diff --git a/.ci/Jenkinsfile_flaky b/.ci/Jenkinsfile_flaky
new file mode 100644
index 00000000000000..e1cbac0528b1f9
--- /dev/null
+++ b/.ci/Jenkinsfile_flaky
@@ -0,0 +1,131 @@
+#!/bin/groovy
+
+library 'kibana-pipeline-library'
+kibanaLibrary.load()
+
+// Looks like 'oss:ciGroup:1' or 'oss:firefoxSmoke'
+def JOB_PARTS = params.CI_GROUP.split(':')
+def IS_XPACK = JOB_PARTS[0] == 'xpack'
+def JOB = JOB_PARTS[1]
+def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
+def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
+def AGENT_COUNT = getAgentCount(EXECUTIONS)
+
+def worker = getWorkerFromParams(IS_XPACK, JOB, CI_GROUP)
+
+def workerFailures = []
+
+currentBuild.displayName += trunc(" ${params.GITHUB_OWNER}:${params.branch_specifier}", 24)
+currentBuild.description = "${params.CI_GROUP}<br />Agents: ${AGENT_COUNT}<br />Executions: ${params.NUMBER_EXECUTIONS}"
+
+stage("Kibana Pipeline") {
+  timeout(time: 180, unit: 'MINUTES') {
+    timestamps {
+      ansiColor('xterm') {
+        def agents = [:]
+        for(def agentNumber = 1; agentNumber <= AGENT_COUNT; agentNumber++) {
+          def agentNumberInside = agentNumber
+          def agentExecutions = floor(EXECUTIONS/AGENT_COUNT) + (agentNumber <= EXECUTIONS%AGENT_COUNT ? 1 : 0)
+          agents["agent-${agentNumber}"] = {
+            catchError {
+              print "Agent ${agentNumberInside} - ${agentExecutions} executions"
+
+              kibanaPipeline.withWorkers('flaky-test-runner', {
+                if (!IS_XPACK) {
+                  kibanaPipeline.buildOss()
+                  if (CI_GROUP == '1') {
+                    runbld "./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh"
+                  }
+                } else {
+                  kibanaPipeline.buildXpack()
+                }
+              }, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
+            }
+          }
+        }
+
+        parallel(agents)
+
+        currentBuild.description += ", Failures: ${workerFailures.size()}"
+
+        if (workerFailures.size() > 0) {
+          print "There were ${workerFailures.size()} test suite failures."
+          print "The executions that failed were:"
+          print workerFailures.join("\n")
+          print "Please check 'Test Result' and 'Pipeline Steps' pages for more info"
+        }
+      }
+    }
+  }
+}
+
+def getWorkerFromParams(isXpack, job, ciGroup) {
+  if (!isXpack) {
+    if (job == 'firefoxSmoke') {
+      return kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' })
+    } else if(job == 'visualRegression') {
+      return kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' })
+    } else {
+      return kibanaPipeline.getOssCiGroupWorker(ciGroup)
+    }
+  }
+
+  if (job == 'firefoxSmoke') {
+    return kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' })
+  } else if(job == 'visualRegression') {
+    return kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' })
+  } else {
+    return kibanaPipeline.getXpackCiGroupWorker(ciGroup)
+  }
+}
+
+def getWorkerMap(agentNumber, numberOfExecutions, worker, workerFailures, maxWorkerProcesses = 12) {
+  def workerMap = [:]
+  def numberOfWorkers = Math.min(numberOfExecutions, maxWorkerProcesses)
+
+  for(def i = 1; i <= numberOfWorkers; i++) {
+    def workerExecutions = numberOfExecutions/numberOfWorkers + (i <= numberOfExecutions%numberOfWorkers ? 1 : 0)
+
+    workerMap["agent-${agentNumber}-worker-${i}"] = { workerNumber ->
+      for(def j = 0; j < workerExecutions; j++) {
+        print "Execute agent-${agentNumber} worker-${workerNumber}: ${j}"
+        withEnv([
+          "JOB=agent-${agentNumber}-worker-${workerNumber}-${j}",
+          "REMOVE_KIBANA_INSTALL_DIR=1",
+        ]) {
+          catchError {
+            try {
+              worker(workerNumber)
+            } catch (ex) {
+              workerFailures << "agent-${agentNumber} worker-${workerNumber}-${j}"
+              throw ex
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return workerMap
+}
+
+def getAgentCount(executions) {
+  // Increase agent count every 24 worker processess, up to 3 agents maximum
+  return Math.min(3, 1 + floor(executions/24))
+}
+
+def trunc(str, length) {
+  if (str.size() >= length) {
+    return str.take(length) + "..."
+  }
+
+  return str;
+}
+
+// All of the real rounding/truncating methods are sandboxed
+def floor(num) {
+  return num
+    .toString()
+    .split('\\.')[0]
+    .toInteger()
+}
diff --git a/.ci/jobs.yml b/.ci/jobs.yml
index fc3e80064fa6fa..a2d8100f78efd0 100644
--- a/.ci/jobs.yml
+++ b/.ci/jobs.yml
@@ -14,7 +14,8 @@ JOB:
   - kibana-ciGroup10
   - kibana-ciGroup11
   - kibana-ciGroup12
-  # - kibana-visualRegression
+  - kibana-accessibility
+  - kibana-visualRegression
 
   # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
   - x-pack-firefoxSmoke
@@ -28,7 +29,8 @@ JOB:
   - x-pack-ciGroup8
   - x-pack-ciGroup9
   - x-pack-ciGroup10
-  # - x-pack-visualRegression
+  - x-pack-accessibility
+  - x-pack-visualRegression
 
 # `~` is yaml for `null`
 exclude: ~
diff --git a/.ci/run.sh b/.ci/run.sh
index 88ce0bd9986a19..9f77438be62d0f 100755
--- a/.ci/run.sh
+++ b/.ci/run.sh
@@ -21,6 +21,9 @@ kibana-ciGroup*)
 kibana-visualRegression*)
   ./test/scripts/jenkins_visual_regression.sh
   ;;
+kibana-accessibility*)
+  ./test/scripts/jenkins_accessibility.sh
+  ;;
 kibana-firefoxSmoke*)
   ./test/scripts/jenkins_firefox_smoke.sh
   ;;
@@ -34,6 +37,9 @@ x-pack-ciGroup*)
 x-pack-visualRegression*)
   ./test/scripts/jenkins_xpack_visual_regression.sh
   ;;
+x-pack-accessibility*)
+  ./test/scripts/jenkins_xpack_accessibility.sh
+  ;;
 x-pack-firefoxSmoke*)
   ./test/scripts/jenkins_xpack_firefox_smoke.sh
   ;;
diff --git a/.eslintrc.js b/.eslintrc.js
index 22d8e67ea702d9..16a80f01278a54 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -55,6 +55,193 @@ module.exports = {
   extends: ['@elastic/eslint-config-kibana', 'plugin:@elastic/eui/recommended'],
 
   overrides: [
+    /**
+     * Temporarily disable some react rules for specific plugins, remove in separate PRs
+     */
+    {
+      files: ['packages/kbn-ui-framework/**/*.{js,ts,tsx}'],
+      rules: {
+        'jsx-a11y/no-onchange': 'off',
+      },
+    },
+    {
+      files: ['src/core/public/application/**/*.{js,ts,tsx}'],
+      rules: {
+        'react/no-danger': 'off',
+      },
+    },
+    {
+      files: ['src/legacy/core_plugins/console/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': '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: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/legacy/core_plugins/kbn_vislib_vis_types/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/legacy/core_plugins/kibana/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/rules-of-hooks': 'off',
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/legacy/core_plugins/tile_map/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/legacy/core_plugins/vis_type_markdown/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/legacy/core_plugins/vis_type_metric/**/*.{js,ts,tsx}'],
+      rules: {
+        'jsx-a11y/click-events-have-key-events': 'off',
+      },
+    },
+    {
+      files: ['src/legacy/core_plugins/vis_type_table/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/legacy/core_plugins/vis_type_vega/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/legacy/ui/public/vis/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/plugins/es_ui_shared/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/plugins/eui_utils/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/plugins/kibana_react/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/rules-of-hooks': 'off',
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['src/plugins/kibana_utils/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/canvas/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+        'jsx-a11y/click-events-have-key-events': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
+      rules: {
+        'jsx-a11y/click-events-have-key-events': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/graph/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/index_management/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+        'react-hooks/rules-of-hooks': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/infra/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+        'react-hooks/rules-of-hooks': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/lens/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+        'react-hooks/rules-of-hooks': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/ml/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/monitoring/**/*.{js,ts,tsx}'],
+      rules: {
+        'jsx-a11y/click-events-have-key-events': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/siem/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+        'react-hooks/rules-of-hooks': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/uptime/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+        'react-hooks/rules-of-hooks': 'off',
+      },
+    },
+    {
+      files: ['x-pack/legacy/plugins/watcher/**/*.{js,ts,tsx}'],
+      rules: {
+        'react-hooks/rules-of-hooks': 'off',
+        'react-hooks/exhaustive-deps': 'off',
+      },
+    },
+
     /**
      * Prettier
      */
@@ -175,10 +362,10 @@ module.exports = {
                   '!src/core/server/*.test.mocks.ts',
 
                   'src/plugins/**/public/**/*',
-                  '!src/plugins/**/public/index*',
+                  '!src/plugins/**/public/index.{js,ts,tsx}',
 
                   'src/plugins/**/server/**/*',
-                  '!src/plugins/**/server/index*',
+                  '!src/plugins/**/server/index.{js,ts,tsx}',
                 ],
                 allowSameFolder: true,
               },
@@ -213,6 +400,7 @@ module.exports = {
         'x-pack/test/functional/apps/**/*.js',
         'x-pack/legacy/plugins/apm/**/*.js',
         'test/*/config.ts',
+        'test/*/{tests,test_suites,apis,apps}/**/*',
         'test/visual_regression/tests/**/*',
         'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',
         'x-pack/test/*/*config.*ts',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4ae7b27a58ee46..94296d076189bf 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,8 +8,14 @@
 
 # App Architecture
 /src/plugins/data/ @elastic/kibana-app-arch
-/src/plugins/kibana_utils/ @elastic/kibana-app-arch
+/src/plugins/embeddable/ @elastic/kibana-app-arch
+/src/plugins/expressions/ @elastic/kibana-app-arch
 /src/plugins/kibana_react/ @elastic/kibana-app-arch
+/src/plugins/kibana_utils/ @elastic/kibana-app-arch
+/src/plugins/navigation/ @elastic/kibana-app-arch
+/src/plugins/ui_actions/ @elastic/kibana-app-arch
+/src/plugins/visualizations/ @elastic/kibana-app-arch
+/x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
 
 # APM
 /x-pack/legacy/plugins/apm/  @elastic/apm-ui
@@ -36,7 +42,9 @@
 /x-pack/test/functional/apps/machine_learning/  @elastic/ml-ui
 /x-pack/test/functional/services/machine_learning/  @elastic/ml-ui
 /x-pack/test/functional/services/ml.ts  @elastic/ml-ui
-/x-pack/legacy/plugins/transform/  @elastic/ml-ui
+# ML team owns the transform plugin, ES team added here for visibility
+# because the plugin lives in Kibana's Elasticsearch management section.
+/x-pack/legacy/plugins/transform/  @elastic/ml-ui @elastic/es-ui
 
 # Operations
 /renovate.json5 @elastic/kibana-operations
@@ -55,11 +63,14 @@
 /src/legacy/server/saved_objects/  @elastic/kibana-platform
 /config/kibana.yml @elastic/kibana-platform
 /x-pack/plugins/features/  @elastic/kibana-platform
+/x-pack/plugins/licensing/  @elastic/kibana-platform
 
 # Security
 /x-pack/legacy/plugins/security/  @elastic/kibana-security
 /x-pack/legacy/plugins/spaces/  @elastic/kibana-security
+/x-pack/plugins/spaces/  @elastic/kibana-security
 /x-pack/legacy/plugins/encrypted_saved_objects/  @elastic/kibana-security
+/x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /src/legacy/server/csp/ @elastic/kibana-security
 /x-pack/plugins/security/  @elastic/kibana-security
 /x-pack/test/api_integration/apis/security/ @elastic/kibana-security
@@ -87,9 +98,6 @@
 /x-pack/legacy/plugins/rollup/  @elastic/es-ui
 /x-pack/legacy/plugins/searchprofiler/  @elastic/es-ui
 /x-pack/legacy/plugins/snapshot_restore/  @elastic/es-ui
-# ML team owns the transform plugin, ES team added here for visibility
-# because the plugin lives in Kibana's Elasticsearch management section.
-/x-pack/legacy/plugins/transform/  @elastic/es-ui
 /x-pack/legacy/plugins/watcher/  @elastic/es-ui
 
 # Kibana TSVB external contractors
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 8a776a909cd9e2..57b299912ae9e7 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -2,6 +2,7 @@
 - src/plugins/data/**/*
 - src/plugins/embeddable/**/*
 - src/plugins/kibana_react/**/*
+- src/plugins/navigation/**/*
 - src/plugins/kibana_utils/**/*
 - src/legacy/core_plugins/dashboard_embeddable_container/**/*
 - src/legacy/core_plugins/data/**/*
diff --git a/.gitignore b/.gitignore
index efb5c577746334..02b20da297fc67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ package-lock.json
 *.sublime-*
 npm-debug.log*
 .tern-project
+x-pack/legacy/plugins/apm/tsconfig.json
+apm.tsconfig.json
diff --git a/.i18nrc.json b/.i18nrc.json
index 0ea51fe8212c4a..01065201b9d641 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -1,36 +1,39 @@
 {
   "paths": {
     "common.ui": "src/legacy/ui",
-    "data": ["src/legacy/core_plugins/data", "src/plugins/data"],
-    "expressions": "src/legacy/core_plugins/expressions",
-    "kibana_react": "src/legacy/core_plugins/kibana_react",
-    "server": "src/legacy/server",
     "console": "src/legacy/core_plugins/console",
     "core": "src/core",
+    "dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
+    "data": ["src/legacy/core_plugins/data", "src/plugins/data"],
+    "embeddableApi": "src/plugins/embeddable",
+    "esUi": "src/plugins/es_ui_shared",
+    "expressions_np": "src/plugins/expressions",
+    "expressions": "src/legacy/core_plugins/expressions",
     "inputControl": "src/legacy/core_plugins/input_control_vis",
+    "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
     "interpreter": "src/legacy/core_plugins/interpreter",
-    "dashboardEmbeddableContainer": "src/legacy/core_plugins/dashboard_embeddable_container",
     "kbn": "src/legacy/core_plugins/kibana",
     "kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
-    "embeddableApi": "src/plugins/embeddable",
+    "kbnESQuery": "packages/kbn-es-query",
     "kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
-    "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
-    "visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
-    "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
-    "visTypeTable": "src/legacy/core_plugins/vis_type_table",
+    "kibana_react": "src/legacy/core_plugins/kibana_react",
+    "kibana-react": "src/plugins/kibana_react",
+    "navigation": "src/legacy/core_plugins/navigation",
     "regionMap": "src/legacy/core_plugins/region_map",
+    "server": "src/legacy/server",
     "statusPage": "src/legacy/core_plugins/status_page",
+    "telemetry": "src/legacy/core_plugins/telemetry",
     "tileMap": "src/legacy/core_plugins/tile_map",
     "timelion": "src/legacy/core_plugins/timelion",
+    "uiActions": "src/plugins/ui_actions",
+    "visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
+    "visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
+    "visTypeTable": "src/legacy/core_plugins/vis_type_table",
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
     "visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
-    "kbnESQuery": "packages/kbn-es-query",
-    "inspector": "src/plugins/inspector",
-    "kibana-react": "src/plugins/kibana_react",
-    "telemetry": "src/legacy/core_plugins/telemetry",
-    "esUi": "src/plugins/es_ui_shared",
-    "uiActions": "src/plugins/ui_actions"
+    "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
+    "visualizations": "src/plugins/visualizations"
   },
   "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
   "translations": []
diff --git a/Jenkinsfile b/Jenkinsfile
index fca814b265295c..8d8579736f6392 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,7 @@
 #!/bin/groovy
 
 library 'kibana-pipeline-library'
+kibanaLibrary.load()
 
 stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a little bit
   timeout(time: 180, unit: 'MINUTES') {
@@ -8,301 +9,44 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
       ansiColor('xterm') {
         catchError {
           parallel([
-            'kibana-intake-agent': legacyJobRunner('kibana-intake'),
-            'x-pack-intake-agent': legacyJobRunner('x-pack-intake'),
-            'kibana-oss-agent': withWorkers('kibana-oss-tests', { buildOss() }, [
-              'oss-ciGroup1': getOssCiGroupWorker(1),
-              'oss-ciGroup2': getOssCiGroupWorker(2),
-              'oss-ciGroup3': getOssCiGroupWorker(3),
-              'oss-ciGroup4': getOssCiGroupWorker(4),
-              'oss-ciGroup5': getOssCiGroupWorker(5),
-              'oss-ciGroup6': getOssCiGroupWorker(6),
-              'oss-ciGroup7': getOssCiGroupWorker(7),
-              'oss-ciGroup8': getOssCiGroupWorker(8),
-              'oss-ciGroup9': getOssCiGroupWorker(9),
-              'oss-ciGroup10': getOssCiGroupWorker(10),
-              'oss-ciGroup11': getOssCiGroupWorker(11),
-              'oss-ciGroup12': getOssCiGroupWorker(12),
-              'oss-firefoxSmoke': getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
-              // 'oss-visualRegression': getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
+            'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
+            'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
+            'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
+              'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
+              'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
+              'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
+              'oss-ciGroup4': kibanaPipeline.getOssCiGroupWorker(4),
+              'oss-ciGroup5': kibanaPipeline.getOssCiGroupWorker(5),
+              'oss-ciGroup6': kibanaPipeline.getOssCiGroupWorker(6),
+              'oss-ciGroup7': kibanaPipeline.getOssCiGroupWorker(7),
+              'oss-ciGroup8': kibanaPipeline.getOssCiGroupWorker(8),
+              'oss-ciGroup9': kibanaPipeline.getOssCiGroupWorker(9),
+              'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
+              'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
+              'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
+              'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
+              'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld './test/scripts/jenkins_accessibility.sh' }),
+              'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
             ]),
-            'kibana-xpack-agent': withWorkers('kibana-xpack-tests', { buildXpack() }, [
-              'xpack-ciGroup1': getXpackCiGroupWorker(1),
-              'xpack-ciGroup2': getXpackCiGroupWorker(2),
-              'xpack-ciGroup3': getXpackCiGroupWorker(3),
-              'xpack-ciGroup4': getXpackCiGroupWorker(4),
-              'xpack-ciGroup5': getXpackCiGroupWorker(5),
-              'xpack-ciGroup6': getXpackCiGroupWorker(6),
-              'xpack-ciGroup7': getXpackCiGroupWorker(7),
-              'xpack-ciGroup8': getXpackCiGroupWorker(8),
-              'xpack-ciGroup9': getXpackCiGroupWorker(9),
-              'xpack-ciGroup10': getXpackCiGroupWorker(10),
-              'xpack-firefoxSmoke': getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' }),
-              // 'xpack-visualRegression': getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' }),
+            'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
+              'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
+              'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
+              'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
+              'xpack-ciGroup4': kibanaPipeline.getXpackCiGroupWorker(4),
+              'xpack-ciGroup5': kibanaPipeline.getXpackCiGroupWorker(5),
+              'xpack-ciGroup6': kibanaPipeline.getXpackCiGroupWorker(6),
+              'xpack-ciGroup7': kibanaPipeline.getXpackCiGroupWorker(7),
+              'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
+              'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
+              'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
+              'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' }),
+              'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld './test/scripts/jenkins_xpack_accessibility.sh' }),
+              'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' }),
             ]),
           ])
         }
-        node('flyweight') {
-          // If the build doesn't have a result set by this point, there haven't been any errors and it can be marked as a success
-          // The e-mail plugin for the infra e-mail depends upon this being set
-          currentBuild.result = currentBuild.result ?: 'SUCCESS'
-
-          sendMail()
-        }
+        kibanaPipeline.sendMail()
       }
     }
   }
 }
-
-def withWorkers(name, preWorkerClosure = {}, workerClosures = [:]) {
-  return {
-    jobRunner('tests-xl', true) {
-      try {
-        doSetup()
-        preWorkerClosure()
-
-        def nextWorker = 1
-        def worker = { workerClosure ->
-          def workerNumber = nextWorker
-          nextWorker++
-
-          return {
-            workerClosure(workerNumber)
-          }
-        }
-
-        def workers = [:]
-        workerClosures.each { workerName, workerClosure ->
-          workers[workerName] = worker(workerClosure)
-        }
-
-        parallel(workers)
-      } finally {
-        catchError {
-          uploadAllGcsArtifacts(name)
-        }
-
-        catchError {
-          runbldJunit()
-        }
-
-        catchError {
-          publishJunit()
-        }
-
-        catchError {
-          runErrorReporter()
-        }
-      }
-    }
-  }
-}
-
-def getPostBuildWorker(name, closure) {
-  return { workerNumber ->
-    def kibanaPort = "61${workerNumber}1"
-    def esPort = "61${workerNumber}2"
-    def esTransportPort = "61${workerNumber}3"
-
-    withEnv([
-      "CI_WORKER_NUMBER=${workerNumber}",
-      "TEST_KIBANA_HOST=localhost",
-      "TEST_KIBANA_PORT=${kibanaPort}",
-      "TEST_KIBANA_URL=http://elastic:changeme@localhost:${kibanaPort}",
-      "TEST_ES_URL=http://elastic:changeme@localhost:${esPort}",
-      "TEST_ES_TRANSPORT_PORT=${esTransportPort}",
-      "IS_PIPELINE_JOB=1",
-    ]) {
-      closure()
-    }
-  }
-}
-
-def getOssCiGroupWorker(ciGroup) {
-  return getPostBuildWorker("ciGroup" + ciGroup, {
-    withEnv([
-      "CI_GROUP=${ciGroup}",
-      "JOB=kibana-ciGroup${ciGroup}",
-    ]) {
-      runbld "./test/scripts/jenkins_ci_group.sh"
-    }
-  })
-}
-
-def getXpackCiGroupWorker(ciGroup) {
-  return getPostBuildWorker("xpack-ciGroup" + ciGroup, {
-    withEnv([
-      "CI_GROUP=${ciGroup}",
-      "JOB=xpack-kibana-ciGroup${ciGroup}",
-    ]) {
-      runbld "./test/scripts/jenkins_xpack_ci_group.sh"
-    }
-  })
-}
-
-def legacyJobRunner(name) {
-  return {
-    parallel([
-      "${name}": {
-        withEnv([
-          "JOB=${name}",
-        ]) {
-          jobRunner('linux && immutable', false) {
-            try {
-              runbld('.ci/run.sh', true)
-            } finally {
-              catchError {
-                uploadAllGcsArtifacts(name)
-              }
-              catchError {
-                publishJunit()
-              }
-              catchError {
-                runErrorReporter()
-              }
-            }
-          }
-        }
-      }
-    ])
-  }
-}
-
-def jobRunner(label, useRamDisk, closure) {
-  node(label) {
-    if (useRamDisk) {
-      // Move to a temporary workspace, so that we can symlink the real workspace into /dev/shm
-      def originalWorkspace = env.WORKSPACE
-      ws('/tmp/workspace') {
-        sh """
-          mkdir -p /dev/shm/workspace
-          mkdir -p '${originalWorkspace}' # create all of the directories leading up to the workspace, if they don't exist
-          rm --preserve-root -rf '${originalWorkspace}' # then remove just the workspace, just in case there's stuff in it
-          ln -s /dev/shm/workspace '${originalWorkspace}'
-        """
-      }
-    }
-
-    def scmVars = checkout scm
-
-    withEnv([
-      "CI=true",
-      "HOME=${env.JENKINS_HOME}",
-      "PR_SOURCE_BRANCH=${env.ghprbSourceBranch ?: ''}",
-      "PR_TARGET_BRANCH=${env.ghprbTargetBranch ?: ''}",
-      "PR_AUTHOR=${env.ghprbPullAuthorLogin ?: ''}",
-      "TEST_BROWSER_HEADLESS=1",
-      "GIT_BRANCH=${scmVars.GIT_BRANCH}",
-    ]) {
-      withCredentials([
-        string(credentialsId: 'vault-addr', variable: 'VAULT_ADDR'),
-        string(credentialsId: 'vault-role-id', variable: 'VAULT_ROLE_ID'),
-        string(credentialsId: 'vault-secret-id', variable: 'VAULT_SECRET_ID'),
-      ]) {
-        // scm is configured to check out to the ./kibana directory
-        dir('kibana') {
-          closure()
-        }
-      }
-    }
-  }
-}
-
-// TODO what should happen if GCS, Junit, or email publishing fails? Unstable build? Failed build?
-
-def uploadGcsArtifact(workerName, pattern) {
-  def storageLocation = "gs://kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/${workerName}" // TODO
-  // def storageLocation = "gs://kibana-pipeline-testing/jobs/pipeline-test/${BUILD_NUMBER}/${workerName}"
-
-  googleStorageUpload(
-    credentialsId: 'kibana-ci-gcs-plugin',
-    bucket: storageLocation,
-    pattern: pattern,
-    sharedPublicly: true,
-    showInline: true,
-  )
-}
-
-def uploadAllGcsArtifacts(workerName) {
-  def ARTIFACT_PATTERNS = [
-    'target/kibana-*',
-    'target/junit/**/*',
-    'test/**/screenshots/**/*.png',
-    'test/functional/failure_debug/html/*.html',
-    'x-pack/test/**/screenshots/**/*.png',
-    'x-pack/test/functional/failure_debug/html/*.html',
-    'x-pack/test/functional/apps/reporting/reports/session/*.pdf',
-  ]
-
-  ARTIFACT_PATTERNS.each { pattern ->
-    uploadGcsArtifact(workerName, pattern)
-  }
-}
-
-def publishJunit() {
-  junit(testResults: 'target/junit/**/*.xml', allowEmptyResults: true, keepLongStdio: true)
-}
-
-def sendMail() {
-  sendInfraMail()
-  sendKibanaMail()
-}
-
-def sendInfraMail() {
-  catchError {
-    step([
-      $class: 'Mailer',
-      notifyEveryUnstableBuild: true,
-      recipients: 'infra-root+build@elastic.co',
-      sendToIndividuals: false
-    ])
-  }
-}
-
-def sendKibanaMail() {
-  catchError {
-    def buildStatus = buildUtils.getBuildStatus()
-
-    if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
-      emailext(
-        to: 'build-kibana@elastic.co',
-        subject: "${env.JOB_NAME} - Build # ${env.BUILD_NUMBER} - ${buildStatus}",
-        body: '${SCRIPT,template="groovy-html.template"}',
-        mimeType: 'text/html',
-      )
-    }
-  }
-}
-
-def runbld(script, enableJunitProcessing = false) {
-  def extraConfig = enableJunitProcessing ? "" : "--config ${env.WORKSPACE}/kibana/.ci/runbld_no_junit.yml"
-
-  sh "/usr/local/bin/runbld -d '${pwd()}' ${extraConfig} ${script}"
-}
-
-def runbldJunit() {
-  sh "/usr/local/bin/runbld -d '${pwd()}' ${env.WORKSPACE}/kibana/test/scripts/jenkins_runbld_junit.sh"
-}
-
-def bash(script) {
-  sh "#!/bin/bash\n${script}"
-}
-
-def doSetup() {
-  runbld "./test/scripts/jenkins_setup.sh"
-}
-
-def buildOss() {
-  runbld "./test/scripts/jenkins_build_kibana.sh"
-}
-
-def buildXpack() {
-  runbld "./test/scripts/jenkins_xpack_build_kibana.sh"
-}
-
-def runErrorReporter() {
-  bash """
-    source src/dev/ci_setup/setup_env.sh
-    node scripts/report_failed_tests
-  """
-}
diff --git a/README.md b/README.md
index 2d33cd218b3dac..03ce6a6525873c 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ _Note: The version numbers below are only examples, meant to illustrate the rela
 
 ## Questions? Problems? Suggestions?
 
-- If you've found a bug or want to request a feature, please create a [GitHub Issue](https://github.com/elastic/kibana/issues/new).
-Please check to make sure someone else hasn't already created an issue for the same topic.
+- If you've found a bug or want to request a feature, please create a [GitHub Issue](https://github.com/elastic/kibana/issues/new/choose).
+  Please check to make sure someone else hasn't already created an issue for the same topic.
 - Need help using Kibana? Ask away on our [Kibana Discuss Forum](https://discuss.elastic.co/c/kibana) and a fellow community member or
 Elastic engineer will be glad to help you out.
diff --git a/config/kibana.yml b/config/kibana.yml
index 9525a6423d90a0..47482f9e6d59f8 100644
--- a/config/kibana.yml
+++ b/config/kibana.yml
@@ -50,7 +50,8 @@
 #server.ssl.key: /path/to/your/server.key
 
 # Optional settings that provide the paths to the PEM-format SSL certificate and key files.
-# These files validate that your Elasticsearch backend uses the same key files.
+# These files are used to verify the identity of Kibana to Elasticsearch and are required when
+# xpack.ssl.verification_mode in Elasticsearch is set to either certificate or full.
 #elasticsearch.ssl.certificate: /path/to/your/client.crt
 #elasticsearch.ssl.key: /path/to/your/client.key
 
diff --git a/docs/canvas/canvas-expressions.asciidoc b/docs/canvas/canvas-expressions.asciidoc
deleted file mode 100644
index 0fcc69c6db726e..00000000000000
--- a/docs/canvas/canvas-expressions.asciidoc
+++ /dev/null
@@ -1,39 +0,0 @@
-[[canvas-expression-editor]]
-=== Customize your element with the expression editor
-
-Each element is backed by an expression that represents the element style and data. To further define the appearance and behavior of the element, use the expression editor.
-
-. In the lower right corner, click *Expression editor*.
-
-. Edit the style and data parts of the expression that you want to change. 
-
-. Click *Run*.
-
-. If you like what you see, click *Close*.
-
-For information about the Canvas expression language, see <<canvas-function-reference,Canvas function reference>>.
-
-//Insert expression video.
-
-[float]
-[[canvas-expression-editor-example]]
-=== Example: Using the expression editor
-
-Build a complex element using expressions. 
-
-```
-image mode="contain" dataurl={
-asset {
-filters | essql
-query="SELECT host,response
-FROM kibana_sample_data_logs
-WHERE host='artifacts.elastic.co'
-ORDER BY timestamp DESC
-LIMIT 1"|
-alterColumn "response" type="number" |
-getCell "response" |
-if {compare lt to=400} then="asset-0a807073-d056-4c7b-9bf4-225b71e47243" else="asset-1343672d-7c02-4402-929e-0f8fef69cddd"
-}
-} | render
-
-```
\ No newline at end of file
diff --git a/docs/canvas/canvas-function-reference.asciidoc b/docs/canvas/canvas-function-reference.asciidoc
index df4b17e9057721..07f3cf028dc0e3 100644
--- a/docs/canvas/canvas-function-reference.asciidoc
+++ b/docs/canvas/canvas-function-reference.asciidoc
@@ -25,6 +25,32 @@ A † denotes an argument can be passed multiple times.
 
 Returns `true` if all of the conditions are met. See also <<any_fn>>.
 
+*Expression syntax*
+[source,js]
+----
+all {neq “foo”} {neq “bar”} {neq “fizz”}
+all condition={gt 10} condition={lt 20}
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| math "mean(percent_uptime)"
+| formatnumber "0.0%"
+| metric "Average uptime"
+  metricFont={
+    font size=48 family="'Open Sans', Helvetica, Arial, sans-serif"
+    color={
+      if {all {gte 0} {lt 0.8}} then="red" else="green"
+    }
+    align="center" lHeight=48
+  }
+| render
+----
+This sets the color of the metric text to `”red”` if the context passed into `metric` is greater than or equal to 0 and less than 0.8. Otherwise, the color is set to `"green"`.
+
 *Accepts:* `null`
 
 [cols="3*^<"]
@@ -47,6 +73,24 @@ Alias: `condition`
 
 Converts between core types, including `string`, `number`, `null`, `boolean`, and `date`, and renames columns. See also <<mapColumn_fn>> and <<staticColumn_fn>>.
 
+*Expression syntax*
+[source,js]
+----
+alterColumn “cost” type=”string”
+alterColumn column=”@timestamp” name=”foo”
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| alterColumn “time” name=”time_in_ms” type=”number”
+| table
+| render
+----
+This renames the `time` column to `time_in_ms` and converts the type of the column’s values from `date` to `number`.
+
 *Accepts:* `datatable`
 
 [cols="3*^<"]
@@ -77,6 +121,27 @@ Alias: `column`
 
 Returns `true` if at least one of the conditions is met. See also <<all_fn>>.
 
+*Expression syntax*
+[source,js]
+----
+any {eq “foo”} {eq “bar”} {eq “fizz”}
+any condition={lte 10} condition={gt 30}
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| filterrows {
+    getCell "project" | any {eq "elasticsearch"} {eq "kibana"} {eq "x-pack"}
+  }
+| pointseries color="project" size="max(price)"
+| pie
+| render
+----
+This filters out any rows that don’t contain `“elasticsearch”`, `“kibana”` or `“x-pack”` in the `project` field.
+
 *Accepts:* `null`
 
 [cols="3*^<"]
@@ -99,6 +164,28 @@ Alias: `condition`
 
 Creates a `datatable` with a single value. See also <<getCell_fn>>.
 
+*Expression syntax*
+[source,js]
+----
+as 
+as “foo”
+as name=”bar”
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| ply by="project" fn={math "count(username)" | as "num_users"} fn={math "mean(price)" | as "price"}
+| pointseries x="project" y="num_users" size="price" color="project"
+| plot
+| render
+----
+`as` casts any primitive value (`string`, `number`, `date`, `null`) into a `datatable` with a single row and a single column with the given name (or defaults to `"value"` if no name is provided). This is useful when piping a primitive value into a function that only takes `datatable` as an input. 
+
+In the example above, `ply` expects each `fn` subexpression to return a `datatable` in order to merge the results of each `fn` back into a `datatable`, but using a `math` aggregation in the subexpressions returns a single `math` value, which is then cast into a `datatable` using `as`.
+
 *Accepts:* `string`, `boolean`, `number`, `null`
 
 [cols="3*^<"]
@@ -123,6 +210,21 @@ Default: `"value"`
 
 Retrieves Canvas workpad asset objects to provide as argument values. Usually images.
 
+*Expression syntax*
+[source,js]
+----
+asset "asset-52f14f2b-fee6-4072-92e8-cd2642665d02"
+asset id="asset-498f7429-4d56-42a2-a7e4-8bf08d98d114"
+----
+
+*Code example*
+[source,text]
+----
+image dataurl={asset "asset-c661a7cc-11be-45a1-a401-d7592ea7917a"} mode="contain"
+| render
+----
+The image asset stored with the ID `“asset-c661a7cc-11be-45a1-a401-d7592ea7917a”` is passed into the `dataurl` argument of the `image` function to display the stored asset.
+
 *Accepts:* `null`
 
 [cols="3*^<"]
@@ -145,6 +247,27 @@ Alias: `id`
 
 Configures the axis of a visualization. Only used with <<plot_fn>>.
 
+*Expression syntax*
+[source,js]
+----
+axisConfig show=false
+axisConfig position=”right” min=0 max=10 tickSize=1
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| pointseries x="size(cost)" y="project" color="project"
+| plot defaultStyle={seriesStyle bars=0.75 horizontalBars=true} 
+  legend=false 
+  xaxis={axisConfig position="top" min=0 max=400 tickSize=100} 
+  yaxis={axisConfig position="right"}
+| render
+----
+This sets the `x-axis` to display on the top of the chart and sets the range of values to `0-400` with ticks displayed at `100` intervals. The `y-axis` is configured to display on the `right`.
+
 *Accepts:* `null`
 
 [cols="3*^<"]
@@ -188,6 +311,34 @@ Default: `true`
 
 Builds a `case` (including a condition/result) to pass to the <<switch_fn>> function.
 
+*Expression syntax*
+[source,js]
+----
+case 0 then=”red”
+case when=5 then=”yellow”
+case if={lte 50} then=”green”
+----
+
+*Code example*
+[source,text]
+----
+math "random()"
+| progress shape="gauge" label={formatnumber "0%"} 
+  font={font size=24 family="'Open Sans', Helvetica, Arial, sans-serif" align="center" 
+    color={
+      switch {case if={lte 0.5} then="green"} 
+        {case if={all {gt 0.5} {lte 0.75}} then="orange"} 
+        default="red"
+    }} 
+  valueColor={
+    switch {case if={lte 0.5} then="green"} 
+      {case if={all {gt 0.5} {lte 0.75}} then="orange"} 
+      default="red"
+  }
+| render
+----
+This sets the color of the progress indicator and the color of the label to `"green"` if the value is less than or equal to `0.5`, `"orange"` if the value is greater than `0.5` and less than or equal to `0.75`, and `"red"` if `none` of the case conditions are met.
+
 *Accepts:* `any`
 
 [cols="3*^<"]
@@ -229,6 +380,24 @@ Clears the _context_, and returns `null`.
 
 Includes or excludes columns from a data table. If you specify both, this will exclude first.
 
+*Expression syntax*
+[source,js]
+----
+columns include=”@timestamp, projects, cost”
+columns exclude=”username, country, age”
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| columns include="price, cost, state, project"
+| table
+| render
+----
+This only keeps the `price`, `cost`, `state`, and `project` columns from the `demodata` data source and removes all other columns.
+
 *Accepts:* `datatable`
 
 [cols="3*^<"]
@@ -257,6 +426,31 @@ Compares the _context_ to specified value to determine `true` or `false`.
 Usually used in combination with <<if_fn>> or <<case_fn>>. This only works with primitive types, 
 such as `number`, `string`, and `boolean`. See also <<eq_fn>>, <<gt_fn>>, <<gte_fn>>, <<lt_fn>>, <<lte_fn>>, and <<neq_fn>>.
 
+*Expression syntax*
+[source,js]
+----
+compare “neq” to=”elasticsearch”
+compare op=”lte” to=100
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| mapColumn project 
+  fn=${getCell project | 
+    switch 
+      {case if={compare eq to=kibana} then=kibana}
+      {case if={compare eq to=elasticsearch} then=elasticsearch}
+      default="other"
+  }
+| pointseries size="size(cost)" color="project"
+| pie 
+| render
+----
+This maps all `project` values that aren’t `“kibana”` and `“elasticsearch”` to `“other”`. Alternatively, you can use the individual comparator functions instead of compare. See <<eq_fn>>, <<neq_fn>>, <<lt_fn>>, <<lte_fn>>, <<gt_fn>>, and <<gte_fn>>.
+
 *Accepts:* `string`, `number`, `boolean`, `null`
 
 [cols="3*^<"]
@@ -287,6 +481,35 @@ Alias: `this`, `b`
 
 Creates an object used for styling an element's container, including background, border, and opacity.
 
+*Expression syntax*
+[source,js]
+----
+containerStyle backgroundColor=”red”’
+containerStyle borderRadius=”50px”
+containerStyle border=”1px solid black”
+containerStyle padding=”5px”
+containerStyle opacity=”0.5”
+containerStyle overflow=”hidden”
+containerStyle backgroundImage={asset id=asset-f40d2292-cf9e-4f2c-8c6f-a504a25e949c} 
+  backgroundRepeat="no-repeat" 
+  backgroundSize="cover" 
+----
+
+*Code example*
+[source,text]
+----
+shape "star" fill="#E61D35" maintainAspect=true
+| render 
+  containerStyle={
+    containerStyle backgroundColor="#F8D546" 
+      borderRadius="200px" 
+      border="4px solid #05509F" 
+      padding="0px"
+      opacity="0.9" 
+      overflow="hidden"
+  }
+----
+
 *Accepts:* `null`
 
 [cols="3*^<"]
@@ -346,6 +569,22 @@ Default: `"hidden"`
 Returns whatever you pass into it. This can be useful when you need to use the 
 _context_ as an argument to a function as a sub-expression.
 
+*Expression syntax*
+[source,js]
+----
+context
+----
+
+*Code example*
+[source,text]
+----
+date
+| formatdate "LLLL"
+| markdown "Last updated: " {context} 
+| render
+----
+Using the `context` function allows us to pass the output, or _context_, of the previous function as a value to an argument in the next function. Here we get the formatted date string from the previous function and pass it as `content` for the markdown element.
+
 *Accepts:* `any`
 
 *Returns:* Original _context_
@@ -356,6 +595,26 @@ _context_ as an argument to a function as a sub-expression.
 
 Creates a `datatable` from CSV input.
 
+*Expression syntax*
+[source,js]
+----
+csv “fruit, stock
+     kiwi, 10
+     Banana, 5”
+----
+
+*Code example*
+[source,text]
+----
+csv "fruit,stock
+     kiwi,10
+     banana,5"
+| pointseries color=fruit size=stock
+| pie
+| render
+----
+This is useful for quickly mocking data.
+
 *Accepts:* `null`
 
 [cols="3*^<"]
@@ -390,6 +649,30 @@ Alias: `data`
 
 Returns the current time, or a time parsed from a `string`, as milliseconds since epoch.
 
+*Expression syntax*
+[source,js]
+----
+date
+date value=1558735195
+date “2019-05-24T21:59:55+0000”
+date “01/31/2019” format=”MM/DD/YYYY”
+----
+
+*Code example*
+[source,text]
+----
+date
+| formatdate "LLL"
+| markdown {context} 
+  font={font family="Arial, sans-serif" size=30 align="left" 
+    color="#000000" 
+    weight="normal" 
+    underline=false 
+    italic=false}
+| render
+----
+Using `date` without passing any arguments will return the current date and time.
+
 *Accepts:* `null`
 
 [cols="3*^<"]
@@ -418,6 +701,24 @@ using the `format` argument. Must be an ISO8601 string or you must provide the f
 
 A mock data set that includes project CI times with usernames, countries, and run phases.
 
+*Expression syntax*
+[source,js]
+----
+demodata
+demodata “ci”
+demodata type=”shirts”
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata 
+| table
+| render
+----
+`demodata` is a mock data set that you can use to start playing around in Canvas.
+
 *Accepts:* `filter`
 
 [cols="3*^<"]
@@ -442,6 +743,23 @@ Default: `"ci"`
 
 Executes multiple sub-expressions, then returns the original _context_. Use for running functions that produce an action or side effect without changing the original _context_.
 
+*Expression syntax*
+[source,js]
+----
+do fn={something cool}
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata 
+| do fn={something cool} 
+| table
+| render
+----
+`do` should be used to invoke a function that produces as a side effect without changing the `context`.
+
 *Accepts:* `any`
 
 [cols="3*^<"]
@@ -464,6 +782,22 @@ Aliases: `expression`, `exp`, `fn`, `function`
 
 Configures a dropdown filter control element.
 
+*Expression syntax*
+[source,js]
+----
+dropdownControl valueColumn=project filterColumn=project
+dropdownControl valueColumn=agent filterColumn=agent.keyword filterGroup=group1
+----
+
+*Code example*
+[source,text]
+----
+demodata
+| dropdownControl valueColumn=project filterColumn=project 
+| render
+----
+This creates a dropdown filter element. It requires a data source and uses the unique values from the given `valueColumn` (i.e. `project`) and applies the filter to the `project` column. Note: `filterColumn` should point to a keyword type field for Elasticsearch data sources.
+
 *Accepts:* `datatable`
 
 [cols="3*^<"]
@@ -496,6 +830,33 @@ Configures a dropdown filter control element.
 
 Returns whether the _context_ is equal to the argument.
 
+*Expression syntax*
+[source,js]
+----
+eq true
+eq null
+eq 10
+eq “foo”
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| mapColumn project 
+  fn=${getCell project | 
+    switch 
+      {case if={eq kibana} then=kibana}
+      {case if={eq elasticsearch} then=elasticsearch}
+      default="other"
+  }
+| pointseries size="size(cost)" color="project"
+| pie 
+| render
+----
+This changes all values in the project column that don’t equal `“kibana”` or `“elasticsearch”` to `“other”`.
+
 *Accepts:* `boolean`, `number`, `string`, `null`
 
 [cols="3*^<"]
@@ -518,6 +879,28 @@ Alias: `value`
 
 Queries {es} for the number of hits matching the specified query.
 
+*Expression syntax*
+[source,js]
+----
+escount index=”logstash-*”
+escount "currency:\"EUR\"" index=”kibana_sample_data_ecommerce” 
+escount query="response:404" index=”kibana_sample_data_logs” 
+----
+
+*Code example*
+[source,text]
+----
+filters
+| escount "Cancelled:true" index="kibana_sample_data_flights"
+| math "value"
+| progress shape="semicircle" 
+  label={formatnumber 0,0} 
+  font={font size=24 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center} 
+  max={filters | escount index="kibana_sample_data_flights"}
+| render
+----
+The first `escount` expression retrieves the number of flights that were cancelled. The second `escount` expression retrieves the total number of flights.
+
 *Accepts:* `filter`
 
 [cols="3*^<"]
@@ -549,6 +932,34 @@ Default: `_all`
 Queries {es} for raw documents. Specify the fields you want to retrieve, 
 especially if you are asking for a lot of rows.
 
+*Expression syntax*
+[source,js]
+----
+esdocs index=”logstash-*”
+esdocs "currency:\"EUR\"" index=”kibana_sample_data_ecommerce” 
+esdocs query="response:404" index=”kibana_sample_data_logs” 
+esdocs index=”kibana_sample_data_flights” count=100 
+esdocs index="kibana_sample_data_flights" sort="AvgTicketPrice, asc"
+----
+
+*Code example*
+[source,text]
+----
+filters
+| esdocs index="kibana_sample_data_ecommerce" 
+  fields="customer_gender, taxful_total_price, order_date" 
+  sort="order_date, asc" 
+  count=10000
+| mapColumn "order_date" 
+  fn={getCell "order_date" | date {context} | rounddate "YYYY-MM-DD"}
+| alterColumn "order_date" type="date"
+| pointseries x="order_date" y="sum(taxful_total_price)" color="customer_gender"
+| plot defaultStyle={seriesStyle lines=3} 
+  palette={palette "#7ECAE3" "#003A4D" gradient=true}
+| render
+----
+This retrieves the latest 10000 documents data from the `kibana_sample_data_ecommerce` index sorted by `order_date` in ascending order and only requests the `customer_gender`, `taxful_total_price`, and `order_date` fields.
+
 *Accepts:* `filter`
 
 [cols="3*^<"]
@@ -593,6 +1004,21 @@ Default: `"_all"`
 
 Queries {es} using {es} SQL.
 
+*Expression syntax*
+[source,js]
+----
+essql query=”SELECT * FROM \”logstash*\”” 
+essql “SELECT * FROM \”apm*\”” count=10000
+----
+
+*Code example*
+[source,text]
+----
+filters
+| essql query="SELECT Carrier, FlightDelayMin, AvgTicketPrice FROM   \"kibana_sample_data_flights\""
+----
+This retrieves the `Carrier`, `FlightDelayMin`, and `AvgTicketPrice` fields from the “kibana_sample_data_flights” index.
+
 *Accepts:* `filter`
 
 [cols="3*^<"]
@@ -627,6 +1053,26 @@ Default: `UTC`
 
 Creates a filter that matches a given column to an exact value.
 
+*Expression syntax*
+[source,js]
+----
+exactly “state” value=”running”
+exactly “age” value=50 filterGroup=”group2”
+exactly column=“project” value=”beats”
+----
+
+*Code example*
+[source,text]
+----
+filters
+| exactly column=project value=elasticsearch
+| demodata
+| pointseries x=project y="mean(age)"
+| plot defaultStyle={seriesStyle bars=1}
+| render
+----
+The `exactly` filter here is added to existing filters retrieved by the `filters` function and further filters down the data to only have `”elasticsearch”` data. The `exactly` filter only applies to this one specific element and will not affect other elements in the workpad.
+
 *Accepts:* `filter`
 
 [cols="3*^<"]
@@ -664,6 +1110,29 @@ capitalization.
 
 Filters rows in a `datatable` based on the return value of a sub-expression.
 
+*Expression syntax*
+[source,js]
+----
+filterrows {getCell “project” | eq “kibana”}
+filterrows fn={getCell “age” | gt 50}
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| filterrows {getCell "country" | any {eq "IN"} {eq "US"} {eq "CN"}}
+| mapColumn "@timestamp" 
+  fn={getCell "@timestamp" | rounddate "YYYY-MM"}
+| alterColumn "@timestamp" type="date"
+| pointseries x="@timestamp" y="mean(cost)" color="country"
+| plot defaultStyle={seriesStyle points="2" lines="1"} 
+  palette={palette "#01A4A4" "#CC6666" "#D0D102" "#616161" "#00A1CB" "#32742C" "#F18D05" "#113F8C" "#61AE24" "#D70060" gradient=false}
+| render
+----
+This uses `filterrows` to only keep data from India (`IN`), the United States (`US`), and China (`CN`).
+
 *Accepts:* `datatable`
 
 [cols="3*^<"]
@@ -688,6 +1157,34 @@ and a `false` value removes it.
 
 Aggregates element filters from the workpad for use elsewhere, usually a data source.
 
+*Expression syntax*
+[source,js]
+----
+filters
+filters group=”timefilter1”
+filters group=”timefilter2” group=”dropdownfilter1” ungrouped=true
+----
+
+*Code example*
+[source,text]
+----
+filters group=group2 ungrouped=true
+| demodata
+| pointseries x="project" y="size(cost)" color="project"
+| plot defaultStyle={seriesStyle bars=0.75} legend=false 
+  font={
+    font size=14 
+    family="'Open Sans', Helvetica, Arial, sans-serif" 
+    align="left" 
+    color="#FFFFFF" 
+    weight="lighter" 
+    underline=true 
+    italic=true
+  }
+| render
+----
+`filters` sets the existing filters as context and accepts `group` parameter to create filter groups.
+
 *Accepts:* `null`
 
 [cols="3*^<"]
@@ -718,6 +1215,38 @@ Default: `false`
 
 Creates a font style.
 
+*Expression syntax*
+[source,js]
+----
+font size=12
+font family=Arial
+font align=middle
+font color=pink
+font weight=lighter
+font underline=true
+font italic=false
+font lHeight=32
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| pointseries x="project" y="size(cost)" color="project"
+| plot defaultStyle={seriesStyle bars=0.75} legend=false 
+  font={
+    font size=14 
+    family="'Open Sans', Helvetica, Arial, sans-serif" 
+    align="left" 
+    color="#FFFFFF" 
+    weight="lighter" 
+    underline=true 
+    italic=true
+  }
+| render
+----
+
 *Accepts:* `null`
 
 [cols="3*^<"]
@@ -781,6 +1310,25 @@ Default: `"normal"`
 
 Formats an ISO8601 date string or a date in milliseconds since epoch using MomentJS. See https://momentjs.com/docs/#/displaying/.
 
+*Expression syntax*
+[source,js]
+----
+formatdate format=”YYYY-MM-DD”
+formatdate “MM/DD/YYYY”
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| mapColumn "time" fn={getCell time | formatdate "MMM 'YY"}
+| pointseries x="time" y="sum(price)" color="state"
+| plot defaultStyle={seriesStyle points=5}
+| render
+----
+This transforms the dates in the `time` field into strings that look like `“Jan ‘19”`, `“Feb ‘19”`, etc. using a MomentJS format.
+
 *Accepts:* `number`, `string`
 
 [cols="3*^<"]
@@ -803,6 +1351,26 @@ Alias: `format`
 
 Formats a `number` into a formatted `string` using NumeralJS. See http://numeraljs.com/#format.
 
+*Expression syntax*
+[source,js]
+----
+formatnumber format=”$0,0.00”
+formatnumber “0.0a”
+----
+
+*Code example*
+[source,text]
+----
+filters
+| demodata
+| math "mean(percent_uptime)"
+| progress shape="gauge" 
+  label={formatnumber "0%"} 
+  font={font size=24 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align="center"}
+| render
+----
+The `formatnumber` subexpression receives the same `context` as the `progress` function, which is the output of the `math` function. It formats the value into a percentage.
+
 *Accepts:* `number`
 
 [cols="3*^<"]
diff --git a/docs/canvas/canvas-share-workpad.asciidoc b/docs/canvas/canvas-share-workpad.asciidoc
index 5cc5b953e5775f..119ede16fe1e7b 100644
--- a/docs/canvas/canvas-share-workpad.asciidoc
+++ b/docs/canvas/canvas-share-workpad.asciidoc
@@ -2,47 +2,100 @@
 [[workpad-share-options]]
 == Share your workpad
 
-When you are ready to share your workpad, create a PDF, or export your workpad.
+When you've finished your workpad, you can share it outside of {kib}.
+
+[float]
+[[export-single-workpad]]
+=== Export workpads
+
+Create a JSON file of your workpad that you can export outside of {kib}.
+
+. From your workpad, click the *Share workpad* icon in the upper left corner.
+
+. Select *Download as JSON*.
++
+[role="screenshot"]
+image::images/canvas-export-workpad.png[Export single workpad]
+
+Want to export multiple workpads? Go to the *Canvas workpads* view, select the workpads you want to export, then click *Export*.
 
 [float]
 [[create-workpad-pdf]]
 === Create a PDF
 
-To view your workpad outside of Kibana, generate a PDF. 
+Create a PDF copy of your workpad that you can save and share outside of {kib}.
 
 . If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file.
 
 . From your workpad, click the *Share workpad* icon in the upper left corner, then select *PDF reports*.
 
-. Click *Generate PDF*. 
+. Click *Generate PDF*.
 +
 [role="screenshot"]
 image::images/canvas-generate-pdf.gif[Generate PDF]
 
 [float]
-[[export-workpad]]
-=== Export your workpad
+[[create-workpad-URL]]
+=== Create a POST URL
+
+Create a POST URL that you can use to automatically generate PDF reports using Watcher or a script.
+
+For more information, refer to <<automating-report-generation, Automating report generation>>.
+
+. If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file.
+
+. From your workpad, click the *Share workpad* icon in the upper left corner, then select *PDF reports*.
 
-To share your workpad with another author, export it as a JSON file.
+. Click *Copy POST URL*.
++
+[role="screenshot"]
+image::images/canvas-create-URL.gif[Create POST URL]
 
 [float]
-[[export-single-workpad]]
-==== Export a single workpad
+[[add-workpad-website]]
+=== Share the workpad on a website
 
-. From your workpad, click the *Share workpad* icon in the upper left corner.
+beta[] Download the workpad and share it on any website, then customize the workpad behavior to autoplay the pages or hide the toolbar.
 
-. Select *Download as JSON*.
+. If you are using a Gold or Platinum license, enable reporting in your `config/kibana.yml` file.
+
+. From your workpad, click the *Share this workpad* icon in the upper left corner, then select *Share on a website*.
+
+. On the *Share on a website* pane, follow the instructions.
+
+. To customize the workpad behavior to autoplay the pages or hide the toolbar, use the inline parameters.
++
+To make sure that your data remains secure, the data in the JSON file is not connected to {kib}. Canvas does not display elements that manipulate the data on the workpad.
 +
 [role="screenshot"]
-image::images/canvas-export-workpad.png[Export single workpad]
+image::images/canvas-embed_workpad.gif[Share the workpad on a website]
++
+NOTE: Shareable workpads encode the current state of the workpad in a JSON file. When you make changes to the workpad, the changes do not appear in the shareable workpad on your website.
 
 [float]
-[[export-multiple-workpads]]
-==== Export multiple workpads
+[[change-the-workpad-settings]]
+=== Change the shareable workpad settings
 
-. Go to the *Canvas workpads* page.
+After you've added the workpad to your website, you can change the autoplay and toolbar settings.
 
-. Select the workpads you want to export
+[float]
+[[shareable-workpad-enable-autoplay]]
+==== Change the autoplay settings
 
-. Click *Export*.
+. In the lower right corner of the shareable workpad, click the settings icon.
 
+. Click *Auto Play*, then change the settings.
++
+[role="screenshot"]
+image::images/canvas_share_autoplay_480.gif[Autoplay settings]
+
+[float]
+[[hide-workpad-toolbar]]
+==== Change the toolbar settings
+
+. In the lower right corner, click the settings icon.
+
+. Click *Toolbar*, then change the settings.
++
+[role="screenshot"]
+image::images/canvas_share_hidetoolbar_480.gif[Hide toolbar settings]
diff --git a/docs/canvas/canvas-workpad.asciidoc b/docs/canvas/canvas-workpad.asciidoc
index f664f055a5ff65..f833bd903b0bca 100644
--- a/docs/canvas/canvas-workpad.asciidoc
+++ b/docs/canvas/canvas-workpad.asciidoc
@@ -18,17 +18,17 @@ To create a workpad, you can:
 [[blank-canvas-workpad]]
 === Start with a blank page
 
-To use the background colors, images, and data of your choice, start with a blank workpad. 
+To use the background colors, images, and data of your choice, start with a blank workpad.
 
 . Open *Canvas*.
 
-. On the *Canvas workpads* page, click *Create workpad*.
+. On the *Canvas workpads* view, click *Create workpad*.
 
 . Add a *Name* to your workpad.
 
-. In the *Width* and *Height* fields, specify the size. 
+. In the *Width* and *Height* fields, specify the size.
 
-. Select the layout. 
+. Select the layout.
 +
 For example, click *720p* for a traditional presentation layout.
 
@@ -45,7 +45,7 @@ If you're unsure about where to start, you can use one of the preconfigured temp
 
 . Open *Canvas*.
 
-. On the *Canvas workpads* page, select *Templates*.
+. On the *Canvas workpads* view, select *Templates*.
 
 . Click the preconfigured template that you want to use.
 
@@ -59,7 +59,7 @@ When you want to use a workpad that someone else has already started, import the
 
 . Open *Canvas*.
 
-. On the *Canvas workpads* page, click and drag the file to the *Import workpad JSON file* field.
+. On the *Canvas workpads* view, click and drag the file to the *Import workpad JSON file* field.
 
 [float]
 [[sample-data-workpad]]
@@ -67,11 +67,11 @@ When you want to use a workpad that someone else has already started, import the
 
 Each of the sample data sets comes with a Canvas workpad that you can use for your own workpad inspiration.
 
-. Add a {kibana-ref}/add-sample-data.html[sample data set]. 
+. Add a {kibana-ref}/add-sample-data.html[sample data set].
 
 . On the *Add Data to Kibana* page, click the *View data* dropdown list, then select *Canvas*.
 +
-Need some more workpad inspiration? Check out the link:https://www.elastic.co/blog/[Elastic Blog]. 
+Need some more workpad inspiration? Check out the link:https://www.elastic.co/blog/[Elastic Blog].
 
 [float]
 [[apply-workpad-styles]]
diff --git a/docs/code/code-basic-nav.asciidoc b/docs/code/code-basic-nav.asciidoc
deleted file mode 100644
index ccd290532b6698..00000000000000
--- a/docs/code/code-basic-nav.asciidoc
+++ /dev/null
@@ -1,25 +0,0 @@
-[[code-basic-nav]]
-== Basic navigation
-
-[float]
-==== View file structure and information
-The *File* tree on the left is the primary way to navigate through your folder structure.  When you are in a directory, *Code* also presents a finder-like view on the right. Additionally, a file path breadcrumb makes it easy to go back to any parent directory.
-
-[float]
-==== Git History and Blame
-The *Directory* view shows the most recent commits.  Clicking *View More* or *History* shows the complete commit history of the current folder or file.
-
-[role="screenshot"]
-image::images/code-history.png[]
-
-Clicking *Blame* shows the most recent commit per line.
-
-[role="screenshot"]
-image::images/code-blame.png[]
-
-[float]
-==== Branch selector
-You can use the Branch selector to view different branches of a repo. Note that code intelligence and search index are not available for any branch other than the master branch.
-
-
-include::code-semantic-nav.asciidoc[]
diff --git a/docs/code/code-import-first-repo.asciidoc b/docs/code/code-import-first-repo.asciidoc
deleted file mode 100644
index 0c8b2660edcab1..00000000000000
--- a/docs/code/code-import-first-repo.asciidoc
+++ /dev/null
@@ -1,48 +0,0 @@
-[[code-import-first-repo]]
-== Import your first repo
-
-The easiest way to get started with *Code* is to import a real-world repository.
-
-[float]
-==== Before you begin
-You must have a {kib} instance up and running.
-
-If you are in an environment where you have multiple {kib} instances in a cluster, see the <<code-multiple-kibana-instances-config, config instructions for multiple Kibana instances>>.
-
-[float]
-==== Enable Code app
-While in beta, you can turn on *Code* by adding the following line to `kibana.yaml`:
-
-[source,yaml]
-----
-xpack.code.ui.enabled: true
-----
-
-[float]
-==== Import your first repository
-. In {Kib}, navigate to *Code*.
-
-. In the *Repository URL* field, paste the following GitHub clone URL:
-+
-[source,bash]
-----
-https://github.com/Microsoft/TypeScript-Node-Starter
-----
-
-`https` is recommend for cloning most git repositories. To clone a private repository, <<code-repo-management, use SSH>>. 
-
-. Click *Import*.
-+
-A new item in the list displays the cloning and indexing progress of the `TypeScript-Node-Starter` repo.
-+
-[role="screenshot"]
-image::images/code-import-repo.png[]
-
-. After the indexing is complete, navigate to the repo by clicking its name in the list.
-+
-[role="screenshot"]
-image::images/code-starter-root.png[]
-+
-Congratulations! You just imported your first repo into *Code*.
-
-include::code-repo-management.asciidoc[]
diff --git a/docs/code/code-install-lang-server.asciidoc b/docs/code/code-install-lang-server.asciidoc
deleted file mode 100644
index 4d4349e654c080..00000000000000
--- a/docs/code/code-install-lang-server.asciidoc
+++ /dev/null
@@ -1,25 +0,0 @@
-[[code-install-lang-server]]
-== Install language server
-
-*Code* comes with built-in language support for TypeScript. You can install additional languages as a {kib} plugin. Plugin's reduce the distribution size to run Code inside {kib}. Install only the languages needed for your indexed repositories. 
-
-[role="screenshot"]
-image::images/code-lang-server-tab.png[]
-
-For the current version, *Code* supports the following languages in addition to TypeScript:
-
-* `Java`
-* `GO`
-
-You can check the status of the language servers and get installation instructions on the *Language Servers* tab.  Make sure the status of the language server is `INSTALLED` or `RUNNING` after you restart the {kib} instance.
-[role="screenshot"]
-image::images/code-lang-server-status.png[]
-
-////
-[float]
-=== Ctag language server
-*Code* also uses a Ctag language server to generate symbol information and code intelligence when a dedicated language server is not available. The code intelligence information generated by the Ctag language server is less accurate but covers more languages.
-////
-
-
-include::code-basic-nav.asciidoc[]
diff --git a/docs/code/code-multiple-kibana-instances-config.asciidoc b/docs/code/code-multiple-kibana-instances-config.asciidoc
deleted file mode 100644
index 359e0764d28f1e..00000000000000
--- a/docs/code/code-multiple-kibana-instances-config.asciidoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[[code-multiple-kibana-instances-config]]
-== Config for multiple {kib} instances
-If you are using multiple instances of {kib}, you must manually assign at least one {kib} instance as a *Code* `node`. Add the following line of code to your `kibana.yml` file for each {kib} instance you wish to use and restart the instances:
-
-[source,yaml]
-----
-xpack.code.codeNodeUrl: 'http://$YourCodeNodeAddress'
-----
-
-`$YourCodeNoteAddress` is the URL of your assigned *Code* node accessible by other {kib} instances.
diff --git a/docs/code/code-repo-management.asciidoc b/docs/code/code-repo-management.asciidoc
deleted file mode 100644
index 1fbd8934f57bef..00000000000000
--- a/docs/code/code-repo-management.asciidoc
+++ /dev/null
@@ -1,76 +0,0 @@
-[[code-repo-management]]
-== Repo management
-
-Code starts with an overview of your repositories.  You can then use the UI to add, delete, and reindex a repo.
-[role="screenshot"]
-image::images/code-repo-management.png[]
-
-[float]
-[[add-delete-a-repo]]
-==== Add and delete a repo
-The <<code-import-first-repo, Import your first repository>> page provides step-by-step instructions for adding a GitHub repo to *Code*.  You can fine-tune the hostname of the git clone URL in your `kibana.yml` file.
-
-For security reasons, Code allows only a few <<clone-url-management,trusted hostnames>>, such as github.com. To clone private repositories see <<clone-private-repo,add an SSH key>>.
-
-To delete a repository, go to the **Repositories** tab, find the name of the repo, and click *Delete*.
-
-[float]
-[[clone-private-repo]]
-==== Clone private repo with an SSH key
-Clones of private repos require an SSH key for authentication. The username associated with your host must have write access to the repository you want to clone.
-
-The following section provides links for generating your ssh key through GitHub. If you already have an SSH key added through your host, skip to step 4.
-
-1. https://help.github.com/en/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#generating-a-new-ssh-key[Generate an ssh key].
-
-2. https://help.github.com/en/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent#adding-your-ssh-key-to-the-ssh-agent[Add the ssh key to your ssh-agent.]
-
-3. https://help.github.com/en/articles/adding-a-new-ssh-key-to-your-github-account[Add the ssh key to your host].
-
-4. Copy the ssh key into `data/code/credentials/` under the {kib} folder.
-
-You can now copy private Git repositories into Code.
-
-To delete a repository, find the go to the **Repositories** tab, find the name of the repo and click *Delete*.
-
-[float]
-[[reindex-a-repo]]
-==== Reindex a repo
-*Code* automatically reindexes an imported repo at set intervals, but in some cases, you might need to refresh the index manually. For example, you might refresh an index after a new language server installs. Or, you might want to update the index to the HEAD revision immediately. Click *Reindex* to initiate a reindex.
-
-[float]
-[[clone-url-management]]
-==== Clone URL management
-For security reasons, *Code* only allows the following hostnames in the git clone URL by default:
-
-- `github.com`
-- `gitlab.com`
-- `bitbucket.org`
-- `gitbox.apache.org`
-- `eclipse.org`
-
-You can add your own hostname (for example, acme.com) to the whitelist by adding the following line to your `config/kibana.yaml` file:
-
-[source,yaml]
-----
-xpack.code.security.gitHostWhitelist: [ "github.com", "gitlab.com", "bitbucket.org", "gitbox.apache.org", "eclipse.org", "acme.com" ]
-----
-
-Set `xpack.code.security.gitHostWhitelist` to [] (empty list) allow any hostname.
-
-You can also control the protocol to use for the clone address. By default, the following protocols are supported: `[ 'https', 'git', 'ssh' ]`. You can change this value by adding the following line to your `config/kibana.yaml` file.  In this example, the user only wants to support the `https` protocol:
-
-[source,yaml]
-----
-xpack.code.security.gitProtocolWhitelist: [ "https" ]
-----
-
-[float]
-[[repo-limitations]]
-==== Limitations
-Consider the following limitations before cloning repositories:
-
-- Only Git is supported. Other version control systems, such as Mercurial and SVN, are not supported.
-- Your disk might not have enough space to clone repositories due to {kib} watermark settings. To update your watermark settings, contact your system administrator and request additional disk space.
-
-include::code-install-lang-server.asciidoc[]
diff --git a/docs/code/code-search.asciidoc b/docs/code/code-search.asciidoc
deleted file mode 100644
index c3086bfb850a0f..00000000000000
--- a/docs/code/code-search.asciidoc
+++ /dev/null
@@ -1,24 +0,0 @@
-[[code-search]]
-== Search
-
-[float]
-==== Typeahead search
-The search bar is designed to help you find what you're looking for as quickly as possible. It shows `Symbols`, `Files`, and `Repos` results as you type. Clicking on any result takes you to the definition. You can use the search type dropdown to show all types of results or limit it to a specific search type.
-
-[role="screenshot"]
-image::images/code-quick-search.png[]
-
-[float]
-==== Full-text search
-If the quick search results don’t contain what you are looking for, you can press ‘Enter’ to conduct a full-text search.
-[role="screenshot"]
-image::images/code-full-text-search.png[]
-You can further refine the results by using the repo and language filters on the left.
-
-[float]
-==== Search filter
-You can also use the Search Filters to limit the search scope to certain repos before issuing a query. To search across all repos, remove any applied repo filters. By default, search results are limited to the repo you're currently viewing.
-[role="screenshot"]
-image::images/code-search-filter.png[]
-
-include::code-multiple-kibana-instances-config.asciidoc[]
diff --git a/docs/code/code-semantic-nav.asciidoc b/docs/code/code-semantic-nav.asciidoc
deleted file mode 100644
index a1535f1449dfe1..00000000000000
--- a/docs/code/code-semantic-nav.asciidoc
+++ /dev/null
@@ -1,28 +0,0 @@
-[[code-semantic-nav]]
-
-== Semantic code navigation
-
-You can navigate a file with semantic code navigation features if:
-
--  *Code* supports the file's <<code-install-lang-server, language>>
-- You have installed the corresponding <<code-install-lang-server, language server>>
-
-[float]
-==== Goto definition and find reference
-Hovering your cursor over a symbol in a file opens information about the symbol, including its qualified name and documentation, when available.  You can perform two actions:
-
-* *Goto Definition* navigates to the symbol definition. Definitions defined in a different repo can be found, provided that you have imported the repo with the definition.
-
-* *Find Reference* opens a panel that lists all references to the symbol.
-
-[role="screenshot"]
-image::images/code-semantic-nav.png[]
-
-[float]
-==== View symbol table
-From the *Structure* tab, you can open a symbol table that details the structure of the current class. Clicking on a member function or variable jumps to its definition.
-
-[role="screenshot"]
-image::images/code-symbol-table.png[]
-
-include::code-search.asciidoc[]
diff --git a/docs/code/index.asciidoc b/docs/code/index.asciidoc
deleted file mode 100644
index 799b356cb42c32..00000000000000
--- a/docs/code/index.asciidoc
+++ /dev/null
@@ -1,21 +0,0 @@
-[[code]]
-= Code
-
-[partintro]
---
-
-beta[]
-
-Interaction with source code is pervasive and essential for any technology company. Speed of innovation is limited by how easy it is to search, navigate, and gain insight into your source code.
-Elastic *Code* provides an easy-to-use code search solution that scales with your organization and empowers your team to understand your codebase faster than ever before.
-*Code* offers the following functions:
-
-* Find references and definitions for any object or symbol
-* Typeahead search for symbol definition, file, and repo
-* Symbol table
-* Full-text search with repo and language filters
-
-<<code-import-first-repo, Get Started>> with *Code* by importing your first repo.
---
-
-include::code-import-first-repo.asciidoc[]
diff --git a/docs/developer/core/development-modules.asciidoc b/docs/developer/core/development-modules.asciidoc
index 603c0f2952d0cb..b36be6bbb5d25b 100644
--- a/docs/developer/core/development-modules.asciidoc
+++ b/docs/developer/core/development-modules.asciidoc
@@ -13,15 +13,6 @@ To prevent this from being an issue the ui module provides "autoloading"
 modules. The sole purpose of these modules is to extend the environment with
 certain components. Here is a breakdown of those modules:
 
-- *`import 'ui/autoload/styles'`*
-    Imports all styles at the root of `src/legacy/ui/public/styles`
-
-- *`import 'ui/autoload/directives'`*
-    Imports all directives in `src/legacy/ui/public/directives`
-
-- *`import 'ui/autoload/filters'`*
-    Imports all filters in `src/legacy/ui/public/filters`
-
 - *`import 'ui/autoload/modules'`*
     Imports angular and several ui services and "components" which Kibana
     depends on without importing. The full list of imports is hard coded in the
diff --git a/docs/development/core/public/kibana-plugin-public.chromedoctitle.change.md b/docs/development/core/public/kibana-plugin-public.chromedoctitle.change.md
new file mode 100644
index 00000000000000..eba149bf93a4c2
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.chromedoctitle.change.md
@@ -0,0 +1,34 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ChromeDocTitle](./kibana-plugin-public.chromedoctitle.md) &gt; [change](./kibana-plugin-public.chromedoctitle.change.md)
+
+## ChromeDocTitle.change() method
+
+Changes the current document title.
+
+<b>Signature:</b>
+
+```typescript
+change(newTitle: string | string[]): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  newTitle | <code>string &#124; string[]</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
+## Example
+
+How to change the title of the document
+
+```ts
+chrome.docTitle.change('My application title')
+chrome.docTitle.change(['My application', 'My section'])
+
+```
+
diff --git a/docs/development/core/public/kibana-plugin-public.chromedoctitle.md b/docs/development/core/public/kibana-plugin-public.chromedoctitle.md
new file mode 100644
index 00000000000000..3c6cfab4862881
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.chromedoctitle.md
@@ -0,0 +1,39 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ChromeDocTitle](./kibana-plugin-public.chromedoctitle.md)
+
+## ChromeDocTitle interface
+
+APIs for accessing and updating the document title.
+
+<b>Signature:</b>
+
+```typescript
+export interface ChromeDocTitle 
+```
+
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [change(newTitle)](./kibana-plugin-public.chromedoctitle.change.md) | Changes the current document title. |
+|  [reset()](./kibana-plugin-public.chromedoctitle.reset.md) | Resets the document title to it's initial value. (meaning the one present in the title meta at application load.) |
+
+## Example 1
+
+How to change the title of the document
+
+```ts
+chrome.docTitle.change('My application')
+
+```
+
+## Example 2
+
+How to reset the title of the document to it's initial value
+
+```ts
+chrome.docTitle.reset()
+
+```
+
diff --git a/docs/development/core/public/kibana-plugin-public.chromedoctitle.reset.md b/docs/development/core/public/kibana-plugin-public.chromedoctitle.reset.md
new file mode 100644
index 00000000000000..4b4c6f573e0061
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.chromedoctitle.reset.md
@@ -0,0 +1,17 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ChromeDocTitle](./kibana-plugin-public.chromedoctitle.md) &gt; [reset](./kibana-plugin-public.chromedoctitle.reset.md)
+
+## ChromeDocTitle.reset() method
+
+Resets the document title to it's initial value. (meaning the one present in the title meta at application load.)
+
+<b>Signature:</b>
+
+```typescript
+reset(): void;
+```
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/core/public/kibana-plugin-public.chromestart.doctitle.md b/docs/development/core/public/kibana-plugin-public.chromestart.doctitle.md
new file mode 100644
index 00000000000000..71eda64c24646e
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.chromestart.doctitle.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ChromeStart](./kibana-plugin-public.chromestart.md) &gt; [docTitle](./kibana-plugin-public.chromestart.doctitle.md)
+
+## ChromeStart.docTitle property
+
+APIs for accessing and updating the document title.
+
+<b>Signature:</b>
+
+```typescript
+docTitle: ChromeDocTitle;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.chromestart.md b/docs/development/core/public/kibana-plugin-public.chromestart.md
index bc41aa10cce8fa..153e06d591404d 100644
--- a/docs/development/core/public/kibana-plugin-public.chromestart.md
+++ b/docs/development/core/public/kibana-plugin-public.chromestart.md
@@ -16,6 +16,7 @@ export interface ChromeStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [docTitle](./kibana-plugin-public.chromestart.doctitle.md) | <code>ChromeDocTitle</code> | APIs for accessing and updating the document title. |
 |  [navControls](./kibana-plugin-public.chromestart.navcontrols.md) | <code>ChromeNavControls</code> | [APIs](./kibana-plugin-public.chromenavcontrols.md) for registering new controls to be displayed in the navigation bar. |
 |  [navLinks](./kibana-plugin-public.chromestart.navlinks.md) | <code>ChromeNavLinks</code> | [APIs](./kibana-plugin-public.chromenavlinks.md) for manipulating nav links. |
 |  [recentlyAccessed](./kibana-plugin-public.chromestart.recentlyaccessed.md) | <code>ChromeRecentlyAccessed</code> | [APIs](./kibana-plugin-public.chromerecentlyaccessed.md) for recently accessed history. |
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.anonymouspaths.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.anonymouspaths.md
new file mode 100644
index 00000000000000..e94757c5eb031a
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpservicebase.anonymouspaths.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [anonymousPaths](./kibana-plugin-public.httpservicebase.anonymouspaths.md)
+
+## HttpServiceBase.anonymousPaths property
+
+APIs for denoting certain paths for not requiring authentication
+
+<b>Signature:</b>
+
+```typescript
+anonymousPaths: IAnonymousPaths;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.md
index a1eef3db42b7dd..9ea77c95b343eb 100644
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.md
+++ b/docs/development/core/public/kibana-plugin-public.httpservicebase.md
@@ -15,6 +15,7 @@ export interface HttpServiceBase
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [anonymousPaths](./kibana-plugin-public.httpservicebase.anonymouspaths.md) | <code>IAnonymousPaths</code> | APIs for denoting certain paths for not requiring authentication |
 |  [basePath](./kibana-plugin-public.httpservicebase.basepath.md) | <code>IBasePath</code> | APIs for manipulating the basePath on URL segments. |
 |  [delete](./kibana-plugin-public.httpservicebase.delete.md) | <code>HttpHandler</code> | Makes an HTTP request with the DELETE method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
 |  [fetch](./kibana-plugin-public.httpservicebase.fetch.md) | <code>HttpHandler</code> | Makes an HTTP request. Defaults to a GET request unless overriden. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
diff --git a/docs/development/core/public/kibana-plugin-public.ianonymouspaths.isanonymous.md b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.isanonymous.md
new file mode 100644
index 00000000000000..d6be78e1e725b2
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.isanonymous.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [IAnonymousPaths](./kibana-plugin-public.ianonymouspaths.md) &gt; [isAnonymous](./kibana-plugin-public.ianonymouspaths.isanonymous.md)
+
+## IAnonymousPaths.isAnonymous() method
+
+Determines whether the provided path doesn't require authentication. `path` should include the current basePath.
+
+<b>Signature:</b>
+
+```typescript
+isAnonymous(path: string): boolean;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  path | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`boolean`
+
diff --git a/docs/development/core/public/kibana-plugin-public.ianonymouspaths.md b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.md
new file mode 100644
index 00000000000000..1290df28780cfe
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.md
@@ -0,0 +1,21 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [IAnonymousPaths](./kibana-plugin-public.ianonymouspaths.md)
+
+## IAnonymousPaths interface
+
+APIs for denoting paths as not requiring authentication
+
+<b>Signature:</b>
+
+```typescript
+export interface IAnonymousPaths 
+```
+
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [isAnonymous(path)](./kibana-plugin-public.ianonymouspaths.isanonymous.md) | Determines whether the provided path doesn't require authentication. <code>path</code> should include the current basePath. |
+|  [register(path)](./kibana-plugin-public.ianonymouspaths.register.md) | Register <code>path</code> as not requiring authentication. <code>path</code> should not include the current basePath. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.ianonymouspaths.register.md b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.register.md
new file mode 100644
index 00000000000000..3ab9bf438aa161
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.register.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [IAnonymousPaths](./kibana-plugin-public.ianonymouspaths.md) &gt; [register](./kibana-plugin-public.ianonymouspaths.register.md)
+
+## IAnonymousPaths.register() method
+
+Register `path` as not requiring authentication. `path` should not include the current basePath.
+
+<b>Signature:</b>
+
+```typescript
+register(path: string): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  path | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/core/public/kibana-plugin-public.md b/docs/development/core/public/kibana-plugin-public.md
index e787621c3aaf96..df0b963e2b6271 100644
--- a/docs/development/core/public/kibana-plugin-public.md
+++ b/docs/development/core/public/kibana-plugin-public.md
@@ -32,6 +32,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [Capabilities](./kibana-plugin-public.capabilities.md) | The read-only set of capabilities available for the current UI session. Capabilities are simple key-value pairs of (string, boolean), where the string denotes the capability ID, and the boolean is a flag indicating if the capability is enabled or disabled. |
 |  [ChromeBadge](./kibana-plugin-public.chromebadge.md) |  |
 |  [ChromeBrand](./kibana-plugin-public.chromebrand.md) |  |
+|  [ChromeDocTitle](./kibana-plugin-public.chromedoctitle.md) | APIs for accessing and updating the document title. |
 |  [ChromeNavControl](./kibana-plugin-public.chromenavcontrol.md) |  |
 |  [ChromeNavControls](./kibana-plugin-public.chromenavcontrols.md) | [APIs](./kibana-plugin-public.chromenavcontrols.md) for registering new controls to be displayed in the navigation bar. |
 |  [ChromeNavLink](./kibana-plugin-public.chromenavlink.md) |  |
@@ -57,6 +58,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [HttpResponse](./kibana-plugin-public.httpresponse.md) |  |
 |  [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) |  |
 |  [I18nStart](./kibana-plugin-public.i18nstart.md) | I18nStart.Context is required by any localizable React component from @<!-- -->kbn/i18n and @<!-- -->elastic/eui packages and is supposed to be used as the topmost component for any i18n-compatible React tree. |
+|  [IAnonymousPaths](./kibana-plugin-public.ianonymouspaths.md) | APIs for denoting paths as not requiring authentication |
 |  [IBasePath](./kibana-plugin-public.ibasepath.md) | APIs for manipulating the basePath on URL segments. |
 |  [IContextContainer](./kibana-plugin-public.icontextcontainer.md) | An object that handles registration of context providers and configuring handlers with context. |
 |  [IHttpFetchError](./kibana-plugin-public.ihttpfetcherror.md) |  |
@@ -119,5 +121,5 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [ToastInputFields](./kibana-plugin-public.toastinputfields.md) | Allowed fields for [ToastInput](./kibana-plugin-public.toastinput.md)<!-- -->. |
 |  [ToastsSetup](./kibana-plugin-public.toastssetup.md) | [IToasts](./kibana-plugin-public.itoasts.md) |
 |  [ToastsStart](./kibana-plugin-public.toastsstart.md) | [IToasts](./kibana-plugin-public.itoasts.md) |
-|  [UiSettingsClientContract](./kibana-plugin-public.uisettingsclientcontract.md) | [UiSettingsClient](./kibana-plugin-public.uisettingsclient.md) |
+|  [UiSettingsClientContract](./kibana-plugin-public.uisettingsclientcontract.md) | Client-side client that provides access to the advanced settings stored in elasticsearch. The settings provide control over the behavior of the Kibana application. For example, a user can specify how to display numeric or date fields. Users can adjust the settings via Management UI. [UiSettingsClient](./kibana-plugin-public.uisettingsclient.md) |
 
diff --git a/docs/development/core/public/kibana-plugin-public.uisettingsclient.getall.md b/docs/development/core/public/kibana-plugin-public.uisettingsclient.getall.md
index 5eaf06e7dd6820..06daf8e8151cd3 100644
--- a/docs/development/core/public/kibana-plugin-public.uisettingsclient.getall.md
+++ b/docs/development/core/public/kibana-plugin-public.uisettingsclient.getall.md
@@ -9,9 +9,9 @@ Gets the metadata about all uiSettings, including the type, default value, and u
 <b>Signature:</b>
 
 ```typescript
-getAll(): UiSettingsState;
+getAll(): Record<string, UiSettingsParams & UserProvidedValues<any>>;
 ```
 <b>Returns:</b>
 
-`UiSettingsState`
+`Record<string, UiSettingsParams & UserProvidedValues<any>>`
 
diff --git a/docs/development/core/public/kibana-plugin-public.uisettingsclientcontract.md b/docs/development/core/public/kibana-plugin-public.uisettingsclientcontract.md
index 6eda1fd3274c60..7173386d882652 100644
--- a/docs/development/core/public/kibana-plugin-public.uisettingsclientcontract.md
+++ b/docs/development/core/public/kibana-plugin-public.uisettingsclientcontract.md
@@ -4,7 +4,7 @@
 
 ## UiSettingsClientContract type
 
-[UiSettingsClient](./kibana-plugin-public.uisettingsclient.md)
+Client-side client that provides access to the advanced settings stored in elasticsearch. The settings provide control over the behavior of the Kibana application. For example, a user can specify how to display numeric or date fields. Users can adjust the settings via Management UI. [UiSettingsClient](./kibana-plugin-public.uisettingsclient.md)
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.coresetup.md b/docs/development/core/server/kibana-plugin-server.coresetup.md
index a6dda69fd154ef..c51459bc41a434 100644
--- a/docs/development/core/server/kibana-plugin-server.coresetup.md
+++ b/docs/development/core/server/kibana-plugin-server.coresetup.md
@@ -19,4 +19,5 @@ export interface CoreSetup
 |  [context](./kibana-plugin-server.coresetup.context.md) | <code>ContextSetup</code> | [ContextSetup](./kibana-plugin-server.contextsetup.md) |
 |  [elasticsearch](./kibana-plugin-server.coresetup.elasticsearch.md) | <code>ElasticsearchServiceSetup</code> | [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) |
 |  [http](./kibana-plugin-server.coresetup.http.md) | <code>HttpServiceSetup</code> | [HttpServiceSetup](./kibana-plugin-server.httpservicesetup.md) |
+|  [uiSettings](./kibana-plugin-server.coresetup.uisettings.md) | <code>UiSettingsServiceSetup</code> | [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md) |
 
diff --git a/docs/development/core/server/kibana-plugin-server.coresetup.uisettings.md b/docs/development/core/server/kibana-plugin-server.coresetup.uisettings.md
new file mode 100644
index 00000000000000..54120d7c3fa8da
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.coresetup.uisettings.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CoreSetup](./kibana-plugin-server.coresetup.md) &gt; [uiSettings](./kibana-plugin-server.coresetup.uisettings.md)
+
+## CoreSetup.uiSettings property
+
+[UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md)
+
+<b>Signature:</b>
+
+```typescript
+uiSettings: UiSettingsServiceSetup;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getdefaults.md b/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getdefaults.md
deleted file mode 100644
index 29faa6d945b43c..00000000000000
--- a/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getdefaults.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [IUiSettingsClient](./kibana-plugin-server.iuisettingsclient.md) &gt; [getDefaults](./kibana-plugin-server.iuisettingsclient.getdefaults.md)
-
-## IUiSettingsClient.getDefaults property
-
-Returns uiSettings default values [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md)
-
-<b>Signature:</b>
-
-```typescript
-getDefaults: () => Record<string, UiSettingsParams>;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getregistered.md b/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getregistered.md
new file mode 100644
index 00000000000000..16ae4c3dd8b364
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getregistered.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [IUiSettingsClient](./kibana-plugin-server.iuisettingsclient.md) &gt; [getRegistered](./kibana-plugin-server.iuisettingsclient.getregistered.md)
+
+## IUiSettingsClient.getRegistered property
+
+Returns registered uiSettings values [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md)
+
+<b>Signature:</b>
+
+```typescript
+getRegistered: () => Readonly<Record<string, UiSettingsParams>>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getuserprovided.md b/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getuserprovided.md
index 9a449b64ed5d03..134039cfa91f3f 100644
--- a/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getuserprovided.md
+++ b/docs/development/core/server/kibana-plugin-server.iuisettingsclient.getuserprovided.md
@@ -9,8 +9,5 @@ Retrieves a set of all uiSettings values set by the user.
 <b>Signature:</b>
 
 ```typescript
-getUserProvided: <T extends SavedObjectAttribute = any>() => Promise<Record<string, {
-        userValue?: T;
-        isOverridden?: boolean;
-    }>>;
+getUserProvided: <T extends SavedObjectAttribute = any>() => Promise<Record<string, UserProvidedValues<T>>>;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md b/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md
index 142f33d27c3850..a4697ddbbb85ed 100644
--- a/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md
+++ b/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md
@@ -4,7 +4,7 @@
 
 ## IUiSettingsClient interface
 
-Service that provides access to the UiSettings stored in elasticsearch.
+Server-side client that provides access to the advanced settings stored in elasticsearch. The settings provide control over the behavior of the Kibana application. For example, a user can specify how to display numeric or date fields. Users can adjust the settings via Management UI.
 
 <b>Signature:</b>
 
@@ -18,8 +18,8 @@ export interface IUiSettingsClient
 |  --- | --- | --- |
 |  [get](./kibana-plugin-server.iuisettingsclient.get.md) | <code>&lt;T extends SavedObjectAttribute = any&gt;(key: string) =&gt; Promise&lt;T&gt;</code> | Retrieves uiSettings values set by the user with fallbacks to default values if not specified. |
 |  [getAll](./kibana-plugin-server.iuisettingsclient.getall.md) | <code>&lt;T extends SavedObjectAttribute = any&gt;() =&gt; Promise&lt;Record&lt;string, T&gt;&gt;</code> | Retrieves a set of all uiSettings values set by the user with fallbacks to default values if not specified. |
-|  [getDefaults](./kibana-plugin-server.iuisettingsclient.getdefaults.md) | <code>() =&gt; Record&lt;string, UiSettingsParams&gt;</code> | Returns uiSettings default values [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) |
-|  [getUserProvided](./kibana-plugin-server.iuisettingsclient.getuserprovided.md) | <code>&lt;T extends SavedObjectAttribute = any&gt;() =&gt; Promise&lt;Record&lt;string, {</code><br/><code>        userValue?: T;</code><br/><code>        isOverridden?: boolean;</code><br/><code>    }&gt;&gt;</code> | Retrieves a set of all uiSettings values set by the user. |
+|  [getRegistered](./kibana-plugin-server.iuisettingsclient.getregistered.md) | <code>() =&gt; Readonly&lt;Record&lt;string, UiSettingsParams&gt;&gt;</code> | Returns registered uiSettings values [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) |
+|  [getUserProvided](./kibana-plugin-server.iuisettingsclient.getuserprovided.md) | <code>&lt;T extends SavedObjectAttribute = any&gt;() =&gt; Promise&lt;Record&lt;string, UserProvidedValues&lt;T&gt;&gt;&gt;</code> | Retrieves a set of all uiSettings values set by the user. |
 |  [isOverridden](./kibana-plugin-server.iuisettingsclient.isoverridden.md) | <code>(key: string) =&gt; boolean</code> | Shows whether the uiSettings value set by the user. |
 |  [remove](./kibana-plugin-server.iuisettingsclient.remove.md) | <code>(key: string) =&gt; Promise&lt;void&gt;</code> | Removes uiSettings value by key. |
 |  [removeMany](./kibana-plugin-server.iuisettingsclient.removemany.md) | <code>(keys: string[]) =&gt; Promise&lt;void&gt;</code> | Removes multiple uiSettings values by keys. |
diff --git a/docs/development/core/server/kibana-plugin-server.md b/docs/development/core/server/kibana-plugin-server.md
index 2f81afacf4bb46..9907750b8742f0 100644
--- a/docs/development/core/server/kibana-plugin-server.md
+++ b/docs/development/core/server/kibana-plugin-server.md
@@ -63,7 +63,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [IKibanaSocket](./kibana-plugin-server.ikibanasocket.md) | A tiny abstraction for TCP socket. |
 |  [IndexSettingsDeprecationInfo](./kibana-plugin-server.indexsettingsdeprecationinfo.md) |  |
 |  [IRouter](./kibana-plugin-server.irouter.md) | Registers route handlers for specified resource path and method. See [RouteConfig](./kibana-plugin-server.routeconfig.md) and [RequestHandler](./kibana-plugin-server.requesthandler.md) for more information about arguments to route registrations. |
-|  [IUiSettingsClient](./kibana-plugin-server.iuisettingsclient.md) | Service that provides access to the UiSettings stored in elasticsearch. |
+|  [IUiSettingsClient](./kibana-plugin-server.iuisettingsclient.md) | Server-side client that provides access to the advanced settings stored in elasticsearch. The settings provide control over the behavior of the Kibana application. For example, a user can specify how to display numeric or date fields. Users can adjust the settings via Management UI. |
 |  [KibanaRequestRoute](./kibana-plugin-server.kibanarequestroute.md) | Request specific route information exposed to a handler. |
 |  [LegacyRequest](./kibana-plugin-server.legacyrequest.md) |  |
 |  [LegacyServiceSetupDeps](./kibana-plugin-server.legacyservicesetupdeps.md) |  |
@@ -90,10 +90,12 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsBulkGetObject](./kibana-plugin-server.savedobjectsbulkgetobject.md) |  |
 |  [SavedObjectsBulkResponse](./kibana-plugin-server.savedobjectsbulkresponse.md) |  |
 |  [SavedObjectsBulkUpdateObject](./kibana-plugin-server.savedobjectsbulkupdateobject.md) |  |
+|  [SavedObjectsBulkUpdateOptions](./kibana-plugin-server.savedobjectsbulkupdateoptions.md) |  |
 |  [SavedObjectsBulkUpdateResponse](./kibana-plugin-server.savedobjectsbulkupdateresponse.md) |  |
 |  [SavedObjectsClientProviderOptions](./kibana-plugin-server.savedobjectsclientprovideroptions.md) | Options to control the creation of the Saved Objects Client. |
 |  [SavedObjectsClientWrapperOptions](./kibana-plugin-server.savedobjectsclientwrapperoptions.md) | Options passed to each SavedObjectsClientWrapperFactory to aid in creating the wrapper instance. |
 |  [SavedObjectsCreateOptions](./kibana-plugin-server.savedobjectscreateoptions.md) |  |
+|  [SavedObjectsDeleteOptions](./kibana-plugin-server.savedobjectsdeleteoptions.md) |  |
 |  [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md) | Options controlling the export operation. |
 |  [SavedObjectsExportResultDetails](./kibana-plugin-server.savedobjectsexportresultdetails.md) | Structure of the export result details entry |
 |  [SavedObjectsFindOptions](./kibana-plugin-server.savedobjectsfindoptions.md) |  |
@@ -116,6 +118,8 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SessionStorageCookieOptions](./kibana-plugin-server.sessionstoragecookieoptions.md) | Configuration used to create HTTP session storage based on top of cookie mechanism. |
 |  [SessionStorageFactory](./kibana-plugin-server.sessionstoragefactory.md) | SessionStorage factory to bind one to an incoming request |
 |  [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) | UiSettings parameters defined by the plugins. |
+|  [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md) |  |
+|  [UserProvidedValues](./kibana-plugin-server.userprovidedvalues.md) | Describes the values explicitly set by user. |
 
 ## Variables
 
@@ -149,6 +153,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [LifecycleResponseFactory](./kibana-plugin-server.lifecycleresponsefactory.md) | Creates an object containing redirection or error response with error details, HTTP headers, and other data transmitted to the client. |
 |  [MIGRATION\_ASSISTANCE\_INDEX\_ACTION](./kibana-plugin-server.migration_assistance_index_action.md) |  |
 |  [MIGRATION\_DEPRECATION\_LEVEL](./kibana-plugin-server.migration_deprecation_level.md) |  |
+|  [MutatingOperationRefreshSetting](./kibana-plugin-server.mutatingoperationrefreshsetting.md) | Elasticsearch Refresh setting for mutating operation |
 |  [OnPostAuthHandler](./kibana-plugin-server.onpostauthhandler.md) | See [OnPostAuthToolkit](./kibana-plugin-server.onpostauthtoolkit.md)<!-- -->. |
 |  [OnPreAuthHandler](./kibana-plugin-server.onpreauthhandler.md) | See [OnPreAuthToolkit](./kibana-plugin-server.onpreauthtoolkit.md)<!-- -->. |
 |  [PluginInitializer](./kibana-plugin-server.plugininitializer.md) | The <code>plugin</code> export at the root of a plugin's <code>server</code> directory should conform to this interface. |
diff --git a/docs/development/core/server/kibana-plugin-server.mutatingoperationrefreshsetting.md b/docs/development/core/server/kibana-plugin-server.mutatingoperationrefreshsetting.md
new file mode 100644
index 00000000000000..94c8fa8c22ef62
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.mutatingoperationrefreshsetting.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [MutatingOperationRefreshSetting](./kibana-plugin-server.mutatingoperationrefreshsetting.md)
+
+## MutatingOperationRefreshSetting type
+
+Elasticsearch Refresh setting for mutating operation
+
+<b>Signature:</b>
+
+```typescript
+export declare type MutatingOperationRefreshSetting = boolean | 'wait_for';
+```
diff --git a/docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md b/docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md
index e1ea358320b9a6..2d8b27ecb6c670 100644
--- a/docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md
+++ b/docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md
@@ -15,5 +15,8 @@ core: {
             dataClient: IScopedClusterClient;
             adminClient: IScopedClusterClient;
         };
+        uiSettings: {
+            client: IUiSettingsClient;
+        };
     };
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md b/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md
index 37a40f98adef3b..c9fc80596efa9d 100644
--- a/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md
+++ b/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md
@@ -18,5 +18,5 @@ export interface RequestHandlerContext
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [core](./kibana-plugin-server.requesthandlercontext.core.md) | <code>{</code><br/><code>        savedObjects: {</code><br/><code>            client: SavedObjectsClientContract;</code><br/><code>        };</code><br/><code>        elasticsearch: {</code><br/><code>            dataClient: IScopedClusterClient;</code><br/><code>            adminClient: IScopedClusterClient;</code><br/><code>        };</code><br/><code>    }</code> |  |
+|  [core](./kibana-plugin-server.requesthandlercontext.core.md) | <code>{</code><br/><code>        savedObjects: {</code><br/><code>            client: SavedObjectsClientContract;</code><br/><code>        };</code><br/><code>        elasticsearch: {</code><br/><code>            dataClient: IScopedClusterClient;</code><br/><code>            adminClient: IScopedClusterClient;</code><br/><code>        };</code><br/><code>        uiSettings: {</code><br/><code>            client: IUiSettingsClient;</code><br/><code>        };</code><br/><code>    }</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.md
new file mode 100644
index 00000000000000..920a6ca224df49
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsBulkUpdateOptions](./kibana-plugin-server.savedobjectsbulkupdateoptions.md)
+
+## SavedObjectsBulkUpdateOptions interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsBulkUpdateOptions extends SavedObjectsBaseOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [refresh](./kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md) | <code>MutatingOperationRefreshSetting</code> | The Elasticsearch Refresh setting for this operation |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md
new file mode 100644
index 00000000000000..35e9e6483da10e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsBulkUpdateOptions](./kibana-plugin-server.savedobjectsbulkupdateoptions.md) &gt; [refresh](./kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md)
+
+## SavedObjectsBulkUpdateOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+<b>Signature:</b>
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.bulkupdate.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.bulkupdate.md
index 107e71959f7062..30db524ffa02c8 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.bulkupdate.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.bulkupdate.md
@@ -9,7 +9,7 @@ Bulk Updates multiple SavedObject at once
 <b>Signature:</b>
 
 ```typescript
-bulkUpdate<T extends SavedObjectAttributes = any>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBaseOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
+bulkUpdate<T extends SavedObjectAttributes = any>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ bulkUpdate<T extends SavedObjectAttributes = any>(objects: Array<SavedObjectsBul
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  objects | <code>Array&lt;SavedObjectsBulkUpdateObject&lt;T&gt;&gt;</code> |  |
-|  options | <code>SavedObjectsBaseOptions</code> |  |
+|  options | <code>SavedObjectsBulkUpdateOptions</code> |  |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.delete.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.delete.md
index 657f56d591e772..c20c7e886490a4 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.delete.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.delete.md
@@ -9,7 +9,7 @@ Deletes a SavedObject
 <b>Signature:</b>
 
 ```typescript
-delete(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<{}>;
+delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
 ```
 
 ## Parameters
@@ -18,7 +18,7 @@ delete(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<{}>
 |  --- | --- | --- |
 |  type | <code>string</code> |  |
 |  id | <code>string</code> |  |
-|  options | <code>SavedObjectsBaseOptions</code> |  |
+|  options | <code>SavedObjectsDeleteOptions</code> |  |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.md
index 16549e420ac01e..e4ad6360569152 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.md
@@ -19,4 +19,5 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions
 |  [migrationVersion](./kibana-plugin-server.savedobjectscreateoptions.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
 |  [overwrite](./kibana-plugin-server.savedobjectscreateoptions.overwrite.md) | <code>boolean</code> | Overwrite existing documents (defaults to false) |
 |  [references](./kibana-plugin-server.savedobjectscreateoptions.references.md) | <code>SavedObjectReference[]</code> |  |
+|  [refresh](./kibana-plugin-server.savedobjectscreateoptions.refresh.md) | <code>MutatingOperationRefreshSetting</code> | The Elasticsearch Refresh setting for this operation |
 
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.refresh.md
new file mode 100644
index 00000000000000..785874a12c8c45
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.refresh.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsCreateOptions](./kibana-plugin-server.savedobjectscreateoptions.md) &gt; [refresh](./kibana-plugin-server.savedobjectscreateoptions.refresh.md)
+
+## SavedObjectsCreateOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+<b>Signature:</b>
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.md
new file mode 100644
index 00000000000000..2c641ba5cc8d8e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsDeleteOptions](./kibana-plugin-server.savedobjectsdeleteoptions.md)
+
+## SavedObjectsDeleteOptions interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsDeleteOptions extends SavedObjectsBaseOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [refresh](./kibana-plugin-server.savedobjectsdeleteoptions.refresh.md) | <code>MutatingOperationRefreshSetting</code> | The Elasticsearch Refresh setting for this operation |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.refresh.md
new file mode 100644
index 00000000000000..782c52956f2976
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.refresh.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsDeleteOptions](./kibana-plugin-server.savedobjectsdeleteoptions.md) &gt; [refresh](./kibana-plugin-server.savedobjectsdeleteoptions.refresh.md)
+
+## SavedObjectsDeleteOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+<b>Signature:</b>
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.md
index 7fcd362e937a01..49e8946ad28269 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.md
@@ -16,5 +16,6 @@ export interface SavedObjectsUpdateOptions extends SavedObjectsBaseOptions
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [references](./kibana-plugin-server.savedobjectsupdateoptions.references.md) | <code>SavedObjectReference[]</code> | A reference to another saved object. |
+|  [refresh](./kibana-plugin-server.savedobjectsupdateoptions.refresh.md) | <code>MutatingOperationRefreshSetting</code> | The Elasticsearch Refresh setting for this operation |
 |  [version](./kibana-plugin-server.savedobjectsupdateoptions.version.md) | <code>string</code> | An opaque version number which changes on each successful write operation. Can be used for implementing optimistic concurrency control. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.refresh.md
new file mode 100644
index 00000000000000..bb1142c2420120
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.refresh.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [SavedObjectsUpdateOptions](./kibana-plugin-server.savedobjectsupdateoptions.md) &gt; [refresh](./kibana-plugin-server.savedobjectsupdateoptions.refresh.md)
+
+## SavedObjectsUpdateOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+<b>Signature:</b>
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsparams.category.md b/docs/development/core/server/kibana-plugin-server.uisettingsparams.category.md
index 47aedbfbf28106..6bf1b17dc947a4 100644
--- a/docs/development/core/server/kibana-plugin-server.uisettingsparams.category.md
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsparams.category.md
@@ -9,5 +9,5 @@ used to group the configured setting in the UI
 <b>Signature:</b>
 
 ```typescript
-category: string[];
+category?: string[];
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsparams.description.md b/docs/development/core/server/kibana-plugin-server.uisettingsparams.description.md
index 8d8887285ae2e2..6a203629f5425c 100644
--- a/docs/development/core/server/kibana-plugin-server.uisettingsparams.description.md
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsparams.description.md
@@ -9,5 +9,5 @@ description provided to a user in UI
 <b>Signature:</b>
 
 ```typescript
-description: string;
+description?: string;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsparams.md b/docs/development/core/server/kibana-plugin-server.uisettingsparams.md
index 275111c05eff92..a38499e8f37dda 100644
--- a/docs/development/core/server/kibana-plugin-server.uisettingsparams.md
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsparams.md
@@ -20,7 +20,7 @@ export interface UiSettingsParams
 |  [description](./kibana-plugin-server.uisettingsparams.description.md) | <code>string</code> | description provided to a user in UI |
 |  [name](./kibana-plugin-server.uisettingsparams.name.md) | <code>string</code> | title in the UI |
 |  [optionLabels](./kibana-plugin-server.uisettingsparams.optionlabels.md) | <code>Record&lt;string, string&gt;</code> | text labels for 'select' type UI element |
-|  [options](./kibana-plugin-server.uisettingsparams.options.md) | <code>string[]</code> | a range of valid values |
+|  [options](./kibana-plugin-server.uisettingsparams.options.md) | <code>string[]</code> | array of permitted values for this setting |
 |  [readonly](./kibana-plugin-server.uisettingsparams.readonly.md) | <code>boolean</code> | a flag indicating that value cannot be changed |
 |  [requiresPageReload](./kibana-plugin-server.uisettingsparams.requirespagereload.md) | <code>boolean</code> | a flag indicating whether new value applying requires page reloading |
 |  [type](./kibana-plugin-server.uisettingsparams.type.md) | <code>UiSettingsType</code> | defines a type of UI element [UiSettingsType](./kibana-plugin-server.uisettingstype.md) |
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsparams.name.md b/docs/development/core/server/kibana-plugin-server.uisettingsparams.name.md
index 2b414eefffed2b..07905ca7de20af 100644
--- a/docs/development/core/server/kibana-plugin-server.uisettingsparams.name.md
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsparams.name.md
@@ -9,5 +9,5 @@ title in the UI
 <b>Signature:</b>
 
 ```typescript
-name: string;
+name?: string;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsparams.options.md b/docs/development/core/server/kibana-plugin-server.uisettingsparams.options.md
index 71eecdfabc4a0c..2220feab74ffde 100644
--- a/docs/development/core/server/kibana-plugin-server.uisettingsparams.options.md
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsparams.options.md
@@ -4,7 +4,7 @@
 
 ## UiSettingsParams.options property
 
-a range of valid values
+array of permitted values for this setting
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsparams.value.md b/docs/development/core/server/kibana-plugin-server.uisettingsparams.value.md
index 455756899ecfca..397498ccf5c111 100644
--- a/docs/development/core/server/kibana-plugin-server.uisettingsparams.value.md
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsparams.value.md
@@ -9,5 +9,5 @@ default value to fall back to if a user doesn't provide any
 <b>Signature:</b>
 
 ```typescript
-value: SavedObjectAttribute;
+value?: SavedObjectAttribute;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.md b/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.md
new file mode 100644
index 00000000000000..8dde78f633d883
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.md
@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md)
+
+## UiSettingsServiceSetup interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface UiSettingsServiceSetup 
+```
+
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [register(settings)](./kibana-plugin-server.uisettingsservicesetup.register.md) | Sets settings with default values for the uiSettings. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.register.md b/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.register.md
new file mode 100644
index 00000000000000..8091a7cec44aaf
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.register.md
@@ -0,0 +1,28 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md) &gt; [register](./kibana-plugin-server.uisettingsservicesetup.register.md)
+
+## UiSettingsServiceSetup.register() method
+
+Sets settings with default values for the uiSettings.
+
+<b>Signature:</b>
+
+```typescript
+register(settings: Record<string, UiSettingsParams>): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  settings | <code>Record&lt;string, UiSettingsParams&gt;</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
+## Example
+
+setup(core: CoreSetup)<!-- -->{ core.uiSettings.register(\[{ foo: { name: i18n.translate('my foo settings'), value: true, description: 'add some awesomeness', }<!-- -->, }<!-- -->\]); }
+
diff --git a/docs/development/core/server/kibana-plugin-server.userprovidedvalues.isoverridden.md b/docs/development/core/server/kibana-plugin-server.userprovidedvalues.isoverridden.md
new file mode 100644
index 00000000000000..01e04b490595d5
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.userprovidedvalues.isoverridden.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UserProvidedValues](./kibana-plugin-server.userprovidedvalues.md) &gt; [isOverridden](./kibana-plugin-server.userprovidedvalues.isoverridden.md)
+
+## UserProvidedValues.isOverridden property
+
+<b>Signature:</b>
+
+```typescript
+isOverridden?: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.userprovidedvalues.md b/docs/development/core/server/kibana-plugin-server.userprovidedvalues.md
new file mode 100644
index 00000000000000..7b2114404d7f2e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.userprovidedvalues.md
@@ -0,0 +1,21 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UserProvidedValues](./kibana-plugin-server.userprovidedvalues.md)
+
+## UserProvidedValues interface
+
+Describes the values explicitly set by user.
+
+<b>Signature:</b>
+
+```typescript
+export interface UserProvidedValues<T extends SavedObjectAttribute = any> 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [isOverridden](./kibana-plugin-server.userprovidedvalues.isoverridden.md) | <code>boolean</code> |  |
+|  [userValue](./kibana-plugin-server.userprovidedvalues.uservalue.md) | <code>T</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.userprovidedvalues.uservalue.md b/docs/development/core/server/kibana-plugin-server.userprovidedvalues.uservalue.md
new file mode 100644
index 00000000000000..59d25651b7697d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.userprovidedvalues.uservalue.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UserProvidedValues](./kibana-plugin-server.userprovidedvalues.md) &gt; [userValue](./kibana-plugin-server.userprovidedvalues.uservalue.md)
+
+## UserProvidedValues.userValue property
+
+<b>Signature:</b>
+
+```typescript
+userValue?: T;
+```
diff --git a/docs/discover/kuery.asciidoc b/docs/discover/kuery.asciidoc
index a87b8d5a78604b..abf3e05fb78198 100644
--- a/docs/discover/kuery.asciidoc
+++ b/docs/discover/kuery.asciidoc
@@ -73,3 +73,87 @@ set these terms will be matched against all fields. For example, a query for `re
 in the response field, but a query for just `200` will search for 200 across all fields in your index.
 ============
 
+===== Nested Field Support
+
+KQL supports querying on {ref}/nested.html[nested fields] through a special syntax. You can query nested fields in subtly different
+ways, depending on the results you want, so crafting nested queries requires extra thought.
+ 
+One main consideration is how to match parts of the nested query to the individual nested documents.
+There are two main approaches to take:
+
+* *Parts of the query may only match a single nested document.* This is what most users want when querying on a nested field.
+* *Parts of the query can match different nested documents.* This is how a regular object field works. 
+ Although generally less useful, there might be occasions where you want to query a nested field in this way.
+
+Let's take a look at the first approach. In the following document, `items` is a nested field:
+
+[source,json]
+----------------------------------
+{
+  "grocery_name": "Elastic Eats",
+  "items": [
+    {
+      "name": "banana",
+      "stock": "12",
+      "category": "fruit"
+    },
+    {
+      "name": "peach",
+      "stock": "10",
+      "category": "fruit"
+    },
+    {
+      "name": "carrot",
+      "stock": "9",
+      "category": "vegetable"
+    },
+    {
+      "name": "broccoli",
+      "stock": "5",
+      "category": "vegetable"
+    }
+  ]
+}
+----------------------------------
+
+To find stores that have more than 10 bananas in stock, you would write a query like this:
+
+`items:{ name:banana and stock > 10 }`
+
+`items` is the "nested path". Everything inside the curly braces (the "nested group") must match a single document. 
+For example, `items:{ name:banana and stock:9 }` does not match because there isn't a single nested document that 
+matches the entire query in the nested group. 
+
+What if you want to find a store with more than 10 bananas that *also* stocks vegetables? This is the second way of querying a nested field, and you can do it like this:
+
+`items:{ name:banana and stock > 10 } and items:{ category:vegetable }`
+
+The first nested group (`name:banana and stock > 10`) must still match a single document, but the `category:vegetables`
+subquery can match a different nested document because it is in a separate group.
+
+KQL's syntax also supports nested fields inside of other nested fields&mdash;you simply have to specify the full path. Suppose you
+have a document where `level1` and `level2` are both nested fields:
+
+[source,json]
+----------------------------------
+{
+  "level1": [
+    {
+      "level2": [
+        {
+          "prop1": "foo",
+          "prop2": "bar"
+        },
+        {
+          "prop1": "baz",
+          "prop2": "qux"
+        }
+      ]
+    }
+  ]
+}
+----------------------------------
+
+You can match on a single nested document by specifying the full path:
+
+`level1.level2:{ prop1:foo and prop2:bar }`
diff --git a/docs/getting-started/tutorial-full-experience.asciidoc b/docs/getting-started/tutorial-full-experience.asciidoc
index 08f65b0a240911..eafbb7d8f7c918 100644
--- a/docs/getting-started/tutorial-full-experience.asciidoc
+++ b/docs/getting-started/tutorial-full-experience.asciidoc
@@ -183,7 +183,7 @@ At this point, you're ready to use the Elasticsearch {ref}/docs-bulk.html[bulk]
 API to load the data sets:
 
 [source,shell]
-curl -u elastic -H 'Content-Type: application/x-ndjson' -XPOST '<host>:<port>/bank/account/_bulk?pretty' --data-binary @accounts.json
+curl -u elastic -H 'Content-Type: application/x-ndjson' -XPOST '<host>:<port>/bank/_bulk?pretty' --data-binary @accounts.json
 curl -u elastic -H 'Content-Type: application/x-ndjson' -XPOST '<host>:<port>/shakespeare/_bulk?pretty' --data-binary @shakespeare.json
 curl -u elastic -H 'Content-Type: application/x-ndjson' -XPOST '<host>:<port>/_bulk?pretty' --data-binary @logs.jsonl
 
diff --git a/docs/images/canvas-create-URL.gif b/docs/images/canvas-create-URL.gif
new file mode 100644
index 00000000000000..c7dfab28c681e6
Binary files /dev/null and b/docs/images/canvas-create-URL.gif differ
diff --git a/docs/images/canvas-embed_workpad.gif b/docs/images/canvas-embed_workpad.gif
new file mode 100644
index 00000000000000..0ffbdeab2862d6
Binary files /dev/null and b/docs/images/canvas-embed_workpad.gif differ
diff --git a/docs/images/canvas-export-workpad.png b/docs/images/canvas-export-workpad.png
index 687c8a121b65ad..fa910daf948d76 100644
Binary files a/docs/images/canvas-export-workpad.png and b/docs/images/canvas-export-workpad.png differ
diff --git a/docs/images/canvas-generate-pdf.gif b/docs/images/canvas-generate-pdf.gif
index 6d60f948de77a5..a51e04cb623a6b 100644
Binary files a/docs/images/canvas-generate-pdf.gif and b/docs/images/canvas-generate-pdf.gif differ
diff --git a/docs/images/canvas_share_autoplay_480.gif b/docs/images/canvas_share_autoplay_480.gif
new file mode 100644
index 00000000000000..da6d8c74dd5ca9
Binary files /dev/null and b/docs/images/canvas_share_autoplay_480.gif differ
diff --git a/docs/images/canvas_share_hidetoolbar_480.gif b/docs/images/canvas_share_hidetoolbar_480.gif
new file mode 100644
index 00000000000000..6206714aa28048
Binary files /dev/null and b/docs/images/canvas_share_hidetoolbar_480.gif differ
diff --git a/docs/images/code-blame.png b/docs/images/code-blame.png
deleted file mode 100644
index c04e1b12c58f58..00000000000000
Binary files a/docs/images/code-blame.png and /dev/null differ
diff --git a/docs/images/code-full-text-search.png b/docs/images/code-full-text-search.png
deleted file mode 100644
index 4d4d3d21a24f6f..00000000000000
Binary files a/docs/images/code-full-text-search.png and /dev/null differ
diff --git a/docs/images/code-history.png b/docs/images/code-history.png
deleted file mode 100644
index 853fcc8fa6adcb..00000000000000
Binary files a/docs/images/code-history.png and /dev/null differ
diff --git a/docs/images/code-import-repo.png b/docs/images/code-import-repo.png
deleted file mode 100644
index adc60614c10077..00000000000000
Binary files a/docs/images/code-import-repo.png and /dev/null differ
diff --git a/docs/images/code-lang-server-status.png b/docs/images/code-lang-server-status.png
deleted file mode 100644
index 3143a876f1c759..00000000000000
Binary files a/docs/images/code-lang-server-status.png and /dev/null differ
diff --git a/docs/images/code-lang-server-tab.png b/docs/images/code-lang-server-tab.png
deleted file mode 100644
index b25573f30d40ba..00000000000000
Binary files a/docs/images/code-lang-server-tab.png and /dev/null differ
diff --git a/docs/images/code-quick-search.png b/docs/images/code-quick-search.png
deleted file mode 100644
index e6274b77dcbaa9..00000000000000
Binary files a/docs/images/code-quick-search.png and /dev/null differ
diff --git a/docs/images/code-repo-management.png b/docs/images/code-repo-management.png
deleted file mode 100644
index 6e3fe5476b3be9..00000000000000
Binary files a/docs/images/code-repo-management.png and /dev/null differ
diff --git a/docs/images/code-search-filter.png b/docs/images/code-search-filter.png
deleted file mode 100644
index f9b09ad2d71ec6..00000000000000
Binary files a/docs/images/code-search-filter.png and /dev/null differ
diff --git a/docs/images/code-semantic-nav.png b/docs/images/code-semantic-nav.png
deleted file mode 100644
index 664225804ce221..00000000000000
Binary files a/docs/images/code-semantic-nav.png and /dev/null differ
diff --git a/docs/images/code-starter-root.png b/docs/images/code-starter-root.png
deleted file mode 100644
index a2e3a579fe2f26..00000000000000
Binary files a/docs/images/code-starter-root.png and /dev/null differ
diff --git a/docs/images/code-symbol-table.png b/docs/images/code-symbol-table.png
deleted file mode 100644
index d3bb4c6eef0c1b..00000000000000
Binary files a/docs/images/code-symbol-table.png and /dev/null differ
diff --git a/docs/infrastructure/getting-started.asciidoc b/docs/infrastructure/getting-started.asciidoc
index 151a8e2928cf8f..7122ad5c19f752 100644
--- a/docs/infrastructure/getting-started.asciidoc
+++ b/docs/infrastructure/getting-started.asciidoc
@@ -1,11 +1,11 @@
 [role="xpack"]
 [[xpack-metrics-getting-started]]
-== Getting started with infrastructure monitoring
+== Getting started with metrics
 
 To get started with the Metrics app in Kibana, you need to start collecting metrics data for your infrastructure.
 
 Kibana provides step-by-step instructions to help you add metrics data.
-The {infra-guide}[Infrastructure Monitoring Guide] is a good source for more detailed information and instructions.
+The {metrics-guide}[Metrics Monitoring Guide] is a good source for more detailed information and instructions.
 
 [role="screenshot"]
-image::infrastructure/images/metrics-add-data.png[Screenshot showing Add metric data to Kibana UI]
+image::infrastructure/images/metrics-add-data.png[Screenshot showing Add metric data to Kibana]
diff --git a/docs/infrastructure/index.asciidoc b/docs/infrastructure/index.asciidoc
index 17361ef6a6080d..5e2d0f3e757b09 100644
--- a/docs/infrastructure/index.asciidoc
+++ b/docs/infrastructure/index.asciidoc
@@ -4,13 +4,13 @@
 
 [partintro]
 --
-The Metrics app enables you to monitor your infrastructure and identify problems in real time.
+The Metrics app enables you to monitor your infrastructure metrics and identify problems in real time.
 You start with a visual summary of your infrastructure where you can view basic metrics for common servers, containers, and services.
 Then you can drill down to view more detailed metrics or other information for that component.
 
 You can:
 
-* View an inventory of your infrastructure by hosts, Kubernetes pod or Docker containers.
+* View your infrastructure metrics by hosts, Kubernetes pods or Docker containers.
 You can group and filter the data in various ways to help you identify the items that interest you.
 
 * View current and historic values for metrics such as CPU usage, memory usage, and network traffic for each component.
diff --git a/docs/infrastructure/infra-ui.asciidoc b/docs/infrastructure/infra-ui.asciidoc
index 5c8c50a978d63d..120a22541717cd 100644
--- a/docs/infrastructure/infra-ui.asciidoc
+++ b/docs/infrastructure/infra-ui.asciidoc
@@ -2,12 +2,12 @@
 [[infra-ui]]
 == Using the Metrics app
 
-Use the Metrics app in {kib} to monitor your infrastructure and identify problems in real time.
+Use the Metrics app in {kib} to monitor your infrastructure metrics and identify problems in real time.
 You can explore metrics for hosts, containers, and services.
 You can also drill down to view more detailed metrics, or seamlessly switch to view the corresponding logs, application traces, and uptime information.
 
 Initially, the *Inventory* tab shows an overview of the hosts in of your infrastructure and the current CPU usage for each host.
-From here, you can drill down into areas of interest.
+From here, you can view other metrics or drill down into areas of interest.
 
 [role="screenshot"]
 image::infrastructure/images/infra-sysmon.png[Infrastructure Overview in Kibana]
diff --git a/docs/infrastructure/metrics-explorer.asciidoc b/docs/infrastructure/metrics-explorer.asciidoc
index 2919eaa976d6a7..c20718dac1c7ac 100644
--- a/docs/infrastructure/metrics-explorer.asciidoc
+++ b/docs/infrastructure/metrics-explorer.asciidoc
@@ -15,7 +15,7 @@ image::infrastructure/images/metrics-explorer-screen.png[Metrics Explorer in Kib
 
 * Metrics Explorer uses data collected from {metricbeat-ref}/metricbeat-overview.html[Metricbeat].
 * You need read permissions on `metricbeat-*` or the metric index specified in the Metrics configuration.
-* Metrics Explorer uses the timestamp field set in the Infrastructure configuration.
+* Metrics Explorer uses the timestamp field from the *Settings* tab.
 By default that is set to `@timestamp`.
 * The interval for the X Axis is set to `auto`.
 The bucket size is determined by the time range.
diff --git a/docs/logs/getting-started.asciidoc b/docs/logs/getting-started.asciidoc
index 1ed8798a4b87fb..ca09bb34c0e56a 100644
--- a/docs/logs/getting-started.asciidoc
+++ b/docs/logs/getting-started.asciidoc
@@ -5,7 +5,7 @@
 To get started with the Logs app in Kibana, you need to start collecting logs data for your infrastructure.
 
 Kibana provides step-by-step instructions to help you add logs data.
-The {infra-guide}[Infrastructure Monitoring Guide] is a good source for more detailed information and instructions.
+The {logs-guide}[Logs Monitoring Guide] is a good source for more detailed information and instructions.
 
 [role="screenshot"]
 image::logs/images/logs-add-data.png[Screenshot showing Add logging data in Kibana]
diff --git a/docs/logs/using.asciidoc b/docs/logs/using.asciidoc
index 65693f4399e53c..916ad42a6d221d 100644
--- a/docs/logs/using.asciidoc
+++ b/docs/logs/using.asciidoc
@@ -17,7 +17,7 @@ image::logs/images/logs-console.png[Logs Console in Kibana]
 Use the search bar to perform ad hoc searches for specific text.
 You can also create structured queries using {kibana-ref}/kuery-query.html[Kibana Query Language].
 For example, enter `host.hostname : "host1"` to see only the information for `host1`.
-// ++ this isn't quite the same as the corresponding infrastructure description now.
+// ++ this isn't quite the same as the corresponding metrics description now.
 
 [float]
 [[logs-configure-source]]
diff --git a/docs/management/snapshot-restore/images/create-policy-example.png b/docs/management/snapshot-restore/images/create-policy-example.png
new file mode 100755
index 00000000000000..e871c925f5fd52
Binary files /dev/null and b/docs/management/snapshot-restore/images/create-policy-example.png differ
diff --git a/docs/management/snapshot-restore/images/snapshot-retention.png b/docs/management/snapshot-restore/images/snapshot-retention.png
new file mode 100755
index 00000000000000..7b390357a21b6b
Binary files /dev/null and b/docs/management/snapshot-restore/images/snapshot-retention.png differ
diff --git a/docs/management/snapshot-restore/index.asciidoc b/docs/management/snapshot-restore/index.asciidoc
index f309b2c17e0ed5..f19aaa122675e7 100644
--- a/docs/management/snapshot-restore/index.asciidoc
+++ b/docs/management/snapshot-restore/index.asciidoc
@@ -11,11 +11,11 @@ you can restore a snapshot from the repository.
 You’ll find *Snapshot and Restore* under *Management > Elasticsearch*. 
 With this UI, you can:
 
-* <<kib-snapshot-register-repository, Register a repository for storing your snapshots>>
-* <<kib-view-snapshot, View a list of your snapshots and drill down into details>>
-* <<kib-restore-snapshot, Restore data into your cluster from a snapshot>>
-* <<kib-snapshot-policy, Create a policy for automatic snapshots>>
-* <<kib-delete-snapshot, Delete a snapshot to free storage space>>
+* Register a repository for storing your snapshots
+* View a list of your snapshots and drill down into details
+* Restore data into your cluster from a snapshot
+* Create a policy to automate snapshot creation and deletion
+* Delete a snapshot to free storage space
 
 [role="screenshot"]
 image:management/snapshot-restore/images/snapshot_list.png["Snapshot list"]
@@ -27,28 +27,34 @@ more detailed information.
 [float]
 [[kib-snapshot-register-repository]]
 === Register a repository
+A repository is where your snapshots live. You must register a snapshot 
+repository before you can perform snapshot and restore operations. 
+
+If you don't have a repository, Kibana walks you through the process of 
+registering one. 
+{kib} supports three repository types
+out of the box: shared file system, read-only URL, and source-only.  
+For more information on these repositories and their settings, 
+see {ref}/modules-snapshots.html#snapshots-repositories[Repositories].
+To use other repositories, such as S3, see  
+{ref}/modules-snapshots.html#_repository_plugins[Repository plugins].
 
-The *Repositories* view provides an overview of your repositories. 
-Click a repository name to view its type, number of snapshots, and settings, and also to verify status.
+
+Once you create a repository, it is listed in the *Repositories* 
+view. 
+Click a repository name to view its type, number of snapshots, and settings, 
+and to verify status.
 
 [role="screenshot"]
 image:management/snapshot-restore/images/repository_list.png["Repository list"]
 
-If you don't have a repository, you're prompted to register one. 
-{es} supports three repository types
-out of the box: shared file system, read-only URL, and source-only.  
-For more information on these repositories and their settings, 
-see {ref}/modules-snapshots.html#snapshots-repositories[Repositories]. For an example, 
-see <<snapshot-repositories-example, registering a shared file system repository>>.
-
-To use other repositories, such as S3, you can install plugins. See  
-{ref}/modules-snapshots.html#_repository_plugins[Repository plugins].
 
 [float]
 [[kib-view-snapshot]]
 === View your snapshots
 
-The *Snapshots* view gives an overview of your snapshots. You can drill down 
+A snapshot is a backup taken from a running {es} cluster. You'll find an overview of 
+your snapshots in the *Snapshots* view, and you can drill down 
 into each snapshot for further investigation.
 
 [role="screenshot"]
@@ -68,18 +74,25 @@ the new data.
 [[kib-restore-snapshot]]
 === Restore a snapshot
 
-The *Restore* wizard walks you through the process of restoring a snapshot 
-into a running cluster. To get started, go to the *Snapshots* view, find the 
-snapshot, and click the restore icon in the *Actions* column. 
+The information stored in a snapshot is not tied to a specific 
+cluster or a cluster name. This enables you to
+restore a snapshot made from one cluster to another cluster. You might 
+use the restore operation to:
 
-You’re presented 
-options for the restore, including which 
+* Recover data lost due to a failure
+* Migrate a current Elasticsearch cluster to a new version
+* Move data from one cluster to another cluster
+
+To get started, go to the *Snapshots* view, find the 
+snapshot, and click the restore icon in the *Actions* column. 
+The Restore wizard presents
+options for the restore operation, including which 
 indices to restore and whether to modify the index settings.
 You can restore an existing index only if it’s closed and has the same 
 number of shards as the index in the snapshot.
 
 Once you initiate the restore, you're navigated to the *Restore Status* view,
-where you can track the progress. 
+where you can track the current state for each shard in the snapshot. 
 
 [role="screenshot"]
 image:management/snapshot-restore/images/snapshot-restore.png["Snapshot details"]
@@ -89,23 +102,28 @@ image:management/snapshot-restore/images/snapshot-restore.png["Snapshot details"
 [[kib-snapshot-policy]]
 === Create a snapshot lifecycle policy
 
-You can create policies to schedule automatic snapshots of your cluster. 
-{ref}/snapshot-lifecycle-management-api.html[Snapshot lifecycle policies] are related 
-to {ref}/index-lifecycle-management.html[index lifecycle policies]. 
-However, where an index lifecycle policy applies to a single index, 
-a snapshot lifecycle policy can span multiple indices.
-
-For an overview of your policies, open the *Policies* view.
-You can drill down into each policy to examine its settings and last successful and failed run. 
-
-If you don’t have any policies, use the *Create policy* wizard.
-You’ll define the snapshots and repository, when to take snapshots, and
-the settings, such as which indices the snapshot should contain.
+Use a {ref}/snapshot-lifecycle-management-api.html[snapshot lifecycle policy] 
+to automate the creation and deletion 
+of cluster snapshots. Taking automatic snapshots:
+
+* Ensures your {es} indices and clusters are backed up on a regular basis
+* Ensures a recent and relevant snapshot is available if a situation 
+arises where a cluster needs to be recovered
+* Allows you to manage your snapshots in {kib}, instead of using a 
+third-party tool
+ 
+If you don’t have any snapshot policies, follow the 
+*Create policy* wizard.  It walks you through defining 
+when and where to take snapshots, the settings you want, 
+and how long to retain snapshots.
 
 [role="screenshot"]
-image:management/snapshot-restore/images/create-policy.png["Snapshot details"]
+image:management/snapshot-restore/images/snapshot-retention.png["Snapshot details"]
+
+An overview of your policies is on the *Policies* view.
+You can drill down into each policy to examine its settings and last successful and failed run. 
 
-You can perform the following actions on a policy:
+You can perform the following actions on a snapshot policy:
 
 * *Run* a policy immediately without waiting for the scheduled time.
 This action is useful before an upgrade or before performing maintenance on indices.
@@ -113,6 +131,9 @@ This action is useful before an upgrade or before performing maintenance on indi
 * *Delete* a policy to prevent any future snapshots from being taken.
 This action does not cancel any currently ongoing snapshots or remove any previously taken snapshots.
 
+[role="screenshot"]
+image:management/snapshot-restore/images/create-policy.png["Snapshot details"]
+
 [float]
 [[kib-delete-snapshot]]
 === Delete a snapshot
@@ -123,16 +144,25 @@ Find the snapshot in the *Snapshots* view and click the trash icon in the
 and then click *Delete snapshots*.
 
 [[snapshot-repositories-example]]
-[float]
-=== Example: Register a shared file system repository
 
-This example shows how to register a shared file system repository 
-and store snapshots.
+[role="xpack"]
+[[snapshot-restore-tutorial]]
+=== Tutorial:  Snapshot and Restore
 
-[float]
-==== Register the repository location
 
-You must register the location of the repository in the `path.repo` setting on 
+Ready to try *Snapshot and Restore*? In this tutorial, you'll learn to:
+
+* Register a repository
+* Add snapshots to the repository
+* Create a snapshot lifecycle policy
+* Restore a snapshot
+
+==== Before you begin
+
+This example shows you how to register a shared file system repository 
+and store snapshots.
+Before you begin, you must register the location of the repository in the 
+{ref}/modules-snapshots.html#_shared_file_system_repository[path.repo] setting on 
 your master and data nodes.  You can do this in one of two ways:
 
 * Edit  your `elasticsearch.yml` to include the `path.repo` setting.
@@ -142,30 +172,26 @@ your master and data nodes.  You can do this in one of two ways:
 `bin/elasticsearch -E path.repo=/tmp/es-backups`
 
 [float]
-==== Register the repository
+[[register-repo-example]]
+==== Register a repository
 
 Use *Snapshot and Restore* to register the repository where your snapshots 
 will live. 
 
 . Go to *Management > Elasticsearch > Snapshot and Restore*.
-. Open the *Repositories* view.
-. Click *Register a repository*.
+. Click *Register a repository* in either the introductory message or *Repository view*.
 . Enter a name for your repository, for example, `my_backup`.
-. Set *Repository type* to Shared file system.
+. Select *Shared file system*.
 + 
 [role="screenshot"]
 image:management/snapshot-restore/images/register_repo.png["Register repository"]
 
 . Click *Next*.
-. In *Location*, enter the path to the snapshot repository, `/tmp/es-backups`.
-. In *Chunk size*, enter 100mb so that snapshot files are not bigger than that size.
-. Use the defaults for all other fields.
-. Click *Register*.
+. In *File system location*, enter the path to the snapshot repository, `/tmp/es-backups`.
+. In *Chunk size*, enter `100mb` so that snapshot files are not bigger than that size.
+. Use the defaults for all other fields, and then click *Register*.
 +
 Your new repository is listed on the *Repositories* view.
-+
-. Click the respository and inspect its details. 
-+
 The repository currently doesn’t have any snapshots.
 
 
@@ -174,19 +200,105 @@ The repository currently doesn’t have any snapshots.
 Use the {ref}//modules-snapshots.html#snapshots-take-snapshot[snapshot API] to create a snapshot.
 
 . Go to *Dev Tools > Console*.
-. Create the snapshot. 
+. Create the snapshot:
++
+[source,js]
+PUT /_snapshot/my_backup/2019-04-25_snapshot?wait_for_completion=true
 +
 In this example, the snapshot name is `2019-04-25_snapshot`. You can also 
 use {ref}//date-math-index-names.html[date math expression] for the snapshot name.
 +
 [role="screenshot"]
 image:management/snapshot-restore/images/create_snapshot.png["Create snapshot"]
-+
-. Open *Snapshot and Restore*. 
+
+. Return to *Snapshot and Restore*. 
 +
 Your new snapshot is available in the *Snapshots* view.
 
+[[create-policy-example]]
+==== Create a snapshot lifecycle policy
+
+Now you'll automate the creation and deletion of snapshots
+using the repository created in the previous example.
+
+. Open the *Policies* view.
+. Click *Create a policy*.
++ 
+[role="screenshot"]
+image:management/snapshot-restore/images/create-policy-example.png["Create policy wizard"]
+
+. As you walk through the wizard, enter the following values:
++
+|===
+|*Logistics* |
+
+|Policy name
+|`daily-snapshots`
+
+|Snapshot name
+|`<daily-snap-{now/d}>`
+
+|Schedule
+|Every day at 1:30 a.m.
+
+|Repository
+|`my_backup`
+
+|*Snapshot&nbsp;settings* |
 
+|Indices
+|Select the indices to back up. By default, all indices, including system indices, are backed up.
 
+|All&nbsp;other&nbsp;settings
+|Use the defaults.
 
+|*Snapshot&nbsp;retention* |
+
+|Expiration
+|`30 days`
+
+|Snapshots&nbsp;to&nbsp;retain
+|Minimum count: `5`, Maximum count: `50`
+|===
+
+. Review your input, and then click *Create policy*.
++
+Your new policy is listed in the *Policies* view, and you see a summary of its details.
+
+[[restore-snapshot-example]]
+==== Restore a snapshot
+Finally, you'll restore indices from an existing snapshot.
+
+. In the *Snapshots* view, find the snapshot you want to restore, for example `2019-04-25_snapshot`.
+. Click the restore icon in the *Actions* column.
+. As you walk through the wizard, enter the following values:
++
+|===
+|*Logistics* |
+
+|Indices
+|Toggle to choose specific indices to restore, or leave in place to restore all indices.
+
+|Rename indices
+|Toggle to give your restored indices new names, or leave in place to restore under original index names.
+
+|All other fields
+|Use the defaults.
+
+|*Index&nbsp;settings* |
+
+|Modify&nbsp;index&nbsp;settings
+|Toggle to overwrite index settings when they are restored, 
+or leave in place to keep existing settings.
+
+|Reset&nbsp;index&nbsp;settings
+|Toggle to reset index settings back to the default when they are restored, 
+or leave in place to keep existing settings.
+|===
+
+. Review your restore settings, and then click *Restore snapshot*.
++
+The operation loads for a few seconds, 
+and then you’re navigated to *Restore Status*, 
+where you can monitor the status of your restored indices.
 
diff --git a/docs/maps/geojson-upload.asciidoc b/docs/maps/geojson-upload.asciidoc
index d9b21f591f6256..8c3cb371b6addf 100644
--- a/docs/maps/geojson-upload.asciidoc
+++ b/docs/maps/geojson-upload.asciidoc
@@ -9,7 +9,7 @@ for example, in visualizations and Canvas workpads.
 [float]
 === Why GeoJSON?
 GeoJSON is an open-standard file format for storing geospatial vector data.
-Although many vector data formats are available in the GIS community, 
+Although many vector data formats are available in the GIS community,
 GeoJSON is the most commonly used and flexible option.
 [float]
 
@@ -18,14 +18,14 @@ Follow the instructions below to upload a GeoJSON data file, or try the
 <<indexing-geojson-data-tutorial, end-to-end integrated example>>.
 
 . Open *Elastic Maps*, and then click *Add layer*.
-. Click *Upload GeoJSON vector file*.
+. Click *Uploaded GeoJSON*.
 +
 [role="screenshot"]
 image::maps/images/fu_gs_select_source_file_upload.png[]
 
 . Use the file chooser to select a valid GeoJSON file. The file will load
 a preview of the data on the map.
-. Use the default *Index type* of {ref}/geo-point.html[geo_point] for point data, 
+. Use the default *Index type* of {ref}/geo-point.html[geo_point] for point data,
 or override it and select {ref}/geo-shape.html[geo_shape].
 All other shapes will default to a type of `geo_shape`.
 . Leave the default *Index name* and *Index pattern* names (the name of the uploaded
diff --git a/docs/maps/heatmap-layer.asciidoc b/docs/maps/heatmap-layer.asciidoc
index 9d456c59b69ef5..77b6d929a931cc 100644
--- a/docs/maps/heatmap-layer.asciidoc
+++ b/docs/maps/heatmap-layer.asciidoc
@@ -13,6 +13,6 @@ You can create a heat map layer from the following data source:
 Set *Show as* to *heat map*.
 The index must contain at least one field mapped as {ref}/geo-point.html[geo_point].
 
-NOTE: Only count and sum metric aggregations are available with the grid aggregation source and heat map layers.
-Mean, median, min, and max are turned off because the heat map will blend nearby values.
+NOTE: Only count, sum, unique count metric aggregations are available with the grid aggregation source and heat map layers.
+Average, min, and max are turned off because the heat map will blend nearby values.
 Blending two average values would make the cluster more prominent, even though it just might literally mean that these nearby areas are average.
diff --git a/docs/maps/indexing-geojson-data-tutorial.asciidoc b/docs/maps/indexing-geojson-data-tutorial.asciidoc
index 5645567ec7e79e..5284bd9ac2ac55 100644
--- a/docs/maps/indexing-geojson-data-tutorial.asciidoc
+++ b/docs/maps/indexing-geojson-data-tutorial.asciidoc
@@ -2,7 +2,7 @@
 [[indexing-geojson-data-tutorial]]
 == Indexing GeoJSON data tutorial
 
-In this tutorial, you'll build a customized map that shows the flight path between 
+In this tutorial, you'll build a customized map that shows the flight path between
 two airports, and the lightning hot spots on that route. You'll learn to:
 
 * Import GeoJSON files into Kibana
@@ -15,7 +15,7 @@ two airports, and the lightning hot spots on that route. You'll learn to:
 This tutorial requires you to download the following GeoJSON sample data files.
 These files are good examples of the types
 of vector data that you can upload to Kibana and index in
-Elasticsearch for display in *Elastic Maps*. 
+Elasticsearch for display in *Elastic Maps*.
 
 * https://raw.githubusercontent.com/elastic/examples/master/Maps/Getting%20Started%20Examples/geojson_upload_and_styling/logan_international_airport.geojson[Logan International Airport]
 * https://raw.githubusercontent.com/elastic/examples/master/Maps/Getting%20Started%20Examples/geojson_upload_and_styling/bangor_international_airport.geojson[Bangor International Airport]
@@ -23,7 +23,7 @@ Elasticsearch for display in *Elastic Maps*.
 * https://raw.githubusercontent.com/elastic/examples/master/Maps/Getting%20Started%20Examples/geojson_upload_and_styling/original_flight_path.geojson[Original flight path]
 * https://raw.githubusercontent.com/elastic/examples/master/Maps/Getting%20Started%20Examples/geojson_upload_and_styling/modified_flight_path.geojson[Modified flight path]
 
-The data represents two real airports, two fictitious flight routes, and 
+The data represents two real airports, two fictitious flight routes, and
 fictitious lightning reports. You don't need to use all of
 these files. Feel free to work with as many files as you'd like, or use valid GeoJSON
 files of your own.
@@ -47,12 +47,12 @@ image::maps/images/fu_gs_new_england_map.png[]
 For each GeoJSON file you downloaded, complete the following steps:
 
 . Below the map legend, click *Add layer*.
-. From the list of layer types, click *Upload GeoJSON vector file*.
+. From the list of layer types, click *Uploaded GeoJSON*.
 . Using the File Picker, upload the GeoJSON file.
 +
-Depending on the geometry type of your features, this will 
+Depending on the geometry type of your features, this will
 auto-populate *Index type* with either {ref}/geo-point.html[geo_point] or
- {ref}/geo-shape.html[geo_shape] and *Index name* with 
+ {ref}/geo-shape.html[geo_shape] and *Index name* with
 `<file name>`.
 
 . Click *Import file* in the lower right.
@@ -60,7 +60,7 @@ auto-populate *Index type* with either {ref}/geo-point.html[geo_point] or
 You'll see activity as the GeoJSON Upload utility creates a new index
 and index pattern for the data set. When the process is complete, you should
 receive messages that the creation of the new index and index pattern
-were successful. 
+were successful.
 
 . Click *Add layer* in the bottom right.
 
@@ -69,7 +69,7 @@ were successful.
 . Once you've added all of the sample files,
 <<maps-save, save your map>>.
 +
-At this point, you could consider the map complete, 
+At this point, you could consider the map complete,
 but there are a few additions and tweaks that you can make to tell a
 better story with your data.
 +
@@ -80,18 +80,18 @@ image::maps/images/fu_gs_flight_paths.png[]
 === Add a heatmap aggregation layer
 
 Looking at the `Lightning detected` layer, it's clear where lightning has
-struck. What's less clear, is if there have been more lightning 
-strikes in some areas than others, in other words, where the lightning 
+struck. What's less clear, is if there have been more lightning
+strikes in some areas than others, in other words, where the lightning
 hot spots are. An advantage of having indexed
-{ref}/geo-point.html[geo_point] data for the 
-lightning strikes is that you can perform aggregations on the data. 
+{ref}/geo-point.html[geo_point] data for the
+lightning strikes is that you can perform aggregations on the data.
 
 . Below the map legend, click *Add layer*.
 . From the list of layer types, click *Grid aggregation*.
 +
-Because you indexed `lightning_detected.geojson` using the index name and 
+Because you indexed `lightning_detected.geojson` using the index name and
 pattern `lightning_detected`, that data is available as a {ref}/geo-point.html[geo_point]
-aggregation. 
+aggregation.
 
 . Select `lightning_detected`.
 . Click *Show as* and select `heat map`.
@@ -99,15 +99,15 @@ aggregation.
 "Lightning intensity".
 +
 The remaining default settings are good, but there are a couple of
-settings that you might want to change. 
+settings that you might want to change.
 
-. Under *Source settings* > *Grid resolution*, select from the different heat map resolutions. 
+. Under *Source settings* > *Grid resolution*, select from the different heat map resolutions.
 +
 The default "Coarse" looks
 good, but feel free to select a different resolution.
 
 . Play around with the *Layer Style* >
-*Color range* setting. 
+*Color range* setting.
 +
 Again the default looks good, but feel free to choose a
 different color range.
@@ -125,14 +125,14 @@ image::maps/images/fu_gs_lightning_intensity.png[]
 === Organize the layers
 
 Consider ways you might improve the appearance of the final map.
-Small changes in how and when layers are shown can help tell a 
+Small changes in how and when layers are shown can help tell a
 better story with your data. Here are a few final tweaks
 you might make:
 
 * Update layer names
 * Adjust styles for each layer
 * Adjust the layer order
-* Decide which layers to show at different zoom levels 
+* Decide which layers to show at different zoom levels
 
 When you've finished, again be sure to <<maps-save, save your work >>.
 
diff --git a/docs/maps/maps-getting-started.asciidoc b/docs/maps/maps-getting-started.asciidoc
index f6db2f0fff219c..88ad6a26d36970 100644
--- a/docs/maps/maps-getting-started.asciidoc
+++ b/docs/maps/maps-getting-started.asciidoc
@@ -65,7 +65,7 @@ and lighter shades symbolize countries with less traffic.
 ==== Add a vector layer from the Elastic Maps Service source
 
 . In the map legend, click *Add layer*.
-. Click the *Vector shapes* data source.
+. Click the *EMS Boundaries* data source.
 . From the *Layer* dropdown menu, select *World Countries*.
 . Click the *Add layer* button.
 . Set *Layer name* to `Total Requests by Country`.
diff --git a/docs/maps/trouble-shooting.asciidoc b/docs/maps/trouble-shooting.asciidoc
index 542138828530bb..76383f8953a781 100644
--- a/docs/maps/trouble-shooting.asciidoc
+++ b/docs/maps/trouble-shooting.asciidoc
@@ -30,4 +30,9 @@ image::maps/images/inspector.png[]
 * Ensure your tile server has configured https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS[Cross-Origin Resource Sharing (CORS)] so tile requests from your Kibana domain have permission to access your tile server domain.
 * Ensure tiles have the required coordinate system. Vector data must use EPSG:4326 and tiles must use EPSG:3857.
 
+[float]
+==== Coordinate and region map visualizations not available in New Visualization menu
+
+Kibana’s out-of-the-box settings no longer offers coordinate and region maps as a choice in the New Visualization menu because you can create these maps in *Elastic Maps*.
+If you want to create new coordinate and region map visualizations, set `xpack.maps.showMapVisualizationTypes` to `true`.
 
diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc
index a8d8a66fd182c7..af67ff70c81b59 100644
--- a/docs/redirects.asciidoc
+++ b/docs/redirects.asciidoc
@@ -35,3 +35,7 @@ This page has moved. Please see <<infra-configure-source>>.
 
 This page has moved. Please see <<xpack-logs-configuring>>.
 
+[role="exclude",id="extend"]
+== Extend your use case
+
+This page was deleted. See <<xpack-graph>> and <<xpack-ml>>.
\ No newline at end of file
diff --git a/docs/settings/code-settings.asciidoc b/docs/settings/code-settings.asciidoc
deleted file mode 100644
index 5dbcb9b3508b8f..00000000000000
--- a/docs/settings/code-settings.asciidoc
+++ /dev/null
@@ -1,51 +0,0 @@
-[role="xpack"]
-[[code-settings-kibana]]
-=== Code Settings in Kibana
-++++
-<titleabbrev>Code settings</titleabbrev>
-++++
-
-Unless you are running multiple Kibana instances as a cluster, you do not need to change any settings to use *Code* by default. If you’d like to change any of the default values, copy and paste the relevant settings below into your `kibana.yml` configuration file.
-
-
-`xpack.code.updateRepoFrequencyMs`::
-Repo update frequency in milliseconds. Defaults to `300000`.
-
-`xpack.code.indexRepoFrequencyMs`::
-Repo index frequency in milliseconds. Defaults to `86400000`.
-
-`xpack.code.lsp.verbose`::
-Whether to show more verbose log for language servers. Defaults to `false`.
-
-`xpack.code.security.enableMavenImport`::
-Whether to support maven. Defaults to `true`.
-
-`xpack.code.security.enableGradleImport`::
-Whether to support gradle. Defaults to `false`.
-
-`xpack.code.security.installNodeDependency`::
-Whether to enable node dependency download. Defaults to `true`.
-
-`xpack.code.security.gitHostWhitelist`::
-Whitelist of hostnames for git clone address. Defaults to `[ 'github.com', 'gitlab.com',  'bitbucket.org', 'gitbox.apache.org', 'eclipse.org',]`.
-
-`xpack.code.security.gitProtocolWhitelist`::
-Whitelist of protocols for git clone address. Defaults to `[ 'https', 'git', 'ssh' ]`.
-
-`xpack.code.security.enableGitCertCheck`::
-Whether enable HTTPS certificate check when clone from HTTPS URL.
-
-`xpack.code.security.enableJavaSecurityManager`::
-Whether enable Java security manager for Java langserver. Defaults to `true`.
-
-`xpack.code.security.extraJavaRepositoryWhitelist`::
-Whitelist of extra repository to download dependencies for Java language. Defaults to `[]`.
-
-`xpack.code.maxWorkspace`::
-Maximal number of workspaces each language server allows to span. Defaults to `5`.
-
-`xpack.code.codeNodeUrl`::
-URL of the Code node. This config is only needed when multiple Kibana instances are set up as a cluster. Defaults to ``
-
-`xpack.code.verbose`::
-Set this config to `true` to log all events. Defaults to `false`
diff --git a/docs/settings/general-infra-logs-ui-settings.asciidoc b/docs/settings/general-infra-logs-ui-settings.asciidoc
index 31a12c6e2e905c..7b32372a1f59a1 100644
--- a/docs/settings/general-infra-logs-ui-settings.asciidoc
+++ b/docs/settings/general-infra-logs-ui-settings.asciidoc
@@ -1,4 +1,4 @@
-`xpack.infra.enabled`:: Set to `false` to disable the Logs and Metrics UI plugin {kib}. Defaults to `true`.
+`xpack.infra.enabled`:: Set to `false` to disable the Logs and Metrics app plugin {kib}. Defaults to `true`.
 
 `xpack.infra.sources.default.logAlias`:: Index pattern for matching indices that contain log data. Defaults to `filebeat-*,kibana_sample_data_logs*`. To match multiple wildcard patterns, use a comma to separate the names, with no space after the comma. For example, `logstash-app1-*,default-logs-*`.
 
@@ -6,7 +6,7 @@
 
 `xpack.infra.sources.default.fields.timestamp`:: Timestamp used to sort log entries. Defaults to `@timestamp`.
 
-`xpack.infra.sources.default.fields.message`:: Fields used to display messages in the Logs UI. Defaults to `['message', '@message']`.
+`xpack.infra.sources.default.fields.message`:: Fields used to display messages in the Logs app. Defaults to `['message', '@message']`.
 
 `xpack.infra.sources.default.fields.tiebreaker`:: Field used to break ties between two entries with the same timestamp. Defaults to `_doc`.
 
diff --git a/docs/settings/infrastructure-ui-settings.asciidoc b/docs/settings/infrastructure-ui-settings.asciidoc
index 1617f2847c50ed..ed69c27feab72a 100644
--- a/docs/settings/infrastructure-ui-settings.asciidoc
+++ b/docs/settings/infrastructure-ui-settings.asciidoc
@@ -1,14 +1,14 @@
 [role="xpack"]
 [[infrastructure-ui-settings-kb]]
-=== Metrics UI settings in Kibana
+=== Metrics settings in Kibana
 ++++
-<titleabbrev>Metrics UI settings</titleabbrev>
+<titleabbrev>Metrics settings</titleabbrev>
 ++++
 
-You do not need to configure any settings to use the Metrics UI. It is enabled by default.
+You do not need to configure any settings to use the Metrics app in {kib}. It is enabled by default.
 
 [float]
 [[general-infra-ui-settings-kb]]
-==== General Metrics UI settings
+==== General Metrics settings
 
 include::general-infra-logs-ui-settings.asciidoc[]
\ No newline at end of file
diff --git a/docs/settings/logs-ui-settings.asciidoc b/docs/settings/logs-ui-settings.asciidoc
index a2c9e12e22fb06..5b6dd902091ae5 100644
--- a/docs/settings/logs-ui-settings.asciidoc
+++ b/docs/settings/logs-ui-settings.asciidoc
@@ -1,14 +1,14 @@
 [role="xpack"]
 [[logs-ui-settings-kb]]
-=== Logs UI settings in Kibana
+=== Logs app settings in Kibana
 ++++
-<titleabbrev>Logs UI settings</titleabbrev>
+<titleabbrev>Logs settings</titleabbrev>
 ++++
 
-You do not need to configure any settings to use the Logs UI. It is enabled by default.
+You do not need to configure any settings to use the Logs app in {kib}. It is enabled by default.
 
 [float]
 [[general-logs-ui-settings-kb]]
-==== General Logs UI settings
+==== General Logs settings
 
 include::general-infra-logs-ui-settings.asciidoc[]
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index f02cf188d31ada..6e7f939a1d2abd 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -277,8 +277,8 @@ setting specifies the port to use.
 
 `server.rewriteBasePath:`:: *Default: deprecated* Specifies whether Kibana should
 rewrite requests that are prefixed with `server.basePath` or require that they
-are rewritten by your reverse proxy. In Kibana 6.3 and earlier, the default is 
-`false`. In Kibana 7.x, the setting is deprecated. In Kibana 8.0 and later, the 
+are rewritten by your reverse proxy. In Kibana 6.3 and earlier, the default is
+`false`. In Kibana 7.x, the setting is deprecated. In Kibana 8.0 and later, the
 default is `true`.
 
 `server.socketTimeout:`:: *Default: "120000"* The number of milliseconds to wait before closing an
@@ -327,7 +327,6 @@ Rollup user interface.
 
 
 include::{docdir}/settings/apm-settings.asciidoc[]
-include::{docdir}/settings/code-settings.asciidoc[]
 include::{docdir}/settings/dev-settings.asciidoc[]
 include::{docdir}/settings/graph-settings.asciidoc[]
 include::{docdir}/settings/infrastructure-ui-settings.asciidoc[]
diff --git a/docs/uptime-guide/overview.asciidoc b/docs/uptime-guide/overview.asciidoc
index 09867e7b05f2a5..c6bd71b1f55742 100644
--- a/docs/uptime-guide/overview.asciidoc
+++ b/docs/uptime-guide/overview.asciidoc
@@ -33,8 +33,8 @@ The {kibana-ref}/xpack-uptime.html[Elasticsearch Uptime app] in Kibana provides
 
 [float]
 === Example deployments
-// ++ I like the Infra/logging diagram which shows Infrastructure and Logging apps as separate components inside Kibana
-// ++ In diagram, should be Uptime app, not Uptime UI, possibly even Elastic Uptime? Also applies to Infra/logging/APM.
+// ++ I like the Infra/logging diagram which shows Metrics and Logging apps as separate components inside Kibana
+// ++ In diagram, should be Uptime app, not Uptime UI, possibly even Elastic Uptime? Also applies to Metrics/Logging/APM.
 // ++ Need more whitespace around components.
 
 image::images/uptime-simple-deployment.png[Uptime simple deployment]
diff --git a/docs/uptime-guide/security.asciidoc b/docs/uptime-guide/security.asciidoc
index 41efcc25627bee..2a960348b1e02c 100644
--- a/docs/uptime-guide/security.asciidoc
+++ b/docs/uptime-guide/security.asciidoc
@@ -31,17 +31,6 @@ PUT /_security/role/uptime
       "allow_restricted_indices" : false
     }
   ],
-  "applications" : [
-    {
-      "application" : "kibana-.kibana",
-      "privileges" : [
-        "all"
-      ],
-      "resources" : [
-        "*"
-      ]
-    }
-  ],
   "transient_metadata" : {
     "enabled" : true
   }
@@ -52,7 +41,8 @@ PUT /_security/role/uptime
 [float]
 === Assign the role to a user
 
-Next, you'll need to create a user with both the `kibana_user`, and `uptime` roles. 
+Next, you'll need to create a user with both the `uptime` role, and another role with sufficient {kibana-ref}/kibana-privileges.html[Kibana privileges],
+such as the `kibana_user` role.
 You can do this with the following request:
 
 ["source","sh",subs="attributes,callouts"]
diff --git a/docs/uptime/overview.asciidoc b/docs/uptime/overview.asciidoc
index ea7047ae940a8f..098ce12a569911 100644
--- a/docs/uptime/overview.asciidoc
+++ b/docs/uptime/overview.asciidoc
@@ -34,7 +34,7 @@ in an `up` or `down` state are displayed, based on the last check reported by He
 for each monitor.
 
 Next to the counts, there is a histogram displaying the change over time throughout the
-selected date range. 
+selected date range.
 
 [float]
 === Monitor list
@@ -56,7 +56,7 @@ ID and URL, its IP address, and a dedicated sparkline showing its check status o
 image::uptime/images/observability_integrations.png[Observability integrations]
 
 The Monitor list also contains a menu of possible integrations. If Uptime detects Kubernetes or
-Docker related host information, it will provide links to open the Metrics UI or Logs UI pre-filtered
+Docker related host information, it will provide links to open the Metrics app or Logs app pre-filtered
 for this host. Additionally, this feature supplies links to simply filter the other views on the host's
 IP address, to help you quickly determine if these other solutions contain data relevant to your current
 interest.
diff --git a/docs/user/canvas.asciidoc b/docs/user/canvas.asciidoc
index f3aa78e8e2e670..c58635ba977696 100644
--- a/docs/user/canvas.asciidoc
+++ b/docs/user/canvas.asciidoc
@@ -5,15 +5,15 @@
 [partintro]
 --
 
-Canvas is a data visualization and presentation tool that sits within Kibana. With Canvas, you can pull live data directly from Elasticsearch, and combine the data with colors, images, text, and your imagination to create dynamic, multi-page, pixel-perfect displays. If you are a little bit creative, a little bit technical, and a whole lot curious, then Canvas is for you. 
+Canvas is a data visualization and presentation tool that sits within Kibana. With Canvas, you can pull live data directly from Elasticsearch, and combine the data with colors, images, text, and your imagination to create dynamic, multi-page, pixel-perfect displays. If you are a little bit creative, a little bit technical, and a whole lot curious, then Canvas is for you.
 
 With Canvas, you can:
 
-* Create and personalize your work space with backgrounds, borders, colors, fonts, and more. 
+* Create and personalize your work space with backgrounds, borders, colors, fonts, and more.
 
 * Customize your workpad with your own visualizations, such as images and text.
 
-* Customize your data by pulling it directly from Elasticsearch. 
+* Customize your data by pulling it directly from Elasticsearch.
 
 * Show off your data with charts, graphs, progress monitors, and more.
 
@@ -37,8 +37,6 @@ include::{kib-repo-dir}/canvas/canvas-present-workpad.asciidoc[]
 
 include::{kib-repo-dir}/canvas/canvas-share-workpad.asciidoc[]
 
-//include::{kib-repo-dir}/canvas/canvas-expressions.asciidoc[]
-
 include::{kib-repo-dir}/canvas/canvas-function-reference.asciidoc[]
 
 include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[]
diff --git a/docs/user/extend.asciidoc b/docs/user/extend.asciidoc
deleted file mode 100644
index c658731ce3c3db..00000000000000
--- a/docs/user/extend.asciidoc
+++ /dev/null
@@ -1,15 +0,0 @@
-[[extend]]
-= Extend your use case
-
-[partintro]
---
-//TBD
-
-* <<xpack-graph>>
-* <<xpack-ml>>
-
---
-
-include::graph/index.asciidoc[]
-
-include::ml/index.asciidoc[]
diff --git a/docs/user/graph/configuring-graph.asciidoc b/docs/user/graph/configuring-graph.asciidoc
index 9503e606406b35..d521f9d8d2846d 100644
--- a/docs/user/graph/configuring-graph.asciidoc
+++ b/docs/user/graph/configuring-graph.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[graph-configuration]]
-=== Configuring Graph
+== Configuring Graph
 
 When a user saves a graph workspace in Kibana, it is stored in the `.kibana`
 index along with other saved objects like visualizations and dashboards.
@@ -57,9 +57,9 @@ is displayed. For more information on granting access to Kibana, see
 [role="screenshot"]
 image::user/graph/images/graph-read-only-badge.png[Example of Graph's read only access indicator in Kibana's header]
 
-[float]
+[discrete]
 [[disable-drill-down]]
-==== Disabling drill down configuration
+=== Disabling drill down configuration
 
 By default, users can configure _drill down_ URLs to display additional
 information about a selected vertex in a new browser window. For example,
diff --git a/docs/user/graph/getting-started.asciidoc b/docs/user/graph/getting-started.asciidoc
index dd5e8527c8976f..19f3df341338ec 100644
--- a/docs/user/graph/getting-started.asciidoc
+++ b/docs/user/graph/getting-started.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[graph-getting-started]]
-=== Using Graph
+== Using Graph
 
 Graph is automatically enabled in {es} and {kib}.
 
diff --git a/docs/user/graph/index.asciidoc b/docs/user/graph/index.asciidoc
index 9ca7b0e4b1a4a4..f9094f5b594b10 100644
--- a/docs/user/graph/index.asciidoc
+++ b/docs/user/graph/index.asciidoc
@@ -1,7 +1,9 @@
 [role="xpack"]
 [[xpack-graph]]
-== Graph data connections
+= Graph data connections
 
+[partintro]
+--
 The {graph-features} enable you to discover how items in an
 Elasticsearch index are related. You can explore the connections between
 indexed terms and see which connections are the most meaningful. This can be
@@ -17,9 +19,9 @@ and an interactive graph visualization tool for Kibana. Both work out of the
 box with existing Elasticsearch indices--you don't need to store any
 additional data to use these features.
 
+[discrete]
 [[how-graph-works]]
-[float]
-=== How Graph works
+== How Graph works
 The graph API provides an alternative way to extract and summarize information
 about the documents and terms in your Elasticsearch index. A _graph_ is really
 just a network of related items. In our case, this means a network of related
@@ -62,6 +64,7 @@ multi-node clusters and scales with your Elasticsearch deployment.
 Advanced options let you control how your data is sampled and summarized.
 You can also set timeouts to prevent graph queries from adversely
 affecting the cluster.
+--
 
 include::getting-started.asciidoc[]
 
diff --git a/docs/user/graph/limitations.asciidoc b/docs/user/graph/limitations.asciidoc
index b40f15000483ad..e96910bd27b4c0 100644
--- a/docs/user/graph/limitations.asciidoc
+++ b/docs/user/graph/limitations.asciidoc
@@ -1,12 +1,12 @@
 [role="xpack"]
 [[graph-limitations]]
-=== Graph limitations
+== Graph limitations
 ++++
 <titleabbrev>Limitations</titleabbrev>
 ++++
 
-[float]
-==== Limited support for multiple indices
+[discrete]
+=== Limited support for multiple indices
 The graph API can explore multiple indices, types, or aliases in a
 single API request, but the assumption is that each "hop" it performs
 is querying the same set of indices. Currently, it is not possible to
diff --git a/docs/user/graph/troubleshooting.asciidoc b/docs/user/graph/troubleshooting.asciidoc
index 7a87aba7b7f813..ff3568ed41afa2 100644
--- a/docs/user/graph/troubleshooting.asciidoc
+++ b/docs/user/graph/troubleshooting.asciidoc
@@ -1,12 +1,12 @@
 [role="xpack"]
 [[graph-troubleshooting]]
-=== Graph Troubleshooting
+== Graph Troubleshooting
 ++++
 <titleabbrev>Troubleshooting</titleabbrev>
 ++++
 
-[float]
-==== Why are results missing?
+[discrete]
+=== Why are results missing?
 
 The default settings in Graph API requests are configured to tune out noisy
 results by using the following strategies:
@@ -29,8 +29,8 @@ of any statistical correlation with the sample.
 * Set the `min_doc_count` for your vertices to 1 to ensure only one document is
 required to assert a relationship.
 
-[float]
-==== What can I do to to improve performance?
+[discrete]
+=== What can I do to to improve performance?
 
 With the default setting of `use_significance` set to `true`, the Graph API
 performs a background frequency check of the terms it discovers as part of
diff --git a/docs/user/index.asciidoc b/docs/user/index.asciidoc
index 54817a6e8743d0..ebe6c10c498724 100644
--- a/docs/user/index.asciidoc
+++ b/docs/user/index.asciidoc
@@ -16,11 +16,11 @@ include::dashboard.asciidoc[]
 
 include::canvas.asciidoc[]
 
-include::extend.asciidoc[]
+include::graph/index.asciidoc[]
 
-include::{kib-repo-dir}/maps/index.asciidoc[]
+include::ml/index.asciidoc[]
 
-include::{kib-repo-dir}/code/index.asciidoc[]
+include::{kib-repo-dir}/maps/index.asciidoc[]
 
 include::{kib-repo-dir}/infrastructure/index.asciidoc[]
 
diff --git a/docs/user/ml/index.asciidoc b/docs/user/ml/index.asciidoc
index f4802592f0e077..a2c23aad98d5be 100644
--- a/docs/user/ml/index.asciidoc
+++ b/docs/user/ml/index.asciidoc
@@ -1,7 +1,9 @@
 [role="xpack"]
 [[xpack-ml]]
-== {ml-cap}
+= {ml-cap}
 
+[partintro]
+--
 As datasets increase in size and complexity, the human effort required to
 inspect dashboards or maintain rules for spotting infrastructure problems,
 cyber attacks, or business issues becomes impractical. Elastic {ml-features}
@@ -18,11 +20,20 @@ image::user/ml/images/ml-data-visualizer-sample.jpg[Data Visualizer for sample f
 
 experimental[] You can also upload a CSV, NDJSON, or log file (up to 100 MB in 
 size). The *Data Visualizer* identifies the file format and field mappings. You 
-can then optionally import that data into an {es} index.  
+can then optionally import that data into an {es} index.
+
+You need the following permissions to use the Data Visualizer with file upload:
+
+* cluster privileges: `monitor`, `manage_ingest_pipelines`
+* index privileges: `read`, `manage`, `index`
+
+For more information, see {ref}/security-privileges.html[Security privileges] 
+and {ref}/built-in-roles.html[Built-in roles].
+
+--
 
-[float]
 [[xpack-ml-anomalies]]
-=== {anomaly-detect-cap}
+== {anomaly-detect-cap}
 
 The Elastic {ml} {anomaly-detect} feature automatically models the normal
 behavior of your time series data — learning trends, periodicity, and more — in
@@ -73,9 +84,8 @@ For more information about the {anomaly-detect} feature, see
 https://www.elastic.co/what-is/elastic-stack-machine-learning[{ml-cap} in the {stack}]
 and {stack-ov}/xpack-ml.html[{ml-cap} {anomaly-detect}].
 
-[float]
 [[xpack-ml-dfanalytics]]
-=== {dfanalytics-cap}
+== {dfanalytics-cap}
 
 The Elastic {ml} {dfanalytics} feature enables you to analyze your data using
 {oldetection} and {regression} algorithms and generate new indices that contain
@@ -89,4 +99,4 @@ in {kib}. For example:
 image::user/ml/images/outliers.jpg[{oldetection-cap} results in {kib}]
 
 For more information about the {dfanalytics} feature, see 
-{stack-ov}/ml-dfanalytics.html[{ml-cap} {dfanalytics}].
+{stack-ov}/ml-dfanalytics.html[{ml-cap} {dfanalytics}].
\ No newline at end of file
diff --git a/docs/user/reporting/index.asciidoc b/docs/user/reporting/index.asciidoc
index 82dd88cb57495a..4a5ca41ae6be97 100644
--- a/docs/user/reporting/index.asciidoc
+++ b/docs/user/reporting/index.asciidoc
@@ -32,8 +32,8 @@ for different operating systems.
 
 . Open {kib} in your web browser and log in. If you are running {kib}
 locally, go to `http://localhost:5601`. To access {kib} and generate
-reports, you need the `kibana_user` and `reporting_user` roles. For more
-information, see <<secure-reporting>>.
+reports, you need the `reporting_user` role, and an additional role with succifient <<kibana-privileges, Kibana privileges>>, such as the `kibana_user` role.
+For more information, see <<secure-reporting>>.
 
 . Open the dashboard, visualization, or saved search you want to include
 in the report.
diff --git a/docs/user/security/api-keys/images/api-key-invalidate.png b/docs/user/security/api-keys/images/api-key-invalidate.png
new file mode 100755
index 00000000000000..c925679ab24bc6
Binary files /dev/null and b/docs/user/security/api-keys/images/api-key-invalidate.png differ
diff --git a/docs/user/security/api-keys/images/api-keys.png b/docs/user/security/api-keys/images/api-keys.png
new file mode 100755
index 00000000000000..df74f245676d9c
Binary files /dev/null and b/docs/user/security/api-keys/images/api-keys.png differ
diff --git a/docs/user/security/api-keys/index.asciidoc b/docs/user/security/api-keys/index.asciidoc
new file mode 100644
index 00000000000000..c00f58cf598e38
--- /dev/null
+++ b/docs/user/security/api-keys/index.asciidoc
@@ -0,0 +1,86 @@
+[role="xpack"]
+[[api-keys]]
+=== API Keys
+
+
+API keys enable you to create secondary credentials so that you can send 
+requests on behalf of the user. Secondary credentials have 
+the same or lower access rights.  
+
+For example, if you extract data from an {es} cluster on a daily
+basis, you might create an API key tied to your credentials, 
+configure it with minimum access, 
+and then put the API credentials into a cron job.
+Or, you might create API keys to automate ingestion of new data from 
+remote sources, without a live user interaction. 
+
+You can create API keys from the {kib} Console. To view and invalidate 
+API keys, use *Management > Security > API Keys*.
+
+[role="screenshot"]
+image:user/security/api-keys/images/api-keys.png["API Keys UI"]
+
+[float]
+[[api-keys-service]]
+=== {es} API key service
+
+The {es} API key service is automatically enabled when you configure 
+{ref}/configuring-tls.html#tls-http[TLS on the HTTP interface]. 
+This ensures that clients are unable to send API keys in clear-text.
+
+When HTTPS connections are not enabled between {kib} and {es}, 
+you cannot create or manage API keys, and you get an error message.
+For more information, see the 
+{ref}/security-api-create-api-key.html[{es} API key documentation], 
+or contact your system administrator.
+
+[float]
+[[api-keys-security-privileges]]
+=== Security privileges
+
+You must have the `manage_security`, `manage_api_key`, or the `manage_own_api_key` 
+cluster privileges to use API keys in {kib}. You can manage roles in 
+*Management > Security > Roles*, or use the <<role-management-api, {kib} Role Management API>>. 
+
+
+[float]
+[[create-api-key]]
+=== Create an API key
+You can {ref}/security-api-create-api-key.html[create an API key] from 
+the Kibana Console. For example:
+
+[source,js]
+POST /_security/api_key
+{
+  "name": "my_api_key",
+  "expiration": "1d"
+}
+
+This creates an API key with the name `my_api_key` that 
+expires after one day. API key names must be globally unique. 
+An expiration date is optional and follows {ref}/common-options.html#time-units[{es} time unit format]. 
+When an expiration is not provided, the API key does not expire.
+
+[float]
+[[view-api-keys]]
+=== View and invalidate API keys
+The *API Keys* UI lists your API keys, including the name, date created, 
+and expiration date. If an API key expires, its status changes from `Active` to `Expired`.
+
+If you have `manage_security` or `manage_api_key` permissions, 
+you can view the API keys of all users, and see which API key was 
+created by which user in which realm.
+If you have only the `manage_own_api_key` permission, you see only a list of your own keys.
+
+You can invalidate API keys individually or in bulk. 
+Invalidated keys are deleted in batch after seven days.
+
+[role="screenshot"]
+image:user/security/api-keys/images/api-key-invalidate.png["API Keys invalidate"]
+
+You cannot modify an API key. If you need additional privileges, 
+you must create a new key with the desired configuration and invalidate the old key.
+
+
+
+
diff --git a/docs/user/security/authentication/index.asciidoc b/docs/user/security/authentication/index.asciidoc
index 8a4678e051490b..c2b1adc5e1b921 100644
--- a/docs/user/security/authentication/index.asciidoc
+++ b/docs/user/security/authentication/index.asciidoc
@@ -138,7 +138,7 @@ xpack.security.authc.saml.maxRedirectURLSize: 1kb
 ==== OpenID Connect Single Sign-On
 
 Similar to SAML, authentication with OpenID Connect allows users to log in to {kib} using an OpenID Connect Provider such as Google, or Okta. OpenID Connect
-should also be configured in {es}, see {xpack-ref}/saml-guide.html[Configuring OpenID Connect Single-Sign-On on the Elastic Stack] for more details.
+should also be configured in {es}. For more details, see {ref}/oidc-guide.html[Configuring single sign-on to the {stack} using OpenID Connect].
 
 Set the configuration values in `kibana.yml` as follows:
 
diff --git a/docs/user/security/index.asciidoc b/docs/user/security/index.asciidoc
index 7b7e38d6108430..f57d1bcd3bc2aa 100644
--- a/docs/user/security/index.asciidoc
+++ b/docs/user/security/index.asciidoc
@@ -36,3 +36,5 @@ cause Kibana's authorization to behave unexpectedly.
 
 include::authorization/index.asciidoc[]
 include::authorization/kibana-privileges.asciidoc[]
+include::api-keys/index.asciidoc[]
+
diff --git a/docs/user/security/reporting.asciidoc b/docs/user/security/reporting.asciidoc
index ffbef3bdc9b189..1d7a3f4978ee09 100644
--- a/docs/user/security/reporting.asciidoc
+++ b/docs/user/security/reporting.asciidoc
@@ -19,7 +19,7 @@ and `kibana_user` roles:
 * If you're using the `native` realm, you can assign roles through
 **Management / Users** UI in Kibana or with the `user` API. For example,
 the following request creates a `reporter` user that has the
-`reporting_user` and `kibana_user` roles:
+`reporting_user` role, and another role with sufficient <<kibana-privileges, Kibana privileges>>, such as the `kibana_user` role:
 +
 [source, sh]
 ---------------------------------------------------------------
diff --git a/docs/user/security/securing-kibana.asciidoc b/docs/user/security/securing-kibana.asciidoc
index fa11d5925bdbeb..1c74bd98642a7c 100644
--- a/docs/user/security/securing-kibana.asciidoc
+++ b/docs/user/security/securing-kibana.asciidoc
@@ -117,7 +117,7 @@ user you've assigned a {kib} user role. For example, you could log in as the
 +
 --
 
-NOTE: This must be a user who has been assigned the `kibana_user` role.
+NOTE: This must be a user who has been assigned <<kibana-privileges, Kibana privileges>>.
 {kib} server credentials should only be used internally by the {kib} server.
 
 --
diff --git a/docs/visualize/regionmap.asciidoc b/docs/visualize/regionmap.asciidoc
index faecc207d81a70..c39282963ef7bc 100644
--- a/docs/visualize/regionmap.asciidoc
+++ b/docs/visualize/regionmap.asciidoc
@@ -1,9 +1,12 @@
 [[regionmap]]
 == Region Maps
 
-Region maps are thematic maps in which boundary vector shapes are colored using a gradient: 
-higher intensity colors indicate larger values, and lower intensity colors indicate smaller values. 
-These are also known as choropleth maps. 
+Region maps are thematic maps in which boundary vector shapes are colored using a gradient:
+higher intensity colors indicate larger values, and lower intensity colors indicate smaller values.
+These are also known as choropleth maps.
+
+Kibana’s out-of-the-box settings do not show a region map in the New Visualization menu. Use <<maps>> instead, which offers more functionality and is easier to use.
+If you want to create new region map visualizations, set `xpack.maps.showMapVisualizationTypes` to `true`.
 
 image::images/regionmap.png[]
 
@@ -11,7 +14,7 @@ image::images/regionmap.png[]
 [[regionmap-configuration]]
 === Configuration
 
-To create a region map, you configure an inner join that joins the result of an Elasticsearch terms aggregation 
+To create a region map, you configure an inner join that joins the result of an Elasticsearch terms aggregation
 and a reference vector file based on a shared key.
 
 [float]
@@ -23,7 +26,7 @@ and a reference vector file based on a shared key.
 Select any of the supported _Metric_ or _Sibling Pipeline Aggregations_.
 
 [float]
-===== Buckets 
+===== Buckets
 
 Configure a _Terms_ aggregation. The term is the _key_ that is used to join the results to the vector data on the map.
 
@@ -35,7 +38,7 @@ Configure a _Terms_ aggregation. The term is the _key_ that is used to join the
 - *Vector map*: select from a list of vector maps. This list includes the maps that are hosted by the © https://www.elastic.co/elastic-maps-service[Elastic Maps Service],
 as well as your self-hosted layers that are configured in the *config/kibana.yml* file. To learn more about how to configure Kibana
 to make self-hosted layers available, see the <<regionmap-settings,regionmap settings>> documentation. You can also explore and preview vector layers available in Elastic Maps Service at https://maps.elastic.co[https://maps.elastic.co].
-- *Join field*: this is the property from the selected vector map that will be used to join on the terms in your terms-aggregation. 
+- *Join field*: this is the property from the selected vector map that will be used to join on the terms in your terms-aggregation.
 When terms cannot be joined to any of the shapes in the vector layer because there is no exact match in the vector layer, Kibana will display a warning.
 To turn of these warnings, go to *Management/Kibana/Advanced Settings* and set `visualization:regionmap:showWarnings` to `false`.
 
@@ -46,4 +49,4 @@ To turn of these warnings, go to *Management/Kibana/Advanced Settings* and set `
 [float]
 ===== Basic Settings
 - *Legend Position*: the location on the screen where the legend should be rendered.
-- *Show Tooltip*: indicates whether a tooltip should be displayed when hovering over a shape..  
\ No newline at end of file
+- *Show Tooltip*: indicates whether a tooltip should be displayed when hovering over a shape..
diff --git a/docs/visualize/tilemap.asciidoc b/docs/visualize/tilemap.asciidoc
index 157eb502bedb7d..0e89704b8ba0b2 100644
--- a/docs/visualize/tilemap.asciidoc
+++ b/docs/visualize/tilemap.asciidoc
@@ -3,7 +3,10 @@
 
 A coordinate map displays a geographic area overlaid with circles keyed to the data determined by the buckets you specify.
 
-NOTE: By default, Kibana uses the https://www.elastic.co/elastic-maps-service[Elastic Maps Service]
+Kibana’s out-of-the-box settings do not show a coordinate map in the New Visualization menu. Use <<maps>> instead, which offers more functionality and is easier to use.
+If you want to create new coordinate map visualizations, set `xpack.maps.showMapVisualizationTypes` to `true`.
+
+Kibana uses the https://www.elastic.co/elastic-maps-service[Elastic Maps Service]
 to display map tiles. To use other tile service providers, configure the <<tilemap-settings,tilemap settings>>
 in `kibana.yml`.
 
diff --git a/package.json b/package.json
index ffd0e9387809db..a8e60e9749f724 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "**/typescript": "3.5.3",
     "**/graphql-toolkit/lodash": "^4.17.13",
     "**/isomorphic-git/**/base64-js": "^1.2.1",
-    "**/babel-plugin-inline-react-svg/svgo/js-yaml": "^3.13.1"
+    "**/image-diff/gm/debug": "^2.6.9"
   },
   "workspaces": {
     "packages": [
@@ -106,10 +106,10 @@
   "dependencies": {
     "@babel/core": "^7.5.5",
     "@babel/register": "^7.5.5",
-    "@elastic/charts": "^13.5.4",
+    "@elastic/charts": "^13.5.12",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
-    "@elastic/eui": "14.5.0",
+    "@elastic/eui": "14.8.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",
@@ -155,11 +155,11 @@
     "custom-event-polyfill": "^0.3.0",
     "d3": "3.5.17",
     "d3-cloud": "1.2.5",
-    "del": "^4.1.1",
-    "elasticsearch": "^16.4.0",
-    "elasticsearch-browser": "^16.4.0",
+    "del": "^5.1.0",
+    "elasticsearch": "^16.5.0",
+    "elasticsearch-browser": "^16.5.0",
     "encode-uri-query": "1.0.1",
-    "execa": "^1.0.0",
+    "execa": "^3.2.0",
     "expiry-js": "0.1.7",
     "file-loader": "4.2.0",
     "font-awesome": "4.7.0",
@@ -198,8 +198,8 @@
     "markdown-it": "^8.4.1",
     "mini-css-extract-plugin": "0.8.0",
     "minimatch": "^3.0.4",
-    "moment": "^2.20.1",
-    "moment-timezone": "^0.5.14",
+    "moment": "^2.24.0",
+    "moment-timezone": "^0.5.27",
     "mustache": "2.3.2",
     "ngreact": "0.5.1",
     "node-fetch": "1.7.3",
@@ -232,12 +232,10 @@
     "request": "^2.88.0",
     "reselect": "^3.0.1",
     "resize-observer-polyfill": "^1.5.0",
-    "rimraf": "2.7.1",
     "rison-node": "1.0.2",
-    "rxjs": "^6.2.1",
+    "rxjs": "^6.5.3",
     "script-loader": "0.7.2",
     "semver": "^5.5.0",
-    "stream-stream": "^1.2.6",
     "style-it": "^2.1.3",
     "style-loader": "0.23.1",
     "symbol-observable": "^1.2.0",
@@ -247,8 +245,6 @@
     "tinygradient": "0.4.3",
     "tinymath": "1.2.1",
     "topojson-client": "3.0.0",
-    "trunc-html": "1.1.2",
-    "trunc-text": "1.0.2",
     "tslib": "^1.9.3",
     "type-detect": "^4.0.8",
     "ui-select": "0.19.8",
@@ -275,7 +271,7 @@
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
     "@elastic/github-checks-reporter": "0.0.20b3",
-    "@elastic/makelogs": "^4.5.0",
+    "@elastic/makelogs": "^5.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/es": "1.0.0",
     "@kbn/eslint-import-resolver-kibana": "2.0.0",
@@ -302,7 +298,6 @@
     "@types/elasticsearch": "^5.0.33",
     "@types/enzyme": "^3.9.0",
     "@types/eslint": "^6.1.2",
-    "@types/execa": "^0.9.0",
     "@types/fetch-mock": "^7.3.1",
     "@types/getopts": "^2.0.1",
     "@types/glob": "^7.1.1",
@@ -313,7 +308,6 @@
     "@types/has-ansi": "^3.0.0",
     "@types/history": "^4.7.3",
     "@types/hoek": "^4.1.3",
-    "@types/humps": "^1.1.2",
     "@types/jest": "^24.0.18",
     "@types/joi": "^13.4.2",
     "@types/jquery": "^3.3.31",
@@ -326,7 +320,7 @@
     "@types/markdown-it": "^0.0.7",
     "@types/minimatch": "^2.0.29",
     "@types/mocha": "^5.2.7",
-    "@types/moment-timezone": "^0.5.8",
+    "@types/moment-timezone": "^0.5.12",
     "@types/mustache": "^0.8.31",
     "@types/node": "^10.12.27",
     "@types/opn": "^5.1.0",
@@ -341,13 +335,13 @@
     "@types/redux": "^3.6.31",
     "@types/redux-actions": "^2.2.1",
     "@types/request": "^2.48.2",
-    "@types/rimraf": "^2.0.2",
     "@types/selenium-webdriver": "^4.0.3",
     "@types/semver": "^5.5.0",
     "@types/sinon": "^7.0.13",
     "@types/strip-ansi": "^3.0.0",
     "@types/styled-components": "^3.0.2",
     "@types/supertest": "^2.0.5",
+    "@types/supertest-as-promised": "^2.0.38",
     "@types/type-detect": "^4.0.1",
     "@types/uuid": "^3.4.4",
     "@types/vinyl-fs": "^2.4.11",
@@ -356,6 +350,7 @@
     "@typescript-eslint/parser": "^2.5.0",
     "angular-mocks": "^1.7.8",
     "archiver": "^3.1.1",
+    "axe-core": "^3.3.2",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
     "babel-plugin-dynamic-import-node": "^2.3.0",
@@ -365,7 +360,7 @@
     "chance": "1.0.18",
     "cheerio": "0.22.0",
     "chokidar": "3.2.1",
-    "chromedriver": "^77.0.0",
+    "chromedriver": "^78.0.1",
     "classnames": "2.2.6",
     "dedent": "^0.7.0",
     "delete-empty": "^2.0.0",
diff --git a/packages/elastic-datemath/package.json b/packages/elastic-datemath/package.json
index 53c8459821147a..57873d28d372de 100644
--- a/packages/elastic-datemath/package.json
+++ b/packages/elastic-datemath/package.json
@@ -14,12 +14,12 @@
     "@babel/cli": "^7.5.5",
     "@babel/preset-env": "^7.5.5",
     "babel-plugin-add-module-exports": "^1.0.2",
-    "moment": "^2.13.0"
+    "moment": "^2.24.0"
   },
   "dependencies": {
     "tslib": "^1.9.3"
   },
   "peerDependencies": {
-    "moment": "^2.13.0"
+    "moment": "^2.24.0"
   }
 }
diff --git a/packages/eslint-config-kibana/.eslintrc.js b/packages/eslint-config-kibana/.eslintrc.js
index 4412ce81368a1b..36f0b95c8e69b6 100644
--- a/packages/eslint-config-kibana/.eslintrc.js
+++ b/packages/eslint-config-kibana/.eslintrc.js
@@ -3,6 +3,7 @@ module.exports = {
     './javascript.js',
     './typescript.js',
     './jest.js',
+    './react.js',
   ],
   plugins: ['@kbn/eslint-plugin-eslint'],
 
diff --git a/packages/eslint-config-kibana/javascript.js b/packages/eslint-config-kibana/javascript.js
index 8462da5cac801c..0c79669c15e733 100644
--- a/packages/eslint-config-kibana/javascript.js
+++ b/packages/eslint-config-kibana/javascript.js
@@ -1,6 +1,3 @@
-const semver = require('semver');
-const { readdirSync } = require('fs');
-const PKG = require('../../package.json');
 const RESTRICTED_GLOBALS = require('./restricted_globals');
 const RESTRICTED_MODULES = { paths: ['gulp-util'] };
 
@@ -16,18 +13,12 @@ module.exports = {
       plugins: [
         'mocha',
         'babel',
-        'react',
-        'react-hooks',
         'import',
         'no-unsanitized',
         'prefer-object-spread',
-        'jsx-a11y',
       ],
 
       settings: {
-        react: {
-          version: semver.valid(semver.coerce(PKG.dependencies.react)),
-        },
         'import/resolver': {
           '@kbn/eslint-import-resolver-kibana': {
             forceNode: true,
@@ -120,64 +111,6 @@ module.exports = {
         'object-curly-spacing': 'off', // overridden with babel/object-curly-spacing
         'babel/object-curly-spacing': [ 'error', 'always' ],
 
-        'jsx-quotes': ['error', 'prefer-double'],
-        'react/jsx-uses-react': 'error',
-        'react/react-in-jsx-scope': 'error',
-        'react/jsx-uses-vars': 'error',
-        'react/jsx-no-undef': 'error',
-        'react/jsx-pascal-case': 'error',
-        'react/jsx-closing-bracket-location': ['error', 'line-aligned'],
-        'react/jsx-closing-tag-location': 'error',
-        'react/jsx-curly-spacing': ['error', 'never', { allowMultiline: true }],
-        'react/jsx-indent-props': ['error', 2],
-        'react/jsx-max-props-per-line': ['error', { maximum: 1, when: 'multiline' }],
-        'react/jsx-no-duplicate-props': ['error', { ignoreCase: true }],
-        'react/no-danger': 'error',
-        'react/self-closing-comp': 'error',
-        'react/jsx-wrap-multilines': ['error', {
-          declaration: true,
-          assignment: true,
-          return: true,
-          arrow: true,
-        }],
-        'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'],
-        'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks
-        'react-hooks/exhaustive-deps': 'warn', // Checks effect dependencies
-        'jsx-a11y/accessible-emoji': 'error',
-        'jsx-a11y/alt-text': 'error',
-        'jsx-a11y/anchor-has-content': 'error',
-        'jsx-a11y/aria-activedescendant-has-tabindex': 'error',
-        'jsx-a11y/aria-props': 'error',
-        'jsx-a11y/aria-proptypes': 'error',
-        'jsx-a11y/aria-role': 'error',
-        'jsx-a11y/aria-unsupported-elements': 'error',
-        'jsx-a11y/heading-has-content': 'error',
-        'jsx-a11y/html-has-lang': 'error',
-        'jsx-a11y/iframe-has-title': 'error',
-        'jsx-a11y/interactive-supports-focus': 'error',
-        'jsx-a11y/media-has-caption': 'error',
-        'jsx-a11y/mouse-events-have-key-events': 'error',
-        'jsx-a11y/no-access-key': 'error',
-        'jsx-a11y/no-distracting-elements': 'error',
-        'jsx-a11y/no-interactive-element-to-noninteractive-role': 'error',
-        'jsx-a11y/no-noninteractive-element-interactions': 'error',
-        'jsx-a11y/no-noninteractive-element-to-interactive-role': 'error',
-        'jsx-a11y/no-redundant-roles': 'error',
-        'jsx-a11y/role-has-required-aria-props': 'error',
-        'jsx-a11y/role-supports-aria-props': 'error',
-        'jsx-a11y/scope': 'error',
-        'jsx-a11y/tabindex-no-positive': 'error',
-        'jsx-a11y/label-has-associated-control': 'error',
-        'react/jsx-equals-spacing': ['error', 'never'],
-        'react/jsx-indent': ['error', 2],
-        'react/no-will-update-set-state': 'error',
-        'react/no-is-mounted': 'error',
-        'react/no-multi-comp': ['error', { ignoreStateless: true }],
-        'react/no-unknown-property': 'error',
-        'react/prefer-es6-class': ['error', 'always'],
-        'react/prefer-stateless-function': ['error', { ignorePureComponents: true }],
-        'react/no-unescaped-entities': 'error',
-
         'mocha/handle-done-callback': 'error',
         'mocha/no-exclusive-tests': 'error',
 
diff --git a/packages/eslint-config-kibana/react.js b/packages/eslint-config-kibana/react.js
new file mode 100644
index 00000000000000..163bd6ca73a07b
--- /dev/null
+++ b/packages/eslint-config-kibana/react.js
@@ -0,0 +1,84 @@
+const semver = require('semver')
+const PKG = require('../../package.json')
+
+module.exports = {
+  plugins: [
+    'react',
+    'react-hooks',
+    'jsx-a11y',
+  ],
+
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true
+    }
+  },
+
+  settings: {
+    react: {
+      version: semver.valid(semver.coerce(PKG.dependencies.react)),
+    },
+  },
+
+  rules: {
+    'jsx-quotes': ['error', 'prefer-double'],
+    'react/jsx-uses-react': 'error',
+    'react/react-in-jsx-scope': 'error',
+    'react/jsx-uses-vars': 'error',
+    'react/jsx-no-undef': 'error',
+    'react/jsx-pascal-case': 'error',
+    'react/jsx-closing-bracket-location': ['error', 'line-aligned'],
+    'react/jsx-closing-tag-location': 'error',
+    'react/jsx-curly-spacing': ['error', 'never', { allowMultiline: true }],
+    'react/jsx-indent-props': ['error', 2],
+    'react/jsx-max-props-per-line': ['error', { maximum: 1, when: 'multiline' }],
+    'react/jsx-no-duplicate-props': ['error', { ignoreCase: true }],
+    'react/no-danger': 'error',
+    'react/self-closing-comp': 'error',
+    'react/jsx-wrap-multilines': ['error', {
+      declaration: true,
+      assignment: true,
+      return: true,
+      arrow: true,
+    }],
+    'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'],
+    'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks
+    'react-hooks/exhaustive-deps': 'error', // Checks effect dependencies
+    'jsx-a11y/accessible-emoji': 'error',
+    'jsx-a11y/alt-text': 'error',
+    'jsx-a11y/anchor-has-content': 'error',
+    'jsx-a11y/aria-activedescendant-has-tabindex': 'error',
+    'jsx-a11y/aria-props': 'error',
+    'jsx-a11y/aria-proptypes': 'error',
+    'jsx-a11y/aria-role': 'error',
+    'jsx-a11y/aria-unsupported-elements': 'error',
+    'jsx-a11y/click-events-have-key-events': 'error',
+    'jsx-a11y/heading-has-content': 'error',
+    'jsx-a11y/html-has-lang': 'error',
+    'jsx-a11y/iframe-has-title': 'error',
+    'jsx-a11y/interactive-supports-focus': 'error',
+    'jsx-a11y/label-has-associated-control': 'error',
+    'jsx-a11y/media-has-caption': 'error',
+    'jsx-a11y/mouse-events-have-key-events': 'error',
+    'jsx-a11y/no-access-key': 'error',
+    'jsx-a11y/no-distracting-elements': 'error',
+    'jsx-a11y/no-interactive-element-to-noninteractive-role': 'error',
+    'jsx-a11y/no-noninteractive-element-interactions': 'error',
+    'jsx-a11y/no-noninteractive-element-to-interactive-role': 'error',
+    'jsx-a11y/no-onchange': 'error',
+    'jsx-a11y/no-redundant-roles': 'error',
+    'jsx-a11y/role-has-required-aria-props': 'error',
+    'jsx-a11y/role-supports-aria-props': 'error',
+    'jsx-a11y/scope': 'error',
+    'jsx-a11y/tabindex-no-positive': 'error',
+    'react/jsx-equals-spacing': ['error', 'never'],
+    'react/jsx-indent': ['error', 2],
+    'react/no-will-update-set-state': 'error',
+    'react/no-is-mounted': 'error',
+    'react/no-multi-comp': ['error', { ignoreStateless: true }],
+    'react/no-unknown-property': 'error',
+    'react/prefer-es6-class': ['error', 'always'],
+    'react/prefer-stateless-function': ['error', { ignorePureComponents: true }],
+    'react/no-unescaped-entities': 'error',
+  },
+}
diff --git a/packages/eslint-config-kibana/typescript.js b/packages/eslint-config-kibana/typescript.js
index 7653c9bb0c3323..757616f36180b6 100644
--- a/packages/eslint-config-kibana/typescript.js
+++ b/packages/eslint-config-kibana/typescript.js
@@ -18,7 +18,6 @@ module.exports = {
         '@typescript-eslint',
         'ban',
         'import',
-        'jsx-a11y',
         'prefer-object-spread',
       ],
 
@@ -171,33 +170,6 @@ module.exports = {
             {'name': ['test', 'only'], 'message': 'No exclusive tests.'},
 
           ],
-          'jsx-a11y/accessible-emoji': 'error',
-          'jsx-a11y/alt-text': 'error',
-          'jsx-a11y/anchor-has-content': 'error',
-          'jsx-a11y/aria-activedescendant-has-tabindex': 'error',
-          'jsx-a11y/aria-props': 'error',
-          'jsx-a11y/aria-proptypes': 'error',
-          'jsx-a11y/aria-role': 'error',
-          'jsx-a11y/aria-unsupported-elements': 'error',
-          'jsx-a11y/click-events-have-key-events': 'error',
-          'jsx-a11y/heading-has-content': 'error',
-          'jsx-a11y/html-has-lang': 'error',
-          'jsx-a11y/iframe-has-title': 'error',
-          'jsx-a11y/interactive-supports-focus': 'error',
-          'jsx-a11y/media-has-caption': 'error',
-          'jsx-a11y/mouse-events-have-key-events': 'error',
-          'jsx-a11y/no-access-key': 'error',
-          'jsx-a11y/no-distracting-elements': 'error',
-          'jsx-a11y/no-interactive-element-to-noninteractive-role': 'error',
-          'jsx-a11y/no-noninteractive-element-interactions': 'error',
-          'jsx-a11y/no-noninteractive-element-to-interactive-role': 'error',
-          'jsx-a11y/no-onchange': 'error',
-          'jsx-a11y/no-redundant-roles': 'error',
-          'jsx-a11y/role-has-required-aria-props': 'error',
-          'jsx-a11y/role-supports-aria-props': 'error',
-          'jsx-a11y/scope': 'error',
-          'jsx-a11y/tabindex-no-positive': 'error',
-          'jsx-a11y/label-has-associated-control': 'error',
           'import/no-default-export': 'error',
         },
         eslintConfigPrettierTypescriptEslintRules
diff --git a/packages/kbn-babel-preset/node_preset.js b/packages/kbn-babel-preset/node_preset.js
index 5ef4219df59f75..793044e3796ea0 100644
--- a/packages/kbn-babel-preset/node_preset.js
+++ b/packages/kbn-babel-preset/node_preset.js
@@ -18,6 +18,25 @@
  */
 
 module.exports = (_, options = {}) => {
+  const overrides = [];
+  if (!process.env.ALLOW_PERFORMANCE_HOOKS_IN_TASK_MANAGER) {
+    overrides.push(
+      {
+        test: [/x-pack[\/\\]legacy[\/\\]plugins[\/\\]task_manager/],
+        plugins: [
+          [
+            require.resolve('babel-plugin-filter-imports'),
+            {
+              imports: {
+                perf_hooks: ['performance'],
+              },
+            },
+          ],
+        ],
+      }
+    );
+  }
+
   return {
     presets: [
       [
@@ -39,7 +58,7 @@ module.exports = (_, options = {}) => {
           modules: 'cjs',
           corejs: 3,
 
-          ...(options['@babel/preset-env'] || {})
+          ...(options['@babel/preset-env'] || {}),
         },
       ],
       require('./common_preset'),
@@ -48,9 +67,10 @@ module.exports = (_, options = {}) => {
       [
         require.resolve('babel-plugin-transform-define'),
         {
-          'global.__BUILT_WITH_BABEL__': 'true'
-        }
-      ]
-    ]
+          'global.__BUILT_WITH_BABEL__': 'true',
+        },
+      ],
+    ],
+    overrides,
   };
 };
diff --git a/packages/kbn-babel-preset/package.json b/packages/kbn-babel-preset/package.json
index 4b183577453606..c22cf175b29e59 100644
--- a/packages/kbn-babel-preset/package.json
+++ b/packages/kbn-babel-preset/package.json
@@ -8,10 +8,11 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-transform-modules-commonjs": "^7.5.0",
     "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react":"^7.0.0",
+    "@babel/preset-react": "^7.0.0",
     "@babel/preset-typescript": "^7.3.3",
     "@kbn/elastic-idx": "1.0.0",
     "babel-plugin-add-module-exports": "^1.0.2",
+    "babel-plugin-filter-imports": "^3.0.0",
     "babel-plugin-transform-define": "^1.3.1",
     "babel-plugin-typescript-strip-namespaces": "^1.1.1"
   }
diff --git a/packages/kbn-config-schema/package.json b/packages/kbn-config-schema/package.json
index cd5ae010f998b7..4880fb4ebfdeeb 100644
--- a/packages/kbn-config-schema/package.json
+++ b/packages/kbn-config-schema/package.json
@@ -14,7 +14,7 @@
   },
   "peerDependencies": {
     "joi": "^13.5.2",
-    "moment": "^2.20.1",
+    "moment": "^2.24.0",
     "type-detect": "^4.0.8"
   }
 }
diff --git a/packages/kbn-config-schema/src/errors/validation_error.ts b/packages/kbn-config-schema/src/errors/validation_error.ts
index 39aac67c208f57..d688d022da85cd 100644
--- a/packages/kbn-config-schema/src/errors/validation_error.ts
+++ b/packages/kbn-config-schema/src/errors/validation_error.ts
@@ -20,17 +20,18 @@
 import { SchemaError, SchemaTypeError, SchemaTypesError } from '.';
 
 export class ValidationError extends SchemaError {
-  public static extractMessage(error: SchemaTypeError, namespace?: string) {
+  private static extractMessage(error: SchemaTypeError, namespace?: string, level?: number) {
     const path = typeof namespace === 'string' ? [namespace, ...error.path] : error.path;
 
     let message = error.message;
     if (error instanceof SchemaTypesError) {
+      const indentLevel = level || 0;
       const childErrorMessages = error.errors.map(childError =>
-        ValidationError.extractMessage(childError, namespace)
+        ValidationError.extractMessage(childError, namespace, indentLevel + 1)
       );
 
       message = `${message}\n${childErrorMessages
-        .map(childErrorMessage => `- ${childErrorMessage}`)
+        .map(childErrorMessage => `${' '.repeat(indentLevel)}- ${childErrorMessage}`)
         .join('\n')}`;
     }
 
diff --git a/packages/kbn-config-schema/src/types/map_of_type.test.ts b/packages/kbn-config-schema/src/types/map_of_type.test.ts
index 1b72d39fcec263..6b9b700efdc3c3 100644
--- a/packages/kbn-config-schema/src/types/map_of_type.test.ts
+++ b/packages/kbn-config-schema/src/types/map_of_type.test.ts
@@ -108,3 +108,23 @@ test('object within mapOf', () => {
 
   expect(type.validate(value)).toEqual(expected);
 });
+
+test('error preserves full path', () => {
+  const type = schema.object({
+    grandParentKey: schema.object({
+      parentKey: schema.mapOf(schema.string({ minLength: 2 }), schema.number()),
+    }),
+  });
+
+  expect(() =>
+    type.validate({ grandParentKey: { parentKey: { a: 'some-value' } } })
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"[grandParentKey.parentKey.key(\\"a\\")]: value is [a] but it must have a minimum length of [2]."`
+  );
+
+  expect(() =>
+    type.validate({ grandParentKey: { parentKey: { ab: 'some-value' } } })
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"[grandParentKey.parentKey.ab]: expected value of type [number] but got [string]"`
+  );
+});
diff --git a/packages/kbn-config-schema/src/types/map_type.ts b/packages/kbn-config-schema/src/types/map_type.ts
index 3acf14a69125e1..c637eccb795715 100644
--- a/packages/kbn-config-schema/src/types/map_type.ts
+++ b/packages/kbn-config-schema/src/types/map_type.ts
@@ -50,7 +50,7 @@ export class MapOfType<K, V> extends Type<Map<K, V>> {
         return `expected value of type [Map] or [object] but got [${typeDetect(value)}]`;
       case 'map.key':
       case 'map.value':
-        const childPathWithIndex = reason.path.slice();
+        const childPathWithIndex = path.slice();
         childPathWithIndex.splice(
           path.length,
           0,
diff --git a/packages/kbn-config-schema/src/types/one_of_type.test.ts b/packages/kbn-config-schema/src/types/one_of_type.test.ts
index 72119e761590b1..c84ae49df7aefb 100644
--- a/packages/kbn-config-schema/src/types/one_of_type.test.ts
+++ b/packages/kbn-config-schema/src/types/one_of_type.test.ts
@@ -125,3 +125,20 @@ test('fails if not matching literal', () => {
 
   expect(() => type.validate('bar')).toThrowErrorMatchingSnapshot();
 });
+
+test('fails if nested union type fail', () => {
+  const type = schema.oneOf([
+    schema.oneOf([schema.boolean()]),
+    schema.oneOf([schema.oneOf([schema.object({}), schema.number()])]),
+  ]);
+
+  expect(() => type.validate('aaa')).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: types that failed validation:
+ - [0]: expected value of type [boolean] but got [string]
+- [1]: types that failed validation:
+ - [0]: types that failed validation:
+  - [0]: expected a plain object value, but found [string] instead.
+  - [1]: expected value of type [number] but got [string]"
+`);
+});
diff --git a/packages/kbn-config-schema/src/types/record_of_type.test.ts b/packages/kbn-config-schema/src/types/record_of_type.test.ts
index 036e34213411fd..2172160e8d1810 100644
--- a/packages/kbn-config-schema/src/types/record_of_type.test.ts
+++ b/packages/kbn-config-schema/src/types/record_of_type.test.ts
@@ -120,3 +120,23 @@ test('object within recordOf', () => {
 
   expect(type.validate(value)).toEqual({ foo: { bar: 123 } });
 });
+
+test('error preserves full path', () => {
+  const type = schema.object({
+    grandParentKey: schema.object({
+      parentKey: schema.recordOf(schema.string({ minLength: 2 }), schema.number()),
+    }),
+  });
+
+  expect(() =>
+    type.validate({ grandParentKey: { parentKey: { a: 'some-value' } } })
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"[grandParentKey.parentKey.key(\\"a\\")]: value is [a] but it must have a minimum length of [2]."`
+  );
+
+  expect(() =>
+    type.validate({ grandParentKey: { parentKey: { ab: 'some-value' } } })
+  ).toThrowErrorMatchingInlineSnapshot(
+    `"[grandParentKey.parentKey.ab]: expected value of type [number] but got [string]"`
+  );
+});
diff --git a/packages/kbn-config-schema/src/types/record_type.ts b/packages/kbn-config-schema/src/types/record_type.ts
index cefb0a7921f4d4..82e585f685c569 100644
--- a/packages/kbn-config-schema/src/types/record_type.ts
+++ b/packages/kbn-config-schema/src/types/record_type.ts
@@ -42,7 +42,7 @@ export class RecordOfType<K extends string, V> extends Type<Record<K, V>> {
         return `expected value of type [object] but got [${typeDetect(value)}]`;
       case 'record.key':
       case 'record.value':
-        const childPathWithIndex = reason.path.slice();
+        const childPathWithIndex = path.slice();
         childPathWithIndex.splice(
           path.length,
           0,
diff --git a/packages/kbn-config-schema/src/types/union_type.ts b/packages/kbn-config-schema/src/types/union_type.ts
index e6efb4afb66aa9..f4de829204e80b 100644
--- a/packages/kbn-config-schema/src/types/union_type.ts
+++ b/packages/kbn-config-schema/src/types/union_type.ts
@@ -41,7 +41,9 @@ export class UnionType<RTS extends Array<Type<any>>, T> extends Type<T> {
             const childPathWithIndex = e.path.slice();
             childPathWithIndex.splice(path.length, 0, index.toString());
 
-            return new SchemaTypeError(e.message, childPathWithIndex);
+            return e instanceof SchemaTypesError
+              ? new SchemaTypesError(e.message, childPathWithIndex, e.errors)
+              : new SchemaTypeError(e.message, childPathWithIndex);
           })
         );
     }
diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json
index 5c64be294f7075..e8781f6d901d92 100644
--- a/packages/kbn-dev-utils/package.json
+++ b/packages/kbn-dev-utils/package.json
@@ -12,11 +12,11 @@
   "dependencies": {
     "chalk": "^2.4.2",
     "dedent": "^0.7.0",
-    "execa": "^1.0.0",
+    "execa": "^3.2.0",
     "exit-hook": "^2.2.0",
     "getopts": "^2.2.5",
-    "moment": "^2.20.1",
-    "rxjs": "^6.2.1",
+    "moment": "^2.24.0",
+    "rxjs": "^6.5.3",
     "tree-kill": "^1.2.1",
     "tslib": "^1.9.3"
   },
diff --git a/packages/kbn-dev-utils/src/proc_runner/proc.ts b/packages/kbn-dev-utils/src/proc_runner/proc.ts
index f29fb5f4b17f6c..c899293191f2a7 100644
--- a/packages/kbn-dev-utils/src/proc_runner/proc.ts
+++ b/packages/kbn-dev-utils/src/proc_runner/proc.ts
@@ -87,6 +87,7 @@ export function startProc(name: string, options: ProcOptions, log: ToolingLog) {
     cwd,
     env,
     stdio: ['pipe', 'pipe', 'pipe'],
+    preferLocal: true,
   });
 
   if (stdin) {
@@ -99,9 +100,9 @@ export function startProc(name: string, options: ProcOptions, log: ToolingLog) {
 
   const outcome$: Rx.Observable<number | null> = Rx.race(
     // observe first exit event
-    Rx.fromEvent(childProcess, 'exit').pipe(
+    Rx.fromEvent<[number]>(childProcess, 'exit').pipe(
       take(1),
-      map(([code]: [number]) => {
+      map(([code]) => {
         if (stopCalled) {
           return null;
         }
diff --git a/packages/kbn-es-query/package.json b/packages/kbn-es-query/package.json
index 5ef1b6e1254135..2cd2a8f53d2eed 100644
--- a/packages/kbn-es-query/package.json
+++ b/packages/kbn-es-query/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "lodash": "npm:@elastic/lodash@3.10.1-kibana3",
-    "moment-timezone": "^0.5.14",
+    "moment-timezone": "^0.5.27",
     "@kbn/i18n": "1.0.0"
   },
   "devDependencies": {
@@ -21,7 +21,7 @@
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/expect": "1.0.0",
-    "del": "^4.1.1",
+    "del": "^5.1.0",
     "getopts": "^2.2.4",
     "supports-color": "^7.0.0"
   }
diff --git a/packages/kbn-es-query/src/__fixtures__/index_pattern_response.json b/packages/kbn-es-query/src/__fixtures__/index_pattern_response.json
index 408e839596ae2f..588e6ada69cfe4 100644
--- a/packages/kbn-es-query/src/__fixtures__/index_pattern_response.json
+++ b/packages/kbn-es-query/src/__fixtures__/index_pattern_response.json
@@ -161,8 +161,7 @@
       "searchable": true,
       "aggregatable": true,
       "readFromDocValues": true,
-      "parent": "machine.os",
-      "subType": "multi"
+      "subType": { "multi": { "parent": "machine.os" } }
     },
     {
       "name": "geo.src",
@@ -277,6 +276,28 @@
       "searchable": true,
       "aggregatable": true,
       "readFromDocValues": false
+    },
+    {
+      "name": "nestedField.child",
+      "type": "string",
+      "esTypes": ["text"],
+      "count": 0,
+      "scripted": false,
+      "searchable": true,
+      "aggregatable": false,
+      "readFromDocValues": false,
+      "subType": { "nested": { "path": "nestedField" } }
+    },
+    {
+      "name": "nestedField.nestedChild.doublyNestedChild",
+      "type": "string",
+      "esTypes": ["text"],
+      "count": 0,
+      "scripted": false,
+      "searchable": true,
+      "aggregatable": false,
+      "readFromDocValues": false,
+      "subType": { "nested": { "path": "nestedField.nestedChild" } }
     }
   ]
 }
diff --git a/packages/kbn-es-query/src/es_query/migrate_filter.js b/packages/kbn-es-query/src/es_query/migrate_filter.js
index d5f52648b027e2..b74fc485a6184f 100644
--- a/packages/kbn-es-query/src/es_query/migrate_filter.js
+++ b/packages/kbn-es-query/src/es_query/migrate_filter.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { getConvertedValueForField } from '../filters';
+import { getConvertedValueForField } from '../utils/filters';
 
 export function migrateFilter(filter, indexPattern) {
   if (filter.match) {
diff --git a/packages/kbn-es-query/src/filters/__tests__/phrase.js b/packages/kbn-es-query/src/filters/__tests__/phrase.js
deleted file mode 100644
index dbd794a018d9ea..00000000000000
--- a/packages/kbn-es-query/src/filters/__tests__/phrase.js
+++ /dev/null
@@ -1,92 +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 { buildInlineScriptForPhraseFilter, buildPhraseFilter } from '../phrase';
-import expect from '@kbn/expect';
-import _ from 'lodash';
-import indexPattern from '../../__fixtures__/index_pattern_response.json';
-import filterSkeleton from '../../__fixtures__/filter_skeleton';
-
-let expected;
-
-describe('Filter Manager', function () {
-  describe('Phrase filter builder', function () {
-    beforeEach(() => {
-      expected = _.cloneDeep(filterSkeleton);
-    });
-
-    it('should be a function', function () {
-      expect(buildPhraseFilter).to.be.a(Function);
-    });
-
-    it('should return a match query filter when passed a standard field', function () {
-      const field = getField(indexPattern, 'bytes');
-      expected.query = {
-        match_phrase: {
-          bytes: 5
-        }
-      };
-      expect(buildPhraseFilter(field, 5, indexPattern)).to.eql(expected);
-    });
-
-    it('should return a script filter when passed a scripted field', function () {
-      const field = getField(indexPattern, 'script number');
-      expected.meta.field = 'script number';
-      _.set(expected, 'script.script', {
-        source: '(' + field.script + ') == value',
-        lang: 'expression',
-        params: {
-          value: 5,
-        }
-      });
-      expect(buildPhraseFilter(field, 5, indexPattern)).to.eql(expected);
-    });
-  });
-
-  describe('buildInlineScriptForPhraseFilter', function () {
-
-    it('should wrap painless scripts in a lambda', function () {
-      const field = {
-        lang: 'painless',
-        script: 'return foo;',
-      };
-
-      const expected = `boolean compare(Supplier s, def v) {return s.get() == v;}` +
-                       `compare(() -> { return foo; }, params.value);`;
-
-      expect(buildInlineScriptForPhraseFilter(field)).to.be(expected);
-    });
-
-    it('should create a simple comparison for other langs', function () {
-      const field = {
-        lang: 'expression',
-        script: 'doc[bytes].value',
-      };
-
-      const expected = `(doc[bytes].value) == value`;
-
-      expect(buildInlineScriptForPhraseFilter(field)).to.be(expected);
-    });
-  });
-});
-
-function getField(indexPattern, name) {
-  return indexPattern.fields.find(field => field.name === name);
-}
diff --git a/packages/kbn-es-query/src/filters/__tests__/query.js b/packages/kbn-es-query/src/filters/__tests__/query.js
deleted file mode 100644
index 8b774f05c29d38..00000000000000
--- a/packages/kbn-es-query/src/filters/__tests__/query.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { buildQueryFilter } from '../query';
-import { cloneDeep } from 'lodash';
-import expect from '@kbn/expect';
-import indexPattern from '../../__fixtures__/index_pattern_response.json';
-import filterSkeleton from '../../__fixtures__/filter_skeleton';
-
-let expected;
-
-describe('Filter Manager', function () {
-  describe('Phrase filter builder', function () {
-    beforeEach(() => {
-      expected = cloneDeep(filterSkeleton);
-    });
-
-    it('should be a function', function () {
-      expect(buildQueryFilter).to.be.a(Function);
-    });
-
-    it('should return a query filter when passed a standard field', function () {
-      expected.query = {
-        foo: 'bar'
-      };
-      expect(buildQueryFilter({ foo: 'bar' }, indexPattern.id)).to.eql(expected);
-    });
-
-  });
-});
diff --git a/packages/kbn-es-query/src/filters/__tests__/range.js b/packages/kbn-es-query/src/filters/__tests__/range.js
deleted file mode 100644
index 9b23fc23908d4d..00000000000000
--- a/packages/kbn-es-query/src/filters/__tests__/range.js
+++ /dev/null
@@ -1,156 +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 { buildRangeFilter } from '../range';
-import expect from '@kbn/expect';
-import _ from 'lodash';
-import indexPattern from '../../__fixtures__/index_pattern_response.json';
-import filterSkeleton from '../../__fixtures__/filter_skeleton';
-
-let expected;
-
-describe('Filter Manager', function () {
-  describe('Range filter builder', function () {
-    beforeEach(() => {
-      expected = _.cloneDeep(filterSkeleton);
-    });
-
-    it('should be a function', function () {
-      expect(buildRangeFilter).to.be.a(Function);
-    });
-
-    it('should return a range filter when passed a standard field', function () {
-      const field = getField(indexPattern, 'bytes');
-      expected.range = {
-        bytes: {
-          gte: 1,
-          lte: 3
-        }
-      };
-      expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).to.eql(expected);
-    });
-
-    it('should return a script filter when passed a scripted field', function () {
-      const field = getField(indexPattern, 'script number');
-      expected.meta.field = 'script number';
-      _.set(expected, 'script.script', {
-        lang: 'expression',
-        source: '(' + field.script + ')>=gte && (' + field.script + ')<=lte',
-        params: {
-          value: '>=1 <=3',
-          gte: 1,
-          lte: 3
-        }
-      });
-      expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).to.eql(expected);
-    });
-
-    it('should wrap painless scripts in comparator lambdas', function () {
-      const field = getField(indexPattern, 'script date');
-      const expected = `boolean gte(Supplier s, def v) {return !s.get().toInstant().isBefore(Instant.parse(v))} ` +
-              `boolean lte(Supplier s, def v) {return !s.get().toInstant().isAfter(Instant.parse(v))}` +
-              `gte(() -> { ${field.script} }, params.gte) && ` +
-              `lte(() -> { ${field.script} }, params.lte)`;
-
-      const inlineScript = buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern).script.script.source;
-      expect(inlineScript).to.be(expected);
-    });
-
-    it('should throw an error when gte and gt, or lte and lt are both passed', function () {
-      const field = getField(indexPattern, 'script number');
-      expect(function () {
-        buildRangeFilter(field, { gte: 1, gt: 3 }, indexPattern);
-      }).to.throwError();
-      expect(function () {
-        buildRangeFilter(field, { lte: 1, lt: 3 }, indexPattern);
-      }).to.throwError();
-    });
-
-    it('to use the right operator for each of gte, gt, lt and lte', function () {
-      const field = getField(indexPattern, 'script number');
-      _.each({ gte: '>=', gt: '>', lte: '<=', lt: '<' }, function (operator, key) {
-        const params = {};
-        params[key] = 5;
-        const filter = buildRangeFilter(field, params, indexPattern);
-
-        expect(filter.script.script.source).to.be(
-          '(' + field.script + ')' + operator + key);
-        expect(filter.script.script.params[key]).to.be(5);
-        expect(filter.script.script.params.value).to.be(operator + 5);
-
-      });
-    });
-
-    describe('when given params where one side is infinite', function () {
-      const field = getField(indexPattern, 'script number');
-      let filter;
-      beforeEach(function () {
-        filter = buildRangeFilter(field, { gte: 0, lt: Infinity }, indexPattern);
-      });
-
-      describe('returned filter', function () {
-        it('is a script filter', function () {
-          expect(filter).to.have.property('script');
-        });
-
-        it('contain a param for the finite side', function () {
-          expect(filter.script.script.params).to.have.property('gte', 0);
-        });
-
-        it('does not contain a param for the infinite side', function () {
-          expect(filter.script.script.params).not.to.have.property('lt');
-        });
-
-        it('does not contain a script condition for the infinite side', function () {
-          const field = getField(indexPattern, 'script number');
-          const script = field.script;
-          expect(filter.script.script.source).to.equal(`(${script})>=gte`);
-        });
-      });
-    });
-
-    describe('when given params where both sides are infinite', function () {
-      const field = getField(indexPattern, 'script number');
-      let filter;
-      beforeEach(function () {
-        filter = buildRangeFilter(
-          field, { gte: -Infinity, lt: Infinity }, indexPattern);
-      });
-
-      describe('returned filter', function () {
-        it('is a match_all filter', function () {
-          expect(filter).not.to.have.property('script');
-          expect(filter).to.have.property('match_all');
-        });
-
-        it('does not contain params', function () {
-          expect(filter).not.to.have.property('params');
-        });
-
-        it('meta field is set to field name', function () {
-          expect(filter.meta.field).to.equal('script number');
-        });
-      });
-    });
-  });
-});
-
-function getField(indexPattern, name) {
-  return indexPattern.fields.find(field => field.name === name);
-}
diff --git a/packages/kbn-es-query/src/filters/exists.js b/packages/kbn-es-query/src/filters/exists.js
deleted file mode 100644
index 0c82279fb44176..00000000000000
--- a/packages/kbn-es-query/src/filters/exists.js
+++ /dev/null
@@ -1,30 +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.
- */
-
-// Creates a filter where the given field exists
-export function buildExistsFilter(field, indexPattern) {
-  return {
-    meta: {
-      index: indexPattern.id
-    },
-    exists: {
-      field: field.name
-    }
-  };
-}
diff --git a/packages/kbn-es-query/src/filters/index.d.ts b/packages/kbn-es-query/src/filters/index.d.ts
deleted file mode 100644
index c05e32dbf07b95..00000000000000
--- a/packages/kbn-es-query/src/filters/index.d.ts
+++ /dev/null
@@ -1,51 +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 { CustomFilter, ExistsFilter, PhraseFilter, PhrasesFilter, RangeFilter } from './lib';
-import { RangeFilterParams } from './lib/range_filter';
-
-export * from './lib';
-
-// We can't import the real types from the data plugin, so need to either duplicate
-// them here or figure out another solution, perhaps housing them in this package
-type Field = any;
-type IndexPattern = any;
-
-export function buildExistsFilter(field: Field, indexPattern: IndexPattern): ExistsFilter;
-
-export function buildPhraseFilter(
-  field: Field,
-  value: string,
-  indexPattern: IndexPattern
-): PhraseFilter;
-
-export function buildPhrasesFilter(
-  field: Field,
-  values: string[],
-  indexPattern: IndexPattern
-): PhrasesFilter;
-
-export function buildQueryFilter(query: any, index: string, alias?: string): CustomFilter;
-
-export function buildRangeFilter(
-  field: Field,
-  params: RangeFilterParams,
-  indexPattern: IndexPattern,
-  formattedValue?: string
-): RangeFilter;
diff --git a/packages/kbn-es-query/src/filters/index.js b/packages/kbn-es-query/src/filters/index.js
deleted file mode 100644
index d7d092eabd8a2f..00000000000000
--- a/packages/kbn-es-query/src/filters/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from './exists';
-export * from './phrase';
-export * from './phrases';
-export * from './query';
-export * from './range';
-export * from './lib';
diff --git a/packages/kbn-es-query/src/filters/lib/index.ts b/packages/kbn-es-query/src/filters/lib/index.ts
deleted file mode 100644
index ea023987103414..00000000000000
--- a/packages/kbn-es-query/src/filters/lib/index.ts
+++ /dev/null
@@ -1,95 +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.
- */
-
-// The interface the other filters extend
-export * from './meta_filter';
-
-// The actual filter types
-import { CustomFilter } from './custom_filter';
-import { ExistsFilter, isExistsFilter } from './exists_filter';
-import { GeoBoundingBoxFilter, isGeoBoundingBoxFilter } from './geo_bounding_box_filter';
-import { GeoPolygonFilter, isGeoPolygonFilter } from './geo_polygon_filter';
-import {
-  PhraseFilter,
-  isPhraseFilter,
-  isScriptedPhraseFilter,
-  getPhraseFilterField,
-  getPhraseFilterValue,
-} from './phrase_filter';
-import { PhrasesFilter, isPhrasesFilter } from './phrases_filter';
-import { QueryStringFilter, isQueryStringFilter } from './query_string_filter';
-import {
-  RangeFilter,
-  isRangeFilter,
-  isScriptedRangeFilter,
-  RangeFilterParams,
-} from './range_filter';
-import { MatchAllFilter, isMatchAllFilter } from './match_all_filter';
-import { MissingFilter, isMissingFilter } from './missing_filter';
-
-export {
-  CustomFilter,
-  ExistsFilter,
-  isExistsFilter,
-  GeoBoundingBoxFilter,
-  isGeoBoundingBoxFilter,
-  GeoPolygonFilter,
-  isGeoPolygonFilter,
-  PhraseFilter,
-  isPhraseFilter,
-  isScriptedPhraseFilter,
-  getPhraseFilterField,
-  getPhraseFilterValue,
-  PhrasesFilter,
-  isPhrasesFilter,
-  QueryStringFilter,
-  isQueryStringFilter,
-  RangeFilter,
-  isRangeFilter,
-  isScriptedRangeFilter,
-  RangeFilterParams,
-  MatchAllFilter,
-  isMatchAllFilter,
-  MissingFilter,
-  isMissingFilter,
-};
-
-// Any filter associated with a field (used in the filter bar/editor)
-export type FieldFilter =
-  | ExistsFilter
-  | GeoBoundingBoxFilter
-  | GeoPolygonFilter
-  | PhraseFilter
-  | PhrasesFilter
-  | RangeFilter
-  | MatchAllFilter
-  | MissingFilter;
-
-export enum FILTERS {
-  CUSTOM = 'custom',
-  PHRASES = 'phrases',
-  PHRASE = 'phrase',
-  EXISTS = 'exists',
-  MATCH_ALL = 'match_all',
-  MISSING = 'missing',
-  QUERY_STRING = 'query_string',
-  RANGE = 'range',
-  GEO_BOUNDING_BOX = 'geo_bounding_box',
-  GEO_POLYGON = 'geo_polygon',
-}
diff --git a/packages/kbn-es-query/src/filters/lib/phrase_filter.ts b/packages/kbn-es-query/src/filters/lib/phrase_filter.ts
deleted file mode 100644
index 124a5da3724871..00000000000000
--- a/packages/kbn-es-query/src/filters/lib/phrase_filter.ts
+++ /dev/null
@@ -1,65 +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 { get, isPlainObject } from 'lodash';
-import { Filter, FilterMeta } from './meta_filter';
-
-export type PhraseFilterMeta = FilterMeta & {
-  params: {
-    query: string; // The unformatted value
-  };
-  script?: {
-    script: {
-      params: any;
-    };
-  };
-  field?: any;
-};
-
-export type PhraseFilter = Filter & {
-  meta: PhraseFilterMeta;
-};
-
-type PhraseFilterValue = string | number | boolean;
-
-export const isPhraseFilter = (filter: any): filter is PhraseFilter => {
-  const isMatchPhraseQuery = filter && filter.query && filter.query.match_phrase;
-
-  const isDeprecatedMatchPhraseQuery =
-    filter &&
-    filter.query &&
-    filter.query.match &&
-    Object.values(filter.query.match).find((params: any) => params.type === 'phrase');
-
-  return !!(isMatchPhraseQuery || isDeprecatedMatchPhraseQuery);
-};
-
-export const isScriptedPhraseFilter = (filter: any): filter is PhraseFilter =>
-  Boolean(get(filter, 'script.script.params.value'));
-
-export const getPhraseFilterField = (filter: PhraseFilter) => {
-  const queryConfig = filter.query.match_phrase || filter.query.match;
-  return Object.keys(queryConfig)[0];
-};
-
-export const getPhraseFilterValue = (filter: PhraseFilter): PhraseFilterValue => {
-  const queryConfig = filter.query.match_phrase || filter.query.match;
-  const queryValue = Object.values(queryConfig)[0] as any;
-  return isPlainObject(queryValue) ? queryValue.query : queryValue;
-};
diff --git a/packages/kbn-es-query/src/filters/lib/phrases_filter.ts b/packages/kbn-es-query/src/filters/lib/phrases_filter.ts
deleted file mode 100644
index 213afb409a0a69..00000000000000
--- a/packages/kbn-es-query/src/filters/lib/phrases_filter.ts
+++ /dev/null
@@ -1,32 +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 { Filter, FilterMeta } from './meta_filter';
-
-export type PhrasesFilterMeta = FilterMeta & {
-  params: string[]; // The unformatted values
-  field?: string;
-};
-
-export type PhrasesFilter = Filter & {
-  meta: PhrasesFilterMeta;
-};
-
-export const isPhrasesFilter = (filter: any): filter is PhrasesFilter =>
-  filter && filter.meta.type === 'phrases';
diff --git a/packages/kbn-es-query/src/filters/lib/range_filter.ts b/packages/kbn-es-query/src/filters/lib/range_filter.ts
deleted file mode 100644
index fc8d05d575d597..00000000000000
--- a/packages/kbn-es-query/src/filters/lib/range_filter.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 { get, keys } from 'lodash';
-import { Filter, FilterMeta } from './meta_filter';
-
-export interface RangeFilterParams {
-  from?: number | string;
-  to?: number | string;
-  gt?: number | string;
-  lt?: number | string;
-  gte?: number | string;
-  lte?: number | string;
-  format?: string;
-}
-
-export type RangeFilterMeta = FilterMeta & {
-  params: RangeFilterParams;
-  field?: any;
-};
-
-export type RangeFilter = Filter & {
-  meta: RangeFilterMeta;
-  script?: {
-    script: {
-      params: any;
-    };
-  };
-  range: { [key: string]: RangeFilterParams };
-};
-
-const hasRangeKeys = (params: RangeFilterParams) =>
-  Boolean(
-    keys(params).find((key: string) => ['gte', 'gt', 'lte', 'lt', 'from', 'to'].includes(key))
-  );
-
-export const isRangeFilter = (filter: any): filter is RangeFilter => filter && filter.range;
-
-export const isScriptedRangeFilter = (filter: any): filter is RangeFilter => {
-  const params: RangeFilterParams = get(filter, 'script.script.params', {});
-
-  return hasRangeKeys(params);
-};
diff --git a/packages/kbn-es-query/src/filters/phrase.js b/packages/kbn-es-query/src/filters/phrase.js
deleted file mode 100644
index f0134f289ad9d2..00000000000000
--- a/packages/kbn-es-query/src/filters/phrase.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// Creates an filter where the given field matches the given value
-export function buildPhraseFilter(field, value, indexPattern) {
-  const filter = { meta: { index: indexPattern.id } };
-  const convertedValue = getConvertedValueForField(field, value);
-
-  if (field.scripted) {
-    filter.script = getPhraseScript(field, value);
-    filter.meta.field = field.name;
-  } else {
-    filter.query = { match_phrase: {} };
-    filter.query.match_phrase[field.name] = convertedValue;
-  }
-  return filter;
-}
-
-export function getPhraseScript(field, value) {
-  const convertedValue = getConvertedValueForField(field, value);
-  const script = buildInlineScriptForPhraseFilter(field);
-
-  return {
-    script: {
-      source: script,
-      lang: field.lang,
-      params: {
-        value: convertedValue
-      }
-    }
-  };
-}
-
-// See https://github.com/elastic/elasticsearch/issues/20941 and https://github.com/elastic/kibana/issues/8677
-// and https://github.com/elastic/elasticsearch/pull/22201
-// for the reason behind this change. Aggs now return boolean buckets with a key of 1 or 0.
-export function getConvertedValueForField(field, value) {
-  if (typeof value !== 'boolean' && field.type === 'boolean') {
-    if ([1, 'true'].includes(value)) {
-      return true;
-    }
-    else if ([0, 'false'].includes(value)) {
-      return false;
-    }
-    else {
-      throw new Error(`${value} is not a valid boolean value for boolean field ${field.name}`);
-    }
-  }
-  return value;
-}
-
-/**
- * Takes a scripted field and returns an inline script appropriate for use in a script query.
- * Handles lucene expression and Painless scripts. Other langs aren't guaranteed to generate valid
- * scripts.
- *
- * @param {object} scriptedField A Field object representing a scripted field
- * @returns {string} The inline script string
- */
-export function buildInlineScriptForPhraseFilter(scriptedField) {
-  // We must wrap painless scripts in a lambda in case they're more than a simple expression
-  if (scriptedField.lang === 'painless') {
-    return `boolean compare(Supplier s, def v) {return s.get() == v;}` +
-           `compare(() -> { ${scriptedField.script} }, params.value);`;
-  }
-  else {
-    return `(${scriptedField.script}) == value`;
-  }
-}
diff --git a/packages/kbn-es-query/src/filters/phrases.js b/packages/kbn-es-query/src/filters/phrases.js
deleted file mode 100644
index f02b3763f37bb7..00000000000000
--- a/packages/kbn-es-query/src/filters/phrases.js
+++ /dev/null
@@ -1,63 +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 { getPhraseScript } from './phrase';
-
-// Creates a filter where the given field matches one or more of the given values
-// params should be an array of values
-export function buildPhrasesFilter(field, params, indexPattern) {
-  const index = indexPattern.id;
-  const type = 'phrases';
-  const key = field.name;
-  const value = params
-    .map(value => format(field, value))
-    .join(', ');
-
-  const filter = {
-    meta: { index, type, key, value, params }
-  };
-
-  let should;
-  if (field.scripted) {
-    should = params.map((value) => ({
-      script: getPhraseScript(field, value)
-    }));
-  } else {
-    should = params.map((value) => ({
-      match_phrase: {
-        [field.name]: value
-      }
-    }));
-  }
-
-  filter.query = {
-    bool: {
-      should,
-      minimum_should_match: 1
-    }
-  };
-
-  return filter;
-}
-
-function format(field, value) {
-  return field && field.format && field.format.convert
-    ? field.format.convert(value)
-    : value;
-}
diff --git a/packages/kbn-es-query/src/filters/query.js b/packages/kbn-es-query/src/filters/query.js
deleted file mode 100644
index ded877231bf67e..00000000000000
--- a/packages/kbn-es-query/src/filters/query.js
+++ /dev/null
@@ -1,34 +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.
- */
-
-// Creates a filter corresponding to a raw Elasticsearch query DSL object
-export function buildQueryFilter(query, index, alias) {
-  const filter = {
-    query: query,
-    meta: {
-      index,
-    }
-  };
-
-  if (alias) {
-    filter.meta.alias = alias;
-  }
-
-  return filter;
-}
diff --git a/packages/kbn-es-query/src/filters/range.js b/packages/kbn-es-query/src/filters/range.js
deleted file mode 100644
index 357f9209c50de3..00000000000000
--- a/packages/kbn-es-query/src/filters/range.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-const OPERANDS_IN_RANGE = 2;
-const operators = {
-  gt: '>',
-  gte: '>=',
-  lte: '<=',
-  lt: '<',
-};
-const comparators = {
-  gt: 'boolean gt(Supplier s, def v) {return s.get() > v}',
-  gte: 'boolean gte(Supplier s, def v) {return s.get() >= v}',
-  lte: 'boolean lte(Supplier s, def v) {return s.get() <= v}',
-  lt: 'boolean lt(Supplier s, def v) {return s.get() < v}',
-};
-
-const dateComparators = {
-  gt: 'boolean gt(Supplier s, def v) {return s.get().toInstant().isAfter(Instant.parse(v))}',
-  gte: 'boolean gte(Supplier s, def v) {return !s.get().toInstant().isBefore(Instant.parse(v))}',
-  lte: 'boolean lte(Supplier s, def v) {return !s.get().toInstant().isAfter(Instant.parse(v))}',
-  lt: 'boolean lt(Supplier s, def v) {return s.get().toInstant().isBefore(Instant.parse(v))}',
-};
-
-function formatValue(field, params) {
-  return _.map(params, (val, key) => operators[key] + format(field, val)).join(' ');
-}
-
-// Creates a filter where the value for the given field is in the given range
-// params should be an object containing `lt`, `lte`, `gt`, and/or `gte`
-export function buildRangeFilter(field, params, indexPattern, formattedValue) {
-  const filter = { meta: { index: indexPattern.id } };
-  if (formattedValue) filter.meta.formattedValue = formattedValue;
-
-  params = _.mapValues(params, (value) => {
-    return (field.type === 'number') ? parseFloat(value) : value;
-  });
-
-  if ('gte' in params && 'gt' in params) throw new Error('gte and gt are mutually exclusive');
-  if ('lte' in params && 'lt' in params) throw new Error('lte and lt are mutually exclusive');
-
-  const totalInfinite = ['gt', 'lt'].reduce((totalInfinite, op) => {
-    const key = op in params ? op : `${op}e`;
-    const isInfinite = Math.abs(params[key]) === Infinity;
-
-    if (isInfinite) {
-      totalInfinite++;
-      delete params[key];
-    }
-
-    return totalInfinite;
-  }, 0);
-
-  if (totalInfinite === OPERANDS_IN_RANGE) {
-    filter.match_all = {};
-    filter.meta.field = field.name;
-  } else if (field.scripted) {
-    filter.script = getRangeScript(field, params);
-    filter.script.script.params.value = formatValue(field, filter.script.script.params);
-
-    filter.meta.field = field.name;
-  } else {
-    filter.range = {};
-    filter.range[field.name] = params;
-  }
-
-  return filter;
-}
-
-export function getRangeScript(field, params) {
-  const knownParams = _.pick(params, (val, key) => {
-    return key in operators;
-  });
-  let script = _.map(knownParams, function (val, key) {
-    return '(' + field.script + ')' + operators[key] + key;
-  }).join(' && ');
-
-  // We must wrap painless scripts in a lambda in case they're more than a simple expression
-  if (field.lang === 'painless') {
-    const comp = field.type === 'date' ? dateComparators : comparators;
-    const currentComparators = _.reduce(knownParams, (acc, val, key) => acc.concat(comp[key]), []).join(' ');
-
-    const comparisons = _.map(knownParams, function (val, key) {
-      return `${key}(() -> { ${field.script} }, params.${key})`;
-    }).join(' && ');
-
-    script = `${currentComparators}${comparisons}`;
-  }
-
-  return {
-    script: {
-      source: script,
-      params: knownParams,
-      lang: field.lang
-    }
-  };
-}
-
-function format(field, value) {
-  return field && field.format && field.format.convert
-    ? field.format.convert(value)
-    : value;
-}
-
diff --git a/packages/kbn-es-query/src/index.d.ts b/packages/kbn-es-query/src/index.d.ts
index ca4455da33f45d..c06cef6367fe78 100644
--- a/packages/kbn-es-query/src/index.d.ts
+++ b/packages/kbn-es-query/src/index.d.ts
@@ -19,4 +19,3 @@
 
 export * from './es_query';
 export * from './kuery';
-export * from './filters';
diff --git a/packages/kbn-es-query/src/index.js b/packages/kbn-es-query/src/index.js
index 086b2f6db8d0dc..963999bd0999b2 100644
--- a/packages/kbn-es-query/src/index.js
+++ b/packages/kbn-es-query/src/index.js
@@ -18,5 +18,4 @@
  */
 
 export * from './kuery';
-export * from './filters';
 export * from './es_query';
diff --git a/packages/kbn-es-query/src/kuery/ast/__tests__/ast.js b/packages/kbn-es-query/src/kuery/ast/__tests__/ast.js
index 1ba10ddca54ac1..3cbe1203bc5330 100644
--- a/packages/kbn-es-query/src/kuery/ast/__tests__/ast.js
+++ b/packages/kbn-es-query/src/kuery/ast/__tests__/ast.js
@@ -198,6 +198,68 @@ describe('kuery AST API', function () {
       expect(actual).to.eql(expected);
     });
 
+    it('should support nested queries indicated by curly braces', () => {
+      const expected = nodeTypes.function.buildNode(
+        'nested',
+        'nestedField',
+        nodeTypes.function.buildNode('is', 'childOfNested', 'foo')
+      );
+      const actual = ast.fromKueryExpression('nestedField:{ childOfNested: foo }');
+      expect(actual).to.eql(expected);
+    });
+
+    it('should support nested subqueries and subqueries inside nested queries', () => {
+      const expected = nodeTypes.function.buildNode(
+        'and',
+        [
+          nodeTypes.function.buildNode('is', 'response', '200'),
+          nodeTypes.function.buildNode(
+            'nested',
+            'nestedField',
+            nodeTypes.function.buildNode('or', [
+              nodeTypes.function.buildNode('is', 'childOfNested', 'foo'),
+              nodeTypes.function.buildNode('is', 'childOfNested', 'bar'),
+            ])
+          )]);
+      const actual = ast.fromKueryExpression('response:200 and nestedField:{ childOfNested:foo or childOfNested:bar }');
+      expect(actual).to.eql(expected);
+    });
+
+    it('should support nested sub-queries inside paren groups', () => {
+      const expected = nodeTypes.function.buildNode(
+        'and',
+        [
+          nodeTypes.function.buildNode('is', 'response', '200'),
+          nodeTypes.function.buildNode('or', [
+            nodeTypes.function.buildNode(
+              'nested',
+              'nestedField',
+              nodeTypes.function.buildNode('is', 'childOfNested', 'foo')
+            ),
+            nodeTypes.function.buildNode(
+              'nested',
+              'nestedField',
+              nodeTypes.function.buildNode('is', 'childOfNested', 'bar')
+            ),
+          ])
+        ]);
+      const actual = ast.fromKueryExpression('response:200 and ( nestedField:{ childOfNested:foo } or nestedField:{ childOfNested:bar } )');
+      expect(actual).to.eql(expected);
+    });
+
+    it('should support nested groups inside other nested groups', () => {
+      const expected = nodeTypes.function.buildNode(
+        'nested',
+        'nestedField',
+        nodeTypes.function.buildNode(
+          'nested',
+          'nestedChild',
+          nodeTypes.function.buildNode('is', 'doublyNestedChild', 'foo')
+        )
+      );
+      const actual = ast.fromKueryExpression('nestedField:{ nestedChild:{ doublyNestedChild:foo } }');
+      expect(actual).to.eql(expected);
+    });
   });
 
   describe('fromLiteralExpression', function () {
diff --git a/packages/kbn-es-query/src/kuery/ast/ast.js b/packages/kbn-es-query/src/kuery/ast/ast.js
index 0bf2b258ba1f40..1688995d46f80e 100644
--- a/packages/kbn-es-query/src/kuery/ast/ast.js
+++ b/packages/kbn-es-query/src/kuery/ast/ast.js
@@ -63,12 +63,12 @@ function fromExpression(expression, parseOptions = {}, parse = parseKuery) {
  * IndexPattern isn't required, but if you pass one in, we can be more intelligent
  * about how we craft the queries (e.g. scripted fields)
  */
-export function toElasticsearchQuery(node, indexPattern, config = {}) {
+export function toElasticsearchQuery(node, indexPattern, config = {}, context = {}) {
   if (!node || !node.type || !nodeTypes[node.type]) {
     return toElasticsearchQuery(nodeTypes.function.buildNode('and', []));
   }
 
-  return nodeTypes[node.type].toElasticsearchQuery(node, indexPattern, config);
+  return nodeTypes[node.type].toElasticsearchQuery(node, indexPattern, config, context);
 }
 
 export function doesKueryExpressionHaveLuceneSyntaxError(expression) {
diff --git a/packages/kbn-es-query/src/kuery/ast/kuery.js b/packages/kbn-es-query/src/kuery/ast/kuery.js
index d39145df790731..f745f01873bae4 100644
--- a/packages/kbn-es-query/src/kuery/ast/kuery.js
+++ b/packages/kbn-es-query/src/kuery/ast/kuery.js
@@ -74,8 +74,30 @@ module.exports = (function() {
             }
             return query;
           },
-        peg$c10 = { type: "other", description: "fieldName" },
-        peg$c11 = function(field, operator, value) {
+        peg$c10 = ":",
+        peg$c11 = { type: "literal", value: ":", description: "\":\"" },
+        peg$c12 = "{",
+        peg$c13 = { type: "literal", value: "{", description: "\"{\"" },
+        peg$c14 = "}",
+        peg$c15 = { type: "literal", value: "}", description: "\"}\"" },
+        peg$c16 = function(field, query, trailing) {
+              if (query.type === 'cursor') {
+                return {
+                  ...query,
+                  nestedPath: query.nestedPath ? `${field.value}.${query.nestedPath}` : field.value,
+                }
+              };
+
+              if (trailing.type === 'cursor') {
+                return {
+                  ...trailing,
+                  suggestionTypes: ['conjunction']
+                };
+              }
+              return buildFunctionNode('nested', [field, query]);
+            },
+        peg$c17 = { type: "other", description: "fieldName" },
+        peg$c18 = function(field, operator, value) {
             if (value.type === 'cursor') {
               return {
                 ...value,
@@ -85,9 +107,7 @@ module.exports = (function() {
             const range = buildNamedArgNode(operator, value);
             return buildFunctionNode('range', [field, range]);
           },
-        peg$c12 = ":",
-        peg$c13 = { type: "literal", value: ":", description: "\":\"" },
-        peg$c14 = function(field, partial) {
+        peg$c19 = function(field, partial) {
             if (partial.type === 'cursor') {
               return {
                 ...partial,
@@ -97,7 +117,7 @@ module.exports = (function() {
             }
             return partial(field);
           },
-        peg$c15 = function(partial) {
+        peg$c20 = function(partial) {
             if (partial.type === 'cursor') {
               const fieldName = `${partial.prefix}${partial.suffix}`.trim();
               return {
@@ -109,7 +129,7 @@ module.exports = (function() {
             const field = buildLiteralNode(null);
             return partial(field);
           },
-        peg$c16 = function(partial, trailing) {
+        peg$c21 = function(partial, trailing) {
             if (trailing.type === 'cursor') {
               return {
                 ...trailing,
@@ -118,7 +138,7 @@ module.exports = (function() {
             }
             return partial;
           },
-        peg$c17 = function(partialLeft, partialRight) {
+        peg$c22 = function(partialLeft, partialRight) {
             const cursor = [partialLeft, partialRight].find(node => node.type === 'cursor');
             if (cursor) {
               return {
@@ -128,7 +148,7 @@ module.exports = (function() {
             }
             return (field) => buildFunctionNode('or', [partialLeft(field), partialRight(field)]);
           },
-        peg$c18 = function(partialLeft, partialRight) {
+        peg$c23 = function(partialLeft, partialRight) {
             const cursor = [partialLeft, partialRight].find(node => node.type === 'cursor');
             if (cursor) {
               return {
@@ -138,7 +158,7 @@ module.exports = (function() {
             }
             return (field) => buildFunctionNode('and', [partialLeft(field), partialRight(field)]);
           },
-        peg$c19 = function(partial) {
+        peg$c24 = function(partial) {
             if (partial.type === 'cursor') {
               return {
                 ...list,
@@ -147,13 +167,13 @@ module.exports = (function() {
             }
             return (field) => buildFunctionNode('not', [partial(field)]);
           },
-        peg$c20 = { type: "other", description: "value" },
-        peg$c21 = function(value) {
+        peg$c25 = { type: "other", description: "value" },
+        peg$c26 = function(value) {
             if (value.type === 'cursor') return value;
             const isPhrase = buildLiteralNode(true);
             return (field) => buildFunctionNode('is', [field, value, isPhrase]);
           },
-        peg$c22 = function(value) {
+        peg$c27 = function(value) {
             if (value.type === 'cursor') return value;
 
             if (!allowLeadingWildcards && value.type === 'wildcard' && nodeTypes.wildcard.hasLeadingWildcard(value)) {
@@ -163,19 +183,19 @@ module.exports = (function() {
             const isPhrase = buildLiteralNode(false);
             return (field) => buildFunctionNode('is', [field, value, isPhrase]);
           },
-        peg$c23 = { type: "other", description: "OR" },
-        peg$c24 = "or",
-        peg$c25 = { type: "literal", value: "or", description: "\"or\"" },
-        peg$c26 = { type: "other", description: "AND" },
-        peg$c27 = "and",
-        peg$c28 = { type: "literal", value: "and", description: "\"and\"" },
-        peg$c29 = { type: "other", description: "NOT" },
-        peg$c30 = "not",
-        peg$c31 = { type: "literal", value: "not", description: "\"not\"" },
-        peg$c32 = { type: "other", description: "literal" },
-        peg$c33 = "\"",
-        peg$c34 = { type: "literal", value: "\"", description: "\"\\\"\"" },
-        peg$c35 = function(prefix, cursor, suffix) {
+        peg$c28 = { type: "other", description: "OR" },
+        peg$c29 = "or",
+        peg$c30 = { type: "literal", value: "or", description: "\"or\"" },
+        peg$c31 = { type: "other", description: "AND" },
+        peg$c32 = "and",
+        peg$c33 = { type: "literal", value: "and", description: "\"and\"" },
+        peg$c34 = { type: "other", description: "NOT" },
+        peg$c35 = "not",
+        peg$c36 = { type: "literal", value: "not", description: "\"not\"" },
+        peg$c37 = { type: "other", description: "literal" },
+        peg$c38 = "\"",
+        peg$c39 = { type: "literal", value: "\"", description: "\"\\\"\"" },
+        peg$c40 = function(prefix, cursor, suffix) {
             const { start, end } = location();
             return {
               type: 'cursor',
@@ -186,17 +206,17 @@ module.exports = (function() {
               text: text().replace(cursor, '')
             };
           },
-        peg$c36 = function(chars) {
+        peg$c41 = function(chars) {
             return buildLiteralNode(chars.join(''));
           },
-        peg$c37 = "\\",
-        peg$c38 = { type: "literal", value: "\\", description: "\"\\\\\"" },
-        peg$c39 = /^[\\"]/,
-        peg$c40 = { type: "class", value: "[\\\\\"]", description: "[\\\\\"]" },
-        peg$c41 = function(char) { return char; },
-        peg$c42 = /^[^"]/,
-        peg$c43 = { type: "class", value: "[^\"]", description: "[^\"]" },
-        peg$c44 = function(chars) {
+        peg$c42 = "\\",
+        peg$c43 = { type: "literal", value: "\\", description: "\"\\\\\"" },
+        peg$c44 = /^[\\"]/,
+        peg$c45 = { type: "class", value: "[\\\\\"]", description: "[\\\\\"]" },
+        peg$c46 = function(char) { return char; },
+        peg$c47 = /^[^"]/,
+        peg$c48 = { type: "class", value: "[^\"]", description: "[^\"]" },
+        peg$c49 = function(chars) {
             const sequence = chars.join('').trim();
             if (sequence === 'null') return buildLiteralNode(null);
             if (sequence === 'true') return buildLiteralNode(true);
@@ -206,108 +226,104 @@ module.exports = (function() {
             const value = isNaN(number) ? sequence : number;
             return buildLiteralNode(value);
           },
-        peg$c45 = { type: "any", description: "any character" },
-        peg$c46 = "*",
-        peg$c47 = { type: "literal", value: "*", description: "\"*\"" },
-        peg$c48 = function() { return wildcardSymbol; },
-        peg$c49 = "\\t",
-        peg$c50 = { type: "literal", value: "\\t", description: "\"\\\\t\"" },
-        peg$c51 = function() { return '\t'; },
-        peg$c52 = "\\r",
-        peg$c53 = { type: "literal", value: "\\r", description: "\"\\\\r\"" },
-        peg$c54 = function() { return '\r'; },
-        peg$c55 = "\\n",
-        peg$c56 = { type: "literal", value: "\\n", description: "\"\\\\n\"" },
-        peg$c57 = function() { return '\n'; },
-        peg$c58 = function(keyword) { return keyword; },
-        peg$c59 = /^[\\():<>"*]/,
-        peg$c60 = { type: "class", value: "[\\\\():<>\"*]", description: "[\\\\():<>\"*]" },
-        peg$c61 = "<=",
-        peg$c62 = { type: "literal", value: "<=", description: "\"<=\"" },
-        peg$c63 = function() { return 'lte'; },
-        peg$c64 = ">=",
-        peg$c65 = { type: "literal", value: ">=", description: "\">=\"" },
-        peg$c66 = function() { return 'gte'; },
-        peg$c67 = "<",
-        peg$c68 = { type: "literal", value: "<", description: "\"<\"" },
-        peg$c69 = function() { return 'lt'; },
-        peg$c70 = ">",
-        peg$c71 = { type: "literal", value: ">", description: "\">\"" },
-        peg$c72 = function() { return 'gt'; },
-        peg$c73 = { type: "other", description: "whitespace" },
-        peg$c74 = /^[ \t\r\n]/,
-        peg$c75 = { type: "class", value: "[\\ \\t\\r\\n]", description: "[\\ \\t\\r\\n]" },
-        peg$c76 = function() { return parseCursor; },
-        peg$c77 = "@kuery-cursor@",
-        peg$c78 = { type: "literal", value: "@kuery-cursor@", description: "\"@kuery-cursor@\"" },
-        peg$c79 = function() { return cursorSymbol; },
-        peg$c80 = "||",
-        peg$c81 = { type: "literal", value: "||", description: "\"||\"" },
-        peg$c82 = function() {
+        peg$c50 = { type: "any", description: "any character" },
+        peg$c51 = "*",
+        peg$c52 = { type: "literal", value: "*", description: "\"*\"" },
+        peg$c53 = function() { return wildcardSymbol; },
+        peg$c54 = "\\t",
+        peg$c55 = { type: "literal", value: "\\t", description: "\"\\\\t\"" },
+        peg$c56 = function() { return '\t'; },
+        peg$c57 = "\\r",
+        peg$c58 = { type: "literal", value: "\\r", description: "\"\\\\r\"" },
+        peg$c59 = function() { return '\r'; },
+        peg$c60 = "\\n",
+        peg$c61 = { type: "literal", value: "\\n", description: "\"\\\\n\"" },
+        peg$c62 = function() { return '\n'; },
+        peg$c63 = function(keyword) { return keyword; },
+        peg$c64 = /^[\\():<>"*{}]/,
+        peg$c65 = { type: "class", value: "[\\\\():<>\"*{}]", description: "[\\\\():<>\"*{}]" },
+        peg$c66 = "<=",
+        peg$c67 = { type: "literal", value: "<=", description: "\"<=\"" },
+        peg$c68 = function() { return 'lte'; },
+        peg$c69 = ">=",
+        peg$c70 = { type: "literal", value: ">=", description: "\">=\"" },
+        peg$c71 = function() { return 'gte'; },
+        peg$c72 = "<",
+        peg$c73 = { type: "literal", value: "<", description: "\"<\"" },
+        peg$c74 = function() { return 'lt'; },
+        peg$c75 = ">",
+        peg$c76 = { type: "literal", value: ">", description: "\">\"" },
+        peg$c77 = function() { return 'gt'; },
+        peg$c78 = { type: "other", description: "whitespace" },
+        peg$c79 = /^[ \t\r\n]/,
+        peg$c80 = { type: "class", value: "[\\ \\t\\r\\n]", description: "[\\ \\t\\r\\n]" },
+        peg$c81 = function() { return parseCursor; },
+        peg$c82 = "@kuery-cursor@",
+        peg$c83 = { type: "literal", value: "@kuery-cursor@", description: "\"@kuery-cursor@\"" },
+        peg$c84 = function() { return cursorSymbol; },
+        peg$c85 = "||",
+        peg$c86 = { type: "literal", value: "||", description: "\"||\"" },
+        peg$c87 = function() {
             error('LuceneOr');
           },
-        peg$c83 = "&&",
-        peg$c84 = { type: "literal", value: "&&", description: "\"&&\"" },
-        peg$c85 = function() {
+        peg$c88 = "&&",
+        peg$c89 = { type: "literal", value: "&&", description: "\"&&\"" },
+        peg$c90 = function() {
             error('LuceneAnd');
           },
-        peg$c86 = "+",
-        peg$c87 = { type: "literal", value: "+", description: "\"+\"" },
-        peg$c88 = "-",
-        peg$c89 = { type: "literal", value: "-", description: "\"-\"" },
-        peg$c90 = function() {
+        peg$c91 = "+",
+        peg$c92 = { type: "literal", value: "+", description: "\"+\"" },
+        peg$c93 = "-",
+        peg$c94 = { type: "literal", value: "-", description: "\"-\"" },
+        peg$c95 = function() {
             error('LuceneNot');
           },
-        peg$c91 = "!",
-        peg$c92 = { type: "literal", value: "!", description: "\"!\"" },
-        peg$c93 = "_exists_",
-        peg$c94 = { type: "literal", value: "_exists_", description: "\"_exists_\"" },
-        peg$c95 = function() {
+        peg$c96 = "!",
+        peg$c97 = { type: "literal", value: "!", description: "\"!\"" },
+        peg$c98 = "_exists_",
+        peg$c99 = { type: "literal", value: "_exists_", description: "\"_exists_\"" },
+        peg$c100 = function() {
             error('LuceneExists');
           },
-        peg$c96 = function() {
+        peg$c101 = function() {
             error('LuceneRange');
           },
-        peg$c97 = "?",
-        peg$c98 = { type: "literal", value: "?", description: "\"?\"" },
-        peg$c99 = function() {
+        peg$c102 = "?",
+        peg$c103 = { type: "literal", value: "?", description: "\"?\"" },
+        peg$c104 = function() {
             error('LuceneWildcard');
           },
-        peg$c100 = "/",
-        peg$c101 = { type: "literal", value: "/", description: "\"/\"" },
-        peg$c102 = /^[^\/]/,
-        peg$c103 = { type: "class", value: "[^/]", description: "[^/]" },
-        peg$c104 = function() {
+        peg$c105 = "/",
+        peg$c106 = { type: "literal", value: "/", description: "\"/\"" },
+        peg$c107 = /^[^\/]/,
+        peg$c108 = { type: "class", value: "[^/]", description: "[^/]" },
+        peg$c109 = function() {
             error('LuceneRegex');
           },
-        peg$c105 = "~",
-        peg$c106 = { type: "literal", value: "~", description: "\"~\"" },
-        peg$c107 = /^[0-9]/,
-        peg$c108 = { type: "class", value: "[0-9]", description: "[0-9]" },
-        peg$c109 = function() {
+        peg$c110 = "~",
+        peg$c111 = { type: "literal", value: "~", description: "\"~\"" },
+        peg$c112 = /^[0-9]/,
+        peg$c113 = { type: "class", value: "[0-9]", description: "[0-9]" },
+        peg$c114 = function() {
             error('LuceneFuzzy');
           },
-        peg$c110 = function() {
+        peg$c115 = function() {
             error('LuceneProximity');
           },
-        peg$c111 = "^",
-        peg$c112 = { type: "literal", value: "^", description: "\"^\"" },
-        peg$c113 = function() {
+        peg$c116 = "^",
+        peg$c117 = { type: "literal", value: "^", description: "\"^\"" },
+        peg$c118 = function() {
             error('LuceneBoost');
           },
-        peg$c114 = function() { return char; },
-        peg$c115 = "=",
-        peg$c116 = { type: "literal", value: "=", description: "\"=\"" },
-        peg$c117 = "{",
-        peg$c118 = { type: "literal", value: "{", description: "\"{\"" },
-        peg$c119 = "}",
-        peg$c120 = { type: "literal", value: "}", description: "\"}\"" },
-        peg$c121 = "[",
-        peg$c122 = { type: "literal", value: "[", description: "\"[\"" },
-        peg$c123 = "]",
-        peg$c124 = { type: "literal", value: "]", description: "\"]\"" },
-        peg$c125 = "TO",
-        peg$c126 = { type: "literal", value: "TO", description: "\"TO\"" },
+        peg$c119 = function() { return char; },
+        peg$c120 = "=",
+        peg$c121 = { type: "literal", value: "=", description: "\"=\"" },
+        peg$c122 = "[",
+        peg$c123 = { type: "literal", value: "[", description: "\"[\"" },
+        peg$c124 = "]",
+        peg$c125 = { type: "literal", value: "]", description: "\"]\"" },
+        peg$c126 = "TO",
+        peg$c127 = { type: "literal", value: "TO", description: "\"TO\"" },
 
         peg$currPos          = 0,
         peg$savedPos         = 0,
@@ -698,6 +714,107 @@ module.exports = (function() {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
+      if (s0 === peg$FAILED) {
+        s0 = peg$parseNestedQuery();
+      }
+
+      return s0;
+    }
+
+    function peg$parseNestedQuery() {
+      var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+
+      s0 = peg$currPos;
+      s1 = peg$parseField();
+      if (s1 !== peg$FAILED) {
+        s2 = [];
+        s3 = peg$parseSpace();
+        while (s3 !== peg$FAILED) {
+          s2.push(s3);
+          s3 = peg$parseSpace();
+        }
+        if (s2 !== peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 58) {
+            s3 = peg$c10;
+            peg$currPos++;
+          } else {
+            s3 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$c11); }
+          }
+          if (s3 !== peg$FAILED) {
+            s4 = [];
+            s5 = peg$parseSpace();
+            while (s5 !== peg$FAILED) {
+              s4.push(s5);
+              s5 = peg$parseSpace();
+            }
+            if (s4 !== peg$FAILED) {
+              if (input.charCodeAt(peg$currPos) === 123) {
+                s5 = peg$c12;
+                peg$currPos++;
+              } else {
+                s5 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$c13); }
+              }
+              if (s5 !== peg$FAILED) {
+                s6 = [];
+                s7 = peg$parseSpace();
+                while (s7 !== peg$FAILED) {
+                  s6.push(s7);
+                  s7 = peg$parseSpace();
+                }
+                if (s6 !== peg$FAILED) {
+                  s7 = peg$parseOrQuery();
+                  if (s7 !== peg$FAILED) {
+                    s8 = peg$parseOptionalSpace();
+                    if (s8 !== peg$FAILED) {
+                      if (input.charCodeAt(peg$currPos) === 125) {
+                        s9 = peg$c14;
+                        peg$currPos++;
+                      } else {
+                        s9 = peg$FAILED;
+                        if (peg$silentFails === 0) { peg$fail(peg$c15); }
+                      }
+                      if (s9 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c16(s1, s7, s8);
+                        s0 = s1;
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                      }
+                    } else {
+                      peg$currPos = s0;
+                      s0 = peg$FAILED;
+                    }
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
       if (s0 === peg$FAILED) {
         s0 = peg$parseExpression();
       }
@@ -727,7 +844,7 @@ module.exports = (function() {
       peg$silentFails--;
       if (s0 === peg$FAILED) {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c10); }
+        if (peg$silentFails === 0) { peg$fail(peg$c17); }
       }
 
       return s0;
@@ -758,7 +875,7 @@ module.exports = (function() {
               s5 = peg$parseLiteral();
               if (s5 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c11(s1, s3, s5);
+                s1 = peg$c18(s1, s3, s5);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -798,11 +915,11 @@ module.exports = (function() {
         }
         if (s2 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 58) {
-            s3 = peg$c12;
+            s3 = peg$c10;
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c13); }
+            if (peg$silentFails === 0) { peg$fail(peg$c11); }
           }
           if (s3 !== peg$FAILED) {
             s4 = [];
@@ -815,7 +932,7 @@ module.exports = (function() {
               s5 = peg$parseListOfValues();
               if (s5 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c14(s1, s5);
+                s1 = peg$c19(s1, s5);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -848,7 +965,7 @@ module.exports = (function() {
       s1 = peg$parseValue();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c15(s1);
+        s1 = peg$c20(s1);
       }
       s0 = s1;
 
@@ -887,7 +1004,7 @@ module.exports = (function() {
               }
               if (s5 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c16(s3, s4);
+                s1 = peg$c21(s3, s4);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -927,7 +1044,7 @@ module.exports = (function() {
           s3 = peg$parseOrListOfValues();
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c17(s1, s3);
+            s1 = peg$c22(s1, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -959,7 +1076,7 @@ module.exports = (function() {
           s3 = peg$parseAndListOfValues();
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c18(s1, s3);
+            s1 = peg$c23(s1, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -989,7 +1106,7 @@ module.exports = (function() {
         s2 = peg$parseListOfValues();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c19(s2);
+          s1 = peg$c24(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -1014,7 +1131,7 @@ module.exports = (function() {
       s1 = peg$parseQuotedString();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c21(s1);
+        s1 = peg$c26(s1);
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -1022,14 +1139,14 @@ module.exports = (function() {
         s1 = peg$parseUnquotedLiteral();
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c22(s1);
+          s1 = peg$c27(s1);
         }
         s0 = s1;
       }
       peg$silentFails--;
       if (s0 === peg$FAILED) {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c20); }
+        if (peg$silentFails === 0) { peg$fail(peg$c25); }
       }
 
       return s0;
@@ -1051,12 +1168,12 @@ module.exports = (function() {
         s1 = peg$FAILED;
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c24) {
+        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c29) {
           s2 = input.substr(peg$currPos, 2);
           peg$currPos += 2;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c25); }
+          if (peg$silentFails === 0) { peg$fail(peg$c30); }
         }
         if (s2 !== peg$FAILED) {
           s3 = [];
@@ -1110,7 +1227,7 @@ module.exports = (function() {
       peg$silentFails--;
       if (s0 === peg$FAILED) {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c23); }
+        if (peg$silentFails === 0) { peg$fail(peg$c28); }
       }
 
       return s0;
@@ -1132,12 +1249,12 @@ module.exports = (function() {
         s1 = peg$FAILED;
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 3).toLowerCase() === peg$c27) {
+        if (input.substr(peg$currPos, 3).toLowerCase() === peg$c32) {
           s2 = input.substr(peg$currPos, 3);
           peg$currPos += 3;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c28); }
+          if (peg$silentFails === 0) { peg$fail(peg$c33); }
         }
         if (s2 !== peg$FAILED) {
           s3 = [];
@@ -1191,7 +1308,7 @@ module.exports = (function() {
       peg$silentFails--;
       if (s0 === peg$FAILED) {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c26); }
+        if (peg$silentFails === 0) { peg$fail(peg$c31); }
       }
 
       return s0;
@@ -1202,12 +1319,12 @@ module.exports = (function() {
 
       peg$silentFails++;
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 3).toLowerCase() === peg$c30) {
+      if (input.substr(peg$currPos, 3).toLowerCase() === peg$c35) {
         s1 = input.substr(peg$currPos, 3);
         peg$currPos += 3;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c31); }
+        if (peg$silentFails === 0) { peg$fail(peg$c36); }
       }
       if (s1 !== peg$FAILED) {
         s2 = [];
@@ -1257,7 +1374,7 @@ module.exports = (function() {
       peg$silentFails--;
       if (s0 === peg$FAILED) {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c29); }
+        if (peg$silentFails === 0) { peg$fail(peg$c34); }
       }
 
       return s0;
@@ -1274,7 +1391,7 @@ module.exports = (function() {
       peg$silentFails--;
       if (s0 === peg$FAILED) {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c32); }
+        if (peg$silentFails === 0) { peg$fail(peg$c37); }
       }
 
       return s0;
@@ -1285,11 +1402,11 @@ module.exports = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 34) {
-        s1 = peg$c33;
+        s1 = peg$c38;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c34); }
+        if (peg$silentFails === 0) { peg$fail(peg$c39); }
       }
       if (s1 !== peg$FAILED) {
         s2 = [];
@@ -1309,15 +1426,15 @@ module.exports = (function() {
             }
             if (s4 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s5 = peg$c33;
+                s5 = peg$c38;
                 peg$currPos++;
               } else {
                 s5 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c34); }
+                if (peg$silentFails === 0) { peg$fail(peg$c39); }
               }
               if (s5 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c35(s2, s3, s4);
+                s1 = peg$c40(s2, s3, s4);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -1342,11 +1459,11 @@ module.exports = (function() {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 34) {
-          s1 = peg$c33;
+          s1 = peg$c38;
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c34); }
+          if (peg$silentFails === 0) { peg$fail(peg$c39); }
         }
         if (s1 !== peg$FAILED) {
           s2 = [];
@@ -1357,15 +1474,15 @@ module.exports = (function() {
           }
           if (s2 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 34) {
-              s3 = peg$c33;
+              s3 = peg$c38;
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c34); }
+              if (peg$silentFails === 0) { peg$fail(peg$c39); }
             }
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c36(s2);
+              s1 = peg$c41(s2);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -1391,23 +1508,23 @@ module.exports = (function() {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 92) {
-          s1 = peg$c37;
+          s1 = peg$c42;
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c38); }
+          if (peg$silentFails === 0) { peg$fail(peg$c43); }
         }
         if (s1 !== peg$FAILED) {
-          if (peg$c39.test(input.charAt(peg$currPos))) {
+          if (peg$c44.test(input.charAt(peg$currPos))) {
             s2 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c40); }
+            if (peg$silentFails === 0) { peg$fail(peg$c45); }
           }
           if (s2 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c41(s2);
+            s1 = peg$c46(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -1430,16 +1547,16 @@ module.exports = (function() {
             s1 = peg$FAILED;
           }
           if (s1 !== peg$FAILED) {
-            if (peg$c42.test(input.charAt(peg$currPos))) {
+            if (peg$c47.test(input.charAt(peg$currPos))) {
               s2 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s2 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c43); }
+              if (peg$silentFails === 0) { peg$fail(peg$c48); }
             }
             if (s2 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c41(s2);
+              s1 = peg$c46(s2);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -1476,7 +1593,7 @@ module.exports = (function() {
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c35(s1, s2, s3);
+            s1 = peg$c40(s1, s2, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -1504,7 +1621,7 @@ module.exports = (function() {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c44(s1);
+          s1 = peg$c49(s1);
         }
         s0 = s1;
       }
@@ -1562,11 +1679,11 @@ module.exports = (function() {
                       peg$currPos++;
                     } else {
                       s4 = peg$FAILED;
-                      if (peg$silentFails === 0) { peg$fail(peg$c45); }
+                      if (peg$silentFails === 0) { peg$fail(peg$c50); }
                     }
                     if (s4 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s1 = peg$c41(s4);
+                      s1 = peg$c46(s4);
                       s0 = s1;
                     } else {
                       peg$currPos = s0;
@@ -1597,15 +1714,15 @@ module.exports = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 42) {
-        s1 = peg$c46;
+        s1 = peg$c51;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c47); }
+        if (peg$silentFails === 0) { peg$fail(peg$c52); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c48();
+        s1 = peg$c53();
       }
       s0 = s1;
 
@@ -1633,7 +1750,7 @@ module.exports = (function() {
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c35(s1, s2, s3);
+            s1 = peg$c40(s1, s2, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -1663,44 +1780,44 @@ module.exports = (function() {
       var s0, s1;
 
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c49) {
-        s1 = peg$c49;
+      if (input.substr(peg$currPos, 2) === peg$c54) {
+        s1 = peg$c54;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c50); }
+        if (peg$silentFails === 0) { peg$fail(peg$c55); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c51();
+        s1 = peg$c56();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c52) {
-          s1 = peg$c52;
+        if (input.substr(peg$currPos, 2) === peg$c57) {
+          s1 = peg$c57;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c53); }
+          if (peg$silentFails === 0) { peg$fail(peg$c58); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c54();
+          s1 = peg$c59();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 2) === peg$c55) {
-            s1 = peg$c55;
+          if (input.substr(peg$currPos, 2) === peg$c60) {
+            s1 = peg$c60;
             peg$currPos += 2;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c56); }
+            if (peg$silentFails === 0) { peg$fail(peg$c61); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c57();
+            s1 = peg$c62();
           }
           s0 = s1;
         }
@@ -1714,17 +1831,17 @@ module.exports = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 92) {
-        s1 = peg$c37;
+        s1 = peg$c42;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c38); }
+        if (peg$silentFails === 0) { peg$fail(peg$c43); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$parseSpecialCharacter();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c41(s2);
+          s1 = peg$c46(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -1743,41 +1860,41 @@ module.exports = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 92) {
-        s1 = peg$c37;
+        s1 = peg$c42;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c38); }
+        if (peg$silentFails === 0) { peg$fail(peg$c43); }
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c24) {
+        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c29) {
           s2 = input.substr(peg$currPos, 2);
           peg$currPos += 2;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c25); }
+          if (peg$silentFails === 0) { peg$fail(peg$c30); }
         }
         if (s2 === peg$FAILED) {
-          if (input.substr(peg$currPos, 3).toLowerCase() === peg$c27) {
+          if (input.substr(peg$currPos, 3).toLowerCase() === peg$c32) {
             s2 = input.substr(peg$currPos, 3);
             peg$currPos += 3;
           } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c28); }
+            if (peg$silentFails === 0) { peg$fail(peg$c33); }
           }
           if (s2 === peg$FAILED) {
-            if (input.substr(peg$currPos, 3).toLowerCase() === peg$c30) {
+            if (input.substr(peg$currPos, 3).toLowerCase() === peg$c35) {
               s2 = input.substr(peg$currPos, 3);
               peg$currPos += 3;
             } else {
               s2 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c31); }
+              if (peg$silentFails === 0) { peg$fail(peg$c36); }
             }
           }
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c58(s2);
+          s1 = peg$c63(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -1808,12 +1925,12 @@ module.exports = (function() {
     function peg$parseSpecialCharacter() {
       var s0;
 
-      if (peg$c59.test(input.charAt(peg$currPos))) {
+      if (peg$c64.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c60); }
+        if (peg$silentFails === 0) { peg$fail(peg$c65); }
       }
 
       return s0;
@@ -1823,58 +1940,58 @@ module.exports = (function() {
       var s0, s1;
 
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c61) {
-        s1 = peg$c61;
+      if (input.substr(peg$currPos, 2) === peg$c66) {
+        s1 = peg$c66;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c62); }
+        if (peg$silentFails === 0) { peg$fail(peg$c67); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c63();
+        s1 = peg$c68();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c64) {
-          s1 = peg$c64;
+        if (input.substr(peg$currPos, 2) === peg$c69) {
+          s1 = peg$c69;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c65); }
+          if (peg$silentFails === 0) { peg$fail(peg$c70); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c66();
+          s1 = peg$c71();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 60) {
-            s1 = peg$c67;
+            s1 = peg$c72;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c68); }
+            if (peg$silentFails === 0) { peg$fail(peg$c73); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c69();
+            s1 = peg$c74();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 62) {
-              s1 = peg$c70;
+              s1 = peg$c75;
               peg$currPos++;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c71); }
+              if (peg$silentFails === 0) { peg$fail(peg$c76); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c72();
+              s1 = peg$c77();
             }
             s0 = s1;
           }
@@ -1888,17 +2005,17 @@ module.exports = (function() {
       var s0, s1;
 
       peg$silentFails++;
-      if (peg$c74.test(input.charAt(peg$currPos))) {
+      if (peg$c79.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c75); }
+        if (peg$silentFails === 0) { peg$fail(peg$c80); }
       }
       peg$silentFails--;
       if (s0 === peg$FAILED) {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c73); }
+        if (peg$silentFails === 0) { peg$fail(peg$c78); }
       }
 
       return s0;
@@ -1909,23 +2026,23 @@ module.exports = (function() {
 
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$c76();
+      s1 = peg$c81();
       if (s1) {
         s1 = void 0;
       } else {
         s1 = peg$FAILED;
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 14) === peg$c77) {
-          s2 = peg$c77;
+        if (input.substr(peg$currPos, 14) === peg$c82) {
+          s2 = peg$c82;
           peg$currPos += 14;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c78); }
+          if (peg$silentFails === 0) { peg$fail(peg$c83); }
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c79();
+          s1 = peg$c84();
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -1950,12 +2067,12 @@ module.exports = (function() {
         s2 = peg$parseSpace();
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c80) {
-          s2 = peg$c80;
+        if (input.substr(peg$currPos, 2) === peg$c85) {
+          s2 = peg$c85;
           peg$currPos += 2;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c81); }
+          if (peg$silentFails === 0) { peg$fail(peg$c86); }
         }
         if (s2 !== peg$FAILED) {
           s3 = [];
@@ -1966,7 +2083,7 @@ module.exports = (function() {
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c82();
+            s1 = peg$c87();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -1995,12 +2112,12 @@ module.exports = (function() {
         s2 = peg$parseSpace();
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c83) {
-          s2 = peg$c83;
+        if (input.substr(peg$currPos, 2) === peg$c88) {
+          s2 = peg$c88;
           peg$currPos += 2;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c84); }
+          if (peg$silentFails === 0) { peg$fail(peg$c89); }
         }
         if (s2 !== peg$FAILED) {
           s3 = [];
@@ -2011,7 +2128,7 @@ module.exports = (function() {
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c85();
+            s1 = peg$c90();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -2028,15 +2145,15 @@ module.exports = (function() {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 43) {
-          s1 = peg$c86;
+          s1 = peg$c91;
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c87); }
+          if (peg$silentFails === 0) { peg$fail(peg$c92); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c85();
+          s1 = peg$c90();
         }
         s0 = s1;
       }
@@ -2049,29 +2166,29 @@ module.exports = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 45) {
-        s1 = peg$c88;
+        s1 = peg$c93;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c89); }
+        if (peg$silentFails === 0) { peg$fail(peg$c94); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c90();
+        s1 = peg$c95();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 33) {
-          s1 = peg$c91;
+          s1 = peg$c96;
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c92); }
+          if (peg$silentFails === 0) { peg$fail(peg$c97); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c90();
+          s1 = peg$c95();
         }
         s0 = s1;
       }
@@ -2107,11 +2224,11 @@ module.exports = (function() {
         }
         if (s2 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 58) {
-            s3 = peg$c12;
+            s3 = peg$c10;
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c13); }
+            if (peg$silentFails === 0) { peg$fail(peg$c11); }
           }
           if (s3 !== peg$FAILED) {
             s4 = [];
@@ -2176,12 +2293,12 @@ module.exports = (function() {
       var s0, s1, s2, s3, s4, s5;
 
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 8) === peg$c93) {
-        s1 = peg$c93;
+      if (input.substr(peg$currPos, 8) === peg$c98) {
+        s1 = peg$c98;
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c94); }
+        if (peg$silentFails === 0) { peg$fail(peg$c99); }
       }
       if (s1 !== peg$FAILED) {
         s2 = [];
@@ -2192,11 +2309,11 @@ module.exports = (function() {
         }
         if (s2 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 58) {
-            s3 = peg$c12;
+            s3 = peg$c10;
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c13); }
+            if (peg$silentFails === 0) { peg$fail(peg$c11); }
           }
           if (s3 !== peg$FAILED) {
             s4 = [];
@@ -2209,7 +2326,7 @@ module.exports = (function() {
               s5 = peg$parseLuceneLiteral();
               if (s5 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c95();
+                s1 = peg$c100();
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -2251,7 +2368,7 @@ module.exports = (function() {
           s3 = peg$parseLuceneLiteral();
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c96();
+            s1 = peg$c101();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -2285,7 +2402,7 @@ module.exports = (function() {
                   s6 = peg$parseLuceneRangeEnd();
                   if (s6 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$c96();
+                    s1 = peg$c101();
                     s0 = s1;
                   } else {
                     peg$currPos = s0;
@@ -2324,11 +2441,11 @@ module.exports = (function() {
       s2 = peg$parseLuceneUnquotedCharacter();
       if (s2 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 42) {
-          s2 = peg$c46;
+          s2 = peg$c51;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c47); }
+          if (peg$silentFails === 0) { peg$fail(peg$c52); }
         }
       }
       while (s2 !== peg$FAILED) {
@@ -2336,21 +2453,21 @@ module.exports = (function() {
         s2 = peg$parseLuceneUnquotedCharacter();
         if (s2 === peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 42) {
-            s2 = peg$c46;
+            s2 = peg$c51;
             peg$currPos++;
           } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c47); }
+            if (peg$silentFails === 0) { peg$fail(peg$c52); }
           }
         }
       }
       if (s1 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 63) {
-          s2 = peg$c97;
+          s2 = peg$c102;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c98); }
+          if (peg$silentFails === 0) { peg$fail(peg$c103); }
         }
         if (s2 !== peg$FAILED) {
           s3 = [];
@@ -2361,7 +2478,7 @@ module.exports = (function() {
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c99();
+            s1 = peg$c104();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -2384,42 +2501,42 @@ module.exports = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 47) {
-        s1 = peg$c100;
+        s1 = peg$c105;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c101); }
+        if (peg$silentFails === 0) { peg$fail(peg$c106); }
       }
       if (s1 !== peg$FAILED) {
         s2 = [];
-        if (peg$c102.test(input.charAt(peg$currPos))) {
+        if (peg$c107.test(input.charAt(peg$currPos))) {
           s3 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c103); }
+          if (peg$silentFails === 0) { peg$fail(peg$c108); }
         }
         while (s3 !== peg$FAILED) {
           s2.push(s3);
-          if (peg$c102.test(input.charAt(peg$currPos))) {
+          if (peg$c107.test(input.charAt(peg$currPos))) {
             s3 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c103); }
+            if (peg$silentFails === 0) { peg$fail(peg$c108); }
           }
         }
         if (s2 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 47) {
-            s3 = peg$c100;
+            s3 = peg$c105;
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c101); }
+            if (peg$silentFails === 0) { peg$fail(peg$c106); }
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c104();
+            s1 = peg$c109();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -2444,34 +2561,34 @@ module.exports = (function() {
       s1 = peg$parseLuceneUnquotedLiteral();
       if (s1 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 126) {
-          s2 = peg$c105;
+          s2 = peg$c110;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c106); }
+          if (peg$silentFails === 0) { peg$fail(peg$c111); }
         }
         if (s2 !== peg$FAILED) {
           s3 = [];
-          if (peg$c107.test(input.charAt(peg$currPos))) {
+          if (peg$c112.test(input.charAt(peg$currPos))) {
             s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c108); }
+            if (peg$silentFails === 0) { peg$fail(peg$c113); }
           }
           while (s4 !== peg$FAILED) {
             s3.push(s4);
-            if (peg$c107.test(input.charAt(peg$currPos))) {
+            if (peg$c112.test(input.charAt(peg$currPos))) {
               s4 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c108); }
+              if (peg$silentFails === 0) { peg$fail(peg$c113); }
             }
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c109();
+            s1 = peg$c114();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -2496,34 +2613,34 @@ module.exports = (function() {
       s1 = peg$parseQuotedString();
       if (s1 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 126) {
-          s2 = peg$c105;
+          s2 = peg$c110;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c106); }
+          if (peg$silentFails === 0) { peg$fail(peg$c111); }
         }
         if (s2 !== peg$FAILED) {
           s3 = [];
-          if (peg$c107.test(input.charAt(peg$currPos))) {
+          if (peg$c112.test(input.charAt(peg$currPos))) {
             s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c108); }
+            if (peg$silentFails === 0) { peg$fail(peg$c113); }
           }
           while (s4 !== peg$FAILED) {
             s3.push(s4);
-            if (peg$c107.test(input.charAt(peg$currPos))) {
+            if (peg$c112.test(input.charAt(peg$currPos))) {
               s4 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c108); }
+              if (peg$silentFails === 0) { peg$fail(peg$c113); }
             }
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c110();
+            s1 = peg$c115();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -2548,34 +2665,34 @@ module.exports = (function() {
       s1 = peg$parseLuceneLiteral();
       if (s1 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 94) {
-          s2 = peg$c111;
+          s2 = peg$c116;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c112); }
+          if (peg$silentFails === 0) { peg$fail(peg$c117); }
         }
         if (s2 !== peg$FAILED) {
           s3 = [];
-          if (peg$c107.test(input.charAt(peg$currPos))) {
+          if (peg$c112.test(input.charAt(peg$currPos))) {
             s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c108); }
+            if (peg$silentFails === 0) { peg$fail(peg$c113); }
           }
           while (s4 !== peg$FAILED) {
             s3.push(s4);
-            if (peg$c107.test(input.charAt(peg$currPos))) {
+            if (peg$c112.test(input.charAt(peg$currPos))) {
               s4 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c108); }
+              if (peg$silentFails === 0) { peg$fail(peg$c113); }
             }
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c113();
+            s1 = peg$c118();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -2656,7 +2773,7 @@ module.exports = (function() {
                 peg$currPos++;
               } else {
                 s3 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c45); }
+                if (peg$silentFails === 0) { peg$fail(peg$c50); }
               }
               if (s3 !== peg$FAILED) {
                 s1 = [s1, s2, s3];
@@ -2707,17 +2824,17 @@ module.exports = (function() {
 
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 92) {
-        s1 = peg$c37;
+        s1 = peg$c42;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c38); }
+        if (peg$silentFails === 0) { peg$fail(peg$c43); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$parseLuceneSpecialCharacter();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c114();
+          s1 = peg$c119();
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -2735,51 +2852,51 @@ module.exports = (function() {
       var s0;
 
       if (input.charCodeAt(peg$currPos) === 43) {
-        s0 = peg$c86;
+        s0 = peg$c91;
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c87); }
+        if (peg$silentFails === 0) { peg$fail(peg$c92); }
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 45) {
-          s0 = peg$c88;
+          s0 = peg$c93;
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c89); }
+          if (peg$silentFails === 0) { peg$fail(peg$c94); }
         }
         if (s0 === peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 61) {
-            s0 = peg$c115;
+            s0 = peg$c120;
             peg$currPos++;
           } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c116); }
+            if (peg$silentFails === 0) { peg$fail(peg$c121); }
           }
           if (s0 === peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 62) {
-              s0 = peg$c70;
+              s0 = peg$c75;
               peg$currPos++;
             } else {
               s0 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c71); }
+              if (peg$silentFails === 0) { peg$fail(peg$c76); }
             }
             if (s0 === peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 60) {
-                s0 = peg$c67;
+                s0 = peg$c72;
                 peg$currPos++;
               } else {
                 s0 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c68); }
+                if (peg$silentFails === 0) { peg$fail(peg$c73); }
               }
               if (s0 === peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 33) {
-                  s0 = peg$c91;
+                  s0 = peg$c96;
                   peg$currPos++;
                 } else {
                   s0 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$c92); }
+                  if (peg$silentFails === 0) { peg$fail(peg$c97); }
                 }
                 if (s0 === peg$FAILED) {
                   if (input.charCodeAt(peg$currPos) === 40) {
@@ -2799,99 +2916,99 @@ module.exports = (function() {
                     }
                     if (s0 === peg$FAILED) {
                       if (input.charCodeAt(peg$currPos) === 123) {
-                        s0 = peg$c117;
+                        s0 = peg$c12;
                         peg$currPos++;
                       } else {
                         s0 = peg$FAILED;
-                        if (peg$silentFails === 0) { peg$fail(peg$c118); }
+                        if (peg$silentFails === 0) { peg$fail(peg$c13); }
                       }
                       if (s0 === peg$FAILED) {
                         if (input.charCodeAt(peg$currPos) === 125) {
-                          s0 = peg$c119;
+                          s0 = peg$c14;
                           peg$currPos++;
                         } else {
                           s0 = peg$FAILED;
-                          if (peg$silentFails === 0) { peg$fail(peg$c120); }
+                          if (peg$silentFails === 0) { peg$fail(peg$c15); }
                         }
                         if (s0 === peg$FAILED) {
                           if (input.charCodeAt(peg$currPos) === 91) {
-                            s0 = peg$c121;
+                            s0 = peg$c122;
                             peg$currPos++;
                           } else {
                             s0 = peg$FAILED;
-                            if (peg$silentFails === 0) { peg$fail(peg$c122); }
+                            if (peg$silentFails === 0) { peg$fail(peg$c123); }
                           }
                           if (s0 === peg$FAILED) {
                             if (input.charCodeAt(peg$currPos) === 93) {
-                              s0 = peg$c123;
+                              s0 = peg$c124;
                               peg$currPos++;
                             } else {
                               s0 = peg$FAILED;
-                              if (peg$silentFails === 0) { peg$fail(peg$c124); }
+                              if (peg$silentFails === 0) { peg$fail(peg$c125); }
                             }
                             if (s0 === peg$FAILED) {
                               if (input.charCodeAt(peg$currPos) === 94) {
-                                s0 = peg$c111;
+                                s0 = peg$c116;
                                 peg$currPos++;
                               } else {
                                 s0 = peg$FAILED;
-                                if (peg$silentFails === 0) { peg$fail(peg$c112); }
+                                if (peg$silentFails === 0) { peg$fail(peg$c117); }
                               }
                               if (s0 === peg$FAILED) {
                                 if (input.charCodeAt(peg$currPos) === 34) {
-                                  s0 = peg$c33;
+                                  s0 = peg$c38;
                                   peg$currPos++;
                                 } else {
                                   s0 = peg$FAILED;
-                                  if (peg$silentFails === 0) { peg$fail(peg$c34); }
+                                  if (peg$silentFails === 0) { peg$fail(peg$c39); }
                                 }
                                 if (s0 === peg$FAILED) {
                                   if (input.charCodeAt(peg$currPos) === 126) {
-                                    s0 = peg$c105;
+                                    s0 = peg$c110;
                                     peg$currPos++;
                                   } else {
                                     s0 = peg$FAILED;
-                                    if (peg$silentFails === 0) { peg$fail(peg$c106); }
+                                    if (peg$silentFails === 0) { peg$fail(peg$c111); }
                                   }
                                   if (s0 === peg$FAILED) {
                                     if (input.charCodeAt(peg$currPos) === 42) {
-                                      s0 = peg$c46;
+                                      s0 = peg$c51;
                                       peg$currPos++;
                                     } else {
                                       s0 = peg$FAILED;
-                                      if (peg$silentFails === 0) { peg$fail(peg$c47); }
+                                      if (peg$silentFails === 0) { peg$fail(peg$c52); }
                                     }
                                     if (s0 === peg$FAILED) {
                                       if (input.charCodeAt(peg$currPos) === 63) {
-                                        s0 = peg$c97;
+                                        s0 = peg$c102;
                                         peg$currPos++;
                                       } else {
                                         s0 = peg$FAILED;
-                                        if (peg$silentFails === 0) { peg$fail(peg$c98); }
+                                        if (peg$silentFails === 0) { peg$fail(peg$c103); }
                                       }
                                       if (s0 === peg$FAILED) {
                                         if (input.charCodeAt(peg$currPos) === 58) {
-                                          s0 = peg$c12;
+                                          s0 = peg$c10;
                                           peg$currPos++;
                                         } else {
                                           s0 = peg$FAILED;
-                                          if (peg$silentFails === 0) { peg$fail(peg$c13); }
+                                          if (peg$silentFails === 0) { peg$fail(peg$c11); }
                                         }
                                         if (s0 === peg$FAILED) {
                                           if (input.charCodeAt(peg$currPos) === 92) {
-                                            s0 = peg$c37;
+                                            s0 = peg$c42;
                                             peg$currPos++;
                                           } else {
                                             s0 = peg$FAILED;
-                                            if (peg$silentFails === 0) { peg$fail(peg$c38); }
+                                            if (peg$silentFails === 0) { peg$fail(peg$c43); }
                                           }
                                           if (s0 === peg$FAILED) {
                                             if (input.charCodeAt(peg$currPos) === 47) {
-                                              s0 = peg$c100;
+                                              s0 = peg$c105;
                                               peg$currPos++;
                                             } else {
                                               s0 = peg$FAILED;
-                                              if (peg$silentFails === 0) { peg$fail(peg$c101); }
+                                              if (peg$silentFails === 0) { peg$fail(peg$c106); }
                                             }
                                           }
                                         }
@@ -2931,12 +3048,12 @@ module.exports = (function() {
         s1 = peg$FAILED;
       }
       if (s1 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c125) {
-          s2 = peg$c125;
+        if (input.substr(peg$currPos, 2) === peg$c126) {
+          s2 = peg$c126;
           peg$currPos += 2;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c126); }
+          if (peg$silentFails === 0) { peg$fail(peg$c127); }
         }
         if (s2 !== peg$FAILED) {
           s3 = [];
@@ -2972,19 +3089,19 @@ module.exports = (function() {
       var s0;
 
       if (input.charCodeAt(peg$currPos) === 91) {
-        s0 = peg$c121;
+        s0 = peg$c122;
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c122); }
+        if (peg$silentFails === 0) { peg$fail(peg$c123); }
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 123) {
-          s0 = peg$c117;
+          s0 = peg$c12;
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c118); }
+          if (peg$silentFails === 0) { peg$fail(peg$c13); }
         }
       }
 
@@ -2995,19 +3112,19 @@ module.exports = (function() {
       var s0;
 
       if (input.charCodeAt(peg$currPos) === 93) {
-        s0 = peg$c123;
+        s0 = peg$c124;
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$c124); }
+        if (peg$silentFails === 0) { peg$fail(peg$c125); }
       }
       if (s0 === peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 125) {
-          s0 = peg$c119;
+          s0 = peg$c14;
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$c120); }
+          if (peg$silentFails === 0) { peg$fail(peg$c15); }
         }
       }
 
diff --git a/packages/kbn-es-query/src/kuery/ast/kuery.peg b/packages/kbn-es-query/src/kuery/ast/kuery.peg
index ec8368d2a921de..389b9a82d2c76b 100644
--- a/packages/kbn-es-query/src/kuery/ast/kuery.peg
+++ b/packages/kbn-es-query/src/kuery/ast/kuery.peg
@@ -59,7 +59,26 @@ SubQuery
     }
     return query;
   }
-  / Expression
+  / NestedQuery
+
+NestedQuery
+  = field:Field Space* ':' Space* '{' Space* query:OrQuery trailing:OptionalSpace '}' {
+      if (query.type === 'cursor') {
+        return {
+          ...query,
+          nestedPath: query.nestedPath ? `${field.value}.${query.nestedPath}` : field.value,
+        }
+      };
+
+      if (trailing.type === 'cursor') {
+        return {
+          ...trailing,
+          suggestionTypes: ['conjunction']
+        };
+      }
+      return buildFunctionNode('nested', [field, query]);
+    }
+    / Expression
 
 Expression
   = FieldRangeExpression
@@ -272,7 +291,7 @@ Keyword
   = Or / And / Not
 
 SpecialCharacter
-  = [\\():<>"*]
+  = [\\():<>"*{}]
 
 RangeOperator
   = '<=' { return 'lte'; }
diff --git a/packages/kbn-es-query/src/kuery/errors/index.test.js b/packages/kbn-es-query/src/kuery/errors/index.test.js
index 91c90b2cce98b9..d8040e464b696b 100644
--- a/packages/kbn-es-query/src/kuery/errors/index.test.js
+++ b/packages/kbn-es-query/src/kuery/errors/index.test.js
@@ -25,7 +25,7 @@ describe('kql syntax errors', () => {
   it('should throw an error for a field query missing a value', () => {
     expect(() => {
       fromKueryExpression('response:');
-    }).toThrow('Expected "(", value, whitespace but end of input found.\n' +
+    }).toThrow('Expected "(", "{", value, whitespace but end of input found.\n' +
       'response:\n' +
       '---------^');
   });
@@ -65,7 +65,7 @@ describe('kql syntax errors', () => {
   it('should throw an error for unbalanced quotes', () => {
     expect(() => {
       fromKueryExpression('foo:"ba ');
-    }).toThrow('Expected "(", value, whitespace but "\"" found.\n' +
+    }).toThrow('Expected "(", "{", value, whitespace but """ found.\n' +
       'foo:"ba \n' +
       '----^');
   });
diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/exists.js b/packages/kbn-es-query/src/kuery/functions/__tests__/exists.js
index 0eaa69a3243e09..ee4cfab94e614d 100644
--- a/packages/kbn-es-query/src/kuery/functions/__tests__/exists.js
+++ b/packages/kbn-es-query/src/kuery/functions/__tests__/exists.js
@@ -72,6 +72,21 @@ describe('kuery functions', function () {
         expect(exists.toElasticsearchQuery)
           .withArgs(existsNode, indexPattern).to.throwException(/Exists query does not support scripted fields/);
       });
+
+      it('should use a provided nested context to create a full field name', function () {
+        const expected = {
+          exists: { field: 'nestedField.response' }
+        };
+
+        const existsNode = nodeTypes.function.buildNode('exists', 'response');
+        const result = exists.toElasticsearchQuery(
+          existsNode,
+          indexPattern,
+          {},
+          { nested: { path: 'nestedField' } }
+        );
+        expect(_.isEqual(expected, result)).to.be(true);
+      });
     });
   });
 });
diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/geo_bounding_box.js b/packages/kbn-es-query/src/kuery/functions/__tests__/geo_bounding_box.js
index 2f8b784d6f6e8a..7afa0fcce1bfeb 100644
--- a/packages/kbn-es-query/src/kuery/functions/__tests__/geo_bounding_box.js
+++ b/packages/kbn-es-query/src/kuery/functions/__tests__/geo_bounding_box.js
@@ -102,6 +102,19 @@ describe('kuery functions', function () {
         expect(geoBoundingBox.toElasticsearchQuery)
           .withArgs(node, indexPattern).to.throwException(/Geo bounding box query does not support scripted fields/);
       });
+
+      it('should use a provided nested context to create a full field name', function () {
+        const node = nodeTypes.function.buildNode('geoBoundingBox', 'geo', params);
+        const result = geoBoundingBox.toElasticsearchQuery(
+          node,
+          indexPattern,
+          {},
+          { nested: { path: 'nestedField' } }
+        );
+        expect(result).to.have.property('geo_bounding_box');
+        expect(result.geo_bounding_box).to.have.property('nestedField.geo');
+      });
+
     });
   });
 });
diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/geo_polygon.js b/packages/kbn-es-query/src/kuery/functions/__tests__/geo_polygon.js
index 1c6a2e0e47fde3..c1f2fae0bb3e1f 100644
--- a/packages/kbn-es-query/src/kuery/functions/__tests__/geo_polygon.js
+++ b/packages/kbn-es-query/src/kuery/functions/__tests__/geo_polygon.js
@@ -114,6 +114,18 @@ describe('kuery functions', function () {
         expect(geoPolygon.toElasticsearchQuery)
           .withArgs(node, indexPattern).to.throwException(/Geo polygon query does not support scripted fields/);
       });
+
+      it('should use a provided nested context to create a full field name', function () {
+        const node = nodeTypes.function.buildNode('geoPolygon', 'geo', points);
+        const result = geoPolygon.toElasticsearchQuery(
+          node,
+          indexPattern,
+          {},
+          { nested: { path: 'nestedField' } }
+        );
+        expect(result).to.have.property('geo_polygon');
+        expect(result.geo_polygon).to.have.property('nestedField.geo');
+      });
     });
   });
 });
diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/is.js b/packages/kbn-es-query/src/kuery/functions/__tests__/is.js
index 18652c9faccb8d..b2f3d7ec16a658 100644
--- a/packages/kbn-es-query/src/kuery/functions/__tests__/is.js
+++ b/packages/kbn-es-query/src/kuery/functions/__tests__/is.js
@@ -245,6 +245,66 @@ describe('kuery functions', function () {
         expect(result).to.eql(expected);
       });
 
+      it('should use a provided nested context to create a full field name', function () {
+        const expected = {
+          bool: {
+            should: [
+              { match: { 'nestedField.extension': 'jpg' } },
+            ],
+            minimum_should_match: 1
+          }
+        };
+
+        const node = nodeTypes.function.buildNode('is', 'extension', 'jpg');
+        const result = is.toElasticsearchQuery(
+          node,
+          indexPattern,
+          {},
+          { nested: { path: 'nestedField' } }
+        );
+        expect(result).to.eql(expected);
+      });
+
+      it('should support wildcard field names', function () {
+        const expected = {
+          bool: {
+            should: [
+              { match: { extension: 'jpg' } },
+            ],
+            minimum_should_match: 1
+          }
+        };
+
+        const node = nodeTypes.function.buildNode('is', 'ext*', 'jpg');
+        const result = is.toElasticsearchQuery(node, indexPattern);
+        expect(result).to.eql(expected);
+      });
+
+      it('should automatically add a nested query when a wildcard field name covers a nested field', () => {
+        const expected = {
+          bool: {
+            should: [
+              {
+                nested: {
+                  path: 'nestedField.nestedChild',
+                  query: {
+                    match: {
+                      'nestedField.nestedChild.doublyNestedChild': 'foo'
+                    }
+                  },
+                  score_mode: 'none'
+                }
+              }
+            ],
+            minimum_should_match: 1
+          }
+        };
+
+
+        const node = nodeTypes.function.buildNode('is', '*doublyNested*', 'foo');
+        const result = is.toElasticsearchQuery(node, indexPattern);
+        expect(result).to.eql(expected);
+      });
     });
   });
 });
diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/nested.js b/packages/kbn-es-query/src/kuery/functions/__tests__/nested.js
new file mode 100644
index 00000000000000..5ba73e485ddf1d
--- /dev/null
+++ b/packages/kbn-es-query/src/kuery/functions/__tests__/nested.js
@@ -0,0 +1,68 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+import * as nested from '../nested';
+import { nodeTypes } from '../../node_types';
+import * as ast from '../../ast';
+import indexPatternResponse from '../../../__fixtures__/index_pattern_response.json';
+
+let indexPattern;
+
+const childNode = nodeTypes.function.buildNode('is', 'child', 'foo');
+
+describe('kuery functions', function () {
+  describe('nested', function () {
+
+    beforeEach(() => {
+      indexPattern = indexPatternResponse;
+    });
+
+    describe('buildNodeParams', function () {
+
+      it('arguments should contain the unmodified child nodes', function () {
+        const result = nested.buildNodeParams('nestedField', childNode);
+        const { arguments: [ resultPath, resultChildNode ] } = result;
+        expect(ast.toElasticsearchQuery(resultPath)).to.be('nestedField');
+        expect(resultChildNode).to.be(childNode);
+      });
+    });
+
+    describe('toElasticsearchQuery', function () {
+
+      it('should wrap subqueries in an ES nested query', function () {
+        const node = nodeTypes.function.buildNode('nested', 'nestedField', childNode);
+        const result = nested.toElasticsearchQuery(node, indexPattern);
+        expect(result).to.only.have.keys('nested');
+        expect(result.nested.path).to.be('nestedField');
+        expect(result.nested.score_mode).to.be('none');
+      });
+
+      it('should pass the nested path to subqueries so the full field name can be used', function () {
+        const node = nodeTypes.function.buildNode('nested', 'nestedField', childNode);
+        const result = nested.toElasticsearchQuery(node, indexPattern);
+        const expectedSubQuery = ast.toElasticsearchQuery(
+          nodeTypes.function.buildNode('is', 'nestedField.child', 'foo')
+        );
+        expect(result.nested.query).to.eql(expectedSubQuery);
+      });
+
+    });
+  });
+});
diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/range.js b/packages/kbn-es-query/src/kuery/functions/__tests__/range.js
index 4f290206c8bfb7..2361e8bb667691 100644
--- a/packages/kbn-es-query/src/kuery/functions/__tests__/range.js
+++ b/packages/kbn-es-query/src/kuery/functions/__tests__/range.js
@@ -181,6 +181,60 @@ describe('kuery functions', function () {
         expect(result).to.eql(expected);
       });
 
+      it('should use a provided nested context to create a full field name', function () {
+        const expected = {
+          bool: {
+            should: [
+              {
+                range: {
+                  'nestedField.bytes': {
+                    gt: 1000,
+                    lt: 8000
+                  }
+                }
+              }
+            ],
+            minimum_should_match: 1
+          }
+        };
+
+        const node = nodeTypes.function.buildNode('range', 'bytes', { gt: 1000, lt: 8000 });
+        const result = range.toElasticsearchQuery(
+          node,
+          indexPattern,
+          {},
+          { nested: { path: 'nestedField' } }
+        );
+        expect(result).to.eql(expected);
+      });
+
+      it('should automatically add a nested query when a wildcard field name covers a nested field', function () {
+        const expected = {
+          bool: {
+            should: [
+              {
+                nested: {
+                  path: 'nestedField.nestedChild',
+                  query: {
+                    range: {
+                      'nestedField.nestedChild.doublyNestedChild': {
+                        gt: 1000,
+                        lt: 8000
+                      }
+                    }
+                  },
+                  score_mode: 'none'
+                }
+              }
+            ],
+            minimum_should_match: 1
+          }
+        };
+
+        const node = nodeTypes.function.buildNode('range', '*doublyNested*', { gt: 1000, lt: 8000 });
+        const result = range.toElasticsearchQuery(node, indexPattern);
+        expect(result).to.eql(expected);
+      });
     });
   });
 });
diff --git a/packages/kbn-es-query/src/kuery/functions/__tests__/utils/get_full_field_name_node.js b/packages/kbn-es-query/src/kuery/functions/__tests__/utils/get_full_field_name_node.js
new file mode 100644
index 00000000000000..dae15979a161cd
--- /dev/null
+++ b/packages/kbn-es-query/src/kuery/functions/__tests__/utils/get_full_field_name_node.js
@@ -0,0 +1,88 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+import { nodeTypes } from '../../../node_types';
+import indexPatternResponse from '../../../../__fixtures__/index_pattern_response.json';
+import { getFullFieldNameNode } from '../../utils/get_full_field_name_node';
+
+let indexPattern;
+
+describe('getFullFieldNameNode', function () {
+
+  beforeEach(() => {
+    indexPattern = indexPatternResponse;
+  });
+
+  it('should return unchanged name node if no nested path is passed in', () => {
+    const nameNode = nodeTypes.literal.buildNode('notNested');
+    const result = getFullFieldNameNode(nameNode, indexPattern);
+    expect(result).to.eql(nameNode);
+  });
+
+  it('should add the nested path if it is valid according to the index pattern', () => {
+    const nameNode = nodeTypes.literal.buildNode('child');
+    const result = getFullFieldNameNode(nameNode, indexPattern, 'nestedField');
+    expect(result).to.eql(nodeTypes.literal.buildNode('nestedField.child'));
+  });
+
+  it('should throw an error if a path is provided for a non-nested field', () => {
+    const nameNode = nodeTypes.literal.buildNode('os');
+    expect(getFullFieldNameNode)
+      .withArgs(nameNode, indexPattern, 'machine')
+      .to
+      .throwException(/machine.os is not a nested field but is in nested group "machine" in the KQL expression/);
+  });
+
+  it('should throw an error if a nested field is not passed with a path', () => {
+    const nameNode = nodeTypes.literal.buildNode('nestedField.child');
+    expect(getFullFieldNameNode)
+      .withArgs(nameNode, indexPattern)
+      .to
+      .throwException(/nestedField.child is a nested field, but is not in a nested group in the KQL expression./);
+  });
+
+  it('should throw an error if a nested field is passed with the wrong path', () => {
+    const nameNode = nodeTypes.literal.buildNode('nestedChild.doublyNestedChild');
+    expect(getFullFieldNameNode)
+      .withArgs(nameNode, indexPattern, 'nestedField')
+      .to
+      // eslint-disable-next-line max-len
+      .throwException(/Nested field nestedField.nestedChild.doublyNestedChild is being queried with the incorrect nested path. The correct path is nestedField.nestedChild/);
+  });
+
+  it('should skip error checking for wildcard names', () => {
+    const nameNode = nodeTypes.wildcard.buildNode('nested*');
+    const result = getFullFieldNameNode(nameNode, indexPattern);
+    expect(result).to.eql(nameNode);
+  });
+
+  it('should skip error checking if no index pattern is passed in', () => {
+    const nameNode = nodeTypes.literal.buildNode('os');
+    expect(getFullFieldNameNode)
+      .withArgs(nameNode, null, 'machine')
+      .to
+      .not
+      .throwException();
+
+    const result = getFullFieldNameNode(nameNode, null, 'machine');
+    expect(result).to.eql(nodeTypes.literal.buildNode('machine.os'));
+  });
+
+});
diff --git a/packages/kbn-es-query/src/kuery/functions/and.js b/packages/kbn-es-query/src/kuery/functions/and.js
index 68e125ea4de59f..2650e83814b66f 100644
--- a/packages/kbn-es-query/src/kuery/functions/and.js
+++ b/packages/kbn-es-query/src/kuery/functions/and.js
@@ -25,13 +25,13 @@ export function buildNodeParams(children) {
   };
 }
 
-export function toElasticsearchQuery(node, indexPattern, config) {
+export function toElasticsearchQuery(node, indexPattern, config, context) {
   const children = node.arguments || [];
 
   return {
     bool: {
       filter: children.map((child) => {
-        return ast.toElasticsearchQuery(child, indexPattern, config);
+        return ast.toElasticsearchQuery(child, indexPattern, config, context);
       })
     }
   };
diff --git a/packages/kbn-es-query/src/kuery/functions/exists.js b/packages/kbn-es-query/src/kuery/functions/exists.js
index 64810fc2ba7969..29940c8c2a4250 100644
--- a/packages/kbn-es-query/src/kuery/functions/exists.js
+++ b/packages/kbn-es-query/src/kuery/functions/exists.js
@@ -26,9 +26,10 @@ export function buildNodeParams(fieldName) {
   };
 }
 
-export function toElasticsearchQuery(node, indexPattern) {
+export function toElasticsearchQuery(node, indexPattern = null, config, context = {}) {
   const { arguments: [ fieldNameArg ] } = node;
-  const fieldName = literal.toElasticsearchQuery(fieldNameArg);
+  const fullFieldNameArg = { ...fieldNameArg, value: context.nested ? `${context.nested.path}.${fieldNameArg.value}` : fieldNameArg.value };
+  const fieldName = literal.toElasticsearchQuery(fullFieldNameArg);
   const field = get(indexPattern, 'fields', []).find(field => field.name === fieldName);
 
   if (field && field.scripted) {
diff --git a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.js b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.js
index eeab146f6f698c..fd7e68e52e054e 100644
--- a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.js
+++ b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.js
@@ -34,9 +34,10 @@ export function buildNodeParams(fieldName, params) {
   };
 }
 
-export function toElasticsearchQuery(node, indexPattern) {
+export function toElasticsearchQuery(node, indexPattern, config, context = {}) {
   const [ fieldNameArg, ...args ] = node.arguments;
-  const fieldName = nodeTypes.literal.toElasticsearchQuery(fieldNameArg);
+  const fullFieldNameArg = { ...fieldNameArg, value: context.nested ? `${context.nested.path}.${fieldNameArg.value}` : fieldNameArg.value };
+  const fieldName = nodeTypes.literal.toElasticsearchQuery(fullFieldNameArg);
   const field = _.get(indexPattern, 'fields', []).find(field => field.name === fieldName);
   const queryParams = args.reduce((acc, arg) => {
     const snakeArgName = _.snakeCase(arg.name);
@@ -57,4 +58,3 @@ export function toElasticsearchQuery(node, indexPattern) {
     },
   };
 }
-
diff --git a/packages/kbn-es-query/src/kuery/functions/geo_polygon.js b/packages/kbn-es-query/src/kuery/functions/geo_polygon.js
index 2e9f10071ea324..7756ae731ce6c5 100644
--- a/packages/kbn-es-query/src/kuery/functions/geo_polygon.js
+++ b/packages/kbn-es-query/src/kuery/functions/geo_polygon.js
@@ -33,12 +33,13 @@ export function buildNodeParams(fieldName, points) {
   };
 }
 
-export function toElasticsearchQuery(node, indexPattern) {
+export function toElasticsearchQuery(node, indexPattern, config = {}, context = {}) {
   const [ fieldNameArg, ...points ] = node.arguments;
-  const fieldName = nodeTypes.literal.toElasticsearchQuery(fieldNameArg);
+  const fullFieldNameArg = { ...fieldNameArg, value: context.nested ? `${context.nested.path}.${fieldNameArg.value}` : fieldNameArg.value };
+  const fieldName = nodeTypes.literal.toElasticsearchQuery(fullFieldNameArg);
   const field = get(indexPattern, 'fields', []).find(field => field.name === fieldName);
   const queryParams = {
-    points: points.map(ast.toElasticsearchQuery)
+    points: points.map((point) => { return ast.toElasticsearchQuery(point, indexPattern, config, context); })
   };
 
   if (field && field.scripted) {
diff --git a/packages/kbn-es-query/src/kuery/functions/index.js b/packages/kbn-es-query/src/kuery/functions/index.js
index 39b41f53018578..08b30f022f4318 100644
--- a/packages/kbn-es-query/src/kuery/functions/index.js
+++ b/packages/kbn-es-query/src/kuery/functions/index.js
@@ -25,6 +25,7 @@ import * as range from './range';
 import * as exists from './exists';
 import * as geoBoundingBox from './geo_bounding_box';
 import * as geoPolygon from './geo_polygon';
+import * as nested from './nested';
 
 export const functions = {
   is,
@@ -35,4 +36,5 @@ export const functions = {
   exists,
   geoBoundingBox,
   geoPolygon,
+  nested,
 };
diff --git a/packages/kbn-es-query/src/kuery/functions/is.js b/packages/kbn-es-query/src/kuery/functions/is.js
index 690f98b08ba827..63ade9e8793a7b 100644
--- a/packages/kbn-es-query/src/kuery/functions/is.js
+++ b/packages/kbn-es-query/src/kuery/functions/is.js
@@ -21,9 +21,10 @@ import _ from 'lodash';
 import * as ast from '../ast';
 import * as literal from '../node_types/literal';
 import * as wildcard from '../node_types/wildcard';
-import { getPhraseScript } from '../../filters';
+import { getPhraseScript } from '../../utils/filters';
 import { getFields } from './utils/get_fields';
 import { getTimeZoneFromSettings } from '../../utils/get_time_zone_from_settings';
+import { getFullFieldNameNode } from './utils/get_full_field_name_node';
 
 export function buildNodeParams(fieldName, value, isPhrase = false) {
   if (_.isUndefined(fieldName)) {
@@ -40,12 +41,13 @@ export function buildNodeParams(fieldName, value, isPhrase = false) {
   };
 }
 
-export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
+export function toElasticsearchQuery(node, indexPattern = null, config = {}, context = {}) {
   const { arguments: [fieldNameArg, valueArg, isPhraseArg] } = node;
-  const fieldName = ast.toElasticsearchQuery(fieldNameArg);
+  const fullFieldNameArg = getFullFieldNameNode(fieldNameArg, indexPattern, context.nested ? context.nested.path : undefined);
+  const fieldName = ast.toElasticsearchQuery(fullFieldNameArg);
   const value = !_.isUndefined(valueArg) ? ast.toElasticsearchQuery(valueArg) : valueArg;
   const type = isPhraseArg.value ? 'phrase' : 'best_fields';
-  if (fieldNameArg.value === null) {
+  if (fullFieldNameArg.value === null) {
     if (valueArg.type === 'wildcard') {
       return {
         query_string: {
@@ -63,7 +65,7 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
     };
   }
 
-  const fields = indexPattern ? getFields(fieldNameArg, indexPattern) : [];
+  const fields = indexPattern ? getFields(fullFieldNameArg, indexPattern) : [];
   // If no fields are found in the index pattern we send through the given field name as-is. We do this to preserve
   // the behaviour of lucene on dashboards where there are panels based on different index patterns that have different
   // fields. If a user queries on a field that exists in one pattern but not the other, the index pattern without the
@@ -71,14 +73,14 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
   // keep things familiar for now.
   if (fields && fields.length === 0) {
     fields.push({
-      name: ast.toElasticsearchQuery(fieldNameArg),
+      name: ast.toElasticsearchQuery(fullFieldNameArg),
       scripted: false,
     });
   }
 
   const isExistsQuery = valueArg.type === 'wildcard' && value === '*';
   const isAllFieldsQuery =
-    (fieldNameArg.type === 'wildcard' && fieldName === '*')
+    (fullFieldNameArg.type === 'wildcard' && fieldName === '*')
     || (fields && indexPattern && fields.length === indexPattern.fields.length);
   const isMatchAllQuery = isExistsQuery && isAllFieldsQuery;
 
@@ -87,6 +89,27 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
   }
 
   const queries = fields.reduce((accumulator, field) => {
+    const wrapWithNestedQuery = (query) => {
+      // Wildcards can easily include nested and non-nested fields. There isn't a good way to let
+      // users handle this themselves so we automatically add nested queries in this scenario.
+      if (
+        !(fullFieldNameArg.type === 'wildcard')
+        || !_.get(field, 'subType.nested')
+        || context.nested
+      ) {
+        return query;
+      }
+      else {
+        return {
+          nested: {
+            path: field.subType.nested.path,
+            query,
+            score_mode: 'none'
+          }
+        };
+      }
+    };
+
     if (field.scripted) {
       // Exists queries don't make sense for scripted fields
       if (!isExistsQuery) {
@@ -98,19 +121,19 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
       }
     }
     else if (isExistsQuery) {
-      return [...accumulator, {
+      return [...accumulator, wrapWithNestedQuery({
         exists: {
           field: field.name
         }
-      }];
+      })];
     }
     else if (valueArg.type === 'wildcard') {
-      return [...accumulator, {
+      return [...accumulator, wrapWithNestedQuery({
         query_string: {
           fields: [field.name],
           query: wildcard.toQueryStringQuery(valueArg),
         }
-      }];
+      })];
     }
     /*
       If we detect that it's a date field and the user wants an exact date, we need to convert the query to both >= and <= the value provided to force a range query. This is because match and match_phrase queries do not accept a timezone parameter.
@@ -118,7 +141,7 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
     */
     else if (field.type === 'date') {
       const timeZoneParam = config.dateFormatTZ ? { time_zone: getTimeZoneFromSettings(config.dateFormatTZ) } : {};
-      return [...accumulator, {
+      return [...accumulator, wrapWithNestedQuery({
         range: {
           [field.name]: {
             gte: value,
@@ -126,15 +149,15 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
             ...timeZoneParam,
           },
         }
-      }];
+      })];
     }
     else {
       const queryType = type === 'phrase' ? 'match_phrase' : 'match';
-      return [...accumulator, {
+      return [...accumulator, wrapWithNestedQuery({
         [queryType]: {
           [field.name]: value
         }
-      }];
+      })];
     }
   }, []);
 
@@ -146,4 +169,3 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
   };
 }
 
-
diff --git a/packages/kbn-es-query/src/kuery/functions/nested.js b/packages/kbn-es-query/src/kuery/functions/nested.js
new file mode 100644
index 00000000000000..6237189e16311b
--- /dev/null
+++ b/packages/kbn-es-query/src/kuery/functions/nested.js
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as ast from '../ast';
+import * as literal from '../node_types/literal';
+
+export function buildNodeParams(path, child) {
+  const pathNode = typeof path === 'string' ? ast.fromLiteralExpression(path) : literal.buildNode(path);
+  return {
+    arguments: [pathNode, child],
+  };
+}
+
+export function toElasticsearchQuery(node, indexPattern, config, context = {}) {
+  if (!indexPattern) {
+    throw new Error('Cannot use nested queries without an index pattern');
+  }
+
+  const [path, child] = node.arguments;
+  const stringPath = ast.toElasticsearchQuery(path);
+  const fullPath = context.nested && context.nested.path ? `${context.nested.path}.${stringPath}` : stringPath;
+
+  return {
+    nested: {
+      path: fullPath,
+      query: ast.toElasticsearchQuery(child, indexPattern, config, { ...context, nested: { path: fullPath } }),
+      score_mode: 'none',
+    },
+  };
+}
diff --git a/packages/kbn-es-query/src/kuery/functions/not.js b/packages/kbn-es-query/src/kuery/functions/not.js
index d3ab14df16bcb4..8a4b8c6060109d 100644
--- a/packages/kbn-es-query/src/kuery/functions/not.js
+++ b/packages/kbn-es-query/src/kuery/functions/not.js
@@ -25,13 +25,12 @@ export function buildNodeParams(child) {
   };
 }
 
-export function toElasticsearchQuery(node, indexPattern, config) {
+export function toElasticsearchQuery(node, indexPattern, config, context) {
   const [ argument ] = node.arguments;
 
   return {
     bool: {
-      must_not: ast.toElasticsearchQuery(argument, indexPattern, config)
+      must_not: ast.toElasticsearchQuery(argument, indexPattern, config, context)
     }
   };
 }
-
diff --git a/packages/kbn-es-query/src/kuery/functions/or.js b/packages/kbn-es-query/src/kuery/functions/or.js
index 918d46a6691de4..9b27ac9151801e 100644
--- a/packages/kbn-es-query/src/kuery/functions/or.js
+++ b/packages/kbn-es-query/src/kuery/functions/or.js
@@ -25,13 +25,13 @@ export function buildNodeParams(children) {
   };
 }
 
-export function toElasticsearchQuery(node, indexPattern, config) {
+export function toElasticsearchQuery(node, indexPattern, config, context) {
   const children = node.arguments || [];
 
   return {
     bool: {
       should: children.map((child) => {
-        return ast.toElasticsearchQuery(child, indexPattern, config);
+        return ast.toElasticsearchQuery(child, indexPattern, config, context);
       }),
       minimum_should_match: 1,
     },
diff --git a/packages/kbn-es-query/src/kuery/functions/range.js b/packages/kbn-es-query/src/kuery/functions/range.js
index df77baf4b02083..f7719998ad5240 100644
--- a/packages/kbn-es-query/src/kuery/functions/range.js
+++ b/packages/kbn-es-query/src/kuery/functions/range.js
@@ -20,9 +20,10 @@
 import _ from 'lodash';
 import { nodeTypes } from '../node_types';
 import * as ast from '../ast';
-import { getRangeScript } from '../../filters';
+import { getRangeScript } from '../../utils/filters';
 import { getFields } from './utils/get_fields';
 import { getTimeZoneFromSettings } from '../../utils/get_time_zone_from_settings';
+import { getFullFieldNameNode } from './utils/get_full_field_name_node';
 
 export function buildNodeParams(fieldName, params) {
   params = _.pick(params, 'gt', 'lt', 'gte', 'lte', 'format');
@@ -36,9 +37,10 @@ export function buildNodeParams(fieldName, params) {
   };
 }
 
-export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
+export function toElasticsearchQuery(node, indexPattern = null, config = {}, context = {}) {
   const [ fieldNameArg, ...args ] = node.arguments;
-  const fields = indexPattern ? getFields(fieldNameArg, indexPattern) : [];
+  const fullFieldNameArg = getFullFieldNameNode(fieldNameArg, indexPattern, context.nested ? context.nested.path : undefined);
+  const fields = indexPattern ? getFields(fullFieldNameArg, indexPattern) : [];
   const namedArgs = extractArguments(args);
   const queryParams = _.mapValues(namedArgs, ast.toElasticsearchQuery);
 
@@ -49,13 +51,34 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
   // keep things familiar for now.
   if (fields && fields.length === 0) {
     fields.push({
-      name: ast.toElasticsearchQuery(fieldNameArg),
+      name: ast.toElasticsearchQuery(fullFieldNameArg),
       scripted: false,
     });
   }
 
 
   const queries = fields.map((field) => {
+    const wrapWithNestedQuery = (query) => {
+      // Wildcards can easily include nested and non-nested fields. There isn't a good way to let
+      // users handle this themselves so we automatically add nested queries in this scenario.
+      if (
+        !fullFieldNameArg.type === 'wildcard'
+        || !_.get(field, 'subType.nested')
+        || context.nested
+      ) {
+        return query;
+      }
+      else {
+        return {
+          nested: {
+            path: field.subType.nested.path,
+            query,
+            score_mode: 'none'
+          }
+        };
+      }
+    };
+
     if (field.scripted) {
       return {
         script: getRangeScript(field, queryParams),
@@ -63,20 +86,20 @@ export function toElasticsearchQuery(node, indexPattern = null, config = {}) {
     }
     else if (field.type === 'date') {
       const timeZoneParam = config.dateFormatTZ ? { time_zone: getTimeZoneFromSettings(config.dateFormatTZ) } : {};
-      return {
+      return wrapWithNestedQuery({
         range: {
           [field.name]: {
             ...queryParams,
             ...timeZoneParam,
           }
         }
-      };
+      });
     }
-    return {
+    return wrapWithNestedQuery({
       range: {
         [field.name]: queryParams
       }
-    };
+    });
   });
 
   return {
diff --git a/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.js b/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.js
new file mode 100644
index 00000000000000..07540344b79553
--- /dev/null
+++ b/packages/kbn-es-query/src/kuery/functions/utils/get_full_field_name_node.js
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+import { getFields } from './get_fields';
+
+export function getFullFieldNameNode(rootNameNode, indexPattern, nestedPath) {
+  const fullFieldNameNode = {
+    ...rootNameNode,
+    value: nestedPath ? `${nestedPath}.${rootNameNode.value}` : rootNameNode.value
+  };
+
+  // Wildcards can easily include nested and non-nested fields. There isn't a good way to let
+  // users handle this themselves so we automatically add nested queries in this scenario and skip the
+  // error checking below.
+  if (!indexPattern || (fullFieldNameNode.type === 'wildcard' && !nestedPath)) {
+    return fullFieldNameNode;
+  }
+  const fields = getFields(fullFieldNameNode, indexPattern);
+
+  const errors = fields.reduce((acc, field) => {
+    const nestedPathFromField = field.subType && field.subType.nested ? field.subType.nested.path : undefined;
+
+    if (nestedPath && !nestedPathFromField) {
+      return [...acc, `${field.name} is not a nested field but is in nested group "${nestedPath}" in the KQL expression.`];
+    }
+
+    if (nestedPathFromField && !nestedPath) {
+      return [...acc, `${field.name} is a nested field, but is not in a nested group in the KQL expression.`];
+    }
+
+    if (nestedPathFromField !== nestedPath) {
+      return [
+        ...acc,
+        `Nested field ${field.name} is being queried with the incorrect nested path. The correct path is ${field.subType.nested.path}.`
+      ];
+    }
+
+    return acc;
+  }, []);
+
+  if (errors.length > 0) {
+    throw new Error(errors.join('\n'));
+  }
+
+  return fullFieldNameNode;
+}
diff --git a/packages/kbn-es-query/src/kuery/node_types/function.js b/packages/kbn-es-query/src/kuery/node_types/function.js
index 6b10bb1f704c85..d54b7de6cd8ea5 100644
--- a/packages/kbn-es-query/src/kuery/node_types/function.js
+++ b/packages/kbn-es-query/src/kuery/node_types/function.js
@@ -47,8 +47,7 @@ export function buildNodeWithArgumentNodes(functionName, argumentNodes) {
   };
 }
 
-export function toElasticsearchQuery(node, indexPattern, config = {}) {
+export function toElasticsearchQuery(node, indexPattern, config = {}, context = {}) {
   const kueryFunction = functions[node.function];
-  return kueryFunction.toElasticsearchQuery(node, indexPattern, config);
+  return kueryFunction.toElasticsearchQuery(node, indexPattern, config, context);
 }
-
diff --git a/packages/kbn-es-query/src/kuery/node_types/index.d.ts b/packages/kbn-es-query/src/kuery/node_types/index.d.ts
index 0d1f2c28e39f08..daf8032f9fe0ef 100644
--- a/packages/kbn-es-query/src/kuery/node_types/index.d.ts
+++ b/packages/kbn-es-query/src/kuery/node_types/index.d.ts
@@ -31,7 +31,8 @@ type FunctionName =
   | 'range'
   | 'exists'
   | 'geoBoundingBox'
-  | 'geoPolygon';
+  | 'geoPolygon'
+  | 'nested';
 
 interface FunctionTypeBuildNode {
   type: 'function';
diff --git a/packages/kbn-es-query/src/utils/filters.js b/packages/kbn-es-query/src/utils/filters.js
new file mode 100644
index 00000000000000..6e4f5c342688ce
--- /dev/null
+++ b/packages/kbn-es-query/src/utils/filters.js
@@ -0,0 +1,133 @@
+/*
+ * 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 { pick, get, reduce, map } from 'lodash';
+
+/** @deprecated
+ * @see src/plugins/data/public/es_query/filters/phrase_filter.ts
+ * Code was already moved into src/plugins/data/public.
+ * This method will be removed after moving 'es_query' into new platform
+ * */
+export const getConvertedValueForField = (field, value) => {
+  if (typeof value !== 'boolean' && field.type === 'boolean') {
+    if ([1, 'true'].includes(value)) {
+      return true;
+    } else if ([0, 'false'].includes(value)) {
+      return false;
+    } else {
+      throw new Error(`${value} is not a valid boolean value for boolean field ${field.name}`);
+    }
+  }
+  return value;
+};
+
+/** @deprecated
+ * @see src/plugins/data/public/es_query/filters/phrase_filter.ts
+ * Code was already moved into src/plugins/data/public.
+ * This method will be removed after moving 'es_query' into new platform
+ * */
+export const buildInlineScriptForPhraseFilter = (scriptedField) => {
+  // We must wrap painless scripts in a lambda in case they're more than a simple expression
+  if (scriptedField.lang === 'painless') {
+    return (
+      `boolean compare(Supplier s, def v) {return s.get() == v;}` +
+      `compare(() -> { ${scriptedField.script} }, params.value);`
+    );
+  } else {
+    return `(${scriptedField.script}) == value`;
+  }
+};
+
+/** @deprecated
+ * @see src/plugins/data/public/es_query/filters/phrase_filter.ts
+ * Code was already moved into src/plugins/data/public.
+ * This method will be removed after moving 'es_query' into new platform
+ * */
+export function getPhraseScript(field, value) {
+  const convertedValue = getConvertedValueForField(field, value);
+  const script = buildInlineScriptForPhraseFilter(field);
+
+  return {
+    script: {
+      source: script,
+      lang: field.lang,
+      params: {
+        value: convertedValue,
+      },
+    },
+  };
+}
+
+/** @deprecated
+ * @see src/plugins/data/public/es_query/filters/range_filter.ts
+ * Code was already moved into src/plugins/data/public.
+ * This method will be removed after moving 'kuery' into new platform
+ * */
+export function getRangeScript(field, params) {
+  const operators = {
+    gt: '>',
+    gte: '>=',
+    lte: '<=',
+    lt: '<',
+  };
+  const comparators = {
+    gt: 'boolean gt(Supplier s, def v) {return s.get() > v}',
+    gte: 'boolean gte(Supplier s, def v) {return s.get() >= v}',
+    lte: 'boolean lte(Supplier s, def v) {return s.get() <= v}',
+    lt: 'boolean lt(Supplier s, def v) {return s.get() < v}',
+  };
+
+  const dateComparators = {
+    gt: 'boolean gt(Supplier s, def v) {return s.get().toInstant().isAfter(Instant.parse(v))}',
+    gte: 'boolean gte(Supplier s, def v) {return !s.get().toInstant().isBefore(Instant.parse(v))}',
+    lte: 'boolean lte(Supplier s, def v) {return !s.get().toInstant().isAfter(Instant.parse(v))}',
+    lt: 'boolean lt(Supplier s, def v) {return s.get().toInstant().isBefore(Instant.parse(v))}',
+  };
+
+  const knownParams = pick(params, (val, key) => {
+    return key in operators;
+  });
+  let script = map(knownParams, (val, key) => {
+    return '(' + field.script + ')' + get(operators, key) + key;
+  }).join(' && ');
+
+  // We must wrap painless scripts in a lambda in case they're more than a simple expression
+  if (field.lang === 'painless') {
+    const comp = field.type === 'date' ? dateComparators : comparators;
+    const currentComparators = reduce(
+      knownParams,
+      (acc, val, key) => acc.concat(get(comp, key)),
+      []
+    ).join(' ');
+
+    const comparisons = map(knownParams, (val, key) => {
+      return `${key}(() -> { ${field.script} }, params.${key})`;
+    }).join(' && ');
+
+    script = `${currentComparators}${comparisons}`;
+  }
+
+  return {
+    script: {
+      source: script,
+      params: knownParams,
+      lang: field.lang,
+    },
+  };
+}
diff --git a/packages/kbn-es/package.json b/packages/kbn-es/package.json
index 5280c671450fa5..cb501dab3ddb75 100644
--- a/packages/kbn-es/package.json
+++ b/packages/kbn-es/package.json
@@ -10,8 +10,8 @@
     "abort-controller": "^2.0.3",
     "chalk": "^2.4.2",
     "dedent": "^0.7.0",
-    "del": "^4.1.1",
-    "execa": "^1.0.0",
+    "del": "^5.1.0",
+    "execa": "^3.2.0",
     "getopts": "^2.2.4",
     "glob": "^7.1.2",
     "node-fetch": "^2.6.0",
diff --git a/packages/kbn-eslint-plugin-eslint/rules/__tests__/files/no_restricted_paths/server/index_patterns/index.js b/packages/kbn-eslint-plugin-eslint/rules/__tests__/files/no_restricted_paths/server/index_patterns/index.js
new file mode 100644
index 00000000000000..d15de7d98a9e0c
--- /dev/null
+++ b/packages/kbn-eslint-plugin-eslint/rules/__tests__/files/no_restricted_paths/server/index_patterns/index.js
@@ -0,0 +1 @@
+/* eslint-disable */
diff --git a/packages/kbn-eslint-plugin-eslint/rules/__tests__/no_restricted_paths.js b/packages/kbn-eslint-plugin-eslint/rules/__tests__/no_restricted_paths.js
index f393a867d95e0d..577be820ccc7bc 100644
--- a/packages/kbn-eslint-plugin-eslint/rules/__tests__/no_restricted_paths.js
+++ b/packages/kbn-eslint-plugin-eslint/rules/__tests__/no_restricted_paths.js
@@ -172,6 +172,27 @@ ruleTester.run('@kbn/eslint/no-restricted-paths', rule, {
         },
       ],
     },
+
+    {
+      // Check if dirs that start with 'index' work correctly.
+      code: 'import { X } from "./index_patterns"',
+      filename: path.join(__dirname, './files/no_restricted_paths/server/b.js'),
+      options: [
+        {
+          basePath: __dirname,
+          zones: [
+            {
+              target: ['files/no_restricted_paths/(public|server)/**/*'],
+              from: [
+                'files/no_restricted_paths/server/**/*',
+                '!files/no_restricted_paths/server/index.{ts,tsx}',
+              ],
+              allowSameFolder: true,
+            },
+          ],
+        },
+      ],
+    },
   ],
 
   invalid: [
@@ -369,5 +390,34 @@ ruleTester.run('@kbn/eslint/no-restricted-paths', rule, {
         },
       ],
     },
+
+    {
+      // Don't use index*.
+      // It won't work with dirs that start with 'index'.
+      code: 'import { X } from "./index_patterns"',
+      filename: path.join(__dirname, './files/no_restricted_paths/server/b.js'),
+      options: [
+        {
+          basePath: __dirname,
+          zones: [
+            {
+              target: ['files/no_restricted_paths/(public|server)/**/*'],
+              from: [
+                'files/no_restricted_paths/server/**/*',
+                '!files/no_restricted_paths/server/index*',
+              ],
+              allowSameFolder: true,
+            },
+          ],
+        },
+      ],
+      errors: [
+        {
+          message: 'Unexpected path "./index_patterns" imported in restricted zone.',
+          line: 1,
+          column: 19,
+        },
+      ],
+    },
   ],
 });
diff --git a/packages/kbn-expect/expect.js b/packages/kbn-expect/expect.js
index 8dc8af4cab8949..bc75d19d2ab1fa 100644
--- a/packages/kbn-expect/expect.js
+++ b/packages/kbn-expect/expect.js
@@ -98,6 +98,9 @@ Assertion.prototype.assert = function (truth, msg, error, expected) {
 
   if (!ok) {
     err = new Error(msg.call(this));
+    if (this.customMsg) {
+      err.message = this.customMsg;
+    }
     if (arguments.length > 3) {
       err.actual = this.obj;
       err.expected = expected;
@@ -217,7 +220,10 @@ Assertion.prototype.empty = function () {
  */
 
 Assertion.prototype.be =
-Assertion.prototype.equal = function (obj) {
+Assertion.prototype.equal = function (obj, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       obj === this.obj
     , function(){ return 'expected ' + i(this.obj) + ' to equal ' + i(obj) }
@@ -231,7 +237,10 @@ Assertion.prototype.equal = function (obj) {
  * @api public
  */
 
-Assertion.prototype.eql = function (obj) {
+Assertion.prototype.eql = function (obj, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       expect.eql(this.obj, obj)
     , function(){ return 'expected ' + i(this.obj) + ' to sort of equal ' + i(obj) }
@@ -248,7 +257,10 @@ Assertion.prototype.eql = function (obj) {
  * @api public
  */
 
-Assertion.prototype.within = function (start, finish) {
+Assertion.prototype.within = function (start, finish, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   var range = start + '..' + finish;
   this.assert(
       this.obj >= start && this.obj <= finish
@@ -298,7 +310,10 @@ Assertion.prototype.an = function (type) {
  */
 
 Assertion.prototype.greaterThan =
-Assertion.prototype.above = function (n) {
+Assertion.prototype.above = function (n, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       this.obj > n
     , function(){ return 'expected ' + i(this.obj) + ' to be above ' + n }
@@ -314,7 +329,10 @@ Assertion.prototype.above = function (n) {
  */
 
 Assertion.prototype.lessThan =
-Assertion.prototype.below = function (n) {
+Assertion.prototype.below = function (n, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       this.obj < n
     , function(){ return 'expected ' + i(this.obj) + ' to be below ' + n }
@@ -329,7 +347,10 @@ Assertion.prototype.below = function (n) {
  * @api public
  */
 
-Assertion.prototype.match = function (regexp) {
+Assertion.prototype.match = function (regexp, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   this.assert(
       regexp.exec(this.obj)
     , function(){ return 'expected ' + i(this.obj) + ' to match ' + regexp }
@@ -344,7 +365,10 @@ Assertion.prototype.match = function (regexp) {
  * @api public
  */
 
-Assertion.prototype.length = function (n) {
+Assertion.prototype.length = function (n, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   expect(this.obj).to.have.property('length');
   var len = this.obj.length;
   this.assert(
@@ -410,7 +434,10 @@ Assertion.prototype.property = function (name, val) {
  */
 
 Assertion.prototype.string =
-Assertion.prototype.contain = function (obj) {
+Assertion.prototype.contain = function (obj, msg) {
+  if (typeof(msg) === 'string') {
+    this.customMsg = msg;
+  }
   if ('string' == typeof this.obj) {
     this.assert(
         ~this.obj.indexOf(obj)
diff --git a/packages/kbn-expect/expect.js.d.ts b/packages/kbn-expect/expect.js.d.ts
index 2062dea686500f..b957a1f9ab1099 100644
--- a/packages/kbn-expect/expect.js.d.ts
+++ b/packages/kbn-expect/expect.js.d.ts
@@ -59,12 +59,12 @@ interface Assertion {
   /**
    * Checks if the obj exactly equals another.
    */
-  equal(obj: any): Assertion;
+  equal(obj: any, msg?: string): Assertion;
 
   /**
    * Checks if the obj sortof equals another.
    */
-  eql(obj: any): Assertion;
+  eql(obj: any, msg?: string): Assertion;
 
   /**
    * Assert within start to finish (inclusive).
@@ -72,7 +72,7 @@ interface Assertion {
    * @param start
    * @param finish
    */
-  within(start: number, finish: number): Assertion;
+  within(start: number, finish: number, msg?: string): Assertion;
 
   /**
    * Assert typeof.
@@ -87,36 +87,36 @@ interface Assertion {
   /**
    * Assert numeric value above n.
    */
-  greaterThan(n: number): Assertion;
+  greaterThan(n: number, msg?: string): Assertion;
 
   /**
    * Assert numeric value above n.
    */
-  above(n: number): Assertion;
+  above(n: number, msg?: string): Assertion;
 
   /**
    * Assert numeric value below n.
    */
-  lessThan(n: number): Assertion;
+  lessThan(n: number, msg?: string): Assertion;
 
   /**
    * Assert numeric value below n.
    */
-  below(n: number): Assertion;
+  below(n: number, msg?: string): Assertion;
 
   /**
    * Assert string value matches regexp.
    *
    * @param regexp
    */
-  match(regexp: RegExp): Assertion;
+  match(regexp: RegExp, msg?: string): Assertion;
 
   /**
    * Assert property "length" exists and has value of n.
    *
    * @param n
    */
-  length(n: number): Assertion;
+  length(n: number, msg?: string): Assertion;
 
   /**
    * Assert property name exists, with optional val.
@@ -129,14 +129,14 @@ interface Assertion {
   /**
    * Assert that string contains str.
    */
-  contain(str: string): Assertion;
-  string(str: string): Assertion;
+  contain(str: string, msg?: string): Assertion;
+  string(str: string, msg?: string): Assertion;
 
   /**
    * Assert that the array contains obj.
    */
-  contain(obj: any): Assertion;
-  string(obj: any): Assertion;
+  contain(obj: any, msg?: string): Assertion;
+  string(obj: any, msg?: string): Assertion;
 
   /**
    * Assert exact keys or inclusion of keys by using the `.own` modifier.
diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json
index dff8a3f2f4b783..8a88626bffbe85 100644
--- a/packages/kbn-i18n/package.json
+++ b/packages/kbn-i18n/package.json
@@ -18,7 +18,7 @@
     "@kbn/dev-utils": "1.0.0",
     "@types/intl-relativeformat": "^2.1.0",
     "@types/react-intl": "^2.3.15",
-    "del": "^4.1.1",
+    "del": "^5.1.0",
     "getopts": "^2.2.4",
     "supports-color": "^7.0.0",
     "typescript": "3.5.3"
diff --git a/packages/kbn-interpreter/package.json b/packages/kbn-interpreter/package.json
index f2aa2e1ced9cd0..27ef70d8718569 100644
--- a/packages/kbn-interpreter/package.json
+++ b/packages/kbn-interpreter/package.json
@@ -24,7 +24,7 @@
     "babel-loader": "^8.0.6",
     "copy-webpack-plugin": "^5.0.4",
     "css-loader": "2.1.1",
-    "del": "^4.1.1",
+    "del": "^5.1.0",
     "getopts": "^2.2.4",
     "pegjs": "0.10.0",
     "sass-loader": "^7.3.1",
diff --git a/packages/kbn-plugin-generator/package.json b/packages/kbn-plugin-generator/package.json
index 74ccbd8e758b56..ac98a0e675fb18 100644
--- a/packages/kbn-plugin-generator/package.json
+++ b/packages/kbn-plugin-generator/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "chalk": "^2.4.2",
     "dedent": "^0.7.0",
-    "execa": "^1.0.0",
+    "execa": "^3.2.0",
     "getopts": "^2.2.4",
     "lodash.camelcase": "^4.3.0",
     "lodash.kebabcase": "^4.1.1",
diff --git a/packages/kbn-plugin-generator/sao_template/template/public/app.js b/packages/kbn-plugin-generator/sao_template/template/public/app.js
index 031878d70f9f3e..37a7c37e916a0f 100755
--- a/packages/kbn-plugin-generator/sao_template/template/public/app.js
+++ b/packages/kbn-plugin-generator/sao_template/template/public/app.js
@@ -6,7 +6,6 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
 <%_ } _%>
 
-import 'ui/autoload/styles';
 import { Main } from './components/main';
 
 const app = uiModules.get('apps/<%= camelCase(name) %>');
diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
index 215963c0769bb5..68af0aa791c8e0 100644
--- a/packages/kbn-plugin-helpers/package.json
+++ b/packages/kbn-plugin-helpers/package.json
@@ -16,8 +16,8 @@
     "@babel/core": "^7.5.5",
     "argv-split": "^2.0.1",
     "commander": "^3.0.0",
-    "del": "^4.1.1",
-    "execa": "^1.0.0",
+    "del": "^5.1.0",
+    "execa": "^3.2.0",
     "globby": "^8.0.1",
     "gulp-babel": "^8.0.0",
     "gulp-rename": "1.4.0",
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index f52c194cfee6af..bbe12a93c241f7 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -94,7 +94,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _cli__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "run", function() { return _cli__WEBPACK_IMPORTED_MODULE_0__["run"]; });
 
-/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(404);
+/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(484);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildProductionProjects"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; });
@@ -105,10 +105,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(54);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return _utils_project__WEBPACK_IMPORTED_MODULE_3__["Project"]; });
 
-/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(163);
+/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(171);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "copyWorkspacePackages", function() { return _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__["copyWorkspacePackages"]; });
 
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(164);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(172);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_5__["getProjectPaths"]; });
 
 /*
@@ -152,7 +152,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
 /* harmony import */ var _commands__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(17);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(394);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(475);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
@@ -2502,9 +2502,9 @@ module.exports = require("path");
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "commands", function() { return commands; });
 /* harmony import */ var _bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
-/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(165);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(192);
-/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(193);
+/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(173);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(272);
+/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(273);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -4415,7 +4415,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(53);
 /* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(54);
-/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(163);
+/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(171);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19082,9 +19082,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(122);
 /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(150);
+/* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(158);
 /* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(log_symbols__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(155);
+/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(163);
 /* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
@@ -19124,7 +19124,8 @@ function generateColors() {
 
 function spawn(command, args, opts) {
   return execa__WEBPACK_IMPORTED_MODULE_1___default()(command, args, _objectSpread({
-    stdio: 'inherit'
+    stdio: 'inherit',
+    preferLocal: true
   }, opts));
 }
 const nextColor = generateColors();
@@ -19132,7 +19133,8 @@ function spawnStreaming(command, args, opts, {
   prefix
 }) {
   const spawned = execa__WEBPACK_IMPORTED_MODULE_1___default()(command, args, _objectSpread({
-    stdio: ['ignore', 'pipe', 'pipe']
+    stdio: ['ignore', 'pipe', 'pipe'],
+    preferLocal: true
   }, opts));
   const color = nextColor();
   const prefixedStdout = strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default()({
@@ -19156,363 +19158,258 @@ function spawnStreaming(command, args, opts, {
 const path = __webpack_require__(16);
 const childProcess = __webpack_require__(123);
 const crossSpawn = __webpack_require__(124);
-const stripEof = __webpack_require__(139);
-const npmRunPath = __webpack_require__(140);
-const isStream = __webpack_require__(142);
-const _getStream = __webpack_require__(143);
-const pFinally = __webpack_require__(147);
-const onExit = __webpack_require__(110);
-const errname = __webpack_require__(148);
-const stdio = __webpack_require__(149);
-
-const TEN_MEGABYTES = 1000 * 1000 * 10;
-
-function handleArgs(cmd, args, opts) {
-	let parsed;
-
-	opts = Object.assign({
-		extendEnv: true,
-		env: {}
-	}, opts);
-
-	if (opts.extendEnv) {
-		opts.env = Object.assign({}, process.env, opts.env);
+const stripFinalNewline = __webpack_require__(137);
+const npmRunPath = __webpack_require__(138);
+const onetime = __webpack_require__(139);
+const makeError = __webpack_require__(141);
+const normalizeStdio = __webpack_require__(146);
+const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(147);
+const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(149);
+const {mergePromise, getSpawnedPromise} = __webpack_require__(156);
+const {joinCommand, parseCommand} = __webpack_require__(157);
+
+const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
+
+const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => {
+	const env = extendEnv ? {...process.env, ...envOption} : envOption;
+
+	if (preferLocal) {
+		return npmRunPath.env({env, cwd: localDir, execPath});
 	}
 
-	if (opts.__winShell === true) {
-		delete opts.__winShell;
-		parsed = {
-			command: cmd,
-			args,
-			options: opts,
-			file: cmd,
-			original: {
-				cmd,
-				args
-			}
-		};
-	} else {
-		parsed = crossSpawn._parse(cmd, args, opts);
-	}
+	return env;
+};
 
-	opts = Object.assign({
-		maxBuffer: TEN_MEGABYTES,
+const handleArgs = (file, args, options = {}) => {
+	const parsed = crossSpawn._parse(file, args, options);
+	file = parsed.command;
+	args = parsed.args;
+	options = parsed.options;
+
+	options = {
+		maxBuffer: DEFAULT_MAX_BUFFER,
 		buffer: true,
-		stripEof: true,
-		preferLocal: true,
-		localDir: parsed.options.cwd || process.cwd(),
+		stripFinalNewline: true,
+		extendEnv: true,
+		preferLocal: false,
+		localDir: options.cwd || process.cwd(),
+		execPath: process.execPath,
 		encoding: 'utf8',
 		reject: true,
-		cleanup: true
-	}, parsed.options);
-
-	opts.stdio = stdio(opts);
-
-	if (opts.preferLocal) {
-		opts.env = npmRunPath.env(Object.assign({}, opts, {cwd: opts.localDir}));
-	}
-
-	if (opts.detached) {
-		// #115
-		opts.cleanup = false;
-	}
-
-	if (process.platform === 'win32' && path.basename(parsed.command) === 'cmd.exe') {
-		// #116
-		parsed.args.unshift('/q');
-	}
-
-	return {
-		cmd: parsed.command,
-		args: parsed.args,
-		opts,
-		parsed
+		cleanup: true,
+		all: false,
+		...options,
+		windowsHide: true
 	};
-}
-
-function handleInput(spawned, input) {
-	if (input === null || input === undefined) {
-		return;
-	}
-
-	if (isStream(input)) {
-		input.pipe(spawned.stdin);
-	} else {
-		spawned.stdin.end(input);
-	}
-}
-
-function handleOutput(opts, val) {
-	if (val && opts.stripEof) {
-		val = stripEof(val);
-	}
-
-	return val;
-}
-
-function handleShell(fn, cmd, opts) {
-	let file = '/bin/sh';
-	let args = ['-c', cmd];
-
-	opts = Object.assign({}, opts);
-
-	if (process.platform === 'win32') {
-		opts.__winShell = true;
-		file = process.env.comspec || 'cmd.exe';
-		args = ['/s', '/c', `"${cmd}"`];
-		opts.windowsVerbatimArguments = true;
-	}
-
-	if (opts.shell) {
-		file = opts.shell;
-		delete opts.shell;
-	}
-
-	return fn(file, args, opts);
-}
 
-function getStream(process, stream, {encoding, buffer, maxBuffer}) {
-	if (!process[stream]) {
-		return null;
-	}
+	options.env = getEnv(options);
 
-	let ret;
+	options.stdio = normalizeStdio(options);
 
-	if (!buffer) {
-		// TODO: Use `ret = util.promisify(stream.finished)(process[stream]);` when targeting Node.js 10
-		ret = new Promise((resolve, reject) => {
-			process[stream]
-				.once('end', resolve)
-				.once('error', reject);
-		});
-	} else if (encoding) {
-		ret = _getStream(process[stream], {
-			encoding,
-			maxBuffer
-		});
-	} else {
-		ret = _getStream.buffer(process[stream], {maxBuffer});
+	if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') {
+		// #116
+		args.unshift('/q');
 	}
 
-	return ret.catch(err => {
-		err.stream = stream;
-		err.message = `${stream} ${err.message}`;
-		throw err;
-	});
-}
-
-function makeError(result, options) {
-	const {stdout, stderr} = result;
-
-	let err = result.error;
-	const {code, signal} = result;
-
-	const {parsed, joinedCmd} = options;
-	const timedOut = options.timedOut || false;
-
-	if (!err) {
-		let output = '';
-
-		if (Array.isArray(parsed.opts.stdio)) {
-			if (parsed.opts.stdio[2] !== 'inherit') {
-				output += output.length > 0 ? stderr : `\n${stderr}`;
-			}
-
-			if (parsed.opts.stdio[1] !== 'inherit') {
-				output += `\n${stdout}`;
-			}
-		} else if (parsed.opts.stdio !== 'inherit') {
-			output = `\n${stderr}${stdout}`;
-		}
+	return {file, args, options, parsed};
+};
 
-		err = new Error(`Command failed: ${joinedCmd}${output}`);
-		err.code = code < 0 ? errname(code) : code;
+const handleOutput = (options, value, error) => {
+	if (typeof value !== 'string' && !Buffer.isBuffer(value)) {
+		// When `execa.sync()` errors, we normalize it to '' to mimic `execa()`
+		return error === undefined ? undefined : '';
 	}
 
-	err.stdout = stdout;
-	err.stderr = stderr;
-	err.failed = true;
-	err.signal = signal || null;
-	err.cmd = joinedCmd;
-	err.timedOut = timedOut;
-
-	return err;
-}
-
-function joinCmd(cmd, args) {
-	let joinedCmd = cmd;
-
-	if (Array.isArray(args) && args.length > 0) {
-		joinedCmd += ' ' + args.join(' ');
+	if (options.stripFinalNewline) {
+		return stripFinalNewline(value);
 	}
 
-	return joinedCmd;
-}
+	return value;
+};
 
-module.exports = (cmd, args, opts) => {
-	const parsed = handleArgs(cmd, args, opts);
-	const {encoding, buffer, maxBuffer} = parsed.opts;
-	const joinedCmd = joinCmd(cmd, args);
+const execa = (file, args, options) => {
+	const parsed = handleArgs(file, args, options);
+	const command = joinCommand(file, args);
 
 	let spawned;
 	try {
-		spawned = childProcess.spawn(parsed.cmd, parsed.args, parsed.opts);
-	} catch (err) {
-		return Promise.reject(err);
-	}
-
-	let removeExitHandler;
-	if (parsed.opts.cleanup) {
-		removeExitHandler = onExit(() => {
-			spawned.kill();
-		});
-	}
-
-	let timeoutId = null;
-	let timedOut = false;
-
-	const cleanup = () => {
-		if (timeoutId) {
-			clearTimeout(timeoutId);
-			timeoutId = null;
-		}
-
-		if (removeExitHandler) {
-			removeExitHandler();
-		}
-	};
-
-	if (parsed.opts.timeout > 0) {
-		timeoutId = setTimeout(() => {
-			timeoutId = null;
-			timedOut = true;
-			spawned.kill(parsed.opts.killSignal);
-		}, parsed.opts.timeout);
-	}
-
-	const processDone = new Promise(resolve => {
-		spawned.on('exit', (code, signal) => {
-			cleanup();
-			resolve({code, signal});
-		});
-
-		spawned.on('error', err => {
-			cleanup();
-			resolve({error: err});
-		});
-
-		if (spawned.stdin) {
-			spawned.stdin.on('error', err => {
-				cleanup();
-				resolve({error: err});
-			});
-		}
-	});
-
-	function destroy() {
-		if (spawned.stdout) {
-			spawned.stdout.destroy();
-		}
-
-		if (spawned.stderr) {
-			spawned.stderr.destroy();
-		}
+		spawned = childProcess.spawn(parsed.file, parsed.args, parsed.options);
+	} catch (error) {
+		// Ensure the returned error is always both a promise and a child process
+		const dummySpawned = new childProcess.ChildProcess();
+		const errorPromise = Promise.reject(makeError({
+			error,
+			stdout: '',
+			stderr: '',
+			all: '',
+			command,
+			parsed,
+			timedOut: false,
+			isCanceled: false,
+			killed: false
+		}));
+		return mergePromise(dummySpawned, errorPromise);
 	}
 
-	const handlePromise = () => pFinally(Promise.all([
-		processDone,
-		getStream(spawned, 'stdout', {encoding, buffer, maxBuffer}),
-		getStream(spawned, 'stderr', {encoding, buffer, maxBuffer})
-	]).then(arr => {
-		const result = arr[0];
-		result.stdout = arr[1];
-		result.stderr = arr[2];
-
-		if (result.error || result.code !== 0 || result.signal !== null) {
-			const err = makeError(result, {
-				joinedCmd,
+	const spawnedPromise = getSpawnedPromise(spawned);
+	const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise);
+	const processDone = setExitHandler(spawned, parsed.options, timedPromise);
+
+	const context = {isCanceled: false};
+
+	spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned));
+	spawned.cancel = spawnedCancel.bind(null, spawned, context);
+
+	const handlePromise = async () => {
+		const [{error, exitCode, signal, timedOut}, stdoutResult, stderrResult, allResult] = await getSpawnedResult(spawned, parsed.options, processDone);
+		const stdout = handleOutput(parsed.options, stdoutResult);
+		const stderr = handleOutput(parsed.options, stderrResult);
+		const all = handleOutput(parsed.options, allResult);
+
+		if (error || exitCode !== 0 || signal !== null) {
+			const returnedError = makeError({
+				error,
+				exitCode,
+				signal,
+				stdout,
+				stderr,
+				all,
+				command,
 				parsed,
-				timedOut
+				timedOut,
+				isCanceled: context.isCanceled,
+				killed: spawned.killed
 			});
 
-			// TODO: missing some timeout logic for killed
-			// https://github.com/nodejs/node/blob/master/lib/child_process.js#L203
-			// err.killed = spawned.killed || killed;
-			err.killed = err.killed || spawned.killed;
-
-			if (!parsed.opts.reject) {
-				return err;
+			if (!parsed.options.reject) {
+				return returnedError;
 			}
 
-			throw err;
+			throw returnedError;
 		}
 
 		return {
-			stdout: handleOutput(parsed.opts, result.stdout),
-			stderr: handleOutput(parsed.opts, result.stderr),
-			code: 0,
+			command,
+			exitCode: 0,
+			stdout,
+			stderr,
+			all,
 			failed: false,
-			killed: false,
-			signal: null,
-			cmd: joinedCmd,
-			timedOut: false
+			timedOut: false,
+			isCanceled: false,
+			killed: false
 		};
-	}), destroy);
+	};
+
+	const handlePromiseOnce = onetime(handlePromise);
 
 	crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed);
 
-	handleInput(spawned, parsed.opts.input);
+	handleInput(spawned, parsed.options.input);
 
-	spawned.then = (onfulfilled, onrejected) => handlePromise().then(onfulfilled, onrejected);
-	spawned.catch = onrejected => handlePromise().catch(onrejected);
+	spawned.all = makeAllStream(spawned, parsed.options);
 
-	return spawned;
+	return mergePromise(spawned, handlePromiseOnce);
 };
 
-// TODO: set `stderr: 'ignore'` when that option is implemented
-module.exports.stdout = (...args) => module.exports(...args).then(x => x.stdout);
+module.exports = execa;
 
-// TODO: set `stdout: 'ignore'` when that option is implemented
-module.exports.stderr = (...args) => module.exports(...args).then(x => x.stderr);
+module.exports.sync = (file, args, options) => {
+	const parsed = handleArgs(file, args, options);
+	const command = joinCommand(file, args);
 
-module.exports.shell = (cmd, opts) => handleShell(module.exports, cmd, opts);
+	validateInputSync(parsed.options);
 
-module.exports.sync = (cmd, args, opts) => {
-	const parsed = handleArgs(cmd, args, opts);
-	const joinedCmd = joinCmd(cmd, args);
-
-	if (isStream(parsed.opts.input)) {
-		throw new TypeError('The `input` option cannot be a stream in sync mode');
+	let result;
+	try {
+		result = childProcess.spawnSync(parsed.file, parsed.args, parsed.options);
+	} catch (error) {
+		throw makeError({
+			error,
+			stdout: '',
+			stderr: '',
+			all: '',
+			command,
+			parsed,
+			timedOut: false,
+			isCanceled: false,
+			killed: false
+		});
 	}
 
-	const result = childProcess.spawnSync(parsed.cmd, parsed.args, parsed.opts);
-	result.code = result.status;
+	const stdout = handleOutput(parsed.options, result.stdout, result.error);
+	const stderr = handleOutput(parsed.options, result.stderr, result.error);
 
 	if (result.error || result.status !== 0 || result.signal !== null) {
-		const err = makeError(result, {
-			joinedCmd,
-			parsed
+		const error = makeError({
+			stdout,
+			stderr,
+			error: result.error,
+			signal: result.signal,
+			exitCode: result.status,
+			command,
+			parsed,
+			timedOut: result.error && result.error.code === 'ETIMEDOUT',
+			isCanceled: false,
+			killed: result.signal !== null
 		});
 
-		if (!parsed.opts.reject) {
-			return err;
+		if (!parsed.options.reject) {
+			return error;
 		}
 
-		throw err;
+		throw error;
 	}
 
 	return {
-		stdout: handleOutput(parsed.opts, result.stdout),
-		stderr: handleOutput(parsed.opts, result.stderr),
-		code: 0,
+		command,
+		exitCode: 0,
+		stdout,
+		stderr,
 		failed: false,
-		signal: null,
-		cmd: joinedCmd,
-		timedOut: false
+		timedOut: false,
+		isCanceled: false,
+		killed: false
 	};
 };
 
-module.exports.shellSync = (cmd, opts) => handleShell(module.exports.sync, cmd, opts);
+module.exports.command = (command, options) => {
+	const [file, ...args] = parseCommand(command);
+	return execa(file, args, options);
+};
+
+module.exports.commandSync = (command, options) => {
+	const [file, ...args] = parseCommand(command);
+	return execa.sync(file, args, options);
+};
+
+module.exports.node = (scriptPath, args, options = {}) => {
+	if (args && !Array.isArray(args) && typeof args === 'object') {
+		options = args;
+		args = [];
+	}
+
+	const stdio = normalizeStdio.node(options);
+
+	const {nodePath = process.execPath, nodeOptions = process.execArgv} = options;
+
+	return execa(
+		nodePath,
+		[
+			...nodeOptions,
+			scriptPath,
+			...(Array.isArray(args) ? args : [])
+		],
+		{
+			...options,
+			stdin: undefined,
+			stdout: undefined,
+			stderr: undefined,
+			stdio,
+			shell: false
+		}
+	);
+};
 
 
 /***/ }),
@@ -19530,7 +19427,7 @@ module.exports = require("child_process");
 
 const cp = __webpack_require__(123);
 const parse = __webpack_require__(125);
-const enoent = __webpack_require__(138);
+const enoent = __webpack_require__(136);
 
 function spawn(command, args, options) {
     // Parse the arguments
@@ -19575,19 +19472,14 @@ module.exports._enoent = enoent;
 
 
 const path = __webpack_require__(16);
-const niceTry = __webpack_require__(126);
-const resolveCommand = __webpack_require__(127);
-const escape = __webpack_require__(133);
-const readShebang = __webpack_require__(134);
-const semver = __webpack_require__(137);
+const resolveCommand = __webpack_require__(126);
+const escape = __webpack_require__(132);
+const readShebang = __webpack_require__(133);
 
 const isWin = process.platform === 'win32';
 const isExecutableRegExp = /\.(?:com|exe)$/i;
 const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
 
-// `options.shell` is supported in Node ^4.8.0, ^5.7.0 and >= 6.0.0
-const supportsShellOption = niceTry(() => semver.satisfies(process.version, '^4.8.0 || ^5.7.0 || >= 6.0.0', true)) || false;
-
 function detectShebang(parsed) {
     parsed.file = resolveCommand(parsed);
 
@@ -19641,35 +19533,6 @@ function parseNonShell(parsed) {
     return parsed;
 }
 
-function parseShell(parsed) {
-    // If node supports the shell option, there's no need to mimic its behavior
-    if (supportsShellOption) {
-        return parsed;
-    }
-
-    // Mimic node shell option
-    // See https://github.com/nodejs/node/blob/b9f6a2dc059a1062776133f3d4fd848c4da7d150/lib/child_process.js#L335
-    const shellCommand = [parsed.command].concat(parsed.args).join(' ');
-
-    if (isWin) {
-        parsed.command = typeof parsed.options.shell === 'string' ? parsed.options.shell : process.env.comspec || 'cmd.exe';
-        parsed.args = ['/d', '/s', '/c', `"${shellCommand}"`];
-        parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped
-    } else {
-        if (typeof parsed.options.shell === 'string') {
-            parsed.command = parsed.options.shell;
-        } else if (process.platform === 'android') {
-            parsed.command = '/system/bin/sh';
-        } else {
-            parsed.command = '/bin/sh';
-        }
-
-        parsed.args = ['-c', shellCommand];
-    }
-
-    return parsed;
-}
-
 function parse(command, args, options) {
     // Normalize arguments, similar to nodejs
     if (args && !Array.isArray(args)) {
@@ -19693,7 +19556,7 @@ function parse(command, args, options) {
     };
 
     // Delegate further parsing to shell or non-shell
-    return options.shell ? parseShell(parsed) : parseNonShell(parsed);
+    return options.shell ? parsed : parseNonShell(parsed);
 }
 
 module.exports = parse;
@@ -19706,36 +19569,19 @@ module.exports = parse;
 "use strict";
 
 
-/**
- * Tries to execute a function and discards any error that occurs.
- * @param {Function} fn - Function that might or might not throw an error.
- * @returns {?*} Return-value of the function when no error occurred.
- */
-module.exports = function(fn) {
-
-	try { return fn() }
-	catch (e) {}
-
-}
-
-/***/ }),
-/* 127 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
 const path = __webpack_require__(16);
-const which = __webpack_require__(128);
-const pathKey = __webpack_require__(132)();
+const which = __webpack_require__(127);
+const pathKey = __webpack_require__(131)();
 
 function resolveCommandAttempt(parsed, withoutPathExt) {
     const cwd = process.cwd();
     const hasCustomCwd = parsed.options.cwd != null;
+    // Worker threads do not have process.chdir()
+    const shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined;
 
     // If a custom `cwd` was specified, we need to change the process cwd
     // because `which` will do stat calls but does not support a custom cwd
-    if (hasCustomCwd) {
+    if (shouldSwitchCwd) {
         try {
             process.chdir(parsed.options.cwd);
         } catch (err) {
@@ -19753,7 +19599,9 @@ function resolveCommandAttempt(parsed, withoutPathExt) {
     } catch (e) {
         /* Empty */
     } finally {
-        process.chdir(cwd);
+        if (shouldSwitchCwd) {
+            process.chdir(cwd);
+        }
     }
 
     // If we successfully resolved, ensure that an absolute path is returned
@@ -19773,126 +19621,113 @@ module.exports = resolveCommand;
 
 
 /***/ }),
-/* 128 */
+/* 127 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = which
-which.sync = whichSync
-
-var isWindows = process.platform === 'win32' ||
+const isWindows = process.platform === 'win32' ||
     process.env.OSTYPE === 'cygwin' ||
     process.env.OSTYPE === 'msys'
 
-var path = __webpack_require__(16)
-var COLON = isWindows ? ';' : ':'
-var isexe = __webpack_require__(129)
-
-function getNotFoundError (cmd) {
-  var er = new Error('not found: ' + cmd)
-  er.code = 'ENOENT'
+const path = __webpack_require__(16)
+const COLON = isWindows ? ';' : ':'
+const isexe = __webpack_require__(128)
 
-  return er
-}
+const getNotFoundError = (cmd) =>
+  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
 
-function getPathInfo (cmd, opt) {
-  var colon = opt.colon || COLON
-  var pathEnv = opt.path || process.env.PATH || ''
-  var pathExt = ['']
+const getPathInfo = (cmd, opt) => {
+  const colon = opt.colon || COLON
 
-  pathEnv = pathEnv.split(colon)
+  // If it has a slash, then we don't bother searching the pathenv.
+  // just check the file itself, and that's it.
+  const pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? ['']
+    : (
+      [
+        // windows always checks the cwd first
+        ...(isWindows ? [process.cwd()] : []),
+        ...(opt.path || process.env.PATH ||
+          /* istanbul ignore next: very unusual */ '').split(colon),
+      ]
+    )
+  const pathExtExe = isWindows
+    ? opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM'
+    : ''
+  const pathExt = isWindows ? pathExtExe.split(colon) : ['']
 
-  var pathExtExe = ''
   if (isWindows) {
-    pathEnv.unshift(process.cwd())
-    pathExtExe = (opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM')
-    pathExt = pathExtExe.split(colon)
-
-
-    // Always test the cmd itself first.  isexe will check to make sure
-    // it's found in the pathExt set.
     if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
       pathExt.unshift('')
   }
 
-  // If it has a slash, then we don't bother searching the pathenv.
-  // just check the file itself, and that's it.
-  if (cmd.match(/\//) || isWindows && cmd.match(/\\/))
-    pathEnv = ['']
-
   return {
-    env: pathEnv,
-    ext: pathExt,
-    extExe: pathExtExe
+    pathEnv,
+    pathExt,
+    pathExtExe,
   }
 }
 
-function which (cmd, opt, cb) {
+const which = (cmd, opt, cb) => {
   if (typeof opt === 'function') {
     cb = opt
     opt = {}
   }
+  if (!opt)
+    opt = {}
 
-  var info = getPathInfo(cmd, opt)
-  var pathEnv = info.env
-  var pathExt = info.ext
-  var pathExtExe = info.extExe
-  var found = []
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
 
-  ;(function F (i, l) {
-    if (i === l) {
-      if (opt.all && found.length)
-        return cb(null, found)
-      else
-        return cb(getNotFoundError(cmd))
-    }
+  const step = i => new Promise((resolve, reject) => {
+    if (i === pathEnv.length)
+      return opt.all && found.length ? resolve(found)
+        : reject(getNotFoundError(cmd))
 
-    var pathPart = pathEnv[i]
-    if (pathPart.charAt(0) === '"' && pathPart.slice(-1) === '"')
-      pathPart = pathPart.slice(1, -1)
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
 
-    var p = path.join(pathPart, cmd)
-    if (!pathPart && (/^\.[\\\/]/).test(cmd)) {
-      p = cmd.slice(0, 2) + p
-    }
-    ;(function E (ii, ll) {
-      if (ii === ll) return F(i + 1, l)
-      var ext = pathExt[ii]
-      isexe(p + ext, { pathExt: pathExtExe }, function (er, is) {
-        if (!er && is) {
-          if (opt.all)
-            found.push(p + ext)
-          else
-            return cb(null, p + ext)
-        }
-        return E(ii + 1, ll)
-      })
-    })(0, pathExt.length)
-  })(0, pathEnv.length)
+    const pCmd = path.join(pathPart, cmd)
+    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
+      : pCmd
+
+    resolve(subStep(p, i, 0))
+  })
+
+  const subStep = (p, i, ii) => new Promise((resolve, reject) => {
+    if (ii === pathExt.length)
+      return resolve(step(i + 1))
+    const ext = pathExt[ii]
+    isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
+      if (!er && is) {
+        if (opt.all)
+          found.push(p + ext)
+        else
+          return resolve(p + ext)
+      }
+      return resolve(subStep(p, i, ii + 1))
+    })
+  })
+
+  return cb ? step(0).then(res => cb(null, res), cb) : step(0)
 }
 
-function whichSync (cmd, opt) {
+const whichSync = (cmd, opt) => {
   opt = opt || {}
 
-  var info = getPathInfo(cmd, opt)
-  var pathEnv = info.env
-  var pathExt = info.ext
-  var pathExtExe = info.extExe
-  var found = []
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
 
-  for (var i = 0, l = pathEnv.length; i < l; i ++) {
-    var pathPart = pathEnv[i]
-    if (pathPart.charAt(0) === '"' && pathPart.slice(-1) === '"')
-      pathPart = pathPart.slice(1, -1)
+  for (let i = 0; i < pathEnv.length; i ++) {
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
 
-    var p = path.join(pathPart, cmd)
-    if (!pathPart && /^\.[\\\/]/.test(cmd)) {
-      p = cmd.slice(0, 2) + p
-    }
-    for (var j = 0, ll = pathExt.length; j < ll; j ++) {
-      var cur = p + pathExt[j]
-      var is
+    const pCmd = path.join(pathPart, cmd)
+    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
+      : pCmd
+
+    for (let j = 0; j < pathExt.length; j ++) {
+      const cur = p + pathExt[j]
       try {
-        is = isexe.sync(cur, { pathExt: pathExtExe })
+        const is = isexe.sync(cur, { pathExt: pathExtExe })
         if (is) {
           if (opt.all)
             found.push(cur)
@@ -19912,17 +19747,20 @@ function whichSync (cmd, opt) {
   throw getNotFoundError(cmd)
 }
 
+module.exports = which
+which.sync = whichSync
+
 
 /***/ }),
-/* 129 */
+/* 128 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var fs = __webpack_require__(23)
 var core
 if (process.platform === 'win32' || global.TESTING_WINDOWS) {
-  core = __webpack_require__(130)
+  core = __webpack_require__(129)
 } else {
-  core = __webpack_require__(131)
+  core = __webpack_require__(130)
 }
 
 module.exports = isexe
@@ -19977,7 +19815,7 @@ function sync (path, options) {
 
 
 /***/ }),
-/* 130 */
+/* 129 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = isexe
@@ -20025,7 +19863,7 @@ function sync (path, options) {
 
 
 /***/ }),
-/* 131 */
+/* 130 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = isexe
@@ -20072,27 +19910,30 @@ function checkMode (stat, options) {
 
 
 /***/ }),
-/* 132 */
+/* 131 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = opts => {
-	opts = opts || {};
 
-	const env = opts.env || process.env;
-	const platform = opts.platform || process.platform;
+const pathKey = (options = {}) => {
+	const environment = options.env || process.env;
+	const platform = options.platform || process.platform;
 
 	if (platform !== 'win32') {
 		return 'PATH';
 	}
 
-	return Object.keys(env).find(x => x.toUpperCase() === 'PATH') || 'Path';
+	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
 };
 
+module.exports = pathKey;
+// TODO: Remove this for the next major release
+module.exports.default = pathKey;
+
 
 /***/ }),
-/* 133 */
+/* 132 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -20144,28 +19985,19 @@ module.exports.argument = escapeArgument;
 
 
 /***/ }),
-/* 134 */
+/* 133 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const fs = __webpack_require__(23);
-const shebangCommand = __webpack_require__(135);
+const shebangCommand = __webpack_require__(134);
 
 function readShebang(command) {
     // Read the first 150 bytes from the file
     const size = 150;
-    let buffer;
-
-    if (Buffer.alloc) {
-        // Node.js v4.5+ / v5.10+
-        buffer = Buffer.alloc(size);
-    } else {
-        // Old Node.js API
-        buffer = new Buffer(size);
-        buffer.fill(0); // zero-fill
-    }
+    const buffer = Buffer.alloc(size);
 
     let fd;
 
@@ -20183,1560 +20015,1113 @@ module.exports = readShebang;
 
 
 /***/ }),
-/* 135 */
+/* 134 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var shebangRegex = __webpack_require__(136);
+const shebangRegex = __webpack_require__(135);
 
-module.exports = function (str) {
-	var match = str.match(shebangRegex);
+module.exports = (string = '') => {
+	const match = string.match(shebangRegex);
 
 	if (!match) {
 		return null;
 	}
 
-	var arr = match[0].replace(/#! ?/, '').split(' ');
-	var bin = arr[0].split('/').pop();
-	var arg = arr[1];
+	const [path, argument] = match[0].replace(/#! ?/, '').split(' ');
+	const binary = path.split('/').pop();
 
-	return (bin === 'env' ?
-		arg :
-		bin + (arg ? ' ' + arg : '')
-	);
+	if (binary === 'env') {
+		return argument;
+	}
+
+	return argument ? `${binary} ${argument}` : binary;
 };
 
 
 /***/ }),
-/* 136 */
+/* 135 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = /^#!.*/;
+module.exports = /^#!(.*)/;
 
 
 /***/ }),
-/* 137 */
-/***/ (function(module, exports) {
+/* 136 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports = module.exports = SemVer;
+"use strict";
 
-// The debug function is excluded entirely from the minified version.
-/* nomin */ var debug;
-/* nomin */ if (typeof process === 'object' &&
-    /* nomin */ process.env &&
-    /* nomin */ process.env.NODE_DEBUG &&
-    /* nomin */ /\bsemver\b/i.test(process.env.NODE_DEBUG))
-  /* nomin */ debug = function() {
-    /* nomin */ var args = Array.prototype.slice.call(arguments, 0);
-    /* nomin */ args.unshift('SEMVER');
-    /* nomin */ console.log.apply(console, args);
-    /* nomin */ };
-/* nomin */ else
-  /* nomin */ debug = function() {};
 
-// Note: this is the semver.org version of the spec that it implements
-// Not necessarily the package version of this code.
-exports.SEMVER_SPEC_VERSION = '2.0.0';
+const isWin = process.platform === 'win32';
 
-var MAX_LENGTH = 256;
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
+function notFoundError(original, syscall) {
+    return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), {
+        code: 'ENOENT',
+        errno: 'ENOENT',
+        syscall: `${syscall} ${original.command}`,
+        path: original.command,
+        spawnargs: original.args,
+    });
+}
 
-// Max safe segment length for coercion.
-var MAX_SAFE_COMPONENT_LENGTH = 16;
+function hookChildProcess(cp, parsed) {
+    if (!isWin) {
+        return;
+    }
 
-// The actual regexps go on exports.re
-var re = exports.re = [];
-var src = exports.src = [];
-var R = 0;
+    const originalEmit = cp.emit;
 
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
+    cp.emit = function (name, arg1) {
+        // If emitting "exit" event and exit code is 1, we need to check if
+        // the command exists and emit an "error" instead
+        // See https://github.com/IndigoUnited/node-cross-spawn/issues/16
+        if (name === 'exit') {
+            const err = verifyENOENT(arg1, parsed, 'spawn');
 
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
+            if (err) {
+                return originalEmit.call(cp, 'error', err);
+            }
+        }
 
-var NUMERICIDENTIFIER = R++;
-src[NUMERICIDENTIFIER] = '0|[1-9]\\d*';
-var NUMERICIDENTIFIERLOOSE = R++;
-src[NUMERICIDENTIFIERLOOSE] = '[0-9]+';
+        return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params
+    };
+}
 
+function verifyENOENT(status, parsed) {
+    if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, 'spawn');
+    }
 
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
+    return null;
+}
 
-var NONNUMERICIDENTIFIER = R++;
-src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
+function verifyENOENTSync(status, parsed) {
+    if (isWin && status === 1 && !parsed.file) {
+        return notFoundError(parsed.original, 'spawnSync');
+    }
 
+    return null;
+}
 
-// ## Main Version
-// Three dot-separated numeric identifiers.
+module.exports = {
+    hookChildProcess,
+    verifyENOENT,
+    verifyENOENTSync,
+    notFoundError,
+};
 
-var MAINVERSION = R++;
-src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')';
 
-var MAINVERSIONLOOSE = R++;
-src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')';
+/***/ }),
+/* 137 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
+"use strict";
 
-var PRERELEASEIDENTIFIER = R++;
-src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
-                            '|' + src[NONNUMERICIDENTIFIER] + ')';
 
-var PRERELEASEIDENTIFIERLOOSE = R++;
-src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[NONNUMERICIDENTIFIER] + ')';
+module.exports = input => {
+	const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt();
+	const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt();
 
+	if (input[input.length - 1] === LF) {
+		input = input.slice(0, input.length - 1);
+	}
 
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
+	if (input[input.length - 1] === CR) {
+		input = input.slice(0, input.length - 1);
+	}
 
-var PRERELEASE = R++;
-src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))';
+	return input;
+};
 
-var PRERELEASELOOSE = R++;
-src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))';
 
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
+/***/ }),
+/* 138 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var BUILDIDENTIFIER = R++;
-src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
+"use strict";
 
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
+const path = __webpack_require__(16);
+const pathKey = __webpack_require__(131);
 
-var BUILD = R++;
-src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
-             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))';
+const npmRunPath = options => {
+	options = {
+		cwd: process.cwd(),
+		path: process.env[pathKey()],
+		execPath: process.execPath,
+		...options
+	};
 
+	let previous;
+	let cwdPath = path.resolve(options.cwd);
+	const result = [];
 
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
+	while (previous !== cwdPath) {
+		result.push(path.join(cwdPath, 'node_modules/.bin'));
+		previous = cwdPath;
+		cwdPath = path.resolve(cwdPath, '..');
+	}
 
-// Note that the only major, minor, patch, and pre-release sections of
-// the version string are capturing groups.  The build metadata is not a
-// capturing group, because it should not ever be used in version
-// comparison.
+	// Ensure the running `node` binary is used
+	const execPathDir = path.resolve(options.cwd, options.execPath, '..');
+	result.unshift(execPathDir);
 
-var FULL = R++;
-var FULLPLAIN = 'v?' + src[MAINVERSION] +
-                src[PRERELEASE] + '?' +
-                src[BUILD] + '?';
+	return result.concat(options.path).join(path.delimiter);
+};
 
-src[FULL] = '^' + FULLPLAIN + '$';
+module.exports = npmRunPath;
+// TODO: Remove this for the next major release
+module.exports.default = npmRunPath;
 
-// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
-// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
-// common in the npm registry.
-var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
-                 src[PRERELEASELOOSE] + '?' +
-                 src[BUILD] + '?';
+module.exports.env = options => {
+	options = {
+		env: process.env,
+		...options
+	};
 
-var LOOSE = R++;
-src[LOOSE] = '^' + LOOSEPLAIN + '$';
+	const env = {...options.env};
+	const path = pathKey({env});
 
-var GTLT = R++;
-src[GTLT] = '((?:<|>)?=?)';
+	options.path = env[path];
+	env[path] = module.exports(options);
 
-// Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
-// Only the first item is strictly required.
-var XRANGEIDENTIFIERLOOSE = R++;
-src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*';
-var XRANGEIDENTIFIER = R++;
-src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*';
+	return env;
+};
 
-var XRANGEPLAIN = R++;
-src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[PRERELEASE] + ')?' +
-                   src[BUILD] + '?' +
-                   ')?)?';
 
-var XRANGEPLAINLOOSE = R++;
-src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[PRERELEASELOOSE] + ')?' +
-                        src[BUILD] + '?' +
-                        ')?)?';
+/***/ }),
+/* 139 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var XRANGE = R++;
-src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
-var XRANGELOOSE = R++;
-src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';
+"use strict";
 
-// Coercion.
-// Extract anything that could conceivably be a part of a valid semver
-var COERCE = R++;
-src[COERCE] = '(?:^|[^\\d])' +
-              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
-              '(?:$|[^\\d])';
+const mimicFn = __webpack_require__(140);
 
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-var LONETILDE = R++;
-src[LONETILDE] = '(?:~>?)';
+const calledFunctions = new WeakMap();
 
-var TILDETRIM = R++;
-src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+';
-re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g');
-var tildeTrimReplace = '$1~';
+const oneTime = (fn, options = {}) => {
+	if (typeof fn !== 'function') {
+		throw new TypeError('Expected a function');
+	}
 
-var TILDE = R++;
-src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
-var TILDELOOSE = R++;
-src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$';
+	let ret;
+	let isCalled = false;
+	let callCount = 0;
+	const functionName = fn.displayName || fn.name || '<anonymous>';
 
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-var LONECARET = R++;
-src[LONECARET] = '(?:\\^)';
+	const onetime = function (...args) {
+		calledFunctions.set(onetime, ++callCount);
 
-var CARETTRIM = R++;
-src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+';
-re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g');
-var caretTrimReplace = '$1^';
+		if (isCalled) {
+			if (options.throw === true) {
+				throw new Error(`Function \`${functionName}\` can only be called once`);
+			}
 
-var CARET = R++;
-src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$';
-var CARETLOOSE = R++;
-src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$';
+			return ret;
+		}
 
-// A simple gt/lt/eq thing, or just "" to indicate "any version"
-var COMPARATORLOOSE = R++;
-src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$';
-var COMPARATOR = R++;
-src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$';
+		isCalled = true;
+		ret = fn.apply(this, args);
+		fn = null;
 
+		return ret;
+	};
 
-// An expression to strip any whitespace between the gtlt and the thing
-// it modifies, so that `> 1.2.3` ==> `>1.2.3`
-var COMPARATORTRIM = R++;
-src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
-                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')';
+	mimicFn(onetime, fn);
+	calledFunctions.set(onetime, callCount);
 
-// this one has to use the /g flag
-re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
-var comparatorTrimReplace = '$1$2$3';
+	return onetime;
+};
 
+module.exports = oneTime;
+// TODO: Remove this for the next major release
+module.exports.default = oneTime;
 
-// Something like `1.2.3 - 1.2.4`
-// Note that these all use the loose form, because they'll be
-// checked against either the strict or loose comparator form
-// later.
-var HYPHENRANGE = R++;
-src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
-                   '\\s+-\\s+' +
-                   '(' + src[XRANGEPLAIN] + ')' +
-                   '\\s*$';
+module.exports.callCount = fn => {
+	if (!calledFunctions.has(fn)) {
+		throw new Error(`The given function \`${fn.name}\` is not wrapped by the \`onetime\` package`);
+	}
 
-var HYPHENRANGELOOSE = R++;
-src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$';
+	return calledFunctions.get(fn);
+};
 
-// Star ranges basically just allow anything at all.
-var STAR = R++;
-src[STAR] = '(<|>)?=?\\s*\\*';
 
-// Compile to actual regexp objects.
-// All are flag-free, unless they were created above with a flag.
-for (var i = 0; i < R; i++) {
-  debug(i, src[i]);
-  if (!re[i])
-    re[i] = new RegExp(src[i]);
-}
+/***/ }),
+/* 140 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.parse = parse;
-function parse(version, loose) {
-  if (version instanceof SemVer)
-    return version;
+"use strict";
 
-  if (typeof version !== 'string')
-    return null;
 
-  if (version.length > MAX_LENGTH)
-    return null;
+const mimicFn = (to, from) => {
+	for (const prop of Reflect.ownKeys(from)) {
+		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
+	}
 
-  var r = loose ? re[LOOSE] : re[FULL];
-  if (!r.test(version))
-    return null;
+	return to;
+};
 
-  try {
-    return new SemVer(version, loose);
-  } catch (er) {
-    return null;
-  }
-}
+module.exports = mimicFn;
+// TODO: Remove this for the next major release
+module.exports.default = mimicFn;
 
-exports.valid = valid;
-function valid(version, loose) {
-  var v = parse(version, loose);
-  return v ? v.version : null;
-}
 
+/***/ }),
+/* 141 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.clean = clean;
-function clean(version, loose) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), loose);
-  return s ? s.version : null;
-}
+"use strict";
 
-exports.SemVer = SemVer;
+const {signalsByName} = __webpack_require__(142);
 
-function SemVer(version, loose) {
-  if (version instanceof SemVer) {
-    if (version.loose === loose)
-      return version;
-    else
-      version = version.version;
-  } else if (typeof version !== 'string') {
-    throw new TypeError('Invalid Version: ' + version);
-  }
+const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => {
+	if (timedOut) {
+		return `timed out after ${timeout} milliseconds`;
+	}
 
-  if (version.length > MAX_LENGTH)
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+	if (isCanceled) {
+		return 'was canceled';
+	}
 
-  if (!(this instanceof SemVer))
-    return new SemVer(version, loose);
+	if (errorCode !== undefined) {
+		return `failed with ${errorCode}`;
+	}
 
-  debug('SemVer', version, loose);
-  this.loose = loose;
-  var m = version.trim().match(loose ? re[LOOSE] : re[FULL]);
+	if (signal !== undefined) {
+		return `was killed with ${signal} (${signalDescription})`;
+	}
 
-  if (!m)
-    throw new TypeError('Invalid Version: ' + version);
+	if (exitCode !== undefined) {
+		return `failed with exit code ${exitCode}`;
+	}
 
-  this.raw = version;
+	return 'failed';
+};
+
+const makeError = ({
+	stdout,
+	stderr,
+	all,
+	error,
+	signal,
+	exitCode,
+	command,
+	timedOut,
+	isCanceled,
+	killed,
+	parsed: {options: {timeout}}
+}) => {
+	// `signal` and `exitCode` emitted on `spawned.on('exit')` event can be `null`.
+	// We normalize them to `undefined`
+	exitCode = exitCode === null ? undefined : exitCode;
+	signal = signal === null ? undefined : signal;
+	const signalDescription = signal === undefined ? undefined : signalsByName[signal].description;
+
+	const errorCode = error && error.code;
+
+	const prefix = getErrorPrefix({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled});
+	const message = `Command ${prefix}: ${command}`;
+
+	if (error instanceof Error) {
+		error.originalMessage = error.message;
+		error.message = `${message}\n${error.message}`;
+	} else {
+		error = new Error(message);
+	}
 
-  // these are actually numbers
-  this.major = +m[1];
-  this.minor = +m[2];
-  this.patch = +m[3];
+	error.command = command;
+	error.exitCode = exitCode;
+	error.signal = signal;
+	error.signalDescription = signalDescription;
+	error.stdout = stdout;
+	error.stderr = stderr;
 
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0)
-    throw new TypeError('Invalid major version')
+	if (all !== undefined) {
+		error.all = all;
+	}
 
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0)
-    throw new TypeError('Invalid minor version')
+	if ('bufferedData' in error) {
+		delete error.bufferedData;
+	}
 
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0)
-    throw new TypeError('Invalid patch version')
+	error.failed = true;
+	error.timedOut = Boolean(timedOut);
+	error.isCanceled = isCanceled;
+	error.killed = killed && !timedOut;
 
-  // numberify any prerelease numeric ids
-  if (!m[4])
-    this.prerelease = [];
-  else
-    this.prerelease = m[4].split('.').map(function(id) {
-      if (/^[0-9]+$/.test(id)) {
-        var num = +id;
-        if (num >= 0 && num < MAX_SAFE_INTEGER)
-          return num;
-      }
-      return id;
-    });
+	return error;
+};
 
-  this.build = m[5] ? m[5].split('.') : [];
-  this.format();
-}
+module.exports = makeError;
 
-SemVer.prototype.format = function() {
-  this.version = this.major + '.' + this.minor + '.' + this.patch;
-  if (this.prerelease.length)
-    this.version += '-' + this.prerelease.join('.');
-  return this.version;
-};
 
-SemVer.prototype.toString = function() {
-  return this.version;
-};
+/***/ }),
+/* 142 */
+/***/ (function(module, exports, __webpack_require__) {
 
-SemVer.prototype.compare = function(other) {
-  debug('SemVer.compare', this.version, this.loose, other);
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(11);
 
-  return this.compareMain(other) || this.comparePre(other);
+var _signals=__webpack_require__(143);
+var _realtime=__webpack_require__(145);
+
+
+
+const getSignalsByName=function(){
+const signals=(0,_signals.getSignals)();
+return signals.reduce(getSignalByName,{});
 };
 
-SemVer.prototype.compareMain = function(other) {
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
+const getSignalByName=function(
+signalByNameMemo,
+{name,number,description,supported,action,forced,standard})
+{
+return{
+...signalByNameMemo,
+[name]:{name,number,description,supported,action,forced,standard}};
 
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch);
 };
 
-SemVer.prototype.comparePre = function(other) {
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
+const signalsByName=getSignalsByName();exports.signalsByName=signalsByName;
 
-  // NOT having a prerelease is > having one
-  if (this.prerelease.length && !other.prerelease.length)
-    return -1;
-  else if (!this.prerelease.length && other.prerelease.length)
-    return 1;
-  else if (!this.prerelease.length && !other.prerelease.length)
-    return 0;
 
-  var i = 0;
-  do {
-    var a = this.prerelease[i];
-    var b = other.prerelease[i];
-    debug('prerelease compare', i, a, b);
-    if (a === undefined && b === undefined)
-      return 0;
-    else if (b === undefined)
-      return 1;
-    else if (a === undefined)
-      return -1;
-    else if (a === b)
-      continue;
-    else
-      return compareIdentifiers(a, b);
-  } while (++i);
-};
 
-// preminor will bump the version up to the next minor release, and immediately
-// down to pre-release. premajor and prepatch work the same way.
-SemVer.prototype.inc = function(release, identifier) {
-  switch (release) {
-    case 'premajor':
-      this.prerelease.length = 0;
-      this.patch = 0;
-      this.minor = 0;
-      this.major++;
-      this.inc('pre', identifier);
-      break;
-    case 'preminor':
-      this.prerelease.length = 0;
-      this.patch = 0;
-      this.minor++;
-      this.inc('pre', identifier);
-      break;
-    case 'prepatch':
-      // If this is already a prerelease, it will bump to the next version
-      // drop any prereleases that might already exist, since they are not
-      // relevant at this point.
-      this.prerelease.length = 0;
-      this.inc('patch', identifier);
-      this.inc('pre', identifier);
-      break;
-    // If the input is a non-prerelease version, this acts the same as
-    // prepatch.
-    case 'prerelease':
-      if (this.prerelease.length === 0)
-        this.inc('patch', identifier);
-      this.inc('pre', identifier);
-      break;
 
-    case 'major':
-      // If this is a pre-major version, bump up to the same major version.
-      // Otherwise increment major.
-      // 1.0.0-5 bumps to 1.0.0
-      // 1.1.0 bumps to 2.0.0
-      if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0)
-        this.major++;
-      this.minor = 0;
-      this.patch = 0;
-      this.prerelease = [];
-      break;
-    case 'minor':
-      // If this is a pre-minor version, bump up to the same minor version.
-      // Otherwise increment minor.
-      // 1.2.0-5 bumps to 1.2.0
-      // 1.2.1 bumps to 1.3.0
-      if (this.patch !== 0 || this.prerelease.length === 0)
-        this.minor++;
-      this.patch = 0;
-      this.prerelease = [];
-      break;
-    case 'patch':
-      // If this is not a pre-release version, it will increment the patch.
-      // If it is a pre-release it will bump up to the same patch version.
-      // 1.2.0-5 patches to 1.2.0
-      // 1.2.0 patches to 1.2.1
-      if (this.prerelease.length === 0)
-        this.patch++;
-      this.prerelease = [];
-      break;
-    // This probably shouldn't be used publicly.
-    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
-    case 'pre':
-      if (this.prerelease.length === 0)
-        this.prerelease = [0];
-      else {
-        var i = this.prerelease.length;
-        while (--i >= 0) {
-          if (typeof this.prerelease[i] === 'number') {
-            this.prerelease[i]++;
-            i = -2;
-          }
-        }
-        if (i === -1) // didn't increment anything
-          this.prerelease.push(0);
-      }
-      if (identifier) {
-        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
-        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
-        if (this.prerelease[0] === identifier) {
-          if (isNaN(this.prerelease[1]))
-            this.prerelease = [identifier, 0];
-        } else
-          this.prerelease = [identifier, 0];
-      }
-      break;
+const getSignalsByNumber=function(){
+const signals=(0,_signals.getSignals)();
+const length=_realtime.SIGRTMAX+1;
+const signalsA=Array.from({length},(value,number)=>
+getSignalByNumber(number,signals));
 
-    default:
-      throw new Error('invalid increment argument: ' + release);
-  }
-  this.format();
-  this.raw = this.version;
-  return this;
+return Object.assign({},...signalsA);
 };
 
-exports.inc = inc;
-function inc(version, release, loose, identifier) {
-  if (typeof(loose) === 'string') {
-    identifier = loose;
-    loose = undefined;
-  }
+const getSignalByNumber=function(number,signals){
+const signal=findSignalByNumber(number,signals);
 
-  try {
-    return new SemVer(version, loose).inc(release, identifier).version;
-  } catch (er) {
-    return null;
-  }
+if(signal===undefined){
+return{};
 }
 
-exports.diff = diff;
-function diff(version1, version2) {
-  if (eq(version1, version2)) {
-    return null;
-  } else {
-    var v1 = parse(version1);
-    var v2 = parse(version2);
-    if (v1.prerelease.length || v2.prerelease.length) {
-      for (var key in v1) {
-        if (key === 'major' || key === 'minor' || key === 'patch') {
-          if (v1[key] !== v2[key]) {
-            return 'pre'+key;
-          }
-        }
-      }
-      return 'prerelease';
-    }
-    for (var key in v1) {
-      if (key === 'major' || key === 'minor' || key === 'patch') {
-        if (v1[key] !== v2[key]) {
-          return key;
-        }
-      }
-    }
-  }
-}
+const{name,description,supported,action,forced,standard}=signal;
+return{
+[number]:{
+name,
+number,
+description,
+supported,
+action,
+forced,
+standard}};
 
-exports.compareIdentifiers = compareIdentifiers;
 
-var numeric = /^[0-9]+$/;
-function compareIdentifiers(a, b) {
-  var anum = numeric.test(a);
-  var bnum = numeric.test(b);
+};
 
-  if (anum && bnum) {
-    a = +a;
-    b = +b;
-  }
 
-  return (anum && !bnum) ? -1 :
-         (bnum && !anum) ? 1 :
-         a < b ? -1 :
-         a > b ? 1 :
-         0;
-}
 
-exports.rcompareIdentifiers = rcompareIdentifiers;
-function rcompareIdentifiers(a, b) {
-  return compareIdentifiers(b, a);
-}
+const findSignalByNumber=function(number,signals){
+const signal=signals.find(({name})=>_os.constants.signals[name]===number);
 
-exports.major = major;
-function major(a, loose) {
-  return new SemVer(a, loose).major;
+if(signal!==undefined){
+return signal;
 }
 
-exports.minor = minor;
-function minor(a, loose) {
-  return new SemVer(a, loose).minor;
-}
+return signals.find(signalA=>signalA.number===number);
+};
 
-exports.patch = patch;
-function patch(a, loose) {
-  return new SemVer(a, loose).patch;
-}
+const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber;
+//# sourceMappingURL=main.js.map
 
-exports.compare = compare;
-function compare(a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose));
-}
+/***/ }),
+/* 143 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.compareLoose = compareLoose;
-function compareLoose(a, b) {
-  return compare(a, b, true);
-}
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(11);
 
-exports.rcompare = rcompare;
-function rcompare(a, b, loose) {
-  return compare(b, a, loose);
-}
+var _core=__webpack_require__(144);
+var _realtime=__webpack_require__(145);
 
-exports.sort = sort;
-function sort(list, loose) {
-  return list.sort(function(a, b) {
-    return exports.compare(a, b, loose);
-  });
-}
 
-exports.rsort = rsort;
-function rsort(list, loose) {
-  return list.sort(function(a, b) {
-    return exports.rcompare(a, b, loose);
-  });
-}
 
-exports.gt = gt;
-function gt(a, b, loose) {
-  return compare(a, b, loose) > 0;
-}
+const getSignals=function(){
+const realtimeSignals=(0,_realtime.getRealtimeSignals)();
+const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal);
+return signals;
+};exports.getSignals=getSignals;
 
-exports.lt = lt;
-function lt(a, b, loose) {
-  return compare(a, b, loose) < 0;
-}
 
-exports.eq = eq;
-function eq(a, b, loose) {
-  return compare(a, b, loose) === 0;
-}
 
-exports.neq = neq;
-function neq(a, b, loose) {
-  return compare(a, b, loose) !== 0;
-}
 
-exports.gte = gte;
-function gte(a, b, loose) {
-  return compare(a, b, loose) >= 0;
-}
 
-exports.lte = lte;
-function lte(a, b, loose) {
-  return compare(a, b, loose) <= 0;
-}
 
-exports.cmp = cmp;
-function cmp(a, op, b, loose) {
-  var ret;
-  switch (op) {
-    case '===':
-      if (typeof a === 'object') a = a.version;
-      if (typeof b === 'object') b = b.version;
-      ret = a === b;
-      break;
-    case '!==':
-      if (typeof a === 'object') a = a.version;
-      if (typeof b === 'object') b = b.version;
-      ret = a !== b;
-      break;
-    case '': case '=': case '==': ret = eq(a, b, loose); break;
-    case '!=': ret = neq(a, b, loose); break;
-    case '>': ret = gt(a, b, loose); break;
-    case '>=': ret = gte(a, b, loose); break;
-    case '<': ret = lt(a, b, loose); break;
-    case '<=': ret = lte(a, b, loose); break;
-    default: throw new TypeError('Invalid operator: ' + op);
-  }
-  return ret;
-}
 
-exports.Comparator = Comparator;
-function Comparator(comp, loose) {
-  if (comp instanceof Comparator) {
-    if (comp.loose === loose)
-      return comp;
-    else
-      comp = comp.value;
-  }
+const normalizeSignal=function({
+name,
+number:defaultNumber,
+description,
+action,
+forced=false,
+standard})
+{
+const{
+signals:{[name]:constantSignal}}=
+_os.constants;
+const supported=constantSignal!==undefined;
+const number=supported?constantSignal:defaultNumber;
+return{name,number,description,supported,action,forced,standard};
+};
+//# sourceMappingURL=signals.js.map
 
-  if (!(this instanceof Comparator))
-    return new Comparator(comp, loose);
+/***/ }),
+/* 144 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  debug('comparator', comp, loose);
-  this.loose = loose;
-  this.parse(comp);
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.SIGNALS=void 0;
+
+const SIGNALS=[
+{
+name:"SIGHUP",
+number:1,
+action:"terminate",
+description:"Terminal closed",
+standard:"posix"},
+
+{
+name:"SIGINT",
+number:2,
+action:"terminate",
+description:"User interruption with CTRL-C",
+standard:"ansi"},
+
+{
+name:"SIGQUIT",
+number:3,
+action:"core",
+description:"User interruption with CTRL-\\",
+standard:"posix"},
+
+{
+name:"SIGILL",
+number:4,
+action:"core",
+description:"Invalid machine instruction",
+standard:"ansi"},
+
+{
+name:"SIGTRAP",
+number:5,
+action:"core",
+description:"Debugger breakpoint",
+standard:"posix"},
+
+{
+name:"SIGABRT",
+number:6,
+action:"core",
+description:"Aborted",
+standard:"ansi"},
+
+{
+name:"SIGIOT",
+number:6,
+action:"core",
+description:"Aborted",
+standard:"bsd"},
+
+{
+name:"SIGBUS",
+number:7,
+action:"core",
+description:
+"Bus error due to misaligned, non-existing address or paging error",
+standard:"bsd"},
+
+{
+name:"SIGEMT",
+number:7,
+action:"terminate",
+description:"Command should be emulated but is not implemented",
+standard:"other"},
+
+{
+name:"SIGFPE",
+number:8,
+action:"core",
+description:"Floating point arithmetic error",
+standard:"ansi"},
+
+{
+name:"SIGKILL",
+number:9,
+action:"terminate",
+description:"Forced termination",
+standard:"posix",
+forced:true},
+
+{
+name:"SIGUSR1",
+number:10,
+action:"terminate",
+description:"Application-specific signal",
+standard:"posix"},
+
+{
+name:"SIGSEGV",
+number:11,
+action:"core",
+description:"Segmentation fault",
+standard:"ansi"},
+
+{
+name:"SIGUSR2",
+number:12,
+action:"terminate",
+description:"Application-specific signal",
+standard:"posix"},
+
+{
+name:"SIGPIPE",
+number:13,
+action:"terminate",
+description:"Broken pipe or socket",
+standard:"posix"},
+
+{
+name:"SIGALRM",
+number:14,
+action:"terminate",
+description:"Timeout or timer",
+standard:"posix"},
+
+{
+name:"SIGTERM",
+number:15,
+action:"terminate",
+description:"Termination",
+standard:"ansi"},
+
+{
+name:"SIGSTKFLT",
+number:16,
+action:"terminate",
+description:"Stack is empty or overflowed",
+standard:"other"},
+
+{
+name:"SIGCHLD",
+number:17,
+action:"ignore",
+description:"Child process terminated, paused or unpaused",
+standard:"posix"},
+
+{
+name:"SIGCLD",
+number:17,
+action:"ignore",
+description:"Child process terminated, paused or unpaused",
+standard:"other"},
+
+{
+name:"SIGCONT",
+number:18,
+action:"unpause",
+description:"Unpaused",
+standard:"posix",
+forced:true},
+
+{
+name:"SIGSTOP",
+number:19,
+action:"pause",
+description:"Paused",
+standard:"posix",
+forced:true},
+
+{
+name:"SIGTSTP",
+number:20,
+action:"pause",
+description:"Paused using CTRL-Z or \"suspend\"",
+standard:"posix"},
+
+{
+name:"SIGTTIN",
+number:21,
+action:"pause",
+description:"Background process cannot read terminal input",
+standard:"posix"},
+
+{
+name:"SIGBREAK",
+number:21,
+action:"terminate",
+description:"User interruption with CTRL-BREAK",
+standard:"other"},
+
+{
+name:"SIGTTOU",
+number:22,
+action:"pause",
+description:"Background process cannot write to terminal output",
+standard:"posix"},
+
+{
+name:"SIGURG",
+number:23,
+action:"ignore",
+description:"Socket received out-of-band data",
+standard:"bsd"},
+
+{
+name:"SIGXCPU",
+number:24,
+action:"core",
+description:"Process timed out",
+standard:"bsd"},
+
+{
+name:"SIGXFSZ",
+number:25,
+action:"core",
+description:"File too big",
+standard:"bsd"},
+
+{
+name:"SIGVTALRM",
+number:26,
+action:"terminate",
+description:"Timeout or timer",
+standard:"bsd"},
+
+{
+name:"SIGPROF",
+number:27,
+action:"terminate",
+description:"Timeout or timer",
+standard:"bsd"},
+
+{
+name:"SIGWINCH",
+number:28,
+action:"ignore",
+description:"Terminal window size changed",
+standard:"bsd"},
+
+{
+name:"SIGIO",
+number:29,
+action:"terminate",
+description:"I/O is available",
+standard:"other"},
+
+{
+name:"SIGPOLL",
+number:29,
+action:"terminate",
+description:"Watched event",
+standard:"other"},
+
+{
+name:"SIGINFO",
+number:29,
+action:"ignore",
+description:"Request for process information",
+standard:"other"},
+
+{
+name:"SIGPWR",
+number:30,
+action:"terminate",
+description:"Device running out of power",
+standard:"systemv"},
+
+{
+name:"SIGSYS",
+number:31,
+action:"core",
+description:"Invalid system call",
+standard:"other"},
+
+{
+name:"SIGUNUSED",
+number:31,
+action:"terminate",
+description:"Invalid system call",
+standard:"other"}];exports.SIGNALS=SIGNALS;
+//# sourceMappingURL=core.js.map
 
-  if (this.semver === ANY)
-    this.value = '';
-  else
-    this.value = this.operator + this.semver.version;
+/***/ }),
+/* 145 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  debug('comp', this);
-}
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.SIGRTMAX=exports.getRealtimeSignals=void 0;
+const getRealtimeSignals=function(){
+const length=SIGRTMAX-SIGRTMIN+1;
+return Array.from({length},getRealtimeSignal);
+};exports.getRealtimeSignals=getRealtimeSignals;
 
-var ANY = {};
-Comparator.prototype.parse = function(comp) {
-  var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
-  var m = comp.match(r);
+const getRealtimeSignal=function(value,index){
+return{
+name:`SIGRT${index+1}`,
+number:SIGRTMIN+index,
+action:"terminate",
+description:"Application-specific signal (realtime)",
+standard:"posix"};
 
-  if (!m)
-    throw new TypeError('Invalid comparator: ' + comp);
+};
 
-  this.operator = m[1];
-  if (this.operator === '=')
-    this.operator = '';
+const SIGRTMIN=34;
+const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX;
+//# sourceMappingURL=realtime.js.map
 
-  // if it literally is just '>' or '' then allow anything.
-  if (!m[2])
-    this.semver = ANY;
-  else
-    this.semver = new SemVer(m[2], this.loose);
-};
+/***/ }),
+/* 146 */
+/***/ (function(module, exports, __webpack_require__) {
 
-Comparator.prototype.toString = function() {
-  return this.value;
-};
+"use strict";
 
-Comparator.prototype.test = function(version) {
-  debug('Comparator.test', version, this.loose);
+const aliases = ['stdin', 'stdout', 'stderr'];
 
-  if (this.semver === ANY)
-    return true;
+const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined);
 
-  if (typeof version === 'string')
-    version = new SemVer(version, this.loose);
+const normalizeStdio = opts => {
+	if (!opts) {
+		return;
+	}
 
-  return cmp(version, this.operator, this.semver, this.loose);
-};
+	const {stdio} = opts;
 
-Comparator.prototype.intersects = function(comp, loose) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required');
-  }
+	if (stdio === undefined) {
+		return aliases.map(alias => opts[alias]);
+	}
 
-  var rangeTmp;
+	if (hasAlias(opts)) {
+		throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`);
+	}
 
-  if (this.operator === '') {
-    rangeTmp = new Range(comp.value, loose);
-    return satisfies(this.value, rangeTmp, loose);
-  } else if (comp.operator === '') {
-    rangeTmp = new Range(this.value, loose);
-    return satisfies(comp.semver, rangeTmp, loose);
-  }
+	if (typeof stdio === 'string') {
+		return stdio;
+	}
 
-  var sameDirectionIncreasing =
-    (this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '>=' || comp.operator === '>');
-  var sameDirectionDecreasing =
-    (this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '<=' || comp.operator === '<');
-  var sameSemVer = this.semver.version === comp.semver.version;
-  var differentDirectionsInclusive =
-    (this.operator === '>=' || this.operator === '<=') &&
-    (comp.operator === '>=' || comp.operator === '<=');
-  var oppositeDirectionsLessThan =
-    cmp(this.semver, '<', comp.semver, loose) &&
-    ((this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '<=' || comp.operator === '<'));
-  var oppositeDirectionsGreaterThan =
-    cmp(this.semver, '>', comp.semver, loose) &&
-    ((this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '>=' || comp.operator === '>'));
+	if (!Array.isArray(stdio)) {
+		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
+	}
 
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan;
+	const length = Math.max(stdio.length, aliases.length);
+	return Array.from({length}, (value, index) => stdio[index]);
 };
 
+module.exports = normalizeStdio;
 
-exports.Range = Range;
-function Range(range, loose) {
-  if (range instanceof Range) {
-    if (range.loose === loose) {
-      return range;
-    } else {
-      return new Range(range.raw, loose);
-    }
-  }
+// `ipc` is pushed unless it is already present
+module.exports.node = opts => {
+	const stdio = normalizeStdio(opts);
 
-  if (range instanceof Comparator) {
-    return new Range(range.value, loose);
-  }
+	if (stdio === 'ipc') {
+		return 'ipc';
+	}
 
-  if (!(this instanceof Range))
-    return new Range(range, loose);
+	if (stdio === undefined || typeof stdio === 'string') {
+		return [stdio, stdio, stdio, 'ipc'];
+	}
 
-  this.loose = loose;
+	if (stdio.includes('ipc')) {
+		return stdio;
+	}
 
-  // First, split based on boolean or ||
-  this.raw = range;
-  this.set = range.split(/\s*\|\|\s*/).map(function(range) {
-    return this.parseRange(range.trim());
-  }, this).filter(function(c) {
-    // throw out any that are not relevant for whatever reason
-    return c.length;
-  });
+	return [...stdio, 'ipc'];
+};
 
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range);
-  }
 
-  this.format();
-}
+/***/ }),
+/* 147 */
+/***/ (function(module, exports, __webpack_require__) {
 
-Range.prototype.format = function() {
-  this.range = this.set.map(function(comps) {
-    return comps.join(' ').trim();
-  }).join('||').trim();
-  return this.range;
+"use strict";
+
+const os = __webpack_require__(11);
+const onExit = __webpack_require__(110);
+const pFinally = __webpack_require__(148);
+
+const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5;
+
+// Monkey-patches `childProcess.kill()` to add `forceKillAfterTimeout` behavior
+const spawnedKill = (kill, signal = 'SIGTERM', options = {}) => {
+	const killResult = kill(signal);
+	setKillTimeout(kill, signal, options, killResult);
+	return killResult;
 };
 
-Range.prototype.toString = function() {
-  return this.range;
+const setKillTimeout = (kill, signal, options, killResult) => {
+	if (!shouldForceKill(signal, options, killResult)) {
+		return;
+	}
+
+	const timeout = getForceKillAfterTimeout(options);
+	setTimeout(() => {
+		kill('SIGKILL');
+	}, timeout).unref();
 };
 
-Range.prototype.parseRange = function(range) {
-  var loose = this.loose;
-  range = range.trim();
-  debug('range', range, loose);
-  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
-  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE];
-  range = range.replace(hr, hyphenReplace);
-  debug('hyphen replace', range);
-  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
-  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace);
-  debug('comparator trim', range, re[COMPARATORTRIM]);
+const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
+	return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
+};
 
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[TILDETRIM], tildeTrimReplace);
+const isSigterm = signal => {
+	return signal === os.constants.signals.SIGTERM ||
+		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
+};
 
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[CARETTRIM], caretTrimReplace);
+const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {
+	if (forceKillAfterTimeout === true) {
+		return DEFAULT_FORCE_KILL_TIMEOUT;
+	}
 
-  // normalize spaces
-  range = range.split(/\s+/).join(' ');
+	if (!Number.isInteger(forceKillAfterTimeout) || forceKillAfterTimeout < 0) {
+		throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`);
+	}
 
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
+	return forceKillAfterTimeout;
+};
 
-  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
-  var set = range.split(' ').map(function(comp) {
-    return parseComparator(comp, loose);
-  }).join(' ').split(/\s+/);
-  if (this.loose) {
-    // in loose mode, throw out any that are not valid comparators
-    set = set.filter(function(comp) {
-      return !!comp.match(compRe);
-    });
-  }
-  set = set.map(function(comp) {
-    return new Comparator(comp, loose);
-  });
+// `childProcess.cancel()`
+const spawnedCancel = (spawned, context) => {
+	const killResult = spawned.kill();
 
-  return set;
+	if (killResult) {
+		context.isCanceled = true;
+	}
 };
 
-Range.prototype.intersects = function(range, loose) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required');
-  }
+const timeoutKill = (spawned, signal, reject) => {
+	spawned.kill(signal);
+	reject(Object.assign(new Error('Timed out'), {timedOut: true, signal}));
+};
 
-  return this.set.some(function(thisComparators) {
-    return thisComparators.every(function(thisComparator) {
-      return range.set.some(function(rangeComparators) {
-        return rangeComparators.every(function(rangeComparator) {
-          return thisComparator.intersects(rangeComparator, loose);
-        });
-      });
-    });
-  });
+// `timeout` option handling
+const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => {
+	if (timeout === 0 || timeout === undefined) {
+		return spawnedPromise;
+	}
+
+	if (!Number.isInteger(timeout) || timeout < 0) {
+		throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`);
+	}
+
+	let timeoutId;
+	const timeoutPromise = new Promise((resolve, reject) => {
+		timeoutId = setTimeout(() => {
+			timeoutKill(spawned, killSignal, reject);
+		}, timeout);
+	});
+
+	const safeSpawnedPromise = pFinally(spawnedPromise, () => {
+		clearTimeout(timeoutId);
+	});
+
+	return Promise.race([timeoutPromise, safeSpawnedPromise]);
 };
 
-// Mostly just for testing and legacy API reasons
-exports.toComparators = toComparators;
-function toComparators(range, loose) {
-  return new Range(range, loose).set.map(function(comp) {
-    return comp.map(function(c) {
-      return c.value;
-    }).join(' ').trim().split(' ');
-  });
-}
+// `cleanup` option handling
+const setExitHandler = (spawned, {cleanup, detached}, timedPromise) => {
+	if (!cleanup || detached) {
+		return timedPromise;
+	}
 
-// comprised of xranges, tildes, stars, and gtlt's at this point.
-// already replaced the hyphen ranges
-// turn into a set of JUST comparators.
-function parseComparator(comp, loose) {
-  debug('comp', comp);
-  comp = replaceCarets(comp, loose);
-  debug('caret', comp);
-  comp = replaceTildes(comp, loose);
-  debug('tildes', comp);
-  comp = replaceXRanges(comp, loose);
-  debug('xrange', comp);
-  comp = replaceStars(comp, loose);
-  debug('stars', comp);
-  return comp;
-}
+	const removeExitHandler = onExit(() => {
+		spawned.kill();
+	});
 
-function isX(id) {
-  return !id || id.toLowerCase() === 'x' || id === '*';
-}
+	// TODO: Use native "finally" syntax when targeting Node.js 10
+	return pFinally(timedPromise, removeExitHandler);
+};
 
-// ~, ~> --> * (any, kinda silly)
-// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
-// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
-// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
-// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
-// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
-function replaceTildes(comp, loose) {
-  return comp.trim().split(/\s+/).map(function(comp) {
-    return replaceTilde(comp, loose);
-  }).join(' ');
-}
+module.exports = {
+	spawnedKill,
+	spawnedCancel,
+	setupTimeout,
+	setExitHandler
+};
 
-function replaceTilde(comp, loose) {
-  var r = loose ? re[TILDELOOSE] : re[TILDE];
-  return comp.replace(r, function(_, M, m, p, pr) {
-    debug('tilde', comp, _, M, m, p, pr);
-    var ret;
 
-    if (isX(M))
-      ret = '';
-    else if (isX(m))
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-    else if (isX(p))
-      // ~1.2 == >=1.2.0 <1.3.0
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-    else if (pr) {
-      debug('replaceTilde pr', pr);
-      if (pr.charAt(0) !== '-')
-        pr = '-' + pr;
-      ret = '>=' + M + '.' + m + '.' + p + pr +
-            ' <' + M + '.' + (+m + 1) + '.0';
-    } else
-      // ~1.2.3 == >=1.2.3 <1.3.0
-      ret = '>=' + M + '.' + m + '.' + p +
-            ' <' + M + '.' + (+m + 1) + '.0';
+/***/ }),
+/* 148 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    debug('tilde return', ret);
-    return ret;
-  });
-}
+"use strict";
 
-// ^ --> * (any, kinda silly)
-// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
-// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
-// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
-// ^1.2.3 --> >=1.2.3 <2.0.0
-// ^1.2.0 --> >=1.2.0 <2.0.0
-function replaceCarets(comp, loose) {
-  return comp.trim().split(/\s+/).map(function(comp) {
-    return replaceCaret(comp, loose);
-  }).join(' ');
-}
 
-function replaceCaret(comp, loose) {
-  debug('caret', comp, loose);
-  var r = loose ? re[CARETLOOSE] : re[CARET];
-  return comp.replace(r, function(_, M, m, p, pr) {
-    debug('caret', comp, _, M, m, p, pr);
-    var ret;
+module.exports = async (
+	promise,
+	onFinally = (() => {})
+) => {
+	let value;
+	try {
+		value = await promise;
+	} catch (error) {
+		await onFinally();
+		throw error;
+	}
 
-    if (isX(M))
-      ret = '';
-    else if (isX(m))
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-    else if (isX(p)) {
-      if (M === '0')
-        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-      else
-        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0';
-    } else if (pr) {
-      debug('replaceCaret pr', pr);
-      if (pr.charAt(0) !== '-')
-        pr = '-' + pr;
-      if (M === '0') {
-        if (m === '0')
-          ret = '>=' + M + '.' + m + '.' + p + pr +
-                ' <' + M + '.' + m + '.' + (+p + 1);
-        else
-          ret = '>=' + M + '.' + m + '.' + p + pr +
-                ' <' + M + '.' + (+m + 1) + '.0';
-      } else
-        ret = '>=' + M + '.' + m + '.' + p + pr +
-              ' <' + (+M + 1) + '.0.0';
-    } else {
-      debug('no pr');
-      if (M === '0') {
-        if (m === '0')
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + m + '.' + (+p + 1);
-        else
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + (+m + 1) + '.0';
-      } else
-        ret = '>=' + M + '.' + m + '.' + p +
-              ' <' + (+M + 1) + '.0.0';
-    }
+	await onFinally();
+	return value;
+};
 
-    debug('caret return', ret);
-    return ret;
-  });
-}
 
-function replaceXRanges(comp, loose) {
-  debug('replaceXRanges', comp, loose);
-  return comp.split(/\s+/).map(function(comp) {
-    return replaceXRange(comp, loose);
-  }).join(' ');
-}
+/***/ }),
+/* 149 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function replaceXRange(comp, loose) {
-  comp = comp.trim();
-  var r = loose ? re[XRANGELOOSE] : re[XRANGE];
-  return comp.replace(r, function(ret, gtlt, M, m, p, pr) {
-    debug('xRange', comp, ret, gtlt, M, m, p, pr);
-    var xM = isX(M);
-    var xm = xM || isX(m);
-    var xp = xm || isX(p);
-    var anyX = xp;
+"use strict";
 
-    if (gtlt === '=' && anyX)
-      gtlt = '';
+const isStream = __webpack_require__(150);
+const getStream = __webpack_require__(151);
+const mergeStream = __webpack_require__(155);
 
-    if (xM) {
-      if (gtlt === '>' || gtlt === '<') {
-        // nothing is allowed
-        ret = '<0.0.0';
-      } else {
-        // nothing is forbidden
-        ret = '*';
-      }
-    } else if (gtlt && anyX) {
-      // replace X with 0
-      if (xm)
-        m = 0;
-      if (xp)
-        p = 0;
+// `input` option
+const handleInput = (spawned, input) => {
+	// Checking for stdin is workaround for https://github.com/nodejs/node/issues/26852
+	// TODO: Remove `|| spawned.stdin === undefined` once we drop support for Node.js <=12.2.0
+	if (input === undefined || spawned.stdin === undefined) {
+		return;
+	}
 
-      if (gtlt === '>') {
-        // >1 => >=2.0.0
-        // >1.2 => >=1.3.0
-        // >1.2.3 => >= 1.2.4
-        gtlt = '>=';
-        if (xm) {
-          M = +M + 1;
-          m = 0;
-          p = 0;
-        } else if (xp) {
-          m = +m + 1;
-          p = 0;
-        }
-      } else if (gtlt === '<=') {
-        // <=0.7.x is actually <0.8.0, since any 0.7.x should
-        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
-        gtlt = '<';
-        if (xm)
-          M = +M + 1;
-        else
-          m = +m + 1;
-      }
+	if (isStream(input)) {
+		input.pipe(spawned.stdin);
+	} else {
+		spawned.stdin.end(input);
+	}
+};
 
-      ret = gtlt + M + '.' + m + '.' + p;
-    } else if (xm) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-    } else if (xp) {
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-    }
+// `all` interleaves `stdout` and `stderr`
+const makeAllStream = (spawned, {all}) => {
+	if (!all || (!spawned.stdout && !spawned.stderr)) {
+		return;
+	}
 
-    debug('xRange return', ret);
+	const mixed = mergeStream();
 
-    return ret;
-  });
-}
+	if (spawned.stdout) {
+		mixed.add(spawned.stdout);
+	}
 
-// Because * is AND-ed with everything else in the comparator,
-// and '' means "any version", just remove the *s entirely.
-function replaceStars(comp, loose) {
-  debug('replaceStars', comp, loose);
-  // Looseness is ignored here.  star is always as loose as it gets!
-  return comp.trim().replace(re[STAR], '');
-}
+	if (spawned.stderr) {
+		mixed.add(spawned.stderr);
+	}
 
-// This function is passed to string.replace(re[HYPHENRANGE])
-// M, m, patch, prerelease, build
-// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
-// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
-// 1.2 - 3.4 => >=1.2.0 <3.5.0
-function hyphenReplace($0,
-                       from, fM, fm, fp, fpr, fb,
-                       to, tM, tm, tp, tpr, tb) {
+	return mixed;
+};
 
-  if (isX(fM))
-    from = '';
-  else if (isX(fm))
-    from = '>=' + fM + '.0.0';
-  else if (isX(fp))
-    from = '>=' + fM + '.' + fm + '.0';
-  else
-    from = '>=' + from;
+// On failure, `result.stdout|stderr|all` should contain the currently buffered stream
+const getBufferedData = async (stream, streamPromise) => {
+	if (!stream) {
+		return;
+	}
 
-  if (isX(tM))
-    to = '';
-  else if (isX(tm))
-    to = '<' + (+tM + 1) + '.0.0';
-  else if (isX(tp))
-    to = '<' + tM + '.' + (+tm + 1) + '.0';
-  else if (tpr)
-    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr;
-  else
-    to = '<=' + to;
+	stream.destroy();
 
-  return (from + ' ' + to).trim();
-}
+	try {
+		return await streamPromise;
+	} catch (error) {
+		return error.bufferedData;
+	}
+};
 
+const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => {
+	if (!stream || !buffer) {
+		return;
+	}
 
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function(version) {
-  if (!version)
-    return false;
+	if (encoding) {
+		return getStream(stream, {encoding, maxBuffer});
+	}
 
-  if (typeof version === 'string')
-    version = new SemVer(version, this.loose);
+	return getStream.buffer(stream, {maxBuffer});
+};
 
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version))
-      return true;
-  }
-  return false;
+// Retrieve result of child process: exit code, signal, error, streams (stdout/stderr/all)
+const getSpawnedResult = async ({stdout, stderr, all}, {encoding, buffer, maxBuffer}, processDone) => {
+	const stdoutPromise = getStreamPromise(stdout, {encoding, buffer, maxBuffer});
+	const stderrPromise = getStreamPromise(stderr, {encoding, buffer, maxBuffer});
+	const allPromise = getStreamPromise(all, {encoding, buffer, maxBuffer: maxBuffer * 2});
+
+	try {
+		return await Promise.all([processDone, stdoutPromise, stderrPromise, allPromise]);
+	} catch (error) {
+		return Promise.all([
+			{error, signal: error.signal, timedOut: error.timedOut},
+			getBufferedData(stdout, stdoutPromise),
+			getBufferedData(stderr, stderrPromise),
+			getBufferedData(all, allPromise)
+		]);
+	}
 };
 
-function testSet(set, version) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version))
-      return false;
-  }
+const validateInputSync = ({input}) => {
+	if (isStream(input)) {
+		throw new TypeError('The `input` option cannot be a stream in sync mode');
+	}
+};
 
-  if (version.prerelease.length) {
-    // Find the set of versions that are allowed to have prereleases
-    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
-    // That should allow `1.2.3-pr.2` to pass.
-    // However, `1.2.4-alpha.notready` should NOT be allowed,
-    // even though it's within the range set by the comparators.
-    for (var i = 0; i < set.length; i++) {
-      debug(set[i].semver);
-      if (set[i].semver === ANY)
-        continue;
+module.exports = {
+	handleInput,
+	makeAllStream,
+	getSpawnedResult,
+	validateInputSync
+};
 
-      if (set[i].semver.prerelease.length > 0) {
-        var allowed = set[i].semver;
-        if (allowed.major === version.major &&
-            allowed.minor === version.minor &&
-            allowed.patch === version.patch)
-          return true;
-      }
-    }
 
-    // Version has a -pre, but it's not one of the ones we like.
-    return false;
-  }
 
-  return true;
-}
+/***/ }),
+/* 150 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.satisfies = satisfies;
-function satisfies(version, range, loose) {
-  try {
-    range = new Range(range, loose);
-  } catch (er) {
-    return false;
-  }
-  return range.test(version);
-}
+"use strict";
 
-exports.maxSatisfying = maxSatisfying;
-function maxSatisfying(versions, range, loose) {
-  var max = null;
-  var maxSV = null;
-  try {
-    var rangeObj = new Range(range, loose);
-  } catch (er) {
-    return null;
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) { // satisfies(v, range, loose)
-      if (!max || maxSV.compare(v) === -1) { // compare(max, v, true)
-        max = v;
-        maxSV = new SemVer(max, loose);
-      }
-    }
-  })
-  return max;
-}
 
-exports.minSatisfying = minSatisfying;
-function minSatisfying(versions, range, loose) {
-  var min = null;
-  var minSV = null;
-  try {
-    var rangeObj = new Range(range, loose);
-  } catch (er) {
-    return null;
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) { // satisfies(v, range, loose)
-      if (!min || minSV.compare(v) === 1) { // compare(min, v, true)
-        min = v;
-        minSV = new SemVer(min, loose);
-      }
-    }
-  })
-  return min;
-}
+const isStream = stream =>
+	stream !== null &&
+	typeof stream === 'object' &&
+	typeof stream.pipe === 'function';
 
-exports.validRange = validRange;
-function validRange(range, loose) {
-  try {
-    // Return '*' instead of '' so that truthiness works.
-    // This will throw if it's invalid anyway
-    return new Range(range, loose).range || '*';
-  } catch (er) {
-    return null;
-  }
-}
+isStream.writable = stream =>
+	isStream(stream) &&
+	stream.writable !== false &&
+	typeof stream._write === 'function' &&
+	typeof stream._writableState === 'object';
 
-// Determine if version is less than all the versions possible in the range
-exports.ltr = ltr;
-function ltr(version, range, loose) {
-  return outside(version, range, '<', loose);
-}
+isStream.readable = stream =>
+	isStream(stream) &&
+	stream.readable !== false &&
+	typeof stream._read === 'function' &&
+	typeof stream._readableState === 'object';
 
-// Determine if version is greater than all the versions possible in the range.
-exports.gtr = gtr;
-function gtr(version, range, loose) {
-  return outside(version, range, '>', loose);
-}
+isStream.duplex = stream =>
+	isStream.writable(stream) &&
+	isStream.readable(stream);
 
-exports.outside = outside;
-function outside(version, range, hilo, loose) {
-  version = new SemVer(version, loose);
-  range = new Range(range, loose);
+isStream.transform = stream =>
+	isStream.duplex(stream) &&
+	typeof stream._transform === 'function' &&
+	typeof stream._transformState === 'object';
 
-  var gtfn, ltefn, ltfn, comp, ecomp;
-  switch (hilo) {
-    case '>':
-      gtfn = gt;
-      ltefn = lte;
-      ltfn = lt;
-      comp = '>';
-      ecomp = '>=';
-      break;
-    case '<':
-      gtfn = lt;
-      ltefn = gte;
-      ltfn = gt;
-      comp = '<';
-      ecomp = '<=';
-      break;
-    default:
-      throw new TypeError('Must provide a hilo val of "<" or ">"');
-  }
+module.exports = isStream;
 
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, loose)) {
-    return false;
-  }
 
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
+/***/ }),
+/* 151 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i];
+"use strict";
 
-    var high = null;
-    var low = null;
-
-    comparators.forEach(function(comparator) {
-      if (comparator.semver === ANY) {
-        comparator = new Comparator('>=0.0.0')
-      }
-      high = high || comparator;
-      low = low || comparator;
-      if (gtfn(comparator.semver, high.semver, loose)) {
-        high = comparator;
-      } else if (ltfn(comparator.semver, low.semver, loose)) {
-        low = comparator;
-      }
-    });
-
-    // If the edge version comparator has a operator then our version
-    // isn't outside it
-    if (high.operator === comp || high.operator === ecomp) {
-      return false;
-    }
-
-    // If the lowest version comparator has an operator and our version
-    // is less than it then it isn't higher than the range
-    if ((!low.operator || low.operator === comp) &&
-        ltefn(version, low.semver)) {
-      return false;
-    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-exports.prerelease = prerelease;
-function prerelease(version, loose) {
-  var parsed = parse(version, loose);
-  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null;
-}
-
-exports.intersects = intersects;
-function intersects(r1, r2, loose) {
-  r1 = new Range(r1, loose)
-  r2 = new Range(r2, loose)
-  return r1.intersects(r2)
-}
-
-exports.coerce = coerce;
-function coerce(version) {
-  if (version instanceof SemVer)
-    return version;
-
-  if (typeof version !== 'string')
-    return null;
-
-  var match = version.match(re[COERCE]);
-
-  if (match == null)
-    return null;
-
-  return parse((match[1] || '0') + '.' + (match[2] || '0') + '.' + (match[3] || '0')); 
-}
-
-
-/***/ }),
-/* 138 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-const isWin = process.platform === 'win32';
-
-function notFoundError(original, syscall) {
-    return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), {
-        code: 'ENOENT',
-        errno: 'ENOENT',
-        syscall: `${syscall} ${original.command}`,
-        path: original.command,
-        spawnargs: original.args,
-    });
-}
-
-function hookChildProcess(cp, parsed) {
-    if (!isWin) {
-        return;
-    }
-
-    const originalEmit = cp.emit;
-
-    cp.emit = function (name, arg1) {
-        // If emitting "exit" event and exit code is 1, we need to check if
-        // the command exists and emit an "error" instead
-        // See https://github.com/IndigoUnited/node-cross-spawn/issues/16
-        if (name === 'exit') {
-            const err = verifyENOENT(arg1, parsed, 'spawn');
-
-            if (err) {
-                return originalEmit.call(cp, 'error', err);
-            }
-        }
-
-        return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params
-    };
-}
-
-function verifyENOENT(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawn');
-    }
-
-    return null;
-}
-
-function verifyENOENTSync(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawnSync');
-    }
-
-    return null;
-}
-
-module.exports = {
-    hookChildProcess,
-    verifyENOENT,
-    verifyENOENTSync,
-    notFoundError,
-};
-
-
-/***/ }),
-/* 139 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = function (x) {
-	var lf = typeof x === 'string' ? '\n' : '\n'.charCodeAt();
-	var cr = typeof x === 'string' ? '\r' : '\r'.charCodeAt();
-
-	if (x[x.length - 1] === lf) {
-		x = x.slice(0, x.length - 1);
-	}
-
-	if (x[x.length - 1] === cr) {
-		x = x.slice(0, x.length - 1);
-	}
-
-	return x;
-};
-
-
-/***/ }),
-/* 140 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const path = __webpack_require__(16);
-const pathKey = __webpack_require__(141);
-
-module.exports = opts => {
-	opts = Object.assign({
-		cwd: process.cwd(),
-		path: process.env[pathKey()]
-	}, opts);
-
-	let prev;
-	let pth = path.resolve(opts.cwd);
-	const ret = [];
-
-	while (prev !== pth) {
-		ret.push(path.join(pth, 'node_modules/.bin'));
-		prev = pth;
-		pth = path.resolve(pth, '..');
-	}
-
-	// ensure the running `node` binary is used
-	ret.push(path.dirname(process.execPath));
-
-	return ret.concat(opts.path).join(path.delimiter);
-};
-
-module.exports.env = opts => {
-	opts = Object.assign({
-		env: process.env
-	}, opts);
-
-	const env = Object.assign({}, opts.env);
-	const path = pathKey({env});
-
-	opts.path = env[path];
-	env[path] = module.exports(opts);
-
-	return env;
-};
-
-
-/***/ }),
-/* 141 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = opts => {
-	opts = opts || {};
-
-	const env = opts.env || process.env;
-	const platform = opts.platform || process.platform;
-
-	if (platform !== 'win32') {
-		return 'PATH';
-	}
-
-	return Object.keys(env).find(x => x.toUpperCase() === 'PATH') || 'Path';
-};
-
-
-/***/ }),
-/* 142 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var isStream = module.exports = function (stream) {
-	return stream !== null && typeof stream === 'object' && typeof stream.pipe === 'function';
-};
-
-isStream.writable = function (stream) {
-	return isStream(stream) && stream.writable !== false && typeof stream._write === 'function' && typeof stream._writableState === 'object';
-};
-
-isStream.readable = function (stream) {
-	return isStream(stream) && stream.readable !== false && typeof stream._read === 'function' && typeof stream._readableState === 'object';
-};
-
-isStream.duplex = function (stream) {
-	return isStream.writable(stream) && isStream.readable(stream);
-};
-
-isStream.transform = function (stream) {
-	return isStream.duplex(stream) && typeof stream._transform === 'function' && typeof stream._transformState === 'object';
-};
-
-
-/***/ }),
-/* 143 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const pump = __webpack_require__(144);
-const bufferStream = __webpack_require__(146);
+const pump = __webpack_require__(152);
+const bufferStream = __webpack_require__(154);
 
 class MaxBufferError extends Error {
 	constructor() {
@@ -21745,21 +21130,25 @@ class MaxBufferError extends Error {
 	}
 }
 
-function getStream(inputStream, options) {
+async function getStream(inputStream, options) {
 	if (!inputStream) {
 		return Promise.reject(new Error('Expected a stream'));
 	}
 
-	options = Object.assign({maxBuffer: Infinity}, options);
+	options = {
+		maxBuffer: Infinity,
+		...options
+	};
 
 	const {maxBuffer} = options;
 
 	let stream;
-	return new Promise((resolve, reject) => {
+	await new Promise((resolve, reject) => {
 		const rejectPromise = error => {
 			if (error) { // A null check
 				error.bufferedData = stream.getBufferedValue();
 			}
+
 			reject(error);
 		};
 
@@ -21777,21 +21166,25 @@ function getStream(inputStream, options) {
 				rejectPromise(new MaxBufferError());
 			}
 		});
-	}).then(() => stream.getBufferedValue());
+	});
+
+	return stream.getBufferedValue();
 }
 
 module.exports = getStream;
-module.exports.buffer = (stream, options) => getStream(stream, Object.assign({}, options, {encoding: 'buffer'}));
-module.exports.array = (stream, options) => getStream(stream, Object.assign({}, options, {array: true}));
+// TODO: Remove this for the next major release
+module.exports.default = getStream;
+module.exports.buffer = (stream, options) => getStream(stream, {...options, encoding: 'buffer'});
+module.exports.array = (stream, options) => getStream(stream, {...options, array: true});
 module.exports.MaxBufferError = MaxBufferError;
 
 
 /***/ }),
-/* 144 */
+/* 152 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var once = __webpack_require__(52)
-var eos = __webpack_require__(145)
+var eos = __webpack_require__(153)
 var fs = __webpack_require__(23) // we only need fs to get the ReadStream and WriteStream prototypes
 
 var noop = function () {}
@@ -21875,7 +21268,7 @@ module.exports = pump
 
 
 /***/ }),
-/* 145 */
+/* 153 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var once = __webpack_require__(52);
@@ -21968,186 +21361,223 @@ module.exports = eos;
 
 
 /***/ }),
-/* 146 */
+/* 154 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const {PassThrough} = __webpack_require__(28);
+const {PassThrough: PassThroughStream} = __webpack_require__(28);
 
 module.exports = options => {
-	options = Object.assign({}, options);
+	options = {...options};
 
 	const {array} = options;
 	let {encoding} = options;
-	const buffer = encoding === 'buffer';
+	const isBuffer = encoding === 'buffer';
 	let objectMode = false;
 
 	if (array) {
-		objectMode = !(encoding || buffer);
+		objectMode = !(encoding || isBuffer);
 	} else {
 		encoding = encoding || 'utf8';
 	}
 
-	if (buffer) {
+	if (isBuffer) {
 		encoding = null;
 	}
 
-	let len = 0;
-	const ret = [];
-	const stream = new PassThrough({objectMode});
+	const stream = new PassThroughStream({objectMode});
 
 	if (encoding) {
 		stream.setEncoding(encoding);
 	}
 
+	let length = 0;
+	const chunks = [];
+
 	stream.on('data', chunk => {
-		ret.push(chunk);
+		chunks.push(chunk);
 
 		if (objectMode) {
-			len = ret.length;
+			length = chunks.length;
 		} else {
-			len += chunk.length;
+			length += chunk.length;
 		}
 	});
 
 	stream.getBufferedValue = () => {
 		if (array) {
-			return ret;
+			return chunks;
 		}
 
-		return buffer ? Buffer.concat(ret, len) : ret.join('');
+		return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
 	};
 
-	stream.getBufferedLength = () => len;
+	stream.getBufferedLength = () => length;
 
 	return stream;
 };
 
 
 /***/ }),
-/* 147 */
+/* 155 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = (promise, onFinally) => {
-	onFinally = onFinally || (() => {});
 
-	return promise.then(
-		val => new Promise(resolve => {
-			resolve(onFinally());
-		}).then(() => val),
-		err => new Promise(resolve => {
-			resolve(onFinally());
-		}).then(() => {
-			throw err;
-		})
-	);
-};
+const { PassThrough } = __webpack_require__(28);
+
+module.exports = function (/*streams...*/) {
+  var sources = []
+  var output  = new PassThrough({objectMode: true})
+
+  output.setMaxListeners(0)
+
+  output.add = add
+  output.isEmpty = isEmpty
+
+  output.on('unpipe', remove)
+
+  Array.prototype.slice.call(arguments).forEach(add)
+
+  return output
+
+  function add (source) {
+    if (Array.isArray(source)) {
+      source.forEach(add)
+      return this
+    }
+
+    sources.push(source);
+    source.once('end', remove.bind(null, source))
+    source.once('error', output.emit.bind(output, 'error'))
+    source.pipe(output, {end: false})
+    return this
+  }
+
+  function isEmpty () {
+    return sources.length == 0;
+  }
+
+  function remove (source) {
+    sources = sources.filter(function (it) { return it !== source })
+    if (!sources.length && output.readable) { output.end() }
+  }
+}
 
 
 /***/ }),
-/* 148 */
+/* 156 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-// Older verions of Node.js might not have `util.getSystemErrorName()`.
-// In that case, fall back to a deprecated internal.
-const util = __webpack_require__(29);
-
-let uv;
+const mergePromiseProperty = (spawned, promise, property) => {
+	// Starting the main `promise` is deferred to avoid consuming streams
+	const value = typeof promise === 'function' ?
+		(...args) => promise()[property](...args) :
+		promise[property].bind(promise);
+
+	Object.defineProperty(spawned, property, {
+		value,
+		writable: true,
+		enumerable: false,
+		configurable: true
+	});
+};
 
-if (typeof util.getSystemErrorName === 'function') {
-	module.exports = util.getSystemErrorName;
-} else {
-	try {
-		uv = process.binding('uv');
+// The return value is a mixin of `childProcess` and `Promise`
+const mergePromise = (spawned, promise) => {
+	mergePromiseProperty(spawned, promise, 'then');
+	mergePromiseProperty(spawned, promise, 'catch');
 
-		if (typeof uv.errname !== 'function') {
-			throw new TypeError('uv.errname is not a function');
-		}
-	} catch (err) {
-		console.error('execa/lib/errname: unable to establish process.binding(\'uv\')', err);
-		uv = null;
+	// TODO: Remove the `if`-guard when targeting Node.js 10
+	if (Promise.prototype.finally) {
+		mergePromiseProperty(spawned, promise, 'finally');
 	}
 
-	module.exports = code => errname(uv, code);
-}
+	return spawned;
+};
 
-// Used for testing the fallback behavior
-module.exports.__test__ = errname;
+// Use promises instead of `child_process` events
+const getSpawnedPromise = spawned => {
+	return new Promise((resolve, reject) => {
+		spawned.on('exit', (exitCode, signal) => {
+			resolve({exitCode, signal});
+		});
 
-function errname(uv, code) {
-	if (uv) {
-		return uv.errname(code);
-	}
+		spawned.on('error', error => {
+			reject(error);
+		});
 
-	if (!(code < 0)) {
-		throw new Error('err >= 0');
-	}
+		if (spawned.stdin) {
+			spawned.stdin.on('error', error => {
+				reject(error);
+			});
+		}
+	});
+};
 
-	return `Unknown system error ${code}`;
-}
+module.exports = {
+	mergePromise,
+	getSpawnedPromise
+};
 
 
 
 /***/ }),
-/* 149 */
+/* 157 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const alias = ['stdin', 'stdout', 'stderr'];
-
-const hasAlias = opts => alias.some(x => Boolean(opts[x]));
+const SPACES_REGEXP = / +/g;
 
-module.exports = opts => {
-	if (!opts) {
-		return null;
+const joinCommand = (file, args = []) => {
+	if (!Array.isArray(args)) {
+		return file;
 	}
 
-	if (opts.stdio && hasAlias(opts)) {
-		throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${alias.map(x => `\`${x}\``).join(', ')}`);
-	}
+	return [file, ...args].join(' ');
+};
 
-	if (typeof opts.stdio === 'string') {
-		return opts.stdio;
+// Allow spaces to be escaped by a backslash if not meant as a delimiter
+const handleEscaping = (tokens, token, index) => {
+	if (index === 0) {
+		return [token];
 	}
 
-	const stdio = opts.stdio || [];
+	const previousToken = tokens[tokens.length - 1];
 
-	if (!Array.isArray(stdio)) {
-		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
+	if (previousToken.endsWith('\\')) {
+		return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`];
 	}
 
-	const result = [];
-	const len = Math.max(stdio.length, alias.length);
-
-	for (let i = 0; i < len; i++) {
-		let value = null;
-
-		if (stdio[i] !== undefined) {
-			value = stdio[i];
-		} else if (opts[alias[i]] !== undefined) {
-			value = opts[alias[i]];
-		}
+	return [...tokens, token];
+};
 
-		result[i] = value;
-	}
+// Handle `execa.command()`
+const parseCommand = command => {
+	return command
+		.trim()
+		.split(SPACES_REGEXP)
+		.reduce(handleEscaping, []);
+};
 
-	return result;
+module.exports = {
+	joinCommand,
+	parseCommand
 };
 
 
 /***/ }),
-/* 150 */
+/* 158 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const chalk = __webpack_require__(151);
+const chalk = __webpack_require__(159);
 
 const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
 
@@ -22169,16 +21599,16 @@ module.exports = isSupported ? main : fallbacks;
 
 
 /***/ }),
-/* 151 */
+/* 159 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(152);
-const stdoutColor = __webpack_require__(153).stdout;
+const ansiStyles = __webpack_require__(160);
+const stdoutColor = __webpack_require__(161).stdout;
 
-const template = __webpack_require__(154);
+const template = __webpack_require__(162);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -22404,7 +21834,7 @@ module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 152 */
+/* 160 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -22577,7 +22007,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 153 */
+/* 161 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -22719,7 +22149,7 @@ module.exports = {
 
 
 /***/ }),
-/* 154 */
+/* 162 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -22854,7 +22284,7 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 155 */
+/* 163 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright IBM Corp. 2014,2018. All Rights Reserved.
@@ -22862,12 +22292,12 @@ module.exports = (chalk, tmp) => {
 // This file is licensed under the Apache License 2.0.
 // License text available at https://opensource.org/licenses/Apache-2.0
 
-module.exports = __webpack_require__(156);
-module.exports.cli = __webpack_require__(160);
+module.exports = __webpack_require__(164);
+module.exports.cli = __webpack_require__(168);
 
 
 /***/ }),
-/* 156 */
+/* 164 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -22882,9 +22312,9 @@ var stream = __webpack_require__(28);
 var util = __webpack_require__(29);
 var fs = __webpack_require__(23);
 
-var through = __webpack_require__(157);
-var duplexer = __webpack_require__(158);
-var StringDecoder = __webpack_require__(159).StringDecoder;
+var through = __webpack_require__(165);
+var duplexer = __webpack_require__(166);
+var StringDecoder = __webpack_require__(167).StringDecoder;
 
 module.exports = Logger;
 
@@ -23073,7 +22503,7 @@ function lineMerger(host) {
 
 
 /***/ }),
-/* 157 */
+/* 165 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(28)
@@ -23187,7 +22617,7 @@ function through (write, end, opts) {
 
 
 /***/ }),
-/* 158 */
+/* 166 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var Stream = __webpack_require__(28)
@@ -23280,13 +22710,13 @@ function duplex(writer, reader) {
 
 
 /***/ }),
-/* 159 */
+/* 167 */
 /***/ (function(module, exports) {
 
 module.exports = require("string_decoder");
 
 /***/ }),
-/* 160 */
+/* 168 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -23297,11 +22727,11 @@ module.exports = require("string_decoder");
 
 
 
-var minimist = __webpack_require__(161);
+var minimist = __webpack_require__(169);
 var path = __webpack_require__(16);
 
-var Logger = __webpack_require__(156);
-var pkg = __webpack_require__(162);
+var Logger = __webpack_require__(164);
+var pkg = __webpack_require__(170);
 
 module.exports = cli;
 
@@ -23355,7 +22785,7 @@ function usage($0, p) {
 
 
 /***/ }),
-/* 161 */
+/* 169 */
 /***/ (function(module, exports) {
 
 module.exports = function (args, opts) {
@@ -23597,13 +23027,13 @@ function isNumber (x) {
 
 
 /***/ }),
-/* 162 */
+/* 170 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"name\":\"strong-log-transformer\",\"version\":\"2.1.0\",\"description\":\"Stream transformer that prefixes lines with timestamps and other things.\",\"author\":\"Ryan Graham <ryan@strongloop.com>\",\"license\":\"Apache-2.0\",\"repository\":{\"type\":\"git\",\"url\":\"git://github.com/strongloop/strong-log-transformer\"},\"keywords\":[\"logging\",\"streams\"],\"bugs\":{\"url\":\"https://github.com/strongloop/strong-log-transformer/issues\"},\"homepage\":\"https://github.com/strongloop/strong-log-transformer\",\"directories\":{\"test\":\"test\"},\"bin\":{\"sl-log-transformer\":\"bin/sl-log-transformer.js\"},\"main\":\"index.js\",\"scripts\":{\"test\":\"tap --100 test/test-*\"},\"dependencies\":{\"duplexer\":\"^0.1.1\",\"minimist\":\"^1.2.0\",\"through\":\"^2.3.4\"},\"devDependencies\":{\"tap\":\"^12.0.1\"},\"engines\":{\"node\":\">=4\"}}");
 
 /***/ }),
-/* 163 */
+/* 171 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -23616,7 +23046,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(164);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172);
 /* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
 /* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(55);
 /* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(36);
@@ -23645,1157 +23075,8428 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-const glob = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(glob__WEBPACK_IMPORTED_MODULE_0___default.a);
-async function workspacePackagePaths(rootPath) {
-  const rootPkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["readPackageJson"])(rootPath);
+const glob = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(glob__WEBPACK_IMPORTED_MODULE_0___default.a);
+async function workspacePackagePaths(rootPath) {
+  const rootPkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_5__["readPackageJson"])(rootPath);
+
+  if (!rootPkgJson.workspaces) {
+    return [];
+  }
+
+  const workspacesPathsPatterns = rootPkgJson.workspaces.packages;
+  let workspaceProjectsPaths = [];
+
+  for (const pattern of workspacesPathsPatterns) {
+    workspaceProjectsPaths = workspaceProjectsPaths.concat((await packagesFromGlobPattern({
+      pattern,
+      rootPath
+    })));
+  } // Filter out exclude glob patterns
+
+
+  for (const pattern of workspacesPathsPatterns) {
+    if (pattern.startsWith('!')) {
+      const pathToRemove = path__WEBPACK_IMPORTED_MODULE_1___default.a.join(rootPath, pattern.slice(1), 'package.json');
+      workspaceProjectsPaths = workspaceProjectsPaths.filter(p => p !== pathToRemove);
+    }
+  }
+
+  return workspaceProjectsPaths;
+}
+async function copyWorkspacePackages(rootPath) {
+  const projectPaths = Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])(rootPath, {});
+  const projects = await Object(_projects__WEBPACK_IMPORTED_MODULE_6__["getProjects"])(rootPath, projectPaths);
+
+  for (const project of projects.values()) {
+    const dest = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(rootPath, 'node_modules', project.name);
+
+    if ((await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["isSymlink"])(dest)) === false) {
+      continue;
+    } // Remove the symlink
+
+
+    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["unlink"])(dest); // Copy in the package
+
+    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["copyDirectory"])(project.path, dest);
+  }
+}
+
+function packagesFromGlobPattern({
+  pattern,
+  rootPath
+}) {
+  const globOptions = {
+    cwd: rootPath,
+    // Should throw in case of unusual errors when reading the file system
+    strict: true,
+    // Always returns absolute paths for matched files
+    absolute: true,
+    // Do not match ** against multiple filenames
+    // (This is only specified because we currently don't have a need for it.)
+    noglobstar: true
+  };
+  return glob(path__WEBPACK_IMPORTED_MODULE_1___default.a.join(pattern, 'package.json'), globOptions);
+}
+
+/***/ }),
+/* 172 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return getProjectPaths; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/*
+ * 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.
+ */
+
+
+/**
+ * Returns all the paths where plugins are located
+ */
+function getProjectPaths(rootPath, options = {}) {
+  const skipKibanaPlugins = Boolean(options['skip-kibana-plugins']);
+  const ossOnly = Boolean(options.oss);
+  const projectPaths = [rootPath, Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'packages/*')]; // This is needed in order to install the dependencies for the declared
+  // plugin functional used in the selenium functional tests.
+  // As we are now using the webpack dll for the client vendors dependencies
+  // when we run the plugin functional tests against the distributable
+  // dependencies used by such plugins like @eui, react and react-dom can't
+  // be loaded from the dll as the context is different from the one declared
+  // into the webpack dll reference plugin.
+  // In anyway, have a plugin declaring their own dependencies is the
+  // correct and the expect behavior.
+
+  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/plugin_functional/plugins/*'));
+  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/interpreter_functional/plugins/*'));
+
+  if (!ossOnly) {
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/legacy/plugins/*'));
+  }
+
+  if (!skipKibanaPlugins) {
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*/packages/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*/plugins/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*/packages/*'));
+    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*/plugins/*'));
+  }
+
+  return projectPaths;
+}
+
+/***/ }),
+/* 173 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CleanCommand", function() { return CleanCommand; });
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(174);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(261);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+
+
+
+
+const CleanCommand = {
+  description: 'Remove the node_modules and target directories from all projects.',
+  name: 'clean',
+
+  async run(projects) {
+    const toDelete = [];
+
+    for (const project of projects.values()) {
+      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isDirectory"])(project.nodeModulesLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.nodeModulesLocation)
+        });
+      }
+
+      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isDirectory"])(project.targetLocation)) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.targetLocation)
+        });
+      }
+
+      const {
+        extraPatterns
+      } = project.getCleanConfig();
+
+      if (extraPatterns) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: extraPatterns
+        });
+      }
+    }
+
+    if (toDelete.length === 0) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold.green('\n\nNothing to delete'));
+    } else {
+      _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold.red('\n\nDeleting:\n'));
+      /**
+       * In order to avoid patterns like `/build` in packages from accidentally
+       * impacting files outside the package we use `process.chdir()` to change
+       * the cwd to the package and execute `del()` without the `force` option
+       * so it will check that each file being deleted is within the package.
+       *
+       * `del()` does support a `cwd` option, but it's only for resolving the
+       * patterns and does not impact the cwd check.
+       */
+
+      const originalCwd = process.cwd();
+
+      try {
+        for (const _ref of toDelete) {
+          const {
+            pattern,
+            cwd
+          } = _ref;
+          process.chdir(cwd);
+          const promise = del__WEBPACK_IMPORTED_MODULE_1___default()(pattern);
+          ora__WEBPACK_IMPORTED_MODULE_2___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_3__["join"])(cwd, String(pattern))));
+          await promise;
+        }
+      } finally {
+        process.chdir(originalCwd);
+      }
+    }
+  }
+
+};
+
+/***/ }),
+/* 174 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {promisify} = __webpack_require__(29);
+const path = __webpack_require__(16);
+const globby = __webpack_require__(175);
+const isGlob = __webpack_require__(187);
+const slash = __webpack_require__(248);
+const gracefulFs = __webpack_require__(250);
+const isPathCwd = __webpack_require__(254);
+const isPathInside = __webpack_require__(255);
+const rimraf = __webpack_require__(256);
+const pMap = __webpack_require__(257);
+
+const rimrafP = promisify(rimraf);
+
+const rimrafOptions = {
+	glob: false,
+	unlink: gracefulFs.unlink,
+	unlinkSync: gracefulFs.unlinkSync,
+	chmod: gracefulFs.chmod,
+	chmodSync: gracefulFs.chmodSync,
+	stat: gracefulFs.stat,
+	statSync: gracefulFs.statSync,
+	lstat: gracefulFs.lstat,
+	lstatSync: gracefulFs.lstatSync,
+	rmdir: gracefulFs.rmdir,
+	rmdirSync: gracefulFs.rmdirSync,
+	readdir: gracefulFs.readdir,
+	readdirSync: gracefulFs.readdirSync
+};
+
+function safeCheck(file, cwd) {
+	if (isPathCwd(file)) {
+		throw new Error('Cannot delete the current working directory. Can be overridden with the `force` option.');
+	}
+
+	if (!isPathInside(file, cwd)) {
+		throw new Error('Cannot delete files/directories outside the current working directory. Can be overridden with the `force` option.');
+	}
+}
+
+function normalizePatterns(patterns) {
+	patterns = Array.isArray(patterns) ? patterns : [patterns];
+
+	patterns = patterns.map(pattern => {
+		if (process.platform === 'win32' && isGlob(pattern) === false) {
+			return slash(pattern);
+		}
+
+		return pattern;
+	});
+
+	return patterns;
+}
+
+module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
+
+	patterns = normalizePatterns(patterns);
+
+	const files = (await globby(patterns, options))
+		.sort((a, b) => b.localeCompare(a));
+
+	const mapper = async file => {
+		file = path.resolve(cwd, file);
+
+		if (!force) {
+			safeCheck(file, cwd);
+		}
+
+		if (!dryRun) {
+			await rimrafP(file, rimrafOptions);
+		}
+
+		return file;
+	};
+
+	const removedFiles = await pMap(files, mapper, options);
+
+	removedFiles.sort((a, b) => a.localeCompare(b));
+
+	return removedFiles;
+};
+
+module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
+
+	patterns = normalizePatterns(patterns);
+
+	const files = globby.sync(patterns, options)
+		.sort((a, b) => b.localeCompare(a));
+
+	const removedFiles = files.map(file => {
+		file = path.resolve(cwd, file);
+
+		if (!force) {
+			safeCheck(file, cwd);
+		}
+
+		if (!dryRun) {
+			rimraf.sync(file, rimrafOptions);
+		}
+
+		return file;
+	});
+
+	removedFiles.sort((a, b) => a.localeCompare(b));
+
+	return removedFiles;
+};
+
+
+/***/ }),
+/* 175 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const fs = __webpack_require__(23);
+const arrayUnion = __webpack_require__(176);
+const merge2 = __webpack_require__(177);
+const glob = __webpack_require__(37);
+const fastGlob = __webpack_require__(178);
+const dirGlob = __webpack_require__(244);
+const gitignore = __webpack_require__(246);
+const {FilterStream, UniqueStream} = __webpack_require__(249);
+
+const DEFAULT_FILTER = () => false;
+
+const isNegative = pattern => pattern[0] === '!';
+
+const assertPatternsInput = patterns => {
+	if (!patterns.every(pattern => typeof pattern === 'string')) {
+		throw new TypeError('Patterns must be a string or an array of strings');
+	}
+};
+
+const checkCwdOption = (options = {}) => {
+	if (!options.cwd) {
+		return;
+	}
+
+	let stat;
+	try {
+		stat = fs.statSync(options.cwd);
+	} catch (_) {
+		return;
+	}
+
+	if (!stat.isDirectory()) {
+		throw new Error('The `cwd` option must be a path to a directory');
+	}
+};
+
+const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
+
+const generateGlobTasks = (patterns, taskOptions) => {
+	patterns = arrayUnion([].concat(patterns));
+	assertPatternsInput(patterns);
+	checkCwdOption(taskOptions);
+
+	const globTasks = [];
+
+	taskOptions = {
+		ignore: [],
+		expandDirectories: true,
+		...taskOptions
+	};
+
+	for (const [index, pattern] of patterns.entries()) {
+		if (isNegative(pattern)) {
+			continue;
+		}
+
+		const ignore = patterns
+			.slice(index)
+			.filter(isNegative)
+			.map(pattern => pattern.slice(1));
+
+		const options = {
+			...taskOptions,
+			ignore: taskOptions.ignore.concat(ignore)
+		};
+
+		globTasks.push({pattern, options});
+	}
+
+	return globTasks;
+};
+
+const globDirs = (task, fn) => {
+	let options = {};
+	if (task.options.cwd) {
+		options.cwd = task.options.cwd;
+	}
+
+	if (Array.isArray(task.options.expandDirectories)) {
+		options = {
+			...options,
+			files: task.options.expandDirectories
+		};
+	} else if (typeof task.options.expandDirectories === 'object') {
+		options = {
+			...options,
+			...task.options.expandDirectories
+		};
+	}
+
+	return fn(task.pattern, options);
+};
+
+const getPattern = (task, fn) => task.options.expandDirectories ? globDirs(task, fn) : [task.pattern];
+
+const getFilterSync = options => {
+	return options && options.gitignore ?
+		gitignore.sync({cwd: options.cwd, ignore: options.ignore}) :
+		DEFAULT_FILTER;
+};
+
+const globToTask = task => glob => {
+	const {options} = task;
+	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
+		options.ignore = dirGlob.sync(options.ignore);
+	}
+
+	return {
+		pattern: glob,
+		options
+	};
+};
+
+module.exports = async (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
+
+	const getFilter = async () => {
+		return options && options.gitignore ?
+			gitignore({cwd: options.cwd, ignore: options.ignore}) :
+			DEFAULT_FILTER;
+	};
+
+	const getTasks = async () => {
+		const tasks = await Promise.all(globTasks.map(async task => {
+			const globs = await getPattern(task, dirGlob);
+			return Promise.all(globs.map(globToTask(task)));
+		}));
+
+		return arrayUnion(...tasks);
+	};
+
+	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
+	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
+
+	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
+};
+
+module.exports.sync = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
+
+	const tasks = globTasks.reduce((tasks, task) => {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		return tasks.concat(newTask);
+	}, []);
+
+	const filter = getFilterSync(options);
+
+	return tasks.reduce(
+		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
+		[]
+	).filter(path_ => !filter(path_));
+};
+
+module.exports.stream = (patterns, options) => {
+	const globTasks = generateGlobTasks(patterns, options);
+
+	const tasks = globTasks.reduce((tasks, task) => {
+		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
+		return tasks.concat(newTask);
+	}, []);
+
+	const filter = getFilterSync(options);
+	const filterStream = new FilterStream(p => !filter(p));
+	const uniqueStream = new UniqueStream();
+
+	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
+		.pipe(filterStream)
+		.pipe(uniqueStream);
+};
+
+module.exports.generateGlobTasks = generateGlobTasks;
+
+module.exports.hasMagic = (patterns, options) => []
+	.concat(patterns)
+	.some(pattern => glob.hasMagic(pattern, options));
+
+module.exports.gitignore = gitignore;
+
+
+/***/ }),
+/* 176 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = (...arguments_) => {
+	return [...new Set([].concat(...arguments_))];
+};
+
+
+/***/ }),
+/* 177 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * merge2
+ * https://github.com/teambition/merge2
+ *
+ * Copyright (c) 2014-2016 Teambition
+ * Licensed under the MIT license.
+ */
+const Stream = __webpack_require__(28)
+const PassThrough = Stream.PassThrough
+const slice = Array.prototype.slice
+
+module.exports = merge2
+
+function merge2 () {
+  const streamsQueue = []
+  let merging = false
+  const args = slice.call(arguments)
+  let options = args[args.length - 1]
+
+  if (options && !Array.isArray(options) && options.pipe == null) args.pop()
+  else options = {}
+
+  const doEnd = options.end !== false
+  if (options.objectMode == null) options.objectMode = true
+  if (options.highWaterMark == null) options.highWaterMark = 64 * 1024
+  const mergedStream = PassThrough(options)
+
+  function addStream () {
+    for (let i = 0, len = arguments.length; i < len; i++) {
+      streamsQueue.push(pauseStreams(arguments[i], options))
+    }
+    mergeStream()
+    return this
+  }
+
+  function mergeStream () {
+    if (merging) return
+    merging = true
+
+    let streams = streamsQueue.shift()
+    if (!streams) {
+      process.nextTick(endStream)
+      return
+    }
+    if (!Array.isArray(streams)) streams = [streams]
+
+    let pipesCount = streams.length + 1
+
+    function next () {
+      if (--pipesCount > 0) return
+      merging = false
+      mergeStream()
+    }
+
+    function pipe (stream) {
+      function onend () {
+        stream.removeListener('merge2UnpipeEnd', onend)
+        stream.removeListener('end', onend)
+        next()
+      }
+      // skip ended stream
+      if (stream._readableState.endEmitted) return next()
+
+      stream.on('merge2UnpipeEnd', onend)
+      stream.on('end', onend)
+      stream.pipe(mergedStream, { end: false })
+      // compatible for old stream
+      stream.resume()
+    }
+
+    for (let i = 0; i < streams.length; i++) pipe(streams[i])
+
+    next()
+  }
+
+  function endStream () {
+    merging = false
+    // emit 'queueDrain' when all streams merged.
+    mergedStream.emit('queueDrain')
+    return doEnd && mergedStream.end()
+  }
+
+  mergedStream.setMaxListeners(0)
+  mergedStream.add = addStream
+  mergedStream.on('unpipe', function (stream) {
+    stream.emit('merge2UnpipeEnd')
+  })
+
+  if (args.length) addStream.apply(null, args)
+  return mergedStream
+}
+
+// check and pause streams for pipe.
+function pauseStreams (streams, options) {
+  if (!Array.isArray(streams)) {
+    // Backwards-compat with old-style streams
+    if (!streams._readableState && streams.pipe) streams = streams.pipe(PassThrough(options))
+    if (!streams._readableState || !streams.pause || !streams.pipe) {
+      throw new Error('Only readable stream can be merged.')
+    }
+    streams.pause()
+  } else {
+    for (let i = 0, len = streams.length; i < len; i++) streams[i] = pauseStreams(streams[i], options)
+  }
+  return streams
+}
+
+
+/***/ }),
+/* 178 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const taskManager = __webpack_require__(179);
+const async_1 = __webpack_require__(207);
+const stream_1 = __webpack_require__(240);
+const sync_1 = __webpack_require__(241);
+const settings_1 = __webpack_require__(243);
+const utils = __webpack_require__(180);
+function FastGlob(source, options) {
+    try {
+        assertPatternsInput(source);
+    }
+    catch (error) {
+        return Promise.reject(error);
+    }
+    const works = getWorks(source, async_1.default, options);
+    return Promise.all(works).then(utils.array.flatten);
+}
+(function (FastGlob) {
+    function sync(source, options) {
+        assertPatternsInput(source);
+        const works = getWorks(source, sync_1.default, options);
+        return utils.array.flatten(works);
+    }
+    FastGlob.sync = sync;
+    function stream(source, options) {
+        assertPatternsInput(source);
+        const works = getWorks(source, stream_1.default, options);
+        /**
+         * The stream returned by the provider cannot work with an asynchronous iterator.
+         * To support asynchronous iterators, regardless of the number of tasks, we always multiplex streams.
+         * This affects performance (+25%). I don't see best solution right now.
+         */
+        return utils.stream.merge(works);
+    }
+    FastGlob.stream = stream;
+    function generateTasks(source, options) {
+        assertPatternsInput(source);
+        const patterns = [].concat(source);
+        const settings = new settings_1.default(options);
+        return taskManager.generate(patterns, settings);
+    }
+    FastGlob.generateTasks = generateTasks;
+})(FastGlob || (FastGlob = {}));
+function getWorks(source, _Provider, options) {
+    const patterns = [].concat(source);
+    const settings = new settings_1.default(options);
+    const tasks = taskManager.generate(patterns, settings);
+    const provider = new _Provider(settings);
+    return tasks.map(provider.read, provider);
+}
+function assertPatternsInput(source) {
+    if ([].concat(source).every(isString)) {
+        return;
+    }
+    throw new TypeError('Patterns must be a string or an array of strings');
+}
+function isString(source) {
+    /* tslint:disable-next-line strict-type-predicates */
+    return typeof source === 'string';
+}
+module.exports = FastGlob;
+
+
+/***/ }),
+/* 179 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(180);
+function generate(patterns, settings) {
+    const positivePatterns = getPositivePatterns(patterns);
+    const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
+    /**
+     * When the `caseSensitiveMatch` option is disabled, all patterns must be marked as dynamic, because we cannot check
+     * filepath directly (without read directory).
+     */
+    const staticPatterns = !settings.caseSensitiveMatch ? [] : positivePatterns.filter(utils.pattern.isStaticPattern);
+    const dynamicPatterns = !settings.caseSensitiveMatch ? positivePatterns : positivePatterns.filter(utils.pattern.isDynamicPattern);
+    const staticTasks = convertPatternsToTasks(staticPatterns, negativePatterns, /* dynamic */ false);
+    const dynamicTasks = convertPatternsToTasks(dynamicPatterns, negativePatterns, /* dynamic */ true);
+    return staticTasks.concat(dynamicTasks);
+}
+exports.generate = generate;
+function convertPatternsToTasks(positive, negative, dynamic) {
+    const positivePatternsGroup = groupPatternsByBaseDirectory(positive);
+    // When we have a global group – there is no reason to divide the patterns into independent tasks.
+    // In this case, the global task covers the rest.
+    if ('.' in positivePatternsGroup) {
+        const task = convertPatternGroupToTask('.', positive, negative, dynamic);
+        return [task];
+    }
+    return convertPatternGroupsToTasks(positivePatternsGroup, negative, dynamic);
+}
+exports.convertPatternsToTasks = convertPatternsToTasks;
+function getPositivePatterns(patterns) {
+    return utils.pattern.getPositivePatterns(patterns);
+}
+exports.getPositivePatterns = getPositivePatterns;
+function getNegativePatternsAsPositive(patterns, ignore) {
+    const negative = utils.pattern.getNegativePatterns(patterns).concat(ignore);
+    const positive = negative.map(utils.pattern.convertToPositivePattern);
+    return positive;
+}
+exports.getNegativePatternsAsPositive = getNegativePatternsAsPositive;
+function groupPatternsByBaseDirectory(patterns) {
+    return patterns.reduce((collection, pattern) => {
+        const base = utils.pattern.getBaseDirectory(pattern);
+        if (base in collection) {
+            collection[base].push(pattern);
+        }
+        else {
+            collection[base] = [pattern];
+        }
+        return collection;
+    }, {});
+}
+exports.groupPatternsByBaseDirectory = groupPatternsByBaseDirectory;
+function convertPatternGroupsToTasks(positive, negative, dynamic) {
+    return Object.keys(positive).map((base) => {
+        return convertPatternGroupToTask(base, positive[base], negative, dynamic);
+    });
+}
+exports.convertPatternGroupsToTasks = convertPatternGroupsToTasks;
+function convertPatternGroupToTask(base, positive, negative, dynamic) {
+    return {
+        dynamic,
+        positive,
+        negative,
+        base,
+        patterns: [].concat(positive, negative.map(utils.pattern.convertToNegativePattern))
+    };
+}
+exports.convertPatternGroupToTask = convertPatternGroupToTask;
+
+
+/***/ }),
+/* 180 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const array = __webpack_require__(181);
+exports.array = array;
+const errno = __webpack_require__(182);
+exports.errno = errno;
+const fs = __webpack_require__(183);
+exports.fs = fs;
+const path = __webpack_require__(184);
+exports.path = path;
+const pattern = __webpack_require__(185);
+exports.pattern = pattern;
+const stream = __webpack_require__(206);
+exports.stream = stream;
+
+
+/***/ }),
+/* 181 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function flatten(items) {
+    return items.reduce((collection, item) => [].concat(collection, item), []);
+}
+exports.flatten = flatten;
+
+
+/***/ }),
+/* 182 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function isEnoentCodeError(error) {
+    return error.code === 'ENOENT';
+}
+exports.isEnoentCodeError = isEnoentCodeError;
+
+
+/***/ }),
+/* 183 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+class DirentFromStats {
+    constructor(name, stats) {
+        this.name = name;
+        this.isBlockDevice = stats.isBlockDevice.bind(stats);
+        this.isCharacterDevice = stats.isCharacterDevice.bind(stats);
+        this.isDirectory = stats.isDirectory.bind(stats);
+        this.isFIFO = stats.isFIFO.bind(stats);
+        this.isFile = stats.isFile.bind(stats);
+        this.isSocket = stats.isSocket.bind(stats);
+        this.isSymbolicLink = stats.isSymbolicLink.bind(stats);
+    }
+}
+function createDirentFromStats(name, stats) {
+    return new DirentFromStats(name, stats);
+}
+exports.createDirentFromStats = createDirentFromStats;
+
+
+/***/ }),
+/* 184 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+/**
+ * Designed to work only with simple paths: `dir\\file`.
+ */
+function unixify(filepath) {
+    return filepath.replace(/\\/g, '/');
+}
+exports.unixify = unixify;
+function makeAbsolute(cwd, filepath) {
+    return path.resolve(cwd, filepath);
+}
+exports.makeAbsolute = makeAbsolute;
+
+
+/***/ }),
+/* 185 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const globParent = __webpack_require__(186);
+const isGlob = __webpack_require__(187);
+const micromatch = __webpack_require__(189);
+const GLOBSTAR = '**';
+function isStaticPattern(pattern) {
+    return !isDynamicPattern(pattern);
+}
+exports.isStaticPattern = isStaticPattern;
+function isDynamicPattern(pattern) {
+    return isGlob(pattern, { strict: false });
+}
+exports.isDynamicPattern = isDynamicPattern;
+function convertToPositivePattern(pattern) {
+    return isNegativePattern(pattern) ? pattern.slice(1) : pattern;
+}
+exports.convertToPositivePattern = convertToPositivePattern;
+function convertToNegativePattern(pattern) {
+    return '!' + pattern;
+}
+exports.convertToNegativePattern = convertToNegativePattern;
+function isNegativePattern(pattern) {
+    return pattern.startsWith('!') && pattern[1] !== '(';
+}
+exports.isNegativePattern = isNegativePattern;
+function isPositivePattern(pattern) {
+    return !isNegativePattern(pattern);
+}
+exports.isPositivePattern = isPositivePattern;
+function getNegativePatterns(patterns) {
+    return patterns.filter(isNegativePattern);
+}
+exports.getNegativePatterns = getNegativePatterns;
+function getPositivePatterns(patterns) {
+    return patterns.filter(isPositivePattern);
+}
+exports.getPositivePatterns = getPositivePatterns;
+function getBaseDirectory(pattern) {
+    return globParent(pattern);
+}
+exports.getBaseDirectory = getBaseDirectory;
+function hasGlobStar(pattern) {
+    return pattern.indexOf(GLOBSTAR) !== -1;
+}
+exports.hasGlobStar = hasGlobStar;
+function endsWithSlashGlobStar(pattern) {
+    return pattern.endsWith('/' + GLOBSTAR);
+}
+exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
+function isAffectDepthOfReadingPattern(pattern) {
+    const basename = path.basename(pattern);
+    return endsWithSlashGlobStar(pattern) || isStaticPattern(basename);
+}
+exports.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
+function getNaiveDepth(pattern) {
+    const base = getBaseDirectory(pattern);
+    const patternDepth = pattern.split('/').length;
+    const patternBaseDepth = base.split('/').length;
+    /**
+     * This is a hack for pattern that has no base directory.
+     *
+     * This is related to the `*\something\*` pattern.
+     */
+    if (base === '.') {
+        return patternDepth - patternBaseDepth;
+    }
+    return patternDepth - patternBaseDepth - 1;
+}
+exports.getNaiveDepth = getNaiveDepth;
+function getMaxNaivePatternsDepth(patterns) {
+    return patterns.reduce((max, pattern) => {
+        const depth = getNaiveDepth(pattern);
+        return depth > max ? depth : max;
+    }, 0);
+}
+exports.getMaxNaivePatternsDepth = getMaxNaivePatternsDepth;
+function makeRe(pattern, options) {
+    return micromatch.makeRe(pattern, options);
+}
+exports.makeRe = makeRe;
+function convertPatternsToRe(patterns, options) {
+    return patterns.map((pattern) => makeRe(pattern, options));
+}
+exports.convertPatternsToRe = convertPatternsToRe;
+function matchAny(entry, patternsRe) {
+    const filepath = entry.replace(/^\.[\\\/]/, '');
+    return patternsRe.some((patternRe) => patternRe.test(filepath));
+}
+exports.matchAny = matchAny;
+
+
+/***/ }),
+/* 186 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var isGlob = __webpack_require__(187);
+var pathPosixDirname = __webpack_require__(16).posix.dirname;
+var isWin32 = __webpack_require__(11).platform() === 'win32';
+
+var slash = '/';
+var backslash = /\\/g;
+var enclosure = /[\{\[].*[\/]*.*[\}\]]$/;
+var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
+var escaped = /\\([\*\?\|\[\]\(\)\{\}])/g;
+
+module.exports = function globParent(str) {
+  // flip windows path separators
+  if (isWin32 && str.indexOf(slash) < 0) {
+    str = str.replace(backslash, slash);
+  }
+
+  // special case for strings ending in enclosure containing path separator
+  if (enclosure.test(str)) {
+    str += slash;
+  }
+
+  // preserves full path in case of trailing path separator
+  str += 'a';
+
+  // remove path parts that are globby
+  do {
+    str = pathPosixDirname(str);
+  } while (isGlob(str) || globby.test(str));
+
+  // remove escape chars and return result
+  return str.replace(escaped, '$1');
+};
+
+
+/***/ }),
+/* 187 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*!
+ * is-glob <https://github.com/jonschlinkert/is-glob>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+var isExtglob = __webpack_require__(188);
+var chars = { '{': '}', '(': ')', '[': ']'};
+var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/;
+var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/;
+
+module.exports = function isGlob(str, options) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
+
+  if (isExtglob(str)) {
+    return true;
+  }
+
+  var regex = strictRegex;
+  var match;
+
+  // optionally relax regex
+  if (options && options.strict === false) {
+    regex = relaxedRegex;
+  }
+
+  while ((match = regex.exec(str))) {
+    if (match[2]) return true;
+    var idx = match.index + match[0].length;
+
+    // if an open bracket/brace/paren is escaped,
+    // set the index to the next closing character
+    var open = match[1];
+    var close = open ? chars[open] : null;
+    if (open && close) {
+      var n = str.indexOf(close, idx);
+      if (n !== -1) {
+        idx = n + 1;
+      }
+    }
+
+    str = str.slice(idx);
+  }
+  return false;
+};
+
+
+/***/ }),
+/* 188 */
+/***/ (function(module, exports) {
+
+/*!
+ * is-extglob <https://github.com/jonschlinkert/is-extglob>
+ *
+ * Copyright (c) 2014-2016, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+module.exports = function isExtglob(str) {
+  if (typeof str !== 'string' || str === '') {
+    return false;
+  }
+
+  var match;
+  while ((match = /(\\).|([@?!+*]\(.*\))/g.exec(str))) {
+    if (match[2]) return true;
+    str = str.slice(match.index + match[0].length);
+  }
+
+  return false;
+};
+
+
+/***/ }),
+/* 189 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const util = __webpack_require__(29);
+const braces = __webpack_require__(190);
+const picomatch = __webpack_require__(200);
+const utils = __webpack_require__(203);
+const isEmptyString = val => typeof val === 'string' && (val === '' || val === './');
+
+/**
+ * Returns an array of strings that match one or more glob patterns.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm(list, patterns[, options]);
+ *
+ * console.log(mm(['a.js', 'a.txt'], ['*.js']));
+ * //=> [ 'a.js' ]
+ * ```
+ * @param {String|Array<string>} list List of strings to match.
+ * @param {String|Array<string>} patterns One or more glob patterns to use for matching.
+ * @param {Object} options See available [options](#options)
+ * @return {Array} Returns an array of matches
+ * @summary false
+ * @api public
+ */
+
+const micromatch = (list, patterns, options) => {
+  patterns = [].concat(patterns);
+  list = [].concat(list);
+
+  let omit = new Set();
+  let keep = new Set();
+  let items = new Set();
+  let negatives = 0;
+
+  let onResult = state => {
+    items.add(state.output);
+    if (options && options.onResult) {
+      options.onResult(state);
+    }
+  };
+
+  for (let i = 0; i < patterns.length; i++) {
+    let isMatch = picomatch(String(patterns[i]), { ...options, onResult }, true);
+    let negated = isMatch.state.negated || isMatch.state.negatedExtglob;
+    if (negated) negatives++;
+
+    for (let item of list) {
+      let matched = isMatch(item, true);
+
+      let match = negated ? !matched.isMatch : matched.isMatch;
+      if (!match) continue;
+
+      if (negated) {
+        omit.add(matched.output);
+      } else {
+        omit.delete(matched.output);
+        keep.add(matched.output);
+      }
+    }
+  }
+
+  let result = negatives === patterns.length ? [...items] : [...keep];
+  let matches = result.filter(item => !omit.has(item));
+
+  if (options && matches.length === 0) {
+    if (options.failglob === true) {
+      throw new Error(`No matches found for "${patterns.join(', ')}"`);
+    }
+
+    if (options.nonull === true || options.nullglob === true) {
+      return options.unescape ? patterns.map(p => p.replace(/\\/g, '')) : patterns;
+    }
+  }
+
+  return matches;
+};
+
+/**
+ * Backwards compatibility
+ */
+
+micromatch.match = micromatch;
+
+/**
+ * Returns a matcher function from the given glob `pattern` and `options`.
+ * The returned function takes a string to match as its only argument and returns
+ * true if the string is a match.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.matcher(pattern[, options]);
+ *
+ * const isMatch = mm.matcher('*.!(*a)');
+ * console.log(isMatch('a.a')); //=> false
+ * console.log(isMatch('a.b')); //=> true
+ * ```
+ * @param {String} `pattern` Glob pattern
+ * @param {Object} `options`
+ * @return {Function} Returns a matcher function.
+ * @api public
+ */
+
+micromatch.matcher = (pattern, options) => picomatch(pattern, options);
+
+/**
+ * Returns true if **any** of the given glob `patterns` match the specified `string`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.isMatch(string, patterns[, options]);
+ *
+ * console.log(mm.isMatch('a.a', ['b.*', '*.a'])); //=> true
+ * console.log(mm.isMatch('a.a', 'b.*')); //=> false
+ * ```
+ * @param {String} str The string to test.
+ * @param {String|Array} patterns One or more glob patterns to use for matching.
+ * @param {Object} [options] See available [options](#options).
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
+
+micromatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
+
+/**
+ * Backwards compatibility
+ */
+
+micromatch.any = micromatch.isMatch;
+
+/**
+ * Returns a list of strings that _**do not match any**_ of the given `patterns`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.not(list, patterns[, options]);
+ *
+ * console.log(mm.not(['a.a', 'b.b', 'c.c'], '*.a'));
+ * //=> ['b.b', 'c.c']
+ * ```
+ * @param {Array} `list` Array of strings to match.
+ * @param {String|Array} `patterns` One or more glob pattern to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Array} Returns an array of strings that **do not match** the given patterns.
+ * @api public
+ */
+
+micromatch.not = (list, patterns, options = {}) => {
+  patterns = [].concat(patterns).map(String);
+  let result = new Set();
+  let items = [];
+
+  let onResult = state => {
+    if (options.onResult) options.onResult(state);
+    items.push(state.output);
+  };
+
+  let matches = micromatch(list, patterns, { ...options, onResult });
+
+  for (let item of items) {
+    if (!matches.includes(item)) {
+      result.add(item);
+    }
+  }
+  return [...result];
+};
+
+/**
+ * Returns true if the given `string` contains the given pattern. Similar
+ * to [.isMatch](#isMatch) but the pattern can match any part of the string.
+ *
+ * ```js
+ * var mm = require('micromatch');
+ * // mm.contains(string, pattern[, options]);
+ *
+ * console.log(mm.contains('aa/bb/cc', '*b'));
+ * //=> true
+ * console.log(mm.contains('aa/bb/cc', '*d'));
+ * //=> false
+ * ```
+ * @param {String} `str` The string to match.
+ * @param {String|Array} `patterns` Glob pattern to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns true if the patter matches any part of `str`.
+ * @api public
+ */
+
+micromatch.contains = (str, pattern, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+  }
+
+  if (Array.isArray(pattern)) {
+    return pattern.some(p => micromatch.contains(str, p, options));
+  }
+
+  if (typeof pattern === 'string') {
+    if (isEmptyString(str) || isEmptyString(pattern)) {
+      return false;
+    }
+
+    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
+      return true;
+    }
+  }
+
+  return micromatch.isMatch(str, pattern, { ...options, contains: true });
+};
+
+/**
+ * Filter the keys of the given object with the given `glob` pattern
+ * and `options`. Does not attempt to match nested keys. If you need this feature,
+ * use [glob-object][] instead.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.matchKeys(object, patterns[, options]);
+ *
+ * const obj = { aa: 'a', ab: 'b', ac: 'c' };
+ * console.log(mm.matchKeys(obj, '*b'));
+ * //=> { ab: 'b' }
+ * ```
+ * @param {Object} `object` The object with keys to filter.
+ * @param {String|Array} `patterns` One or more glob patterns to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Object} Returns an object with only keys that match the given patterns.
+ * @api public
+ */
+
+micromatch.matchKeys = (obj, patterns, options) => {
+  if (!utils.isObject(obj)) {
+    throw new TypeError('Expected the first argument to be an object');
+  }
+  let keys = micromatch(Object.keys(obj), patterns, options);
+  let res = {};
+  for (let key of keys) res[key] = obj[key];
+  return res;
+};
+
+/**
+ * Returns true if some of the strings in the given `list` match any of the given glob `patterns`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.some(list, patterns[, options]);
+ *
+ * console.log(mm.some(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
+ * // true
+ * console.log(mm.some(['foo.js'], ['*.js', '!foo.js']));
+ * // false
+ * ```
+ * @param {String|Array} `list` The string or array of strings to test. Returns as soon as the first match is found.
+ * @param {String|Array} `patterns` One or more glob patterns to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
+
+micromatch.some = (list, patterns, options) => {
+  let items = [].concat(list);
+
+  for (let pattern of [].concat(patterns)) {
+    let isMatch = picomatch(String(pattern), options);
+    if (items.some(item => isMatch(item))) {
+      return true;
+    }
+  }
+  return false;
+};
+
+/**
+ * Returns true if every string in the given `list` matches
+ * any of the given glob `patterns`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.every(list, patterns[, options]);
+ *
+ * console.log(mm.every('foo.js', ['foo.js']));
+ * // true
+ * console.log(mm.every(['foo.js', 'bar.js'], ['*.js']));
+ * // true
+ * console.log(mm.every(['foo.js', 'bar.js'], ['*.js', '!foo.js']));
+ * // false
+ * console.log(mm.every(['foo.js'], ['*.js', '!foo.js']));
+ * // false
+ * ```
+ * @param {String|Array} `list` The string or array of strings to test.
+ * @param {String|Array} `patterns` One or more glob patterns to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
+
+micromatch.every = (list, patterns, options) => {
+  let items = [].concat(list);
+
+  for (let pattern of [].concat(patterns)) {
+    let isMatch = picomatch(String(pattern), options);
+    if (!items.every(item => isMatch(item))) {
+      return false;
+    }
+  }
+  return true;
+};
+
+/**
+ * Returns true if **all** of the given `patterns` match
+ * the specified string.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.all(string, patterns[, options]);
+ *
+ * console.log(mm.all('foo.js', ['foo.js']));
+ * // true
+ *
+ * console.log(mm.all('foo.js', ['*.js', '!foo.js']));
+ * // false
+ *
+ * console.log(mm.all('foo.js', ['*.js', 'foo.js']));
+ * // true
+ *
+ * console.log(mm.all('foo.js', ['*.js', 'f*', '*o*', '*o.js']));
+ * // true
+ * ```
+ * @param {String|Array} `str` The string to test.
+ * @param {String|Array} `patterns` One or more glob patterns to use for matching.
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
+
+micromatch.all = (str, patterns, options) => {
+  if (typeof str !== 'string') {
+    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
+  }
+
+  return [].concat(patterns).every(p => picomatch(p, options)(str));
+};
+
+/**
+ * Returns an array of matches captured by `pattern` in `string, or `null` if the pattern did not match.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.capture(pattern, string[, options]);
+ *
+ * console.log(mm.capture('test/*.js', 'test/foo.js'));
+ * //=> ['foo']
+ * console.log(mm.capture('test/*.js', 'foo/bar.css'));
+ * //=> null
+ * ```
+ * @param {String} `glob` Glob pattern to use for matching.
+ * @param {String} `input` String to match
+ * @param {Object} `options` See available [options](#options) for changing how matches are performed
+ * @return {Boolean} Returns an array of captures if the input matches the glob pattern, otherwise `null`.
+ * @api public
+ */
+
+micromatch.capture = (glob, input, options) => {
+  let posix = utils.isWindows(options);
+  let regex = picomatch.makeRe(String(glob), { ...options, capture: true });
+  let match = regex.exec(posix ? utils.toPosixSlashes(input) : input);
+
+  if (match) {
+    return match.slice(1).map(v => v === void 0 ? '' : v);
+  }
+};
+
+/**
+ * Create a regular expression from the given glob `pattern`.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * // mm.makeRe(pattern[, options]);
+ *
+ * console.log(mm.makeRe('*.js'));
+ * //=> /^(?:(\.[\\\/])?(?!\.)(?=.)[^\/]*?\.js)$/
+ * ```
+ * @param {String} `pattern` A glob pattern to convert to regex.
+ * @param {Object} `options`
+ * @return {RegExp} Returns a regex created from the given pattern.
+ * @api public
+ */
+
+micromatch.makeRe = (...args) => picomatch.makeRe(...args);
+
+/**
+ * Scan a glob pattern to separate the pattern into segments. Used
+ * by the [split](#split) method.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * const state = mm.scan(pattern[, options]);
+ * ```
+ * @param {String} `pattern`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with
+ * @api public
+ */
+
+micromatch.scan = (...args) => picomatch.scan(...args);
+
+/**
+ * Parse a glob pattern to create the source string for a regular
+ * expression.
+ *
+ * ```js
+ * const mm = require('micromatch');
+ * const state = mm(pattern[, options]);
+ * ```
+ * @param {String} `glob`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with useful properties and output to be used as regex source string.
+ * @api public
+ */
+
+micromatch.parse = (patterns, options) => {
+  let res = [];
+  for (let pattern of [].concat(patterns || [])) {
+    for (let str of braces(String(pattern), options)) {
+      res.push(picomatch.parse(str, options));
+    }
+  }
+  return res;
+};
+
+/**
+ * Process the given brace `pattern`.
+ *
+ * ```js
+ * const { braces } = require('micromatch');
+ * console.log(braces('foo/{a,b,c}/bar'));
+ * //=> [ 'foo/(a|b|c)/bar' ]
+ *
+ * console.log(braces('foo/{a,b,c}/bar', { expand: true }));
+ * //=> [ 'foo/a/bar', 'foo/b/bar', 'foo/c/bar' ]
+ * ```
+ * @param {String} `pattern` String with brace pattern to process.
+ * @param {Object} `options` Any [options](#options) to change how expansion is performed. See the [braces][] library for all available options.
+ * @return {Array}
+ * @api public
+ */
+
+micromatch.braces = (pattern, options) => {
+  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
+  if ((options && options.nobrace === true) || !/\{.*\}/.test(pattern)) {
+    return [pattern];
+  }
+  return braces(pattern, options);
+};
+
+/**
+ * Expand braces
+ */
+
+micromatch.braceExpand = (pattern, options) => {
+  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
+  return micromatch.braces(pattern, { ...options, expand: true });
+};
+
+/**
+ * Expose micromatch
+ */
+
+module.exports = micromatch;
+
+
+/***/ }),
+/* 190 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const stringify = __webpack_require__(191);
+const compile = __webpack_require__(193);
+const expand = __webpack_require__(197);
+const parse = __webpack_require__(198);
+
+/**
+ * Expand the given pattern or create a regex-compatible string.
+ *
+ * ```js
+ * const braces = require('braces');
+ * console.log(braces('{a,b,c}', { compile: true })); //=> ['(a|b|c)']
+ * console.log(braces('{a,b,c}')); //=> ['a', 'b', 'c']
+ * ```
+ * @param {String} `str`
+ * @param {Object} `options`
+ * @return {String}
+ * @api public
+ */
+
+const braces = (input, options = {}) => {
+  let output = [];
+
+  if (Array.isArray(input)) {
+    for (let pattern of input) {
+      let result = braces.create(pattern, options);
+      if (Array.isArray(result)) {
+        output.push(...result);
+      } else {
+        output.push(result);
+      }
+    }
+  } else {
+    output = [].concat(braces.create(input, options));
+  }
+
+  if (options && options.expand === true && options.nodupes === true) {
+    output = [...new Set(output)];
+  }
+  return output;
+};
+
+/**
+ * Parse the given `str` with the given `options`.
+ *
+ * ```js
+ * // braces.parse(pattern, [, options]);
+ * const ast = braces.parse('a/{b,c}/d');
+ * console.log(ast);
+ * ```
+ * @param {String} pattern Brace pattern to parse
+ * @param {Object} options
+ * @return {Object} Returns an AST
+ * @api public
+ */
+
+braces.parse = (input, options = {}) => parse(input, options);
+
+/**
+ * Creates a braces string from an AST, or an AST node.
+ *
+ * ```js
+ * const braces = require('braces');
+ * let ast = braces.parse('foo/{a,b}/bar');
+ * console.log(stringify(ast.nodes[2])); //=> '{a,b}'
+ * ```
+ * @param {String} `input` Brace pattern or AST.
+ * @param {Object} `options`
+ * @return {Array} Returns an array of expanded values.
+ * @api public
+ */
+
+braces.stringify = (input, options = {}) => {
+  if (typeof input === 'string') {
+    return stringify(braces.parse(input, options), options);
+  }
+  return stringify(input, options);
+};
+
+/**
+ * Compiles a brace pattern into a regex-compatible, optimized string.
+ * This method is called by the main [braces](#braces) function by default.
+ *
+ * ```js
+ * const braces = require('braces');
+ * console.log(braces.compile('a/{b,c}/d'));
+ * //=> ['a/(b|c)/d']
+ * ```
+ * @param {String} `input` Brace pattern or AST.
+ * @param {Object} `options`
+ * @return {Array} Returns an array of expanded values.
+ * @api public
+ */
+
+braces.compile = (input, options = {}) => {
+  if (typeof input === 'string') {
+    input = braces.parse(input, options);
+  }
+  return compile(input, options);
+};
+
+/**
+ * Expands a brace pattern into an array. This method is called by the
+ * main [braces](#braces) function when `options.expand` is true. Before
+ * using this method it's recommended that you read the [performance notes](#performance))
+ * and advantages of using [.compile](#compile) instead.
+ *
+ * ```js
+ * const braces = require('braces');
+ * console.log(braces.expand('a/{b,c}/d'));
+ * //=> ['a/b/d', 'a/c/d'];
+ * ```
+ * @param {String} `pattern` Brace pattern
+ * @param {Object} `options`
+ * @return {Array} Returns an array of expanded values.
+ * @api public
+ */
+
+braces.expand = (input, options = {}) => {
+  if (typeof input === 'string') {
+    input = braces.parse(input, options);
+  }
+
+  let result = expand(input, options);
+
+  // filter out empty strings if specified
+  if (options.noempty === true) {
+    result = result.filter(Boolean);
+  }
+
+  // filter out duplicates if specified
+  if (options.nodupes === true) {
+    result = [...new Set(result)];
+  }
+
+  return result;
+};
+
+/**
+ * Processes a brace pattern and returns either an expanded array
+ * (if `options.expand` is true), a highly optimized regex-compatible string.
+ * This method is called by the main [braces](#braces) function.
+ *
+ * ```js
+ * const braces = require('braces');
+ * console.log(braces.create('user-{200..300}/project-{a,b,c}-{1..10}'))
+ * //=> 'user-(20[0-9]|2[1-9][0-9]|300)/project-(a|b|c)-([1-9]|10)'
+ * ```
+ * @param {String} `pattern` Brace pattern
+ * @param {Object} `options`
+ * @return {Array} Returns an array of expanded values.
+ * @api public
+ */
+
+braces.create = (input, options = {}) => {
+  if (input === '' || input.length < 3) {
+    return [input];
+  }
+
+ return options.expand !== true
+    ? braces.compile(input, options)
+    : braces.expand(input, options);
+};
+
+/**
+ * Expose "braces"
+ */
+
+module.exports = braces;
+
+
+/***/ }),
+/* 191 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const utils = __webpack_require__(192);
+
+module.exports = (ast, options = {}) => {
+  let stringify = (node, parent = {}) => {
+    let invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent);
+    let invalidNode = node.invalid === true && options.escapeInvalid === true;
+    let output = '';
+
+    if (node.value) {
+      if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
+        return '\\' + node.value;
+      }
+      return node.value;
+    }
+
+    if (node.value) {
+      return node.value;
+    }
+
+    if (node.nodes) {
+      for (let child of node.nodes) {
+        output += stringify(child);
+      }
+    }
+    return output;
+  };
+
+  return stringify(ast);
+};
+
+
+
+/***/ }),
+/* 192 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+exports.isInteger = num => {
+  if (typeof num === 'number') {
+    return Number.isInteger(num);
+  }
+  if (typeof num === 'string' && num.trim() !== '') {
+    return Number.isInteger(Number(num));
+  }
+  return false;
+};
+
+/**
+ * Find a node of the given type
+ */
+
+exports.find = (node, type) => node.nodes.find(node => node.type === type);
+
+/**
+ * Find a node of the given type
+ */
+
+exports.exceedsLimit = (min, max, step = 1, limit) => {
+  if (limit === false) return false;
+  if (!exports.isInteger(min) || !exports.isInteger(max)) return false;
+  return ((Number(max) - Number(min)) / Number(step)) >= limit;
+};
+
+/**
+ * Escape the given node with '\\' before node.value
+ */
+
+exports.escapeNode = (block, n = 0, type) => {
+  let node = block.nodes[n];
+  if (!node) return;
+
+  if ((type && node.type === type) || node.type === 'open' || node.type === 'close') {
+    if (node.escaped !== true) {
+      node.value = '\\' + node.value;
+      node.escaped = true;
+    }
+  }
+};
+
+/**
+ * Returns true if the given brace node should be enclosed in literal braces
+ */
+
+exports.encloseBrace = node => {
+  if (node.type !== 'brace') return false;
+  if ((node.commas >> 0 + node.ranges >> 0) === 0) {
+    node.invalid = true;
+    return true;
+  }
+  return false;
+};
+
+/**
+ * Returns true if a brace node is invalid.
+ */
+
+exports.isInvalidBrace = block => {
+  if (block.type !== 'brace') return false;
+  if (block.invalid === true || block.dollar) return true;
+  if ((block.commas >> 0 + block.ranges >> 0) === 0) {
+    block.invalid = true;
+    return true;
+  }
+  if (block.open !== true || block.close !== true) {
+    block.invalid = true;
+    return true;
+  }
+  return false;
+};
+
+/**
+ * Returns true if a node is an open or close node
+ */
+
+exports.isOpenOrClose = node => {
+  if (node.type === 'open' || node.type === 'close') {
+    return true;
+  }
+  return node.open === true || node.close === true;
+};
+
+/**
+ * Reduce an array of text nodes.
+ */
+
+exports.reduce = nodes => nodes.reduce((acc, node) => {
+  if (node.type === 'text') acc.push(node.value);
+  if (node.type === 'range') node.type = 'text';
+  return acc;
+}, []);
+
+/**
+ * Flatten an array
+ */
+
+exports.flatten = (...args) => {
+  const result = [];
+  const flat = arr => {
+    for (let i = 0; i < arr.length; i++) {
+      let ele = arr[i];
+      Array.isArray(ele) ? flat(ele, result) : ele !== void 0 && result.push(ele);
+    }
+    return result;
+  };
+  flat(args);
+  return result;
+};
+
+
+/***/ }),
+/* 193 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const fill = __webpack_require__(194);
+const utils = __webpack_require__(192);
+
+const compile = (ast, options = {}) => {
+  let walk = (node, parent = {}) => {
+    let invalidBlock = utils.isInvalidBrace(parent);
+    let invalidNode = node.invalid === true && options.escapeInvalid === true;
+    let invalid = invalidBlock === true || invalidNode === true;
+    let prefix = options.escapeInvalid === true ? '\\' : '';
+    let output = '';
+
+    if (node.isOpen === true) {
+      return prefix + node.value;
+    }
+    if (node.isClose === true) {
+      return prefix + node.value;
+    }
+
+    if (node.type === 'open') {
+      return invalid ? (prefix + node.value) : '(';
+    }
+
+    if (node.type === 'close') {
+      return invalid ? (prefix + node.value) : ')';
+    }
+
+    if (node.type === 'comma') {
+      return node.prev.type === 'comma' ? '' : (invalid ? node.value : '|');
+    }
+
+    if (node.value) {
+      return node.value;
+    }
+
+    if (node.nodes && node.ranges > 0) {
+      let args = utils.reduce(node.nodes);
+      let range = fill(...args, { ...options, wrap: false, toRegex: true });
+
+      if (range.length !== 0) {
+        return args.length > 1 && range.length > 1 ? `(${range})` : range;
+      }
+    }
+
+    if (node.nodes) {
+      for (let child of node.nodes) {
+        output += walk(child, node);
+      }
+    }
+    return output;
+  };
+
+  return walk(ast);
+};
+
+module.exports = compile;
+
+
+/***/ }),
+/* 194 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * fill-range <https://github.com/jonschlinkert/fill-range>
+ *
+ * Copyright (c) 2014-present, Jon Schlinkert.
+ * Licensed under the MIT License.
+ */
+
+
+
+const util = __webpack_require__(29);
+const toRegexRange = __webpack_require__(195);
+
+const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
+
+const transform = toNumber => {
+  return value => toNumber === true ? Number(value) : String(value);
+};
+
+const isValidValue = value => {
+  return typeof value === 'number' || (typeof value === 'string' && value !== '');
+};
+
+const isNumber = num => Number.isInteger(+num);
+
+const zeros = input => {
+  let value = `${input}`;
+  let index = -1;
+  if (value[0] === '-') value = value.slice(1);
+  if (value === '0') return false;
+  while (value[++index] === '0');
+  return index > 0;
+};
+
+const stringify = (start, end, options) => {
+  if (typeof start === 'string' || typeof end === 'string') {
+    return true;
+  }
+  return options.stringify === true;
+};
+
+const pad = (input, maxLength, toNumber) => {
+  if (maxLength > 0) {
+    let dash = input[0] === '-' ? '-' : '';
+    if (dash) input = input.slice(1);
+    input = (dash + input.padStart(dash ? maxLength - 1 : maxLength, '0'));
+  }
+  if (toNumber === false) {
+    return String(input);
+  }
+  return input;
+};
+
+const toMaxLen = (input, maxLength) => {
+  let negative = input[0] === '-' ? '-' : '';
+  if (negative) {
+    input = input.slice(1);
+    maxLength--;
+  }
+  while (input.length < maxLength) input = '0' + input;
+  return negative ? ('-' + input) : input;
+};
+
+const toSequence = (parts, options) => {
+  parts.negatives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+  parts.positives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+
+  let prefix = options.capture ? '' : '?:';
+  let positives = '';
+  let negatives = '';
+  let result;
+
+  if (parts.positives.length) {
+    positives = parts.positives.join('|');
+  }
+
+  if (parts.negatives.length) {
+    negatives = `-(${prefix}${parts.negatives.join('|')})`;
+  }
+
+  if (positives && negatives) {
+    result = `${positives}|${negatives}`;
+  } else {
+    result = positives || negatives;
+  }
+
+  if (options.wrap) {
+    return `(${prefix}${result})`;
+  }
+
+  return result;
+};
+
+const toRange = (a, b, isNumbers, options) => {
+  if (isNumbers) {
+    return toRegexRange(a, b, { wrap: false, ...options });
+  }
+
+  let start = String.fromCharCode(a);
+  if (a === b) return start;
+
+  let stop = String.fromCharCode(b);
+  return `[${start}-${stop}]`;
+};
+
+const toRegex = (start, end, options) => {
+  if (Array.isArray(start)) {
+    let wrap = options.wrap === true;
+    let prefix = options.capture ? '' : '?:';
+    return wrap ? `(${prefix}${start.join('|')})` : start.join('|');
+  }
+  return toRegexRange(start, end, options);
+};
+
+const rangeError = (...args) => {
+  return new RangeError('Invalid range arguments: ' + util.inspect(...args));
+};
+
+const invalidRange = (start, end, options) => {
+  if (options.strictRanges === true) throw rangeError([start, end]);
+  return [];
+};
+
+const invalidStep = (step, options) => {
+  if (options.strictRanges === true) {
+    throw new TypeError(`Expected step "${step}" to be a number`);
+  }
+  return [];
+};
+
+const fillNumbers = (start, end, step = 1, options = {}) => {
+  let a = Number(start);
+  let b = Number(end);
+
+  if (!Number.isInteger(a) || !Number.isInteger(b)) {
+    if (options.strictRanges === true) throw rangeError([start, end]);
+    return [];
+  }
+
+  // fix negative zero
+  if (a === 0) a = 0;
+  if (b === 0) b = 0;
+
+  let descending = a > b;
+  let startString = String(start);
+  let endString = String(end);
+  let stepString = String(step);
+  step = Math.max(Math.abs(step), 1);
+
+  let padded = zeros(startString) || zeros(endString) || zeros(stepString);
+  let maxLen = padded ? Math.max(startString.length, endString.length, stepString.length) : 0;
+  let toNumber = padded === false && stringify(start, end, options) === false;
+  let format = options.transform || transform(toNumber);
+
+  if (options.toRegex && step === 1) {
+    return toRange(toMaxLen(start, maxLen), toMaxLen(end, maxLen), true, options);
+  }
+
+  let parts = { negatives: [], positives: [] };
+  let push = num => parts[num < 0 ? 'negatives' : 'positives'].push(Math.abs(num));
+  let range = [];
+  let index = 0;
+
+  while (descending ? a >= b : a <= b) {
+    if (options.toRegex === true && step > 1) {
+      push(a);
+    } else {
+      range.push(pad(format(a, index), maxLen, toNumber));
+    }
+    a = descending ? a - step : a + step;
+    index++;
+  }
+
+  if (options.toRegex === true) {
+    return step > 1
+      ? toSequence(parts, options)
+      : toRegex(range, null, { wrap: false, ...options });
+  }
+
+  return range;
+};
+
+const fillLetters = (start, end, step = 1, options = {}) => {
+  if ((!isNumber(start) && start.length > 1) || (!isNumber(end) && end.length > 1)) {
+    return invalidRange(start, end, options);
+  }
+
+
+  let format = options.transform || (val => String.fromCharCode(val));
+  let a = `${start}`.charCodeAt(0);
+  let b = `${end}`.charCodeAt(0);
+
+  let descending = a > b;
+  let min = Math.min(a, b);
+  let max = Math.max(a, b);
+
+  if (options.toRegex && step === 1) {
+    return toRange(min, max, false, options);
+  }
+
+  let range = [];
+  let index = 0;
+
+  while (descending ? a >= b : a <= b) {
+    range.push(format(a, index));
+    a = descending ? a - step : a + step;
+    index++;
+  }
+
+  if (options.toRegex === true) {
+    return toRegex(range, null, { wrap: false, options });
+  }
+
+  return range;
+};
+
+const fill = (start, end, step, options = {}) => {
+  if (end == null && isValidValue(start)) {
+    return [start];
+  }
+
+  if (!isValidValue(start) || !isValidValue(end)) {
+    return invalidRange(start, end, options);
+  }
+
+  if (typeof step === 'function') {
+    return fill(start, end, 1, { transform: step });
+  }
+
+  if (isObject(step)) {
+    return fill(start, end, 0, step);
+  }
+
+  let opts = { ...options };
+  if (opts.capture === true) opts.wrap = true;
+  step = step || opts.step || 1;
+
+  if (!isNumber(step)) {
+    if (step != null && !isObject(step)) return invalidStep(step, opts);
+    return fill(start, end, 1, step);
+  }
+
+  if (isNumber(start) && isNumber(end)) {
+    return fillNumbers(start, end, step, opts);
+  }
+
+  return fillLetters(start, end, Math.max(Math.abs(step), 1), opts);
+};
+
+module.exports = fill;
+
+
+/***/ }),
+/* 195 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * to-regex-range <https://github.com/micromatch/to-regex-range>
+ *
+ * Copyright (c) 2015-present, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+const isNumber = __webpack_require__(196);
+
+const toRegexRange = (min, max, options) => {
+  if (isNumber(min) === false) {
+    throw new TypeError('toRegexRange: expected the first argument to be a number');
+  }
+
+  if (max === void 0 || min === max) {
+    return String(min);
+  }
+
+  if (isNumber(max) === false) {
+    throw new TypeError('toRegexRange: expected the second argument to be a number.');
+  }
+
+  let opts = { relaxZeros: true, ...options };
+  if (typeof opts.strictZeros === 'boolean') {
+    opts.relaxZeros = opts.strictZeros === false;
+  }
+
+  let relax = String(opts.relaxZeros);
+  let shorthand = String(opts.shorthand);
+  let capture = String(opts.capture);
+  let wrap = String(opts.wrap);
+  let cacheKey = min + ':' + max + '=' + relax + shorthand + capture + wrap;
+
+  if (toRegexRange.cache.hasOwnProperty(cacheKey)) {
+    return toRegexRange.cache[cacheKey].result;
+  }
+
+  let a = Math.min(min, max);
+  let b = Math.max(min, max);
+
+  if (Math.abs(a - b) === 1) {
+    let result = min + '|' + max;
+    if (opts.capture) {
+      return `(${result})`;
+    }
+    if (opts.wrap === false) {
+      return result;
+    }
+    return `(?:${result})`;
+  }
+
+  let isPadded = hasPadding(min) || hasPadding(max);
+  let state = { min, max, a, b };
+  let positives = [];
+  let negatives = [];
+
+  if (isPadded) {
+    state.isPadded = isPadded;
+    state.maxLen = String(state.max).length;
+  }
+
+  if (a < 0) {
+    let newMin = b < 0 ? Math.abs(b) : 1;
+    negatives = splitToPatterns(newMin, Math.abs(a), state, opts);
+    a = state.a = 0;
+  }
+
+  if (b >= 0) {
+    positives = splitToPatterns(a, b, state, opts);
+  }
+
+  state.negatives = negatives;
+  state.positives = positives;
+  state.result = collatePatterns(negatives, positives, opts);
+
+  if (opts.capture === true) {
+    state.result = `(${state.result})`;
+  } else if (opts.wrap !== false && (positives.length + negatives.length) > 1) {
+    state.result = `(?:${state.result})`;
+  }
+
+  toRegexRange.cache[cacheKey] = state;
+  return state.result;
+};
+
+function collatePatterns(neg, pos, options) {
+  let onlyNegative = filterPatterns(neg, pos, '-', false, options) || [];
+  let onlyPositive = filterPatterns(pos, neg, '', false, options) || [];
+  let intersected = filterPatterns(neg, pos, '-?', true, options) || [];
+  let subpatterns = onlyNegative.concat(intersected).concat(onlyPositive);
+  return subpatterns.join('|');
+}
+
+function splitToRanges(min, max) {
+  let nines = 1;
+  let zeros = 1;
+
+  let stop = countNines(min, nines);
+  let stops = new Set([max]);
+
+  while (min <= stop && stop <= max) {
+    stops.add(stop);
+    nines += 1;
+    stop = countNines(min, nines);
+  }
+
+  stop = countZeros(max + 1, zeros) - 1;
+
+  while (min < stop && stop <= max) {
+    stops.add(stop);
+    zeros += 1;
+    stop = countZeros(max + 1, zeros) - 1;
+  }
+
+  stops = [...stops];
+  stops.sort(compare);
+  return stops;
+}
+
+/**
+ * Convert a range to a regex pattern
+ * @param {Number} `start`
+ * @param {Number} `stop`
+ * @return {String}
+ */
+
+function rangeToPattern(start, stop, options) {
+  if (start === stop) {
+    return { pattern: start, count: [], digits: 0 };
+  }
+
+  let zipped = zip(start, stop);
+  let digits = zipped.length;
+  let pattern = '';
+  let count = 0;
+
+  for (let i = 0; i < digits; i++) {
+    let [startDigit, stopDigit] = zipped[i];
+
+    if (startDigit === stopDigit) {
+      pattern += startDigit;
+
+    } else if (startDigit !== '0' || stopDigit !== '9') {
+      pattern += toCharacterClass(startDigit, stopDigit, options);
+
+    } else {
+      count++;
+    }
+  }
+
+  if (count) {
+    pattern += options.shorthand === true ? '\\d' : '[0-9]';
+  }
+
+  return { pattern, count: [count], digits };
+}
+
+function splitToPatterns(min, max, tok, options) {
+  let ranges = splitToRanges(min, max);
+  let tokens = [];
+  let start = min;
+  let prev;
+
+  for (let i = 0; i < ranges.length; i++) {
+    let max = ranges[i];
+    let obj = rangeToPattern(String(start), String(max), options);
+    let zeros = '';
+
+    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
+      if (prev.count.length > 1) {
+        prev.count.pop();
+      }
+
+      prev.count.push(obj.count[0]);
+      prev.string = prev.pattern + toQuantifier(prev.count);
+      start = max + 1;
+      continue;
+    }
+
+    if (tok.isPadded) {
+      zeros = padZeros(max, tok, options);
+    }
+
+    obj.string = zeros + obj.pattern + toQuantifier(obj.count);
+    tokens.push(obj);
+    start = max + 1;
+    prev = obj;
+  }
+
+  return tokens;
+}
+
+function filterPatterns(arr, comparison, prefix, intersection, options) {
+  let result = [];
+
+  for (let ele of arr) {
+    let { string } = ele;
+
+    // only push if _both_ are negative...
+    if (!intersection && !contains(comparison, 'string', string)) {
+      result.push(prefix + string);
+    }
+
+    // or _both_ are positive
+    if (intersection && contains(comparison, 'string', string)) {
+      result.push(prefix + string);
+    }
+  }
+  return result;
+}
+
+/**
+ * Zip strings
+ */
+
+function zip(a, b) {
+  let arr = [];
+  for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
+  return arr;
+}
+
+function compare(a, b) {
+  return a > b ? 1 : b > a ? -1 : 0;
+}
+
+function contains(arr, key, val) {
+  return arr.some(ele => ele[key] === val);
+}
+
+function countNines(min, len) {
+  return Number(String(min).slice(0, -len) + '9'.repeat(len));
+}
+
+function countZeros(integer, zeros) {
+  return integer - (integer % Math.pow(10, zeros));
+}
+
+function toQuantifier(digits) {
+  let [start = 0, stop = ''] = digits;
+  if (stop || start > 1) {
+    return `{${start + (stop ? ',' + stop : '')}}`;
+  }
+  return '';
+}
+
+function toCharacterClass(a, b, options) {
+  return `[${a}${(b - a === 1) ? '' : '-'}${b}]`;
+}
+
+function hasPadding(str) {
+  return /^-?(0+)\d/.test(str);
+}
+
+function padZeros(value, tok, options) {
+  if (!tok.isPadded) {
+    return value;
+  }
+
+  let diff = Math.abs(tok.maxLen - String(value).length);
+  let relax = options.relaxZeros !== false;
+
+  switch (diff) {
+    case 0:
+      return '';
+    case 1:
+      return relax ? '0?' : '0';
+    case 2:
+      return relax ? '0{0,2}' : '00';
+    default: {
+      return relax ? `0{0,${diff}}` : `0{${diff}}`;
+    }
+  }
+}
+
+/**
+ * Cache
+ */
+
+toRegexRange.cache = {};
+toRegexRange.clearCache = () => (toRegexRange.cache = {});
+
+/**
+ * Expose `toRegexRange`
+ */
+
+module.exports = toRegexRange;
+
+
+/***/ }),
+/* 196 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*!
+ * is-number <https://github.com/jonschlinkert/is-number>
+ *
+ * Copyright (c) 2014-present, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+
+
+module.exports = function(num) {
+  if (typeof num === 'number') {
+    return num - num === 0;
+  }
+  if (typeof num === 'string' && num.trim() !== '') {
+    return Number.isFinite ? Number.isFinite(+num) : isFinite(+num);
+  }
+  return false;
+};
+
+
+/***/ }),
+/* 197 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const fill = __webpack_require__(194);
+const stringify = __webpack_require__(191);
+const utils = __webpack_require__(192);
+
+const append = (queue = '', stash = '', enclose = false) => {
+  let result = [];
+
+  queue = [].concat(queue);
+  stash = [].concat(stash);
+
+  if (!stash.length) return queue;
+  if (!queue.length) {
+    return enclose ? utils.flatten(stash).map(ele => `{${ele}}`) : stash;
+  }
+
+  for (let item of queue) {
+    if (Array.isArray(item)) {
+      for (let value of item) {
+        result.push(append(value, stash, enclose));
+      }
+    } else {
+      for (let ele of stash) {
+        if (enclose === true && typeof ele === 'string') ele = `{${ele}}`;
+        result.push(Array.isArray(ele) ? append(item, ele, enclose) : (item + ele));
+      }
+    }
+  }
+  return utils.flatten(result);
+};
+
+const expand = (ast, options = {}) => {
+  let rangeLimit = options.rangeLimit === void 0 ? 1000 : options.rangeLimit;
+
+  let walk = (node, parent = {}) => {
+    node.queue = [];
+
+    let p = parent;
+    let q = parent.queue;
+
+    while (p.type !== 'brace' && p.type !== 'root' && p.parent) {
+      p = p.parent;
+      q = p.queue;
+    }
+
+    if (node.invalid || node.dollar) {
+      q.push(append(q.pop(), stringify(node, options)));
+      return;
+    }
+
+    if (node.type === 'brace' && node.invalid !== true && node.nodes.length === 2) {
+      q.push(append(q.pop(), ['{}']));
+      return;
+    }
+
+    if (node.nodes && node.ranges > 0) {
+      let args = utils.reduce(node.nodes);
+
+      if (utils.exceedsLimit(...args, options.step, rangeLimit)) {
+        throw new RangeError('expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.');
+      }
+
+      let range = fill(...args, options);
+      if (range.length === 0) {
+        range = stringify(node, options);
+      }
+
+      q.push(append(q.pop(), range));
+      node.nodes = [];
+      return;
+    }
+
+    let enclose = utils.encloseBrace(node);
+    let queue = node.queue;
+    let block = node;
+
+    while (block.type !== 'brace' && block.type !== 'root' && block.parent) {
+      block = block.parent;
+      queue = block.queue;
+    }
+
+    for (let i = 0; i < node.nodes.length; i++) {
+      let child = node.nodes[i];
+
+      if (child.type === 'comma' && node.type === 'brace') {
+        if (i === 1) queue.push('');
+        queue.push('');
+        continue;
+      }
+
+      if (child.type === 'close') {
+        q.push(append(q.pop(), queue, enclose));
+        continue;
+      }
+
+      if (child.value && child.type !== 'open') {
+        queue.push(append(queue.pop(), child.value));
+        continue;
+      }
+
+      if (child.nodes) {
+        walk(child, node);
+      }
+    }
+
+    return queue;
+  };
+
+  return utils.flatten(walk(ast));
+};
+
+module.exports = expand;
+
+
+/***/ }),
+/* 198 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const stringify = __webpack_require__(191);
+
+/**
+ * Constants
+ */
+
+const {
+  MAX_LENGTH,
+  CHAR_BACKSLASH, /* \ */
+  CHAR_BACKTICK, /* ` */
+  CHAR_COMMA, /* , */
+  CHAR_DOT, /* . */
+  CHAR_LEFT_PARENTHESES, /* ( */
+  CHAR_RIGHT_PARENTHESES, /* ) */
+  CHAR_LEFT_CURLY_BRACE, /* { */
+  CHAR_RIGHT_CURLY_BRACE, /* } */
+  CHAR_LEFT_SQUARE_BRACKET, /* [ */
+  CHAR_RIGHT_SQUARE_BRACKET, /* ] */
+  CHAR_DOUBLE_QUOTE, /* " */
+  CHAR_SINGLE_QUOTE, /* ' */
+  CHAR_NO_BREAK_SPACE,
+  CHAR_ZERO_WIDTH_NOBREAK_SPACE
+} = __webpack_require__(199);
+
+/**
+ * parse
+ */
+
+const parse = (input, options = {}) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected a string');
+  }
+
+  let opts = options || {};
+  let max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+  if (input.length > max) {
+    throw new SyntaxError(`Input length (${input.length}), exceeds max characters (${max})`);
+  }
+
+  let ast = { type: 'root', input, nodes: [] };
+  let stack = [ast];
+  let block = ast;
+  let prev = ast;
+  let brackets = 0;
+  let length = input.length;
+  let index = 0;
+  let depth = 0;
+  let value;
+  let memo = {};
+
+  /**
+   * Helpers
+   */
+
+  const advance = () => input[index++];
+  const push = node => {
+    if (node.type === 'text' && prev.type === 'dot') {
+      prev.type = 'text';
+    }
+
+    if (prev && prev.type === 'text' && node.type === 'text') {
+      prev.value += node.value;
+      return;
+    }
+
+    block.nodes.push(node);
+    node.parent = block;
+    node.prev = prev;
+    prev = node;
+    return node;
+  };
+
+  push({ type: 'bos' });
+
+  while (index < length) {
+    block = stack[stack.length - 1];
+    value = advance();
+
+    /**
+     * Invalid chars
+     */
+
+    if (value === CHAR_ZERO_WIDTH_NOBREAK_SPACE || value === CHAR_NO_BREAK_SPACE) {
+      continue;
+    }
+
+    /**
+     * Escaped chars
+     */
+
+    if (value === CHAR_BACKSLASH) {
+      push({ type: 'text', value: (options.keepEscaping ? value : '') + advance() });
+      continue;
+    }
+
+    /**
+     * Right square bracket (literal): ']'
+     */
+
+    if (value === CHAR_RIGHT_SQUARE_BRACKET) {
+      push({ type: 'text', value: '\\' + value });
+      continue;
+    }
+
+    /**
+     * Left square bracket: '['
+     */
+
+    if (value === CHAR_LEFT_SQUARE_BRACKET) {
+      brackets++;
+
+      let closed = true;
+      let next;
+
+      while (index < length && (next = advance())) {
+        value += next;
+
+        if (next === CHAR_LEFT_SQUARE_BRACKET) {
+          brackets++;
+          continue;
+        }
+
+        if (next === CHAR_BACKSLASH) {
+          value += advance();
+          continue;
+        }
+
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          brackets--;
+
+          if (brackets === 0) {
+            break;
+          }
+        }
+      }
+
+      push({ type: 'text', value });
+      continue;
+    }
+
+    /**
+     * Parentheses
+     */
+
+    if (value === CHAR_LEFT_PARENTHESES) {
+      block = push({ type: 'paren', nodes: [] });
+      stack.push(block);
+      push({ type: 'text', value });
+      continue;
+    }
+
+    if (value === CHAR_RIGHT_PARENTHESES) {
+      if (block.type !== 'paren') {
+        push({ type: 'text', value });
+        continue;
+      }
+      block = stack.pop();
+      push({ type: 'text', value });
+      block = stack[stack.length - 1];
+      continue;
+    }
+
+    /**
+     * Quotes: '|"|`
+     */
+
+    if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
+      let open = value;
+      let next;
+
+      if (options.keepQuotes !== true) {
+        value = '';
+      }
+
+      while (index < length && (next = advance())) {
+        if (next === CHAR_BACKSLASH) {
+          value += next + advance();
+          continue;
+        }
+
+        if (next === open) {
+          if (options.keepQuotes === true) value += next;
+          break;
+        }
+
+        value += next;
+      }
+
+      push({ type: 'text', value });
+      continue;
+    }
+
+    /**
+     * Left curly brace: '{'
+     */
+
+    if (value === CHAR_LEFT_CURLY_BRACE) {
+      depth++;
+
+      let dollar = prev.value && prev.value.slice(-1) === '$' || block.dollar === true;
+      let brace = {
+        type: 'brace',
+        open: true,
+        close: false,
+        dollar,
+        depth,
+        commas: 0,
+        ranges: 0,
+        nodes: []
+      };
+
+      block = push(brace);
+      stack.push(block);
+      push({ type: 'open', value });
+      continue;
+    }
+
+    /**
+     * Right curly brace: '}'
+     */
+
+    if (value === CHAR_RIGHT_CURLY_BRACE) {
+      if (block.type !== 'brace') {
+        push({ type: 'text', value });
+        continue;
+      }
+
+      let type = 'close';
+      block = stack.pop();
+      block.close = true;
+
+      push({ type, value });
+      depth--;
+
+      block = stack[stack.length - 1];
+      continue;
+    }
+
+    /**
+     * Comma: ','
+     */
+
+    if (value === CHAR_COMMA && depth > 0) {
+      if (block.ranges > 0) {
+        block.ranges = 0;
+        let open = block.nodes.shift();
+        block.nodes = [open, { type: 'text', value: stringify(block) }];
+      }
+
+      push({ type: 'comma', value });
+      block.commas++;
+      continue;
+    }
+
+    /**
+     * Dot: '.'
+     */
+
+    if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
+      let siblings = block.nodes;
+
+      if (depth === 0 || siblings.length === 0) {
+        push({ type: 'text', value });
+        continue;
+      }
+
+      if (prev.type === 'dot') {
+        block.range = [];
+        prev.value += value;
+        prev.type = 'range';
+
+        if (block.nodes.length !== 3 && block.nodes.length !== 5) {
+          block.invalid = true;
+          block.ranges = 0;
+          prev.type = 'text';
+          continue;
+        }
+
+        block.ranges++;
+        block.args = [];
+        continue;
+      }
+
+      if (prev.type === 'range') {
+        siblings.pop();
+
+        let before = siblings[siblings.length - 1];
+        before.value += prev.value + value;
+        prev = before;
+        block.ranges--;
+        continue;
+      }
+
+      push({ type: 'dot', value });
+      continue;
+    }
+
+    /**
+     * Text
+     */
+
+    push({ type: 'text', value });
+  }
+
+  // Mark imbalanced braces and brackets as invalid
+  do {
+    block = stack.pop();
+
+    if (block.type !== 'root') {
+      block.nodes.forEach(node => {
+        if (!node.nodes) {
+          if (node.type === 'open') node.isOpen = true;
+          if (node.type === 'close') node.isClose = true;
+          if (!node.nodes) node.type = 'text';
+          node.invalid = true;
+        }
+      });
+
+      // get the location of the block on parent.nodes (block's siblings)
+      let parent = stack[stack.length - 1];
+      let index = parent.nodes.indexOf(block);
+      // replace the (invalid) block with it's nodes
+      parent.nodes.splice(index, 1, ...block.nodes);
+    }
+  } while (stack.length > 0);
+
+  push({ type: 'eos' });
+  return ast;
+};
+
+module.exports = parse;
+
+
+/***/ }),
+/* 199 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = {
+  MAX_LENGTH: 1024 * 64,
+
+  // Digits
+  CHAR_0: '0', /* 0 */
+  CHAR_9: '9', /* 9 */
+
+  // Alphabet chars.
+  CHAR_UPPERCASE_A: 'A', /* A */
+  CHAR_LOWERCASE_A: 'a', /* a */
+  CHAR_UPPERCASE_Z: 'Z', /* Z */
+  CHAR_LOWERCASE_Z: 'z', /* z */
+
+  CHAR_LEFT_PARENTHESES: '(', /* ( */
+  CHAR_RIGHT_PARENTHESES: ')', /* ) */
+
+  CHAR_ASTERISK: '*', /* * */
+
+  // Non-alphabetic chars.
+  CHAR_AMPERSAND: '&', /* & */
+  CHAR_AT: '@', /* @ */
+  CHAR_BACKSLASH: '\\', /* \ */
+  CHAR_BACKTICK: '`', /* ` */
+  CHAR_CARRIAGE_RETURN: '\r', /* \r */
+  CHAR_CIRCUMFLEX_ACCENT: '^', /* ^ */
+  CHAR_COLON: ':', /* : */
+  CHAR_COMMA: ',', /* , */
+  CHAR_DOLLAR: '$', /* . */
+  CHAR_DOT: '.', /* . */
+  CHAR_DOUBLE_QUOTE: '"', /* " */
+  CHAR_EQUAL: '=', /* = */
+  CHAR_EXCLAMATION_MARK: '!', /* ! */
+  CHAR_FORM_FEED: '\f', /* \f */
+  CHAR_FORWARD_SLASH: '/', /* / */
+  CHAR_HASH: '#', /* # */
+  CHAR_HYPHEN_MINUS: '-', /* - */
+  CHAR_LEFT_ANGLE_BRACKET: '<', /* < */
+  CHAR_LEFT_CURLY_BRACE: '{', /* { */
+  CHAR_LEFT_SQUARE_BRACKET: '[', /* [ */
+  CHAR_LINE_FEED: '\n', /* \n */
+  CHAR_NO_BREAK_SPACE: '\u00A0', /* \u00A0 */
+  CHAR_PERCENT: '%', /* % */
+  CHAR_PLUS: '+', /* + */
+  CHAR_QUESTION_MARK: '?', /* ? */
+  CHAR_RIGHT_ANGLE_BRACKET: '>', /* > */
+  CHAR_RIGHT_CURLY_BRACE: '}', /* } */
+  CHAR_RIGHT_SQUARE_BRACKET: ']', /* ] */
+  CHAR_SEMICOLON: ';', /* ; */
+  CHAR_SINGLE_QUOTE: '\'', /* ' */
+  CHAR_SPACE: ' ', /*   */
+  CHAR_TAB: '\t', /* \t */
+  CHAR_UNDERSCORE: '_', /* _ */
+  CHAR_VERTICAL_LINE: '|', /* | */
+  CHAR_ZERO_WIDTH_NOBREAK_SPACE: '\uFEFF' /* \uFEFF */
+};
+
+
+/***/ }),
+/* 200 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = __webpack_require__(201);
+
+
+/***/ }),
+/* 201 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const path = __webpack_require__(16);
+const scan = __webpack_require__(202);
+const parse = __webpack_require__(205);
+const utils = __webpack_require__(203);
+
+/**
+ * Creates a matcher function from one or more glob patterns. The
+ * returned function takes a string to match as its first argument,
+ * and returns true if the string is a match. The returned matcher
+ * function also takes a boolean as the second argument that, when true,
+ * returns an object with additional information.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch(glob[, options]);
+ *
+ * const isMatch = picomatch('*.!(*a)');
+ * console.log(isMatch('a.a')); //=> false
+ * console.log(isMatch('a.b')); //=> true
+ * ```
+ * @name picomatch
+ * @param {String|Array} `globs` One or more glob patterns.
+ * @param {Object=} `options`
+ * @return {Function=} Returns a matcher function.
+ * @api public
+ */
+
+const picomatch = (glob, options, returnState = false) => {
+  if (Array.isArray(glob)) {
+    let fns = glob.map(input => picomatch(input, options, returnState));
+    return str => {
+      for (let isMatch of fns) {
+        let state = isMatch(str);
+        if (state) return state;
+      }
+      return false;
+    };
+  }
+
+  if (typeof glob !== 'string' || glob === '') {
+    throw new TypeError('Expected pattern to be a non-empty string');
+  }
+
+  let opts = options || {};
+  let posix = utils.isWindows(options);
+  let regex = picomatch.makeRe(glob, options, false, true);
+  let state = regex.state;
+  delete regex.state;
+
+  let isIgnored = () => false;
+  if (opts.ignore) {
+    let ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
+    isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
+  }
+
+  const matcher = (input, returnObject = false) => {
+    let { isMatch, match, output } = picomatch.test(input, regex, options, { glob, posix });
+    let result = { glob, state, regex, posix, input, output, match, isMatch };
+
+    if (typeof opts.onResult === 'function') {
+      opts.onResult(result);
+    }
+
+    if (isMatch === false) {
+      result.isMatch = false;
+      return returnObject ? result : false;
+    }
+
+    if (isIgnored(input)) {
+      if (typeof opts.onIgnore === 'function') {
+        opts.onIgnore(result);
+      }
+      result.isMatch = false;
+      return returnObject ? result : false;
+    }
+
+    if (typeof opts.onMatch === 'function') {
+      opts.onMatch(result);
+    }
+    return returnObject ? result : true;
+  };
+
+  if (returnState) {
+    matcher.state = state;
+  }
+
+  return matcher;
+};
+
+/**
+ * Test `input` with the given `regex`. This is used by the main
+ * `picomatch()` function to test the input string.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.test(input, regex[, options]);
+ *
+ * console.log(picomatch.test('foo/bar', /^(?:([^/]*?)\/([^/]*?))$/));
+ * // { isMatch: true, match: [ 'foo/', 'foo', 'bar' ], output: 'foo/bar' }
+ * ```
+ * @param {String} `input` String to test.
+ * @param {RegExp} `regex`
+ * @return {Object} Returns an object with matching info.
+ * @api public
+ */
+
+picomatch.test = (input, regex, options, { glob, posix } = {}) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected input to be a string');
+  }
+
+  if (input === '') {
+    return { isMatch: false, output: '' };
+  }
+
+  let opts = options || {};
+  let format = opts.format || (posix ? utils.toPosixSlashes : null);
+  let match = input === glob;
+  let output = (match && format) ? format(input) : input;
+
+  if (match === false) {
+    output = format ? format(input) : input;
+    match = output === glob;
+  }
+
+  if (match === false || opts.capture === true) {
+    if (opts.matchBase === true || opts.basename === true) {
+      match = picomatch.matchBase(input, regex, options, posix);
+    } else {
+      match = regex.exec(output);
+    }
+  }
+
+  return { isMatch: !!match, match, output };
+};
+
+/**
+ * Match the basename of a filepath.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.matchBase(input, glob[, options]);
+ * console.log(picomatch.matchBase('foo/bar.js', '*.js'); // true
+ * ```
+ * @param {String} `input` String to test.
+ * @param {RegExp|String} `glob` Glob pattern or regex created by [.makeRe](#makeRe).
+ * @return {Boolean}
+ * @api public
+ */
+
+picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
+  let regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
+  return regex.test(path.basename(input));
+};
+
+/**
+ * Returns true if **any** of the given glob `patterns` match the specified `string`.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.isMatch(string, patterns[, options]);
+ *
+ * console.log(picomatch.isMatch('a.a', ['b.*', '*.a'])); //=> true
+ * console.log(picomatch.isMatch('a.a', 'b.*')); //=> false
+ * ```
+ * @param {String|Array} str The string to test.
+ * @param {String|Array} patterns One or more glob patterns to use for matching.
+ * @param {Object} [options] See available [options](#options).
+ * @return {Boolean} Returns true if any patterns match `str`
+ * @api public
+ */
+
+picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
+
+/**
+ * Parse a glob pattern to create the source string for a regular
+ * expression.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * const result = picomatch.parse(glob[, options]);
+ * ```
+ * @param {String} `glob`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with useful properties and output to be used as a regex source string.
+ * @api public
+ */
+
+picomatch.parse = (glob, options) => parse(glob, options);
+
+/**
+ * Scan a glob pattern to separate the pattern into segments.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.scan(input[, options]);
+ *
+ * const result = picomatch.scan('!./foo/*.js');
+ * console.log(result);
+ * // { prefix: '!./',
+ * //   input: '!./foo/*.js',
+ * //   base: 'foo',
+ * //   glob: '*.js',
+ * //   negated: true,
+ * //   isGlob: true }
+ * ```
+ * @param {String} `input` Glob pattern to scan.
+ * @param {Object} `options`
+ * @return {Object} Returns an object with
+ * @api public
+ */
+
+picomatch.scan = (input, options) => scan(input, options);
+
+/**
+ * Create a regular expression from a glob pattern.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.makeRe(input[, options]);
+ *
+ * console.log(picomatch.makeRe('*.js'));
+ * //=> /^(?:(?!\.)(?=.)[^/]*?\.js)$/
+ * ```
+ * @param {String} `input` A glob pattern to convert to regex.
+ * @param {Object} `options`
+ * @return {RegExp} Returns a regex created from the given pattern.
+ * @api public
+ */
+
+picomatch.makeRe = (input, options, returnOutput = false, returnState = false) => {
+  if (!input || typeof input !== 'string') {
+    throw new TypeError('Expected a non-empty string');
+  }
+
+  let opts = options || {};
+  let prepend = opts.contains ? '' : '^';
+  let append = opts.contains ? '' : '$';
+  let state = { negated: false, fastpaths: true };
+  let prefix = '';
+  let output;
+
+  if (input.startsWith('./')) {
+    input = input.slice(2);
+    prefix = state.prefix = './';
+  }
+
+  if (opts.fastpaths !== false && (input[0] === '.' || input[0] === '*')) {
+    output = parse.fastpaths(input, options);
+  }
+
+  if (output === void 0) {
+    state = picomatch.parse(input, options);
+    state.prefix = prefix + (state.prefix || '');
+    output = state.output;
+  }
+
+  if (returnOutput === true) {
+    return output;
+  }
+
+  let source = `${prepend}(?:${output})${append}`;
+  if (state && state.negated === true) {
+    source = `^(?!${source}).*$`;
+  }
+
+  let regex = picomatch.toRegex(source, options);
+  if (returnState === true) {
+    regex.state = state;
+  }
+
+  return regex;
+};
+
+/**
+ * Create a regular expression from the given regex source string.
+ *
+ * ```js
+ * const picomatch = require('picomatch');
+ * // picomatch.toRegex(source[, options]);
+ *
+ * const { output } = picomatch.parse('*.js');
+ * console.log(picomatch.toRegex(output));
+ * //=> /^(?:(?!\.)(?=.)[^/]*?\.js)$/
+ * ```
+ * @param {String} `source` Regular expression source string.
+ * @param {Object} `options`
+ * @return {RegExp}
+ * @api public
+ */
+
+picomatch.toRegex = (source, options) => {
+  try {
+    let opts = options || {};
+    return new RegExp(source, opts.flags || (opts.nocase ? 'i' : ''));
+  } catch (err) {
+    if (options && options.debug === true) throw err;
+    return /$^/;
+  }
+};
+
+/**
+ * Picomatch constants.
+ * @return {Object}
+ */
+
+picomatch.constants = __webpack_require__(204);
+
+/**
+ * Expose "picomatch"
+ */
+
+module.exports = picomatch;
+
+
+/***/ }),
+/* 202 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const utils = __webpack_require__(203);
+
+const {
+  CHAR_ASTERISK,             /* * */
+  CHAR_AT,                   /* @ */
+  CHAR_BACKWARD_SLASH,       /* \ */
+  CHAR_COMMA,                /* , */
+  CHAR_DOT,                  /* . */
+  CHAR_EXCLAMATION_MARK,     /* ! */
+  CHAR_FORWARD_SLASH,        /* / */
+  CHAR_LEFT_CURLY_BRACE,     /* { */
+  CHAR_LEFT_PARENTHESES,     /* ( */
+  CHAR_LEFT_SQUARE_BRACKET,  /* [ */
+  CHAR_PLUS,                 /* + */
+  CHAR_QUESTION_MARK,        /* ? */
+  CHAR_RIGHT_CURLY_BRACE,    /* } */
+  CHAR_RIGHT_PARENTHESES,    /* ) */
+  CHAR_RIGHT_SQUARE_BRACKET /* ] */
+} = __webpack_require__(204);
+
+const isPathSeparator = code => {
+  return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
+};
+
+/**
+ * Quickly scans a glob pattern and returns an object with a handful of
+ * useful properties, like `isGlob`, `path` (the leading non-glob, if it exists),
+ * `glob` (the actual pattern), and `negated` (true if the path starts with `!`).
+ *
+ * ```js
+ * const pm = require('picomatch');
+ * console.log(pm.scan('foo/bar/*.js'));
+ * { isGlob: true, input: 'foo/bar/*.js', base: 'foo/bar', glob: '*.js' }
+ * ```
+ * @param {String} `str`
+ * @param {Object} `options`
+ * @return {Object} Returns an object with tokens and regex source string.
+ * @api public
+ */
+
+module.exports = (input, options) => {
+  let opts = options || {};
+  let length = input.length - 1;
+  let index = -1;
+  let start = 0;
+  let lastIndex = 0;
+  let isGlob = false;
+  let backslashes = false;
+  let negated = false;
+  let braces = 0;
+  let prev;
+  let code;
+
+  let braceEscaped = false;
+
+  let eos = () => index >= length;
+  let advance = () => {
+    prev = code;
+    return input.charCodeAt(++index);
+  };
+
+  while (index < length) {
+    code = advance();
+    let next;
+
+    if (code === CHAR_BACKWARD_SLASH) {
+      backslashes = true;
+      next = advance();
+
+      if (next === CHAR_LEFT_CURLY_BRACE) {
+        braceEscaped = true;
+      }
+      continue;
+    }
+
+    if (braceEscaped === true || code === CHAR_LEFT_CURLY_BRACE) {
+      braces++;
+
+      while (!eos() && (next = advance())) {
+        if (next === CHAR_BACKWARD_SLASH) {
+          backslashes = true;
+          next = advance();
+          continue;
+        }
+
+        if (next === CHAR_LEFT_CURLY_BRACE) {
+          braces++;
+          continue;
+        }
+
+        if (!braceEscaped && next === CHAR_DOT && (next = advance()) === CHAR_DOT) {
+          isGlob = true;
+          break;
+        }
+
+        if (!braceEscaped && next === CHAR_COMMA) {
+          isGlob = true;
+          break;
+        }
+
+        if (next === CHAR_RIGHT_CURLY_BRACE) {
+          braces--;
+          if (braces === 0) {
+            braceEscaped = false;
+            break;
+          }
+        }
+      }
+    }
+
+    if (code === CHAR_FORWARD_SLASH) {
+      if (prev === CHAR_DOT && index === (start + 1)) {
+        start += 2;
+        continue;
+      }
+
+      lastIndex = index + 1;
+      continue;
+    }
+
+    if (code === CHAR_ASTERISK) {
+      isGlob = true;
+      break;
+    }
+
+    if (code === CHAR_ASTERISK || code === CHAR_QUESTION_MARK) {
+      isGlob = true;
+      break;
+    }
+
+    if (code === CHAR_LEFT_SQUARE_BRACKET) {
+      while (!eos() && (next = advance())) {
+        if (next === CHAR_BACKWARD_SLASH) {
+          backslashes = true;
+          next = advance();
+          continue;
+        }
+
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          isGlob = true;
+          break;
+        }
+      }
+    }
+
+    let isExtglobChar = code === CHAR_PLUS
+      || code === CHAR_AT
+      || code === CHAR_EXCLAMATION_MARK;
+
+    if (isExtglobChar && input.charCodeAt(index + 1) === CHAR_LEFT_PARENTHESES) {
+      isGlob = true;
+      break;
+    }
+
+    if (code === CHAR_EXCLAMATION_MARK && index === start) {
+      negated = true;
+      start++;
+      continue;
+    }
+
+    if (code === CHAR_LEFT_PARENTHESES) {
+      while (!eos() && (next = advance())) {
+        if (next === CHAR_BACKWARD_SLASH) {
+          backslashes = true;
+          next = advance();
+          continue;
+        }
+
+        if (next === CHAR_RIGHT_PARENTHESES) {
+          isGlob = true;
+          break;
+        }
+      }
+    }
+
+    if (isGlob) {
+      break;
+    }
+  }
+
+  let prefix = '';
+  let orig = input;
+  let base = input;
+  let glob = '';
+
+  if (start > 0) {
+    prefix = input.slice(0, start);
+    input = input.slice(start);
+    lastIndex -= start;
+  }
+
+  if (base && isGlob === true && lastIndex > 0) {
+    base = input.slice(0, lastIndex);
+    glob = input.slice(lastIndex);
+  } else if (isGlob === true) {
+    base = '';
+    glob = input;
+  } else {
+    base = input;
+  }
+
+  if (base && base !== '' && base !== '/' && base !== input) {
+    if (isPathSeparator(base.charCodeAt(base.length - 1))) {
+      base = base.slice(0, -1);
+    }
+  }
+
+  if (opts.unescape === true) {
+    if (glob) glob = utils.removeBackslashes(glob);
+
+    if (base && backslashes === true) {
+      base = utils.removeBackslashes(base);
+    }
+  }
+
+  return { prefix, input: orig, base, glob, negated, isGlob };
+};
+
+
+/***/ }),
+/* 203 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const path = __webpack_require__(16);
+const win32 = process.platform === 'win32';
+const {
+  REGEX_SPECIAL_CHARS,
+  REGEX_SPECIAL_CHARS_GLOBAL,
+  REGEX_REMOVE_BACKSLASH
+} = __webpack_require__(204);
+
+exports.isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
+exports.hasRegexChars = str => REGEX_SPECIAL_CHARS.test(str);
+exports.isRegexChar = str => str.length === 1 && exports.hasRegexChars(str);
+exports.escapeRegex = str => str.replace(REGEX_SPECIAL_CHARS_GLOBAL, '\\$1');
+exports.toPosixSlashes = str => str.replace(/\\/g, '/');
+
+exports.removeBackslashes = str => {
+  return str.replace(REGEX_REMOVE_BACKSLASH, match => {
+    return match === '\\' ? '' : match;
+  });
+}
+
+exports.supportsLookbehinds = () => {
+  let segs = process.version.slice(1).split('.');
+  if (segs.length === 3 && +segs[0] >= 9 || (+segs[0] === 8 && +segs[1] >= 10)) {
+    return true;
+  }
+  return false;
+};
+
+exports.isWindows = options => {
+  if (options && typeof options.windows === 'boolean') {
+    return options.windows;
+  }
+  return win32 === true || path.sep === '\\';
+};
+
+exports.escapeLast = (input, char, lastIdx) => {
+  let idx = input.lastIndexOf(char, lastIdx);
+  if (idx === -1) return input;
+  if (input[idx - 1] === '\\') return exports.escapeLast(input, char, idx - 1);
+  return input.slice(0, idx) + '\\' + input.slice(idx);
+};
+
+
+/***/ }),
+/* 204 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const path = __webpack_require__(16);
+const WIN_SLASH = '\\\\/';
+const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
+
+/**
+ * Posix glob regex
+ */
+
+const DOT_LITERAL = '\\.';
+const PLUS_LITERAL = '\\+';
+const QMARK_LITERAL = '\\?';
+const SLASH_LITERAL = '\\/';
+const ONE_CHAR = '(?=.)';
+const QMARK = '[^/]';
+const END_ANCHOR = `(?:${SLASH_LITERAL}|$)`;
+const START_ANCHOR = `(?:^|${SLASH_LITERAL})`;
+const DOTS_SLASH = `${DOT_LITERAL}{1,2}${END_ANCHOR}`;
+const NO_DOT = `(?!${DOT_LITERAL})`;
+const NO_DOTS = `(?!${START_ANCHOR}${DOTS_SLASH})`;
+const NO_DOT_SLASH = `(?!${DOT_LITERAL}{0,1}${END_ANCHOR})`;
+const NO_DOTS_SLASH = `(?!${DOTS_SLASH})`;
+const QMARK_NO_DOT = `[^.${SLASH_LITERAL}]`;
+const STAR = `${QMARK}*?`;
+
+const POSIX_CHARS = {
+  DOT_LITERAL,
+  PLUS_LITERAL,
+  QMARK_LITERAL,
+  SLASH_LITERAL,
+  ONE_CHAR,
+  QMARK,
+  END_ANCHOR,
+  DOTS_SLASH,
+  NO_DOT,
+  NO_DOTS,
+  NO_DOT_SLASH,
+  NO_DOTS_SLASH,
+  QMARK_NO_DOT,
+  STAR,
+  START_ANCHOR
+};
+
+/**
+ * Windows glob regex
+ */
+
+const WINDOWS_CHARS = {
+  ...POSIX_CHARS,
+
+  SLASH_LITERAL: `[${WIN_SLASH}]`,
+  QMARK: WIN_NO_SLASH,
+  STAR: `${WIN_NO_SLASH}*?`,
+  DOTS_SLASH: `${DOT_LITERAL}{1,2}(?:[${WIN_SLASH}]|$)`,
+  NO_DOT: `(?!${DOT_LITERAL})`,
+  NO_DOTS: `(?!(?:^|[${WIN_SLASH}])${DOT_LITERAL}{1,2}(?:[${WIN_SLASH}]|$))`,
+  NO_DOT_SLASH: `(?!${DOT_LITERAL}{0,1}(?:[${WIN_SLASH}]|$))`,
+  NO_DOTS_SLASH: `(?!${DOT_LITERAL}{1,2}(?:[${WIN_SLASH}]|$))`,
+  QMARK_NO_DOT: `[^.${WIN_SLASH}]`,
+  START_ANCHOR: `(?:^|[${WIN_SLASH}])`,
+  END_ANCHOR: `(?:[${WIN_SLASH}]|$)`
+};
+
+/**
+ * POSIX Bracket Regex
+ */
+
+const POSIX_REGEX_SOURCE = {
+  alnum: 'a-zA-Z0-9',
+  alpha: 'a-zA-Z',
+  ascii: '\\x00-\\x7F',
+  blank: ' \\t',
+  cntrl: '\\x00-\\x1F\\x7F',
+  digit: '0-9',
+  graph: '\\x21-\\x7E',
+  lower: 'a-z',
+  print: '\\x20-\\x7E ',
+  punct: '\\-!"#$%&\'()\\*+,./:;<=>?@[\\]^_`{|}~',
+  space: ' \\t\\r\\n\\v\\f',
+  upper: 'A-Z',
+  word: 'A-Za-z0-9_',
+  xdigit: 'A-Fa-f0-9'
+};
+
+module.exports = {
+  MAX_LENGTH: 1024 * 64,
+  POSIX_REGEX_SOURCE,
+
+  // regular expressions
+  REGEX_BACKSLASH: /\\(?![*+?^${}(|)[\]])/g,
+  REGEX_NON_SPECIAL_CHAR: /^[^@![\].,$*+?^{}()|\\/]+/,
+  REGEX_SPECIAL_CHARS: /[-*+?.^${}(|)[\]]/,
+  REGEX_SPECIAL_CHARS_BACKREF: /(\\?)((\W)(\3*))/g,
+  REGEX_SPECIAL_CHARS_GLOBAL: /([-*+?.^${}(|)[\]])/g,
+  REGEX_REMOVE_BACKSLASH: /(?:\[.*?[^\\]\]|\\(?=.))/g,
+
+  // Replace globs with equivalent patterns to reduce parsing time.
+  REPLACEMENTS: {
+    '***': '*',
+    '**/**': '**',
+    '**/**/**': '**'
+  },
+
+  // Digits
+  CHAR_0: 48, /* 0 */
+  CHAR_9: 57, /* 9 */
+
+  // Alphabet chars.
+  CHAR_UPPERCASE_A: 65, /* A */
+  CHAR_LOWERCASE_A: 97, /* a */
+  CHAR_UPPERCASE_Z: 90, /* Z */
+  CHAR_LOWERCASE_Z: 122, /* z */
+
+  CHAR_LEFT_PARENTHESES: 40, /* ( */
+  CHAR_RIGHT_PARENTHESES: 41, /* ) */
+
+  CHAR_ASTERISK: 42, /* * */
+
+  // Non-alphabetic chars.
+  CHAR_AMPERSAND: 38, /* & */
+  CHAR_AT: 64, /* @ */
+  CHAR_BACKWARD_SLASH: 92, /* \ */
+  CHAR_CARRIAGE_RETURN: 13, /* \r */
+  CHAR_CIRCUMFLEX_ACCENT: 94, /* ^ */
+  CHAR_COLON: 58, /* : */
+  CHAR_COMMA: 44, /* , */
+  CHAR_DOT: 46, /* . */
+  CHAR_DOUBLE_QUOTE: 34, /* " */
+  CHAR_EQUAL: 61, /* = */
+  CHAR_EXCLAMATION_MARK: 33, /* ! */
+  CHAR_FORM_FEED: 12, /* \f */
+  CHAR_FORWARD_SLASH: 47, /* / */
+  CHAR_GRAVE_ACCENT: 96, /* ` */
+  CHAR_HASH: 35, /* # */
+  CHAR_HYPHEN_MINUS: 45, /* - */
+  CHAR_LEFT_ANGLE_BRACKET: 60, /* < */
+  CHAR_LEFT_CURLY_BRACE: 123, /* { */
+  CHAR_LEFT_SQUARE_BRACKET: 91, /* [ */
+  CHAR_LINE_FEED: 10, /* \n */
+  CHAR_NO_BREAK_SPACE: 160, /* \u00A0 */
+  CHAR_PERCENT: 37, /* % */
+  CHAR_PLUS: 43, /* + */
+  CHAR_QUESTION_MARK: 63, /* ? */
+  CHAR_RIGHT_ANGLE_BRACKET: 62, /* > */
+  CHAR_RIGHT_CURLY_BRACE: 125, /* } */
+  CHAR_RIGHT_SQUARE_BRACKET: 93, /* ] */
+  CHAR_SEMICOLON: 59, /* ; */
+  CHAR_SINGLE_QUOTE: 39, /* ' */
+  CHAR_SPACE: 32, /*   */
+  CHAR_TAB: 9, /* \t */
+  CHAR_UNDERSCORE: 95, /* _ */
+  CHAR_VERTICAL_LINE: 124, /* | */
+  CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279, /* \uFEFF */
+
+  SEP: path.sep,
+
+  /**
+   * Create EXTGLOB_CHARS
+   */
+
+  extglobChars(chars) {
+    return {
+      '!': { type: 'negate', open: '(?:(?!(?:', close: `))${chars.STAR})` },
+      '?': { type: 'qmark', open: '(?:', close: ')?' },
+      '+': { type: 'plus', open: '(?:', close: ')+' },
+      '*': { type: 'star', open: '(?:', close: ')*' },
+      '@': { type: 'at', open: '(?:', close: ')' }
+    };
+  },
+
+  /**
+   * Create GLOB_CHARS
+   */
+
+  globChars(win32) {
+    return win32 === true ? WINDOWS_CHARS : POSIX_CHARS;
+  }
+};
+
+
+/***/ }),
+/* 205 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const utils = __webpack_require__(203);
+const constants = __webpack_require__(204);
+
+/**
+ * Constants
+ */
+
+const {
+  MAX_LENGTH,
+  POSIX_REGEX_SOURCE,
+  REGEX_NON_SPECIAL_CHAR,
+  REGEX_SPECIAL_CHARS_BACKREF,
+  REPLACEMENTS
+} = constants;
+
+/**
+ * Helpers
+ */
+
+const expandRange = (args, options) => {
+  if (typeof options.expandRange === 'function') {
+    return options.expandRange(...args, options);
+  }
+
+  args.sort();
+  let value = `[${args.join('-')}]`;
+
+  try {
+    /* eslint-disable no-new */
+    new RegExp(value);
+  } catch (ex) {
+    return args.map(v => utils.escapeRegex(v)).join('..');
+  }
+
+  return value;
+};
+
+const negate = state => {
+  let count = 1;
+
+  while (state.peek() === '!' && (state.peek(2) !== '(' || state.peek(3) === '?')) {
+    state.advance();
+    state.start++;
+    count++;
+  }
+
+  if (count % 2 === 0) {
+    return false;
+  }
+
+  state.negated = true;
+  state.start++;
+  return true;
+};
+
+/**
+ * Create the message for a syntax error
+ */
+
+const syntaxError = (type, char) => {
+  return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
+};
+
+/**
+ * Parse the given input string.
+ * @param {String} input
+ * @param {Object} options
+ * @return {Object}
+ */
+
+const parse = (input, options) => {
+  if (typeof input !== 'string') {
+    throw new TypeError('Expected a string');
+  }
+
+  input = REPLACEMENTS[input] || input;
+
+  let opts = { ...options };
+  let max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+  let len = input.length;
+  if (len > max) {
+    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
+  }
+
+  let bos = { type: 'bos', value: '', output: opts.prepend || '' };
+  let tokens = [bos];
+
+  let capture = opts.capture ? '' : '?:';
+  let win32 = utils.isWindows(options);
+
+  // create constants based on platform, for windows or posix
+  const PLATFORM_CHARS = constants.globChars(win32);
+  const EXTGLOB_CHARS = constants.extglobChars(PLATFORM_CHARS);
+
+  const {
+    DOT_LITERAL,
+    PLUS_LITERAL,
+    SLASH_LITERAL,
+    ONE_CHAR,
+    DOTS_SLASH,
+    NO_DOT,
+    NO_DOT_SLASH,
+    NO_DOTS_SLASH,
+    QMARK,
+    QMARK_NO_DOT,
+    STAR,
+    START_ANCHOR
+  } = PLATFORM_CHARS;
+
+  const globstar = (opts) => {
+    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
+  };
+
+  let nodot = opts.dot ? '' : NO_DOT;
+  let star = opts.bash === true ? globstar(opts) : STAR;
+  let qmarkNoDot = opts.dot ? QMARK : QMARK_NO_DOT;
+
+  if (opts.capture) {
+    star = `(${star})`;
+  }
+
+  // minimatch options support
+  if (typeof opts.noext === 'boolean') {
+    opts.noextglob = opts.noext;
+  }
+
+  let state = {
+    index: -1,
+    start: 0,
+    consumed: '',
+    output: '',
+    backtrack: false,
+    brackets: 0,
+    braces: 0,
+    parens: 0,
+    quotes: 0,
+    tokens
+  };
+
+  let extglobs = [];
+  let stack = [];
+  let prev = bos;
+  let value;
+
+  /**
+   * Tokenizing helpers
+   */
+
+  const eos = () => state.index === len - 1;
+  const peek = state.peek = (n = 1) => input[state.index + n];
+  const advance = state.advance = () => input[++state.index];
+  const append = token => {
+    state.output += token.output != null ? token.output : token.value;
+    state.consumed += token.value || '';
+  };
+
+  const increment = type => {
+    state[type]++;
+    stack.push(type);
+  };
+
+  const decrement = type => {
+    state[type]--;
+    stack.pop();
+  };
+
+  /**
+   * Push tokens onto the tokens array. This helper speeds up
+   * tokenizing by 1) helping us avoid backtracking as much as possible,
+   * and 2) helping us avoid creating extra tokens when consecutive
+   * characters are plain text. This improves performance and simplifies
+   * lookbehinds.
+   */
+
+  const push = tok => {
+    if (prev.type === 'globstar') {
+      let isBrace = state.braces > 0 && (tok.type === 'comma' || tok.type === 'brace');
+      let isExtglob = extglobs.length && (tok.type === 'pipe' || tok.type === 'paren');
+      if (tok.type !== 'slash' && tok.type !== 'paren' && !isBrace && !isExtglob) {
+        state.output = state.output.slice(0, -prev.output.length);
+        prev.type = 'star';
+        prev.value = '*';
+        prev.output = star;
+        state.output += prev.output;
+      }
+    }
+
+    if (extglobs.length && tok.type !== 'paren' && !EXTGLOB_CHARS[tok.value]) {
+      extglobs[extglobs.length - 1].inner += tok.value;
+    }
+
+    if (tok.value || tok.output) append(tok);
+    if (prev && prev.type === 'text' && tok.type === 'text') {
+      prev.value += tok.value;
+      return;
+    }
+
+    tok.prev = prev;
+    tokens.push(tok);
+    prev = tok;
+  };
+
+  const extglobOpen = (type, value) => {
+    let token = { ...EXTGLOB_CHARS[value], conditions: 1, inner: '' };
+
+    token.prev = prev;
+    token.parens = state.parens;
+    token.output = state.output;
+    let output = (opts.capture ? '(' : '') + token.open;
+
+    push({ type, value, output: state.output ? '' : ONE_CHAR });
+    push({ type: 'paren', extglob: true, value: advance(), output });
+    increment('parens');
+    extglobs.push(token);
+  };
+
+  const extglobClose = token => {
+    let output = token.close + (opts.capture ? ')' : '');
+
+    if (token.type === 'negate') {
+      let extglobStar = star;
+
+      if (token.inner && token.inner.length > 1 && token.inner.includes('/')) {
+        extglobStar = globstar(opts);
+      }
+
+      if (extglobStar !== star || eos() || /^\)+$/.test(input.slice(state.index + 1))) {
+        output = token.close = ')$))' + extglobStar;
+      }
+
+      if (token.prev.type === 'bos' && eos()) {
+        state.negatedExtglob = true;
+      }
+    }
+
+    push({ type: 'paren', extglob: true, value, output });
+    decrement('parens');
+  };
+
+  if (opts.fastpaths !== false && !/(^[*!]|[/{[()\]}"])/.test(input)) {
+    let backslashes = false;
+
+    let output = input.replace(REGEX_SPECIAL_CHARS_BACKREF, (m, esc, chars, first, rest, index) => {
+      if (first === '\\') {
+        backslashes = true;
+        return m;
+      }
+
+      if (first === '?') {
+        if (esc) {
+          return esc + first + (rest ? QMARK.repeat(rest.length) : '');
+        }
+        if (index === 0) {
+          return qmarkNoDot + (rest ? QMARK.repeat(rest.length) : '');
+        }
+        return QMARK.repeat(chars.length);
+      }
+
+      if (first === '.') {
+        return DOT_LITERAL.repeat(chars.length);
+      }
+
+      if (first === '*') {
+        if (esc) {
+          return esc + first + (rest ? star : '');
+        }
+        return star;
+      }
+      return esc ? m : '\\' + m;
+    });
+
+    if (backslashes === true) {
+      if (opts.unescape === true) {
+        output = output.replace(/\\/g, '');
+      } else {
+        output = output.replace(/\\+/g, m => {
+          return m.length % 2 === 0 ? '\\\\' : (m ? '\\' : '');
+        });
+      }
+    }
+
+    state.output = output;
+    return state;
+  }
+
+  /**
+   * Tokenize input until we reach end-of-string
+   */
+
+  while (!eos()) {
+    value = advance();
+
+    if (value === '\u0000') {
+      continue;
+    }
+
+    /**
+     * Escaped characters
+     */
+
+    if (value === '\\') {
+      let next = peek();
+
+      if (next === '/' && opts.bash !== true) {
+        continue;
+      }
+
+      if (next === '.' || next === ';') {
+        continue;
+      }
+
+      if (!next) {
+        value += '\\';
+        push({ type: 'text', value });
+        continue;
+      }
+
+      // collapse slashes to reduce potential for exploits
+      let match = /^\\+/.exec(input.slice(state.index + 1));
+      let slashes = 0;
+
+      if (match && match[0].length > 2) {
+        slashes = match[0].length;
+        state.index += slashes;
+        if (slashes % 2 !== 0) {
+          value += '\\';
+        }
+      }
+
+      if (opts.unescape === true) {
+        value = advance() || '';
+      } else {
+        value += advance() || '';
+      }
+
+      if (state.brackets === 0) {
+        push({ type: 'text', value });
+        continue;
+      }
+    }
+
+    /**
+     * If we're inside a regex character class, continue
+     * until we reach the closing bracket.
+     */
+
+    if (state.brackets > 0 && (value !== ']' || prev.value === '[' || prev.value === '[^')) {
+      if (opts.posix !== false && value === ':') {
+        let inner = prev.value.slice(1);
+        if (inner.includes('[')) {
+          prev.posix = true;
+
+          if (inner.includes(':')) {
+            let idx = prev.value.lastIndexOf('[');
+            let pre = prev.value.slice(0, idx);
+            let rest = prev.value.slice(idx + 2);
+            let posix = POSIX_REGEX_SOURCE[rest];
+            if (posix) {
+              prev.value = pre + posix;
+              state.backtrack = true;
+              advance();
+
+              if (!bos.output && tokens.indexOf(prev) === 1) {
+                bos.output = ONE_CHAR;
+              }
+              continue;
+            }
+          }
+        }
+      }
+
+      if ((value === '[' && peek() !== ':') || (value === '-' && peek() === ']')) {
+        value = '\\' + value;
+      }
+
+      if (value === ']' && (prev.value === '[' || prev.value === '[^')) {
+        value = '\\' + value;
+      }
+
+      if (opts.posix === true && value === '!' && prev.value === '[') {
+        value = '^';
+      }
+
+      prev.value += value;
+      append({ value });
+      continue;
+    }
+
+    /**
+     * If we're inside a quoted string, continue
+     * until we reach the closing double quote.
+     */
+
+    if (state.quotes === 1 && value !== '"') {
+      value = utils.escapeRegex(value);
+      prev.value += value;
+      append({ value });
+      continue;
+    }
+
+    /**
+     * Double quotes
+     */
+
+    if (value === '"') {
+      state.quotes = state.quotes === 1 ? 0 : 1;
+      if (opts.keepQuotes === true) {
+        push({ type: 'text', value });
+      }
+      continue;
+    }
+
+    /**
+     * Parentheses
+     */
+
+    if (value === '(') {
+      push({ type: 'paren', value });
+      increment('parens');
+      continue;
+    }
+
+    if (value === ')') {
+      if (state.parens === 0 && opts.strictBrackets === true) {
+        throw new SyntaxError(syntaxError('opening', '('));
+      }
+
+      let extglob = extglobs[extglobs.length - 1];
+      if (extglob && state.parens === extglob.parens + 1) {
+        extglobClose(extglobs.pop());
+        continue;
+      }
+
+      push({ type: 'paren', value, output: state.parens ? ')' : '\\)' });
+      decrement('parens');
+      continue;
+    }
+
+    /**
+     * Brackets
+     */
+
+    if (value === '[') {
+      if (opts.nobracket === true || !input.slice(state.index + 1).includes(']')) {
+        if (opts.nobracket !== true && opts.strictBrackets === true) {
+          throw new SyntaxError(syntaxError('closing', ']'));
+        }
+
+        value = '\\' + value;
+      } else {
+        increment('brackets');
+      }
+
+      push({ type: 'bracket', value });
+      continue;
+    }
+
+    if (value === ']') {
+      if (opts.nobracket === true || (prev && prev.type === 'bracket' && prev.value.length === 1)) {
+        push({ type: 'text', value, output: '\\' + value });
+        continue;
+      }
+
+      if (state.brackets === 0) {
+        if (opts.strictBrackets === true) {
+          throw new SyntaxError(syntaxError('opening', '['));
+        }
+
+        push({ type: 'text', value, output: '\\' + value });
+        continue;
+      }
+
+      decrement('brackets');
+
+      let prevValue = prev.value.slice(1);
+      if (prev.posix !== true && prevValue[0] === '^' && !prevValue.includes('/')) {
+        value = '/' + value;
+      }
+
+      prev.value += value;
+      append({ value });
+
+      // when literal brackets are explicitly disabled
+      // assume we should match with a regex character class
+      if (opts.literalBrackets === false || utils.hasRegexChars(prevValue)) {
+        continue;
+      }
+
+      let escaped = utils.escapeRegex(prev.value);
+      state.output = state.output.slice(0, -prev.value.length);
+
+      // when literal brackets are explicitly enabled
+      // assume we should escape the brackets to match literal characters
+      if (opts.literalBrackets === true) {
+        state.output += escaped;
+        prev.value = escaped;
+        continue;
+      }
+
+      // when the user specifies nothing, try to match both
+      prev.value = `(${capture}${escaped}|${prev.value})`;
+      state.output += prev.value;
+      continue;
+    }
+
+    /**
+     * Braces
+     */
+
+    if (value === '{' && opts.nobrace !== true) {
+      push({ type: 'brace', value, output: '(' });
+      increment('braces');
+      continue;
+    }
+
+    if (value === '}') {
+      if (opts.nobrace === true || state.braces === 0) {
+        push({ type: 'text', value, output: '\\' + value });
+        continue;
+      }
+
+      let output = ')';
+
+      if (state.dots === true) {
+        let arr = tokens.slice();
+        let range = [];
+
+        for (let i = arr.length - 1; i >= 0; i--) {
+          tokens.pop();
+          if (arr[i].type === 'brace') {
+            break;
+          }
+          if (arr[i].type !== 'dots') {
+            range.unshift(arr[i].value);
+          }
+        }
+
+        output = expandRange(range, opts);
+        state.backtrack = true;
+      }
+
+      push({ type: 'brace', value, output });
+      decrement('braces');
+      continue;
+    }
+
+    /**
+     * Pipes
+     */
+
+    if (value === '|') {
+      if (extglobs.length > 0) {
+        extglobs[extglobs.length - 1].conditions++;
+      }
+      push({ type: 'text', value });
+      continue;
+    }
+
+    /**
+     * Commas
+     */
+
+    if (value === ',') {
+      let output = value;
+
+      if (state.braces > 0 && stack[stack.length - 1] === 'braces') {
+        output = '|';
+      }
+
+      push({ type: 'comma', value, output });
+      continue;
+    }
+
+    /**
+     * Slashes
+     */
+
+    if (value === '/') {
+      // if the beginning of the glob is "./", advance the start
+      // to the current index, and don't add the "./" characters
+      // to the state. This greatly simplifies lookbehinds when
+      // checking for BOS characters like "!" and "." (not "./")
+      if (prev.type === 'dot' && state.index === 1) {
+        state.start = state.index + 1;
+        state.consumed = '';
+        state.output = '';
+        tokens.pop();
+        prev = bos; // reset "prev" to the first token
+        continue;
+      }
+
+      push({ type: 'slash', value, output: SLASH_LITERAL });
+      continue;
+    }
+
+    /**
+     * Dots
+     */
+
+    if (value === '.') {
+      if (state.braces > 0 && prev.type === 'dot') {
+        if (prev.value === '.') prev.output = DOT_LITERAL;
+        prev.type = 'dots';
+        prev.output += value;
+        prev.value += value;
+        state.dots = true;
+        continue;
+      }
+
+      push({ type: 'dot', value, output: DOT_LITERAL });
+      continue;
+    }
+
+    /**
+     * Question marks
+     */
+
+    if (value === '?') {
+      if (prev && prev.type === 'paren') {
+        let next = peek();
+        let output = value;
+
+        if (next === '<' && !utils.supportsLookbehinds()) {
+          throw new Error('Node.js v10 or higher is required for regex lookbehinds');
+        }
+
+        if (prev.value === '(' && !/[!=<:]/.test(next) || (next === '<' && !/[!=]/.test(peek(2)))) {
+          output = '\\' + value;
+        }
+
+        push({ type: 'text', value, output });
+        continue;
+      }
+
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        extglobOpen('qmark', value);
+        continue;
+      }
+
+      if (opts.dot !== true && (prev.type === 'slash' || prev.type === 'bos')) {
+        push({ type: 'qmark', value, output: QMARK_NO_DOT });
+        continue;
+      }
+
+      push({ type: 'qmark', value, output: QMARK });
+      continue;
+    }
+
+    /**
+     * Exclamation
+     */
+
+    if (value === '!') {
+      if (opts.noextglob !== true && peek() === '(') {
+        if (peek(2) !== '?' || !/[!=<:]/.test(peek(3))) {
+          extglobOpen('negate', value);
+          continue;
+        }
+      }
+
+      if (opts.nonegate !== true && state.index === 0) {
+        negate(state);
+        continue;
+      }
+    }
+
+    /**
+     * Plus
+     */
+
+    if (value === '+') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        extglobOpen('plus', value);
+        continue;
+      }
+
+      if (prev && (prev.type === 'bracket' || prev.type === 'paren' || prev.type === 'brace')) {
+        let output = prev.extglob === true ? '\\' + value : value;
+        push({ type: 'plus', value, output });
+        continue;
+      }
+
+      // use regex behavior inside parens
+      if (state.parens > 0 && opts.regex !== false) {
+        push({ type: 'plus', value });
+        continue;
+      }
+
+      push({ type: 'plus', value: PLUS_LITERAL });
+      continue;
+    }
+
+    /**
+     * Plain text
+     */
+
+    if (value === '@') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        push({ type: 'at', value, output: '' });
+        continue;
+      }
+
+      push({ type: 'text', value });
+      continue;
+    }
+
+    /**
+     * Plain text
+     */
+
+    if (value !== '*') {
+      if (value === '$' || value === '^') {
+        value = '\\' + value;
+      }
+
+      let match = REGEX_NON_SPECIAL_CHAR.exec(input.slice(state.index + 1));
+      if (match) {
+        value += match[0];
+        state.index += match[0].length;
+      }
+
+      push({ type: 'text', value });
+      continue;
+    }
+
+    /**
+     * Stars
+     */
+
+    if (prev && (prev.type === 'globstar' || prev.star === true)) {
+      prev.type = 'star';
+      prev.star = true;
+      prev.value += value;
+      prev.output = star;
+      state.backtrack = true;
+      state.consumed += value;
+      continue;
+    }
+
+    if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+      extglobOpen('star', value);
+      continue;
+    }
+
+    if (prev.type === 'star') {
+      if (opts.noglobstar === true) {
+        state.consumed += value;
+        continue;
+      }
+
+      let prior = prev.prev;
+      let before = prior.prev;
+      let isStart = prior.type === 'slash' || prior.type === 'bos';
+      let afterStar = before && (before.type === 'star' || before.type === 'globstar');
+
+      if (opts.bash === true && (!isStart || (!eos() && peek() !== '/'))) {
+        push({ type: 'star', value, output: '' });
+        continue;
+      }
+
+      let isBrace = state.braces > 0 && (prior.type === 'comma' || prior.type === 'brace');
+      let isExtglob = extglobs.length && (prior.type === 'pipe' || prior.type === 'paren');
+      if (!isStart && prior.type !== 'paren' && !isBrace && !isExtglob) {
+        push({ type: 'star', value, output: '' });
+        continue;
+      }
+
+      // strip consecutive `/**/`
+      while (input.slice(state.index + 1, state.index + 4) === '/**') {
+        let after = input[state.index + 4];
+        if (after && after !== '/') {
+          break;
+        }
+        state.consumed += '/**';
+        state.index += 3;
+      }
+
+      if (prior.type === 'bos' && eos()) {
+        prev.type = 'globstar';
+        prev.value += value;
+        prev.output = globstar(opts);
+        state.output = prev.output;
+        state.consumed += value;
+        continue;
+      }
+
+      if (prior.type === 'slash' && prior.prev.type !== 'bos' && !afterStar && eos()) {
+        state.output = state.output.slice(0, -(prior.output + prev.output).length);
+        prior.output = '(?:' + prior.output;
+
+        prev.type = 'globstar';
+        prev.output = globstar(opts) + '|$)';
+        prev.value += value;
+
+        state.output += prior.output + prev.output;
+        state.consumed += value;
+        continue;
+      }
+
+      let next = peek();
+      if (prior.type === 'slash' && prior.prev.type !== 'bos' && next === '/') {
+        let end = peek(2) !== void 0 ? '|$' : '';
+
+        state.output = state.output.slice(0, -(prior.output + prev.output).length);
+        prior.output = '(?:' + prior.output;
+
+        prev.type = 'globstar';
+        prev.output = `${globstar(opts)}${SLASH_LITERAL}|${SLASH_LITERAL}${end})`;
+        prev.value += value;
+
+        state.output += prior.output + prev.output;
+        state.consumed += value + advance();
+
+        push({ type: 'slash', value, output: '' });
+        continue;
+      }
+
+      if (prior.type === 'bos' && next === '/') {
+        prev.type = 'globstar';
+        prev.value += value;
+        prev.output = `(?:^|${SLASH_LITERAL}|${globstar(opts)}${SLASH_LITERAL})`;
+        state.output = prev.output;
+        state.consumed += value + advance();
+        push({ type: 'slash', value, output: '' });
+        continue;
+      }
+
+      // remove single star from output
+      state.output = state.output.slice(0, -prev.output.length);
+
+      // reset previous token to globstar
+      prev.type = 'globstar';
+      prev.output = globstar(opts);
+      prev.value += value;
+
+      // reset output with globstar
+      state.output += prev.output;
+      state.consumed += value;
+      continue;
+    }
+
+    let token = { type: 'star', value, output: star };
+
+    if (opts.bash === true) {
+      token.output = '.*?';
+      if (prev.type === 'bos' || prev.type === 'slash') {
+        token.output = nodot + token.output;
+      }
+      push(token);
+      continue;
+    }
+
+    if (prev && (prev.type === 'bracket' || prev.type === 'paren') && opts.regex === true) {
+      token.output = value;
+      push(token);
+      continue;
+    }
+
+    if (state.index === state.start || prev.type === 'slash' || prev.type === 'dot') {
+      if (prev.type === 'dot') {
+        state.output += NO_DOT_SLASH;
+        prev.output += NO_DOT_SLASH;
+
+      } else if (opts.dot === true) {
+        state.output += NO_DOTS_SLASH;
+        prev.output += NO_DOTS_SLASH;
+
+      } else {
+        state.output += nodot;
+        prev.output += nodot;
+      }
+
+      if (peek() !== '*') {
+        state.output += ONE_CHAR;
+        prev.output += ONE_CHAR;
+      }
+    }
+
+    push(token);
+  }
+
+  while (state.brackets > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ']'));
+    state.output = utils.escapeLast(state.output, '[');
+    decrement('brackets');
+  }
+
+  while (state.parens > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ')'));
+    state.output = utils.escapeLast(state.output, '(');
+    decrement('parens');
+  }
+
+  while (state.braces > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', '}'));
+    state.output = utils.escapeLast(state.output, '{');
+    decrement('braces');
+  }
+
+  if (opts.strictSlashes !== true && (prev.type === 'star' || prev.type === 'bracket')) {
+    push({ type: 'maybe_slash', value: '', output: `${SLASH_LITERAL}?` });
+  }
+
+  // rebuild the output if we had to backtrack at any point
+  if (state.backtrack === true) {
+    state.output = '';
+
+    for (let token of state.tokens) {
+      state.output += token.output != null ? token.output : token.value;
+
+      if (token.suffix) {
+        state.output += token.suffix;
+      }
+    }
+  }
+
+  return state;
+};
+
+/**
+ * Fast paths for creating regular expressions for common glob patterns.
+ * This can significantly speed up processing and has very little downside
+ * impact when none of the fast paths match.
+ */
+
+parse.fastpaths = (input, options) => {
+  let opts = { ...options };
+  let max = typeof opts.maxLength === 'number' ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+  let len = input.length;
+  if (len > max) {
+    throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
+  }
+
+  input = REPLACEMENTS[input] || input;
+  let win32 = utils.isWindows(options);
+
+  // create constants based on platform, for windows or posix
+  const {
+    DOT_LITERAL,
+    SLASH_LITERAL,
+    ONE_CHAR,
+    DOTS_SLASH,
+    NO_DOT,
+    NO_DOTS,
+    NO_DOTS_SLASH,
+    STAR,
+    START_ANCHOR
+  } = constants.globChars(win32);
+
+  let capture = opts.capture ? '' : '?:';
+  let star = opts.bash === true ? '.*?' : STAR;
+  let nodot = opts.dot ? NO_DOTS : NO_DOT;
+  let slashDot = opts.dot ? NO_DOTS_SLASH : NO_DOT;
+
+  if (opts.capture) {
+    star = `(${star})`;
+  }
+
+  const globstar = (opts) => {
+    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
+  };
+
+  const create = str => {
+    switch (str) {
+      case '*':
+        return `${nodot}${ONE_CHAR}${star}`;
+
+      case '.*':
+        return `${DOT_LITERAL}${ONE_CHAR}${star}`;
+
+      case '*.*':
+        return `${nodot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
+
+      case '*/*':
+        return `${nodot}${star}${SLASH_LITERAL}${ONE_CHAR}${slashDot}${star}`;
+
+      case '**':
+        return nodot + globstar(opts);
+
+      case '**/*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${ONE_CHAR}${star}`;
+
+      case '**/*.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
+
+      case '**/.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${DOT_LITERAL}${ONE_CHAR}${star}`;
+
+      default: {
+        let match = /^(.*?)\.(\w+)$/.exec(str);
+        if (!match) return;
+
+        let source = create(match[1], options);
+        if (!source) return;
+
+        return source + DOT_LITERAL + match[2];
+      }
+    }
+  };
+
+  let output = create(input);
+  if (output && opts.strictSlashes !== true) {
+    output += `${SLASH_LITERAL}?`;
+  }
+
+  return output;
+};
+
+module.exports = parse;
+
+
+/***/ }),
+/* 206 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const merge2 = __webpack_require__(177);
+function merge(streams) {
+    const mergedStream = merge2(streams);
+    streams.forEach((stream) => {
+        stream.once('error', (err) => mergedStream.emit('error', err));
+    });
+    return mergedStream;
+}
+exports.merge = merge;
+
+
+/***/ }),
+/* 207 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(208);
+const provider_1 = __webpack_require__(235);
+class ProviderAsync extends provider_1.default {
+    constructor() {
+        super(...arguments);
+        this._reader = new stream_1.default(this._settings);
+    }
+    read(task) {
+        const root = this._getRootDirectory(task);
+        const options = this._getReaderOptions(task);
+        const entries = [];
+        return new Promise((resolve, reject) => {
+            const stream = this.api(root, task, options);
+            stream.once('error', reject);
+            stream.on('data', (entry) => entries.push(options.transform(entry)));
+            stream.once('end', () => resolve(entries));
+        });
+    }
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
+    }
+}
+exports.default = ProviderAsync;
+
+
+/***/ }),
+/* 208 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(28);
+const fsStat = __webpack_require__(209);
+const fsWalk = __webpack_require__(214);
+const reader_1 = __webpack_require__(234);
+class ReaderStream extends reader_1.default {
+    constructor() {
+        super(...arguments);
+        this._walkStream = fsWalk.walkStream;
+        this._stat = fsStat.stat;
+    }
+    dynamic(root, options) {
+        return this._walkStream(root, options);
+    }
+    static(patterns, options) {
+        const filepaths = patterns.map(this._getFullEntryPath, this);
+        const stream = new stream_1.PassThrough({ objectMode: true });
+        stream._write = (index, _enc, done) => {
+            return this._getEntry(filepaths[index], patterns[index], options)
+                .then((entry) => {
+                if (entry !== null && options.entryFilter(entry)) {
+                    stream.push(entry);
+                }
+                if (index === filepaths.length - 1) {
+                    stream.end();
+                }
+                done();
+            })
+                .catch(done);
+        };
+        for (let i = 0; i < filepaths.length; i++) {
+            stream.write(i);
+        }
+        return stream;
+    }
+    _getEntry(filepath, pattern, options) {
+        return this._getStat(filepath)
+            .then((stats) => this._makeEntry(stats, pattern))
+            .catch((error) => {
+            if (options.errorFilter(error)) {
+                return null;
+            }
+            throw error;
+        });
+    }
+    _getStat(filepath) {
+        return new Promise((resolve, reject) => {
+            this._stat(filepath, this._fsStatSettings, (error, stats) => {
+                error ? reject(error) : resolve(stats);
+            });
+        });
+    }
+}
+exports.default = ReaderStream;
+
+
+/***/ }),
+/* 209 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__(210);
+const sync = __webpack_require__(211);
+const settings_1 = __webpack_require__(212);
+exports.Settings = settings_1.default;
+function stat(path, optionsOrSettingsOrCallback, callback) {
+    if (typeof optionsOrSettingsOrCallback === 'function') {
+        return async.read(path, getSettings(), optionsOrSettingsOrCallback);
+    }
+    async.read(path, getSettings(optionsOrSettingsOrCallback), callback);
+}
+exports.stat = stat;
+function statSync(path, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    return sync.read(path, settings);
+}
+exports.statSync = statSync;
+function getSettings(settingsOrOptions = {}) {
+    if (settingsOrOptions instanceof settings_1.default) {
+        return settingsOrOptions;
+    }
+    return new settings_1.default(settingsOrOptions);
+}
+
+
+/***/ }),
+/* 210 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function read(path, settings, callback) {
+    settings.fs.lstat(path, (lstatError, lstat) => {
+        if (lstatError) {
+            return callFailureCallback(callback, lstatError);
+        }
+        if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
+            return callSuccessCallback(callback, lstat);
+        }
+        settings.fs.stat(path, (statError, stat) => {
+            if (statError) {
+                if (settings.throwErrorOnBrokenSymbolicLink) {
+                    return callFailureCallback(callback, statError);
+                }
+                return callSuccessCallback(callback, lstat);
+            }
+            if (settings.markSymbolicLink) {
+                stat.isSymbolicLink = () => true;
+            }
+            callSuccessCallback(callback, stat);
+        });
+    });
+}
+exports.read = read;
+function callFailureCallback(callback, error) {
+    callback(error);
+}
+function callSuccessCallback(callback, result) {
+    callback(null, result);
+}
+
+
+/***/ }),
+/* 211 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function read(path, settings) {
+    const lstat = settings.fs.lstatSync(path);
+    if (!lstat.isSymbolicLink() || !settings.followSymbolicLink) {
+        return lstat;
+    }
+    try {
+        const stat = settings.fs.statSync(path);
+        if (settings.markSymbolicLink) {
+            stat.isSymbolicLink = () => true;
+        }
+        return stat;
+    }
+    catch (error) {
+        if (!settings.throwErrorOnBrokenSymbolicLink) {
+            return lstat;
+        }
+        throw error;
+    }
+}
+exports.read = read;
+
+
+/***/ }),
+/* 212 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(213);
+class Settings {
+    constructor(_options = {}) {
+        this._options = _options;
+        this.followSymbolicLink = this._getValue(this._options.followSymbolicLink, true);
+        this.fs = fs.createFileSystemAdapter(this._options.fs);
+        this.markSymbolicLink = this._getValue(this._options.markSymbolicLink, false);
+        this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
+    }
+    _getValue(option, value) {
+        return option === undefined ? value : option;
+    }
+}
+exports.default = Settings;
+
+
+/***/ }),
+/* 213 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(23);
+exports.FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    stat: fs.stat,
+    lstatSync: fs.lstatSync,
+    statSync: fs.statSync
+};
+function createFileSystemAdapter(fsMethods) {
+    if (!fsMethods) {
+        return exports.FILE_SYSTEM_ADAPTER;
+    }
+    return Object.assign({}, exports.FILE_SYSTEM_ADAPTER, fsMethods);
+}
+exports.createFileSystemAdapter = createFileSystemAdapter;
+
+
+/***/ }),
+/* 214 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__(215);
+const stream_1 = __webpack_require__(230);
+const sync_1 = __webpack_require__(231);
+const settings_1 = __webpack_require__(233);
+exports.Settings = settings_1.default;
+function walk(dir, optionsOrSettingsOrCallback, callback) {
+    if (typeof optionsOrSettingsOrCallback === 'function') {
+        return new async_1.default(dir, getSettings()).read(optionsOrSettingsOrCallback);
+    }
+    new async_1.default(dir, getSettings(optionsOrSettingsOrCallback)).read(callback);
+}
+exports.walk = walk;
+function walkSync(dir, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    const provider = new sync_1.default(dir, settings);
+    return provider.read();
+}
+exports.walkSync = walkSync;
+function walkStream(dir, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    const provider = new stream_1.default(dir, settings);
+    return provider.read();
+}
+exports.walkStream = walkStream;
+function getSettings(settingsOrOptions = {}) {
+    if (settingsOrOptions instanceof settings_1.default) {
+        return settingsOrOptions;
+    }
+    return new settings_1.default(settingsOrOptions);
+}
+
+
+/***/ }),
+/* 215 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__(216);
+class AsyncProvider {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._reader = new async_1.default(this._root, this._settings);
+        this._storage = new Set();
+    }
+    read(callback) {
+        this._reader.onError((error) => {
+            callFailureCallback(callback, error);
+        });
+        this._reader.onEntry((entry) => {
+            this._storage.add(entry);
+        });
+        this._reader.onEnd(() => {
+            callSuccessCallback(callback, Array.from(this._storage));
+        });
+        this._reader.read();
+    }
+}
+exports.default = AsyncProvider;
+function callFailureCallback(callback, error) {
+    callback(error);
+}
+function callSuccessCallback(callback, entries) {
+    callback(null, entries);
+}
+
+
+/***/ }),
+/* 216 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = __webpack_require__(46);
+const fsScandir = __webpack_require__(217);
+const fastq = __webpack_require__(226);
+const common = __webpack_require__(228);
+const reader_1 = __webpack_require__(229);
+class AsyncReader extends reader_1.default {
+    constructor(_root, _settings) {
+        super(_root, _settings);
+        this._settings = _settings;
+        this._scandir = fsScandir.scandir;
+        this._emitter = new events_1.EventEmitter();
+        this._queue = fastq(this._worker.bind(this), this._settings.concurrency);
+        this._isFatalError = false;
+        this._isDestroyed = false;
+        this._queue.drain = () => {
+            if (!this._isFatalError) {
+                this._emitter.emit('end');
+            }
+        };
+    }
+    read() {
+        this._isFatalError = false;
+        this._isDestroyed = false;
+        setImmediate(() => {
+            this._pushToQueue(this._root, this._settings.basePath);
+        });
+        return this._emitter;
+    }
+    destroy() {
+        if (this._isDestroyed) {
+            throw new Error('The reader is already destroyed');
+        }
+        this._isDestroyed = true;
+        this._queue.killAndDrain();
+    }
+    onEntry(callback) {
+        this._emitter.on('entry', callback);
+    }
+    onError(callback) {
+        this._emitter.once('error', callback);
+    }
+    onEnd(callback) {
+        this._emitter.once('end', callback);
+    }
+    _pushToQueue(dir, base) {
+        const queueItem = { dir, base };
+        this._queue.push(queueItem, (error) => {
+            if (error) {
+                this._handleError(error);
+            }
+        });
+    }
+    _worker(item, done) {
+        this._scandir(item.dir, this._settings.fsScandirSettings, (error, entries) => {
+            if (error) {
+                return done(error, undefined);
+            }
+            for (const entry of entries) {
+                this._handleEntry(entry, item.base);
+            }
+            done(null, undefined);
+        });
+    }
+    _handleError(error) {
+        if (!common.isFatalError(this._settings, error)) {
+            return;
+        }
+        this._isFatalError = true;
+        this._isDestroyed = true;
+        this._emitter.emit('error', error);
+    }
+    _handleEntry(entry, base) {
+        if (this._isDestroyed || this._isFatalError) {
+            return;
+        }
+        const fullpath = entry.path;
+        if (base !== undefined) {
+            entry.path = common.joinPathSegments(base, entry.name, this._settings.pathSegmentSeparator);
+        }
+        if (common.isAppliedFilter(this._settings.entryFilter, entry)) {
+            this._emitEntry(entry);
+        }
+        if (entry.dirent.isDirectory() && common.isAppliedFilter(this._settings.deepFilter, entry)) {
+            this._pushToQueue(fullpath, entry.path);
+        }
+    }
+    _emitEntry(entry) {
+        this._emitter.emit('entry', entry);
+    }
+}
+exports.default = AsyncReader;
+
+
+/***/ }),
+/* 217 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__(218);
+const sync = __webpack_require__(223);
+const settings_1 = __webpack_require__(224);
+exports.Settings = settings_1.default;
+function scandir(path, optionsOrSettingsOrCallback, callback) {
+    if (typeof optionsOrSettingsOrCallback === 'function') {
+        return async.read(path, getSettings(), optionsOrSettingsOrCallback);
+    }
+    async.read(path, getSettings(optionsOrSettingsOrCallback), callback);
+}
+exports.scandir = scandir;
+function scandirSync(path, optionsOrSettings) {
+    const settings = getSettings(optionsOrSettings);
+    return sync.read(path, settings);
+}
+exports.scandirSync = scandirSync;
+function getSettings(settingsOrOptions = {}) {
+    if (settingsOrOptions instanceof settings_1.default) {
+        return settingsOrOptions;
+    }
+    return new settings_1.default(settingsOrOptions);
+}
+
+
+/***/ }),
+/* 218 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__(209);
+const rpl = __webpack_require__(219);
+const constants_1 = __webpack_require__(220);
+const utils = __webpack_require__(221);
+function read(dir, settings, callback) {
+    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
+        return readdirWithFileTypes(dir, settings, callback);
+    }
+    return readdir(dir, settings, callback);
+}
+exports.read = read;
+function readdirWithFileTypes(dir, settings, callback) {
+    settings.fs.readdir(dir, { withFileTypes: true }, (readdirError, dirents) => {
+        if (readdirError) {
+            return callFailureCallback(callback, readdirError);
+        }
+        const entries = dirents.map((dirent) => ({
+            dirent,
+            name: dirent.name,
+            path: `${dir}${settings.pathSegmentSeparator}${dirent.name}`
+        }));
+        if (!settings.followSymbolicLinks) {
+            return callSuccessCallback(callback, entries);
+        }
+        const tasks = entries.map((entry) => makeRplTaskEntry(entry, settings));
+        rpl(tasks, (rplError, rplEntries) => {
+            if (rplError) {
+                return callFailureCallback(callback, rplError);
+            }
+            callSuccessCallback(callback, rplEntries);
+        });
+    });
+}
+exports.readdirWithFileTypes = readdirWithFileTypes;
+function makeRplTaskEntry(entry, settings) {
+    return (done) => {
+        if (!entry.dirent.isSymbolicLink()) {
+            return done(null, entry);
+        }
+        settings.fs.stat(entry.path, (statError, stats) => {
+            if (statError) {
+                if (settings.throwErrorOnBrokenSymbolicLink) {
+                    return done(statError);
+                }
+                return done(null, entry);
+            }
+            entry.dirent = utils.fs.createDirentFromStats(entry.name, stats);
+            return done(null, entry);
+        });
+    };
+}
+function readdir(dir, settings, callback) {
+    settings.fs.readdir(dir, (readdirError, names) => {
+        if (readdirError) {
+            return callFailureCallback(callback, readdirError);
+        }
+        const filepaths = names.map((name) => `${dir}${settings.pathSegmentSeparator}${name}`);
+        const tasks = filepaths.map((filepath) => {
+            return (done) => fsStat.stat(filepath, settings.fsStatSettings, done);
+        });
+        rpl(tasks, (rplError, results) => {
+            if (rplError) {
+                return callFailureCallback(callback, rplError);
+            }
+            const entries = [];
+            for (let index = 0; index < names.length; index++) {
+                const name = names[index];
+                const stats = results[index];
+                const entry = {
+                    name,
+                    path: filepaths[index],
+                    dirent: utils.fs.createDirentFromStats(name, stats)
+                };
+                if (settings.stats) {
+                    entry.stats = stats;
+                }
+                entries.push(entry);
+            }
+            callSuccessCallback(callback, entries);
+        });
+    });
+}
+exports.readdir = readdir;
+function callFailureCallback(callback, error) {
+    callback(error);
+}
+function callSuccessCallback(callback, result) {
+    callback(null, result);
+}
+
+
+/***/ }),
+/* 219 */
+/***/ (function(module, exports) {
+
+module.exports = runParallel
+
+function runParallel (tasks, cb) {
+  var results, pending, keys
+  var isSync = true
+
+  if (Array.isArray(tasks)) {
+    results = []
+    pending = tasks.length
+  } else {
+    keys = Object.keys(tasks)
+    results = {}
+    pending = keys.length
+  }
+
+  function done (err) {
+    function end () {
+      if (cb) cb(err, results)
+      cb = null
+    }
+    if (isSync) process.nextTick(end)
+    else end()
+  }
+
+  function each (i, err, result) {
+    results[i] = result
+    if (--pending === 0 || err) {
+      done(err)
+    }
+  }
+
+  if (!pending) {
+    // empty
+    done(null)
+  } else if (keys) {
+    // object
+    keys.forEach(function (key) {
+      tasks[key](function (err, result) { each(key, err, result) })
+    })
+  } else {
+    // array
+    tasks.forEach(function (task, i) {
+      task(function (err, result) { each(i, err, result) })
+    })
+  }
+
+  isSync = false
+}
+
+
+/***/ }),
+/* 220 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const NODE_PROCESS_VERSION_PARTS = process.versions.node.split('.');
+const MAJOR_VERSION = parseInt(NODE_PROCESS_VERSION_PARTS[0], 10);
+const MINOR_VERSION = parseInt(NODE_PROCESS_VERSION_PARTS[1], 10);
+/**
+ * IS `true` for Node.js 10.10 and greater.
+ */
+exports.IS_SUPPORT_READDIR_WITH_FILE_TYPES = MAJOR_VERSION > 10 || (MAJOR_VERSION === 10 && MINOR_VERSION >= 10);
+
+
+/***/ }),
+/* 221 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(222);
+exports.fs = fs;
+
+
+/***/ }),
+/* 222 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+class DirentFromStats {
+    constructor(name, stats) {
+        this.name = name;
+        this.isBlockDevice = stats.isBlockDevice.bind(stats);
+        this.isCharacterDevice = stats.isCharacterDevice.bind(stats);
+        this.isDirectory = stats.isDirectory.bind(stats);
+        this.isFIFO = stats.isFIFO.bind(stats);
+        this.isFile = stats.isFile.bind(stats);
+        this.isSocket = stats.isSocket.bind(stats);
+        this.isSymbolicLink = stats.isSymbolicLink.bind(stats);
+    }
+}
+function createDirentFromStats(name, stats) {
+    return new DirentFromStats(name, stats);
+}
+exports.createDirentFromStats = createDirentFromStats;
+
+
+/***/ }),
+/* 223 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__(209);
+const constants_1 = __webpack_require__(220);
+const utils = __webpack_require__(221);
+function read(dir, settings) {
+    if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
+        return readdirWithFileTypes(dir, settings);
+    }
+    return readdir(dir, settings);
+}
+exports.read = read;
+function readdirWithFileTypes(dir, settings) {
+    const dirents = settings.fs.readdirSync(dir, { withFileTypes: true });
+    return dirents.map((dirent) => {
+        const entry = {
+            dirent,
+            name: dirent.name,
+            path: `${dir}${settings.pathSegmentSeparator}${dirent.name}`
+        };
+        if (entry.dirent.isSymbolicLink() && settings.followSymbolicLinks) {
+            try {
+                const stats = settings.fs.statSync(entry.path);
+                entry.dirent = utils.fs.createDirentFromStats(entry.name, stats);
+            }
+            catch (error) {
+                if (settings.throwErrorOnBrokenSymbolicLink) {
+                    throw error;
+                }
+            }
+        }
+        return entry;
+    });
+}
+exports.readdirWithFileTypes = readdirWithFileTypes;
+function readdir(dir, settings) {
+    const names = settings.fs.readdirSync(dir);
+    return names.map((name) => {
+        const entryPath = `${dir}${settings.pathSegmentSeparator}${name}`;
+        const stats = fsStat.statSync(entryPath, settings.fsStatSettings);
+        const entry = {
+            name,
+            path: entryPath,
+            dirent: utils.fs.createDirentFromStats(name, stats)
+        };
+        if (settings.stats) {
+            entry.stats = stats;
+        }
+        return entry;
+    });
+}
+exports.readdir = readdir;
+
+
+/***/ }),
+/* 224 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const fsStat = __webpack_require__(209);
+const fs = __webpack_require__(225);
+class Settings {
+    constructor(_options = {}) {
+        this._options = _options;
+        this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false);
+        this.fs = fs.createFileSystemAdapter(this._options.fs);
+        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path.sep);
+        this.stats = this._getValue(this._options.stats, false);
+        this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
+        this.fsStatSettings = new fsStat.Settings({
+            followSymbolicLink: this.followSymbolicLinks,
+            fs: this.fs,
+            throwErrorOnBrokenSymbolicLink: this.throwErrorOnBrokenSymbolicLink
+        });
+    }
+    _getValue(option, value) {
+        return option === undefined ? value : option;
+    }
+}
+exports.default = Settings;
+
+
+/***/ }),
+/* 225 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(23);
+exports.FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    stat: fs.stat,
+    lstatSync: fs.lstatSync,
+    statSync: fs.statSync,
+    readdir: fs.readdir,
+    readdirSync: fs.readdirSync
+};
+function createFileSystemAdapter(fsMethods) {
+    if (!fsMethods) {
+        return exports.FILE_SYSTEM_ADAPTER;
+    }
+    return Object.assign({}, exports.FILE_SYSTEM_ADAPTER, fsMethods);
+}
+exports.createFileSystemAdapter = createFileSystemAdapter;
+
+
+/***/ }),
+/* 226 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var reusify = __webpack_require__(227)
+
+function fastqueue (context, worker, concurrency) {
+  if (typeof context === 'function') {
+    concurrency = worker
+    worker = context
+    context = null
+  }
+
+  var cache = reusify(Task)
+  var queueHead = null
+  var queueTail = null
+  var _running = 0
+
+  var self = {
+    push: push,
+    drain: noop,
+    saturated: noop,
+    pause: pause,
+    paused: false,
+    concurrency: concurrency,
+    running: running,
+    resume: resume,
+    idle: idle,
+    length: length,
+    unshift: unshift,
+    empty: noop,
+    kill: kill,
+    killAndDrain: killAndDrain
+  }
+
+  return self
+
+  function running () {
+    return _running
+  }
+
+  function pause () {
+    self.paused = true
+  }
+
+  function length () {
+    var current = queueHead
+    var counter = 0
+
+    while (current) {
+      current = current.next
+      counter++
+    }
+
+    return counter
+  }
+
+  function resume () {
+    if (!self.paused) return
+    self.paused = false
+    for (var i = 0; i < self.concurrency; i++) {
+      _running++
+      release()
+    }
+  }
+
+  function idle () {
+    return _running === 0 && self.length() === 0
+  }
+
+  function push (value, done) {
+    var current = cache.get()
+
+    current.context = context
+    current.release = release
+    current.value = value
+    current.callback = done || noop
+
+    if (_running === self.concurrency || self.paused) {
+      if (queueTail) {
+        queueTail.next = current
+        queueTail = current
+      } else {
+        queueHead = current
+        queueTail = current
+        self.saturated()
+      }
+    } else {
+      _running++
+      worker.call(context, current.value, current.worked)
+    }
+  }
+
+  function unshift (value, done) {
+    var current = cache.get()
+
+    current.context = context
+    current.release = release
+    current.value = value
+    current.callback = done || noop
+
+    if (_running === self.concurrency || self.paused) {
+      if (queueHead) {
+        current.next = queueHead
+        queueHead = current
+      } else {
+        queueHead = current
+        queueTail = current
+        self.saturated()
+      }
+    } else {
+      _running++
+      worker.call(context, current.value, current.worked)
+    }
+  }
+
+  function release (holder) {
+    if (holder) {
+      cache.release(holder)
+    }
+    var next = queueHead
+    if (next) {
+      if (!self.paused) {
+        if (queueTail === queueHead) {
+          queueTail = null
+        }
+        queueHead = next.next
+        next.next = null
+        worker.call(context, next.value, next.worked)
+        if (queueTail === null) {
+          self.empty()
+        }
+      } else {
+        _running--
+      }
+    } else if (--_running === 0) {
+      self.drain()
+    }
+  }
+
+  function kill () {
+    queueHead = null
+    queueTail = null
+    self.drain = noop
+  }
+
+  function killAndDrain () {
+    queueHead = null
+    queueTail = null
+    self.drain()
+    self.drain = noop
+  }
+}
+
+function noop () {}
+
+function Task () {
+  this.value = null
+  this.callback = noop
+  this.next = null
+  this.release = noop
+  this.context = null
+
+  var self = this
+
+  this.worked = function worked (err, result) {
+    var callback = self.callback
+    self.value = null
+    self.callback = noop
+    callback.call(self.context, err, result)
+    self.release(self)
+  }
+}
+
+module.exports = fastqueue
+
+
+/***/ }),
+/* 227 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+function reusify (Constructor) {
+  var head = new Constructor()
+  var tail = head
+
+  function get () {
+    var current = head
+
+    if (current.next) {
+      head = current.next
+    } else {
+      head = new Constructor()
+      tail = head
+    }
+
+    current.next = null
+
+    return current
+  }
+
+  function release (obj) {
+    tail.next = obj
+    tail = obj
+  }
+
+  return {
+    get: get,
+    release: release
+  }
+}
+
+module.exports = reusify
+
+
+/***/ }),
+/* 228 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function isFatalError(settings, error) {
+    if (settings.errorFilter === null) {
+        return true;
+    }
+    return !settings.errorFilter(error);
+}
+exports.isFatalError = isFatalError;
+function isAppliedFilter(filter, value) {
+    return filter === null || filter(value);
+}
+exports.isAppliedFilter = isAppliedFilter;
+function replacePathSegmentSeparator(filepath, separator) {
+    return filepath.split(/[\\\/]/).join(separator);
+}
+exports.replacePathSegmentSeparator = replacePathSegmentSeparator;
+function joinPathSegments(a, b, separator) {
+    if (a === '') {
+        return b;
+    }
+    return a + separator + b;
+}
+exports.joinPathSegments = joinPathSegments;
+
+
+/***/ }),
+/* 229 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const common = __webpack_require__(228);
+class Reader {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._root = common.replacePathSegmentSeparator(_root, _settings.pathSegmentSeparator);
+    }
+}
+exports.default = Reader;
+
+
+/***/ }),
+/* 230 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(28);
+const async_1 = __webpack_require__(216);
+class StreamProvider {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._reader = new async_1.default(this._root, this._settings);
+        this._stream = new stream_1.Readable({
+            objectMode: true,
+            read: () => { },
+            destroy: this._reader.destroy.bind(this._reader)
+        });
+    }
+    read() {
+        this._reader.onError((error) => {
+            this._stream.emit('error', error);
+        });
+        this._reader.onEntry((entry) => {
+            this._stream.push(entry);
+        });
+        this._reader.onEnd(() => {
+            this._stream.push(null);
+        });
+        this._reader.read();
+        return this._stream;
+    }
+}
+exports.default = StreamProvider;
+
+
+/***/ }),
+/* 231 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__(232);
+class SyncProvider {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._reader = new sync_1.default(this._root, this._settings);
+    }
+    read() {
+        return this._reader.read();
+    }
+}
+exports.default = SyncProvider;
+
+
+/***/ }),
+/* 232 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsScandir = __webpack_require__(217);
+const common = __webpack_require__(228);
+const reader_1 = __webpack_require__(229);
+class SyncReader extends reader_1.default {
+    constructor() {
+        super(...arguments);
+        this._scandir = fsScandir.scandirSync;
+        this._storage = new Set();
+        this._queue = new Set();
+    }
+    read() {
+        this._pushToQueue(this._root, this._settings.basePath);
+        this._handleQueue();
+        return Array.from(this._storage);
+    }
+    _pushToQueue(dir, base) {
+        this._queue.add({ dir, base });
+    }
+    _handleQueue() {
+        for (const item of this._queue.values()) {
+            this._handleDirectory(item.dir, item.base);
+        }
+    }
+    _handleDirectory(dir, base) {
+        try {
+            const entries = this._scandir(dir, this._settings.fsScandirSettings);
+            for (const entry of entries) {
+                this._handleEntry(entry, base);
+            }
+        }
+        catch (error) {
+            this._handleError(error);
+        }
+    }
+    _handleError(error) {
+        if (!common.isFatalError(this._settings, error)) {
+            return;
+        }
+        throw error;
+    }
+    _handleEntry(entry, base) {
+        const fullpath = entry.path;
+        if (base !== undefined) {
+            entry.path = common.joinPathSegments(base, entry.name, this._settings.pathSegmentSeparator);
+        }
+        if (common.isAppliedFilter(this._settings.entryFilter, entry)) {
+            this._pushToStorage(entry);
+        }
+        if (entry.dirent.isDirectory() && common.isAppliedFilter(this._settings.deepFilter, entry)) {
+            this._pushToQueue(fullpath, entry.path);
+        }
+    }
+    _pushToStorage(entry) {
+        this._storage.add(entry);
+    }
+}
+exports.default = SyncReader;
+
+
+/***/ }),
+/* 233 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const fsScandir = __webpack_require__(217);
+class Settings {
+    constructor(_options = {}) {
+        this._options = _options;
+        this.basePath = this._getValue(this._options.basePath, undefined);
+        this.concurrency = this._getValue(this._options.concurrency, Infinity);
+        this.deepFilter = this._getValue(this._options.deepFilter, null);
+        this.entryFilter = this._getValue(this._options.entryFilter, null);
+        this.errorFilter = this._getValue(this._options.errorFilter, null);
+        this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path.sep);
+        this.fsScandirSettings = new fsScandir.Settings({
+            followSymbolicLinks: this._options.followSymbolicLinks,
+            fs: this._options.fs,
+            pathSegmentSeparator: this._options.pathSegmentSeparator,
+            stats: this._options.stats,
+            throwErrorOnBrokenSymbolicLink: this._options.throwErrorOnBrokenSymbolicLink
+        });
+    }
+    _getValue(option, value) {
+        return option === undefined ? value : option;
+    }
+}
+exports.default = Settings;
+
+
+/***/ }),
+/* 234 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const fsStat = __webpack_require__(209);
+const utils = __webpack_require__(180);
+class Reader {
+    constructor(_settings) {
+        this._settings = _settings;
+        this._fsStatSettings = new fsStat.Settings({
+            followSymbolicLink: this._settings.followSymbolicLinks,
+            fs: this._settings.fs,
+            throwErrorOnBrokenSymbolicLink: this._settings.followSymbolicLinks
+        });
+    }
+    _getFullEntryPath(filepath) {
+        return path.resolve(this._settings.cwd, filepath);
+    }
+    _makeEntry(stats, pattern) {
+        const entry = {
+            name: pattern,
+            path: pattern,
+            dirent: utils.fs.createDirentFromStats(pattern, stats)
+        };
+        if (this._settings.stats) {
+            entry.stats = stats;
+        }
+        return entry;
+    }
+    _isFatalError(error) {
+        return !utils.errno.isEnoentCodeError(error) && !this._settings.suppressErrors;
+    }
+}
+exports.default = Reader;
+
+
+/***/ }),
+/* 235 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const deep_1 = __webpack_require__(236);
+const entry_1 = __webpack_require__(237);
+const error_1 = __webpack_require__(238);
+const entry_2 = __webpack_require__(239);
+class Provider {
+    constructor(_settings) {
+        this._settings = _settings;
+        this.errorFilter = new error_1.default(this._settings);
+        this.entryFilter = new entry_1.default(this._settings, this._getMicromatchOptions());
+        this.deepFilter = new deep_1.default(this._settings, this._getMicromatchOptions());
+        this.entryTransformer = new entry_2.default(this._settings);
+    }
+    _getRootDirectory(task) {
+        return path.resolve(this._settings.cwd, task.base);
+    }
+    _getReaderOptions(task) {
+        const basePath = task.base === '.' ? '' : task.base;
+        return {
+            basePath,
+            pathSegmentSeparator: '/',
+            concurrency: this._settings.concurrency,
+            deepFilter: this.deepFilter.getFilter(basePath, task.positive, task.negative),
+            entryFilter: this.entryFilter.getFilter(task.positive, task.negative),
+            errorFilter: this.errorFilter.getFilter(),
+            followSymbolicLinks: this._settings.followSymbolicLinks,
+            fs: this._settings.fs,
+            stats: this._settings.stats,
+            throwErrorOnBrokenSymbolicLink: this._settings.throwErrorOnBrokenSymbolicLink,
+            transform: this.entryTransformer.getTransformer()
+        };
+    }
+    _getMicromatchOptions() {
+        return {
+            dot: this._settings.dot,
+            matchBase: this._settings.baseNameMatch,
+            nobrace: !this._settings.braceExpansion,
+            nocase: !this._settings.caseSensitiveMatch,
+            noext: !this._settings.extglob,
+            noglobstar: !this._settings.globstar,
+            posix: true,
+            strictSlashes: false
+        };
+    }
+}
+exports.default = Provider;
+
+
+/***/ }),
+/* 236 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(180);
+class DeepFilter {
+    constructor(_settings, _micromatchOptions) {
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
+    }
+    getFilter(basePath, positive, negative) {
+        const maxPatternDepth = this._getMaxPatternDepth(positive);
+        const negativeRe = this._getNegativePatternsRe(negative);
+        return (entry) => this._filter(basePath, entry, negativeRe, maxPatternDepth);
+    }
+    _getMaxPatternDepth(patterns) {
+        const globstar = patterns.some(utils.pattern.hasGlobStar);
+        return globstar ? Infinity : utils.pattern.getMaxNaivePatternsDepth(patterns);
+    }
+    _getNegativePatternsRe(patterns) {
+        const affectDepthOfReadingPatterns = patterns.filter(utils.pattern.isAffectDepthOfReadingPattern);
+        return utils.pattern.convertPatternsToRe(affectDepthOfReadingPatterns, this._micromatchOptions);
+    }
+    _filter(basePath, entry, negativeRe, maxPatternDepth) {
+        const depth = this._getEntryDepth(basePath, entry.path);
+        if (this._isSkippedByDeep(depth)) {
+            return false;
+        }
+        if (this._isSkippedByMaxPatternDepth(depth, maxPatternDepth)) {
+            return false;
+        }
+        if (this._isSkippedSymbolicLink(entry)) {
+            return false;
+        }
+        if (this._isSkippedDotDirectory(entry)) {
+            return false;
+        }
+        return this._isSkippedByNegativePatterns(entry, negativeRe);
+    }
+    _getEntryDepth(basePath, entryPath) {
+        const basePathDepth = basePath.split('/').length;
+        const entryPathDepth = entryPath.split('/').length;
+        return entryPathDepth - (basePath === '' ? 0 : basePathDepth);
+    }
+    _isSkippedByDeep(entryDepth) {
+        return entryDepth >= this._settings.deep;
+    }
+    _isSkippedByMaxPatternDepth(entryDepth, maxPatternDepth) {
+        return !this._settings.baseNameMatch && maxPatternDepth !== Infinity && entryDepth > maxPatternDepth;
+    }
+    _isSkippedSymbolicLink(entry) {
+        return !this._settings.followSymbolicLinks && entry.dirent.isSymbolicLink();
+    }
+    _isSkippedDotDirectory(entry) {
+        return !this._settings.dot && entry.name.startsWith('.');
+    }
+    _isSkippedByNegativePatterns(entry, negativeRe) {
+        return !utils.pattern.matchAny(entry.path, negativeRe);
+    }
+}
+exports.default = DeepFilter;
+
+
+/***/ }),
+/* 237 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(180);
+class EntryFilter {
+    constructor(_settings, _micromatchOptions) {
+        this._settings = _settings;
+        this._micromatchOptions = _micromatchOptions;
+        this.index = new Map();
+    }
+    getFilter(positive, negative) {
+        const positiveRe = utils.pattern.convertPatternsToRe(positive, this._micromatchOptions);
+        const negativeRe = utils.pattern.convertPatternsToRe(negative, this._micromatchOptions);
+        return (entry) => this._filter(entry, positiveRe, negativeRe);
+    }
+    _filter(entry, positiveRe, negativeRe) {
+        if (this._settings.unique) {
+            if (this._isDuplicateEntry(entry)) {
+                return false;
+            }
+            this._createIndexRecord(entry);
+        }
+        if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
+            return false;
+        }
+        if (this._isSkippedByAbsoluteNegativePatterns(entry, negativeRe)) {
+            return false;
+        }
+        const filepath = this._settings.baseNameMatch ? entry.name : entry.path;
+        return this._isMatchToPatterns(filepath, positiveRe) && !this._isMatchToPatterns(entry.path, negativeRe);
+    }
+    _isDuplicateEntry(entry) {
+        return this.index.has(entry.path);
+    }
+    _createIndexRecord(entry) {
+        this.index.set(entry.path, undefined);
+    }
+    _onlyFileFilter(entry) {
+        return this._settings.onlyFiles && !entry.dirent.isFile();
+    }
+    _onlyDirectoryFilter(entry) {
+        return this._settings.onlyDirectories && !entry.dirent.isDirectory();
+    }
+    _isSkippedByAbsoluteNegativePatterns(entry, negativeRe) {
+        if (!this._settings.absolute) {
+            return false;
+        }
+        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entry.path);
+        return this._isMatchToPatterns(fullpath, negativeRe);
+    }
+    _isMatchToPatterns(filepath, patternsRe) {
+        return utils.pattern.matchAny(filepath, patternsRe);
+    }
+}
+exports.default = EntryFilter;
+
+
+/***/ }),
+/* 238 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(180);
+class ErrorFilter {
+    constructor(_settings) {
+        this._settings = _settings;
+    }
+    getFilter() {
+        return (error) => this._isNonFatalError(error);
+    }
+    _isNonFatalError(error) {
+        return utils.errno.isEnoentCodeError(error) || this._settings.suppressErrors;
+    }
+}
+exports.default = ErrorFilter;
+
+
+/***/ }),
+/* 239 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(180);
+class EntryTransformer {
+    constructor(_settings) {
+        this._settings = _settings;
+    }
+    getTransformer() {
+        return (entry) => this._transform(entry);
+    }
+    _transform(entry) {
+        let filepath = entry.path;
+        if (this._settings.absolute) {
+            filepath = utils.path.makeAbsolute(this._settings.cwd, filepath);
+            filepath = utils.path.unixify(filepath);
+        }
+        if (this._settings.markDirectories && entry.dirent.isDirectory()) {
+            filepath += '/';
+        }
+        if (!this._settings.objectMode) {
+            return filepath;
+        }
+        return Object.assign({}, entry, { path: filepath });
+    }
+}
+exports.default = EntryTransformer;
+
+
+/***/ }),
+/* 240 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(28);
+const stream_2 = __webpack_require__(208);
+const provider_1 = __webpack_require__(235);
+class ProviderStream extends provider_1.default {
+    constructor() {
+        super(...arguments);
+        this._reader = new stream_2.default(this._settings);
+    }
+    read(task) {
+        const root = this._getRootDirectory(task);
+        const options = this._getReaderOptions(task);
+        const source = this.api(root, task, options);
+        const dest = new stream_1.Readable({ objectMode: true, read: () => { } });
+        source
+            .once('error', (error) => dest.emit('error', error))
+            .on('data', (entry) => dest.emit('data', options.transform(entry)))
+            .once('end', () => dest.emit('end'));
+        return dest;
+    }
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
+    }
+}
+exports.default = ProviderStream;
+
+
+/***/ }),
+/* 241 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__(242);
+const provider_1 = __webpack_require__(235);
+class ProviderSync extends provider_1.default {
+    constructor() {
+        super(...arguments);
+        this._reader = new sync_1.default(this._settings);
+    }
+    read(task) {
+        const root = this._getRootDirectory(task);
+        const options = this._getReaderOptions(task);
+        const entries = this.api(root, task, options);
+        return entries.map(options.transform);
+    }
+    api(root, task, options) {
+        if (task.dynamic) {
+            return this._reader.dynamic(root, options);
+        }
+        return this._reader.static(task.patterns, options);
+    }
+}
+exports.default = ProviderSync;
+
+
+/***/ }),
+/* 242 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__(209);
+const fsWalk = __webpack_require__(214);
+const reader_1 = __webpack_require__(234);
+class ReaderSync extends reader_1.default {
+    constructor() {
+        super(...arguments);
+        this._walkSync = fsWalk.walkSync;
+        this._statSync = fsStat.statSync;
+    }
+    dynamic(root, options) {
+        return this._walkSync(root, options);
+    }
+    static(patterns, options) {
+        const entries = [];
+        for (const pattern of patterns) {
+            const filepath = this._getFullEntryPath(pattern);
+            const entry = this._getEntry(filepath, pattern, options);
+            if (entry === null || !options.entryFilter(entry)) {
+                continue;
+            }
+            entries.push(entry);
+        }
+        return entries;
+    }
+    _getEntry(filepath, pattern, options) {
+        try {
+            const stats = this._getStat(filepath);
+            return this._makeEntry(stats, pattern);
+        }
+        catch (error) {
+            if (options.errorFilter(error)) {
+                return null;
+            }
+            throw error;
+        }
+    }
+    _getStat(filepath) {
+        return this._statSync(filepath, this._fsStatSettings);
+    }
+}
+exports.default = ReaderSync;
+
+
+/***/ }),
+/* 243 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(23);
+const os = __webpack_require__(11);
+const CPU_COUNT = os.cpus().length;
+exports.DEFAULT_FILE_SYSTEM_ADAPTER = {
+    lstat: fs.lstat,
+    lstatSync: fs.lstatSync,
+    stat: fs.stat,
+    statSync: fs.statSync,
+    readdir: fs.readdir,
+    readdirSync: fs.readdirSync
+};
+// tslint:enable no-redundant-jsdoc
+class Settings {
+    constructor(_options = {}) {
+        this._options = _options;
+        this.absolute = this._getValue(this._options.absolute, false);
+        this.baseNameMatch = this._getValue(this._options.baseNameMatch, false);
+        this.braceExpansion = this._getValue(this._options.braceExpansion, true);
+        this.caseSensitiveMatch = this._getValue(this._options.caseSensitiveMatch, true);
+        this.concurrency = this._getValue(this._options.concurrency, CPU_COUNT);
+        this.cwd = this._getValue(this._options.cwd, process.cwd());
+        this.deep = this._getValue(this._options.deep, Infinity);
+        this.dot = this._getValue(this._options.dot, false);
+        this.extglob = this._getValue(this._options.extglob, true);
+        this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, true);
+        this.fs = this._getFileSystemMethods(this._options.fs);
+        this.globstar = this._getValue(this._options.globstar, true);
+        this.ignore = this._getValue(this._options.ignore, []);
+        this.markDirectories = this._getValue(this._options.markDirectories, false);
+        this.objectMode = this._getValue(this._options.objectMode, false);
+        this.onlyDirectories = this._getValue(this._options.onlyDirectories, false);
+        this.onlyFiles = this._getValue(this._options.onlyFiles, true);
+        this.stats = this._getValue(this._options.stats, false);
+        this.suppressErrors = this._getValue(this._options.suppressErrors, false);
+        this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, false);
+        this.unique = this._getValue(this._options.unique, true);
+        if (this.onlyDirectories) {
+            this.onlyFiles = false;
+        }
+        if (this.stats) {
+            this.objectMode = true;
+        }
+    }
+    _getValue(option, value) {
+        return option === undefined ? value : option;
+    }
+    _getFileSystemMethods(methods = {}) {
+        return Object.assign({}, exports.DEFAULT_FILE_SYSTEM_ADAPTER, methods);
+    }
+}
+exports.default = Settings;
+
+
+/***/ }),
+/* 244 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const path = __webpack_require__(16);
+const pathType = __webpack_require__(245);
+
+const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
+
+const getPath = (filepath, cwd) => {
+	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
+	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
+};
+
+const addExtensions = (file, extensions) => {
+	if (path.extname(file)) {
+		return `**/${file}`;
+	}
+
+	return `**/${file}.${getExtensions(extensions)}`;
+};
+
+const getGlob = (directory, options) => {
+	if (options.files && !Array.isArray(options.files)) {
+		throw new TypeError(`Expected \`files\` to be of type \`Array\` but received type \`${typeof options.files}\``);
+	}
+
+	if (options.extensions && !Array.isArray(options.extensions)) {
+		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof options.extensions}\``);
+	}
+
+	if (options.files && options.extensions) {
+		return options.files.map(x => path.posix.join(directory, addExtensions(x, options.extensions)));
+	}
+
+	if (options.files) {
+		return options.files.map(x => path.posix.join(directory, `**/${x}`));
+	}
+
+	if (options.extensions) {
+		return [path.posix.join(directory, `**/*.${getExtensions(options.extensions)}`)];
+	}
+
+	return [path.posix.join(directory, '**')];
+};
+
+module.exports = async (input, options) => {
+	options = {
+		cwd: process.cwd(),
+		...options
+	};
+
+	if (typeof options.cwd !== 'string') {
+		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
+	}
+
+	const globs = await Promise.all([].concat(input).map(async x => {
+		const isDirectory = await pathType.isDirectory(getPath(x, options.cwd));
+		return isDirectory ? getGlob(x, options) : x;
+	}));
+
+	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
+};
+
+module.exports.sync = (input, options) => {
+	options = {
+		cwd: process.cwd(),
+		...options
+	};
+
+	if (typeof options.cwd !== 'string') {
+		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
+	}
+
+	const globs = [].concat(input).map(x => pathType.isDirectorySync(getPath(x, options.cwd)) ? getGlob(x, options) : x);
+
+	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
+};
+
+
+/***/ }),
+/* 245 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {promisify} = __webpack_require__(29);
+const fs = __webpack_require__(23);
+
+async function isType(fsStatType, statsMethodName, filePath) {
+	if (typeof filePath !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof filePath}`);
+	}
+
+	try {
+		const stats = await promisify(fs[fsStatType])(filePath);
+		return stats[statsMethodName]();
+	} catch (error) {
+		if (error.code === 'ENOENT') {
+			return false;
+		}
+
+		throw error;
+	}
+}
+
+function isTypeSync(fsStatType, statsMethodName, filePath) {
+	if (typeof filePath !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof filePath}`);
+	}
+
+	try {
+		return fs[fsStatType](filePath)[statsMethodName]();
+	} catch (error) {
+		if (error.code === 'ENOENT') {
+			return false;
+		}
+
+		throw error;
+	}
+}
+
+exports.isFile = isType.bind(null, 'stat', 'isFile');
+exports.isDirectory = isType.bind(null, 'stat', 'isDirectory');
+exports.isSymlink = isType.bind(null, 'lstat', 'isSymbolicLink');
+exports.isFileSync = isTypeSync.bind(null, 'statSync', 'isFile');
+exports.isDirectorySync = isTypeSync.bind(null, 'statSync', 'isDirectory');
+exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink');
+
+
+/***/ }),
+/* 246 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {promisify} = __webpack_require__(29);
+const fs = __webpack_require__(23);
+const path = __webpack_require__(16);
+const fastGlob = __webpack_require__(178);
+const gitIgnore = __webpack_require__(247);
+const slash = __webpack_require__(248);
+
+const DEFAULT_IGNORE = [
+	'**/node_modules/**',
+	'**/flow-typed/**',
+	'**/coverage/**',
+	'**/.git'
+];
+
+const readFileP = promisify(fs.readFile);
+
+const mapGitIgnorePatternTo = base => ignore => {
+	if (ignore.startsWith('!')) {
+		return '!' + path.posix.join(base, ignore.slice(1));
+	}
+
+	return path.posix.join(base, ignore);
+};
+
+const parseGitIgnore = (content, options) => {
+	const base = slash(path.relative(options.cwd, path.dirname(options.fileName)));
+
+	return content
+		.split(/\r?\n/)
+		.filter(Boolean)
+		.filter(line => !line.startsWith('#'))
+		.map(mapGitIgnorePatternTo(base));
+};
+
+const reduceIgnore = files => {
+	return files.reduce((ignores, file) => {
+		ignores.add(parseGitIgnore(file.content, {
+			cwd: file.cwd,
+			fileName: file.filePath
+		}));
+		return ignores;
+	}, gitIgnore());
+};
+
+const ensureAbsolutePathForCwd = (cwd, p) => {
+	if (path.isAbsolute(p)) {
+		if (p.startsWith(cwd)) {
+			return p;
+		}
+
+		throw new Error(`Path ${p} is not in cwd ${cwd}`);
+	}
+
+	return path.join(cwd, p);
+};
+
+const getIsIgnoredPredecate = (ignores, cwd) => {
+	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p))));
+};
+
+const getFile = async (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = await readFileP(filePath, 'utf8');
+
+	return {
+		cwd,
+		filePath,
+		content
+	};
+};
+
+const getFileSync = (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = fs.readFileSync(filePath, 'utf8');
+
+	return {
+		cwd,
+		filePath,
+		content
+	};
+};
+
+const normalizeOptions = ({
+	ignore = [],
+	cwd = process.cwd()
+} = {}) => {
+	return {ignore, cwd};
+};
+
+module.exports = async options => {
+	options = normalizeOptions(options);
+
+	const paths = await fastGlob('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	});
+
+	const files = await Promise.all(paths.map(file => getFile(file, options.cwd)));
+	const ignores = reduceIgnore(files);
+
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
+
+module.exports.sync = options => {
+	options = normalizeOptions(options);
+
+	const paths = fastGlob.sync('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	});
+
+	const files = paths.map(file => getFileSync(file, options.cwd));
+	const ignores = reduceIgnore(files);
+
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
+
+
+/***/ }),
+/* 247 */
+/***/ (function(module, exports) {
+
+// A simple implementation of make-array
+function makeArray (subject) {
+  return Array.isArray(subject)
+    ? subject
+    : [subject]
+}
+
+const REGEX_TEST_BLANK_LINE = /^\s+$/
+const REGEX_REPLACE_LEADING_EXCAPED_EXCLAMATION = /^\\!/
+const REGEX_REPLACE_LEADING_EXCAPED_HASH = /^\\#/
+const REGEX_SPLITALL_CRLF = /\r?\n/g
+// /foo,
+// ./foo,
+// ../foo,
+// .
+// ..
+const REGEX_TEST_INVALID_PATH = /^\.*\/|^\.+$/
+
+const SLASH = '/'
+const KEY_IGNORE = typeof Symbol !== 'undefined'
+  ? Symbol.for('node-ignore')
+  /* istanbul ignore next */
+  : 'node-ignore'
+
+const define = (object, key, value) =>
+  Object.defineProperty(object, key, {value})
+
+const REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g
+
+// Sanitize the range of a regular expression
+// The cases are complicated, see test cases for details
+const sanitizeRange = range => range.replace(
+  REGEX_REGEXP_RANGE,
+  (match, from, to) => from.charCodeAt(0) <= to.charCodeAt(0)
+    ? match
+    // Invalid range (out of order) which is ok for gitignore rules but
+    //   fatal for JavaScript regular expression, so eliminate it.
+    : ''
+)
+
+// > If the pattern ends with a slash,
+// > it is removed for the purpose of the following description,
+// > but it would only find a match with a directory.
+// > In other words, foo/ will match a directory foo and paths underneath it,
+// > but will not match a regular file or a symbolic link foo
+// >  (this is consistent with the way how pathspec works in general in Git).
+// '`foo/`' will not match regular file '`foo`' or symbolic link '`foo`'
+// -> ignore-rules will not deal with it, because it costs extra `fs.stat` call
+//      you could use option `mark: true` with `glob`
+
+// '`foo/`' should not continue with the '`..`'
+const DEFAULT_REPLACER_PREFIX = [
+
+  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
+  [
+    // (a\ ) -> (a )
+    // (a  ) -> (a)
+    // (a \ ) -> (a  )
+    /\\?\s+$/,
+    match => match.indexOf('\\') === 0
+      ? ' '
+      : ''
+  ],
+
+  // replace (\ ) with ' '
+  [
+    /\\\s/g,
+    () => ' '
+  ],
+
+  // Escape metacharacters
+  // which is written down by users but means special for regular expressions.
+
+  // > There are 12 characters with special meanings:
+  // > - the backslash \,
+  // > - the caret ^,
+  // > - the dollar sign $,
+  // > - the period or dot .,
+  // > - the vertical bar or pipe symbol |,
+  // > - the question mark ?,
+  // > - the asterisk or star *,
+  // > - the plus sign +,
+  // > - the opening parenthesis (,
+  // > - the closing parenthesis ),
+  // > - and the opening square bracket [,
+  // > - the opening curly brace {,
+  // > These special characters are often called "metacharacters".
+  [
+    /[\\^$.|*+(){]/g,
+    match => `\\${match}`
+  ],
+
+  [
+    // > [abc] matches any character inside the brackets
+    // >    (in this case a, b, or c);
+    /\[([^\]/]*)($|\])/g,
+    (match, p1, p2) => p2 === ']'
+      ? `[${sanitizeRange(p1)}]`
+      : `\\${match}`
+  ],
+
+  [
+    // > a question mark (?) matches a single character
+    /(?!\\)\?/g,
+    () => '[^/]'
+  ],
+
+  // leading slash
+  [
+
+    // > A leading slash matches the beginning of the pathname.
+    // > For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c".
+    // A leading slash matches the beginning of the pathname
+    /^\//,
+    () => '^'
+  ],
+
+  // replace special metacharacter slash after the leading slash
+  [
+    /\//g,
+    () => '\\/'
+  ],
+
+  [
+    // > A leading "**" followed by a slash means match in all directories.
+    // > For example, "**/foo" matches file or directory "foo" anywhere,
+    // > the same as pattern "foo".
+    // > "**/foo/bar" matches file or directory "bar" anywhere that is directly
+    // >   under directory "foo".
+    // Notice that the '*'s have been replaced as '\\*'
+    /^\^*\\\*\\\*\\\//,
+
+    // '**/foo' <-> 'foo'
+    () => '^(?:.*\\/)?'
+  ]
+]
+
+const DEFAULT_REPLACER_SUFFIX = [
+  // starting
+  [
+    // there will be no leading '/'
+    //   (which has been replaced by section "leading slash")
+    // If starts with '**', adding a '^' to the regular expression also works
+    /^(?=[^^])/,
+    function startingReplacer () {
+      return !/\/(?!$)/.test(this)
+        // > If the pattern does not contain a slash /,
+        // >   Git treats it as a shell glob pattern
+        // Actually, if there is only a trailing slash,
+        //   git also treats it as a shell glob pattern
+        ? '(?:^|\\/)'
+
+        // > Otherwise, Git treats the pattern as a shell glob suitable for
+        // >   consumption by fnmatch(3)
+        : '^'
+    }
+  ],
+
+  // two globstars
+  [
+    // Use lookahead assertions so that we could match more than one `'/**'`
+    /\\\/\\\*\\\*(?=\\\/|$)/g,
+
+    // Zero, one or several directories
+    // should not use '*', or it will be replaced by the next replacer
+
+    // Check if it is not the last `'/**'`
+    (_, index, str) => index + 6 < str.length
+
+      // case: /**/
+      // > A slash followed by two consecutive asterisks then a slash matches
+      // >   zero or more directories.
+      // > For example, "a/**/b" matches "a/b", "a/x/b", "a/x/y/b" and so on.
+      // '/**/'
+      ? '(?:\\/[^\\/]+)*'
+
+      // case: /**
+      // > A trailing `"/**"` matches everything inside.
+
+      // #21: everything inside but it should not include the current folder
+      : '\\/.+'
+  ],
+
+  // intermediate wildcards
+  [
+    // Never replace escaped '*'
+    // ignore rule '\*' will match the path '*'
+
+    // 'abc.*/' -> go
+    // 'abc.*'  -> skip this rule
+    /(^|[^\\]+)\\\*(?=.+)/g,
+
+    // '*.js' matches '.js'
+    // '*.js' doesn't match 'abc'
+    (_, p1) => `${p1}[^\\/]*`
+  ],
+
+  // trailing wildcard
+  [
+    /(\^|\\\/)?\\\*$/,
+    (_, p1) => {
+      const prefix = p1
+        // '\^':
+        // '/*' does not match ''
+        // '/*' does not match everything
+
+        // '\\\/':
+        // 'abc/*' does not match 'abc/'
+        ? `${p1}[^/]+`
+
+        // 'a*' matches 'a'
+        // 'a*' matches 'aa'
+        : '[^/]*'
+
+      return `${prefix}(?=$|\\/$)`
+    }
+  ],
+
+  [
+    // unescape
+    /\\\\\\/g,
+    () => '\\'
+  ]
+]
+
+const POSITIVE_REPLACERS = [
+  ...DEFAULT_REPLACER_PREFIX,
+
+  // 'f'
+  // matches
+  // - /f(end)
+  // - /f/
+  // - (start)f(end)
+  // - (start)f/
+  // doesn't match
+  // - oof
+  // - foo
+  // pseudo:
+  // -> (^|/)f(/|$)
+
+  // ending
+  [
+    // 'js' will not match 'js.'
+    // 'ab' will not match 'abc'
+    /(?:[^*/])$/,
+
+    // 'js*' will not match 'a.js'
+    // 'js/' will not match 'a.js'
+    // 'js' will match 'a.js' and 'a.js/'
+    match => `${match}(?=$|\\/)`
+  ],
+
+  ...DEFAULT_REPLACER_SUFFIX
+]
+
+const NEGATIVE_REPLACERS = [
+  ...DEFAULT_REPLACER_PREFIX,
+
+  // #24, #38
+  // The MISSING rule of [gitignore docs](https://git-scm.com/docs/gitignore)
+  // A negative pattern without a trailing wildcard should not
+  // re-include the things inside that directory.
+
+  // eg:
+  // ['node_modules/*', '!node_modules']
+  // should ignore `node_modules/a.js`
+  [
+    /(?:[^*])$/,
+    match => `${match}(?=$|\\/$)`
+  ],
+
+  ...DEFAULT_REPLACER_SUFFIX
+]
+
+// A simple cache, because an ignore rule only has only one certain meaning
+const regexCache = Object.create(null)
+
+// @param {pattern}
+const makeRegex = (pattern, negative, ignorecase) => {
+  const r = regexCache[pattern]
+  if (r) {
+    return r
+  }
+
+  const replacers = negative
+    ? NEGATIVE_REPLACERS
+    : POSITIVE_REPLACERS
+
+  const source = replacers.reduce(
+    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
+    pattern
+  )
+
+  return regexCache[pattern] = ignorecase
+    ? new RegExp(source, 'i')
+    : new RegExp(source)
+}
 
-  if (!rootPkgJson.workspaces) {
-    return [];
-  }
+const isString = subject => typeof subject === 'string'
 
-  const workspacesPathsPatterns = rootPkgJson.workspaces.packages;
-  let workspaceProjectsPaths = [];
+// > A blank line matches no files, so it can serve as a separator for readability.
+const checkPattern = pattern => pattern
+  && isString(pattern)
+  && !REGEX_TEST_BLANK_LINE.test(pattern)
 
-  for (const pattern of workspacesPathsPatterns) {
-    workspaceProjectsPaths = workspaceProjectsPaths.concat((await packagesFromGlobPattern({
-      pattern,
-      rootPath
-    })));
-  } // Filter out exclude glob patterns
+  // > A line starting with # serves as a comment.
+  && pattern.indexOf('#') !== 0
 
+const splitPattern = pattern => pattern.split(REGEX_SPLITALL_CRLF)
 
-  for (const pattern of workspacesPathsPatterns) {
-    if (pattern.startsWith('!')) {
-      const pathToRemove = path__WEBPACK_IMPORTED_MODULE_1___default.a.join(rootPath, pattern.slice(1), 'package.json');
-      workspaceProjectsPaths = workspaceProjectsPaths.filter(p => p !== pathToRemove);
-    }
+class IgnoreRule {
+  constructor (
+    origin,
+    pattern,
+    negative,
+    regex
+  ) {
+    this.origin = origin
+    this.pattern = pattern
+    this.negative = negative
+    this.regex = regex
   }
-
-  return workspaceProjectsPaths;
 }
-async function copyWorkspacePackages(rootPath) {
-  const projectPaths = Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])(rootPath, {});
-  const projects = await Object(_projects__WEBPACK_IMPORTED_MODULE_6__["getProjects"])(rootPath, projectPaths);
 
-  for (const project of projects.values()) {
-    const dest = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(rootPath, 'node_modules', project.name);
+const createRule = (pattern, ignorecase) => {
+  const origin = pattern
+  let negative = false
 
-    if ((await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["isSymlink"])(dest)) === false) {
-      continue;
-    } // Remove the symlink
+  // > An optional prefix "!" which negates the pattern;
+  if (pattern.indexOf('!') === 0) {
+    negative = true
+    pattern = pattern.substr(1)
+  }
 
+  pattern = pattern
+  // > Put a backslash ("\") in front of the first "!" for patterns that
+  // >   begin with a literal "!", for example, `"\!important!.txt"`.
+  .replace(REGEX_REPLACE_LEADING_EXCAPED_EXCLAMATION, '!')
+  // > Put a backslash ("\") in front of the first hash for patterns that
+  // >   begin with a hash.
+  .replace(REGEX_REPLACE_LEADING_EXCAPED_HASH, '#')
 
-    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["unlink"])(dest); // Copy in the package
+  const regex = makeRegex(pattern, negative, ignorecase)
 
-    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["copyDirectory"])(project.path, dest);
-  }
+  return new IgnoreRule(
+    origin,
+    pattern,
+    negative,
+    regex
+  )
 }
 
-function packagesFromGlobPattern({
-  pattern,
-  rootPath
-}) {
-  const globOptions = {
-    cwd: rootPath,
-    // Should throw in case of unusual errors when reading the file system
-    strict: true,
-    // Always returns absolute paths for matched files
-    absolute: true,
-    // Do not match ** against multiple filenames
-    // (This is only specified because we currently don't have a need for it.)
-    noglobstar: true
-  };
-  return glob(path__WEBPACK_IMPORTED_MODULE_1___default.a.join(pattern, 'package.json'), globOptions);
+const throwError = (message, Ctor) => {
+  throw new Ctor(message)
 }
 
-/***/ }),
-/* 164 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return getProjectPaths; });
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/*
- * 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.
- */
-
-
-/**
- * Returns all the paths where plugins are located
- */
-function getProjectPaths(rootPath, options = {}) {
-  const skipKibanaPlugins = Boolean(options['skip-kibana-plugins']);
-  const ossOnly = Boolean(options.oss);
-  const projectPaths = [rootPath, Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'packages/*')]; // This is needed in order to install the dependencies for the declared
-  // plugin functional used in the selenium functional tests.
-  // As we are now using the webpack dll for the client vendors dependencies
-  // when we run the plugin functional tests against the distributable
-  // dependencies used by such plugins like @eui, react and react-dom can't
-  // be loaded from the dll as the context is different from the one declared
-  // into the webpack dll reference plugin.
-  // In anyway, have a plugin declaring their own dependencies is the
-  // correct and the expect behavior.
-
-  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/plugin_functional/plugins/*'));
-  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'test/interpreter_functional/plugins/*'));
+const checkPath = (path, originalPath, doThrow) => {
+  if (!isString(path)) {
+    return doThrow(
+      `path must be a string, but got \`${originalPath}\``,
+      TypeError
+    )
+  }
 
-  if (!ossOnly) {
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'x-pack/legacy/plugins/*'));
+  // We don't know if we should ignore '', so throw
+  if (!path) {
+    return doThrow(`path must not be empty`, TypeError)
   }
 
-  if (!skipKibanaPlugins) {
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*/packages/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, '../kibana-extra/*/plugins/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*/packages/*'));
-    projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'plugins/*/plugins/*'));
+  // Check if it is a relative path
+  if (checkPath.isNotRelative(path)) {
+    const r = '`path.relative()`d'
+    return doThrow(
+      `path should be a ${r} string, but got "${originalPath}"`,
+      RangeError
+    )
   }
 
-  return projectPaths;
+  return true
 }
 
-/***/ }),
-/* 165 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CleanCommand", function() { return CleanCommand; });
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(166);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(181);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-
-
-
-
-const CleanCommand = {
-  description: 'Remove the node_modules and target directories from all projects.',
-  name: 'clean',
-
-  async run(projects) {
-    const toDelete = [];
+const isNotRelative = path => REGEX_TEST_INVALID_PATH.test(path)
 
-    for (const project of projects.values()) {
-      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isDirectory"])(project.nodeModulesLocation)) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.nodeModulesLocation)
-        });
-      }
+checkPath.isNotRelative = isNotRelative
+checkPath.convert = p => p
 
-      if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_4__["isDirectory"])(project.targetLocation)) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.targetLocation)
-        });
-      }
+class Ignore {
+  constructor ({
+    ignorecase = true
+  } = {}) {
+    this._rules = []
+    this._ignorecase = ignorecase
+    define(this, KEY_IGNORE, true)
+    this._initCache()
+  }
 
-      const {
-        extraPatterns
-      } = project.getCleanConfig();
+  _initCache () {
+    this._ignoreCache = Object.create(null)
+    this._testCache = Object.create(null)
+  }
 
-      if (extraPatterns) {
-        toDelete.push({
-          cwd: project.path,
-          pattern: extraPatterns
-        });
-      }
+  _addPattern (pattern) {
+    // #32
+    if (pattern && pattern[KEY_IGNORE]) {
+      this._rules = this._rules.concat(pattern._rules)
+      this._added = true
+      return
     }
 
-    if (toDelete.length === 0) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold.green('\n\nNothing to delete'));
-    } else {
-      _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold.red('\n\nDeleting:\n'));
-      /**
-       * In order to avoid patterns like `/build` in packages from accidentally
-       * impacting files outside the package we use `process.chdir()` to change
-       * the cwd to the package and execute `del()` without the `force` option
-       * so it will check that each file being deleted is within the package.
-       *
-       * `del()` does support a `cwd` option, but it's only for resolving the
-       * patterns and does not impact the cwd check.
-       */
-
-      const originalCwd = process.cwd();
-
-      try {
-        for (const _ref of toDelete) {
-          const {
-            pattern,
-            cwd
-          } = _ref;
-          process.chdir(cwd);
-          const promise = del__WEBPACK_IMPORTED_MODULE_1___default()(pattern);
-          ora__WEBPACK_IMPORTED_MODULE_2___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_3__["join"])(cwd, String(pattern))));
-          await promise;
-        }
-      } finally {
-        process.chdir(originalCwd);
-      }
+    if (checkPattern(pattern)) {
+      const rule = createRule(pattern, this._ignorecase)
+      this._added = true
+      this._rules.push(rule)
     }
   }
 
-};
-
-/***/ }),
-/* 166 */
-/***/ (function(module, exports, __webpack_require__) {
+  // @param {Array<string> | string | Ignore} pattern
+  add (pattern) {
+    this._added = false
 
-"use strict";
+    makeArray(
+      isString(pattern)
+        ? splitPattern(pattern)
+        : pattern
+    ).forEach(this._addPattern, this)
 
-const path = __webpack_require__(16);
-const globby = __webpack_require__(167);
-const isPathCwd = __webpack_require__(174);
-const isPathInCwd = __webpack_require__(175);
-const pify = __webpack_require__(178);
-const rimraf = __webpack_require__(179);
-const pMap = __webpack_require__(180);
+    // Some rules have just added to the ignore,
+    // making the behavior changed.
+    if (this._added) {
+      this._initCache()
+    }
 
-const rimrafP = pify(rimraf);
+    return this
+  }
 
-function safeCheck(file) {
-	if (isPathCwd(file)) {
-		throw new Error('Cannot delete the current working directory. Can be overridden with the `force` option.');
-	}
+  // legacy
+  addPattern (pattern) {
+    return this.add(pattern)
+  }
 
-	if (!isPathInCwd(file)) {
-		throw new Error('Cannot delete files/folders outside the current working directory. Can be overridden with the `force` option.');
-	}
-}
+  //          |           ignored : unignored
+  // negative |   0:0   |   0:1   |   1:0   |   1:1
+  // -------- | ------- | ------- | ------- | --------
+  //     0    |  TEST   |  TEST   |  SKIP   |    X
+  //     1    |  TESTIF |  SKIP   |  TEST   |    X
 
-const del = (patterns, options) => {
-	options = Object.assign({}, options);
+  // - SKIP: always skip
+  // - TEST: always test
+  // - TESTIF: only test if checkUnignored
+  // - X: that never happen
 
-	const {force, dryRun} = options;
-	delete options.force;
-	delete options.dryRun;
+  // @param {boolean} whether should check if the path is unignored,
+  //   setting `checkUnignored` to `false` could reduce additional
+  //   path matching.
 
-	const mapper = file => {
-		if (!force) {
-			safeCheck(file);
-		}
+  // @returns {TestResult} true if a file is ignored
+  _testOne (path, checkUnignored) {
+    let ignored = false
+    let unignored = false
 
-		file = path.resolve(options.cwd || '', file);
+    this._rules.forEach(rule => {
+      const {negative} = rule
+      if (
+        unignored === negative && ignored !== unignored
+        || negative && !ignored && !unignored && !checkUnignored
+      ) {
+        return
+      }
 
-		if (dryRun) {
-			return file;
-		}
+      const matched = rule.regex.test(path)
 
-		return rimrafP(file, {glob: false}).then(() => file);
-	};
+      if (matched) {
+        ignored = !negative
+        unignored = negative
+      }
+    })
 
-	return globby(patterns, options).then(files => pMap(files, mapper, options));
-};
+    return {
+      ignored,
+      unignored
+    }
+  }
 
-module.exports = del;
-// TODO: Remove this for the next major release
-module.exports.default = del;
+  // @returns {TestResult}
+  _test (originalPath, cache, checkUnignored, slices) {
+    const path = originalPath
+      // Supports nullable path
+      && checkPath.convert(originalPath)
 
-module.exports.sync = (patterns, options) => {
-	options = Object.assign({}, options);
+    checkPath(path, originalPath, throwError)
 
-	const {force, dryRun} = options;
-	delete options.force;
-	delete options.dryRun;
+    return this._t(path, cache, checkUnignored, slices)
+  }
 
-	return globby.sync(patterns, options).map(file => {
-		if (!force) {
-			safeCheck(file);
-		}
+  _t (path, cache, checkUnignored, slices) {
+    if (path in cache) {
+      return cache[path]
+    }
 
-		file = path.resolve(options.cwd || '', file);
+    if (!slices) {
+      // path/to/a.js
+      // ['path', 'to', 'a.js']
+      slices = path.split(SLASH)
+    }
 
-		if (!dryRun) {
-			rimraf.sync(file, {glob: false});
-		}
+    slices.pop()
 
-		return file;
-	});
-};
+    // If the path has no parent directory, just test it
+    if (!slices.length) {
+      return cache[path] = this._testOne(path, checkUnignored)
+    }
 
+    const parent = this._t(
+      slices.join(SLASH) + SLASH,
+      cache,
+      checkUnignored,
+      slices
+    )
 
-/***/ }),
-/* 167 */
-/***/ (function(module, exports, __webpack_require__) {
+    // If the path contains a parent directory, check the parent first
+    return cache[path] = parent.ignored
+      // > It is not possible to re-include a file if a parent directory of
+      // >   that file is excluded.
+      ? parent
+      : this._testOne(path, checkUnignored)
+  }
 
-"use strict";
+  ignores (path) {
+    return this._test(path, this._ignoreCache, false).ignored
+  }
 
-var Promise = __webpack_require__(168);
-var arrayUnion = __webpack_require__(170);
-var objectAssign = __webpack_require__(172);
-var glob = __webpack_require__(37);
-var pify = __webpack_require__(173);
+  createFilter () {
+    return path => !this.ignores(path)
+  }
 
-var globP = pify(glob, Promise).bind(glob);
+  filter (paths) {
+    return makeArray(paths).filter(this.createFilter())
+  }
 
-function isNegative(pattern) {
-	return pattern[0] === '!';
+  // @returns {TestResult}
+  test (path) {
+    return this._test(path, this._testCache, true)
+  }
 }
 
-function isString(value) {
-	return typeof value === 'string';
-}
+const factory = options => new Ignore(options)
 
-function assertPatternsInput(patterns) {
-	if (!patterns.every(isString)) {
-		throw new TypeError('patterns must be a string or an array of strings');
-	}
-}
+const returnFalse = () => false
 
-function generateGlobTasks(patterns, opts) {
-	patterns = [].concat(patterns);
-	assertPatternsInput(patterns);
+const isPathValid = path =>
+  checkPath(path && checkPath.convert(path), path, returnFalse)
 
-	var globTasks = [];
+factory.isPathValid = isPathValid
 
-	opts = objectAssign({
-		cache: Object.create(null),
-		statCache: Object.create(null),
-		realpathCache: Object.create(null),
-		symlinks: Object.create(null),
-		ignore: []
-	}, opts);
+// Fixes typescript
+factory.default = factory
 
-	patterns.forEach(function (pattern, i) {
-		if (isNegative(pattern)) {
-			return;
-		}
+module.exports = factory
 
-		var ignore = patterns.slice(i).filter(isNegative).map(function (pattern) {
-			return pattern.slice(1);
-		});
+// Windows
+// --------------------------------------------------------------
+/* istanbul ignore if  */
+if (
+  // Detect `process` so that it can run in browsers.
+  typeof process !== 'undefined'
+  && (
+    process.env && process.env.IGNORE_TEST_WIN32
+    || process.platform === 'win32'
+  )
+) {
+  /* eslint no-control-regex: "off" */
+  const makePosix = str => /^\\\\\?\\/.test(str)
+  || /["<>|\u0000-\u001F]+/u.test(str)
+    ? str
+    : str.replace(/\\/g, '/')
 
-		globTasks.push({
-			pattern: pattern,
-			opts: objectAssign({}, opts, {
-				ignore: opts.ignore.concat(ignore)
-			})
-		});
-	});
+  checkPath.convert = makePosix
 
-	return globTasks;
+  // 'C:\\foo'     <- 'C:\\foo' has been converted to 'C:/'
+  // 'd:\\foo'
+  const REGIX_IS_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i
+  checkPath.isNotRelative = path =>
+    REGIX_IS_WINDOWS_PATH_ABSOLUTE.test(path)
+    || isNotRelative(path)
 }
 
-module.exports = function (patterns, opts) {
-	var globTasks;
-
-	try {
-		globTasks = generateGlobTasks(patterns, opts);
-	} catch (err) {
-		return Promise.reject(err);
-	}
-
-	return Promise.all(globTasks.map(function (task) {
-		return globP(task.pattern, task.opts);
-	})).then(function (paths) {
-		return arrayUnion.apply(null, paths);
-	});
-};
-
-module.exports.sync = function (patterns, opts) {
-	var globTasks = generateGlobTasks(patterns, opts);
-
-	return globTasks.reduce(function (matches, task) {
-		return arrayUnion(matches, glob.sync(task.pattern, task.opts));
-	}, []);
-};
-
-module.exports.generateGlobTasks = generateGlobTasks;
-
-module.exports.hasMagic = function (patterns, opts) {
-	return [].concat(patterns).some(function (pattern) {
-		return glob.hasMagic(pattern, opts);
-	});
-};
-
 
 /***/ }),
-/* 168 */
+/* 248 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+module.exports = path => {
+	const isExtendedLengthPath = /^\\\\\?\\/.test(path);
+	const hasNonAscii = /[^\u0000-\u0080]+/.test(path); // eslint-disable-line no-control-regex
 
-module.exports = typeof Promise === 'function' ? Promise : __webpack_require__(169);
+	if (isExtendedLengthPath || hasNonAscii) {
+		return path;
+	}
+
+	return path.replace(/\\/g, '/');
+};
 
 
 /***/ }),
-/* 169 */
+/* 249 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const {Transform} = __webpack_require__(28);
 
-var PENDING = 'pending';
-var SETTLED = 'settled';
-var FULFILLED = 'fulfilled';
-var REJECTED = 'rejected';
-var NOOP = function () {};
-var isNode = typeof global !== 'undefined' && typeof global.process !== 'undefined' && typeof global.process.emit === 'function';
-
-var asyncSetTimer = typeof setImmediate === 'undefined' ? setTimeout : setImmediate;
-var asyncQueue = [];
-var asyncTimer;
-
-function asyncFlush() {
-	// run promise callbacks
-	for (var i = 0; i < asyncQueue.length; i++) {
-		asyncQueue[i][0](asyncQueue[i][1]);
+class ObjectTransform extends Transform {
+	constructor() {
+		super({
+			objectMode: true
+		});
 	}
-
-	// reset async asyncQueue
-	asyncQueue = [];
-	asyncTimer = false;
 }
 
-function asyncCall(callback, arg) {
-	asyncQueue.push([callback, arg]);
+class FilterStream extends ObjectTransform {
+	constructor(filter) {
+		super();
+		this._filter = filter;
+	}
+
+	_transform(data, encoding, callback) {
+		if (this._filter(data)) {
+			this.push(data);
+		}
 
-	if (!asyncTimer) {
-		asyncTimer = true;
-		asyncSetTimer(asyncFlush, 0);
+		callback();
 	}
 }
 
-function invokeResolver(resolver, promise) {
-	function resolvePromise(value) {
-		resolve(promise, value);
+class UniqueStream extends ObjectTransform {
+	constructor() {
+		super();
+		this._pushed = new Set();
 	}
 
-	function rejectPromise(reason) {
-		reject(promise, reason);
-	}
+	_transform(data, encoding, callback) {
+		if (!this._pushed.has(data)) {
+			this.push(data);
+			this._pushed.add(data);
+		}
 
-	try {
-		resolver(resolvePromise, rejectPromise);
-	} catch (e) {
-		rejectPromise(e);
+		callback();
 	}
 }
 
-function invokeCallback(subscriber) {
-	var owner = subscriber.owner;
-	var settled = owner._state;
-	var value = owner._data;
-	var callback = subscriber[settled];
-	var promise = subscriber.then;
+module.exports = {
+	FilterStream,
+	UniqueStream
+};
 
-	if (typeof callback === 'function') {
-		settled = FULFILLED;
-		try {
-			value = callback(value);
-		} catch (e) {
-			reject(promise, e);
-		}
-	}
 
-	if (!handleThenable(promise, value)) {
-		if (settled === FULFILLED) {
-			resolve(promise, value);
-		}
+/***/ }),
+/* 250 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		if (settled === REJECTED) {
-			reject(promise, value);
-		}
-	}
+var fs = __webpack_require__(23)
+var polyfills = __webpack_require__(251)
+var legacy = __webpack_require__(252)
+var clone = __webpack_require__(253)
+
+var util = __webpack_require__(29)
+
+/* istanbul ignore next - node 0.x polyfill */
+var gracefulQueue
+var previousSymbol
+
+/* istanbul ignore else - node 0.x polyfill */
+if (typeof Symbol === 'function' && typeof Symbol.for === 'function') {
+  gracefulQueue = Symbol.for('graceful-fs.queue')
+  // This is used in testing by future versions
+  previousSymbol = Symbol.for('graceful-fs.previous')
+} else {
+  gracefulQueue = '___graceful-fs.queue'
+  previousSymbol = '___graceful-fs.previous'
 }
 
-function handleThenable(promise, value) {
-	var resolved;
+function noop () {}
 
-	try {
-		if (promise === value) {
-			throw new TypeError('A promises callback cannot return that same promise.');
-		}
+var debug = noop
+if (util.debuglog)
+  debug = util.debuglog('gfs4')
+else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ''))
+  debug = function() {
+    var m = util.format.apply(util, arguments)
+    m = 'GFS4: ' + m.split(/\n/).join('\nGFS4: ')
+    console.error(m)
+  }
 
-		if (value && (typeof value === 'function' || typeof value === 'object')) {
-			// then should be retrieved only once
-			var then = value.then;
+// Once time initialization
+if (!global[gracefulQueue]) {
+  // This queue can be shared by multiple loaded instances
+  var queue = []
+  Object.defineProperty(global, gracefulQueue, {
+    get: function() {
+      return queue
+    }
+  })
 
-			if (typeof then === 'function') {
-				then.call(value, function (val) {
-					if (!resolved) {
-						resolved = true;
+  // Patch fs.close/closeSync to shared queue version, because we need
+  // to retry() whenever a close happens *anywhere* in the program.
+  // This is essential when multiple graceful-fs instances are
+  // in play at the same time.
+  fs.close = (function (fs$close) {
+    function close (fd, cb) {
+      return fs$close.call(fs, fd, function (err) {
+        // This function uses the graceful-fs shared queue
+        if (!err) {
+          retry()
+        }
 
-						if (value === val) {
-							fulfill(promise, val);
-						} else {
-							resolve(promise, val);
-						}
-					}
-				}, function (reason) {
-					if (!resolved) {
-						resolved = true;
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+      })
+    }
 
-						reject(promise, reason);
-					}
-				});
+    Object.defineProperty(close, previousSymbol, {
+      value: fs$close
+    })
+    return close
+  })(fs.close)
 
-				return true;
-			}
-		}
-	} catch (e) {
-		if (!resolved) {
-			reject(promise, e);
-		}
+  fs.closeSync = (function (fs$closeSync) {
+    function closeSync (fd) {
+      // This function uses the graceful-fs shared queue
+      fs$closeSync.apply(fs, arguments)
+      retry()
+    }
 
-		return true;
-	}
+    Object.defineProperty(closeSync, previousSymbol, {
+      value: fs$closeSync
+    })
+    return closeSync
+  })(fs.closeSync)
 
-	return false;
+  if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
+    process.on('exit', function() {
+      debug(global[gracefulQueue])
+      __webpack_require__(30).equal(global[gracefulQueue].length, 0)
+    })
+  }
 }
 
-function resolve(promise, value) {
-	if (promise === value || !handleThenable(promise, value)) {
-		fulfill(promise, value);
-	}
+module.exports = patch(clone(fs))
+if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
+    module.exports = patch(fs)
+    fs.__patched = true;
 }
 
-function fulfill(promise, value) {
-	if (promise._state === PENDING) {
-		promise._state = SETTLED;
-		promise._data = value;
+function patch (fs) {
+  // Everything that references the open() function needs to be in here
+  polyfills(fs)
+  fs.gracefulify = patch
+
+  fs.createReadStream = createReadStream
+  fs.createWriteStream = createWriteStream
+  var fs$readFile = fs.readFile
+  fs.readFile = readFile
+  function readFile (path, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
+
+    return go$readFile(path, options, cb)
 
-		asyncCall(publishFulfillment, promise);
-	}
-}
+    function go$readFile (path, options, cb) {
+      return fs$readFile(path, options, function (err) {
+        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+          enqueue([go$readFile, [path, options, cb]])
+        else {
+          if (typeof cb === 'function')
+            cb.apply(this, arguments)
+          retry()
+        }
+      })
+    }
+  }
 
-function reject(promise, reason) {
-	if (promise._state === PENDING) {
-		promise._state = SETTLED;
-		promise._data = reason;
+  var fs$writeFile = fs.writeFile
+  fs.writeFile = writeFile
+  function writeFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
 
-		asyncCall(publishRejection, promise);
-	}
-}
+    return go$writeFile(path, data, options, cb)
 
-function publish(promise) {
-	promise._then = promise._then.forEach(invokeCallback);
-}
+    function go$writeFile (path, data, options, cb) {
+      return fs$writeFile(path, data, options, function (err) {
+        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+          enqueue([go$writeFile, [path, data, options, cb]])
+        else {
+          if (typeof cb === 'function')
+            cb.apply(this, arguments)
+          retry()
+        }
+      })
+    }
+  }
 
-function publishFulfillment(promise) {
-	promise._state = FULFILLED;
-	publish(promise);
-}
+  var fs$appendFile = fs.appendFile
+  if (fs$appendFile)
+    fs.appendFile = appendFile
+  function appendFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
 
-function publishRejection(promise) {
-	promise._state = REJECTED;
-	publish(promise);
-	if (!promise._handled && isNode) {
-		global.process.emit('unhandledRejection', promise._data, promise);
-	}
-}
+    return go$appendFile(path, data, options, cb)
 
-function notifyRejectionHandled(promise) {
-	global.process.emit('rejectionHandled', promise);
-}
+    function go$appendFile (path, data, options, cb) {
+      return fs$appendFile(path, data, options, function (err) {
+        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+          enqueue([go$appendFile, [path, data, options, cb]])
+        else {
+          if (typeof cb === 'function')
+            cb.apply(this, arguments)
+          retry()
+        }
+      })
+    }
+  }
 
-/**
- * @class
- */
-function Promise(resolver) {
-	if (typeof resolver !== 'function') {
-		throw new TypeError('Promise resolver ' + resolver + ' is not a function');
-	}
+  var fs$readdir = fs.readdir
+  fs.readdir = readdir
+  function readdir (path, options, cb) {
+    var args = [path]
+    if (typeof options !== 'function') {
+      args.push(options)
+    } else {
+      cb = options
+    }
+    args.push(go$readdir$cb)
 
-	if (this instanceof Promise === false) {
-		throw new TypeError('Failed to construct \'Promise\': Please use the \'new\' operator, this object constructor cannot be called as a function.');
-	}
+    return go$readdir(args)
 
-	this._then = [];
+    function go$readdir$cb (err, files) {
+      if (files && files.sort)
+        files.sort()
 
-	invokeResolver(resolver, this);
-}
+      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+        enqueue([go$readdir, [args]])
 
-Promise.prototype = {
-	constructor: Promise,
+      else {
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+        retry()
+      }
+    }
+  }
 
-	_state: PENDING,
-	_then: null,
-	_data: undefined,
-	_handled: false,
+  function go$readdir (args) {
+    return fs$readdir.apply(fs, args)
+  }
 
-	then: function (onFulfillment, onRejection) {
-		var subscriber = {
-			owner: this,
-			then: new this.constructor(NOOP),
-			fulfilled: onFulfillment,
-			rejected: onRejection
-		};
+  if (process.version.substr(0, 4) === 'v0.8') {
+    var legStreams = legacy(fs)
+    ReadStream = legStreams.ReadStream
+    WriteStream = legStreams.WriteStream
+  }
 
-		if ((onRejection || onFulfillment) && !this._handled) {
-			this._handled = true;
-			if (this._state === REJECTED && isNode) {
-				asyncCall(notifyRejectionHandled, this);
-			}
-		}
+  var fs$ReadStream = fs.ReadStream
+  if (fs$ReadStream) {
+    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
+    ReadStream.prototype.open = ReadStream$open
+  }
 
-		if (this._state === FULFILLED || this._state === REJECTED) {
-			// already resolved, call callback async
-			asyncCall(invokeCallback, subscriber);
-		} else {
-			// subscribe
-			this._then.push(subscriber);
-		}
+  var fs$WriteStream = fs.WriteStream
+  if (fs$WriteStream) {
+    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
+    WriteStream.prototype.open = WriteStream$open
+  }
 
-		return subscriber.then;
-	},
+  Object.defineProperty(fs, 'ReadStream', {
+    get: function () {
+      return ReadStream
+    },
+    set: function (val) {
+      ReadStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
+  Object.defineProperty(fs, 'WriteStream', {
+    get: function () {
+      return WriteStream
+    },
+    set: function (val) {
+      WriteStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
 
-	catch: function (onRejection) {
-		return this.then(null, onRejection);
-	}
-};
+  // legacy names
+  Object.defineProperty(fs, 'FileReadStream', {
+    get: function () {
+      return ReadStream
+    },
+    set: function (val) {
+      ReadStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
+  Object.defineProperty(fs, 'FileWriteStream', {
+    get: function () {
+      return WriteStream
+    },
+    set: function (val) {
+      WriteStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
 
-Promise.all = function (promises) {
-	if (!Array.isArray(promises)) {
-		throw new TypeError('You must pass an array to Promise.all().');
-	}
+  function ReadStream (path, options) {
+    if (this instanceof ReadStream)
+      return fs$ReadStream.apply(this, arguments), this
+    else
+      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
+  }
 
-	return new Promise(function (resolve, reject) {
-		var results = [];
-		var remaining = 0;
+  function ReadStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        if (that.autoClose)
+          that.destroy()
 
-		function resolver(index) {
-			remaining++;
-			return function (value) {
-				results[index] = value;
-				if (!--remaining) {
-					resolve(results);
-				}
-			};
-		}
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+        that.read()
+      }
+    })
+  }
 
-		for (var i = 0, promise; i < promises.length; i++) {
-			promise = promises[i];
+  function WriteStream (path, options) {
+    if (this instanceof WriteStream)
+      return fs$WriteStream.apply(this, arguments), this
+    else
+      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
+  }
 
-			if (promise && typeof promise.then === 'function') {
-				promise.then(resolver(i), reject);
-			} else {
-				results[i] = promise;
-			}
-		}
+  function WriteStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        that.destroy()
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+      }
+    })
+  }
 
-		if (!remaining) {
-			resolve(results);
-		}
-	});
-};
+  function createReadStream (path, options) {
+    return new fs.ReadStream(path, options)
+  }
 
-Promise.race = function (promises) {
-	if (!Array.isArray(promises)) {
-		throw new TypeError('You must pass an array to Promise.race().');
-	}
+  function createWriteStream (path, options) {
+    return new fs.WriteStream(path, options)
+  }
 
-	return new Promise(function (resolve, reject) {
-		for (var i = 0, promise; i < promises.length; i++) {
-			promise = promises[i];
+  var fs$open = fs.open
+  fs.open = open
+  function open (path, flags, mode, cb) {
+    if (typeof mode === 'function')
+      cb = mode, mode = null
 
-			if (promise && typeof promise.then === 'function') {
-				promise.then(resolve, reject);
-			} else {
-				resolve(promise);
-			}
-		}
-	});
-};
+    return go$open(path, flags, mode, cb)
 
-Promise.resolve = function (value) {
-	if (value && typeof value === 'object' && value.constructor === Promise) {
-		return value;
-	}
+    function go$open (path, flags, mode, cb) {
+      return fs$open(path, flags, mode, function (err, fd) {
+        if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+          enqueue([go$open, [path, flags, mode, cb]])
+        else {
+          if (typeof cb === 'function')
+            cb.apply(this, arguments)
+          retry()
+        }
+      })
+    }
+  }
 
-	return new Promise(function (resolve) {
-		resolve(value);
-	});
-};
+  return fs
+}
 
-Promise.reject = function (reason) {
-	return new Promise(function (resolve, reject) {
-		reject(reason);
-	});
-};
+function enqueue (elem) {
+  debug('ENQUEUE', elem[0].name, elem[1])
+  global[gracefulQueue].push(elem)
+}
 
-module.exports = Promise;
+function retry () {
+  var elem = global[gracefulQueue].shift()
+  if (elem) {
+    debug('RETRY', elem[0].name, elem[1])
+    elem[0].apply(null, elem[1])
+  }
+}
 
 
 /***/ }),
-/* 170 */
+/* 251 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var constants = __webpack_require__(26)
 
-var arrayUniq = __webpack_require__(171);
+var origCwd = process.cwd
+var cwd = null
 
-module.exports = function () {
-	return arrayUniq([].concat.apply([], arguments));
-};
+var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
 
+process.cwd = function() {
+  if (!cwd)
+    cwd = origCwd.call(process)
+  return cwd
+}
+try {
+  process.cwd()
+} catch (er) {}
 
-/***/ }),
-/* 171 */
-/***/ (function(module, exports, __webpack_require__) {
+var chdir = process.chdir
+process.chdir = function(d) {
+  cwd = null
+  chdir.call(process, d)
+}
 
-"use strict";
+module.exports = patch
 
+function patch (fs) {
+  // (re-)implement some things that are known busted or missing.
 
-// there's 3 implementations written in increasing order of efficiency
+  // lchmod, broken prior to 0.6.2
+  // back-port the fix here.
+  if (constants.hasOwnProperty('O_SYMLINK') &&
+      process.version.match(/^v0\.6\.[0-2]|^v0\.5\./)) {
+    patchLchmod(fs)
+  }
 
-// 1 - no Set type is defined
-function uniqNoSet(arr) {
-	var ret = [];
+  // lutimes implementation, or no-op
+  if (!fs.lutimes) {
+    patchLutimes(fs)
+  }
 
-	for (var i = 0; i < arr.length; i++) {
-		if (ret.indexOf(arr[i]) === -1) {
-			ret.push(arr[i]);
-		}
-	}
+  // https://github.com/isaacs/node-graceful-fs/issues/4
+  // Chown should not fail on einval or eperm if non-root.
+  // It should not fail on enosys ever, as this just indicates
+  // that a fs doesn't support the intended operation.
 
-	return ret;
-}
+  fs.chown = chownFix(fs.chown)
+  fs.fchown = chownFix(fs.fchown)
+  fs.lchown = chownFix(fs.lchown)
 
-// 2 - a simple Set type is defined
-function uniqSet(arr) {
-	var seen = new Set();
-	return arr.filter(function (el) {
-		if (!seen.has(el)) {
-			seen.add(el);
-			return true;
-		}
+  fs.chmod = chmodFix(fs.chmod)
+  fs.fchmod = chmodFix(fs.fchmod)
+  fs.lchmod = chmodFix(fs.lchmod)
 
-		return false;
-	});
-}
+  fs.chownSync = chownFixSync(fs.chownSync)
+  fs.fchownSync = chownFixSync(fs.fchownSync)
+  fs.lchownSync = chownFixSync(fs.lchownSync)
 
-// 3 - a standard Set type is defined and it has a forEach method
-function uniqSetWithForEach(arr) {
-	var ret = [];
+  fs.chmodSync = chmodFixSync(fs.chmodSync)
+  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
+  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
 
-	(new Set(arr)).forEach(function (el) {
-		ret.push(el);
-	});
+  fs.stat = statFix(fs.stat)
+  fs.fstat = statFix(fs.fstat)
+  fs.lstat = statFix(fs.lstat)
 
-	return ret;
-}
+  fs.statSync = statFixSync(fs.statSync)
+  fs.fstatSync = statFixSync(fs.fstatSync)
+  fs.lstatSync = statFixSync(fs.lstatSync)
 
-// V8 currently has a broken implementation
-// https://github.com/joyent/node/issues/8449
-function doesForEachActuallyWork() {
-	var ret = false;
+  // if lchmod/lchown do not exist, then make them no-ops
+  if (!fs.lchmod) {
+    fs.lchmod = function (path, mode, cb) {
+      if (cb) process.nextTick(cb)
+    }
+    fs.lchmodSync = function () {}
+  }
+  if (!fs.lchown) {
+    fs.lchown = function (path, uid, gid, cb) {
+      if (cb) process.nextTick(cb)
+    }
+    fs.lchownSync = function () {}
+  }
 
-	(new Set([true])).forEach(function (el) {
-		ret = el;
-	});
+  // on Windows, A/V software can lock the directory, causing this
+  // to fail with an EACCES or EPERM if the directory contains newly
+  // created files.  Try again on failure, for up to 60 seconds.
 
-	return ret === true;
-}
+  // Set the timeout this long because some Windows Anti-Virus, such as Parity
+  // bit9, may lock files for up to a minute, causing npm package install
+  // failures. Also, take care to yield the scheduler. Windows scheduling gives
+  // CPU to a busy looping process, which can cause the program causing the lock
+  // contention to be starved of CPU by node, so the contention doesn't resolve.
+  if (platform === "win32") {
+    fs.rename = (function (fs$rename) { return function (from, to, cb) {
+      var start = Date.now()
+      var backoff = 0;
+      fs$rename(from, to, function CB (er) {
+        if (er
+            && (er.code === "EACCES" || er.code === "EPERM")
+            && Date.now() - start < 60000) {
+          setTimeout(function() {
+            fs.stat(to, function (stater, st) {
+              if (stater && stater.code === "ENOENT")
+                fs$rename(from, to, CB);
+              else
+                cb(er)
+            })
+          }, backoff)
+          if (backoff < 100)
+            backoff += 10;
+          return;
+        }
+        if (cb) cb(er)
+      })
+    }})(fs.rename)
+  }
 
-if ('Set' in global) {
-	if (typeof Set.prototype.forEach === 'function' && doesForEachActuallyWork()) {
-		module.exports = uniqSetWithForEach;
-	} else {
-		module.exports = uniqSet;
-	}
-} else {
-	module.exports = uniqNoSet;
-}
+  // if read() returns EAGAIN, then just try it again.
+  fs.read = (function (fs$read) {
+    function read (fd, buffer, offset, length, position, callback_) {
+      var callback
+      if (callback_ && typeof callback_ === 'function') {
+        var eagCounter = 0
+        callback = function (er, _, __) {
+          if (er && er.code === 'EAGAIN' && eagCounter < 10) {
+            eagCounter ++
+            return fs$read.call(fs, fd, buffer, offset, length, position, callback)
+          }
+          callback_.apply(this, arguments)
+        }
+      }
+      return fs$read.call(fs, fd, buffer, offset, length, position, callback)
+    }
 
+    // This ensures `util.promisify` works as it does for native `fs.read`.
+    read.__proto__ = fs$read
+    return read
+  })(fs.read)
 
-/***/ }),
-/* 172 */
-/***/ (function(module, exports, __webpack_require__) {
+  fs.readSync = (function (fs$readSync) { return function (fd, buffer, offset, length, position) {
+    var eagCounter = 0
+    while (true) {
+      try {
+        return fs$readSync.call(fs, fd, buffer, offset, length, position)
+      } catch (er) {
+        if (er.code === 'EAGAIN' && eagCounter < 10) {
+          eagCounter ++
+          continue
+        }
+        throw er
+      }
+    }
+  }})(fs.readSync)
 
-"use strict";
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
+  function patchLchmod (fs) {
+    fs.lchmod = function (path, mode, callback) {
+      fs.open( path
+             , constants.O_WRONLY | constants.O_SYMLINK
+             , mode
+             , function (err, fd) {
+        if (err) {
+          if (callback) callback(err)
+          return
+        }
+        // prefer to return the chmod error, if one occurs,
+        // but still try to close, and report closing errors if they occur.
+        fs.fchmod(fd, mode, function (err) {
+          fs.close(fd, function(err2) {
+            if (callback) callback(err || err2)
+          })
+        })
+      })
+    }
 
+    fs.lchmodSync = function (path, mode) {
+      var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
 
-/* eslint-disable no-unused-vars */
-var getOwnPropertySymbols = Object.getOwnPropertySymbols;
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-var propIsEnumerable = Object.prototype.propertyIsEnumerable;
+      // prefer to return the chmod error, if one occurs,
+      // but still try to close, and report closing errors if they occur.
+      var threw = true
+      var ret
+      try {
+        ret = fs.fchmodSync(fd, mode)
+        threw = false
+      } finally {
+        if (threw) {
+          try {
+            fs.closeSync(fd)
+          } catch (er) {}
+        } else {
+          fs.closeSync(fd)
+        }
+      }
+      return ret
+    }
+  }
 
-function toObject(val) {
-	if (val === null || val === undefined) {
-		throw new TypeError('Object.assign cannot be called with null or undefined');
-	}
+  function patchLutimes (fs) {
+    if (constants.hasOwnProperty("O_SYMLINK")) {
+      fs.lutimes = function (path, at, mt, cb) {
+        fs.open(path, constants.O_SYMLINK, function (er, fd) {
+          if (er) {
+            if (cb) cb(er)
+            return
+          }
+          fs.futimes(fd, at, mt, function (er) {
+            fs.close(fd, function (er2) {
+              if (cb) cb(er || er2)
+            })
+          })
+        })
+      }
 
-	return Object(val);
-}
+      fs.lutimesSync = function (path, at, mt) {
+        var fd = fs.openSync(path, constants.O_SYMLINK)
+        var ret
+        var threw = true
+        try {
+          ret = fs.futimesSync(fd, at, mt)
+          threw = false
+        } finally {
+          if (threw) {
+            try {
+              fs.closeSync(fd)
+            } catch (er) {}
+          } else {
+            fs.closeSync(fd)
+          }
+        }
+        return ret
+      }
 
-function shouldUseNative() {
-	try {
-		if (!Object.assign) {
-			return false;
-		}
+    } else {
+      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
+      fs.lutimesSync = function () {}
+    }
+  }
 
-		// Detect buggy property enumeration order in older V8 versions.
+  function chmodFix (orig) {
+    if (!orig) return orig
+    return function (target, mode, cb) {
+      return orig.call(fs, target, mode, function (er) {
+        if (chownErOk(er)) er = null
+        if (cb) cb.apply(this, arguments)
+      })
+    }
+  }
 
-		// https://bugs.chromium.org/p/v8/issues/detail?id=4118
-		var test1 = new String('abc');  // eslint-disable-line no-new-wrappers
-		test1[5] = 'de';
-		if (Object.getOwnPropertyNames(test1)[0] === '5') {
-			return false;
-		}
+  function chmodFixSync (orig) {
+    if (!orig) return orig
+    return function (target, mode) {
+      try {
+        return orig.call(fs, target, mode)
+      } catch (er) {
+        if (!chownErOk(er)) throw er
+      }
+    }
+  }
 
-		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
-		var test2 = {};
-		for (var i = 0; i < 10; i++) {
-			test2['_' + String.fromCharCode(i)] = i;
-		}
-		var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
-			return test2[n];
-		});
-		if (order2.join('') !== '0123456789') {
-			return false;
-		}
 
-		// https://bugs.chromium.org/p/v8/issues/detail?id=3056
-		var test3 = {};
-		'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
-			test3[letter] = letter;
-		});
-		if (Object.keys(Object.assign({}, test3)).join('') !==
-				'abcdefghijklmnopqrst') {
-			return false;
-		}
+  function chownFix (orig) {
+    if (!orig) return orig
+    return function (target, uid, gid, cb) {
+      return orig.call(fs, target, uid, gid, function (er) {
+        if (chownErOk(er)) er = null
+        if (cb) cb.apply(this, arguments)
+      })
+    }
+  }
 
-		return true;
-	} catch (err) {
-		// We don't expect any of the above to throw, but better to be safe.
-		return false;
-	}
-}
+  function chownFixSync (orig) {
+    if (!orig) return orig
+    return function (target, uid, gid) {
+      try {
+        return orig.call(fs, target, uid, gid)
+      } catch (er) {
+        if (!chownErOk(er)) throw er
+      }
+    }
+  }
 
-module.exports = shouldUseNative() ? Object.assign : function (target, source) {
-	var from;
-	var to = toObject(target);
-	var symbols;
+  function statFix (orig) {
+    if (!orig) return orig
+    // Older versions of Node erroneously returned signed integers for
+    // uid + gid.
+    return function (target, options, cb) {
+      if (typeof options === 'function') {
+        cb = options
+        options = null
+      }
+      function callback (er, stats) {
+        if (stats) {
+          if (stats.uid < 0) stats.uid += 0x100000000
+          if (stats.gid < 0) stats.gid += 0x100000000
+        }
+        if (cb) cb.apply(this, arguments)
+      }
+      return options ? orig.call(fs, target, options, callback)
+        : orig.call(fs, target, callback)
+    }
+  }
 
-	for (var s = 1; s < arguments.length; s++) {
-		from = Object(arguments[s]);
+  function statFixSync (orig) {
+    if (!orig) return orig
+    // Older versions of Node erroneously returned signed integers for
+    // uid + gid.
+    return function (target, options) {
+      var stats = options ? orig.call(fs, target, options)
+        : orig.call(fs, target)
+      if (stats.uid < 0) stats.uid += 0x100000000
+      if (stats.gid < 0) stats.gid += 0x100000000
+      return stats;
+    }
+  }
 
-		for (var key in from) {
-			if (hasOwnProperty.call(from, key)) {
-				to[key] = from[key];
-			}
-		}
+  // ENOSYS means that the fs doesn't support the op. Just ignore
+  // that, because it doesn't matter.
+  //
+  // if there's no getuid, or if getuid() is something other
+  // than 0, and the error is EINVAL or EPERM, then just ignore
+  // it.
+  //
+  // This specific case is a silent failure in cp, install, tar,
+  // and most other unix tools that manage permissions.
+  //
+  // When running as root, or if other types of errors are
+  // encountered, then it's strict.
+  function chownErOk (er) {
+    if (!er)
+      return true
 
-		if (getOwnPropertySymbols) {
-			symbols = getOwnPropertySymbols(from);
-			for (var i = 0; i < symbols.length; i++) {
-				if (propIsEnumerable.call(from, symbols[i])) {
-					to[symbols[i]] = from[symbols[i]];
-				}
-			}
-		}
-	}
+    if (er.code === "ENOSYS")
+      return true
 
-	return to;
-};
+    var nonroot = !process.getuid || process.getuid() !== 0
+    if (nonroot) {
+      if (er.code === "EINVAL" || er.code === "EPERM")
+        return true
+    }
+
+    return false
+  }
+}
 
 
 /***/ }),
-/* 173 */
+/* 252 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+var Stream = __webpack_require__(28).Stream
 
-var processFn = function (fn, P, opts) {
-	return function () {
-		var that = this;
-		var args = new Array(arguments.length);
+module.exports = legacy
 
-		for (var i = 0; i < arguments.length; i++) {
-			args[i] = arguments[i];
-		}
+function legacy (fs) {
+  return {
+    ReadStream: ReadStream,
+    WriteStream: WriteStream
+  }
 
-		return new P(function (resolve, reject) {
-			args.push(function (err, result) {
-				if (err) {
-					reject(err);
-				} else if (opts.multiArgs) {
-					var results = new Array(arguments.length - 1);
+  function ReadStream (path, options) {
+    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
 
-					for (var i = 1; i < arguments.length; i++) {
-						results[i - 1] = arguments[i];
-					}
+    Stream.call(this);
 
-					resolve(results);
-				} else {
-					resolve(result);
-				}
-			});
+    var self = this;
 
-			fn.apply(that, args);
-		});
-	};
-};
+    this.path = path;
+    this.fd = null;
+    this.readable = true;
+    this.paused = false;
 
-var pify = module.exports = function (obj, P, opts) {
-	if (typeof P !== 'function') {
-		opts = P;
-		P = Promise;
-	}
+    this.flags = 'r';
+    this.mode = 438; /*=0666*/
+    this.bufferSize = 64 * 1024;
 
-	opts = opts || {};
-	opts.exclude = opts.exclude || [/.+Sync$/];
+    options = options || {};
 
-	var filter = function (key) {
-		var match = function (pattern) {
-			return typeof pattern === 'string' ? key === pattern : pattern.test(key);
-		};
+    // Mixin options into this
+    var keys = Object.keys(options);
+    for (var index = 0, length = keys.length; index < length; index++) {
+      var key = keys[index];
+      this[key] = options[key];
+    }
 
-		return opts.include ? opts.include.some(match) : !opts.exclude.some(match);
-	};
+    if (this.encoding) this.setEncoding(this.encoding);
 
-	var ret = typeof obj === 'function' ? function () {
-		if (opts.excludeMain) {
-			return obj.apply(this, arguments);
-		}
+    if (this.start !== undefined) {
+      if ('number' !== typeof this.start) {
+        throw TypeError('start must be a Number');
+      }
+      if (this.end === undefined) {
+        this.end = Infinity;
+      } else if ('number' !== typeof this.end) {
+        throw TypeError('end must be a Number');
+      }
 
-		return processFn(obj, P, opts).apply(this, arguments);
-	} : {};
+      if (this.start > this.end) {
+        throw new Error('start must be <= end');
+      }
 
-	return Object.keys(obj).reduce(function (ret, key) {
-		var x = obj[key];
+      this.pos = this.start;
+    }
 
-		ret[key] = typeof x === 'function' && filter(key) ? processFn(x, P, opts) : x;
+    if (this.fd !== null) {
+      process.nextTick(function() {
+        self._read();
+      });
+      return;
+    }
 
-		return ret;
-	}, ret);
-};
+    fs.open(this.path, this.flags, this.mode, function (err, fd) {
+      if (err) {
+        self.emit('error', err);
+        self.readable = false;
+        return;
+      }
 
-pify.all = pify;
+      self.fd = fd;
+      self.emit('open', fd);
+      self._read();
+    })
+  }
 
+  function WriteStream (path, options) {
+    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
 
-/***/ }),
-/* 174 */
-/***/ (function(module, exports, __webpack_require__) {
+    Stream.call(this);
 
-"use strict";
+    this.path = path;
+    this.fd = null;
+    this.writable = true;
 
-const path = __webpack_require__(16);
+    this.flags = 'w';
+    this.encoding = 'binary';
+    this.mode = 438; /*=0666*/
+    this.bytesWritten = 0;
 
-module.exports = path_ => path.resolve(path_) === process.cwd();
+    options = options || {};
 
+    // Mixin options into this
+    var keys = Object.keys(options);
+    for (var index = 0, length = keys.length; index < length; index++) {
+      var key = keys[index];
+      this[key] = options[key];
+    }
 
-/***/ }),
-/* 175 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (this.start !== undefined) {
+      if ('number' !== typeof this.start) {
+        throw TypeError('start must be a Number');
+      }
+      if (this.start < 0) {
+        throw new Error('start must be >= zero');
+      }
 
-"use strict";
+      this.pos = this.start;
+    }
 
-const isPathInside = __webpack_require__(176);
+    this.busy = false;
+    this._queue = [];
 
-module.exports = path => isPathInside(path, process.cwd());
+    if (this.fd === null) {
+      this._open = fs.open;
+      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
+      this.flush();
+    }
+  }
+}
 
 
 /***/ }),
-/* 176 */
+/* 253 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const path = __webpack_require__(16);
-const pathIsInside = __webpack_require__(177);
 
-module.exports = (childPath, parentPath) => {
-	childPath = path.resolve(childPath);
-	parentPath = path.resolve(parentPath);
+module.exports = clone
 
-	if (childPath === parentPath) {
-		return false;
-	}
+function clone (obj) {
+  if (obj === null || typeof obj !== 'object')
+    return obj
 
-	return pathIsInside(childPath, parentPath);
-};
+  if (obj instanceof Object)
+    var copy = { __proto__: obj.__proto__ }
+  else
+    var copy = Object.create(null)
+
+  Object.getOwnPropertyNames(obj).forEach(function (key) {
+    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
+  })
+
+  return copy
+}
 
 
 /***/ }),
-/* 177 */
+/* 254 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const path = __webpack_require__(16);
 
-var path = __webpack_require__(16);
+module.exports = path_ => {
+	let cwd = process.cwd();
 
-module.exports = function (thePath, potentialParent) {
-    // For inside-directory checking, we want to allow trailing slashes, so normalize.
-    thePath = stripTrailingSep(thePath);
-    potentialParent = stripTrailingSep(potentialParent);
+	path_ = path.resolve(path_);
 
-    // Node treats only Windows as case-insensitive in its path module; we follow those conventions.
-    if (process.platform === "win32") {
-        thePath = thePath.toLowerCase();
-        potentialParent = potentialParent.toLowerCase();
-    }
+	if (process.platform === 'win32') {
+		cwd = cwd.toLowerCase();
+		path_ = path_.toLowerCase();
+	}
 
-    return thePath.lastIndexOf(potentialParent, 0) === 0 &&
-		(
-			thePath[potentialParent.length] === path.sep ||
-			thePath[potentialParent.length] === undefined
-		);
+	return path_ === cwd;
 };
 
-function stripTrailingSep(thePath) {
-    if (thePath[thePath.length - 1] === path.sep) {
-        return thePath.slice(0, -1);
-    }
-    return thePath;
-}
-
 
 /***/ }),
-/* 178 */
+/* 255 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const path = __webpack_require__(16);
 
-const processFn = (fn, options) => function (...args) {
-	const P = options.promiseModule;
-
-	return new P((resolve, reject) => {
-		if (options.multiArgs) {
-			args.push((...result) => {
-				if (options.errorFirst) {
-					if (result[0]) {
-						reject(result);
-					} else {
-						result.shift();
-						resolve(result);
-					}
-				} else {
-					resolve(result);
-				}
-			});
-		} else if (options.errorFirst) {
-			args.push((error, result) => {
-				if (error) {
-					reject(error);
-				} else {
-					resolve(result);
-				}
-			});
-		} else {
-			args.push(resolve);
-		}
-
-		fn.apply(this, args);
-	});
-};
-
-module.exports = (input, options) => {
-	options = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, options);
+module.exports = (childPath, parentPath) => {
+	childPath = path.resolve(childPath);
+	parentPath = path.resolve(parentPath);
 
-	const objType = typeof input;
-	if (!(input !== null && (objType === 'object' || objType === 'function'))) {
-		throw new TypeError(`Expected \`input\` to be a \`Function\` or \`Object\`, got \`${input === null ? 'null' : objType}\``);
+	if (process.platform === 'win32') {
+		childPath = childPath.toLowerCase();
+		parentPath = parentPath.toLowerCase();
 	}
 
-	const filter = key => {
-		const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key);
-		return options.include ? options.include.some(match) : !options.exclude.some(match);
-	};
-
-	let ret;
-	if (objType === 'function') {
-		ret = function (...args) {
-			return options.excludeMain ? input(...args) : processFn(input, options).apply(this, args);
-		};
-	} else {
-		ret = Object.create(Object.getPrototypeOf(input));
+	if (childPath === parentPath) {
+		return false;
 	}
 
-	for (const key in input) { // eslint-disable-line guard-for-in
-		const property = input[key];
-		ret[key] = typeof property === 'function' && filter(key) ? processFn(property, options) : property;
-	}
+	childPath += path.sep;
+	parentPath += path.sep;
 
-	return ret;
+	return childPath.startsWith(parentPath);
 };
 
 
 /***/ }),
-/* 179 */
+/* 256 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = rimraf
-rimraf.sync = rimrafSync
-
-var assert = __webpack_require__(30)
-var path = __webpack_require__(16)
-var fs = __webpack_require__(23)
-var glob = __webpack_require__(37)
-var _0666 = parseInt('666', 8)
+const assert = __webpack_require__(30)
+const path = __webpack_require__(16)
+const fs = __webpack_require__(23)
+let glob = undefined
+try {
+  glob = __webpack_require__(37)
+} catch (_err) {
+  // treat glob as optional.
+}
 
-var defaultGlobOpts = {
+const defaultGlobOpts = {
   nosort: true,
   silent: true
 }
 
 // for EMFILE handling
-var timeout = 0
+let timeout = 0
 
-var isWindows = (process.platform === "win32")
+const isWindows = (process.platform === "win32")
 
-function defaults (options) {
-  var methods = [
+const defaults = options => {
+  const methods = [
     'unlink',
     'chmod',
     'stat',
@@ -24803,7 +31504,7 @@ function defaults (options) {
     'rmdir',
     'readdir'
   ]
-  methods.forEach(function(m) {
+  methods.forEach(m => {
     options[m] = options[m] || fs[m]
     m = m + 'Sync'
     options[m] = options[m] || fs[m]
@@ -24814,11 +31515,14 @@ function defaults (options) {
   if (options.glob === false) {
     options.disableGlob = true
   }
+  if (options.disableGlob !== true && glob === undefined) {
+    throw Error('glob dependency not found, set `options.disableGlob = true` if intentional')
+  }
   options.disableGlob = options.disableGlob || false
   options.glob = options.glob || defaultGlobOpts
 }
 
-function rimraf (p, options, cb) {
+const rimraf = (p, options, cb) => {
   if (typeof options === 'function') {
     cb = options
     options = {}
@@ -24832,27 +31536,17 @@ function rimraf (p, options, cb) {
 
   defaults(options)
 
-  var busyTries = 0
-  var errState = null
-  var n = 0
-
-  if (options.disableGlob || !glob.hasMagic(p))
-    return afterGlob(null, [p])
-
-  options.lstat(p, function (er, stat) {
-    if (!er)
-      return afterGlob(null, [p])
-
-    glob(p, options.glob, afterGlob)
-  })
+  let busyTries = 0
+  let errState = null
+  let n = 0
 
-  function next (er) {
+  const next = (er) => {
     errState = errState || er
     if (--n === 0)
       cb(errState)
   }
 
-  function afterGlob (er, results) {
+  const afterGlob = (er, results) => {
     if (er)
       return cb(er)
 
@@ -24860,24 +31554,19 @@ function rimraf (p, options, cb) {
     if (n === 0)
       return cb()
 
-    results.forEach(function (p) {
-      rimraf_(p, options, function CB (er) {
+    results.forEach(p => {
+      const CB = (er) => {
         if (er) {
           if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
               busyTries < options.maxBusyTries) {
             busyTries ++
-            var time = busyTries * 100
             // try again, with the same exact callback as this one.
-            return setTimeout(function () {
-              rimraf_(p, options, CB)
-            }, time)
+            return setTimeout(() => rimraf_(p, options, CB), busyTries * 100)
           }
 
           // this one won't happen if graceful-fs is used.
           if (er.code === "EMFILE" && timeout < options.emfileWait) {
-            return setTimeout(function () {
-              rimraf_(p, options, CB)
-            }, timeout ++)
+            return setTimeout(() => rimraf_(p, options, CB), timeout ++)
           }
 
           // already gone
@@ -24886,9 +31575,21 @@ function rimraf (p, options, cb) {
 
         timeout = 0
         next(er)
-      })
+      }
+      rimraf_(p, options, CB)
     })
   }
+
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
+
+  options.lstat(p, (er, stat) => {
+    if (!er)
+      return afterGlob(null, [p])
+
+    glob(p, options.glob, afterGlob)
+  })
+
 }
 
 // Two possible strategies.
@@ -24902,14 +31603,14 @@ function rimraf (p, options, cb) {
 //
 // If anyone ever complains about this, then I guess the strategy could
 // be made configurable somehow.  But until then, YAGNI.
-function rimraf_ (p, options, cb) {
+const rimraf_ = (p, options, cb) => {
   assert(p)
   assert(options)
   assert(typeof cb === 'function')
 
   // sunos lets the root user unlink directories, which is... weird.
   // so we have to lstat here and make sure it's not a dir.
-  options.lstat(p, function (er, st) {
+  options.lstat(p, (er, st) => {
     if (er && er.code === "ENOENT")
       return cb(null)
 
@@ -24920,7 +31621,7 @@ function rimraf_ (p, options, cb) {
     if (st && st.isDirectory())
       return rmdir(p, options, er, cb)
 
-    options.unlink(p, function (er) {
+    options.unlink(p, er => {
       if (er) {
         if (er.code === "ENOENT")
           return cb(null)
@@ -24936,18 +31637,18 @@ function rimraf_ (p, options, cb) {
   })
 }
 
-function fixWinEPERM (p, options, er, cb) {
+const fixWinEPERM = (p, options, er, cb) => {
   assert(p)
   assert(options)
   assert(typeof cb === 'function')
   if (er)
     assert(er instanceof Error)
 
-  options.chmod(p, _0666, function (er2) {
+  options.chmod(p, 0o666, er2 => {
     if (er2)
       cb(er2.code === "ENOENT" ? null : er)
     else
-      options.stat(p, function(er3, stats) {
+      options.stat(p, (er3, stats) => {
         if (er3)
           cb(er3.code === "ENOENT" ? null : er)
         else if (stats.isDirectory())
@@ -24958,14 +31659,14 @@ function fixWinEPERM (p, options, er, cb) {
   })
 }
 
-function fixWinEPERMSync (p, options, er) {
+const fixWinEPERMSync = (p, options, er) => {
   assert(p)
   assert(options)
   if (er)
     assert(er instanceof Error)
 
   try {
-    options.chmodSync(p, _0666)
+    options.chmodSync(p, 0o666)
   } catch (er2) {
     if (er2.code === "ENOENT")
       return
@@ -24973,8 +31674,9 @@ function fixWinEPERMSync (p, options, er) {
       throw er
   }
 
+  let stats
   try {
-    var stats = options.statSync(p)
+    stats = options.statSync(p)
   } catch (er3) {
     if (er3.code === "ENOENT")
       return
@@ -24988,7 +31690,7 @@ function fixWinEPERMSync (p, options, er) {
     options.unlinkSync(p)
 }
 
-function rmdir (p, options, originalEr, cb) {
+const rmdir = (p, options, originalEr, cb) => {
   assert(p)
   assert(options)
   if (originalEr)
@@ -24998,7 +31700,7 @@ function rmdir (p, options, originalEr, cb) {
   // try to rmdir first, and only readdir on ENOTEMPTY or EEXIST (SunOS)
   // if we guessed wrong, and it's not a directory, then
   // raise the original error.
-  options.rmdir(p, function (er) {
+  options.rmdir(p, er => {
     if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
       rmkids(p, options, cb)
     else if (er && er.code === "ENOTDIR")
@@ -25008,20 +31710,20 @@ function rmdir (p, options, originalEr, cb) {
   })
 }
 
-function rmkids(p, options, cb) {
+const rmkids = (p, options, cb) => {
   assert(p)
   assert(options)
   assert(typeof cb === 'function')
 
-  options.readdir(p, function (er, files) {
+  options.readdir(p, (er, files) => {
     if (er)
       return cb(er)
-    var n = files.length
+    let n = files.length
     if (n === 0)
       return options.rmdir(p, cb)
-    var errState
-    files.forEach(function (f) {
-      rimraf(path.join(p, f), options, function (er) {
+    let errState
+    files.forEach(f => {
+      rimraf(path.join(p, f), options, er => {
         if (errState)
           return
         if (er)
@@ -25036,7 +31738,7 @@ function rmkids(p, options, cb) {
 // this looks simpler, and is strictly *faster*, but will
 // tie up the JavaScript thread and fail on excessively
 // deep directory trees.
-function rimrafSync (p, options) {
+const rimrafSync = (p, options) => {
   options = options || {}
   defaults(options)
 
@@ -25045,7 +31747,7 @@ function rimrafSync (p, options) {
   assert(options, 'rimraf: missing options')
   assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
-  var results
+  let results
 
   if (options.disableGlob || !glob.hasMagic(p)) {
     results = [p]
@@ -25061,11 +31763,12 @@ function rimrafSync (p, options) {
   if (!results.length)
     return
 
-  for (var i = 0; i < results.length; i++) {
-    var p = results[i]
+  for (let i = 0; i < results.length; i++) {
+    const p = results[i]
 
+    let st
     try {
-      var st = options.lstatSync(p)
+      st = options.lstatSync(p)
     } catch (er) {
       if (er.code === "ENOENT")
         return
@@ -25094,7 +31797,7 @@ function rimrafSync (p, options) {
   }
 }
 
-function rmdirSync (p, options, originalEr) {
+const rmdirSync = (p, options, originalEr) => {
   assert(p)
   assert(options)
   if (originalEr)
@@ -25112,12 +31815,10 @@ function rmdirSync (p, options, originalEr) {
   }
 }
 
-function rmkidsSync (p, options) {
+const rmkidsSync = (p, options) => {
   assert(p)
   assert(options)
-  options.readdirSync(p).forEach(function (f) {
-    rimrafSync(path.join(p, f), options)
-  })
+  options.readdirSync(p).forEach(f => rimrafSync(path.join(p, f), options))
 
   // We only end up here once we got ENOTEMPTY at least once, and
   // at this point, we are guaranteed to have removed all the kids.
@@ -25125,12 +31826,12 @@ function rmkidsSync (p, options) {
   // try really hard to delete stuff on windows, because it has a
   // PROFOUNDLY annoying habit of not closing handles promptly when
   // files are deleted, resulting in spurious ENOTEMPTY errors.
-  var retries = isWindows ? 100 : 1
-  var i = 0
+  const retries = isWindows ? 100 : 1
+  let i = 0
   do {
-    var threw = true
+    let threw = true
     try {
-      var ret = options.rmdirSync(p, options)
+      const ret = options.rmdirSync(p, options)
       threw = false
       return ret
     } finally {
@@ -25140,96 +31841,243 @@ function rmkidsSync (p, options) {
   } while (true)
 }
 
+module.exports = rimraf
+rimraf.sync = rimrafSync
+
 
 /***/ }),
-/* 180 */
+/* 257 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const AggregateError = __webpack_require__(258);
 
-const pMap = (iterable, mapper, options) => new Promise((resolve, reject) => {
-	options = Object.assign({
-		concurrency: Infinity
-	}, options);
-
-	if (typeof mapper !== 'function') {
-		throw new TypeError('Mapper function is required');
-	}
+module.exports = async (
+	iterable,
+	mapper,
+	{
+		concurrency = Infinity,
+		stopOnError = true
+	} = {}
+) => {
+	return new Promise((resolve, reject) => {
+		if (typeof mapper !== 'function') {
+			throw new TypeError('Mapper function is required');
+		}
 
-	const {concurrency} = options;
+		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
+			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
+		}
 
-	if (!(typeof concurrency === 'number' && concurrency >= 1)) {
-		throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
-	}
+		const ret = [];
+		const errors = [];
+		const iterator = iterable[Symbol.iterator]();
+		let isRejected = false;
+		let isIterableDone = false;
+		let resolvingCount = 0;
+		let currentIndex = 0;
 
-	const ret = [];
-	const iterator = iterable[Symbol.iterator]();
-	let isRejected = false;
-	let isIterableDone = false;
-	let resolvingCount = 0;
-	let currentIndex = 0;
+		const next = () => {
+			if (isRejected) {
+				return;
+			}
 
-	const next = () => {
-		if (isRejected) {
-			return;
-		}
+			const nextItem = iterator.next();
+			const i = currentIndex;
+			currentIndex++;
 
-		const nextItem = iterator.next();
-		const i = currentIndex;
-		currentIndex++;
+			if (nextItem.done) {
+				isIterableDone = true;
 
-		if (nextItem.done) {
-			isIterableDone = true;
+				if (resolvingCount === 0) {
+					if (!stopOnError && errors.length !== 0) {
+						reject(new AggregateError(errors));
+					} else {
+						resolve(ret);
+					}
+				}
 
-			if (resolvingCount === 0) {
-				resolve(ret);
+				return;
 			}
 
-			return;
-		}
+			resolvingCount++;
 
-		resolvingCount++;
-
-		Promise.resolve(nextItem.value)
-			.then(element => mapper(element, i))
-			.then(
-				value => {
-					ret[i] = value;
+			(async () => {
+				try {
+					const element = await nextItem.value;
+					ret[i] = await mapper(element, i);
 					resolvingCount--;
 					next();
-				},
-				error => {
-					isRejected = true;
-					reject(error);
+				} catch (error) {
+					if (stopOnError) {
+						isRejected = true;
+						reject(error);
+					} else {
+						errors.push(error);
+						resolvingCount--;
+						next();
+					}
 				}
-			);
-	};
+			})();
+		};
+
+		for (let i = 0; i < concurrency; i++) {
+			next();
+
+			if (isIterableDone) {
+				break;
+			}
+		}
+	});
+};
+
+
+/***/ }),
+/* 258 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const indentString = __webpack_require__(259);
+const cleanStack = __webpack_require__(260);
+
+const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
 
-	for (let i = 0; i < concurrency; i++) {
-		next();
+class AggregateError extends Error {
+	constructor(errors) {
+		if (!Array.isArray(errors)) {
+			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
+		}
+
+		errors = [...errors].map(error => {
+			if (error instanceof Error) {
+				return error;
+			}
+
+			if (error !== null && typeof error === 'object') {
+				// Handle plain error objects with message property and/or possibly other metadata
+				return Object.assign(new Error(error.message), error);
+			}
+
+			return new Error(error);
+		});
+
+		let message = errors
+			.map(error => {
+				// The `stack` property is not standardized, so we can't assume it exists
+				return typeof error.stack === 'string' ? cleanInternalStack(cleanStack(error.stack)) : String(error);
+			})
+			.join('\n');
+		message = '\n' + indentString(message, 4);
+		super(message);
+
+		this.name = 'AggregateError';
+
+		Object.defineProperty(this, '_errors', {value: errors});
+	}
 
-		if (isIterableDone) {
-			break;
+	* [Symbol.iterator]() {
+		for (const error of this._errors) {
+			yield error;
 		}
 	}
-});
+}
 
-module.exports = pMap;
-// TODO: Remove this for the next major release
-module.exports.default = pMap;
+module.exports = AggregateError;
 
 
 /***/ }),
-/* 181 */
+/* 259 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = (str, count, opts) => {
+	// Support older versions: use the third parameter as options.indent
+	// TODO: Remove the workaround in the next major version
+	const options = typeof opts === 'object' ? Object.assign({indent: ' '}, opts) : {indent: opts || ' '};
+	count = count === undefined ? 1 : count;
+
+	if (typeof str !== 'string') {
+		throw new TypeError(`Expected \`input\` to be a \`string\`, got \`${typeof str}\``);
+	}
+
+	if (typeof count !== 'number') {
+		throw new TypeError(`Expected \`count\` to be a \`number\`, got \`${typeof count}\``);
+	}
+
+	if (typeof options.indent !== 'string') {
+		throw new TypeError(`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``);
+	}
+
+	if (count === 0) {
+		return str;
+	}
+
+	const regex = options.includeEmptyLines ? /^/mg : /^(?!\s*$)/mg;
+	return str.replace(regex, options.indent.repeat(count));
+}
+;
+
+
+/***/ }),
+/* 260 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const os = __webpack_require__(11);
+
+const extractPathRegex = /\s+at.*(?:\(|\s)(.*)\)?/;
+const pathRegex = /^(?:(?:(?:node|(?:internal\/[\w/]*|.*node_modules\/(?:babel-polyfill|pirates)\/.*)?\w+)\.js:\d+:\d+)|native)/;
+const homeDir = os.homedir();
+
+module.exports = (stack, options) => {
+	options = Object.assign({pretty: false}, options);
+
+	return stack.replace(/\\/g, '/')
+		.split('\n')
+		.filter(line => {
+			const pathMatches = line.match(extractPathRegex);
+			if (pathMatches === null || !pathMatches[1]) {
+				return true;
+			}
+
+			const match = pathMatches[1];
+
+			// Electron
+			if (
+				match.includes('.app/Contents/Resources/electron.asar') ||
+				match.includes('.app/Contents/Resources/default_app.asar')
+			) {
+				return false;
+			}
+
+			return !pathRegex.test(match);
+		})
+		.filter(line => line.trim() !== '')
+		.map(line => {
+			if (options.pretty) {
+				return line.replace(extractPathRegex, (m, p1) => m.replace(p1, p1.replace(homeDir, '~')));
+			}
+
+			return line;
+		})
+		.join('\n');
+};
+
+
+/***/ }),
+/* 261 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const chalk = __webpack_require__(182);
-const cliCursor = __webpack_require__(186);
-const cliSpinners = __webpack_require__(190);
-const logSymbols = __webpack_require__(150);
+const chalk = __webpack_require__(262);
+const cliCursor = __webpack_require__(266);
+const cliSpinners = __webpack_require__(270);
+const logSymbols = __webpack_require__(158);
 
 class Ora {
 	constructor(options) {
@@ -25376,16 +32224,16 @@ module.exports.promise = (action, options) => {
 
 
 /***/ }),
-/* 182 */
+/* 262 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(183);
-const stdoutColor = __webpack_require__(184).stdout;
+const ansiStyles = __webpack_require__(263);
+const stdoutColor = __webpack_require__(264).stdout;
 
-const template = __webpack_require__(185);
+const template = __webpack_require__(265);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -25611,7 +32459,7 @@ module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 183 */
+/* 263 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -25784,7 +32632,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 184 */
+/* 264 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -25926,7 +32774,7 @@ module.exports = {
 
 
 /***/ }),
-/* 185 */
+/* 265 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -26061,12 +32909,12 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 186 */
+/* 266 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const restoreCursor = __webpack_require__(187);
+const restoreCursor = __webpack_require__(267);
 
 let hidden = false;
 
@@ -26107,12 +32955,12 @@ exports.toggle = (force, stream) => {
 
 
 /***/ }),
-/* 187 */
+/* 267 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const onetime = __webpack_require__(188);
+const onetime = __webpack_require__(268);
 const signalExit = __webpack_require__(110);
 
 module.exports = onetime(() => {
@@ -26123,12 +32971,12 @@ module.exports = onetime(() => {
 
 
 /***/ }),
-/* 188 */
+/* 268 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const mimicFn = __webpack_require__(189);
+const mimicFn = __webpack_require__(269);
 
 module.exports = (fn, opts) => {
 	// TODO: Remove this in v3
@@ -26169,7 +33017,7 @@ module.exports = (fn, opts) => {
 
 
 /***/ }),
-/* 189 */
+/* 269 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -26185,22 +33033,22 @@ module.exports = (to, from) => {
 
 
 /***/ }),
-/* 190 */
+/* 270 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-module.exports = __webpack_require__(191);
+module.exports = __webpack_require__(271);
 
 
 /***/ }),
-/* 191 */
+/* 271 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("{\"dots\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠹\",\"⠸\",\"⠼\",\"⠴\",\"⠦\",\"⠧\",\"⠇\",\"⠏\"]},\"dots2\":{\"interval\":80,\"frames\":[\"⣾\",\"⣽\",\"⣻\",\"⢿\",\"⡿\",\"⣟\",\"⣯\",\"⣷\"]},\"dots3\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠞\",\"⠖\",\"⠦\",\"⠴\",\"⠲\",\"⠳\",\"⠓\"]},\"dots4\":{\"interval\":80,\"frames\":[\"⠄\",\"⠆\",\"⠇\",\"⠋\",\"⠙\",\"⠸\",\"⠰\",\"⠠\",\"⠰\",\"⠸\",\"⠙\",\"⠋\",\"⠇\",\"⠆\"]},\"dots5\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\"]},\"dots6\":{\"interval\":80,\"frames\":[\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠴\",\"⠲\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠚\",\"⠙\",\"⠉\",\"⠁\"]},\"dots7\":{\"interval\":80,\"frames\":[\"⠈\",\"⠉\",\"⠋\",\"⠓\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠖\",\"⠦\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\"]},\"dots8\":{\"interval\":80,\"frames\":[\"⠁\",\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\",\"⠈\"]},\"dots9\":{\"interval\":80,\"frames\":[\"⢹\",\"⢺\",\"⢼\",\"⣸\",\"⣇\",\"⡧\",\"⡗\",\"⡏\"]},\"dots10\":{\"interval\":80,\"frames\":[\"⢄\",\"⢂\",\"⢁\",\"⡁\",\"⡈\",\"⡐\",\"⡠\"]},\"dots11\":{\"interval\":100,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⡀\",\"⢀\",\"⠠\",\"⠐\",\"⠈\"]},\"dots12\":{\"interval\":80,\"frames\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"line\":{\"interval\":130,\"frames\":[\"-\",\"\\\\\",\"|\",\"/\"]},\"line2\":{\"interval\":100,\"frames\":[\"⠂\",\"-\",\"–\",\"—\",\"–\",\"-\"]},\"pipe\":{\"interval\":100,\"frames\":[\"┤\",\"┘\",\"┴\",\"└\",\"├\",\"┌\",\"┬\",\"┐\"]},\"simpleDots\":{\"interval\":400,\"frames\":[\".  \",\".. \",\"...\",\"   \"]},\"simpleDotsScrolling\":{\"interval\":200,\"frames\":[\".  \",\".. \",\"...\",\" ..\",\"  .\",\"   \"]},\"star\":{\"interval\":70,\"frames\":[\"✶\",\"✸\",\"✹\",\"✺\",\"✹\",\"✷\"]},\"star2\":{\"interval\":80,\"frames\":[\"+\",\"x\",\"*\"]},\"flip\":{\"interval\":70,\"frames\":[\"_\",\"_\",\"_\",\"-\",\"`\",\"`\",\"'\",\"´\",\"-\",\"_\",\"_\",\"_\"]},\"hamburger\":{\"interval\":100,\"frames\":[\"☱\",\"☲\",\"☴\"]},\"growVertical\":{\"interval\":120,\"frames\":[\"▁\",\"▃\",\"▄\",\"▅\",\"▆\",\"▇\",\"▆\",\"▅\",\"▄\",\"▃\"]},\"growHorizontal\":{\"interval\":120,\"frames\":[\"▏\",\"▎\",\"▍\",\"▌\",\"▋\",\"▊\",\"▉\",\"▊\",\"▋\",\"▌\",\"▍\",\"▎\"]},\"balloon\":{\"interval\":140,\"frames\":[\" \",\".\",\"o\",\"O\",\"@\",\"*\",\" \"]},\"balloon2\":{\"interval\":120,\"frames\":[\".\",\"o\",\"O\",\"°\",\"O\",\"o\",\".\"]},\"noise\":{\"interval\":100,\"frames\":[\"▓\",\"▒\",\"░\"]},\"bounce\":{\"interval\":120,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⠂\"]},\"boxBounce\":{\"interval\":120,\"frames\":[\"▖\",\"▘\",\"▝\",\"▗\"]},\"boxBounce2\":{\"interval\":100,\"frames\":[\"▌\",\"▀\",\"▐\",\"▄\"]},\"triangle\":{\"interval\":50,\"frames\":[\"◢\",\"◣\",\"◤\",\"◥\"]},\"arc\":{\"interval\":100,\"frames\":[\"◜\",\"◠\",\"◝\",\"◞\",\"◡\",\"◟\"]},\"circle\":{\"interval\":120,\"frames\":[\"◡\",\"⊙\",\"◠\"]},\"squareCorners\":{\"interval\":180,\"frames\":[\"◰\",\"◳\",\"◲\",\"◱\"]},\"circleQuarters\":{\"interval\":120,\"frames\":[\"◴\",\"◷\",\"◶\",\"◵\"]},\"circleHalves\":{\"interval\":50,\"frames\":[\"◐\",\"◓\",\"◑\",\"◒\"]},\"squish\":{\"interval\":100,\"frames\":[\"╫\",\"╪\"]},\"toggle\":{\"interval\":250,\"frames\":[\"⊶\",\"⊷\"]},\"toggle2\":{\"interval\":80,\"frames\":[\"▫\",\"▪\"]},\"toggle3\":{\"interval\":120,\"frames\":[\"□\",\"■\"]},\"toggle4\":{\"interval\":100,\"frames\":[\"■\",\"□\",\"▪\",\"▫\"]},\"toggle5\":{\"interval\":100,\"frames\":[\"▮\",\"▯\"]},\"toggle6\":{\"interval\":300,\"frames\":[\"ဝ\",\"၀\"]},\"toggle7\":{\"interval\":80,\"frames\":[\"⦾\",\"⦿\"]},\"toggle8\":{\"interval\":100,\"frames\":[\"◍\",\"◌\"]},\"toggle9\":{\"interval\":100,\"frames\":[\"◉\",\"◎\"]},\"toggle10\":{\"interval\":100,\"frames\":[\"㊂\",\"㊀\",\"㊁\"]},\"toggle11\":{\"interval\":50,\"frames\":[\"⧇\",\"⧆\"]},\"toggle12\":{\"interval\":120,\"frames\":[\"☗\",\"☖\"]},\"toggle13\":{\"interval\":80,\"frames\":[\"=\",\"*\",\"-\"]},\"arrow\":{\"interval\":100,\"frames\":[\"←\",\"↖\",\"↑\",\"↗\",\"→\",\"↘\",\"↓\",\"↙\"]},\"arrow2\":{\"interval\":80,\"frames\":[\"⬆️ \",\"↗️ \",\"➡️ \",\"↘️ \",\"⬇️ \",\"↙️ \",\"⬅️ \",\"↖️ \"]},\"arrow3\":{\"interval\":120,\"frames\":[\"▹▹▹▹▹\",\"▸▹▹▹▹\",\"▹▸▹▹▹\",\"▹▹▸▹▹\",\"▹▹▹▸▹\",\"▹▹▹▹▸\"]},\"bouncingBar\":{\"interval\":80,\"frames\":[\"[    ]\",\"[=   ]\",\"[==  ]\",\"[=== ]\",\"[ ===]\",\"[  ==]\",\"[   =]\",\"[    ]\",\"[   =]\",\"[  ==]\",\"[ ===]\",\"[====]\",\"[=== ]\",\"[==  ]\",\"[=   ]\"]},\"bouncingBall\":{\"interval\":80,\"frames\":[\"( ●    )\",\"(  ●   )\",\"(   ●  )\",\"(    ● )\",\"(     ●)\",\"(    ● )\",\"(   ●  )\",\"(  ●   )\",\"( ●    )\",\"(●     )\"]},\"smiley\":{\"interval\":200,\"frames\":[\"😄 \",\"😝 \"]},\"monkey\":{\"interval\":300,\"frames\":[\"🙈 \",\"🙈 \",\"🙉 \",\"🙊 \"]},\"hearts\":{\"interval\":100,\"frames\":[\"💛 \",\"💙 \",\"💜 \",\"💚 \",\"❤️ \"]},\"clock\":{\"interval\":100,\"frames\":[\"🕐 \",\"🕑 \",\"🕒 \",\"🕓 \",\"🕔 \",\"🕕 \",\"🕖 \",\"🕗 \",\"🕘 \",\"🕙 \",\"🕚 \"]},\"earth\":{\"interval\":180,\"frames\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"moon\":{\"interval\":80,\"frames\":[\"🌑 \",\"🌒 \",\"🌓 \",\"🌔 \",\"🌕 \",\"🌖 \",\"🌗 \",\"🌘 \"]},\"runner\":{\"interval\":140,\"frames\":[\"🚶 \",\"🏃 \"]},\"pong\":{\"interval\":80,\"frames\":[\"▐⠂       ▌\",\"▐⠈       ▌\",\"▐ ⠂      ▌\",\"▐ ⠠      ▌\",\"▐  ⡀     ▌\",\"▐  ⠠     ▌\",\"▐   ⠂    ▌\",\"▐   ⠈    ▌\",\"▐    ⠂   ▌\",\"▐    ⠠   ▌\",\"▐     ⡀  ▌\",\"▐     ⠠  ▌\",\"▐      ⠂ ▌\",\"▐      ⠈ ▌\",\"▐       ⠂▌\",\"▐       ⠠▌\",\"▐       ⡀▌\",\"▐      ⠠ ▌\",\"▐      ⠂ ▌\",\"▐     ⠈  ▌\",\"▐     ⠂  ▌\",\"▐    ⠠   ▌\",\"▐    ⡀   ▌\",\"▐   ⠠    ▌\",\"▐   ⠂    ▌\",\"▐  ⠈     ▌\",\"▐  ⠂     ▌\",\"▐ ⠠      ▌\",\"▐ ⡀      ▌\",\"▐⠠       ▌\"]},\"shark\":{\"interval\":120,\"frames\":[\"▐|\\\\____________▌\",\"▐_|\\\\___________▌\",\"▐__|\\\\__________▌\",\"▐___|\\\\_________▌\",\"▐____|\\\\________▌\",\"▐_____|\\\\_______▌\",\"▐______|\\\\______▌\",\"▐_______|\\\\_____▌\",\"▐________|\\\\____▌\",\"▐_________|\\\\___▌\",\"▐__________|\\\\__▌\",\"▐___________|\\\\_▌\",\"▐____________|\\\\▌\",\"▐____________/|▌\",\"▐___________/|_▌\",\"▐__________/|__▌\",\"▐_________/|___▌\",\"▐________/|____▌\",\"▐_______/|_____▌\",\"▐______/|______▌\",\"▐_____/|_______▌\",\"▐____/|________▌\",\"▐___/|_________▌\",\"▐__/|__________▌\",\"▐_/|___________▌\",\"▐/|____________▌\"]},\"dqpb\":{\"interval\":100,\"frames\":[\"d\",\"q\",\"p\",\"b\"]},\"weather\":{\"interval\":100,\"frames\":[\"☀️ \",\"☀️ \",\"☀️ \",\"🌤 \",\"⛅️ \",\"🌥 \",\"☁️ \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"⛈ \",\"🌨 \",\"🌧 \",\"🌨 \",\"☁️ \",\"🌥 \",\"⛅️ \",\"🌤 \",\"☀️ \",\"☀️ \"]},\"christmas\":{\"interval\":400,\"frames\":[\"🌲\",\"🎄\"]}}");
 
 /***/ }),
-/* 192 */
+/* 272 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -26260,7 +33108,7 @@ const RunCommand = {
 };
 
 /***/ }),
-/* 193 */
+/* 273 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -26271,7 +33119,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
 /* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35);
 /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(36);
-/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(194);
+/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(274);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -26355,14 +33203,14 @@ const WatchCommand = {
 };
 
 /***/ }),
-/* 194 */
+/* 274 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waitUntilWatchIsReady", function() { return waitUntilWatchIsReady; });
-/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(195);
-/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(275);
+/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(377);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -26429,169 +33277,177 @@ function waitUntilWatchIsReady(stream, opts = {}) {
 }
 
 /***/ }),
-/* 195 */
+/* 275 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
+/* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return _internal_Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]; });
 
-/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(214);
+/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(293);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["ConnectableObservable"]; });
 
-/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(219);
+/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(298);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__["GroupedObservable"]; });
 
-/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(211);
+/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(290);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__["observable"]; });
 
-/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(215);
+/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(294);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _internal_Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]; });
 
-/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(220);
+/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(299);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__["BehaviorSubject"]; });
 
-/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(221);
+/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(300);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__["ReplaySubject"]; });
 
-/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(238);
+/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(317);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__["AsyncSubject"]; });
 
-/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(239);
+/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(318);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["asap"]; });
 
-/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(243);
+/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(322);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["async"]; });
 
-/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(222);
+/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(301);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["queue"]; });
 
-/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(244);
+/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(323);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["animationFrame"]; });
 
-/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(247);
+/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(326);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualTimeScheduler"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualAction"]; });
 
-/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(228);
+/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(307);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__["Scheduler"]; });
 
-/* harmony import */ var _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(204);
+/* harmony import */ var _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(284);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__["Subscription"]; });
 
-/* harmony import */ var _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(198);
+/* harmony import */ var _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(278);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__["Subscriber"]; });
 
-/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(230);
+/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(309);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["Notification"]; });
 
-/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(212);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["NotificationKind"]; });
+
+/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(291);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__["pipe"]; });
 
-/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(213);
+/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(292);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__["noop"]; });
 
-/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(248);
+/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(327);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__["identity"]; });
 
-/* harmony import */ var _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(249);
+/* harmony import */ var _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(328);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__["isObservable"]; });
 
-/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(250);
+/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(329);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__["ArgumentOutOfRangeError"]; });
 
-/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(251);
+/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(330);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__["EmptyError"]; });
 
-/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(216);
+/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(295);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__["ObjectUnsubscribedError"]; });
 
-/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(209);
+/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(287);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__["UnsubscriptionError"]; });
 
-/* harmony import */ var _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(252);
+/* harmony import */ var _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(331);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__["TimeoutError"]; });
 
-/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(253);
+/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(332);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__["bindCallback"]; });
 
-/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(255);
+/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(334);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__["bindNodeCallback"]; });
 
-/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(256);
+/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(335);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__["combineLatest"]; });
 
-/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(267);
+/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(346);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__["concat"]; });
 
-/* harmony import */ var _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(277);
+/* harmony import */ var _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(357);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__["defer"]; });
 
-/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(231);
+/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(310);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["empty"]; });
 
-/* harmony import */ var _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(278);
+/* harmony import */ var _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(358);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__["forkJoin"]; });
 
-/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(268);
+/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(350);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "from", function() { return _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__["from"]; });
 
-/* harmony import */ var _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(279);
+/* harmony import */ var _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(359);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__["fromEvent"]; });
 
-/* harmony import */ var _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(280);
+/* harmony import */ var _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(360);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_35__["fromEventPattern"]; });
 
-/* harmony import */ var _internal_observable_generate__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(281);
+/* harmony import */ var _internal_observable_generate__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(361);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return _internal_observable_generate__WEBPACK_IMPORTED_MODULE_36__["generate"]; });
 
-/* harmony import */ var _internal_observable_iif__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(282);
+/* harmony import */ var _internal_observable_iif__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(362);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return _internal_observable_iif__WEBPACK_IMPORTED_MODULE_37__["iif"]; });
 
-/* harmony import */ var _internal_observable_interval__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(283);
+/* harmony import */ var _internal_observable_interval__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(363);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return _internal_observable_interval__WEBPACK_IMPORTED_MODULE_38__["interval"]; });
 
-/* harmony import */ var _internal_observable_merge__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(285);
+/* harmony import */ var _internal_observable_merge__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(365);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_observable_merge__WEBPACK_IMPORTED_MODULE_39__["merge"]; });
 
-/* harmony import */ var _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(286);
+/* harmony import */ var _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(366);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "never", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["never"]; });
 
-/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(232);
+/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(311);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "of", function() { return _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__["of"]; });
 
-/* harmony import */ var _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(287);
+/* harmony import */ var _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(367);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__["onErrorResumeNext"]; });
 
-/* harmony import */ var _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(288);
+/* harmony import */ var _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(368);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__["pairs"]; });
 
-/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(289);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_44__["race"]; });
+/* harmony import */ var _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(369);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__["partition"]; });
+
+/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(372);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__["race"]; });
+
+/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(373);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__["range"]; });
 
-/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(290);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_45__["range"]; });
+/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(316);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__["throwError"]; });
 
-/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(237);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_46__["throwError"]; });
+/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(374);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__["timer"]; });
 
-/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(291);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_47__["timer"]; });
+/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(375);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__["using"]; });
 
-/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(292);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_48__["using"]; });
+/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(376);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__["zip"]; });
 
-/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(293);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_49__["zip"]; });
+/* harmony import */ var _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(351);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__["scheduled"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["EMPTY"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["NEVER"]; });
 
-/* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(202);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_50__["config"]; });
+/* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(282);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_52__["config"]; });
 
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
 
@@ -26644,6 +33500,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
 
 
 
@@ -26651,17 +33509,19 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 196 */
+/* 276 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return Observable; });
-/* harmony import */ var _util_toSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(197);
-/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(211);
-/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(212);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(202);
-/** PURE_IMPORTS_START _util_toSubscriber,_internal_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */
+/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(277);
+/* harmony import */ var _util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(289);
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(290);
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(291);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(282);
+/** PURE_IMPORTS_START _util_canReportError,_util_toSubscriber,_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */
+
 
 
 
@@ -26681,16 +33541,16 @@ var Observable = /*@__PURE__*/ (function () {
     };
     Observable.prototype.subscribe = function (observerOrNext, error, complete) {
         var operator = this.operator;
-        var sink = Object(_util_toSubscriber__WEBPACK_IMPORTED_MODULE_0__["toSubscriber"])(observerOrNext, error, complete);
+        var sink = Object(_util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__["toSubscriber"])(observerOrNext, error, complete);
         if (operator) {
-            operator.call(sink, this.source);
+            sink.add(operator.call(sink, this.source));
         }
         else {
-            sink.add(this.source || (_config__WEBPACK_IMPORTED_MODULE_3__["config"].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ?
+            sink.add(this.source || (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ?
                 this._subscribe(sink) :
                 this._trySubscribe(sink));
         }
-        if (_config__WEBPACK_IMPORTED_MODULE_3__["config"].useDeprecatedSynchronousErrorHandling) {
+        if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) {
             if (sink.syncErrorThrowable) {
                 sink.syncErrorThrowable = false;
                 if (sink.syncErrorThrown) {
@@ -26705,11 +33565,16 @@ var Observable = /*@__PURE__*/ (function () {
             return this._subscribe(sink);
         }
         catch (err) {
-            if (_config__WEBPACK_IMPORTED_MODULE_3__["config"].useDeprecatedSynchronousErrorHandling) {
+            if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) {
                 sink.syncErrorThrown = true;
                 sink.syncErrorValue = err;
             }
-            sink.error(err);
+            if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_0__["canReportError"])(sink)) {
+                sink.error(err);
+            }
+            else {
+                console.warn(err);
+            }
         }
     };
     Observable.prototype.forEach = function (next, promiseCtor) {
@@ -26734,7 +33599,7 @@ var Observable = /*@__PURE__*/ (function () {
         var source = this.source;
         return source && source.subscribe(subscriber);
     };
-    Observable.prototype[_internal_symbol_observable__WEBPACK_IMPORTED_MODULE_1__["observable"]] = function () {
+    Observable.prototype[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]] = function () {
         return this;
     };
     Observable.prototype.pipe = function () {
@@ -26745,7 +33610,7 @@ var Observable = /*@__PURE__*/ (function () {
         if (operations.length === 0) {
             return this;
         }
-        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_2__["pipeFromArray"])(operations)(this);
+        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipeFromArray"])(operations)(this);
     };
     Observable.prototype.toPromise = function (promiseCtor) {
         var _this = this;
@@ -26763,7 +33628,7 @@ var Observable = /*@__PURE__*/ (function () {
 
 function getPromiseCtor(promiseCtor) {
     if (!promiseCtor) {
-        promiseCtor = _config__WEBPACK_IMPORTED_MODULE_3__["config"].Promise || Promise;
+        promiseCtor = _config__WEBPACK_IMPORTED_MODULE_4__["config"].Promise || Promise;
     }
     if (!promiseCtor) {
         throw new Error('no Promise impl found');
@@ -26774,50 +33639,48 @@ function getPromiseCtor(promiseCtor) {
 
 
 /***/ }),
-/* 197 */
+/* 277 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toSubscriber", function() { return toSubscriber; });
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(198);
-/* harmony import */ var _symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(210);
-/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(201);
-/** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */
-
-
-
-function toSubscriber(nextOrObserver, error, complete) {
-    if (nextOrObserver) {
-        if (nextOrObserver instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) {
-            return nextOrObserver;
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canReportError", function() { return canReportError; });
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(278);
+/** PURE_IMPORTS_START _Subscriber PURE_IMPORTS_END */
+
+function canReportError(observer) {
+    while (observer) {
+        var _a = observer, closed_1 = _a.closed, destination = _a.destination, isStopped = _a.isStopped;
+        if (closed_1 || isStopped) {
+            return false;
         }
-        if (nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]) {
-            return nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]();
+        else if (destination && destination instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) {
+            observer = destination;
+        }
+        else {
+            observer = null;
         }
     }
-    if (!nextOrObserver && !error && !complete) {
-        return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](_Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]);
-    }
-    return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](nextOrObserver, error, complete);
+    return true;
 }
-//# sourceMappingURL=toSubscriber.js.map
+//# sourceMappingURL=canReportError.js.map
 
 
 /***/ }),
-/* 198 */
+/* 278 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return Subscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(200);
-/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(201);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(204);
-/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(210);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(202);
-/* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(203);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SafeSubscriber", function() { return SafeSubscriber; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(280);
+/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(281);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(284);
+/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(288);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(282);
+/* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(283);
 /** PURE_IMPORTS_START tslib,_util_isFunction,_Observer,_Subscription,_internal_symbol_rxSubscriber,_config,_util_hostReportError PURE_IMPORTS_END */
 
 
@@ -26844,11 +33707,10 @@ var Subscriber = /*@__PURE__*/ (function (_super) {
                     break;
                 }
                 if (typeof destinationOrNext === 'object') {
-                    if (isTrustedSubscriber(destinationOrNext)) {
-                        var trustedSubscriber = destinationOrNext[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__["rxSubscriber"]]();
-                        _this.syncErrorThrowable = trustedSubscriber.syncErrorThrowable;
-                        _this.destination = trustedSubscriber;
-                        trustedSubscriber.add(_this);
+                    if (destinationOrNext instanceof Subscriber) {
+                        _this.syncErrorThrowable = destinationOrNext.syncErrorThrowable;
+                        _this.destination = destinationOrNext;
+                        destinationOrNext.add(_this);
                     }
                     else {
                         _this.syncErrorThrowable = true;
@@ -26905,14 +33767,12 @@ var Subscriber = /*@__PURE__*/ (function (_super) {
         this.unsubscribe();
     };
     Subscriber.prototype._unsubscribeAndRecycle = function () {
-        var _a = this, _parent = _a._parent, _parents = _a._parents;
-        this._parent = null;
-        this._parents = null;
+        var _parentOrParents = this._parentOrParents;
+        this._parentOrParents = null;
         this.unsubscribe();
         this.closed = false;
         this.isStopped = false;
-        this._parent = _parent;
-        this._parents = _parents;
+        this._parentOrParents = _parentOrParents;
         return this;
     };
     return Subscriber;
@@ -27052,14 +33912,12 @@ var SafeSubscriber = /*@__PURE__*/ (function (_super) {
     };
     return SafeSubscriber;
 }(Subscriber));
-function isTrustedSubscriber(obj) {
-    return obj instanceof Subscriber || ('syncErrorThrowable' in obj && obj[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__["rxSubscriber"]]);
-}
+
 //# sourceMappingURL=Subscriber.js.map
 
 
 /***/ }),
-/* 199 */
+/* 279 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27272,7 +34130,7 @@ function __importDefault(mod) {
 
 
 /***/ }),
-/* 200 */
+/* 280 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27286,14 +34144,14 @@ function isFunction(x) {
 
 
 /***/ }),
-/* 201 */
+/* 281 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return empty; });
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(202);
-/* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(203);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(282);
+/* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(283);
 /** PURE_IMPORTS_START _config,_util_hostReportError PURE_IMPORTS_END */
 
 
@@ -27314,7 +34172,7 @@ var empty = {
 
 
 /***/ }),
-/* 202 */
+/* 282 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27342,7 +34200,7 @@ var config = {
 
 
 /***/ }),
-/* 203 */
+/* 283 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27350,27 +34208,23 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hostReportError", function() { return hostReportError; });
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
 function hostReportError(err) {
-    setTimeout(function () { throw err; });
+    setTimeout(function () { throw err; }, 0);
 }
 //# sourceMappingURL=hostReportError.js.map
 
 
 /***/ }),
-/* 204 */
+/* 284 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return Subscription; });
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(205);
-/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(206);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(200);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(208);
-/* harmony import */ var _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(209);
-/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_tryCatch,_util_errorObject,_util_UnsubscriptionError PURE_IMPORTS_END */
-
-
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(285);
+/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(286);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(280);
+/* harmony import */ var _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(287);
+/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_UnsubscriptionError PURE_IMPORTS_END */
 
 
 
@@ -27378,94 +34232,112 @@ __webpack_require__.r(__webpack_exports__);
 var Subscription = /*@__PURE__*/ (function () {
     function Subscription(unsubscribe) {
         this.closed = false;
-        this._parent = null;
-        this._parents = null;
+        this._parentOrParents = null;
         this._subscriptions = null;
         if (unsubscribe) {
             this._unsubscribe = unsubscribe;
         }
     }
     Subscription.prototype.unsubscribe = function () {
-        var hasErrors = false;
         var errors;
         if (this.closed) {
             return;
         }
-        var _a = this, _parent = _a._parent, _parents = _a._parents, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions;
+        var _a = this, _parentOrParents = _a._parentOrParents, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions;
         this.closed = true;
-        this._parent = null;
-        this._parents = null;
+        this._parentOrParents = null;
         this._subscriptions = null;
-        var index = -1;
-        var len = _parents ? _parents.length : 0;
-        while (_parent) {
-            _parent.remove(this);
-            _parent = ++index < len && _parents[index] || null;
+        if (_parentOrParents instanceof Subscription) {
+            _parentOrParents.remove(this);
+        }
+        else if (_parentOrParents !== null) {
+            for (var index = 0; index < _parentOrParents.length; ++index) {
+                var parent_1 = _parentOrParents[index];
+                parent_1.remove(this);
+            }
         }
         if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(_unsubscribe)) {
-            var trial = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_3__["tryCatch"])(_unsubscribe).call(this);
-            if (trial === _util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"]) {
-                hasErrors = true;
-                errors = errors || (_util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__["UnsubscriptionError"] ?
-                    flattenUnsubscriptionErrors(_util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e.errors) : [_util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e]);
+            try {
+                _unsubscribe.call(this);
+            }
+            catch (e) {
+                errors = e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"] ? flattenUnsubscriptionErrors(e.errors) : [e];
             }
         }
         if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(_subscriptions)) {
-            index = -1;
-            len = _subscriptions.length;
+            var index = -1;
+            var len = _subscriptions.length;
             while (++index < len) {
                 var sub = _subscriptions[index];
                 if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_1__["isObject"])(sub)) {
-                    var trial = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_3__["tryCatch"])(sub.unsubscribe).call(sub);
-                    if (trial === _util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"]) {
-                        hasErrors = true;
+                    try {
+                        sub.unsubscribe();
+                    }
+                    catch (e) {
                         errors = errors || [];
-                        var err = _util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e;
-                        if (err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__["UnsubscriptionError"]) {
-                            errors = errors.concat(flattenUnsubscriptionErrors(err.errors));
+                        if (e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"]) {
+                            errors = errors.concat(flattenUnsubscriptionErrors(e.errors));
                         }
                         else {
-                            errors.push(err);
+                            errors.push(e);
                         }
                     }
                 }
             }
         }
-        if (hasErrors) {
-            throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__["UnsubscriptionError"](errors);
+        if (errors) {
+            throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"](errors);
         }
     };
     Subscription.prototype.add = function (teardown) {
-        if (!teardown || (teardown === Subscription.EMPTY)) {
+        var subscription = teardown;
+        if (!teardown) {
             return Subscription.EMPTY;
         }
-        if (teardown === this) {
-            return this;
-        }
-        var subscription = teardown;
         switch (typeof teardown) {
             case 'function':
                 subscription = new Subscription(teardown);
             case 'object':
-                if (subscription.closed || typeof subscription.unsubscribe !== 'function') {
+                if (subscription === this || subscription.closed || typeof subscription.unsubscribe !== 'function') {
                     return subscription;
                 }
                 else if (this.closed) {
                     subscription.unsubscribe();
                     return subscription;
                 }
-                else if (typeof subscription._addParent !== 'function') {
+                else if (!(subscription instanceof Subscription)) {
                     var tmp = subscription;
                     subscription = new Subscription();
                     subscription._subscriptions = [tmp];
                 }
                 break;
-            default:
+            default: {
                 throw new Error('unrecognized teardown ' + teardown + ' added to Subscription.');
+            }
+        }
+        var _parentOrParents = subscription._parentOrParents;
+        if (_parentOrParents === null) {
+            subscription._parentOrParents = this;
+        }
+        else if (_parentOrParents instanceof Subscription) {
+            if (_parentOrParents === this) {
+                return subscription;
+            }
+            subscription._parentOrParents = [_parentOrParents, this];
+        }
+        else if (_parentOrParents.indexOf(this) === -1) {
+            _parentOrParents.push(this);
+        }
+        else {
+            return subscription;
+        }
+        var subscriptions = this._subscriptions;
+        if (subscriptions === null) {
+            this._subscriptions = [subscription];
+        }
+        else {
+            subscriptions.push(subscription);
         }
-        var subscriptions = this._subscriptions || (this._subscriptions = []);
-        subscriptions.push(subscription);
-        subscription._addParent(this);
         return subscription;
     };
     Subscription.prototype.remove = function (subscription) {
@@ -27477,18 +34349,6 @@ var Subscription = /*@__PURE__*/ (function () {
             }
         }
     };
-    Subscription.prototype._addParent = function (parent) {
-        var _a = this, _parent = _a._parent, _parents = _a._parents;
-        if (!_parent || _parent === parent) {
-            this._parent = parent;
-        }
-        else if (!_parents) {
-            this._parents = [parent];
-        }
-        else if (_parents.indexOf(parent) === -1) {
-            _parents.push(parent);
-        }
-    };
     Subscription.EMPTY = (function (empty) {
         empty.closed = true;
         return empty;
@@ -27497,25 +34357,25 @@ var Subscription = /*@__PURE__*/ (function () {
 }());
 
 function flattenUnsubscriptionErrors(errors) {
-    return errors.reduce(function (errs, err) { return errs.concat((err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_5__["UnsubscriptionError"]) ? err.errors : err); }, []);
+    return errors.reduce(function (errs, err) { return errs.concat((err instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"]) ? err.errors : err); }, []);
 }
 //# sourceMappingURL=Subscription.js.map
 
 
 /***/ }),
-/* 205 */
+/* 285 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArray", function() { return isArray; });
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var isArray = Array.isArray || (function (x) { return x && typeof x.length === 'number'; });
+var isArray = /*@__PURE__*/ (function () { return Array.isArray || (function (x) { return x && typeof x.length === 'number'; }); })();
 //# sourceMappingURL=isArray.js.map
 
 
 /***/ }),
-/* 206 */
+/* 286 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27523,113 +34383,105 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isObject", function() { return isObject; });
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
 function isObject(x) {
-    return x != null && typeof x === 'object';
+    return x !== null && typeof x === 'object';
 }
 //# sourceMappingURL=isObject.js.map
 
 
 /***/ }),
-/* 207 */
+/* 287 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tryCatch", function() { return tryCatch; });
-/* harmony import */ var _errorObject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(208);
-/** PURE_IMPORTS_START _errorObject PURE_IMPORTS_END */
-
-var tryCatchTarget;
-function tryCatcher() {
-    try {
-        return tryCatchTarget.apply(this, arguments);
-    }
-    catch (e) {
-        _errorObject__WEBPACK_IMPORTED_MODULE_0__["errorObject"].e = e;
-        return _errorObject__WEBPACK_IMPORTED_MODULE_0__["errorObject"];
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return UnsubscriptionError; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var UnsubscriptionErrorImpl = /*@__PURE__*/ (function () {
+    function UnsubscriptionErrorImpl(errors) {
+        Error.call(this);
+        this.message = errors ?
+            errors.length + " errors occurred during unsubscription:\n" + errors.map(function (err, i) { return i + 1 + ") " + err.toString(); }).join('\n  ') : '';
+        this.name = 'UnsubscriptionError';
+        this.errors = errors;
+        return this;
     }
-}
-function tryCatch(fn) {
-    tryCatchTarget = fn;
-    return tryCatcher;
-}
-//# sourceMappingURL=tryCatch.js.map
+    UnsubscriptionErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return UnsubscriptionErrorImpl;
+})();
+var UnsubscriptionError = UnsubscriptionErrorImpl;
+//# sourceMappingURL=UnsubscriptionError.js.map
 
 
 /***/ }),
-/* 208 */
+/* 288 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "errorObject", function() { return errorObject; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rxSubscriber", function() { return rxSubscriber; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$rxSubscriber", function() { return $$rxSubscriber; });
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var errorObject = { e: {} };
-//# sourceMappingURL=errorObject.js.map
+var rxSubscriber = /*@__PURE__*/ (function () {
+    return typeof Symbol === 'function'
+        ? /*@__PURE__*/ Symbol('rxSubscriber')
+        : '@@rxSubscriber_' + /*@__PURE__*/ Math.random();
+})();
+var $$rxSubscriber = rxSubscriber;
+//# sourceMappingURL=rxSubscriber.js.map
 
 
 /***/ }),
-/* 209 */
+/* 289 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return UnsubscriptionError; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */
-
-var UnsubscriptionError = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](UnsubscriptionError, _super);
-    function UnsubscriptionError(errors) {
-        var _this = _super.call(this, errors ?
-            errors.length + " errors occurred during unsubscription:\n  " + errors.map(function (err, i) { return i + 1 + ") " + err.toString(); }).join('\n  ') : '') || this;
-        _this.errors = errors;
-        _this.name = 'UnsubscriptionError';
-        Object.setPrototypeOf(_this, UnsubscriptionError.prototype);
-        return _this;
-    }
-    return UnsubscriptionError;
-}(Error));
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toSubscriber", function() { return toSubscriber; });
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(278);
+/* harmony import */ var _symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(288);
+/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(281);
+/** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */
 
-//# sourceMappingURL=UnsubscriptionError.js.map
 
 
-/***/ }),
-/* 210 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rxSubscriber", function() { return rxSubscriber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$rxSubscriber", function() { return $$rxSubscriber; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var rxSubscriber = (typeof Symbol === 'function' && typeof Symbol.for === 'function')
-    ? /*@__PURE__*/ Symbol.for('rxSubscriber')
-    : '@@rxSubscriber';
-var $$rxSubscriber = rxSubscriber;
-//# sourceMappingURL=rxSubscriber.js.map
+function toSubscriber(nextOrObserver, error, complete) {
+    if (nextOrObserver) {
+        if (nextOrObserver instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) {
+            return nextOrObserver;
+        }
+        if (nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]) {
+            return nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]();
+        }
+    }
+    if (!nextOrObserver && !error && !complete) {
+        return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](_Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]);
+    }
+    return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](nextOrObserver, error, complete);
+}
+//# sourceMappingURL=toSubscriber.js.map
 
 
 /***/ }),
-/* 211 */
+/* 290 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return observable; });
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var observable = typeof Symbol === 'function' && Symbol.observable || '@@observable';
+var observable = /*@__PURE__*/ (function () { return typeof Symbol === 'function' && Symbol.observable || '@@observable'; })();
 //# sourceMappingURL=observable.js.map
 
 
 /***/ }),
-/* 212 */
+/* 291 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return pipe; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipeFromArray", function() { return pipeFromArray; });
-/* harmony import */ var _noop__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(213);
+/* harmony import */ var _noop__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(292);
 /** PURE_IMPORTS_START _noop PURE_IMPORTS_END */
 
 function pipe() {
@@ -27654,7 +34506,7 @@ function pipeFromArray(fns) {
 
 
 /***/ }),
-/* 213 */
+/* 292 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27666,19 +34518,19 @@ function noop() { }
 
 
 /***/ }),
-/* 214 */
+/* 293 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return ConnectableObservable; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "connectableObservableDescriptor", function() { return connectableObservableDescriptor; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(196);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(198);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(204);
-/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(218);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(276);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(278);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(284);
+/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(297);
 /** PURE_IMPORTS_START tslib,_Subject,_Observable,_Subscriber,_Subscription,_operators_refCount PURE_IMPORTS_END */
 
 
@@ -27717,9 +34569,6 @@ var ConnectableObservable = /*@__PURE__*/ (function (_super) {
                 this._connection = null;
                 connection = _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"].EMPTY;
             }
-            else {
-                this._connection = connection;
-            }
         }
         return connection;
     };
@@ -27729,18 +34578,20 @@ var ConnectableObservable = /*@__PURE__*/ (function (_super) {
     return ConnectableObservable;
 }(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]));
 
-var connectableProto = ConnectableObservable.prototype;
-var connectableObservableDescriptor = {
-    operator: { value: null },
-    _refCount: { value: 0, writable: true },
-    _subject: { value: null, writable: true },
-    _connection: { value: null, writable: true },
-    _subscribe: { value: connectableProto._subscribe },
-    _isComplete: { value: connectableProto._isComplete, writable: true },
-    getSubject: { value: connectableProto.getSubject },
-    connect: { value: connectableProto.connect },
-    refCount: { value: connectableProto.refCount }
-};
+var connectableObservableDescriptor = /*@__PURE__*/ (function () {
+    var connectableProto = ConnectableObservable.prototype;
+    return {
+        operator: { value: null },
+        _refCount: { value: 0, writable: true },
+        _subject: { value: null, writable: true },
+        _connection: { value: null, writable: true },
+        _subscribe: { value: connectableProto._subscribe },
+        _isComplete: { value: connectableProto._isComplete, writable: true },
+        getSubject: { value: connectableProto.getSubject },
+        connect: { value: connectableProto.connect },
+        refCount: { value: connectableProto.refCount }
+    };
+})();
 var ConnectableSubscriber = /*@__PURE__*/ (function (_super) {
     tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableSubscriber, _super);
     function ConnectableSubscriber(destination, connectable) {
@@ -27825,7 +34676,7 @@ var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 215 */
+/* 294 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -27833,13 +34684,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscriber", function() { return SubjectSubscriber; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return Subject; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnonymousSubject", function() { return AnonymousSubject; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(196);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(198);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(204);
-/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(216);
-/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(217);
-/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(210);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(276);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(278);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(284);
+/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(295);
+/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(296);
+/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(288);
 /** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */
 
 
@@ -28001,38 +34852,36 @@ var AnonymousSubject = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 216 */
+/* 295 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return ObjectUnsubscribedError; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */
-
-var ObjectUnsubscribedError = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ObjectUnsubscribedError, _super);
-    function ObjectUnsubscribedError() {
-        var _this = _super.call(this, 'object unsubscribed') || this;
-        _this.name = 'ObjectUnsubscribedError';
-        Object.setPrototypeOf(_this, ObjectUnsubscribedError.prototype);
-        return _this;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var ObjectUnsubscribedErrorImpl = /*@__PURE__*/ (function () {
+    function ObjectUnsubscribedErrorImpl() {
+        Error.call(this);
+        this.message = 'object unsubscribed';
+        this.name = 'ObjectUnsubscribedError';
+        return this;
     }
-    return ObjectUnsubscribedError;
-}(Error));
-
+    ObjectUnsubscribedErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return ObjectUnsubscribedErrorImpl;
+})();
+var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl;
 //# sourceMappingURL=ObjectUnsubscribedError.js.map
 
 
 /***/ }),
-/* 217 */
+/* 296 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscription", function() { return SubjectSubscription; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
 /** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
 
 
@@ -28068,14 +34917,14 @@ var SubjectSubscription = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 218 */
+/* 297 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return refCount; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -28137,18 +34986,18 @@ var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 219 */
+/* 298 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return groupBy; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return GroupedObservable; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(204);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(196);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(215);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(284);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(276);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(294);
 /** PURE_IMPORTS_START tslib,_Subscriber,_Subscription,_Observable,_Subject PURE_IMPORTS_END */
 
 
@@ -28334,15 +35183,15 @@ var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 220 */
+/* 299 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return BehaviorSubject; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(216);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(295);
 /** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */
 
 
@@ -28389,19 +35238,19 @@ var BehaviorSubject = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 221 */
+/* 300 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return ReplaySubject; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(222);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(204);
-/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(229);
-/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(216);
-/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(217);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(301);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(284);
+/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(308);
+/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(295);
+/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(296);
 /** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */
 
 
@@ -28522,14 +35371,14 @@ var ReplayEvent = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 222 */
+/* 301 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return queue; });
-/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(223);
-/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(226);
+/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(302);
+/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(305);
 /** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */
 
 
@@ -28538,14 +35387,14 @@ var queue = /*@__PURE__*/ new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__["Queu
 
 
 /***/ }),
-/* 223 */
+/* 302 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueAction", function() { return QueueAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(224);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(303);
 /** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
 
 
@@ -28590,14 +35439,14 @@ var QueueAction = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 224 */
+/* 303 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncAction", function() { return AsyncAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(225);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(304);
 /** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */
 
 
@@ -28641,7 +35490,8 @@ var AsyncAction = /*@__PURE__*/ (function (_super) {
         if (delay !== null && this.delay === delay && this.pending === false) {
             return id;
         }
-        return clearInterval(id) && undefined || undefined;
+        clearInterval(id);
+        return undefined;
     };
     AsyncAction.prototype.execute = function (state, delay) {
         if (this.closed) {
@@ -28695,14 +35545,14 @@ var AsyncAction = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 225 */
+/* 304 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Action", function() { return Action; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
 /** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
 
 
@@ -28724,14 +35574,14 @@ var Action = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 226 */
+/* 305 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueScheduler", function() { return QueueScheduler; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306);
 /** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
 
 
@@ -28747,14 +35597,14 @@ var QueueScheduler = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 227 */
+/* 306 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncScheduler", function() { return AsyncScheduler; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(228);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(307);
 /** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */
 
 
@@ -28816,7 +35666,7 @@ var AsyncScheduler = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 228 */
+/* 307 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -28836,7 +35686,7 @@ var Scheduler = /*@__PURE__*/ (function () {
         }
         return new this.SchedulerAction(this, work).schedule(state, delay);
     };
-    Scheduler.now = Date.now ? Date.now : function () { return +new Date(); };
+    Scheduler.now = function () { return Date.now(); };
     return Scheduler;
 }());
 
@@ -28844,7 +35694,7 @@ var Scheduler = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 229 */
+/* 308 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -28853,9 +35703,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnOperator", function() { return ObserveOnOperator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnSubscriber", function() { return ObserveOnSubscriber; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnMessage", function() { return ObserveOnMessage; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(309);
 /** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
 
 
@@ -28899,16 +35749,19 @@ var ObserveOnSubscriber = /*@__PURE__*/ (function (_super) {
         this.unsubscribe();
     };
     ObserveOnSubscriber.prototype.scheduleMessage = function (notification) {
-        this.add(this.scheduler.schedule(ObserveOnSubscriber.dispatch, this.delay, new ObserveOnMessage(notification, this.destination)));
+        var destination = this.destination;
+        destination.add(this.scheduler.schedule(ObserveOnSubscriber.dispatch, this.delay, new ObserveOnMessage(notification, this.destination)));
     };
     ObserveOnSubscriber.prototype._next = function (value) {
         this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value));
     };
     ObserveOnSubscriber.prototype._error = function (err) {
         this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err));
+        this.unsubscribe();
     };
     ObserveOnSubscriber.prototype._complete = function () {
         this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete());
+        this.unsubscribe();
     };
     return ObserveOnSubscriber;
 }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
@@ -28925,19 +35778,26 @@ var ObserveOnMessage = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 230 */
+/* 309 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return NotificationKind; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return Notification; });
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(231);
-/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232);
-/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(237);
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(310);
+/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(311);
+/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(316);
 /** PURE_IMPORTS_START _observable_empty,_observable_of,_observable_throwError PURE_IMPORTS_END */
 
 
 
+var NotificationKind;
+/*@__PURE__*/ (function (NotificationKind) {
+    NotificationKind["NEXT"] = "N";
+    NotificationKind["ERROR"] = "E";
+    NotificationKind["COMPLETE"] = "C";
+})(NotificationKind || (NotificationKind = {}));
 var Notification = /*@__PURE__*/ (function () {
     function Notification(kind, value, error) {
         this.kind = kind;
@@ -29007,15 +35867,14 @@ var Notification = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 231 */
+/* 310 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return EMPTY; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return empty; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "emptyScheduled", function() { return emptyScheduled; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
 /** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
 
 var EMPTY = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.complete(); });
@@ -29029,18 +35888,16 @@ function emptyScheduled(scheduler) {
 
 
 /***/ }),
-/* 232 */
+/* 311 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "of", function() { return of; });
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(233);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(234);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231);
-/* harmony import */ var _scalar__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(236);
-/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_empty,_scalar PURE_IMPORTS_END */
-
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(312);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(313);
+/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(315);
+/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_scheduled_scheduleArray PURE_IMPORTS_END */
 
 
 
@@ -29052,24 +35909,17 @@ function of() {
     var scheduler = args[args.length - 1];
     if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_0__["isScheduler"])(scheduler)) {
         args.pop();
+        return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(args, scheduler);
     }
     else {
-        scheduler = undefined;
-    }
-    switch (args.length) {
-        case 0:
-            return Object(_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(scheduler);
-        case 1:
-            return scheduler ? Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args, scheduler) : Object(_scalar__WEBPACK_IMPORTED_MODULE_3__["scalar"])(args[0]);
-        default:
-            return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args, scheduler);
+        return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args);
     }
 }
 //# sourceMappingURL=of.js.map
 
 
 /***/ }),
-/* 233 */
+/* 312 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -29083,46 +35933,32 @@ function isScheduler(value) {
 
 
 /***/ }),
-/* 234 */
+/* 313 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromArray", function() { return fromArray; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
-/* harmony import */ var _util_subscribeToArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(235);
-/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToArray PURE_IMPORTS_END */
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(314);
+/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(315);
+/** PURE_IMPORTS_START _Observable,_util_subscribeToArray,_scheduled_scheduleArray PURE_IMPORTS_END */
 
 
 
 function fromArray(input, scheduler) {
     if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToArray__WEBPACK_IMPORTED_MODULE_2__["subscribeToArray"])(input));
+        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__["subscribeToArray"])(input));
     }
     else {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-            var i = 0;
-            sub.add(scheduler.schedule(function () {
-                if (i === input.length) {
-                    subscriber.complete();
-                    return;
-                }
-                subscriber.next(input[i++]);
-                if (!subscriber.closed) {
-                    sub.add(this.schedule());
-                }
-            }));
-            return sub;
-        });
+        return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler);
     }
 }
 //# sourceMappingURL=fromArray.js.map
 
 
 /***/ }),
-/* 235 */
+/* 314 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -29134,44 +35970,52 @@ var subscribeToArray = function (array) {
         for (var i = 0, len = array.length; i < len && !subscriber.closed; i++) {
             subscriber.next(array[i]);
         }
-        if (!subscriber.closed) {
-            subscriber.complete();
-        }
+        subscriber.complete();
     };
 };
 //# sourceMappingURL=subscribeToArray.js.map
 
 
 /***/ }),
-/* 236 */
+/* 315 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scalar", function() { return scalar; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleArray", function() { return scheduleArray; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
+/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
 
-function scalar(value) {
-    var result = new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        subscriber.next(value);
-        subscriber.complete();
+
+function scheduleArray(input, scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
+        var i = 0;
+        sub.add(scheduler.schedule(function () {
+            if (i === input.length) {
+                subscriber.complete();
+                return;
+            }
+            subscriber.next(input[i++]);
+            if (!subscriber.closed) {
+                sub.add(this.schedule());
+            }
+        }));
+        return sub;
     });
-    result._isScalar = true;
-    result.value = value;
-    return result;
 }
-//# sourceMappingURL=scalar.js.map
+//# sourceMappingURL=scheduleArray.js.map
 
 
 /***/ }),
-/* 237 */
+/* 316 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return throwError; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
 /** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
 
 function throwError(error, scheduler) {
@@ -29190,15 +36034,15 @@ function dispatch(_a) {
 
 
 /***/ }),
-/* 238 */
+/* 317 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return AsyncSubject; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(204);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(284);
 /** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */
 
 
@@ -29249,14 +36093,14 @@ var AsyncSubject = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 239 */
+/* 318 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return asap; });
-/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(240);
-/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(242);
+/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(319);
+/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(321);
 /** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */
 
 
@@ -29265,15 +36109,15 @@ var asap = /*@__PURE__*/ new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__["AsapSc
 
 
 /***/ }),
-/* 240 */
+/* 319 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapAction", function() { return AsapAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(241);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(224);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320);
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(303);
 /** PURE_IMPORTS_START tslib,_util_Immediate,_AsyncAction PURE_IMPORTS_END */
 
 
@@ -29316,7 +36160,7 @@ var AsapAction = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 241 */
+/* 320 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -29346,14 +36190,14 @@ var Immediate = {
 
 
 /***/ }),
-/* 242 */
+/* 321 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapScheduler", function() { return AsapScheduler; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306);
 /** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
 
 
@@ -29390,14 +36234,14 @@ var AsapScheduler = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 243 */
+/* 322 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "async", function() { return async; });
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(224);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227);
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(303);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306);
 /** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
 
 
@@ -29406,14 +36250,14 @@ var async = /*@__PURE__*/ new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["Asyn
 
 
 /***/ }),
-/* 244 */
+/* 323 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return animationFrame; });
-/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(245);
-/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(246);
+/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(324);
+/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(325);
 /** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */
 
 
@@ -29422,14 +36266,14 @@ var animationFrame = /*@__PURE__*/ new _AnimationFrameScheduler__WEBPACK_IMPORTE
 
 
 /***/ }),
-/* 245 */
+/* 324 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameAction", function() { return AnimationFrameAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(224);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(303);
 /** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
 
 
@@ -29471,14 +36315,14 @@ var AnimationFrameAction = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 246 */
+/* 325 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameScheduler", function() { return AnimationFrameScheduler; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306);
 /** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
 
 
@@ -29515,16 +36359,16 @@ var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 247 */
+/* 326 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return VirtualTimeScheduler; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return VirtualAction; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(224);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(227);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(303);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(306);
 /** PURE_IMPORTS_START tslib,_AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
 
 
@@ -29547,7 +36391,9 @@ var VirtualTimeScheduler = /*@__PURE__*/ (function (_super) {
     VirtualTimeScheduler.prototype.flush = function () {
         var _a = this, actions = _a.actions, maxFrames = _a.maxFrames;
         var error, action;
-        while ((action = actions.shift()) && (this.frame = action.delay) <= maxFrames) {
+        while ((action = actions[0]) && action.delay <= maxFrames) {
+            actions.shift();
+            this.frame = action.delay;
             if (error = action.execute(action.state, action.delay)) {
                 break;
             }
@@ -29636,7 +36482,7 @@ var VirtualAction = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 248 */
+/* 327 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -29650,13 +36496,13 @@ function identity(x) {
 
 
 /***/ }),
-/* 249 */
+/* 328 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return isObservable; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
 /** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
 
 function isObservable(obj) {
@@ -29666,90 +36512,86 @@ function isObservable(obj) {
 
 
 /***/ }),
-/* 250 */
+/* 329 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return ArgumentOutOfRangeError; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */
-
-var ArgumentOutOfRangeError = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ArgumentOutOfRangeError, _super);
-    function ArgumentOutOfRangeError() {
-        var _this = _super.call(this, 'argument out of range') || this;
-        _this.name = 'ArgumentOutOfRangeError';
-        Object.setPrototypeOf(_this, ArgumentOutOfRangeError.prototype);
-        return _this;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var ArgumentOutOfRangeErrorImpl = /*@__PURE__*/ (function () {
+    function ArgumentOutOfRangeErrorImpl() {
+        Error.call(this);
+        this.message = 'argument out of range';
+        this.name = 'ArgumentOutOfRangeError';
+        return this;
     }
-    return ArgumentOutOfRangeError;
-}(Error));
-
+    ArgumentOutOfRangeErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return ArgumentOutOfRangeErrorImpl;
+})();
+var ArgumentOutOfRangeError = ArgumentOutOfRangeErrorImpl;
 //# sourceMappingURL=ArgumentOutOfRangeError.js.map
 
 
 /***/ }),
-/* 251 */
+/* 330 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return EmptyError; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */
-
-var EmptyError = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](EmptyError, _super);
-    function EmptyError() {
-        var _this = _super.call(this, 'no elements in sequence') || this;
-        _this.name = 'EmptyError';
-        Object.setPrototypeOf(_this, EmptyError.prototype);
-        return _this;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var EmptyErrorImpl = /*@__PURE__*/ (function () {
+    function EmptyErrorImpl() {
+        Error.call(this);
+        this.message = 'no elements in sequence';
+        this.name = 'EmptyError';
+        return this;
     }
-    return EmptyError;
-}(Error));
-
+    EmptyErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return EmptyErrorImpl;
+})();
+var EmptyError = EmptyErrorImpl;
 //# sourceMappingURL=EmptyError.js.map
 
 
 /***/ }),
-/* 252 */
+/* 331 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return TimeoutError; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */
-
-var TimeoutError = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TimeoutError, _super);
-    function TimeoutError() {
-        var _this = _super.call(this, 'Timeout has occurred') || this;
-        _this.name = 'TimeoutError';
-        Object.setPrototypeOf(_this, TimeoutError.prototype);
-        return _this;
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var TimeoutErrorImpl = /*@__PURE__*/ (function () {
+    function TimeoutErrorImpl() {
+        Error.call(this);
+        this.message = 'Timeout has occurred';
+        this.name = 'TimeoutError';
+        return this;
     }
-    return TimeoutError;
-}(Error));
-
+    TimeoutErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return TimeoutErrorImpl;
+})();
+var TimeoutError = TimeoutErrorImpl;
 //# sourceMappingURL=TimeoutError.js.map
 
 
 /***/ }),
-/* 253 */
+/* 332 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return bindCallback; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(238);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(254);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(205);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(233);
-/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_isArray,_util_isScheduler PURE_IMPORTS_END */
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(317);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(333);
+/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(277);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(285);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(312);
+/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */
+
 
 
 
@@ -29757,7 +36599,7 @@ __webpack_require__.r(__webpack_exports__);
 
 function bindCallback(callbackFunc, resultSelector, scheduler) {
     if (resultSelector) {
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(resultSelector)) {
+        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(resultSelector)) {
             scheduler = resultSelector;
         }
         else {
@@ -29766,7 +36608,7 @@ function bindCallback(callbackFunc, resultSelector, scheduler) {
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                return bindCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_3__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+                return bindCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_4__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
             };
         }
     }
@@ -29799,7 +36641,12 @@ function bindCallback(callbackFunc, resultSelector, scheduler) {
                         callbackFunc.apply(context, args.concat([handler]));
                     }
                     catch (err) {
-                        subject.error(err);
+                        if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) {
+                            subject.error(err);
+                        }
+                        else {
+                            console.warn(err);
+                        }
                     }
                 }
                 return subject.subscribe(subscriber);
@@ -29851,15 +36698,15 @@ function dispatchError(state) {
 
 
 /***/ }),
-/* 254 */
+/* 333 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return map; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MapOperator", function() { return MapOperator; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -29908,18 +36755,20 @@ var MapSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 255 */
+/* 334 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return bindNodeCallback; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(238);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(254);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(233);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(205);
-/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_isScheduler,_util_isArray PURE_IMPORTS_END */
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(317);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(333);
+/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(277);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(312);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(285);
+/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */
+
 
 
 
@@ -29927,7 +36776,7 @@ __webpack_require__.r(__webpack_exports__);
 
 function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
     if (resultSelector) {
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(resultSelector)) {
+        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(resultSelector)) {
             scheduler = resultSelector;
         }
         else {
@@ -29936,7 +36785,7 @@ function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                return bindNodeCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_4__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+                return bindNodeCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_5__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
             };
         }
     }
@@ -29975,7 +36824,12 @@ function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
                         callbackFunc.apply(context, args.concat([handler]));
                     }
                     catch (err) {
-                        subject.error(err);
+                        if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) {
+                            subject.error(err);
+                        }
+                        else {
+                            console.warn(err);
+                        }
                     }
                 }
                 return subject.subscribe(subscriber);
@@ -30029,7 +36883,7 @@ function dispatchError(arg) {
 
 
 /***/ }),
-/* 256 */
+/* 335 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -30037,12 +36891,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestOperator", function() { return CombineLatestOperator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestSubscriber", function() { return CombineLatestSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(233);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(258);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(234);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(312);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(285);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(313);
 /** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */
 
 
@@ -30147,14 +37001,14 @@ var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 257 */
+/* 336 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "OuterSubscriber", function() { return OuterSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -30179,33 +37033,43 @@ var OuterSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 258 */
+/* 337 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToResult", function() { return subscribeToResult; });
-/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(259);
-/* harmony import */ var _subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(260);
-/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo PURE_IMPORTS_END */
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(338);
+/* harmony import */ var _subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(339);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(276);
+/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo,_Observable PURE_IMPORTS_END */
 
 
-function subscribeToResult(outerSubscriber, result, outerValue, outerIndex) {
-    var destination = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__["InnerSubscriber"](outerSubscriber, outerValue, outerIndex);
+
+function subscribeToResult(outerSubscriber, result, outerValue, outerIndex, destination) {
+    if (destination === void 0) {
+        destination = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__["InnerSubscriber"](outerSubscriber, outerValue, outerIndex);
+    }
+    if (destination.closed) {
+        return undefined;
+    }
+    if (result instanceof _Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]) {
+        return result.subscribe(destination);
+    }
     return Object(_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(result)(destination);
 }
 //# sourceMappingURL=subscribeToResult.js.map
 
 
 /***/ }),
-/* 259 */
+/* 338 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "InnerSubscriber", function() { return InnerSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -30237,24 +37101,22 @@ var InnerSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 260 */
+/* 339 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeTo", function() { return subscribeTo; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _subscribeToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(235);
-/* harmony import */ var _subscribeToPromise__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(261);
-/* harmony import */ var _subscribeToIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(262);
-/* harmony import */ var _subscribeToObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(264);
-/* harmony import */ var _isArrayLike__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(265);
-/* harmony import */ var _isPromise__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(266);
-/* harmony import */ var _isObject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(206);
-/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(263);
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(211);
-/** PURE_IMPORTS_START _Observable,_subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */
-
+/* harmony import */ var _subscribeToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(314);
+/* harmony import */ var _subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(340);
+/* harmony import */ var _subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(341);
+/* harmony import */ var _subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(343);
+/* harmony import */ var _isArrayLike__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(344);
+/* harmony import */ var _isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(345);
+/* harmony import */ var _isObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(286);
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(342);
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(290);
+/** PURE_IMPORTS_START _subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */
 
 
 
@@ -30265,32 +37127,20 @@ __webpack_require__.r(__webpack_exports__);
 
 
 var subscribeTo = function (result) {
-    if (result instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) {
-        return function (subscriber) {
-            if (result._isScalar) {
-                subscriber.next(result.value);
-                subscriber.complete();
-                return undefined;
-            }
-            else {
-                return result.subscribe(subscriber);
-            }
-        };
+    if (!!result && typeof result[_symbol_observable__WEBPACK_IMPORTED_MODULE_8__["observable"]] === 'function') {
+        return Object(_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__["subscribeToObservable"])(result);
     }
-    else if (result && typeof result[_symbol_observable__WEBPACK_IMPORTED_MODULE_9__["observable"]] === 'function') {
-        return Object(_subscribeToObservable__WEBPACK_IMPORTED_MODULE_4__["subscribeToObservable"])(result);
+    else if (Object(_isArrayLike__WEBPACK_IMPORTED_MODULE_4__["isArrayLike"])(result)) {
+        return Object(_subscribeToArray__WEBPACK_IMPORTED_MODULE_0__["subscribeToArray"])(result);
     }
-    else if (Object(_isArrayLike__WEBPACK_IMPORTED_MODULE_5__["isArrayLike"])(result)) {
-        return Object(_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__["subscribeToArray"])(result);
+    else if (Object(_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(result)) {
+        return Object(_subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__["subscribeToPromise"])(result);
     }
-    else if (Object(_isPromise__WEBPACK_IMPORTED_MODULE_6__["isPromise"])(result)) {
-        return Object(_subscribeToPromise__WEBPACK_IMPORTED_MODULE_2__["subscribeToPromise"])(result);
-    }
-    else if (result && typeof result[_symbol_iterator__WEBPACK_IMPORTED_MODULE_8__["iterator"]] === 'function') {
-        return Object(_subscribeToIterable__WEBPACK_IMPORTED_MODULE_3__["subscribeToIterable"])(result);
+    else if (!!result && typeof result[_symbol_iterator__WEBPACK_IMPORTED_MODULE_7__["iterator"]] === 'function') {
+        return Object(_subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__["subscribeToIterable"])(result);
     }
     else {
-        var value = Object(_isObject__WEBPACK_IMPORTED_MODULE_7__["isObject"])(result) ? 'an invalid object' : "'" + result + "'";
+        var value = Object(_isObject__WEBPACK_IMPORTED_MODULE_6__["isObject"])(result) ? 'an invalid object' : "'" + result + "'";
         var msg = "You provided " + value + " where a stream was expected."
             + ' You can provide an Observable, Promise, Array, or Iterable.';
         throw new TypeError(msg);
@@ -30300,13 +37150,13 @@ var subscribeTo = function (result) {
 
 
 /***/ }),
-/* 261 */
+/* 340 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToPromise", function() { return subscribeToPromise; });
-/* harmony import */ var _hostReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(203);
+/* harmony import */ var _hostReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(283);
 /** PURE_IMPORTS_START _hostReportError PURE_IMPORTS_END */
 
 var subscribeToPromise = function (promise) {
@@ -30325,13 +37175,13 @@ var subscribeToPromise = function (promise) {
 
 
 /***/ }),
-/* 262 */
+/* 341 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToIterable", function() { return subscribeToIterable; });
-/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(263);
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(342);
 /** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
 
 var subscribeToIterable = function (iterable) {
@@ -30362,7 +37212,7 @@ var subscribeToIterable = function (iterable) {
 
 
 /***/ }),
-/* 263 */
+/* 342 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -30383,13 +37233,13 @@ var $$iterator = iterator;
 
 
 /***/ }),
-/* 264 */
+/* 343 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToObservable", function() { return subscribeToObservable; });
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(211);
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(290);
 /** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
 
 var subscribeToObservable = function (obj) {
@@ -30407,7 +37257,7 @@ var subscribeToObservable = function (obj) {
 
 
 /***/ }),
-/* 265 */
+/* 344 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -30419,7 +37269,7 @@ var isArrayLike = (function (x) { return x && typeof x.length === 'number' && ty
 
 
 /***/ }),
-/* 266 */
+/* 345 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -30427,25 +37277,21 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPromise", function() { return isPromise; });
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
 function isPromise(value) {
-    return value && typeof value.subscribe !== 'function' && typeof value.then === 'function';
+    return !!value && typeof value.subscribe !== 'function' && typeof value.then === 'function';
 }
 //# sourceMappingURL=isPromise.js.map
 
 
 /***/ }),
-/* 267 */
+/* 346 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; });
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(233);
-/* harmony import */ var _of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(268);
-/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(274);
-/** PURE_IMPORTS_START _util_isScheduler,_of,_from,_operators_concatAll PURE_IMPORTS_END */
-
-
+/* harmony import */ var _of__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(311);
+/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(347);
+/** PURE_IMPORTS_START _of,_operators_concatAll PURE_IMPORTS_END */
 
 
 function concat() {
@@ -30453,249 +37299,19 @@ function concat() {
     for (var _i = 0; _i < arguments.length; _i++) {
         observables[_i] = arguments[_i];
     }
-    if (observables.length === 1 || (observables.length === 2 && Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_0__["isScheduler"])(observables[1]))) {
-        return Object(_from__WEBPACK_IMPORTED_MODULE_2__["from"])(observables[0]);
-    }
-    return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_3__["concatAll"])()(_of__WEBPACK_IMPORTED_MODULE_1__["of"].apply(void 0, observables));
+    return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_1__["concatAll"])()(_of__WEBPACK_IMPORTED_MODULE_0__["of"].apply(void 0, observables));
 }
 //# sourceMappingURL=concat.js.map
 
 
 /***/ }),
-/* 268 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return from; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(266);
-/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(265);
-/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(269);
-/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(270);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(234);
-/* harmony import */ var _fromPromise__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(271);
-/* harmony import */ var _fromIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(272);
-/* harmony import */ var _fromObservable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(273);
-/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(260);
-/** PURE_IMPORTS_START _Observable,_util_isPromise,_util_isArrayLike,_util_isInteropObservable,_util_isIterable,_fromArray,_fromPromise,_fromIterable,_fromObservable,_util_subscribeTo PURE_IMPORTS_END */
-
-
-
-
-
-
-
-
-
-
-function from(input, scheduler) {
-    if (!scheduler) {
-        if (input instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) {
-            return input;
-        }
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_9__["subscribeTo"])(input));
-    }
-    if (input != null) {
-        if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_3__["isInteropObservable"])(input)) {
-            return Object(_fromObservable__WEBPACK_IMPORTED_MODULE_8__["fromObservable"])(input, scheduler);
-        }
-        else if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_1__["isPromise"])(input)) {
-            return Object(_fromPromise__WEBPACK_IMPORTED_MODULE_6__["fromPromise"])(input, scheduler);
-        }
-        else if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_2__["isArrayLike"])(input)) {
-            return Object(_fromArray__WEBPACK_IMPORTED_MODULE_5__["fromArray"])(input, scheduler);
-        }
-        else if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_4__["isIterable"])(input) || typeof input === 'string') {
-            return Object(_fromIterable__WEBPACK_IMPORTED_MODULE_7__["fromIterable"])(input, scheduler);
-        }
-    }
-    throw new TypeError((input !== null && typeof input || input) + ' is not observable');
-}
-//# sourceMappingURL=from.js.map
-
-
-/***/ }),
-/* 269 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isInteropObservable", function() { return isInteropObservable; });
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(211);
-/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
-
-function isInteropObservable(input) {
-    return input && typeof input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]] === 'function';
-}
-//# sourceMappingURL=isInteropObservable.js.map
-
-
-/***/ }),
-/* 270 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isIterable", function() { return isIterable; });
-/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(263);
-/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
-
-function isIterable(input) {
-    return input && typeof input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]] === 'function';
-}
-//# sourceMappingURL=isIterable.js.map
-
-
-/***/ }),
-/* 271 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromPromise", function() { return fromPromise; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
-/* harmony import */ var _util_subscribeToPromise__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(261);
-/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToPromise PURE_IMPORTS_END */
-
-
-
-function fromPromise(input, scheduler) {
-    if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToPromise__WEBPACK_IMPORTED_MODULE_2__["subscribeToPromise"])(input));
-    }
-    else {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-            sub.add(scheduler.schedule(function () {
-                return input.then(function (value) {
-                    sub.add(scheduler.schedule(function () {
-                        subscriber.next(value);
-                        sub.add(scheduler.schedule(function () { return subscriber.complete(); }));
-                    }));
-                }, function (err) {
-                    sub.add(scheduler.schedule(function () { return subscriber.error(err); }));
-                });
-            }));
-            return sub;
-        });
-    }
-}
-//# sourceMappingURL=fromPromise.js.map
-
-
-/***/ }),
-/* 272 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromIterable", function() { return fromIterable; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
-/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(263);
-/* harmony import */ var _util_subscribeToIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(262);
-/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator,_util_subscribeToIterable PURE_IMPORTS_END */
-
-
-
-
-function fromIterable(input, scheduler) {
-    if (!input) {
-        throw new Error('Iterable cannot be null');
-    }
-    if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToIterable__WEBPACK_IMPORTED_MODULE_3__["subscribeToIterable"])(input));
-    }
-    else {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-            var iterator;
-            sub.add(function () {
-                if (iterator && typeof iterator.return === 'function') {
-                    iterator.return();
-                }
-            });
-            sub.add(scheduler.schedule(function () {
-                iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_2__["iterator"]]();
-                sub.add(scheduler.schedule(function () {
-                    if (subscriber.closed) {
-                        return;
-                    }
-                    var value;
-                    var done;
-                    try {
-                        var result = iterator.next();
-                        value = result.value;
-                        done = result.done;
-                    }
-                    catch (err) {
-                        subscriber.error(err);
-                        return;
-                    }
-                    if (done) {
-                        subscriber.complete();
-                    }
-                    else {
-                        subscriber.next(value);
-                        this.schedule();
-                    }
-                }));
-            }));
-            return sub;
-        });
-    }
-}
-//# sourceMappingURL=fromIterable.js.map
-
-
-/***/ }),
-/* 273 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromObservable", function() { return fromObservable; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
-/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(211);
-/* harmony import */ var _util_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(264);
-/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable,_util_subscribeToObservable PURE_IMPORTS_END */
-
-
-
-
-function fromObservable(input, scheduler) {
-    if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__["subscribeToObservable"])(input));
-    }
-    else {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-            sub.add(scheduler.schedule(function () {
-                var observable = input[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]]();
-                sub.add(observable.subscribe({
-                    next: function (value) { sub.add(scheduler.schedule(function () { return subscriber.next(value); })); },
-                    error: function (err) { sub.add(scheduler.schedule(function () { return subscriber.error(err); })); },
-                    complete: function () { sub.add(scheduler.schedule(function () { return subscriber.complete(); })); },
-                }));
-            }));
-            return sub;
-        });
-    }
-}
-//# sourceMappingURL=fromObservable.js.map
-
-
-/***/ }),
-/* 274 */
+/* 347 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return concatAll; });
-/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(275);
+/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(348);
 /** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */
 
 function concatAll() {
@@ -30705,14 +37321,14 @@ function concatAll() {
 
 
 /***/ }),
-/* 275 */
+/* 348 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return mergeAll; });
-/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(248);
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(349);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(327);
 /** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */
 
 
@@ -30726,7 +37342,7 @@ function mergeAll(concurrent) {
 
 
 /***/ }),
-/* 276 */
+/* 349 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -30734,12 +37350,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return mergeMap; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapOperator", function() { return MergeMapOperator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapSubscriber", function() { return MergeMapSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(258);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(257);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(254);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(268);
-/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_map,_observable_from PURE_IMPORTS_END */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(338);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(333);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(350);
+/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber,_map,_observable_from PURE_IMPORTS_END */
+
 
 
 
@@ -30750,7 +37368,7 @@ function mergeMap(project, resultSelector, concurrent) {
         concurrent = Number.POSITIVE_INFINITY;
     }
     if (typeof resultSelector === 'function') {
-        return function (source) { return source.pipe(mergeMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_4__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); };
+        return function (source) { return source.pipe(mergeMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); };
     }
     else if (typeof resultSelector === 'number') {
         concurrent = resultSelector;
@@ -30808,13 +37426,17 @@ var MergeMapSubscriber = /*@__PURE__*/ (function (_super) {
         this._innerSub(result, value, index);
     };
     MergeMapSubscriber.prototype._innerSub = function (ish, value, index) {
-        this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index));
+        var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__["InnerSubscriber"](this, undefined, undefined);
+        var destination = this.destination;
+        destination.add(innerSubscriber);
+        Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index, innerSubscriber);
     };
     MergeMapSubscriber.prototype._complete = function () {
         this.hasCompleted = true;
         if (this.active === 0 && this.buffer.length === 0) {
             this.destination.complete();
         }
+        this.unsubscribe();
     };
     MergeMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
         this.destination.next(innerValue);
@@ -30837,15 +37459,239 @@ var MergeMapSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 277 */
+/* 350 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return from; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(339);
+/* harmony import */ var _scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(351);
+/** PURE_IMPORTS_START _Observable,_util_subscribeTo,_scheduled_scheduled PURE_IMPORTS_END */
+
+
+
+function from(input, scheduler) {
+    if (!scheduler) {
+        if (input instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) {
+            return input;
+        }
+        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(input));
+    }
+    else {
+        return Object(_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__["scheduled"])(input, scheduler);
+    }
+}
+//# sourceMappingURL=from.js.map
+
+
+/***/ }),
+/* 351 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return scheduled; });
+/* harmony import */ var _scheduleObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(352);
+/* harmony import */ var _schedulePromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(353);
+/* harmony import */ var _scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(315);
+/* harmony import */ var _scheduleIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(354);
+/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(355);
+/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(345);
+/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(344);
+/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(356);
+/** PURE_IMPORTS_START _scheduleObservable,_schedulePromise,_scheduleArray,_scheduleIterable,_util_isInteropObservable,_util_isPromise,_util_isArrayLike,_util_isIterable PURE_IMPORTS_END */
+
+
+
+
+
+
+
+
+function scheduled(input, scheduler) {
+    if (input != null) {
+        if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__["isInteropObservable"])(input)) {
+            return Object(_scheduleObservable__WEBPACK_IMPORTED_MODULE_0__["scheduleObservable"])(input, scheduler);
+        }
+        else if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(input)) {
+            return Object(_schedulePromise__WEBPACK_IMPORTED_MODULE_1__["schedulePromise"])(input, scheduler);
+        }
+        else if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__["isArrayLike"])(input)) {
+            return Object(_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler);
+        }
+        else if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_7__["isIterable"])(input) || typeof input === 'string') {
+            return Object(_scheduleIterable__WEBPACK_IMPORTED_MODULE_3__["scheduleIterable"])(input, scheduler);
+        }
+    }
+    throw new TypeError((input !== null && typeof input || input) + ' is not observable');
+}
+//# sourceMappingURL=scheduled.js.map
+
+
+/***/ }),
+/* 352 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleObservable", function() { return scheduleObservable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(290);
+/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable PURE_IMPORTS_END */
+
+
+
+function scheduleObservable(input, scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
+        sub.add(scheduler.schedule(function () {
+            var observable = input[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]]();
+            sub.add(observable.subscribe({
+                next: function (value) { sub.add(scheduler.schedule(function () { return subscriber.next(value); })); },
+                error: function (err) { sub.add(scheduler.schedule(function () { return subscriber.error(err); })); },
+                complete: function () { sub.add(scheduler.schedule(function () { return subscriber.complete(); })); },
+            }));
+        }));
+        return sub;
+    });
+}
+//# sourceMappingURL=scheduleObservable.js.map
+
+
+/***/ }),
+/* 353 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "schedulePromise", function() { return schedulePromise; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
+/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
+
+
+function schedulePromise(input, scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
+        sub.add(scheduler.schedule(function () {
+            return input.then(function (value) {
+                sub.add(scheduler.schedule(function () {
+                    subscriber.next(value);
+                    sub.add(scheduler.schedule(function () { return subscriber.complete(); }));
+                }));
+            }, function (err) {
+                sub.add(scheduler.schedule(function () { return subscriber.error(err); }));
+            });
+        }));
+        return sub;
+    });
+}
+//# sourceMappingURL=schedulePromise.js.map
+
+
+/***/ }),
+/* 354 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleIterable", function() { return scheduleIterable; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(342);
+/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator PURE_IMPORTS_END */
+
+
+
+function scheduleIterable(input, scheduler) {
+    if (!input) {
+        throw new Error('Iterable cannot be null');
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
+        var iterator;
+        sub.add(function () {
+            if (iterator && typeof iterator.return === 'function') {
+                iterator.return();
+            }
+        });
+        sub.add(scheduler.schedule(function () {
+            iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_2__["iterator"]]();
+            sub.add(scheduler.schedule(function () {
+                if (subscriber.closed) {
+                    return;
+                }
+                var value;
+                var done;
+                try {
+                    var result = iterator.next();
+                    value = result.value;
+                    done = result.done;
+                }
+                catch (err) {
+                    subscriber.error(err);
+                    return;
+                }
+                if (done) {
+                    subscriber.complete();
+                }
+                else {
+                    subscriber.next(value);
+                    this.schedule();
+                }
+            }));
+        }));
+        return sub;
+    });
+}
+//# sourceMappingURL=scheduleIterable.js.map
+
+
+/***/ }),
+/* 355 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isInteropObservable", function() { return isInteropObservable; });
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(290);
+/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
+
+function isInteropObservable(input) {
+    return input && typeof input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]] === 'function';
+}
+//# sourceMappingURL=isInteropObservable.js.map
+
+
+/***/ }),
+/* 356 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isIterable", function() { return isIterable; });
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(342);
+/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
+
+function isIterable(input) {
+    return input && typeof input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]] === 'function';
+}
+//# sourceMappingURL=isIterable.js.map
+
+
+/***/ }),
+/* 357 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return defer; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(268);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(350);
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(310);
 /** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
 
 
@@ -30868,22 +37714,18 @@ function defer(observableFactory) {
 
 
 /***/ }),
-/* 278 */
+/* 358 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return forkJoin; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(196);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(258);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(257);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(254);
-/** PURE_IMPORTS_START tslib,_Observable,_util_isArray,_empty,_util_subscribeToResult,_OuterSubscriber,_operators_map PURE_IMPORTS_END */
-
-
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(285);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(333);
+/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(286);
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(350);
+/** PURE_IMPORTS_START _Observable,_util_isArray,_operators_map,_util_isObject,_from PURE_IMPORTS_END */
 
 
 
@@ -30894,86 +37736,83 @@ function forkJoin() {
     for (var _i = 0; _i < arguments.length; _i++) {
         sources[_i] = arguments[_i];
     }
-    var resultSelector;
-    if (typeof sources[sources.length - 1] === 'function') {
-        resultSelector = sources.pop();
-    }
-    if (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(sources[0])) {
-        sources = sources[0];
-    }
-    if (sources.length === 0) {
-        return _empty__WEBPACK_IMPORTED_MODULE_3__["EMPTY"];
+    if (sources.length === 1) {
+        var first_1 = sources[0];
+        if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(first_1)) {
+            return forkJoinInternal(first_1, null);
+        }
+        if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_3__["isObject"])(first_1) && Object.getPrototypeOf(first_1) === Object.prototype) {
+            var keys = Object.keys(first_1);
+            return forkJoinInternal(keys.map(function (key) { return first_1[key]; }), keys);
+        }
     }
-    if (resultSelector) {
-        return forkJoin(sources).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_6__["map"])(function (args) { return resultSelector.apply(void 0, args); }));
+    if (typeof sources[sources.length - 1] === 'function') {
+        var resultSelector_1 = sources.pop();
+        sources = (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(sources[0])) ? sources[0] : sources;
+        return forkJoinInternal(sources, null).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return resultSelector_1.apply(void 0, args); }));
     }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"](function (subscriber) {
-        return new ForkJoinSubscriber(subscriber, sources);
-    });
+    return forkJoinInternal(sources, null);
 }
-var ForkJoinSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ForkJoinSubscriber, _super);
-    function ForkJoinSubscriber(destination, sources) {
-        var _this = _super.call(this, destination) || this;
-        _this.sources = sources;
-        _this.completed = 0;
-        _this.haveValues = 0;
+function forkJoinInternal(sources, keys) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
         var len = sources.length;
-        _this.values = new Array(len);
-        for (var i = 0; i < len; i++) {
-            var source = sources[i];
-            var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(_this, source, null, i);
-            if (innerSubscription) {
-                _this.add(innerSubscription);
-            }
-        }
-        return _this;
-    }
-    ForkJoinSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.values[outerIndex] = innerValue;
-        if (!innerSub._hasValue) {
-            innerSub._hasValue = true;
-            this.haveValues++;
-        }
-    };
-    ForkJoinSubscriber.prototype.notifyComplete = function (innerSub) {
-        var _a = this, destination = _a.destination, haveValues = _a.haveValues, values = _a.values;
-        var len = values.length;
-        if (!innerSub._hasValue) {
-            destination.complete();
-            return;
-        }
-        this.completed++;
-        if (this.completed !== len) {
+        if (len === 0) {
+            subscriber.complete();
             return;
         }
-        if (haveValues === len) {
-            destination.next(values);
+        var values = new Array(len);
+        var completed = 0;
+        var emitted = 0;
+        var _loop_1 = function (i) {
+            var source = Object(_from__WEBPACK_IMPORTED_MODULE_4__["from"])(sources[i]);
+            var hasValue = false;
+            subscriber.add(source.subscribe({
+                next: function (value) {
+                    if (!hasValue) {
+                        hasValue = true;
+                        emitted++;
+                    }
+                    values[i] = value;
+                },
+                error: function (err) { return subscriber.error(err); },
+                complete: function () {
+                    completed++;
+                    if (completed === len || !hasValue) {
+                        if (emitted === len) {
+                            subscriber.next(keys ?
+                                keys.reduce(function (result, key, i) { return (result[key] = values[i], result); }, {}) :
+                                values);
+                        }
+                        subscriber.complete();
+                    }
+                }
+            }));
+        };
+        for (var i = 0; i < len; i++) {
+            _loop_1(i);
         }
-        destination.complete();
-    };
-    return ForkJoinSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_5__["OuterSubscriber"]));
+    });
+}
 //# sourceMappingURL=forkJoin.js.map
 
 
 /***/ }),
-/* 279 */
+/* 359 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return fromEvent; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(205);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(200);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(254);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(285);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(280);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(333);
 /** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
 
 
 
 
-var toString = Object.prototype.toString;
+var toString = /*@__PURE__*/ (function () { return Object.prototype.toString; })();
 function fromEvent(target, eventName, options, resultSelector) {
     if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(options)) {
         resultSelector = options;
@@ -31034,16 +37873,16 @@ function isEventTarget(sourceObj) {
 
 
 /***/ }),
-/* 280 */
+/* 360 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return fromEventPattern; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(205);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(200);
-/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(254);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(285);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(280);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(333);
 /** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
 
 
@@ -31079,15 +37918,15 @@ function fromEventPattern(addHandler, removeHandler, resultSelector) {
 
 
 /***/ }),
-/* 281 */
+/* 361 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return generate; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(248);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(233);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(327);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(312);
 /** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */
 
 
@@ -31216,14 +38055,14 @@ function dispatch(state) {
 
 
 /***/ }),
-/* 282 */
+/* 362 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return iif; });
-/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(277);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(231);
+/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(357);
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(310);
 /** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */
 
 
@@ -31240,15 +38079,15 @@ function iif(condition, trueResult, falseResult) {
 
 
 /***/ }),
-/* 283 */
+/* 363 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return interval; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(243);
-/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(284);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322);
+/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(364);
 /** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */
 
 
@@ -31280,13 +38119,13 @@ function dispatch(state) {
 
 
 /***/ }),
-/* 284 */
+/* 364 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isNumeric", function() { return isNumeric; });
-/* harmony import */ var _isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(205);
+/* harmony import */ var _isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(285);
 /** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */
 
 function isNumeric(val) {
@@ -31296,16 +38135,16 @@ function isNumeric(val) {
 
 
 /***/ }),
-/* 285 */
+/* 365 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(233);
-/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(275);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(234);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(312);
+/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(348);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(313);
 /** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */
 
 
@@ -31337,15 +38176,15 @@ function merge() {
 
 
 /***/ }),
-/* 286 */
+/* 366 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return NEVER; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "never", function() { return never; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(213);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(292);
 /** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */
 
 
@@ -31357,16 +38196,16 @@ function never() {
 
 
 /***/ }),
-/* 287 */
+/* 367 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(268);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(350);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(285);
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(310);
 /** PURE_IMPORTS_START _Observable,_from,_util_isArray,_empty PURE_IMPORTS_END */
 
 
@@ -31397,15 +38236,15 @@ function onErrorResumeNext() {
 
 
 /***/ }),
-/* 288 */
+/* 368 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return pairs; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dispatch", function() { return dispatch; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
 /** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
 
 
@@ -31448,7 +38287,105 @@ function dispatch(state) {
 
 
 /***/ }),
-/* 289 */
+/* 369 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; });
+/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(370);
+/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(339);
+/* harmony import */ var _operators_filter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(371);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(276);
+/** PURE_IMPORTS_START _util_not,_util_subscribeTo,_operators_filter,_Observable PURE_IMPORTS_END */
+
+
+
+
+function partition(source, predicate, thisArg) {
+    return [
+        Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(predicate, thisArg)(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source))),
+        Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source)))
+    ];
+}
+//# sourceMappingURL=partition.js.map
+
+
+/***/ }),
+/* 370 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "not", function() { return not; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function not(pred, thisArg) {
+    function notPred() {
+        return !(notPred.pred.apply(notPred.thisArg, arguments));
+    }
+    notPred.pred = pred;
+    notPred.thisArg = thisArg;
+    return notPred;
+}
+//# sourceMappingURL=not.js.map
+
+
+/***/ }),
+/* 371 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return filter; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function filter(predicate, thisArg) {
+    return function filterOperatorFunction(source) {
+        return source.lift(new FilterOperator(predicate, thisArg));
+    };
+}
+var FilterOperator = /*@__PURE__*/ (function () {
+    function FilterOperator(predicate, thisArg) {
+        this.predicate = predicate;
+        this.thisArg = thisArg;
+    }
+    FilterOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new FilterSubscriber(subscriber, this.predicate, this.thisArg));
+    };
+    return FilterOperator;
+}());
+var FilterSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FilterSubscriber, _super);
+    function FilterSubscriber(destination, predicate, thisArg) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.thisArg = thisArg;
+        _this.count = 0;
+        return _this;
+    }
+    FilterSubscriber.prototype._next = function (value) {
+        var result;
+        try {
+            result = this.predicate.call(this.thisArg, value, this.count++);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        if (result) {
+            this.destination.next(value);
+        }
+    };
+    return FilterSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=filter.js.map
+
+
+/***/ }),
+/* 372 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -31456,11 +38393,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RaceOperator", function() { return RaceOperator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RaceSubscriber", function() { return RaceSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(205);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(234);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(285);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(313);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_util_isArray,_fromArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -31542,24 +38479,25 @@ var RaceSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 290 */
+/* 373 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "range", function() { return range; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dispatch", function() { return dispatch; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
 /** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
 
 function range(start, count, scheduler) {
     if (start === void 0) {
         start = 0;
     }
-    if (count === void 0) {
-        count = 0;
-    }
     return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        if (count === undefined) {
+            count = start;
+            start = 0;
+        }
         var index = 0;
         var current = start;
         if (scheduler) {
@@ -31600,16 +38538,16 @@ function dispatch(state) {
 
 
 /***/ }),
-/* 291 */
+/* 374 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return timer; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(243);
-/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(284);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(233);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322);
+/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(364);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(312);
 /** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
 
 
@@ -31654,15 +38592,15 @@ function dispatch(state) {
 
 
 /***/ }),
-/* 292 */
+/* 375 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "using", function() { return using; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(268);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(350);
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(310);
 /** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
 
 
@@ -31699,7 +38637,7 @@ function using(resourceFactory, observableFactory) {
 
 
 /***/ }),
-/* 293 */
+/* 376 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -31707,13 +38645,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipOperator", function() { return ZipOperator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipSubscriber", function() { return ZipSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(234);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(198);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(258);
-/* harmony import */ var _internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(263);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(313);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(285);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(278);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(337);
+/* harmony import */ var _internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(342);
 /** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_OuterSubscriber,_util_subscribeToResult,_.._internal_symbol_iterator PURE_IMPORTS_END */
 
 
@@ -31771,6 +38709,7 @@ var ZipSubscriber = /*@__PURE__*/ (function (_super) {
     ZipSubscriber.prototype._complete = function () {
         var iterators = this.iterators;
         var len = iterators.length;
+        this.unsubscribe();
         if (len === 0) {
             this.destination.complete();
             return;
@@ -31779,7 +38718,8 @@ var ZipSubscriber = /*@__PURE__*/ (function (_super) {
         for (var i = 0; i < len; i++) {
             var iterator = iterators[i];
             if (iterator.stillUnsubscribed) {
-                this.add(iterator.subscribe(iterator, i));
+                var destination = this.destination;
+                destination.add(iterator.subscribe(iterator, i));
             }
             else {
                 this.active--;
@@ -31933,320 +38873,320 @@ var ZipBufferIterator = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 294 */
+/* 377 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(295);
+/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(378);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["audit"]; });
 
-/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(296);
+/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(379);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["auditTime"]; });
 
-/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(297);
+/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(380);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__["buffer"]; });
 
-/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(298);
+/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(381);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__["bufferCount"]; });
 
-/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(299);
+/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(382);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["bufferTime"]; });
 
-/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(300);
+/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(383);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__["bufferToggle"]; });
 
-/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(301);
+/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(384);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["bufferWhen"]; });
 
-/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(302);
+/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(385);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["catchError"]; });
 
-/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(303);
+/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(386);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["combineAll"]; });
 
-/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(304);
+/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(387);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__["combineLatest"]; });
 
-/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(305);
+/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(388);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__["concat"]; });
 
-/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(274);
+/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(347);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__["concatAll"]; });
 
-/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(306);
+/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(389);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__["concatMap"]; });
 
-/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(307);
+/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(390);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__["concatMapTo"]; });
 
-/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(308);
+/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(391);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__["count"]; });
 
-/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(309);
+/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(392);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__["debounce"]; });
 
-/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(310);
+/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(393);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__["debounceTime"]; });
 
-/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(311);
+/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(394);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__["defaultIfEmpty"]; });
 
-/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(312);
+/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(395);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__["delay"]; });
 
-/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(314);
+/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(397);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__["delayWhen"]; });
 
-/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(315);
+/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(398);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__["dematerialize"]; });
 
-/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(316);
+/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(399);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__["distinct"]; });
 
-/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(317);
+/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(400);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__["distinctUntilChanged"]; });
 
-/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(318);
+/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(401);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__["distinctUntilKeyChanged"]; });
 
-/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(319);
+/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(402);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__["elementAt"]; });
 
-/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(324);
+/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(405);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__["endWith"]; });
 
-/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(325);
+/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(406);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__["every"]; });
 
-/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(326);
+/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(407);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__["exhaust"]; });
 
-/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(327);
+/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(408);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__["exhaustMap"]; });
 
-/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(328);
+/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(409);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__["expand"]; });
 
-/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(320);
+/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(371);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__["filter"]; });
 
-/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(329);
+/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(410);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__["finalize"]; });
 
-/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(330);
+/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(411);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__["find"]; });
 
-/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(331);
+/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(412);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__["findIndex"]; });
 
-/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(332);
+/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(413);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__["first"]; });
 
-/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(219);
+/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(298);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__["groupBy"]; });
 
-/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(333);
+/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(414);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__["ignoreElements"]; });
 
-/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(334);
+/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(415);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__["isEmpty"]; });
 
-/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(335);
+/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(416);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__["last"]; });
 
-/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(254);
+/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(333);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__["map"]; });
 
-/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(337);
+/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(418);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__["mapTo"]; });
 
-/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(338);
+/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(419);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__["materialize"]; });
 
-/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(339);
+/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(420);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__["max"]; });
 
-/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(342);
+/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(423);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__["merge"]; });
 
-/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(275);
+/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(348);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__["mergeAll"]; });
 
-/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(276);
+/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(349);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; });
 
-/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(343);
+/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(424);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__["mergeMapTo"]; });
 
-/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(344);
+/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(425);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__["mergeScan"]; });
 
-/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(345);
+/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(426);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__["min"]; });
 
-/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(346);
+/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(427);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__["multicast"]; });
 
-/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(229);
+/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(308);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__["observeOn"]; });
 
-/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(347);
+/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(428);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__["onErrorResumeNext"]; });
 
-/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(348);
+/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(429);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__["pairwise"]; });
 
-/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(349);
+/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(430);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__["partition"]; });
 
-/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(351);
+/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(431);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__["pluck"]; });
 
-/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(352);
+/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(432);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__["publish"]; });
 
-/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(353);
+/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(433);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__["publishBehavior"]; });
 
-/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(354);
+/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(434);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__["publishLast"]; });
 
-/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(355);
+/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(435);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__["publishReplay"]; });
 
-/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(356);
+/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(436);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__["race"]; });
 
-/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(340);
+/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(421);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__["reduce"]; });
 
-/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(357);
+/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(437);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__["repeat"]; });
 
-/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(358);
+/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(438);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__["repeatWhen"]; });
 
-/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(359);
+/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(439);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__["retry"]; });
 
-/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(360);
+/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(440);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__["retryWhen"]; });
 
-/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(218);
+/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(297);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__["refCount"]; });
 
-/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(361);
+/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(441);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__["sample"]; });
 
-/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(362);
+/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(442);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__["sampleTime"]; });
 
-/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(341);
+/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(422);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__["scan"]; });
 
-/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(363);
+/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(443);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__["sequenceEqual"]; });
 
-/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(364);
+/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(444);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__["share"]; });
 
-/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(365);
+/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(445);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__["shareReplay"]; });
 
-/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(366);
+/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(446);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__["single"]; });
 
-/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(367);
+/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(447);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__["skip"]; });
 
-/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(368);
+/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(448);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__["skipLast"]; });
 
-/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(369);
+/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(449);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__["skipUntil"]; });
 
-/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(370);
+/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(450);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__["skipWhile"]; });
 
-/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(371);
+/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(451);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__["startWith"]; });
 
-/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(372);
+/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(452);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__["subscribeOn"]; });
 
-/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(374);
+/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(454);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__["switchAll"]; });
 
-/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(375);
+/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(455);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__["switchMap"]; });
 
-/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(376);
+/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(456);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__["switchMapTo"]; });
 
-/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(323);
+/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(404);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__["take"]; });
 
-/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(336);
+/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(417);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__["takeLast"]; });
 
-/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(377);
+/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(457);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__["takeUntil"]; });
 
-/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(378);
+/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(458);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__["takeWhile"]; });
 
-/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(322);
+/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(459);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__["tap"]; });
 
-/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(379);
+/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(460);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__["throttle"]; });
 
-/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(380);
+/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(461);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__["throttleTime"]; });
 
-/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(321);
+/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(403);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__["throwIfEmpty"]; });
 
-/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(381);
+/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(462);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__["timeInterval"]; });
 
-/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(382);
+/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(463);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__["timeout"]; });
 
-/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(383);
+/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(464);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__["timeoutWith"]; });
 
-/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(384);
+/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(465);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__["timestamp"]; });
 
-/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(385);
+/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(466);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__["toArray"]; });
 
-/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(386);
+/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(467);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__["window"]; });
 
-/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(387);
+/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(468);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__["windowCount"]; });
 
-/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(388);
+/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(469);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__["windowTime"]; });
 
-/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(389);
+/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(470);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__["windowToggle"]; });
 
-/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(390);
+/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(471);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__["windowWhen"]; });
 
-/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(391);
+/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(472);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__["withLatestFrom"]; });
 
-/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(392);
+/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(473);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__["zip"]; });
 
-/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(393);
+/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(474);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__["zipAll"]; });
 
 /** PURE_IMPORTS_START  PURE_IMPORTS_END */
@@ -32358,20 +39298,16 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 295 */
+/* 378 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return audit; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(208);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
 
@@ -32401,18 +39337,20 @@ var AuditSubscriber = /*@__PURE__*/ (function (_super) {
         this.value = value;
         this.hasValue = true;
         if (!this.throttled) {
-            var duration = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_1__["tryCatch"])(this.durationSelector)(value);
-            if (duration === _util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"]) {
-                this.destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"].e);
+            var duration = void 0;
+            try {
+                var durationSelector = this.durationSelector;
+                duration = durationSelector(value);
+            }
+            catch (err) {
+                return this.destination.error(err);
+            }
+            var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration);
+            if (!innerSubscription || innerSubscription.closed) {
+                this.clearThrottle();
             }
             else {
-                var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, duration);
-                if (!innerSubscription || innerSubscription.closed) {
-                    this.clearThrottle();
-                }
-                else {
-                    this.add(this.throttled = innerSubscription);
-                }
+                this.add(this.throttled = innerSubscription);
             }
         }
     };
@@ -32436,20 +39374,20 @@ var AuditSubscriber = /*@__PURE__*/ (function (_super) {
         this.clearThrottle();
     };
     return AuditSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
 //# sourceMappingURL=audit.js.map
 
 
 /***/ }),
-/* 296 */
+/* 379 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return auditTime; });
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(243);
-/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295);
-/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(291);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(322);
+/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(378);
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(374);
 /** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */
 
 
@@ -32464,15 +39402,15 @@ function auditTime(duration, scheduler) {
 
 
 /***/ }),
-/* 297 */
+/* 380 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return buffer; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -32513,14 +39451,14 @@ var BufferSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 298 */
+/* 381 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return bufferCount; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -32614,16 +39552,16 @@ var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 299 */
+/* 382 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return bufferTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(243);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(198);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(233);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(278);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(312);
 /** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */
 
 
@@ -32775,16 +39713,16 @@ function dispatchBufferClose(arg) {
 
 
 /***/ }),
-/* 300 */
+/* 383 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return bufferToggle; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(257);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336);
 /** PURE_IMPORTS_START tslib,_Subscription,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */
 
 
@@ -32895,21 +39833,17 @@ var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 301 */
+/* 384 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return bufferWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(208);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
 
@@ -32973,35 +39907,39 @@ var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) {
             this.destination.next(buffer);
         }
         this.buffer = [];
-        var closingNotifier = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.closingSelector)();
-        if (closingNotifier === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) {
-            this.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e);
+        var closingNotifier;
+        try {
+            var closingSelector = this.closingSelector;
+            closingNotifier = closingSelector();
         }
-        else {
-            closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-            this.closingSubscription = closingSubscription;
-            this.add(closingSubscription);
-            this.subscribing = true;
-            closingSubscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, closingNotifier));
-            this.subscribing = false;
+        catch (err) {
+            return this.error(err);
         }
+        closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
+        this.closingSubscription = closingSubscription;
+        this.add(closingSubscription);
+        this.subscribing = true;
+        closingSubscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, closingNotifier));
+        this.subscribing = false;
     };
     return BufferWhenSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"]));
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
 //# sourceMappingURL=bufferWhen.js.map
 
 
 /***/ }),
-/* 302 */
+/* 385 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return catchError; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
 
 
 
@@ -33040,7 +39978,9 @@ var CatchSubscriber = /*@__PURE__*/ (function (_super) {
                 return;
             }
             this._unsubscribeAndRecycle();
-            this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result));
+            var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined);
+            this.add(innerSubscriber);
+            Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, undefined, undefined, innerSubscriber);
         }
     };
     return CatchSubscriber;
@@ -33049,13 +39989,13 @@ var CatchSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 303 */
+/* 386 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return combineAll; });
-/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(256);
+/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(335);
 /** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */
 
 function combineAll(project) {
@@ -33065,15 +40005,15 @@ function combineAll(project) {
 
 
 /***/ }),
-/* 304 */
+/* 387 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; });
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(205);
-/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(256);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(268);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(285);
+/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(335);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(350);
 /** PURE_IMPORTS_START _util_isArray,_observable_combineLatest,_observable_from PURE_IMPORTS_END */
 
 
@@ -33097,13 +40037,13 @@ function combineLatest() {
 
 
 /***/ }),
-/* 305 */
+/* 388 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; });
-/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(267);
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346);
 /** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */
 
 function concat() {
@@ -33117,13 +40057,13 @@ function concat() {
 
 
 /***/ }),
-/* 306 */
+/* 389 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return concatMap; });
-/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(349);
 /** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
 
 function concatMap(project, resultSelector) {
@@ -33133,13 +40073,13 @@ function concatMap(project, resultSelector) {
 
 
 /***/ }),
-/* 307 */
+/* 390 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return concatMapTo; });
-/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(306);
+/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(389);
 /** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */
 
 function concatMapTo(innerObservable, resultSelector) {
@@ -33149,14 +40089,14 @@ function concatMapTo(innerObservable, resultSelector) {
 
 
 /***/ }),
-/* 308 */
+/* 391 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "count", function() { return count; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -33214,15 +40154,15 @@ var CountSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 309 */
+/* 392 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return debounce; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -33302,15 +40242,15 @@ var DebounceSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 310 */
+/* 393 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return debounceTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(243);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(322);
 /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
 
 
@@ -33378,14 +40318,14 @@ function dispatchNext(subscriber) {
 
 
 /***/ }),
-/* 311 */
+/* 394 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return defaultIfEmpty; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -33428,17 +40368,17 @@ var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 312 */
+/* 395 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return delay; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(243);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(313);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(198);
-/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(230);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322);
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(396);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(278);
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(309);
 /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */
 
 
@@ -33493,7 +40433,8 @@ var DelaySubscriber = /*@__PURE__*/ (function (_super) {
     };
     DelaySubscriber.prototype._schedule = function (scheduler) {
         this.active = true;
-        this.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, {
+        var destination = this.destination;
+        destination.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, {
             source: this, destination: this.destination, scheduler: scheduler
         }));
     };
@@ -33515,9 +40456,11 @@ var DelaySubscriber = /*@__PURE__*/ (function (_super) {
         this.errored = true;
         this.queue = [];
         this.destination.error(err);
+        this.unsubscribe();
     };
     DelaySubscriber.prototype._complete = function () {
         this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createComplete());
+        this.unsubscribe();
     };
     return DelaySubscriber;
 }(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
@@ -33532,7 +40475,7 @@ var DelayMessage = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 313 */
+/* 396 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -33546,17 +40489,17 @@ function isDate(value) {
 
 
 /***/ }),
-/* 314 */
+/* 397 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return delayWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(196);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(276);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -33588,6 +40531,7 @@ var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) {
         _this.delayDurationSelector = delayDurationSelector;
         _this.completed = false;
         _this.delayNotifierSubscriptions = [];
+        _this.index = 0;
         return _this;
     }
     DelayWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
@@ -33606,8 +40550,9 @@ var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) {
         this.tryComplete();
     };
     DelayWhenSubscriber.prototype._next = function (value) {
+        var index = this.index++;
         try {
-            var delayNotifier = this.delayDurationSelector(value);
+            var delayNotifier = this.delayDurationSelector(value, index);
             if (delayNotifier) {
                 this.tryDelay(delayNotifier, value);
             }
@@ -33619,6 +40564,7 @@ var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) {
     DelayWhenSubscriber.prototype._complete = function () {
         this.completed = true;
         this.tryComplete();
+        this.unsubscribe();
     };
     DelayWhenSubscriber.prototype.removeSubscription = function (subscription) {
         subscription.unsubscribe();
@@ -33631,7 +40577,8 @@ var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) {
     DelayWhenSubscriber.prototype.tryDelay = function (delayNotifier, value) {
         var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, delayNotifier, value);
         if (notifierSubscription && !notifierSubscription.closed) {
-            this.add(notifierSubscription);
+            var destination = this.destination;
+            destination.add(notifierSubscription);
             this.delayNotifierSubscriptions.push(notifierSubscription);
         }
     };
@@ -33672,6 +40619,7 @@ var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) {
         this.parent.error(err);
     };
     SubscriptionDelaySubscriber.prototype._complete = function () {
+        this.unsubscribe();
         this.subscribeToSource();
     };
     SubscriptionDelaySubscriber.prototype.subscribeToSource = function () {
@@ -33687,14 +40635,14 @@ var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 315 */
+/* 398 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return dematerialize; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -33725,16 +40673,16 @@ var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 316 */
+/* 399 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return distinct; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DistinctSubscriber", function() { return DistinctSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -33803,19 +40751,15 @@ var DistinctSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 317 */
+/* 400 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return distinctUntilChanged; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(208);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
-
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
 function distinctUntilChanged(compare, keySelector) {
@@ -33846,25 +40790,28 @@ var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) {
         return x === y;
     };
     DistinctUntilChangedSubscriber.prototype._next = function (value) {
-        var keySelector = this.keySelector;
-        var key = value;
-        if (keySelector) {
-            key = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.keySelector)(value);
-            if (key === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) {
-                return this.destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e);
-            }
+        var key;
+        try {
+            var keySelector = this.keySelector;
+            key = keySelector ? keySelector(value) : value;
+        }
+        catch (err) {
+            return this.destination.error(err);
         }
         var result = false;
         if (this.hasKey) {
-            result = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.compare)(this.key, key);
-            if (result === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) {
-                return this.destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e);
+            try {
+                var compare = this.compare;
+                result = compare(this.key, key);
+            }
+            catch (err) {
+                return this.destination.error(err);
             }
         }
         else {
             this.hasKey = true;
         }
-        if (Boolean(result) === false) {
+        if (!result) {
             this.key = key;
             this.destination.next(value);
         }
@@ -33875,13 +40822,13 @@ var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 318 */
+/* 401 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return distinctUntilKeyChanged; });
-/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(317);
+/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(400);
 /** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */
 
 function distinctUntilKeyChanged(key, compare) {
@@ -33891,17 +40838,17 @@ function distinctUntilKeyChanged(key, compare) {
 
 
 /***/ }),
-/* 319 */
+/* 402 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return elementAt; });
-/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(250);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(321);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(311);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(323);
+/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(329);
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(403);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(394);
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(404);
 /** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */
 
 
@@ -33923,190 +40870,82 @@ function elementAt(index, defaultValue) {
 
 
 /***/ }),
-/* 320 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return filter; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
-
-function filter(predicate, thisArg) {
-    return function filterOperatorFunction(source) {
-        return source.lift(new FilterOperator(predicate, thisArg));
-    };
-}
-var FilterOperator = /*@__PURE__*/ (function () {
-    function FilterOperator(predicate, thisArg) {
-        this.predicate = predicate;
-        this.thisArg = thisArg;
-    }
-    FilterOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new FilterSubscriber(subscriber, this.predicate, this.thisArg));
-    };
-    return FilterOperator;
-}());
-var FilterSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FilterSubscriber, _super);
-    function FilterSubscriber(destination, predicate, thisArg) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.thisArg = thisArg;
-        _this.count = 0;
-        return _this;
-    }
-    FilterSubscriber.prototype._next = function (value) {
-        var result;
-        try {
-            result = this.predicate.call(this.thisArg, value, this.count++);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        if (result) {
-            this.destination.next(value);
-        }
-    };
-    return FilterSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=filter.js.map
-
-
-/***/ }),
-/* 321 */
+/* 403 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return throwIfEmpty; });
-/* harmony import */ var _tap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(322);
-/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(251);
-/** PURE_IMPORTS_START _tap,_util_EmptyError PURE_IMPORTS_END */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(330);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(278);
+/** PURE_IMPORTS_START tslib,_util_EmptyError,_Subscriber PURE_IMPORTS_END */
 
 
-var throwIfEmpty = function (errorFactory) {
+
+function throwIfEmpty(errorFactory) {
     if (errorFactory === void 0) {
         errorFactory = defaultErrorFactory;
     }
-    return Object(_tap__WEBPACK_IMPORTED_MODULE_0__["tap"])({
-        hasValue: false,
-        next: function () { this.hasValue = true; },
-        complete: function () {
-            if (!this.hasValue) {
-                throw errorFactory();
-            }
-        }
-    });
-};
-function defaultErrorFactory() {
-    return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__["EmptyError"]();
-}
-//# sourceMappingURL=throwIfEmpty.js.map
-
-
-/***/ }),
-/* 322 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return tap; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(213);
-/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(200);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */
-
-
-
-
-function tap(nextOrObserver, error, complete) {
-    return function tapOperatorFunction(source) {
-        return source.lift(new DoOperator(nextOrObserver, error, complete));
+    return function (source) {
+        return source.lift(new ThrowIfEmptyOperator(errorFactory));
     };
 }
-var DoOperator = /*@__PURE__*/ (function () {
-    function DoOperator(nextOrObserver, error, complete) {
-        this.nextOrObserver = nextOrObserver;
-        this.error = error;
-        this.complete = complete;
+var ThrowIfEmptyOperator = /*@__PURE__*/ (function () {
+    function ThrowIfEmptyOperator(errorFactory) {
+        this.errorFactory = errorFactory;
     }
-    DoOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TapSubscriber(subscriber, this.nextOrObserver, this.error, this.complete));
+    ThrowIfEmptyOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ThrowIfEmptySubscriber(subscriber, this.errorFactory));
     };
-    return DoOperator;
+    return ThrowIfEmptyOperator;
 }());
-var TapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TapSubscriber, _super);
-    function TapSubscriber(destination, observerOrNext, error, complete) {
+var ThrowIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrowIfEmptySubscriber, _super);
+    function ThrowIfEmptySubscriber(destination, errorFactory) {
         var _this = _super.call(this, destination) || this;
-        _this._tapNext = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        _this._tapError = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        _this._tapComplete = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        _this._tapError = error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        _this._tapComplete = complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__["isFunction"])(observerOrNext)) {
-            _this._context = _this;
-            _this._tapNext = observerOrNext;
-        }
-        else if (observerOrNext) {
-            _this._context = observerOrNext;
-            _this._tapNext = observerOrNext.next || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-            _this._tapError = observerOrNext.error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-            _this._tapComplete = observerOrNext.complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
-        }
+        _this.errorFactory = errorFactory;
+        _this.hasValue = false;
         return _this;
     }
-    TapSubscriber.prototype._next = function (value) {
-        try {
-            this._tapNext.call(this._context, value);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
+    ThrowIfEmptySubscriber.prototype._next = function (value) {
+        this.hasValue = true;
         this.destination.next(value);
     };
-    TapSubscriber.prototype._error = function (err) {
-        try {
-            this._tapError.call(this._context, err);
-        }
-        catch (err) {
+    ThrowIfEmptySubscriber.prototype._complete = function () {
+        if (!this.hasValue) {
+            var err = void 0;
+            try {
+                err = this.errorFactory();
+            }
+            catch (e) {
+                err = e;
+            }
             this.destination.error(err);
-            return;
-        }
-        this.destination.error(err);
-    };
-    TapSubscriber.prototype._complete = function () {
-        try {
-            this._tapComplete.call(this._context);
         }
-        catch (err) {
-            this.destination.error(err);
-            return;
+        else {
+            return this.destination.complete();
         }
-        return this.destination.complete();
     };
-    return TapSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=tap.js.map
+    return ThrowIfEmptySubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
+function defaultErrorFactory() {
+    return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__["EmptyError"]();
+}
+//# sourceMappingURL=throwIfEmpty.js.map
 
 
 /***/ }),
-/* 323 */
+/* 404 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "take", function() { return take; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250);
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(329);
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(310);
 /** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
 
 
@@ -34159,21 +40998,15 @@ var TakeSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 324 */
+/* 405 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return endWith; });
-/* harmony import */ var _observable_fromArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(234);
-/* harmony import */ var _observable_scalar__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(236);
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231);
-/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(267);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(233);
-/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
-
-
-
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346);
+/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(311);
+/** PURE_IMPORTS_START _observable_concat,_observable_of PURE_IMPORTS_END */
 
 
 function endWith() {
@@ -34181,38 +41014,20 @@ function endWith() {
     for (var _i = 0; _i < arguments.length; _i++) {
         array[_i] = arguments[_i];
     }
-    return function (source) {
-        var scheduler = array[array.length - 1];
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(scheduler)) {
-            array.pop();
-        }
-        else {
-            scheduler = null;
-        }
-        var len = array.length;
-        if (len === 1 && !scheduler) {
-            return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(source, Object(_observable_scalar__WEBPACK_IMPORTED_MODULE_1__["scalar"])(array[0]));
-        }
-        else if (len > 0) {
-            return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(source, Object(_observable_fromArray__WEBPACK_IMPORTED_MODULE_0__["fromArray"])(array, scheduler));
-        }
-        else {
-            return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(source, Object(_observable_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(scheduler));
-        }
-    };
+    return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(source, _observable_of__WEBPACK_IMPORTED_MODULE_1__["of"].apply(void 0, array)); };
 }
 //# sourceMappingURL=endWith.js.map
 
 
 /***/ }),
-/* 325 */
+/* 406 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "every", function() { return every; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -34267,15 +41082,15 @@ var EverySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 326 */
+/* 407 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return exhaust; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -34324,18 +41139,20 @@ var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 327 */
+/* 408 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return exhaustMap; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(254);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(268);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(333);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(350);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
+
 
 
 
@@ -34343,20 +41160,20 @@ __webpack_require__.r(__webpack_exports__);
 
 function exhaustMap(project, resultSelector) {
     if (resultSelector) {
-        return function (source) { return source.pipe(exhaustMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_4__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
+        return function (source) { return source.pipe(exhaustMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
     }
     return function (source) {
-        return source.lift(new ExhauseMapOperator(project));
+        return source.lift(new ExhaustMapOperator(project));
     };
 }
-var ExhauseMapOperator = /*@__PURE__*/ (function () {
-    function ExhauseMapOperator(project) {
+var ExhaustMapOperator = /*@__PURE__*/ (function () {
+    function ExhaustMapOperator(project) {
         this.project = project;
     }
-    ExhauseMapOperator.prototype.call = function (subscriber, source) {
+    ExhaustMapOperator.prototype.call = function (subscriber, source) {
         return source.subscribe(new ExhaustMapSubscriber(subscriber, this.project));
     };
-    return ExhauseMapOperator;
+    return ExhaustMapOperator;
 }());
 var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
     tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExhaustMapSubscriber, _super);
@@ -34374,22 +41191,30 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
         }
     };
     ExhaustMapSubscriber.prototype.tryNext = function (value) {
+        var result;
         var index = this.index++;
-        var destination = this.destination;
         try {
-            var result = this.project(value, index);
-            this.hasSubscription = true;
-            this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result, value, index));
+            result = this.project(value, index);
         }
         catch (err) {
-            destination.error(err);
+            this.destination.error(err);
+            return;
         }
+        this.hasSubscription = true;
+        this._innerSub(result, value, index);
+    };
+    ExhaustMapSubscriber.prototype._innerSub = function (result, value, index) {
+        var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined);
+        var destination = this.destination;
+        destination.add(innerSubscriber);
+        Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, value, index, innerSubscriber);
     };
     ExhaustMapSubscriber.prototype._complete = function () {
         this.hasCompleted = true;
         if (!this.hasSubscription) {
             this.destination.complete();
         }
+        this.unsubscribe();
     };
     ExhaustMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
         this.destination.next(innerValue);
@@ -34398,7 +41223,8 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
         this.destination.error(err);
     };
     ExhaustMapSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.remove(innerSub);
+        var destination = this.destination;
+        destination.remove(innerSub);
         this.hasSubscription = false;
         if (this.hasCompleted) {
             this.destination.complete();
@@ -34410,7 +41236,7 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 328 */
+/* 409 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -34418,14 +41244,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return expand; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandOperator", function() { return ExpandOperator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandSubscriber", function() { return ExpandSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(208);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
 
@@ -34479,16 +41301,20 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
         var index = this.index++;
         if (this.active < this.concurrent) {
             destination.next(value);
-            var result = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_1__["tryCatch"])(this.project)(value, index);
-            if (result === _util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"]) {
-                destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"].e);
-            }
-            else if (!this.scheduler) {
-                this.subscribeToProjection(result, value, index);
+            try {
+                var project = this.project;
+                var result = project(value, index);
+                if (!this.scheduler) {
+                    this.subscribeToProjection(result, value, index);
+                }
+                else {
+                    var state = { subscriber: this, result: result, value: value, index: index };
+                    var destination_1 = this.destination;
+                    destination_1.add(this.scheduler.schedule(ExpandSubscriber.dispatch, 0, state));
+                }
             }
-            else {
-                var state = { subscriber: this, result: result, value: value, index: index };
-                this.add(this.scheduler.schedule(ExpandSubscriber.dispatch, 0, state));
+            catch (e) {
+                destination.error(e);
             }
         }
         else {
@@ -34497,20 +41323,23 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
     };
     ExpandSubscriber.prototype.subscribeToProjection = function (result, value, index) {
         this.active++;
-        this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, result, value, index));
+        var destination = this.destination;
+        destination.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result, value, index));
     };
     ExpandSubscriber.prototype._complete = function () {
         this.hasCompleted = true;
         if (this.hasCompleted && this.active === 0) {
             this.destination.complete();
         }
+        this.unsubscribe();
     };
     ExpandSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
         this._next(innerValue);
     };
     ExpandSubscriber.prototype.notifyComplete = function (innerSub) {
         var buffer = this.buffer;
-        this.remove(innerSub);
+        var destination = this.destination;
+        destination.remove(innerSub);
         this.active--;
         if (buffer && buffer.length > 0) {
             this._next(buffer.shift());
@@ -34520,21 +41349,21 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
         }
     };
     return ExpandSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
 
 //# sourceMappingURL=expand.js.map
 
 
 /***/ }),
-/* 329 */
+/* 410 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return finalize; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(204);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(284);
 /** PURE_IMPORTS_START tslib,_Subscriber,_Subscription PURE_IMPORTS_END */
 
 
@@ -34564,7 +41393,7 @@ var FinallySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 330 */
+/* 411 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -34572,8 +41401,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "find", function() { return find; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FindValueOperator", function() { return FindValueOperator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FindValueSubscriber", function() { return FindValueSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -34611,6 +41440,7 @@ var FindValueSubscriber = /*@__PURE__*/ (function (_super) {
         var destination = this.destination;
         destination.next(value);
         destination.complete();
+        this.unsubscribe();
     };
     FindValueSubscriber.prototype._next = function (value) {
         var _a = this, predicate = _a.predicate, thisArg = _a.thisArg;
@@ -34635,13 +41465,13 @@ var FindValueSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 331 */
+/* 412 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return findIndex; });
-/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(330);
+/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(411);
 /** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */
 
 function findIndex(predicate, thisArg) {
@@ -34651,18 +41481,18 @@ function findIndex(predicate, thisArg) {
 
 
 /***/ }),
-/* 332 */
+/* 413 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "first", function() { return first; });
-/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(251);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(323);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(311);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(321);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(248);
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(330);
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371);
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(404);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(394);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(403);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(327);
 /** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */
 
 
@@ -34678,14 +41508,14 @@ function first(predicate, defaultValue) {
 
 
 /***/ }),
-/* 333 */
+/* 414 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return ignoreElements; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -34715,14 +41545,14 @@ var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 334 */
+/* 415 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return isEmpty; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -34759,18 +41589,18 @@ var IsEmptySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 335 */
+/* 416 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return last; });
-/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(251);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320);
-/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(321);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(311);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(248);
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(330);
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371);
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(417);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(403);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(394);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(327);
 /** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */
 
 
@@ -34786,16 +41616,16 @@ function last(predicate, defaultValue) {
 
 
 /***/ }),
-/* 336 */
+/* 417 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return takeLast; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250);
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(329);
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(310);
 /** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
 
 
@@ -34863,14 +41693,14 @@ var TakeLastSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 337 */
+/* 418 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return mapTo; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -34902,15 +41732,15 @@ var MapToSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 338 */
+/* 419 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return materialize; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(309);
 /** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
 
 
@@ -34952,13 +41782,13 @@ var MaterializeSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 339 */
+/* 420 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "max", function() { return max; });
-/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(340);
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(421);
 /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
 function max(comparer) {
@@ -34971,16 +41801,16 @@ function max(comparer) {
 
 
 /***/ }),
-/* 340 */
+/* 421 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return reduce; });
-/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(341);
-/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(311);
-/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(212);
+/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(422);
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(417);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(394);
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(291);
 /** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */
 
 
@@ -34993,23 +41823,21 @@ function reduce(accumulator, seed) {
         };
     }
     return function reduceOperatorFunction(source) {
-        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(function (acc, value, index) {
-            return accumulator(acc, value, index + 1);
-        }), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1))(source);
+        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(function (acc, value, index) { return accumulator(acc, value, index + 1); }), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1))(source);
     };
 }
 //# sourceMappingURL=reduce.js.map
 
 
 /***/ }),
-/* 341 */
+/* 422 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return scan; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -35084,13 +41912,13 @@ var ScanSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 342 */
+/* 423 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; });
-/* harmony import */ var _observable_merge__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(285);
+/* harmony import */ var _observable_merge__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(365);
 /** PURE_IMPORTS_START _observable_merge PURE_IMPORTS_END */
 
 function merge() {
@@ -35104,13 +41932,13 @@ function merge() {
 
 
 /***/ }),
-/* 343 */
+/* 424 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return mergeMapTo; });
-/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
+/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(349);
 /** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
 
 function mergeMapTo(innerObservable, resultSelector, concurrent) {
@@ -35129,7 +41957,7 @@ function mergeMapTo(innerObservable, resultSelector, concurrent) {
 
 
 /***/ }),
-/* 344 */
+/* 425 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -35137,13 +41965,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return mergeScan; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanOperator", function() { return MergeScanOperator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanSubscriber", function() { return MergeScanSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(208);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(258);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(257);
-/** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(337);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(338);
+/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber PURE_IMPORTS_END */
 
 
 
@@ -35183,22 +42009,27 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
     MergeScanSubscriber.prototype._next = function (value) {
         if (this.active < this.concurrent) {
             var index = this.index++;
-            var ish = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_1__["tryCatch"])(this.accumulator)(this.acc, value);
             var destination = this.destination;
-            if (ish === _util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"]) {
-                destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_2__["errorObject"].e);
+            var ish = void 0;
+            try {
+                var accumulator = this.accumulator;
+                ish = accumulator(this.acc, value, index);
             }
-            else {
-                this.active++;
-                this._innerSub(ish, value, index);
+            catch (e) {
+                return destination.error(e);
             }
+            this.active++;
+            this._innerSub(ish, value, index);
         }
         else {
             this.buffer.push(value);
         }
     };
     MergeScanSubscriber.prototype._innerSub = function (ish, value, index) {
-        this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, ish, value, index));
+        var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__["InnerSubscriber"](this, undefined, undefined);
+        var destination = this.destination;
+        destination.add(innerSubscriber);
+        Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index, innerSubscriber);
     };
     MergeScanSubscriber.prototype._complete = function () {
         this.hasCompleted = true;
@@ -35208,6 +42039,7 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
             }
             this.destination.complete();
         }
+        this.unsubscribe();
     };
     MergeScanSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
         var destination = this.destination;
@@ -35217,7 +42049,8 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
     };
     MergeScanSubscriber.prototype.notifyComplete = function (innerSub) {
         var buffer = this.buffer;
-        this.remove(innerSub);
+        var destination = this.destination;
+        destination.remove(innerSub);
         this.active--;
         if (buffer.length > 0) {
             this._next(buffer.shift());
@@ -35230,19 +42063,19 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
         }
     };
     return MergeScanSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"]));
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
 
 //# sourceMappingURL=mergeScan.js.map
 
 
 /***/ }),
-/* 345 */
+/* 426 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return min; });
-/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(340);
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(421);
 /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
 function min(comparer) {
@@ -35255,14 +42088,14 @@ function min(comparer) {
 
 
 /***/ }),
-/* 346 */
+/* 427 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return multicast; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MulticastOperator", function() { return MulticastOperator; });
-/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(214);
+/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(293);
 /** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */
 
 function multicast(subjectOrSubjectFactory, selector) {
@@ -35304,19 +42137,21 @@ var MulticastOperator = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 347 */
+/* 428 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNextStatic", function() { return onErrorResumeNextStatic; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(268);
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(350);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(285);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(338);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
 
 
 
@@ -35369,14 +42204,19 @@ var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) {
     };
     OnErrorResumeNextSubscriber.prototype._error = function (err) {
         this.subscribeToNextSource();
+        this.unsubscribe();
     };
     OnErrorResumeNextSubscriber.prototype._complete = function () {
         this.subscribeToNextSource();
+        this.unsubscribe();
     };
     OnErrorResumeNextSubscriber.prototype.subscribeToNextSource = function () {
         var next = this.nextSources.shift();
-        if (next) {
-            this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, next));
+        if (!!next) {
+            var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_4__["InnerSubscriber"](this, undefined, undefined);
+            var destination = this.destination;
+            destination.add(innerSubscriber);
+            Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, next, undefined, undefined, innerSubscriber);
         }
         else {
             this.destination.complete();
@@ -35388,14 +42228,14 @@ var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 348 */
+/* 429 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return pairwise; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -35418,13 +42258,17 @@ var PairwiseSubscriber = /*@__PURE__*/ (function (_super) {
         return _this;
     }
     PairwiseSubscriber.prototype._next = function (value) {
+        var pair;
         if (this.hasPrev) {
-            this.destination.next([this.prev, value]);
+            pair = [this.prev, value];
         }
         else {
             this.hasPrev = true;
         }
         this.prev = value;
+        if (pair) {
+            this.destination.next(pair);
+        }
     };
     return PairwiseSubscriber;
 }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
@@ -35432,14 +42276,14 @@ var PairwiseSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 349 */
+/* 430 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; });
-/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(350);
-/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320);
+/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(370);
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371);
 /** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */
 
 
@@ -35455,32 +42299,13 @@ function partition(predicate, thisArg) {
 
 
 /***/ }),
-/* 350 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "not", function() { return not; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function not(pred, thisArg) {
-    function notPred() {
-        return !(notPred.pred.apply(notPred.thisArg, arguments));
-    }
-    notPred.pred = pred;
-    notPred.thisArg = thisArg;
-    return notPred;
-}
-//# sourceMappingURL=not.js.map
-
-
-/***/ }),
-/* 351 */
+/* 431 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return pluck; });
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(254);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(333);
 /** PURE_IMPORTS_START _map PURE_IMPORTS_END */
 
 function pluck() {
@@ -35514,14 +42339,14 @@ function plucker(props, length) {
 
 
 /***/ }),
-/* 352 */
+/* 432 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return publish; });
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(215);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(346);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(294);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
 /** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */
 
 
@@ -35534,14 +42359,14 @@ function publish(selector) {
 
 
 /***/ }),
-/* 353 */
+/* 433 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return publishBehavior; });
-/* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(220);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(346);
+/* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(299);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
 /** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */
 
 
@@ -35552,14 +42377,14 @@ function publishBehavior(value) {
 
 
 /***/ }),
-/* 354 */
+/* 434 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return publishLast; });
-/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(238);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(346);
+/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(317);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
 /** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */
 
 
@@ -35570,14 +42395,14 @@ function publishLast() {
 
 
 /***/ }),
-/* 355 */
+/* 435 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return publishReplay; });
-/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(221);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(346);
+/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(300);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
 /** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */
 
 
@@ -35593,14 +42418,14 @@ function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) {
 
 
 /***/ }),
-/* 356 */
+/* 436 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; });
-/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(205);
-/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(289);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(285);
+/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(372);
 /** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */
 
 
@@ -35620,15 +42445,15 @@ function race() {
 
 
 /***/ }),
-/* 357 */
+/* 437 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return repeat; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(310);
 /** PURE_IMPORTS_START tslib,_Subscriber,_observable_empty PURE_IMPORTS_END */
 
 
@@ -35685,21 +42510,17 @@ var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 358 */
+/* 438 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return repeatWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(208);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
 
@@ -35768,27 +42589,31 @@ var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) {
     };
     RepeatWhenSubscriber.prototype.subscribeToRetries = function () {
         this.notifications = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-        var retries = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.notifier)(this.notifications);
-        if (retries === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) {
+        var retries;
+        try {
+            var notifier = this.notifier;
+            retries = notifier(this.notifications);
+        }
+        catch (e) {
             return _super.prototype.complete.call(this);
         }
         this.retries = retries;
-        this.retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, retries);
+        this.retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries);
     };
     return RepeatWhenSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"]));
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
 //# sourceMappingURL=repeatWhen.js.map
 
 
 /***/ }),
-/* 359 */
+/* 439 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return retry; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -35834,21 +42659,17 @@ var RetrySubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 360 */
+/* 440 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return retryWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(208);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
 
@@ -35881,11 +42702,14 @@ var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) {
             var retriesSubscription = this.retriesSubscription;
             if (!retries) {
                 errors = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-                retries = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.notifier)(errors);
-                if (retries === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) {
-                    return _super.prototype.error.call(this, _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e);
+                try {
+                    var notifier = this.notifier;
+                    retries = notifier(errors);
                 }
-                retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, retries);
+                catch (e) {
+                    return _super.prototype.error.call(this, e);
+                }
+                retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries);
             }
             else {
                 this.errors = null;
@@ -35918,20 +42742,20 @@ var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) {
         this.source.subscribe(this);
     };
     return RetryWhenSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"]));
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
 //# sourceMappingURL=retryWhen.js.map
 
 
 /***/ }),
-/* 361 */
+/* 441 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return sample; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -35980,15 +42804,15 @@ var SampleSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 362 */
+/* 442 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return sampleTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(243);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(322);
 /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
 
 
@@ -36040,7 +42864,7 @@ function dispatchNotification(state) {
 
 
 /***/ }),
-/* 363 */
+/* 443 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -36048,39 +42872,35 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return sequenceEqual; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceEqualOperator", function() { return SequenceEqualOperator; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceEqualSubscriber", function() { return SequenceEqualSubscriber; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(208);
-/** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */
-
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
-function sequenceEqual(compareTo, comparor) {
-    return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparor)); };
+function sequenceEqual(compareTo, comparator) {
+    return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparator)); };
 }
 var SequenceEqualOperator = /*@__PURE__*/ (function () {
-    function SequenceEqualOperator(compareTo, comparor) {
+    function SequenceEqualOperator(compareTo, comparator) {
         this.compareTo = compareTo;
-        this.comparor = comparor;
+        this.comparator = comparator;
     }
     SequenceEqualOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparor));
+        return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparator));
     };
     return SequenceEqualOperator;
 }());
 
 var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) {
     tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualSubscriber, _super);
-    function SequenceEqualSubscriber(destination, compareTo, comparor) {
+    function SequenceEqualSubscriber(destination, compareTo, comparator) {
         var _this = _super.call(this, destination) || this;
         _this.compareTo = compareTo;
-        _this.comparor = comparor;
+        _this.comparator = comparator;
         _this._a = [];
         _this._b = [];
         _this._oneComplete = false;
-        _this.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this)));
+        _this.destination.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this)));
         return _this;
     }
     SequenceEqualSubscriber.prototype._next = function (value) {
@@ -36099,21 +42919,19 @@ var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) {
         else {
             this._oneComplete = true;
         }
+        this.unsubscribe();
     };
     SequenceEqualSubscriber.prototype.checkValues = function () {
-        var _c = this, _a = _c._a, _b = _c._b, comparor = _c.comparor;
+        var _c = this, _a = _c._a, _b = _c._b, comparator = _c.comparator;
         while (_a.length > 0 && _b.length > 0) {
             var a = _a.shift();
             var b = _b.shift();
             var areEqual = false;
-            if (comparor) {
-                areEqual = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(comparor)(a, b);
-                if (areEqual === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) {
-                    this.destination.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e);
-                }
+            try {
+                areEqual = comparator ? comparator(a, b) : a === b;
             }
-            else {
-                areEqual = a === b;
+            catch (e) {
+                this.destination.error(e);
             }
             if (!areEqual) {
                 this.emit(false);
@@ -36134,6 +42952,14 @@ var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) {
             this.checkValues();
         }
     };
+    SequenceEqualSubscriber.prototype.completeB = function () {
+        if (this._oneComplete) {
+            this.emit(this._a.length === 0 && this._b.length === 0);
+        }
+        else {
+            this._oneComplete = true;
+        }
+    };
     return SequenceEqualSubscriber;
 }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
 
@@ -36149,9 +42975,11 @@ var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
     };
     SequenceEqualCompareToSubscriber.prototype._error = function (err) {
         this.parent.error(err);
+        this.unsubscribe();
     };
     SequenceEqualCompareToSubscriber.prototype._complete = function () {
-        this.parent._complete();
+        this.parent.completeB();
+        this.unsubscribe();
     };
     return SequenceEqualCompareToSubscriber;
 }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
@@ -36159,15 +42987,15 @@ var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 364 */
+/* 444 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "share", function() { return share; });
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346);
-/* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(215);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(427);
+/* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(297);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(294);
 /** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */
 
 
@@ -36182,19 +43010,32 @@ function share() {
 
 
 /***/ }),
-/* 365 */
+/* 445 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return shareReplay; });
-/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(221);
+/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(300);
 /** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */
 
-function shareReplay(bufferSize, windowTime, scheduler) {
-    return function (source) { return source.lift(shareReplayOperator(bufferSize, windowTime, scheduler)); };
+function shareReplay(configOrBufferSize, windowTime, scheduler) {
+    var config;
+    if (configOrBufferSize && typeof configOrBufferSize === 'object') {
+        config = configOrBufferSize;
+    }
+    else {
+        config = {
+            bufferSize: configOrBufferSize,
+            windowTime: windowTime,
+            refCount: false,
+            scheduler: scheduler
+        };
+    }
+    return function (source) { return source.lift(shareReplayOperator(config)); };
 }
-function shareReplayOperator(bufferSize, windowTime, scheduler) {
+function shareReplayOperator(_a) {
+    var _b = _a.bufferSize, bufferSize = _b === void 0 ? Number.POSITIVE_INFINITY : _b, _c = _a.windowTime, windowTime = _c === void 0 ? Number.POSITIVE_INFINITY : _c, useRefCount = _a.refCount, scheduler = _a.scheduler;
     var subject;
     var refCount = 0;
     var subscription;
@@ -36218,28 +43059,30 @@ function shareReplayOperator(bufferSize, windowTime, scheduler) {
             });
         }
         var innerSub = subject.subscribe(this);
-        return function () {
+        this.add(function () {
             refCount--;
             innerSub.unsubscribe();
-            if (subscription && refCount === 0 && isComplete) {
+            if (subscription && !isComplete && useRefCount && refCount === 0) {
                 subscription.unsubscribe();
+                subscription = undefined;
+                subject = undefined;
             }
-        };
+        });
     };
 }
 //# sourceMappingURL=shareReplay.js.map
 
 
 /***/ }),
-/* 366 */
+/* 446 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "single", function() { return single; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(251);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(330);
 /** PURE_IMPORTS_START tslib,_Subscriber,_util_EmptyError PURE_IMPORTS_END */
 
 
@@ -36311,14 +43154,14 @@ var SingleSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 367 */
+/* 447 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return skip; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -36353,15 +43196,15 @@ var SkipSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 368 */
+/* 448 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return skipLast; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(329);
 /** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError PURE_IMPORTS_END */
 
 
@@ -36415,16 +43258,18 @@ var SkipLastSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 369 */
+/* 449 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return skipUntil; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
 
 
 
@@ -36445,7 +43290,10 @@ var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) {
     function SkipUntilSubscriber(destination, notifier) {
         var _this = _super.call(this, destination) || this;
         _this.hasValue = false;
-        _this.add(_this.innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, notifier));
+        var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](_this, undefined, undefined);
+        _this.add(innerSubscriber);
+        _this.innerSubscription = innerSubscriber;
+        Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(_this, notifier, undefined, undefined, innerSubscriber);
         return _this;
     }
     SkipUntilSubscriber.prototype._next = function (value) {
@@ -36467,14 +43315,14 @@ var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 370 */
+/* 450 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return skipWhile; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
@@ -36523,21 +43371,15 @@ var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 371 */
+/* 451 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return startWith; });
-/* harmony import */ var _observable_fromArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(234);
-/* harmony import */ var _observable_scalar__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(236);
-/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231);
-/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(267);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(233);
-/** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */
-
-
-
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(312);
+/** PURE_IMPORTS_START _observable_concat,_util_isScheduler PURE_IMPORTS_END */
 
 
 function startWith() {
@@ -36545,37 +43387,26 @@ function startWith() {
     for (var _i = 0; _i < arguments.length; _i++) {
         array[_i] = arguments[_i];
     }
-    return function (source) {
-        var scheduler = array[array.length - 1];
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(scheduler)) {
-            array.pop();
-        }
-        else {
-            scheduler = null;
-        }
-        var len = array.length;
-        if (len === 1 && !scheduler) {
-            return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(Object(_observable_scalar__WEBPACK_IMPORTED_MODULE_1__["scalar"])(array[0]), source);
-        }
-        else if (len > 0) {
-            return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(Object(_observable_fromArray__WEBPACK_IMPORTED_MODULE_0__["fromArray"])(array, scheduler), source);
-        }
-        else {
-            return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_3__["concat"])(Object(_observable_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(scheduler), source);
-        }
-    };
+    var scheduler = array[array.length - 1];
+    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(scheduler)) {
+        array.pop();
+        return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source, scheduler); };
+    }
+    else {
+        return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source); };
+    }
 }
 //# sourceMappingURL=startWith.js.map
 
 
 /***/ }),
-/* 372 */
+/* 452 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return subscribeOn; });
-/* harmony import */ var _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(373);
+/* harmony import */ var _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(453);
 /** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */
 
 function subscribeOn(scheduler, delay) {
@@ -36600,16 +43431,16 @@ var SubscribeOnOperator = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 373 */
+/* 453 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubscribeOnObservable", function() { return SubscribeOnObservable; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(196);
-/* harmony import */ var _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(239);
-/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(284);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(276);
+/* harmony import */ var _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(318);
+/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(364);
 /** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */
 
 
@@ -36664,14 +43495,14 @@ var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 374 */
+/* 454 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return switchAll; });
-/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(375);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(248);
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(455);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(327);
 /** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */
 
 
@@ -36682,18 +43513,20 @@ function switchAll() {
 
 
 /***/ }),
-/* 375 */
+/* 455 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return switchMap; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(254);
-/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(268);
-/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(338);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(333);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(350);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
+
 
 
 
@@ -36701,7 +43534,7 @@ __webpack_require__.r(__webpack_exports__);
 
 function switchMap(project, resultSelector) {
     if (typeof resultSelector === 'function') {
-        return function (source) { return source.pipe(switchMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_4__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
+        return function (source) { return source.pipe(switchMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); };
     }
     return function (source) { return source.lift(new SwitchMapOperator(project)); };
 }
@@ -36739,19 +43572,24 @@ var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) {
         if (innerSubscription) {
             innerSubscription.unsubscribe();
         }
-        this.add(this.innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result, value, index));
+        var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined);
+        var destination = this.destination;
+        destination.add(innerSubscriber);
+        this.innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, value, index, innerSubscriber);
     };
     SwitchMapSubscriber.prototype._complete = function () {
         var innerSubscription = this.innerSubscription;
         if (!innerSubscription || innerSubscription.closed) {
             _super.prototype._complete.call(this);
         }
+        this.unsubscribe();
     };
     SwitchMapSubscriber.prototype._unsubscribe = function () {
         this.innerSubscription = null;
     };
     SwitchMapSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.remove(innerSub);
+        var destination = this.destination;
+        destination.remove(innerSub);
         this.innerSubscription = null;
         if (this.isStopped) {
             _super.prototype._complete.call(this);
@@ -36766,13 +43604,13 @@ var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 376 */
+/* 456 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return switchMapTo; });
-/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(375);
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(455);
 /** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */
 
 function switchMapTo(innerObservable, resultSelector) {
@@ -36782,15 +43620,15 @@ function switchMapTo(innerObservable, resultSelector) {
 
 
 /***/ }),
-/* 377 */
+/* 457 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return takeUntil; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -36805,7 +43643,7 @@ var TakeUntilOperator = /*@__PURE__*/ (function () {
     TakeUntilOperator.prototype.call = function (subscriber, source) {
         var takeUntilSubscriber = new TakeUntilSubscriber(subscriber);
         var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(takeUntilSubscriber, this.notifier);
-        if (notifierSubscription && !notifierSubscription.closed) {
+        if (notifierSubscription && !takeUntilSubscriber.seenValue) {
             takeUntilSubscriber.add(notifierSubscription);
             return source.subscribe(takeUntilSubscriber);
         }
@@ -36816,9 +43654,12 @@ var TakeUntilOperator = /*@__PURE__*/ (function () {
 var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) {
     tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeUntilSubscriber, _super);
     function TakeUntilSubscriber(destination) {
-        return _super.call(this, destination) || this;
+        var _this = _super.call(this, destination) || this;
+        _this.seenValue = false;
+        return _this;
     }
     TakeUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.seenValue = true;
         this.complete();
     };
     TakeUntilSubscriber.prototype.notifyComplete = function () {
@@ -36829,34 +43670,41 @@ var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 378 */
+/* 458 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return takeWhile; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
 /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
 
-function takeWhile(predicate) {
-    return function (source) { return source.lift(new TakeWhileOperator(predicate)); };
+function takeWhile(predicate, inclusive) {
+    if (inclusive === void 0) {
+        inclusive = false;
+    }
+    return function (source) {
+        return source.lift(new TakeWhileOperator(predicate, inclusive));
+    };
 }
 var TakeWhileOperator = /*@__PURE__*/ (function () {
-    function TakeWhileOperator(predicate) {
+    function TakeWhileOperator(predicate, inclusive) {
         this.predicate = predicate;
+        this.inclusive = inclusive;
     }
     TakeWhileOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TakeWhileSubscriber(subscriber, this.predicate));
+        return source.subscribe(new TakeWhileSubscriber(subscriber, this.predicate, this.inclusive));
     };
     return TakeWhileOperator;
 }());
 var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) {
     tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeWhileSubscriber, _super);
-    function TakeWhileSubscriber(destination, predicate) {
+    function TakeWhileSubscriber(destination, predicate, inclusive) {
         var _this = _super.call(this, destination) || this;
         _this.predicate = predicate;
+        _this.inclusive = inclusive;
         _this.index = 0;
         return _this;
     }
@@ -36878,6 +43726,9 @@ var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) {
             destination.next(value);
         }
         else {
+            if (this.inclusive) {
+                destination.next(value);
+            }
             destination.complete();
         }
     };
@@ -36887,16 +43738,104 @@ var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 379 */
+/* 459 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return tap; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(292);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(280);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */
+
+
+
+
+function tap(nextOrObserver, error, complete) {
+    return function tapOperatorFunction(source) {
+        return source.lift(new DoOperator(nextOrObserver, error, complete));
+    };
+}
+var DoOperator = /*@__PURE__*/ (function () {
+    function DoOperator(nextOrObserver, error, complete) {
+        this.nextOrObserver = nextOrObserver;
+        this.error = error;
+        this.complete = complete;
+    }
+    DoOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new TapSubscriber(subscriber, this.nextOrObserver, this.error, this.complete));
+    };
+    return DoOperator;
+}());
+var TapSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TapSubscriber, _super);
+    function TapSubscriber(destination, observerOrNext, error, complete) {
+        var _this = _super.call(this, destination) || this;
+        _this._tapNext = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
+        _this._tapError = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
+        _this._tapComplete = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
+        _this._tapError = error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
+        _this._tapComplete = complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
+        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__["isFunction"])(observerOrNext)) {
+            _this._context = _this;
+            _this._tapNext = observerOrNext;
+        }
+        else if (observerOrNext) {
+            _this._context = observerOrNext;
+            _this._tapNext = observerOrNext.next || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
+            _this._tapError = observerOrNext.error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
+            _this._tapComplete = observerOrNext.complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"];
+        }
+        return _this;
+    }
+    TapSubscriber.prototype._next = function (value) {
+        try {
+            this._tapNext.call(this._context, value);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(value);
+    };
+    TapSubscriber.prototype._error = function (err) {
+        try {
+            this._tapError.call(this._context, err);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.error(err);
+    };
+    TapSubscriber.prototype._complete = function () {
+        try {
+            this._tapComplete.call(this._context);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        return this.destination.complete();
+    };
+    return TapSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=tap.js.map
+
+
+/***/ }),
+/* 460 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultThrottleConfig", function() { return defaultThrottleConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return throttle; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -36956,7 +43895,7 @@ var ThrottleSubscriber = /*@__PURE__*/ (function (_super) {
     };
     ThrottleSubscriber.prototype.throttle = function (value) {
         var duration = this.tryDurationSelector(value);
-        if (duration) {
+        if (!!duration) {
             this.add(this._throttled = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration));
         }
     };
@@ -36991,16 +43930,16 @@ var ThrottleSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 380 */
+/* 461 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return throttleTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(243);
-/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(379);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(322);
+/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(460);
 /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */
 
 
@@ -37051,6 +43990,10 @@ var ThrottleTimeSubscriber = /*@__PURE__*/ (function (_super) {
             if (this.leading) {
                 this.destination.next(value);
             }
+            else if (this.trailing) {
+                this._trailingValue = value;
+                this._hasTrailingValue = true;
+            }
         }
     };
     ThrottleTimeSubscriber.prototype._complete = function () {
@@ -37085,17 +44028,17 @@ function dispatchNext(arg) {
 
 
 /***/ }),
-/* 381 */
+/* 462 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return timeInterval; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeInterval", function() { return TimeInterval; });
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(243);
-/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(341);
-/* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(277);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(254);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(322);
+/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(422);
+/* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(357);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(333);
 /** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */
 
 
@@ -37129,16 +44072,16 @@ var TimeInterval = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 382 */
+/* 463 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return timeout; });
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(243);
-/* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(252);
-/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(383);
-/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(237);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(322);
+/* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(331);
+/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(464);
+/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(316);
 /** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */
 
 
@@ -37154,17 +44097,17 @@ function timeout(due, scheduler) {
 
 
 /***/ }),
-/* 383 */
+/* 464 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return timeoutWith; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(243);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(313);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322);
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(396);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -37236,15 +44179,15 @@ var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 384 */
+/* 465 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return timestamp; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Timestamp", function() { return Timestamp; });
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(243);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(254);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(322);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(333);
 /** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */
 
 
@@ -37266,13 +44209,13 @@ var Timestamp = /*@__PURE__*/ (function () {
 
 
 /***/ }),
-/* 385 */
+/* 466 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return toArray; });
-/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(340);
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(421);
 /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
 function toArrayReducer(arr, item, index) {
@@ -37289,16 +44232,16 @@ function toArray() {
 
 
 /***/ }),
-/* 386 */
+/* 467 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "window", function() { return window; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -37369,15 +44312,15 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 387 */
+/* 468 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return windowCount; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(215);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(294);
 /** PURE_IMPORTS_START tslib,_Subscriber,_Subject PURE_IMPORTS_END */
 
 
@@ -37459,18 +44402,18 @@ var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 388 */
+/* 469 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return windowTime; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(243);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(198);
-/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(284);
-/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(233);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(322);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(278);
+/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(364);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(312);
 /** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
 
 
@@ -37629,22 +44572,18 @@ function dispatchWindowClose(state) {
 
 
 /***/ }),
-/* 389 */
+/* 470 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return windowToggle; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(204);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(208);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(284);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
 
@@ -37670,7 +44609,7 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
         _this.openings = openings;
         _this.closingSelector = closingSelector;
         _this.contexts = [];
-        _this.add(_this.openSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_6__["subscribeToResult"])(_this, openings, openings));
+        _this.add(_this.openSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(_this, openings, openings));
         return _this;
     }
     WindowToggleSubscriber.prototype._next = function (value) {
@@ -37725,26 +44664,27 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
     };
     WindowToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
         if (outerValue === this.openings) {
-            var closingSelector = this.closingSelector;
-            var closingNotifier = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_3__["tryCatch"])(closingSelector)(innerValue);
-            if (closingNotifier === _util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"]) {
-                return this.error(_util_errorObject__WEBPACK_IMPORTED_MODULE_4__["errorObject"].e);
+            var closingNotifier = void 0;
+            try {
+                var closingSelector = this.closingSelector;
+                closingNotifier = closingSelector(innerValue);
+            }
+            catch (e) {
+                return this.error(e);
+            }
+            var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
+            var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]();
+            var context_4 = { window: window_1, subscription: subscription };
+            this.contexts.push(context_4);
+            var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, closingNotifier, context_4);
+            if (innerSubscription.closed) {
+                this.closeWindow(this.contexts.length - 1);
             }
             else {
-                var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-                var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]();
-                var context_4 = { window: window_1, subscription: subscription };
-                this.contexts.push(context_4);
-                var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_6__["subscribeToResult"])(this, closingNotifier, context_4);
-                if (innerSubscription.closed) {
-                    this.closeWindow(this.contexts.length - 1);
-                }
-                else {
-                    innerSubscription.context = context_4;
-                    subscription.add(innerSubscription);
-                }
-                this.destination.next(window_1);
+                innerSubscription.context = context_4;
+                subscription.add(innerSubscription);
             }
+            this.destination.next(window_1);
         }
         else {
             this.closeWindow(this.contexts.indexOf(outerValue));
@@ -37770,26 +44710,22 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
         subscription.unsubscribe();
     };
     return WindowToggleSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_5__["OuterSubscriber"]));
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
 //# sourceMappingURL=windowToggle.js.map
 
 
 /***/ }),
-/* 390 */
+/* 471 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return windowWhen; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
-/* harmony import */ var _util_tryCatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(207);
-/* harmony import */ var _util_errorObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(208);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(258);
-/** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
-
-
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(294);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(337);
+/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
 
@@ -37858,31 +44794,33 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) {
         }
         var window = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
         this.destination.next(window);
-        var closingNotifier = Object(_util_tryCatch__WEBPACK_IMPORTED_MODULE_2__["tryCatch"])(this.closingSelector)();
-        if (closingNotifier === _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"]) {
-            var err = _util_errorObject__WEBPACK_IMPORTED_MODULE_3__["errorObject"].e;
-            this.destination.error(err);
-            this.window.error(err);
+        var closingNotifier;
+        try {
+            var closingSelector = this.closingSelector;
+            closingNotifier = closingSelector();
         }
-        else {
-            this.add(this.closingNotification = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, closingNotifier));
+        catch (e) {
+            this.destination.error(e);
+            this.window.error(e);
+            return;
         }
+        this.add(this.closingNotification = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, closingNotifier));
     };
     return WindowSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"]));
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
 //# sourceMappingURL=windowWhen.js.map
 
 
 /***/ }),
-/* 391 */
+/* 472 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return withLatestFrom; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199);
-/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(257);
-/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(258);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(279);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(336);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(337);
 /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
 
 
@@ -37969,13 +44907,13 @@ var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) {
 
 
 /***/ }),
-/* 392 */
+/* 473 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; });
-/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(293);
+/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(376);
 /** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
 
 function zip() {
@@ -37991,13 +44929,13 @@ function zip() {
 
 
 /***/ }),
-/* 393 */
+/* 474 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return zipAll; });
-/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(293);
+/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(376);
 /** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
 
 function zipAll(project) {
@@ -38007,7 +44945,7 @@ function zipAll(project) {
 
 
 /***/ }),
-/* 394 */
+/* 475 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -38015,15 +44953,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runCommand", function() { return runCommand; });
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(395);
+/* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(259);
 /* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(indent_string__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(396);
+/* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(476);
 /* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(wrap_ansi__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(164);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172);
 /* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(53);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
 /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(36);
-/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(403);
+/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(483);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -38101,47 +45039,13 @@ function toArray(value) {
 }
 
 /***/ }),
-/* 395 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-module.exports = (str, count, opts) => {
-	// Support older versions: use the third parameter as options.indent
-	// TODO: Remove the workaround in the next major version
-	const options = typeof opts === 'object' ? Object.assign({indent: ' '}, opts) : {indent: opts || ' '};
-	count = count === undefined ? 1 : count;
-
-	if (typeof str !== 'string') {
-		throw new TypeError(`Expected \`input\` to be a \`string\`, got \`${typeof str}\``);
-	}
-
-	if (typeof count !== 'number') {
-		throw new TypeError(`Expected \`count\` to be a \`number\`, got \`${typeof count}\``);
-	}
-
-	if (typeof options.indent !== 'string') {
-		throw new TypeError(`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``);
-	}
-
-	if (count === 0) {
-		return str;
-	}
-
-	const regex = options.includeEmptyLines ? /^/mg : /^(?!\s*$)/mg;
-	return str.replace(regex, options.indent.repeat(count));
-}
-;
-
-
-/***/ }),
-/* 396 */
+/* 476 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const stringWidth = __webpack_require__(397);
-const stripAnsi = __webpack_require__(401);
+const stringWidth = __webpack_require__(477);
+const stripAnsi = __webpack_require__(481);
 
 const ESCAPES = new Set([
 	'\u001B',
@@ -38335,13 +45239,13 @@ module.exports = (str, cols, opts) => {
 
 
 /***/ }),
-/* 397 */
+/* 477 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const stripAnsi = __webpack_require__(398);
-const isFullwidthCodePoint = __webpack_require__(400);
+const stripAnsi = __webpack_require__(478);
+const isFullwidthCodePoint = __webpack_require__(480);
 
 module.exports = str => {
 	if (typeof str !== 'string' || str.length === 0) {
@@ -38378,18 +45282,18 @@ module.exports = str => {
 
 
 /***/ }),
-/* 398 */
+/* 478 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const ansiRegex = __webpack_require__(399);
+const ansiRegex = __webpack_require__(479);
 
 module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
 
 
 /***/ }),
-/* 399 */
+/* 479 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -38406,7 +45310,7 @@ module.exports = () => {
 
 
 /***/ }),
-/* 400 */
+/* 480 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -38459,18 +45363,18 @@ module.exports = x => {
 
 
 /***/ }),
-/* 401 */
+/* 481 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const ansiRegex = __webpack_require__(402);
+const ansiRegex = __webpack_require__(482);
 
 module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
 
 
 /***/ }),
-/* 402 */
+/* 482 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -38487,7 +45391,7 @@ module.exports = () => {
 
 
 /***/ }),
-/* 403 */
+/* 483 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -38640,15 +45544,15 @@ function addProjectToTree(tree, pathParts, project) {
 }
 
 /***/ }),
-/* 404 */
+/* 484 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(405);
+/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(485);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _build_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildProductionProjects"]; });
 
-/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(613);
+/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(692);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; });
 
 /*
@@ -38673,19 +45577,19 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 405 */
+/* 485 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return buildProductionProjects; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(406);
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(486);
 /* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(166);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(174);
 /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(164);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172);
 /* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
 /* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(55);
@@ -38819,17 +45723,17 @@ async function copyToBuild(project, kibanaRoot, buildRoot) {
 }
 
 /***/ }),
-/* 406 */
+/* 486 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const EventEmitter = __webpack_require__(46);
 const path = __webpack_require__(16);
-const arrify = __webpack_require__(407);
-const globby = __webpack_require__(408);
-const cpFile = __webpack_require__(603);
-const CpyError = __webpack_require__(611);
+const arrify = __webpack_require__(487);
+const globby = __webpack_require__(488);
+const cpFile = __webpack_require__(682);
+const CpyError = __webpack_require__(690);
 
 const preprocessSrcPath = (srcPath, options) => options.cwd ? path.resolve(options.cwd, srcPath) : srcPath;
 
@@ -38934,7 +45838,7 @@ module.exports.default = cpy;
 
 
 /***/ }),
-/* 407 */
+/* 487 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -38949,17 +45853,17 @@ module.exports = function (val) {
 
 
 /***/ }),
-/* 408 */
+/* 488 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const arrayUnion = __webpack_require__(170);
+const arrayUnion = __webpack_require__(489);
 const glob = __webpack_require__(37);
-const fastGlob = __webpack_require__(409);
-const dirGlob = __webpack_require__(596);
-const gitignore = __webpack_require__(599);
+const fastGlob = __webpack_require__(491);
+const dirGlob = __webpack_require__(675);
+const gitignore = __webpack_require__(678);
 
 const DEFAULT_FILTER = () => false;
 
@@ -39104,10 +46008,92 @@ module.exports.gitignore = gitignore;
 
 
 /***/ }),
-/* 409 */
+/* 489 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var arrayUniq = __webpack_require__(490);
+
+module.exports = function () {
+	return arrayUniq([].concat.apply([], arguments));
+};
+
+
+/***/ }),
+/* 490 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// there's 3 implementations written in increasing order of efficiency
+
+// 1 - no Set type is defined
+function uniqNoSet(arr) {
+	var ret = [];
+
+	for (var i = 0; i < arr.length; i++) {
+		if (ret.indexOf(arr[i]) === -1) {
+			ret.push(arr[i]);
+		}
+	}
+
+	return ret;
+}
+
+// 2 - a simple Set type is defined
+function uniqSet(arr) {
+	var seen = new Set();
+	return arr.filter(function (el) {
+		if (!seen.has(el)) {
+			seen.add(el);
+			return true;
+		}
+
+		return false;
+	});
+}
+
+// 3 - a standard Set type is defined and it has a forEach method
+function uniqSetWithForEach(arr) {
+	var ret = [];
+
+	(new Set(arr)).forEach(function (el) {
+		ret.push(el);
+	});
+
+	return ret;
+}
+
+// V8 currently has a broken implementation
+// https://github.com/joyent/node/issues/8449
+function doesForEachActuallyWork() {
+	var ret = false;
+
+	(new Set([true])).forEach(function (el) {
+		ret = el;
+	});
+
+	return ret === true;
+}
+
+if ('Set' in global) {
+	if (typeof Set.prototype.forEach === 'function' && doesForEachActuallyWork()) {
+		module.exports = uniqSetWithForEach;
+	} else {
+		module.exports = uniqSet;
+	}
+} else {
+	module.exports = uniqNoSet;
+}
+
+
+/***/ }),
+/* 491 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const pkg = __webpack_require__(410);
+const pkg = __webpack_require__(492);
 
 module.exports = pkg.async;
 module.exports.default = pkg.async;
@@ -39120,19 +46106,19 @@ module.exports.generateTasks = pkg.generateTasks;
 
 
 /***/ }),
-/* 410 */
+/* 492 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var optionsManager = __webpack_require__(411);
-var taskManager = __webpack_require__(412);
-var reader_async_1 = __webpack_require__(566);
-var reader_stream_1 = __webpack_require__(590);
-var reader_sync_1 = __webpack_require__(591);
-var arrayUtils = __webpack_require__(593);
-var streamUtils = __webpack_require__(594);
+var optionsManager = __webpack_require__(493);
+var taskManager = __webpack_require__(494);
+var reader_async_1 = __webpack_require__(646);
+var reader_stream_1 = __webpack_require__(670);
+var reader_sync_1 = __webpack_require__(671);
+var arrayUtils = __webpack_require__(673);
+var streamUtils = __webpack_require__(674);
 /**
  * Synchronous API.
  */
@@ -39198,7 +46184,7 @@ function isString(source) {
 
 
 /***/ }),
-/* 411 */
+/* 493 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39236,13 +46222,13 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 412 */
+/* 494 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var patternUtils = __webpack_require__(413);
+var patternUtils = __webpack_require__(495);
 /**
  * Generate tasks based on parent directory of each pattern.
  */
@@ -39333,16 +46319,16 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask;
 
 
 /***/ }),
-/* 413 */
+/* 495 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(16);
-var globParent = __webpack_require__(414);
-var isGlob = __webpack_require__(418);
-var micromatch = __webpack_require__(419);
+var globParent = __webpack_require__(496);
+var isGlob = __webpack_require__(499);
+var micromatch = __webpack_require__(500);
 var GLOBSTAR = '**';
 /**
  * Return true for static pattern.
@@ -39488,15 +46474,15 @@ exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 414 */
+/* 496 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var path = __webpack_require__(16);
-var isglob = __webpack_require__(415);
-var pathDirname = __webpack_require__(417);
+var isglob = __webpack_require__(497);
+var pathDirname = __webpack_require__(498);
 var isWin32 = __webpack_require__(11).platform() === 'win32';
 
 module.exports = function globParent(str) {
@@ -39519,7 +46505,7 @@ module.exports = function globParent(str) {
 
 
 /***/ }),
-/* 415 */
+/* 497 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -39529,7 +46515,7 @@ module.exports = function globParent(str) {
  * Licensed under the MIT License.
  */
 
-var isExtglob = __webpack_require__(416);
+var isExtglob = __webpack_require__(188);
 
 module.exports = function isGlob(str) {
   if (typeof str !== 'string' || str === '') {
@@ -39550,33 +46536,7 @@ module.exports = function isGlob(str) {
 
 
 /***/ }),
-/* 416 */
-/***/ (function(module, exports) {
-
-/*!
- * is-extglob <https://github.com/jonschlinkert/is-extglob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
-
-module.exports = function isExtglob(str) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
-
-  var match;
-  while ((match = /(\\).|([@?!+*]\(.*\))/g.exec(str))) {
-    if (match[2]) return true;
-    str = str.slice(match.index + match[0].length);
-  }
-
-  return false;
-};
-
-
-/***/ }),
-/* 417 */
+/* 498 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39726,7 +46686,7 @@ module.exports.win32 = win32;
 
 
 /***/ }),
-/* 418 */
+/* 499 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -39736,7 +46696,7 @@ module.exports.win32 = win32;
  * Released under the MIT License.
  */
 
-var isExtglob = __webpack_require__(416);
+var isExtglob = __webpack_require__(188);
 var chars = { '{': '}', '(': ')', '[': ']'};
 
 module.exports = function isGlob(str, options) {
@@ -39778,7 +46738,7 @@ module.exports = function isGlob(str, options) {
 
 
 /***/ }),
-/* 419 */
+/* 500 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -39789,18 +46749,18 @@ module.exports = function isGlob(str, options) {
  */
 
 var util = __webpack_require__(29);
-var braces = __webpack_require__(420);
-var toRegex = __webpack_require__(524);
-var extend = __webpack_require__(532);
+var braces = __webpack_require__(501);
+var toRegex = __webpack_require__(604);
+var extend = __webpack_require__(612);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(535);
-var parsers = __webpack_require__(562);
-var cache = __webpack_require__(563);
-var utils = __webpack_require__(564);
+var compilers = __webpack_require__(615);
+var parsers = __webpack_require__(642);
+var cache = __webpack_require__(643);
+var utils = __webpack_require__(644);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -40662,7 +47622,7 @@ module.exports = micromatch;
 
 
 /***/ }),
-/* 420 */
+/* 501 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -40672,18 +47632,18 @@ module.exports = micromatch;
  * Module dependencies
  */
 
-var toRegex = __webpack_require__(421);
-var unique = __webpack_require__(433);
-var extend = __webpack_require__(430);
+var toRegex = __webpack_require__(502);
+var unique = __webpack_require__(514);
+var extend = __webpack_require__(511);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(434);
-var parsers = __webpack_require__(449);
-var Braces = __webpack_require__(459);
-var utils = __webpack_require__(435);
+var compilers = __webpack_require__(515);
+var parsers = __webpack_require__(530);
+var Braces = __webpack_require__(540);
+var utils = __webpack_require__(516);
 var MAX_LENGTH = 1024 * 64;
 var cache = {};
 
@@ -40987,15 +47947,15 @@ module.exports = braces;
 
 
 /***/ }),
-/* 421 */
+/* 502 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(422);
-var extend = __webpack_require__(430);
-var not = __webpack_require__(432);
+var define = __webpack_require__(503);
+var extend = __webpack_require__(511);
+var not = __webpack_require__(513);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -41142,7 +48102,7 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 422 */
+/* 503 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -41155,7 +48115,7 @@ module.exports.makeRe = makeRe;
 
 
 
-var isDescriptor = __webpack_require__(423);
+var isDescriptor = __webpack_require__(504);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -41180,7 +48140,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 423 */
+/* 504 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -41193,9 +48153,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(424);
-var isAccessor = __webpack_require__(425);
-var isData = __webpack_require__(428);
+var typeOf = __webpack_require__(505);
+var isAccessor = __webpack_require__(506);
+var isData = __webpack_require__(509);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -41209,7 +48169,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 424 */
+/* 505 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -41362,7 +48322,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 425 */
+/* 506 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -41375,7 +48335,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(426);
+var typeOf = __webpack_require__(507);
 
 // accessor descriptor properties
 var accessor = {
@@ -41438,10 +48398,10 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 426 */
+/* 507 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(427);
+var isBuffer = __webpack_require__(508);
 var toString = Object.prototype.toString;
 
 /**
@@ -41560,7 +48520,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 427 */
+/* 508 */
 /***/ (function(module, exports) {
 
 /*!
@@ -41587,7 +48547,7 @@ function isSlowBuffer (obj) {
 
 
 /***/ }),
-/* 428 */
+/* 509 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -41600,7 +48560,7 @@ function isSlowBuffer (obj) {
 
 
 
-var typeOf = __webpack_require__(429);
+var typeOf = __webpack_require__(510);
 
 // data descriptor properties
 var data = {
@@ -41649,10 +48609,10 @@ module.exports = isDataDescriptor;
 
 
 /***/ }),
-/* 429 */
+/* 510 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(427);
+var isBuffer = __webpack_require__(508);
 var toString = Object.prototype.toString;
 
 /**
@@ -41771,13 +48731,13 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 430 */
+/* 511 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(431);
+var isObject = __webpack_require__(512);
 
 module.exports = function extend(o/*, objects*/) {
   if (!isObject(o)) { o = {}; }
@@ -41811,7 +48771,7 @@ function hasOwn(obj, key) {
 
 
 /***/ }),
-/* 431 */
+/* 512 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -41831,13 +48791,13 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 432 */
+/* 513 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(430);
+var extend = __webpack_require__(511);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -41904,7 +48864,7 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 433 */
+/* 514 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -41954,13 +48914,13 @@ module.exports.immutable = function uniqueImmutable(arr) {
 
 
 /***/ }),
-/* 434 */
+/* 515 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(435);
+var utils = __webpack_require__(516);
 
 module.exports = function(braces, options) {
   braces.compiler
@@ -42243,25 +49203,25 @@ function hasQueue(node) {
 
 
 /***/ }),
-/* 435 */
+/* 516 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var splitString = __webpack_require__(436);
+var splitString = __webpack_require__(517);
 var utils = module.exports;
 
 /**
  * Module dependencies
  */
 
-utils.extend = __webpack_require__(430);
-utils.flatten = __webpack_require__(442);
-utils.isObject = __webpack_require__(440);
-utils.fillRange = __webpack_require__(443);
-utils.repeat = __webpack_require__(448);
-utils.unique = __webpack_require__(433);
+utils.extend = __webpack_require__(511);
+utils.flatten = __webpack_require__(523);
+utils.isObject = __webpack_require__(521);
+utils.fillRange = __webpack_require__(524);
+utils.repeat = __webpack_require__(529);
+utils.unique = __webpack_require__(514);
 
 utils.define = function(obj, key, val) {
   Object.defineProperty(obj, key, {
@@ -42593,7 +49553,7 @@ utils.escapeRegex = function(str) {
 
 
 /***/ }),
-/* 436 */
+/* 517 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -42606,7 +49566,7 @@ utils.escapeRegex = function(str) {
 
 
 
-var extend = __webpack_require__(437);
+var extend = __webpack_require__(518);
 
 module.exports = function(str, options, fn) {
   if (typeof str !== 'string') {
@@ -42771,14 +49731,14 @@ function keepEscaping(opts, str, idx) {
 
 
 /***/ }),
-/* 437 */
+/* 518 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(438);
-var assignSymbols = __webpack_require__(441);
+var isExtendable = __webpack_require__(519);
+var assignSymbols = __webpack_require__(522);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -42838,7 +49798,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 438 */
+/* 519 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -42851,7 +49811,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(439);
+var isPlainObject = __webpack_require__(520);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -42859,7 +49819,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 439 */
+/* 520 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -42872,7 +49832,7 @@ module.exports = function isExtendable(val) {
 
 
 
-var isObject = __webpack_require__(440);
+var isObject = __webpack_require__(521);
 
 function isObjectObject(o) {
   return isObject(o) === true
@@ -42903,7 +49863,7 @@ module.exports = function isPlainObject(o) {
 
 
 /***/ }),
-/* 440 */
+/* 521 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -42922,7 +49882,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 441 */
+/* 522 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -42969,7 +49929,7 @@ module.exports = function(receiver, objects) {
 
 
 /***/ }),
-/* 442 */
+/* 523 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -42998,7 +49958,7 @@ function flat(arr, res) {
 
 
 /***/ }),
-/* 443 */
+/* 524 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43012,10 +49972,10 @@ function flat(arr, res) {
 
 
 var util = __webpack_require__(29);
-var isNumber = __webpack_require__(444);
-var extend = __webpack_require__(430);
-var repeat = __webpack_require__(446);
-var toRegex = __webpack_require__(447);
+var isNumber = __webpack_require__(525);
+var extend = __webpack_require__(511);
+var repeat = __webpack_require__(527);
+var toRegex = __webpack_require__(528);
 
 /**
  * Return a range of numbers or letters.
@@ -43213,7 +50173,7 @@ module.exports = fillRange;
 
 
 /***/ }),
-/* 444 */
+/* 525 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43226,7 +50186,7 @@ module.exports = fillRange;
 
 
 
-var typeOf = __webpack_require__(445);
+var typeOf = __webpack_require__(526);
 
 module.exports = function isNumber(num) {
   var type = typeOf(num);
@@ -43242,10 +50202,10 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 445 */
+/* 526 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(427);
+var isBuffer = __webpack_require__(508);
 var toString = Object.prototype.toString;
 
 /**
@@ -43364,7 +50324,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 446 */
+/* 527 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43441,7 +50401,7 @@ function repeat(str, num) {
 
 
 /***/ }),
-/* 447 */
+/* 528 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43454,8 +50414,8 @@ function repeat(str, num) {
 
 
 
-var repeat = __webpack_require__(446);
-var isNumber = __webpack_require__(444);
+var repeat = __webpack_require__(527);
+var isNumber = __webpack_require__(525);
 var cache = {};
 
 function toRegexRange(min, max, options) {
@@ -43742,7 +50702,7 @@ module.exports = toRegexRange;
 
 
 /***/ }),
-/* 448 */
+/* 529 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -43767,14 +50727,14 @@ module.exports = function repeat(ele, num) {
 
 
 /***/ }),
-/* 449 */
+/* 530 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Node = __webpack_require__(450);
-var utils = __webpack_require__(435);
+var Node = __webpack_require__(531);
+var utils = __webpack_require__(516);
 
 /**
  * Braces parsers
@@ -44134,15 +51094,15 @@ function concatNodes(pos, node, parent, options) {
 
 
 /***/ }),
-/* 450 */
+/* 531 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(440);
-var define = __webpack_require__(451);
-var utils = __webpack_require__(458);
+var isObject = __webpack_require__(521);
+var define = __webpack_require__(532);
+var utils = __webpack_require__(539);
 var ownNames;
 
 /**
@@ -44633,7 +51593,7 @@ exports = module.exports = Node;
 
 
 /***/ }),
-/* 451 */
+/* 532 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -44646,7 +51606,7 @@ exports = module.exports = Node;
 
 
 
-var isDescriptor = __webpack_require__(452);
+var isDescriptor = __webpack_require__(533);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -44671,7 +51631,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 452 */
+/* 533 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -44684,9 +51644,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(453);
-var isAccessor = __webpack_require__(454);
-var isData = __webpack_require__(456);
+var typeOf = __webpack_require__(534);
+var isAccessor = __webpack_require__(535);
+var isData = __webpack_require__(537);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -44700,7 +51660,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 453 */
+/* 534 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -44835,7 +51795,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 454 */
+/* 535 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -44848,7 +51808,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(455);
+var typeOf = __webpack_require__(536);
 
 // accessor descriptor properties
 var accessor = {
@@ -44911,7 +51871,7 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 455 */
+/* 536 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -45046,7 +52006,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 456 */
+/* 537 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -45059,7 +52019,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(457);
+var typeOf = __webpack_require__(538);
 
 module.exports = function isDataDescriptor(obj, prop) {
   // data descriptor properties
@@ -45102,7 +52062,7 @@ module.exports = function isDataDescriptor(obj, prop) {
 
 
 /***/ }),
-/* 457 */
+/* 538 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -45237,13 +52197,13 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 458 */
+/* 539 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(445);
+var typeOf = __webpack_require__(526);
 var utils = module.exports;
 
 /**
@@ -46263,17 +53223,17 @@ function assert(val, message) {
 
 
 /***/ }),
-/* 459 */
+/* 540 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(430);
-var Snapdragon = __webpack_require__(460);
-var compilers = __webpack_require__(434);
-var parsers = __webpack_require__(449);
-var utils = __webpack_require__(435);
+var extend = __webpack_require__(511);
+var Snapdragon = __webpack_require__(541);
+var compilers = __webpack_require__(515);
+var parsers = __webpack_require__(530);
+var utils = __webpack_require__(516);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -46374,17 +53334,17 @@ module.exports = Braces;
 
 
 /***/ }),
-/* 460 */
+/* 541 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Base = __webpack_require__(461);
-var define = __webpack_require__(422);
-var Compiler = __webpack_require__(491);
-var Parser = __webpack_require__(521);
-var utils = __webpack_require__(501);
+var Base = __webpack_require__(542);
+var define = __webpack_require__(503);
+var Compiler = __webpack_require__(571);
+var Parser = __webpack_require__(601);
+var utils = __webpack_require__(581);
 var regexCache = {};
 var cache = {};
 
@@ -46555,20 +53515,20 @@ module.exports.Parser = Parser;
 
 
 /***/ }),
-/* 461 */
+/* 542 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var define = __webpack_require__(462);
-var CacheBase = __webpack_require__(463);
-var Emitter = __webpack_require__(464);
-var isObject = __webpack_require__(440);
-var merge = __webpack_require__(482);
-var pascal = __webpack_require__(485);
-var cu = __webpack_require__(486);
+var define = __webpack_require__(543);
+var CacheBase = __webpack_require__(544);
+var Emitter = __webpack_require__(545);
+var isObject = __webpack_require__(521);
+var merge = __webpack_require__(562);
+var pascal = __webpack_require__(565);
+var cu = __webpack_require__(566);
 
 /**
  * Optionally define a custom `cache` namespace to use.
@@ -46997,7 +53957,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 462 */
+/* 543 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47010,7 +53970,7 @@ module.exports.namespace = namespace;
 
 
 
-var isDescriptor = __webpack_require__(452);
+var isDescriptor = __webpack_require__(533);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -47035,21 +53995,21 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 463 */
+/* 544 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(440);
-var Emitter = __webpack_require__(464);
-var visit = __webpack_require__(465);
-var toPath = __webpack_require__(468);
-var union = __webpack_require__(469);
-var del = __webpack_require__(473);
-var get = __webpack_require__(471);
-var has = __webpack_require__(478);
-var set = __webpack_require__(481);
+var isObject = __webpack_require__(521);
+var Emitter = __webpack_require__(545);
+var visit = __webpack_require__(546);
+var toPath = __webpack_require__(549);
+var union = __webpack_require__(550);
+var del = __webpack_require__(554);
+var get = __webpack_require__(552);
+var has = __webpack_require__(559);
+var set = __webpack_require__(553);
 
 /**
  * Create a `Cache` constructor that when instantiated will
@@ -47303,7 +54263,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 464 */
+/* 545 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -47472,7 +54432,7 @@ Emitter.prototype.hasListeners = function(event){
 
 
 /***/ }),
-/* 465 */
+/* 546 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47485,8 +54445,8 @@ Emitter.prototype.hasListeners = function(event){
 
 
 
-var visit = __webpack_require__(466);
-var mapVisit = __webpack_require__(467);
+var visit = __webpack_require__(547);
+var mapVisit = __webpack_require__(548);
 
 module.exports = function(collection, method, val) {
   var result;
@@ -47509,7 +54469,7 @@ module.exports = function(collection, method, val) {
 
 
 /***/ }),
-/* 466 */
+/* 547 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47522,7 +54482,7 @@ module.exports = function(collection, method, val) {
 
 
 
-var isObject = __webpack_require__(440);
+var isObject = __webpack_require__(521);
 
 module.exports = function visit(thisArg, method, target, val) {
   if (!isObject(thisArg) && typeof thisArg !== 'function') {
@@ -47549,14 +54509,14 @@ module.exports = function visit(thisArg, method, target, val) {
 
 
 /***/ }),
-/* 467 */
+/* 548 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var visit = __webpack_require__(466);
+var visit = __webpack_require__(547);
 
 /**
  * Map `visit` over an array of objects.
@@ -47593,7 +54553,7 @@ function isObject(val) {
 
 
 /***/ }),
-/* 468 */
+/* 549 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47606,7 +54566,7 @@ function isObject(val) {
 
 
 
-var typeOf = __webpack_require__(445);
+var typeOf = __webpack_require__(526);
 
 module.exports = function toPath(args) {
   if (typeOf(args) !== 'arguments') {
@@ -47633,16 +54593,16 @@ function filter(arr) {
 
 
 /***/ }),
-/* 469 */
+/* 550 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(431);
-var union = __webpack_require__(470);
-var get = __webpack_require__(471);
-var set = __webpack_require__(472);
+var isObject = __webpack_require__(512);
+var union = __webpack_require__(551);
+var get = __webpack_require__(552);
+var set = __webpack_require__(553);
 
 module.exports = function unionValue(obj, prop, value) {
   if (!isObject(obj)) {
@@ -47670,7 +54630,7 @@ function arrayify(val) {
 
 
 /***/ }),
-/* 470 */
+/* 551 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47706,7 +54666,7 @@ module.exports = function union(init) {
 
 
 /***/ }),
-/* 471 */
+/* 552 */
 /***/ (function(module, exports) {
 
 /*!
@@ -47762,7 +54722,7 @@ function toString(val) {
 
 
 /***/ }),
-/* 472 */
+/* 553 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47775,64 +54735,56 @@ function toString(val) {
 
 
 
-var toPath = __webpack_require__(468);
-var extend = __webpack_require__(430);
-var isPlainObject = __webpack_require__(439);
-var isObject = __webpack_require__(431);
+var split = __webpack_require__(517);
+var extend = __webpack_require__(511);
+var isPlainObject = __webpack_require__(520);
+var isObject = __webpack_require__(512);
 
-module.exports = function(obj, path, val) {
+module.exports = function(obj, prop, val) {
   if (!isObject(obj)) {
     return obj;
   }
 
-  if (Array.isArray(path)) {
-    path = toPath(path);
+  if (Array.isArray(prop)) {
+    prop = [].concat.apply([], prop).join('.');
   }
 
-  if (typeof path !== 'string') {
+  if (typeof prop !== 'string') {
     return obj;
   }
 
-  var segs = path.split('.');
-  var len = segs.length, i = -1;
-  var res = obj;
-  var last;
-
-  while (++i < len) {
-    var key = segs[i];
-
-    while (key[key.length - 1] === '\\') {
-      key = key.slice(0, -1) + '.' + segs[++i];
-    }
-
-    if (i === len - 1) {
-      last = key;
-      break;
-    }
+  var keys = split(prop, {sep: '.', brackets: true}).filter(isValidKey);
+  var len = keys.length;
+  var idx = -1;
+  var current = obj;
 
-    if (!isObject(obj[key])) {
-      obj[key] = {};
+  while (++idx < len) {
+    var key = keys[idx];
+    if (idx !== len - 1) {
+      if (!isObject(current[key])) {
+        current[key] = {};
+      }
+      current = current[key];
+      continue;
     }
-    obj = obj[key];
-  }
 
-  if (obj.hasOwnProperty(last) && isObject(obj[last])) {
-    if (isPlainObject(val)) {
-      extend(obj[last], val);
+    if (isPlainObject(current[key]) && isPlainObject(val)) {
+      current[key] = extend({}, current[key], val);
     } else {
-      obj[last] = val;
+      current[key] = val;
     }
-
-  } else {
-    obj[last] = val;
   }
-  return res;
+
+  return obj;
 };
 
+function isValidKey(key) {
+  return key !== '__proto__' && key !== 'constructor' && key !== 'prototype';
+}
 
 
 /***/ }),
-/* 473 */
+/* 554 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47845,8 +54797,8 @@ module.exports = function(obj, path, val) {
 
 
 
-var isObject = __webpack_require__(440);
-var has = __webpack_require__(474);
+var isObject = __webpack_require__(521);
+var has = __webpack_require__(555);
 
 module.exports = function unset(obj, prop) {
   if (!isObject(obj)) {
@@ -47871,7 +54823,7 @@ module.exports = function unset(obj, prop) {
 
 
 /***/ }),
-/* 474 */
+/* 555 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47884,9 +54836,9 @@ module.exports = function unset(obj, prop) {
 
 
 
-var isObject = __webpack_require__(475);
-var hasValues = __webpack_require__(477);
-var get = __webpack_require__(471);
+var isObject = __webpack_require__(556);
+var hasValues = __webpack_require__(558);
+var get = __webpack_require__(552);
 
 module.exports = function(obj, prop, noZero) {
   if (isObject(obj)) {
@@ -47897,7 +54849,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 /***/ }),
-/* 475 */
+/* 556 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47910,7 +54862,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 
-var isArray = __webpack_require__(476);
+var isArray = __webpack_require__(557);
 
 module.exports = function isObject(val) {
   return val != null && typeof val === 'object' && isArray(val) === false;
@@ -47918,7 +54870,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 476 */
+/* 557 */
 /***/ (function(module, exports) {
 
 var toString = {}.toString;
@@ -47929,7 +54881,7 @@ module.exports = Array.isArray || function (arr) {
 
 
 /***/ }),
-/* 477 */
+/* 558 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47972,7 +54924,7 @@ module.exports = function hasValue(o, noZero) {
 
 
 /***/ }),
-/* 478 */
+/* 559 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47985,9 +54937,9 @@ module.exports = function hasValue(o, noZero) {
 
 
 
-var isObject = __webpack_require__(440);
-var hasValues = __webpack_require__(479);
-var get = __webpack_require__(471);
+var isObject = __webpack_require__(521);
+var hasValues = __webpack_require__(560);
+var get = __webpack_require__(552);
 
 module.exports = function(val, prop) {
   return hasValues(isObject(val) && prop ? get(val, prop) : val);
@@ -47995,7 +54947,7 @@ module.exports = function(val, prop) {
 
 
 /***/ }),
-/* 479 */
+/* 560 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48008,8 +54960,8 @@ module.exports = function(val, prop) {
 
 
 
-var typeOf = __webpack_require__(480);
-var isNumber = __webpack_require__(444);
+var typeOf = __webpack_require__(561);
+var isNumber = __webpack_require__(525);
 
 module.exports = function hasValue(val) {
   // is-number checks for NaN and other edge cases
@@ -48062,10 +55014,10 @@ module.exports = function hasValue(val) {
 
 
 /***/ }),
-/* 480 */
+/* 561 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(427);
+var isBuffer = __webpack_require__(508);
 var toString = Object.prototype.toString;
 
 /**
@@ -48187,72 +55139,14 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 481 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/*!
- * set-value <https://github.com/jonschlinkert/set-value>
- *
- * Copyright (c) 2014-2015, 2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-
-
-var split = __webpack_require__(436);
-var extend = __webpack_require__(430);
-var isPlainObject = __webpack_require__(439);
-var isObject = __webpack_require__(431);
-
-module.exports = function(obj, prop, val) {
-  if (!isObject(obj)) {
-    return obj;
-  }
-
-  if (Array.isArray(prop)) {
-    prop = [].concat.apply([], prop).join('.');
-  }
-
-  if (typeof prop !== 'string') {
-    return obj;
-  }
-
-  var keys = split(prop, {sep: '.', brackets: true});
-  var len = keys.length;
-  var idx = -1;
-  var current = obj;
-
-  while (++idx < len) {
-    var key = keys[idx];
-    if (idx !== len - 1) {
-      if (!isObject(current[key])) {
-        current[key] = {};
-      }
-      current = current[key];
-      continue;
-    }
-
-    if (isPlainObject(current[key]) && isPlainObject(val)) {
-      current[key] = extend({}, current[key], val);
-    } else {
-      current[key] = val;
-    }
-  }
-
-  return obj;
-};
-
-
-/***/ }),
-/* 482 */
+/* 562 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(483);
-var forIn = __webpack_require__(484);
+var isExtendable = __webpack_require__(563);
+var forIn = __webpack_require__(564);
 
 function mixinDeep(target, objects) {
   var len = arguments.length, i = 0;
@@ -48316,7 +55210,7 @@ module.exports = mixinDeep;
 
 
 /***/ }),
-/* 483 */
+/* 563 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48329,7 +55223,7 @@ module.exports = mixinDeep;
 
 
 
-var isPlainObject = __webpack_require__(439);
+var isPlainObject = __webpack_require__(520);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -48337,7 +55231,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 484 */
+/* 564 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48360,7 +55254,7 @@ module.exports = function forIn(obj, fn, thisArg) {
 
 
 /***/ }),
-/* 485 */
+/* 565 */
 /***/ (function(module, exports) {
 
 /*!
@@ -48387,14 +55281,14 @@ module.exports = pascalcase;
 
 
 /***/ }),
-/* 486 */
+/* 566 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var utils = __webpack_require__(487);
+var utils = __webpack_require__(567);
 
 /**
  * Expose class utils
@@ -48759,7 +55653,7 @@ cu.bubble = function(Parent, events) {
 
 
 /***/ }),
-/* 487 */
+/* 567 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48773,10 +55667,10 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.union = __webpack_require__(470);
-utils.define = __webpack_require__(422);
-utils.isObj = __webpack_require__(440);
-utils.staticExtend = __webpack_require__(488);
+utils.union = __webpack_require__(551);
+utils.define = __webpack_require__(503);
+utils.isObj = __webpack_require__(521);
+utils.staticExtend = __webpack_require__(568);
 
 
 /**
@@ -48787,7 +55681,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 488 */
+/* 568 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48800,8 +55694,8 @@ module.exports = utils;
 
 
 
-var copy = __webpack_require__(489);
-var define = __webpack_require__(422);
+var copy = __webpack_require__(569);
+var define = __webpack_require__(503);
 var util = __webpack_require__(29);
 
 /**
@@ -48884,15 +55778,15 @@ module.exports = extend;
 
 
 /***/ }),
-/* 489 */
+/* 569 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(445);
-var copyDescriptor = __webpack_require__(490);
-var define = __webpack_require__(422);
+var typeOf = __webpack_require__(526);
+var copyDescriptor = __webpack_require__(570);
+var define = __webpack_require__(503);
 
 /**
  * Copy static properties, prototype properties, and descriptors from one object to another.
@@ -49065,7 +55959,7 @@ module.exports.has = has;
 
 
 /***/ }),
-/* 490 */
+/* 570 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49153,16 +56047,16 @@ function isObject(val) {
 
 
 /***/ }),
-/* 491 */
+/* 571 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(492);
-var define = __webpack_require__(422);
-var debug = __webpack_require__(494)('snapdragon:compiler');
-var utils = __webpack_require__(501);
+var use = __webpack_require__(572);
+var define = __webpack_require__(503);
+var debug = __webpack_require__(574)('snapdragon:compiler');
+var utils = __webpack_require__(581);
 
 /**
  * Create a new `Compiler` with the given `options`.
@@ -49316,7 +56210,7 @@ Compiler.prototype = {
 
     // source map support
     if (opts.sourcemap) {
-      var sourcemaps = __webpack_require__(520);
+      var sourcemaps = __webpack_require__(600);
       sourcemaps(this);
       this.mapVisit(this.ast.nodes);
       this.applySourceMaps();
@@ -49337,7 +56231,7 @@ module.exports = Compiler;
 
 
 /***/ }),
-/* 492 */
+/* 572 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49350,7 +56244,7 @@ module.exports = Compiler;
 
 
 
-var utils = __webpack_require__(493);
+var utils = __webpack_require__(573);
 
 module.exports = function base(app, opts) {
   if (!utils.isObject(app) && typeof app !== 'function') {
@@ -49465,7 +56359,7 @@ module.exports = function base(app, opts) {
 
 
 /***/ }),
-/* 493 */
+/* 573 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49479,8 +56373,8 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.define = __webpack_require__(422);
-utils.isObject = __webpack_require__(440);
+utils.define = __webpack_require__(503);
+utils.isObject = __webpack_require__(521);
 
 
 utils.isString = function(val) {
@@ -49495,7 +56389,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 494 */
+/* 574 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -49504,14 +56398,14 @@ module.exports = utils;
  */
 
 if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(495);
+  module.exports = __webpack_require__(575);
 } else {
-  module.exports = __webpack_require__(498);
+  module.exports = __webpack_require__(578);
 }
 
 
 /***/ }),
-/* 495 */
+/* 575 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -49520,7 +56414,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(496);
+exports = module.exports = __webpack_require__(576);
 exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
@@ -49702,7 +56596,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 496 */
+/* 576 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -49718,7 +56612,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = __webpack_require__(497);
+exports.humanize = __webpack_require__(577);
 
 /**
  * The currently active debug mode names, and names to skip.
@@ -49910,7 +56804,7 @@ function coerce(val) {
 
 
 /***/ }),
-/* 497 */
+/* 577 */
 /***/ (function(module, exports) {
 
 /**
@@ -50068,14 +56962,14 @@ function plural(ms, n, name) {
 
 
 /***/ }),
-/* 498 */
+/* 578 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
  * Module dependencies.
  */
 
-var tty = __webpack_require__(499);
+var tty = __webpack_require__(579);
 var util = __webpack_require__(29);
 
 /**
@@ -50084,7 +56978,7 @@ var util = __webpack_require__(29);
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(496);
+exports = module.exports = __webpack_require__(576);
 exports.init = init;
 exports.log = log;
 exports.formatArgs = formatArgs;
@@ -50263,7 +57157,7 @@ function createWritableStdioStream (fd) {
 
     case 'PIPE':
     case 'TCP':
-      var net = __webpack_require__(500);
+      var net = __webpack_require__(580);
       stream = new net.Socket({
         fd: fd,
         readable: false,
@@ -50322,19 +57216,19 @@ exports.enable(load());
 
 
 /***/ }),
-/* 499 */
+/* 579 */
 /***/ (function(module, exports) {
 
 module.exports = require("tty");
 
 /***/ }),
-/* 500 */
+/* 580 */
 /***/ (function(module, exports) {
 
 module.exports = require("net");
 
 /***/ }),
-/* 501 */
+/* 581 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50344,9 +57238,9 @@ module.exports = require("net");
  * Module dependencies
  */
 
-exports.extend = __webpack_require__(430);
-exports.SourceMap = __webpack_require__(502);
-exports.sourceMapResolve = __webpack_require__(513);
+exports.extend = __webpack_require__(511);
+exports.SourceMap = __webpack_require__(582);
+exports.sourceMapResolve = __webpack_require__(593);
 
 /**
  * Convert backslash in the given string to forward slashes
@@ -50389,7 +57283,7 @@ exports.last = function(arr, n) {
 
 
 /***/ }),
-/* 502 */
+/* 582 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -50397,13 +57291,13 @@ exports.last = function(arr, n) {
  * Licensed under the New BSD license. See LICENSE.txt or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
-exports.SourceMapGenerator = __webpack_require__(503).SourceMapGenerator;
-exports.SourceMapConsumer = __webpack_require__(509).SourceMapConsumer;
-exports.SourceNode = __webpack_require__(512).SourceNode;
+exports.SourceMapGenerator = __webpack_require__(583).SourceMapGenerator;
+exports.SourceMapConsumer = __webpack_require__(589).SourceMapConsumer;
+exports.SourceNode = __webpack_require__(592).SourceNode;
 
 
 /***/ }),
-/* 503 */
+/* 583 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -50413,10 +57307,10 @@ exports.SourceNode = __webpack_require__(512).SourceNode;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var base64VLQ = __webpack_require__(504);
-var util = __webpack_require__(506);
-var ArraySet = __webpack_require__(507).ArraySet;
-var MappingList = __webpack_require__(508).MappingList;
+var base64VLQ = __webpack_require__(584);
+var util = __webpack_require__(586);
+var ArraySet = __webpack_require__(587).ArraySet;
+var MappingList = __webpack_require__(588).MappingList;
 
 /**
  * An instance of the SourceMapGenerator represents a source map which is
@@ -50825,7 +57719,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
 
 
 /***/ }),
-/* 504 */
+/* 584 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -50865,7 +57759,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-var base64 = __webpack_require__(505);
+var base64 = __webpack_require__(585);
 
 // A single base 64 digit can contain 6 bits of data. For the base 64 variable
 // length quantities we use in the source map spec, the first bit is the sign,
@@ -50971,7 +57865,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
 
 
 /***/ }),
-/* 505 */
+/* 585 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -51044,7 +57938,7 @@ exports.decode = function (charCode) {
 
 
 /***/ }),
-/* 506 */
+/* 586 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -51467,7 +58361,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
 
 
 /***/ }),
-/* 507 */
+/* 587 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -51477,7 +58371,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(506);
+var util = __webpack_require__(586);
 var has = Object.prototype.hasOwnProperty;
 var hasNativeMap = typeof Map !== "undefined";
 
@@ -51594,7 +58488,7 @@ exports.ArraySet = ArraySet;
 
 
 /***/ }),
-/* 508 */
+/* 588 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -51604,7 +58498,7 @@ exports.ArraySet = ArraySet;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(506);
+var util = __webpack_require__(586);
 
 /**
  * Determine whether mappingB is after mappingA with respect to generated
@@ -51679,7 +58573,7 @@ exports.MappingList = MappingList;
 
 
 /***/ }),
-/* 509 */
+/* 589 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -51689,11 +58583,11 @@ exports.MappingList = MappingList;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(506);
-var binarySearch = __webpack_require__(510);
-var ArraySet = __webpack_require__(507).ArraySet;
-var base64VLQ = __webpack_require__(504);
-var quickSort = __webpack_require__(511).quickSort;
+var util = __webpack_require__(586);
+var binarySearch = __webpack_require__(590);
+var ArraySet = __webpack_require__(587).ArraySet;
+var base64VLQ = __webpack_require__(584);
+var quickSort = __webpack_require__(591).quickSort;
 
 function SourceMapConsumer(aSourceMap) {
   var sourceMap = aSourceMap;
@@ -52767,7 +59661,7 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
 
 
 /***/ }),
-/* 510 */
+/* 590 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -52884,7 +59778,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
 
 
 /***/ }),
-/* 511 */
+/* 591 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -53004,7 +59898,7 @@ exports.quickSort = function (ary, comparator) {
 
 
 /***/ }),
-/* 512 */
+/* 592 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -53014,8 +59908,8 @@ exports.quickSort = function (ary, comparator) {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var SourceMapGenerator = __webpack_require__(503).SourceMapGenerator;
-var util = __webpack_require__(506);
+var SourceMapGenerator = __webpack_require__(583).SourceMapGenerator;
+var util = __webpack_require__(586);
 
 // Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
 // operating systems these days (capturing the result).
@@ -53423,17 +60317,17 @@ exports.SourceNode = SourceNode;
 
 
 /***/ }),
-/* 513 */
+/* 593 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014, 2015, 2016, 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var sourceMappingURL   = __webpack_require__(514)
-var resolveUrl         = __webpack_require__(515)
-var decodeUriComponent = __webpack_require__(516)
-var urix               = __webpack_require__(518)
-var atob               = __webpack_require__(519)
+var sourceMappingURL   = __webpack_require__(594)
+var resolveUrl         = __webpack_require__(595)
+var decodeUriComponent = __webpack_require__(596)
+var urix               = __webpack_require__(598)
+var atob               = __webpack_require__(599)
 
 
 
@@ -53731,7 +60625,7 @@ module.exports = {
 
 
 /***/ }),
-/* 514 */
+/* 594 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell
@@ -53794,7 +60688,7 @@ void (function(root, factory) {
 
 
 /***/ }),
-/* 515 */
+/* 595 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
@@ -53812,13 +60706,13 @@ module.exports = resolveUrl
 
 
 /***/ }),
-/* 516 */
+/* 596 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var decodeUriComponent = __webpack_require__(517)
+var decodeUriComponent = __webpack_require__(597)
 
 function customDecodeUriComponent(string) {
   // `decodeUriComponent` turns `+` into ` `, but that's not wanted.
@@ -53829,7 +60723,7 @@ module.exports = customDecodeUriComponent
 
 
 /***/ }),
-/* 517 */
+/* 597 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53930,7 +60824,7 @@ module.exports = function (encodedURI) {
 
 
 /***/ }),
-/* 518 */
+/* 598 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
@@ -53953,7 +60847,7 @@ module.exports = urix
 
 
 /***/ }),
-/* 519 */
+/* 599 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53967,7 +60861,7 @@ module.exports = atob.atob = atob;
 
 
 /***/ }),
-/* 520 */
+/* 600 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53975,8 +60869,8 @@ module.exports = atob.atob = atob;
 
 var fs = __webpack_require__(23);
 var path = __webpack_require__(16);
-var define = __webpack_require__(422);
-var utils = __webpack_require__(501);
+var define = __webpack_require__(503);
+var utils = __webpack_require__(581);
 
 /**
  * Expose `mixin()`.
@@ -54119,19 +61013,19 @@ exports.comment = function(node) {
 
 
 /***/ }),
-/* 521 */
+/* 601 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(492);
+var use = __webpack_require__(572);
 var util = __webpack_require__(29);
-var Cache = __webpack_require__(522);
-var define = __webpack_require__(422);
-var debug = __webpack_require__(494)('snapdragon:parser');
-var Position = __webpack_require__(523);
-var utils = __webpack_require__(501);
+var Cache = __webpack_require__(602);
+var define = __webpack_require__(503);
+var debug = __webpack_require__(574)('snapdragon:parser');
+var Position = __webpack_require__(603);
+var utils = __webpack_require__(581);
 
 /**
  * Create a new `Parser` with the given `input` and `options`.
@@ -54659,7 +61553,7 @@ module.exports = Parser;
 
 
 /***/ }),
-/* 522 */
+/* 602 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54766,13 +61660,13 @@ MapCache.prototype.del = function mapDelete(key) {
 
 
 /***/ }),
-/* 523 */
+/* 603 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(422);
+var define = __webpack_require__(503);
 
 /**
  * Store position for a node
@@ -54787,16 +61681,16 @@ module.exports = function Position(start, parser) {
 
 
 /***/ }),
-/* 524 */
+/* 604 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var safe = __webpack_require__(525);
-var define = __webpack_require__(531);
-var extend = __webpack_require__(532);
-var not = __webpack_require__(534);
+var safe = __webpack_require__(605);
+var define = __webpack_require__(611);
+var extend = __webpack_require__(612);
+var not = __webpack_require__(614);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -54949,10 +61843,10 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 525 */
+/* 605 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var parse = __webpack_require__(526);
+var parse = __webpack_require__(606);
 var types = parse.types;
 
 module.exports = function (re, opts) {
@@ -54998,13 +61892,13 @@ function isRegExp (x) {
 
 
 /***/ }),
-/* 526 */
+/* 606 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var util      = __webpack_require__(527);
-var types     = __webpack_require__(528);
-var sets      = __webpack_require__(529);
-var positions = __webpack_require__(530);
+var util      = __webpack_require__(607);
+var types     = __webpack_require__(608);
+var sets      = __webpack_require__(609);
+var positions = __webpack_require__(610);
 
 
 module.exports = function(regexpStr) {
@@ -55286,11 +62180,11 @@ module.exports.types = types;
 
 
 /***/ }),
-/* 527 */
+/* 607 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(528);
-var sets  = __webpack_require__(529);
+var types = __webpack_require__(608);
+var sets  = __webpack_require__(609);
 
 
 // All of these are private and only used by randexp.
@@ -55403,7 +62297,7 @@ exports.error = function(regexp, msg) {
 
 
 /***/ }),
-/* 528 */
+/* 608 */
 /***/ (function(module, exports) {
 
 module.exports = {
@@ -55419,10 +62313,10 @@ module.exports = {
 
 
 /***/ }),
-/* 529 */
+/* 609 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(528);
+var types = __webpack_require__(608);
 
 var INTS = function() {
  return [{ type: types.RANGE , from: 48, to: 57 }];
@@ -55507,10 +62401,10 @@ exports.anyChar = function() {
 
 
 /***/ }),
-/* 530 */
+/* 610 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(528);
+var types = __webpack_require__(608);
 
 exports.wordBoundary = function() {
   return { type: types.POSITION, value: 'b' };
@@ -55530,7 +62424,7 @@ exports.end = function() {
 
 
 /***/ }),
-/* 531 */
+/* 611 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55543,8 +62437,8 @@ exports.end = function() {
 
 
 
-var isobject = __webpack_require__(440);
-var isDescriptor = __webpack_require__(452);
+var isobject = __webpack_require__(521);
+var isDescriptor = __webpack_require__(533);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -55575,14 +62469,14 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 532 */
+/* 612 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(533);
-var assignSymbols = __webpack_require__(441);
+var isExtendable = __webpack_require__(613);
+var assignSymbols = __webpack_require__(522);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -55642,7 +62536,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 533 */
+/* 613 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55655,7 +62549,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(439);
+var isPlainObject = __webpack_require__(520);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -55663,14 +62557,14 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 534 */
+/* 614 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(532);
-var safe = __webpack_require__(525);
+var extend = __webpack_require__(612);
+var safe = __webpack_require__(605);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -55742,14 +62636,14 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 535 */
+/* 615 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var nanomatch = __webpack_require__(536);
-var extglob = __webpack_require__(551);
+var nanomatch = __webpack_require__(616);
+var extglob = __webpack_require__(631);
 
 module.exports = function(snapdragon) {
   var compilers = snapdragon.compiler.compilers;
@@ -55826,7 +62720,7 @@ function escapeExtglobs(compiler) {
 
 
 /***/ }),
-/* 536 */
+/* 616 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55837,17 +62731,17 @@ function escapeExtglobs(compiler) {
  */
 
 var util = __webpack_require__(29);
-var toRegex = __webpack_require__(421);
-var extend = __webpack_require__(537);
+var toRegex = __webpack_require__(502);
+var extend = __webpack_require__(617);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(539);
-var parsers = __webpack_require__(540);
-var cache = __webpack_require__(543);
-var utils = __webpack_require__(545);
+var compilers = __webpack_require__(619);
+var parsers = __webpack_require__(620);
+var cache = __webpack_require__(623);
+var utils = __webpack_require__(625);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -56671,14 +63565,14 @@ module.exports = nanomatch;
 
 
 /***/ }),
-/* 537 */
+/* 617 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(538);
-var assignSymbols = __webpack_require__(441);
+var isExtendable = __webpack_require__(618);
+var assignSymbols = __webpack_require__(522);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -56738,7 +63632,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 538 */
+/* 618 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -56751,7 +63645,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(439);
+var isPlainObject = __webpack_require__(520);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -56759,7 +63653,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 539 */
+/* 619 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -57105,15 +63999,15 @@ module.exports = function(nanomatch, options) {
 
 
 /***/ }),
-/* 540 */
+/* 620 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regexNot = __webpack_require__(432);
-var toRegex = __webpack_require__(421);
-var isOdd = __webpack_require__(541);
+var regexNot = __webpack_require__(513);
+var toRegex = __webpack_require__(502);
+var isOdd = __webpack_require__(621);
 
 /**
  * Characters to use in negation regex (we want to "not" match
@@ -57499,7 +64393,7 @@ module.exports.not = NOT_REGEX;
 
 
 /***/ }),
-/* 541 */
+/* 621 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -57512,7 +64406,7 @@ module.exports.not = NOT_REGEX;
 
 
 
-var isNumber = __webpack_require__(542);
+var isNumber = __webpack_require__(622);
 
 module.exports = function isOdd(i) {
   if (!isNumber(i)) {
@@ -57526,7 +64420,7 @@ module.exports = function isOdd(i) {
 
 
 /***/ }),
-/* 542 */
+/* 622 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -57554,14 +64448,14 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 543 */
+/* 623 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(544))();
+module.exports = new (__webpack_require__(624))();
 
 
 /***/ }),
-/* 544 */
+/* 624 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -57574,7 +64468,7 @@ module.exports = new (__webpack_require__(544))();
 
 
 
-var MapCache = __webpack_require__(522);
+var MapCache = __webpack_require__(602);
 
 /**
  * Create a new `FragmentCache` with an optional object to use for `caches`.
@@ -57696,7 +64590,7 @@ exports = module.exports = FragmentCache;
 
 
 /***/ }),
-/* 545 */
+/* 625 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -57709,14 +64603,14 @@ var path = __webpack_require__(16);
  * Module dependencies
  */
 
-var isWindows = __webpack_require__(546)();
-var Snapdragon = __webpack_require__(460);
-utils.define = __webpack_require__(547);
-utils.diff = __webpack_require__(548);
-utils.extend = __webpack_require__(537);
-utils.pick = __webpack_require__(549);
-utils.typeOf = __webpack_require__(550);
-utils.unique = __webpack_require__(433);
+var isWindows = __webpack_require__(626)();
+var Snapdragon = __webpack_require__(541);
+utils.define = __webpack_require__(627);
+utils.diff = __webpack_require__(628);
+utils.extend = __webpack_require__(617);
+utils.pick = __webpack_require__(629);
+utils.typeOf = __webpack_require__(630);
+utils.unique = __webpack_require__(514);
 
 /**
  * Returns true if the given value is effectively an empty string
@@ -58082,7 +64976,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 546 */
+/* 626 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -58110,7 +65004,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 /***/ }),
-/* 547 */
+/* 627 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58123,8 +65017,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 
-var isobject = __webpack_require__(440);
-var isDescriptor = __webpack_require__(452);
+var isobject = __webpack_require__(521);
+var isDescriptor = __webpack_require__(533);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -58155,7 +65049,7 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 548 */
+/* 628 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58209,7 +65103,7 @@ function diffArray(one, two) {
 
 
 /***/ }),
-/* 549 */
+/* 629 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58222,7 +65116,7 @@ function diffArray(one, two) {
 
 
 
-var isObject = __webpack_require__(440);
+var isObject = __webpack_require__(521);
 
 module.exports = function pick(obj, keys) {
   if (!isObject(obj) && typeof obj !== 'function') {
@@ -58251,7 +65145,7 @@ module.exports = function pick(obj, keys) {
 
 
 /***/ }),
-/* 550 */
+/* 630 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -58386,7 +65280,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 551 */
+/* 631 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58396,18 +65290,18 @@ function isBuffer(val) {
  * Module dependencies
  */
 
-var extend = __webpack_require__(430);
-var unique = __webpack_require__(433);
-var toRegex = __webpack_require__(421);
+var extend = __webpack_require__(511);
+var unique = __webpack_require__(514);
+var toRegex = __webpack_require__(502);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(552);
-var parsers = __webpack_require__(558);
-var Extglob = __webpack_require__(561);
-var utils = __webpack_require__(560);
+var compilers = __webpack_require__(632);
+var parsers = __webpack_require__(638);
+var Extglob = __webpack_require__(641);
+var utils = __webpack_require__(640);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -58724,13 +65618,13 @@ module.exports = extglob;
 
 
 /***/ }),
-/* 552 */
+/* 632 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(553);
+var brackets = __webpack_require__(633);
 
 /**
  * Extglob compilers
@@ -58900,7 +65794,7 @@ module.exports = function(extglob) {
 
 
 /***/ }),
-/* 553 */
+/* 633 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -58910,17 +65804,17 @@ module.exports = function(extglob) {
  * Local dependencies
  */
 
-var compilers = __webpack_require__(554);
-var parsers = __webpack_require__(556);
+var compilers = __webpack_require__(634);
+var parsers = __webpack_require__(636);
 
 /**
  * Module dependencies
  */
 
-var debug = __webpack_require__(494)('expand-brackets');
-var extend = __webpack_require__(430);
-var Snapdragon = __webpack_require__(460);
-var toRegex = __webpack_require__(421);
+var debug = __webpack_require__(574)('expand-brackets');
+var extend = __webpack_require__(511);
+var Snapdragon = __webpack_require__(541);
+var toRegex = __webpack_require__(502);
 
 /**
  * Parses the given POSIX character class `pattern` and returns a
@@ -59118,13 +66012,13 @@ module.exports = brackets;
 
 
 /***/ }),
-/* 554 */
+/* 634 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var posix = __webpack_require__(555);
+var posix = __webpack_require__(635);
 
 module.exports = function(brackets) {
   brackets.compiler
@@ -59212,7 +66106,7 @@ module.exports = function(brackets) {
 
 
 /***/ }),
-/* 555 */
+/* 635 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -59241,14 +66135,14 @@ module.exports = {
 
 
 /***/ }),
-/* 556 */
+/* 636 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(557);
-var define = __webpack_require__(422);
+var utils = __webpack_require__(637);
+var define = __webpack_require__(503);
 
 /**
  * Text regex
@@ -59467,14 +66361,14 @@ module.exports.TEXT_REGEX = TEXT_REGEX;
 
 
 /***/ }),
-/* 557 */
+/* 637 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var toRegex = __webpack_require__(421);
-var regexNot = __webpack_require__(432);
+var toRegex = __webpack_require__(502);
+var regexNot = __webpack_require__(513);
 var cached;
 
 /**
@@ -59508,15 +66402,15 @@ exports.createRegex = function(pattern, include) {
 
 
 /***/ }),
-/* 558 */
+/* 638 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(553);
-var define = __webpack_require__(559);
-var utils = __webpack_require__(560);
+var brackets = __webpack_require__(633);
+var define = __webpack_require__(639);
+var utils = __webpack_require__(640);
 
 /**
  * Characters to use in text regex (we want to "not" match
@@ -59671,7 +66565,7 @@ module.exports = parsers;
 
 
 /***/ }),
-/* 559 */
+/* 639 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -59684,7 +66578,7 @@ module.exports = parsers;
 
 
 
-var isDescriptor = __webpack_require__(452);
+var isDescriptor = __webpack_require__(533);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -59709,14 +66603,14 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 560 */
+/* 640 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regex = __webpack_require__(432);
-var Cache = __webpack_require__(544);
+var regex = __webpack_require__(513);
+var Cache = __webpack_require__(624);
 
 /**
  * Utils
@@ -59785,7 +66679,7 @@ utils.createRegex = function(str) {
 
 
 /***/ }),
-/* 561 */
+/* 641 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -59795,16 +66689,16 @@ utils.createRegex = function(str) {
  * Module dependencies
  */
 
-var Snapdragon = __webpack_require__(460);
-var define = __webpack_require__(559);
-var extend = __webpack_require__(430);
+var Snapdragon = __webpack_require__(541);
+var define = __webpack_require__(639);
+var extend = __webpack_require__(511);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(552);
-var parsers = __webpack_require__(558);
+var compilers = __webpack_require__(632);
+var parsers = __webpack_require__(638);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -59870,16 +66764,16 @@ module.exports = Extglob;
 
 
 /***/ }),
-/* 562 */
+/* 642 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extglob = __webpack_require__(551);
-var nanomatch = __webpack_require__(536);
-var regexNot = __webpack_require__(432);
-var toRegex = __webpack_require__(524);
+var extglob = __webpack_require__(631);
+var nanomatch = __webpack_require__(616);
+var regexNot = __webpack_require__(513);
+var toRegex = __webpack_require__(604);
 var not;
 
 /**
@@ -59960,14 +66854,14 @@ function textRegex(pattern) {
 
 
 /***/ }),
-/* 563 */
+/* 643 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(544))();
+module.exports = new (__webpack_require__(624))();
 
 
 /***/ }),
-/* 564 */
+/* 644 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -59980,13 +66874,13 @@ var path = __webpack_require__(16);
  * Module dependencies
  */
 
-var Snapdragon = __webpack_require__(460);
-utils.define = __webpack_require__(531);
-utils.diff = __webpack_require__(548);
-utils.extend = __webpack_require__(532);
-utils.pick = __webpack_require__(549);
-utils.typeOf = __webpack_require__(565);
-utils.unique = __webpack_require__(433);
+var Snapdragon = __webpack_require__(541);
+utils.define = __webpack_require__(611);
+utils.diff = __webpack_require__(628);
+utils.extend = __webpack_require__(612);
+utils.pick = __webpack_require__(629);
+utils.typeOf = __webpack_require__(645);
+utils.unique = __webpack_require__(514);
 
 /**
  * Returns true if the platform is windows, or `path.sep` is `\\`.
@@ -60283,7 +67177,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 565 */
+/* 645 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -60418,7 +67312,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 566 */
+/* 646 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60437,9 +67331,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(567);
-var reader_1 = __webpack_require__(580);
-var fs_stream_1 = __webpack_require__(584);
+var readdir = __webpack_require__(647);
+var reader_1 = __webpack_require__(660);
+var fs_stream_1 = __webpack_require__(664);
 var ReaderAsync = /** @class */ (function (_super) {
     __extends(ReaderAsync, _super);
     function ReaderAsync() {
@@ -60500,15 +67394,15 @@ exports.default = ReaderAsync;
 
 
 /***/ }),
-/* 567 */
+/* 647 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const readdirSync = __webpack_require__(568);
-const readdirAsync = __webpack_require__(576);
-const readdirStream = __webpack_require__(579);
+const readdirSync = __webpack_require__(648);
+const readdirAsync = __webpack_require__(656);
+const readdirStream = __webpack_require__(659);
 
 module.exports = exports = readdirAsyncPath;
 exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
@@ -60592,7 +67486,7 @@ function readdirStreamStat (dir, options) {
 
 
 /***/ }),
-/* 568 */
+/* 648 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60600,11 +67494,11 @@ function readdirStreamStat (dir, options) {
 
 module.exports = readdirSync;
 
-const DirectoryReader = __webpack_require__(569);
+const DirectoryReader = __webpack_require__(649);
 
 let syncFacade = {
-  fs: __webpack_require__(574),
-  forEach: __webpack_require__(575),
+  fs: __webpack_require__(654),
+  forEach: __webpack_require__(655),
   sync: true
 };
 
@@ -60633,7 +67527,7 @@ function readdirSync (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 569 */
+/* 649 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60642,9 +67536,9 @@ function readdirSync (dir, options, internalOptions) {
 const Readable = __webpack_require__(28).Readable;
 const EventEmitter = __webpack_require__(46).EventEmitter;
 const path = __webpack_require__(16);
-const normalizeOptions = __webpack_require__(570);
-const stat = __webpack_require__(572);
-const call = __webpack_require__(573);
+const normalizeOptions = __webpack_require__(650);
+const stat = __webpack_require__(652);
+const call = __webpack_require__(653);
 
 /**
  * Asynchronously reads the contents of a directory and streams the results
@@ -61020,14 +67914,14 @@ module.exports = DirectoryReader;
 
 
 /***/ }),
-/* 570 */
+/* 650 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const path = __webpack_require__(16);
-const globToRegExp = __webpack_require__(571);
+const globToRegExp = __webpack_require__(651);
 
 module.exports = normalizeOptions;
 
@@ -61204,7 +68098,7 @@ function normalizeOptions (options, internalOptions) {
 
 
 /***/ }),
-/* 571 */
+/* 651 */
 /***/ (function(module, exports) {
 
 module.exports = function (glob, opts) {
@@ -61341,13 +68235,13 @@ module.exports = function (glob, opts) {
 
 
 /***/ }),
-/* 572 */
+/* 652 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const call = __webpack_require__(573);
+const call = __webpack_require__(653);
 
 module.exports = stat;
 
@@ -61422,7 +68316,7 @@ function symlinkStat (fs, path, lstats, callback) {
 
 
 /***/ }),
-/* 573 */
+/* 653 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61483,14 +68377,14 @@ function callOnce (fn) {
 
 
 /***/ }),
-/* 574 */
+/* 654 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const fs = __webpack_require__(23);
-const call = __webpack_require__(573);
+const call = __webpack_require__(653);
 
 /**
  * A facade around {@link fs.readdirSync} that allows it to be called
@@ -61554,7 +68448,7 @@ exports.lstat = function (path, callback) {
 
 
 /***/ }),
-/* 575 */
+/* 655 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61583,7 +68477,7 @@ function syncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 576 */
+/* 656 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61591,12 +68485,12 @@ function syncForEach (array, iterator, done) {
 
 module.exports = readdirAsync;
 
-const maybe = __webpack_require__(577);
-const DirectoryReader = __webpack_require__(569);
+const maybe = __webpack_require__(657);
+const DirectoryReader = __webpack_require__(649);
 
 let asyncFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(578),
+  forEach: __webpack_require__(658),
   async: true
 };
 
@@ -61638,7 +68532,7 @@ function readdirAsync (dir, options, callback, internalOptions) {
 
 
 /***/ }),
-/* 577 */
+/* 657 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61665,7 +68559,7 @@ module.exports = function maybe (cb, promise) {
 
 
 /***/ }),
-/* 578 */
+/* 658 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61701,7 +68595,7 @@ function asyncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 579 */
+/* 659 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61709,11 +68603,11 @@ function asyncForEach (array, iterator, done) {
 
 module.exports = readdirStream;
 
-const DirectoryReader = __webpack_require__(569);
+const DirectoryReader = __webpack_require__(649);
 
 let streamFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(578),
+  forEach: __webpack_require__(658),
   async: true
 };
 
@@ -61733,16 +68627,16 @@ function readdirStream (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 580 */
+/* 660 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(16);
-var deep_1 = __webpack_require__(581);
-var entry_1 = __webpack_require__(583);
-var pathUtil = __webpack_require__(582);
+var deep_1 = __webpack_require__(661);
+var entry_1 = __webpack_require__(663);
+var pathUtil = __webpack_require__(662);
 var Reader = /** @class */ (function () {
     function Reader(options) {
         this.options = options;
@@ -61808,14 +68702,14 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 581 */
+/* 661 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(582);
-var patternUtils = __webpack_require__(413);
+var pathUtils = __webpack_require__(662);
+var patternUtils = __webpack_require__(495);
 var DeepFilter = /** @class */ (function () {
     function DeepFilter(options, micromatchOptions) {
         this.options = options;
@@ -61898,7 +68792,7 @@ exports.default = DeepFilter;
 
 
 /***/ }),
-/* 582 */
+/* 662 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61929,14 +68823,14 @@ exports.makeAbsolute = makeAbsolute;
 
 
 /***/ }),
-/* 583 */
+/* 663 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(582);
-var patternUtils = __webpack_require__(413);
+var pathUtils = __webpack_require__(662);
+var patternUtils = __webpack_require__(495);
 var EntryFilter = /** @class */ (function () {
     function EntryFilter(options, micromatchOptions) {
         this.options = options;
@@ -62021,7 +68915,7 @@ exports.default = EntryFilter;
 
 
 /***/ }),
-/* 584 */
+/* 664 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62041,8 +68935,8 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(28);
-var fsStat = __webpack_require__(585);
-var fs_1 = __webpack_require__(589);
+var fsStat = __webpack_require__(665);
+var fs_1 = __webpack_require__(669);
 var FileSystemStream = /** @class */ (function (_super) {
     __extends(FileSystemStream, _super);
     function FileSystemStream() {
@@ -62092,14 +68986,14 @@ exports.default = FileSystemStream;
 
 
 /***/ }),
-/* 585 */
+/* 665 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const optionsManager = __webpack_require__(586);
-const statProvider = __webpack_require__(588);
+const optionsManager = __webpack_require__(666);
+const statProvider = __webpack_require__(668);
 /**
  * Asynchronous API.
  */
@@ -62130,13 +69024,13 @@ exports.statSync = statSync;
 
 
 /***/ }),
-/* 586 */
+/* 666 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsAdapter = __webpack_require__(587);
+const fsAdapter = __webpack_require__(667);
 function prepare(opts) {
     const options = Object.assign({
         fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
@@ -62149,7 +69043,7 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 587 */
+/* 667 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62172,7 +69066,7 @@ exports.getFileSystemAdapter = getFileSystemAdapter;
 
 
 /***/ }),
-/* 588 */
+/* 668 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62224,7 +69118,7 @@ exports.isFollowedSymlink = isFollowedSymlink;
 
 
 /***/ }),
-/* 589 */
+/* 669 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62255,7 +69149,7 @@ exports.default = FileSystem;
 
 
 /***/ }),
-/* 590 */
+/* 670 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62275,9 +69169,9 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var stream = __webpack_require__(28);
-var readdir = __webpack_require__(567);
-var reader_1 = __webpack_require__(580);
-var fs_stream_1 = __webpack_require__(584);
+var readdir = __webpack_require__(647);
+var reader_1 = __webpack_require__(660);
+var fs_stream_1 = __webpack_require__(664);
 var TransformStream = /** @class */ (function (_super) {
     __extends(TransformStream, _super);
     function TransformStream(reader) {
@@ -62345,7 +69239,7 @@ exports.default = ReaderStream;
 
 
 /***/ }),
-/* 591 */
+/* 671 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62364,9 +69258,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(567);
-var reader_1 = __webpack_require__(580);
-var fs_sync_1 = __webpack_require__(592);
+var readdir = __webpack_require__(647);
+var reader_1 = __webpack_require__(660);
+var fs_sync_1 = __webpack_require__(672);
 var ReaderSync = /** @class */ (function (_super) {
     __extends(ReaderSync, _super);
     function ReaderSync() {
@@ -62426,7 +69320,7 @@ exports.default = ReaderSync;
 
 
 /***/ }),
-/* 592 */
+/* 672 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62445,8 +69339,8 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var fsStat = __webpack_require__(585);
-var fs_1 = __webpack_require__(589);
+var fsStat = __webpack_require__(665);
+var fs_1 = __webpack_require__(669);
 var FileSystemSync = /** @class */ (function (_super) {
     __extends(FileSystemSync, _super);
     function FileSystemSync() {
@@ -62492,7 +69386,7 @@ exports.default = FileSystemSync;
 
 
 /***/ }),
-/* 593 */
+/* 673 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62508,13 +69402,13 @@ exports.flatten = flatten;
 
 
 /***/ }),
-/* 594 */
+/* 674 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var merge2 = __webpack_require__(595);
+var merge2 = __webpack_require__(177);
 /**
  * Merge multiple streams and propagate their errors into one stream in parallel.
  */
@@ -62529,127 +69423,13 @@ exports.merge = merge;
 
 
 /***/ }),
-/* 595 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-/*
- * merge2
- * https://github.com/teambition/merge2
- *
- * Copyright (c) 2014-2016 Teambition
- * Licensed under the MIT license.
- */
-const Stream = __webpack_require__(28)
-const PassThrough = Stream.PassThrough
-const slice = Array.prototype.slice
-
-module.exports = merge2
-
-function merge2 () {
-  const streamsQueue = []
-  let merging = false
-  const args = slice.call(arguments)
-  let options = args[args.length - 1]
-
-  if (options && !Array.isArray(options) && options.pipe == null) args.pop()
-  else options = {}
-
-  const doEnd = options.end !== false
-  if (options.objectMode == null) options.objectMode = true
-  if (options.highWaterMark == null) options.highWaterMark = 64 * 1024
-  const mergedStream = PassThrough(options)
-
-  function addStream () {
-    for (let i = 0, len = arguments.length; i < len; i++) {
-      streamsQueue.push(pauseStreams(arguments[i], options))
-    }
-    mergeStream()
-    return this
-  }
-
-  function mergeStream () {
-    if (merging) return
-    merging = true
-
-    let streams = streamsQueue.shift()
-    if (!streams) {
-      process.nextTick(endStream)
-      return
-    }
-    if (!Array.isArray(streams)) streams = [streams]
-
-    let pipesCount = streams.length + 1
-
-    function next () {
-      if (--pipesCount > 0) return
-      merging = false
-      mergeStream()
-    }
-
-    function pipe (stream) {
-      function onend () {
-        stream.removeListener('merge2UnpipeEnd', onend)
-        stream.removeListener('end', onend)
-        next()
-      }
-      // skip ended stream
-      if (stream._readableState.endEmitted) return next()
-
-      stream.on('merge2UnpipeEnd', onend)
-      stream.on('end', onend)
-      stream.pipe(mergedStream, { end: false })
-      // compatible for old stream
-      stream.resume()
-    }
-
-    for (let i = 0; i < streams.length; i++) pipe(streams[i])
-
-    next()
-  }
-
-  function endStream () {
-    merging = false
-    // emit 'queueDrain' when all streams merged.
-    mergedStream.emit('queueDrain')
-    return doEnd && mergedStream.end()
-  }
-
-  mergedStream.setMaxListeners(0)
-  mergedStream.add = addStream
-  mergedStream.on('unpipe', function (stream) {
-    stream.emit('merge2UnpipeEnd')
-  })
-
-  if (args.length) addStream.apply(null, args)
-  return mergedStream
-}
-
-// check and pause streams for pipe.
-function pauseStreams (streams, options) {
-  if (!Array.isArray(streams)) {
-    // Backwards-compat with old-style streams
-    if (!streams._readableState && streams.pipe) streams = streams.pipe(PassThrough(options))
-    if (!streams._readableState || !streams.pause || !streams.pipe) {
-      throw new Error('Only readable stream can be merged.')
-    }
-    streams.pause()
-  } else {
-    for (let i = 0, len = streams.length; i < len; i++) streams[i] = pauseStreams(streams[i], options)
-  }
-  return streams
-}
-
-
-/***/ }),
-/* 596 */
+/* 675 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
-const pathType = __webpack_require__(597);
+const pathType = __webpack_require__(676);
 
 const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
@@ -62715,13 +69495,13 @@ module.exports.sync = (input, opts) => {
 
 
 /***/ }),
-/* 597 */
+/* 676 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const pify = __webpack_require__(598);
+const pify = __webpack_require__(677);
 
 function type(fn, fn2, fp) {
 	if (typeof fp !== 'string') {
@@ -62764,7 +69544,7 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 
 /***/ }),
-/* 598 */
+/* 677 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62855,17 +69635,17 @@ module.exports = (obj, opts) => {
 
 
 /***/ }),
-/* 599 */
+/* 678 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const fastGlob = __webpack_require__(409);
-const gitIgnore = __webpack_require__(600);
-const pify = __webpack_require__(601);
-const slash = __webpack_require__(602);
+const fastGlob = __webpack_require__(491);
+const gitIgnore = __webpack_require__(679);
+const pify = __webpack_require__(680);
+const slash = __webpack_require__(681);
 
 const DEFAULT_IGNORE = [
 	'**/node_modules/**',
@@ -62963,7 +69743,7 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 600 */
+/* 679 */
 /***/ (function(module, exports) {
 
 // A simple implementation of make-array
@@ -63432,7 +70212,7 @@ module.exports = options => new IgnoreBase(options)
 
 
 /***/ }),
-/* 601 */
+/* 680 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -63507,7 +70287,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 602 */
+/* 681 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -63525,17 +70305,17 @@ module.exports = input => {
 
 
 /***/ }),
-/* 603 */
+/* 682 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
 const {constants: fsConstants} = __webpack_require__(23);
-const {Buffer} = __webpack_require__(604);
-const CpFileError = __webpack_require__(606);
-const fs = __webpack_require__(608);
-const ProgressEmitter = __webpack_require__(610);
+const {Buffer} = __webpack_require__(683);
+const CpFileError = __webpack_require__(685);
+const fs = __webpack_require__(687);
+const ProgressEmitter = __webpack_require__(689);
 
 const cpFile = (source, destination, options) => {
 	if (!source || !destination) {
@@ -63689,11 +70469,11 @@ module.exports.sync = (source, destination, options) => {
 
 
 /***/ }),
-/* 604 */
+/* 683 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* eslint-disable node/no-deprecated-api */
-var buffer = __webpack_require__(605)
+var buffer = __webpack_require__(684)
 var Buffer = buffer.Buffer
 
 // alternative to using Object.keys for old browsers
@@ -63757,18 +70537,18 @@ SafeBuffer.allocUnsafeSlow = function (size) {
 
 
 /***/ }),
-/* 605 */
+/* 684 */
 /***/ (function(module, exports) {
 
 module.exports = require("buffer");
 
 /***/ }),
-/* 606 */
+/* 685 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(607);
+const NestedError = __webpack_require__(686);
 
 class CpFileError extends NestedError {
 	constructor(message, nested) {
@@ -63782,7 +70562,7 @@ module.exports = CpFileError;
 
 
 /***/ }),
-/* 607 */
+/* 686 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var inherits = __webpack_require__(44);
@@ -63836,15 +70616,15 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 608 */
+/* 687 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(22);
 const makeDir = __webpack_require__(115);
-const pify = __webpack_require__(609);
-const CpFileError = __webpack_require__(606);
+const pify = __webpack_require__(688);
+const CpFileError = __webpack_require__(685);
 
 const fsP = pify(fs);
 
@@ -63989,7 +70769,7 @@ if (fs.copyFileSync) {
 
 
 /***/ }),
-/* 609 */
+/* 688 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64064,7 +70844,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 610 */
+/* 689 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64105,12 +70885,12 @@ module.exports = ProgressEmitter;
 
 
 /***/ }),
-/* 611 */
+/* 690 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(612);
+const NestedError = __webpack_require__(691);
 
 class CpyError extends NestedError {
 	constructor(message, nested) {
@@ -64124,7 +70904,7 @@ module.exports = CpyError;
 
 
 /***/ }),
-/* 612 */
+/* 691 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var inherits = __webpack_require__(29).inherits;
@@ -64180,7 +70960,7 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 613 */
+/* 692 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json
index 8480e74ceb3a20..34a56615ed43a1 100644
--- a/packages/kbn-pm/package.json
+++ b/packages/kbn-pm/package.json
@@ -18,7 +18,6 @@
     "@types/cmd-shim": "^2.0.0",
     "@types/cpy": "^5.1.0",
     "@types/dedent": "^0.7.0",
-    "@types/execa": "^0.9.0",
     "@types/getopts": "^2.0.1",
     "@types/glob": "^5.0.35",
     "@types/globby": "^6.1.0",
@@ -40,8 +39,8 @@
     "cmd-shim": "^2.1.0",
     "cpy": "^7.3.0",
     "dedent": "^0.7.0",
-    "del": "^4.1.1",
-    "execa": "^1.0.0",
+    "del": "^5.1.0",
+    "execa": "^3.2.0",
     "getopts": "^2.2.4",
     "glob": "^7.1.2",
     "globby": "^8.0.1",
@@ -53,7 +52,7 @@
     "ora": "^1.4.0",
     "prettier": "^1.18.2",
     "read-pkg": "^5.2.0",
-    "rxjs": "^6.2.1",
+    "rxjs": "^6.5.3",
     "spawn-sync": "^1.0.15",
     "string-replace-loader": "^2.2.0",
     "strip-ansi": "^4.0.0",
diff --git a/packages/kbn-pm/src/utils/child_process.ts b/packages/kbn-pm/src/utils/child_process.ts
index 9b4b7b2516f1c7..784446924a8dc4 100644
--- a/packages/kbn-pm/src/utils/child_process.ts
+++ b/packages/kbn-pm/src/utils/child_process.ts
@@ -34,6 +34,7 @@ function generateColors() {
 export function spawn(command: string, args: string[], opts: execa.Options) {
   return execa(command, args, {
     stdio: 'inherit',
+    preferLocal: true,
     ...opts,
   });
 }
@@ -48,6 +49,7 @@ export function spawnStreaming(
 ) {
   const spawned = execa(command, args, {
     stdio: ['ignore', 'pipe', 'pipe'],
+    preferLocal: true,
     ...opts,
   });
 
diff --git a/packages/kbn-pm/src/utils/projects.test.ts b/packages/kbn-pm/src/utils/projects.test.ts
index 1b839440b94499..093f178f1813a1 100644
--- a/packages/kbn-pm/src/utils/projects.test.ts
+++ b/packages/kbn-pm/src/utils/projects.test.ts
@@ -19,7 +19,7 @@
 
 import { mkdir, symlink } from 'fs';
 import { join, resolve } from 'path';
-import rmdir from 'rimraf';
+import del from 'del';
 import { promisify } from 'util';
 
 import { getProjectPaths } from '../config';
@@ -33,20 +33,20 @@ import {
   topologicallyBatchProjects,
 } from './projects';
 
-const rootPath = resolve(`${__dirname}/__fixtures__/kibana`);
+const rootPath = resolve(__dirname, '__fixtures__/kibana');
 const rootPlugins = join(rootPath, 'plugins');
 
 describe('#getProjects', () => {
   beforeAll(async () => {
     await promisify(mkdir)(rootPlugins);
 
-    return promisify(symlink)(
+    await promisify(symlink)(
       join(__dirname, '__fixtures__/symlinked-plugins/corge'),
       join(rootPlugins, 'corge')
     );
   });
 
-  afterAll(() => promisify(rmdir)(rootPlugins));
+  afterAll(async () => await del(rootPlugins));
 
   test('find all packages in the packages directory', async () => {
     const projects = await getProjects(rootPath, ['packages/*']);
diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json
index 86a81207a9fa94..8c5358c82208df 100644
--- a/packages/kbn-test/package.json
+++ b/packages/kbn-test/package.json
@@ -20,12 +20,12 @@
   "dependencies": {
     "chalk": "^2.4.2",
     "dedent": "^0.7.0",
-    "del": "^4.1.1",
+    "del": "^5.1.0",
     "getopts": "^2.2.4",
     "glob": "^7.1.2",
     "parse-link-header": "^1.0.1",
     "strip-ansi": "^5.2.0",
-    "rxjs": "^6.2.1",
+    "rxjs": "^6.5.3",
     "tar-fs": "^1.16.3",
     "tmp": "^0.1.0",
     "xml2js": "^0.4.22",
diff --git a/packages/kbn-test/src/functional_tests/tasks.js b/packages/kbn-test/src/functional_tests/tasks.js
index 6ebc49679fbf3b..d50f6a15c2e0b8 100644
--- a/packages/kbn-test/src/functional_tests/tasks.js
+++ b/packages/kbn-test/src/functional_tests/tasks.js
@@ -82,12 +82,20 @@ export async function runTests(options) {
     await withProcRunner(log, async procs => {
       const config = await readConfigFile(log, configPath);
 
-      const es = await runElasticsearch({ config, options: opts });
-      await runKibanaServer({ procs, config, options: opts });
-      await runFtr({ configPath, options: opts });
-
-      await procs.stop('kibana');
-      await es.cleanup();
+      let es;
+      try {
+        es = await runElasticsearch({ config, options: opts });
+        await runKibanaServer({ procs, config, options: opts });
+        await runFtr({ configPath, options: opts });
+      } finally {
+        try {
+          await procs.stop('kibana');
+        } finally {
+          if (es) {
+            await es.cleanup();
+          }
+        }
+      }
     });
   }
 }
diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json
index cb4d2e3cadf956..d034e4393f58ff 100644
--- a/packages/kbn-ui-framework/package.json
+++ b/packages/kbn-ui-framework/package.json
@@ -52,7 +52,7 @@
     "imports-loader": "^0.8.0",
     "jquery": "^3.4.1",
     "keymirror": "0.1.1",
-    "moment": "^2.20.1",
+    "moment": "^2.24.0",
     "node-sass": "^4.9.4",
     "postcss": "^7.0.5",
     "postcss-loader": "^3.0.0",
diff --git a/packages/kbn-utility-types/package.json b/packages/kbn-utility-types/package.json
index b665fa20ff1ff1..a79d08677020b5 100644
--- a/packages/kbn-utility-types/package.json
+++ b/packages/kbn-utility-types/package.json
@@ -10,12 +10,13 @@
     "kbn:bootstrap": "tsc",
     "kbn:watch": "tsc --watch",
     "test": "tsd",
-    "clean": "rimraf target"
+    "clean": "del target"
   },
   "dependencies": {
     "utility-types": "^3.7.0"
   },
   "devDependencies": {
+    "del-cli": "^3.0.0",
     "tsd": "^0.7.4"
   }
 }
diff --git a/renovate.json5 b/renovate.json5
index 21af4ad1e83f8d..0c288bb85c72c8 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -353,14 +353,6 @@
           '@types/elasticsearch',
         ],
       },
-      {
-        groupSlug: 'execa',
-        groupName: 'execa related packages',
-        packageNames: [
-          'execa',
-          '@types/execa',
-        ],
-      },
       {
         groupSlug: 'fetch-mock',
         groupName: 'fetch-mock related packages',
@@ -409,14 +401,6 @@
           '@types/history',
         ],
       },
-      {
-        groupSlug: 'humps',
-        groupName: 'humps related packages',
-        packageNames: [
-          'humps',
-          '@types/humps',
-        ],
-      },
       {
         groupSlug: 'jquery',
         groupName: 'jquery related packages',
@@ -537,14 +521,6 @@
           '@types/request',
         ],
       },
-      {
-        groupSlug: 'rimraf',
-        groupName: 'rimraf related packages',
-        packageNames: [
-          'rimraf',
-          '@types/rimraf',
-        ],
-      },
       {
         groupSlug: 'selenium-webdriver',
         groupName: 'selenium-webdriver related packages',
@@ -593,6 +569,14 @@
           '@types/supertest',
         ],
       },
+      {
+        groupSlug: 'supertest-as-promised',
+        groupName: 'supertest-as-promised related packages',
+        packageNames: [
+          'supertest-as-promised',
+          '@types/supertest-as-promised',
+        ],
+      },
       {
         groupSlug: 'type-detect',
         groupName: 'type-detect related packages',
diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
index 8d56f6406ef59b..a67593c02a5935 100644
--- a/src/cli/cluster/cluster_manager.js
+++ b/src/cli/cluster/cluster_manager.js
@@ -113,7 +113,7 @@ export default class ClusterManager {
         ...scanDirs,
       ];
 
-      const extraIgnores = scanDirs
+      const pluginInternalDirsIgnore = scanDirs
         .map(scanDir => resolve(scanDir, '*'))
         .concat(pluginPaths)
         .reduce(
@@ -124,16 +124,11 @@ export default class ClusterManager {
               resolve(path, 'target'),
               resolve(path, 'scripts'),
               resolve(path, 'docs'),
-              resolve(path, 'src/legacy/server/sass/__tmp__'),
-              resolve(path, 'legacy/plugins/reporting/.chromium'),
-              resolve(path, 'legacy/plugins/siem/cypress'),
-              resolve(path, 'legacy/plugins/apm/cypress'),
-              resolve(path, 'x-pack/legacy/plugins/canvas/canvas_plugin_src') // prevents server from restarting twice for Canvas plugin changes
             ),
           []
         );
 
-      this.setupWatching(extraPaths, extraIgnores);
+      this.setupWatching(extraPaths, pluginInternalDirsIgnore);
     } else this.startCluster();
   }
 
@@ -170,7 +165,7 @@ export default class ClusterManager {
       .then(() => opn(openUrl));
   }
 
-  setupWatching(extraPaths, extraIgnores) {
+  setupWatching(extraPaths, pluginInternalDirsIgnore) {
     const chokidar = require('chokidar');
     const { fromRoot } = require('../../legacy/utils');
 
@@ -187,12 +182,21 @@ export default class ClusterManager {
       ...extraPaths,
     ].map(path => resolve(path));
 
+    const ignorePaths = [
+      fromRoot('src/legacy/server/sass/__tmp__'),
+      fromRoot('x-pack/legacy/plugins/reporting/.chromium'),
+      fromRoot('x-pack/legacy/plugins/siem/cypress'),
+      fromRoot('x-pack/legacy/plugins/apm/cypress'),
+      fromRoot('x-pack/legacy/plugins/canvas/canvas_plugin_src') // prevents server from restarting twice for Canvas plugin changes
+    ];
+
     this.watcher = chokidar.watch(uniq(watchPaths), {
       cwd: fromRoot('.'),
       ignored: [
         /[\\\/](\..*|node_modules|bower_components|public|__[a-z0-9_]+__|coverage)[\\\/]/,
         /\.test\.(js|ts)$/,
-        ...extraIgnores,
+        ...pluginInternalDirsIgnore,
+        ...ignorePaths,
         'plugins/java_languageserver'
       ],
     });
diff --git a/src/cli/serve/integration_tests/reload_logging_config.test.js b/src/cli/serve/integration_tests/reload_logging_config.test.js
index 8e8bdb15abc684..8558a5eb6c9103 100644
--- a/src/cli/serve/integration_tests/reload_logging_config.test.js
+++ b/src/cli/serve/integration_tests/reload_logging_config.test.js
@@ -21,7 +21,7 @@ import { spawn } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import rimraf from 'rimraf';
+import del from 'del';
 
 import { safeDump } from 'js-yaml';
 import { createMapStream, createSplitStream, createPromiseFromStreams } from '../../../legacy/utils/streams';
@@ -70,7 +70,7 @@ describe('Server logging configuration', function () {
       child = undefined;
     }
 
-    rimraf.sync(tempDir);
+    del.sync(tempDir, { force: true });
   });
 
   const isWindows = /^win/.test(process.platform);
diff --git a/src/cli_plugin/install/cleanup.js b/src/cli_plugin/install/cleanup.js
index 631257fba72716..55251e6a0a0db2 100644
--- a/src/cli_plugin/install/cleanup.js
+++ b/src/cli_plugin/install/cleanup.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import rimraf from 'rimraf';
+import del from 'del';
 import fs from 'fs';
 
 export function cleanPrevious(settings, logger) {
@@ -27,7 +27,7 @@ export function cleanPrevious(settings, logger) {
 
       logger.log('Found previous install attempt. Deleting...');
       try {
-        rimraf.sync(settings.workingPath);
+        del.sync(settings.workingPath);
       } catch (e) {
         reject(e);
       }
@@ -44,8 +44,8 @@ export function cleanArtifacts(settings) {
   // delete the working directory.
   // At this point we're bailing, so swallow any errors on delete.
   try {
-    rimraf.sync(settings.workingPath);
-    rimraf.sync(settings.plugins[0].path);
+    del.sync(settings.workingPath);
+    del.sync(settings.plugins[0].path);
   }
   catch (e) {} // eslint-disable-line no-empty
 }
diff --git a/src/cli_plugin/install/cleanup.test.js b/src/cli_plugin/install/cleanup.test.js
index a0f5f5064102ce..bb2771920b39cb 100644
--- a/src/cli_plugin/install/cleanup.test.js
+++ b/src/cli_plugin/install/cleanup.test.js
@@ -19,7 +19,7 @@
 
 import sinon from 'sinon';
 import fs from 'fs';
-import rimraf from 'rimraf';
+import del from 'del';
 
 import { cleanPrevious, cleanArtifacts } from './cleanup';
 import Logger from '../lib/logger';
@@ -48,11 +48,11 @@ describe('kibana cli', function () {
           logger.log.restore();
           logger.error.restore();
           fs.statSync.restore();
-          rimraf.sync.restore();
+          del.sync.restore();
         });
 
         it('should resolve if the working path does not exist', function () {
-          sinon.stub(rimraf, 'sync');
+          sinon.stub(del, 'sync');
           sinon.stub(fs, 'statSync').callsFake(() => {
             const error = new Error('ENOENT');
             error.code = 'ENOENT';
@@ -67,7 +67,7 @@ describe('kibana cli', function () {
         });
 
         it('should rethrow any exception except ENOENT from fs.statSync', function () {
-          sinon.stub(rimraf, 'sync');
+          sinon.stub(del, 'sync');
           sinon.stub(fs, 'statSync').throws(new Error('An Unhandled Error'));
 
           errorStub = sinon.stub();
@@ -79,7 +79,7 @@ describe('kibana cli', function () {
         });
 
         it('should log a message if there was a working directory', function () {
-          sinon.stub(rimraf, 'sync');
+          sinon.stub(del, 'sync');
           sinon.stub(fs, 'statSync');
 
           return cleanPrevious(settings, logger)
@@ -89,9 +89,9 @@ describe('kibana cli', function () {
             });
         });
 
-        it('should rethrow any exception from rimraf.sync', function () {
+        it('should rethrow any exception from del.sync', function () {
           sinon.stub(fs, 'statSync');
-          sinon.stub(rimraf, 'sync').throws(new Error('I am an error thrown by rimraf'));
+          sinon.stub(del, 'sync').throws(new Error('I am an error thrown by del'));
 
           errorStub = sinon.stub();
           return cleanPrevious(settings, logger)
@@ -102,7 +102,7 @@ describe('kibana cli', function () {
         });
 
         it('should resolve if the working path is deleted', function () {
-          sinon.stub(rimraf, 'sync');
+          sinon.stub(del, 'sync');
           sinon.stub(fs, 'statSync');
 
           return cleanPrevious(settings, logger)
@@ -117,18 +117,18 @@ describe('kibana cli', function () {
         beforeEach(function () {});
 
         afterEach(function () {
-          rimraf.sync.restore();
+          del.sync.restore();
         });
 
         it('should attempt to delete the working directory', function () {
-          sinon.stub(rimraf, 'sync');
+          sinon.stub(del, 'sync');
 
           cleanArtifacts(settings);
-          expect(rimraf.sync.calledWith(settings.workingPath)).toBe(true);
+          expect(del.sync.calledWith(settings.workingPath)).toBe(true);
         });
 
-        it('should swallow any errors thrown by rimraf.sync', function () {
-          sinon.stub(rimraf, 'sync').throws(new Error('Something bad happened.'));
+        it('should swallow any errors thrown by del.sync', function () {
+          sinon.stub(del, 'sync').throws(new Error('Something bad happened.'));
 
           expect(() => cleanArtifacts(settings)).not.toThrow();
         });
diff --git a/src/cli_plugin/install/download.test.js b/src/cli_plugin/install/download.test.js
index 9de6491f3c9571..0769e5351a5d28 100644
--- a/src/cli_plugin/install/download.test.js
+++ b/src/cli_plugin/install/download.test.js
@@ -20,7 +20,7 @@
 import sinon from 'sinon';
 import nock from 'nock';
 import glob from 'glob-all';
-import rimraf from 'rimraf';
+import del from 'del';
 import Fs from 'fs';
 import Logger from '../lib/logger';
 import { UnsupportedProtocolError } from '../lib/errors';
@@ -63,14 +63,14 @@ describe('kibana cli', function () {
     beforeEach(function () {
       sinon.stub(logger, 'log');
       sinon.stub(logger, 'error');
-      rimraf.sync(testWorkingPath);
+      del.sync(testWorkingPath);
       Fs.mkdirSync(testWorkingPath, { recursive: true });
     });
 
     afterEach(function () {
       logger.log.restore();
       logger.error.restore();
-      rimraf.sync(testWorkingPath);
+      del.sync(testWorkingPath);
     });
 
     describe('_downloadSingle', function () {
diff --git a/src/cli_plugin/install/install.js b/src/cli_plugin/install/install.js
index 10816591f7d714..a62d8525f24952 100644
--- a/src/cli_plugin/install/install.js
+++ b/src/cli_plugin/install/install.js
@@ -25,7 +25,7 @@ import path from 'path';
 import { cleanPrevious, cleanArtifacts } from './cleanup';
 import { extract, getPackData } from './pack';
 import { renamePlugin } from './rename';
-import { sync as rimrafSync } from 'rimraf';
+import del from 'del';
 import { errorIfXPackInstall } from '../lib/error_if_x_pack';
 import { existingInstall, assertVersion } from './kibana';
 import { prepareExternalProjectDependencies } from '@kbn/pm';
@@ -46,7 +46,7 @@ export default async function install(settings, logger) {
 
     await extract(settings, logger);
 
-    rimrafSync(settings.tempArchiveFile);
+    del.sync(settings.tempArchiveFile);
 
     existingInstall(settings, logger);
 
diff --git a/src/cli_plugin/install/kibana.test.js b/src/cli_plugin/install/kibana.test.js
index 64de96b34e807a..f5485846274cec 100644
--- a/src/cli_plugin/install/kibana.test.js
+++ b/src/cli_plugin/install/kibana.test.js
@@ -17,19 +17,19 @@
  * under the License.
  */
 
-jest.mock('fs', () => ({
-  statSync: jest.fn().mockImplementation(() => require('fs').statSync),
-  unlinkSync: jest.fn().mockImplementation(() => require('fs').unlinkSync),
-  mkdirSync: jest.fn().mockImplementation(() => require('fs').mkdirSync),
-}));
-
 import sinon from 'sinon';
 import Logger from '../lib/logger';
 import { join } from 'path';
-import rimraf from 'rimraf';
+import del from 'del';
 import fs from 'fs';
 import { existingInstall, assertVersion } from './kibana';
 
+jest.spyOn(fs, 'statSync');
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
 describe('kibana cli', function () {
 
   describe('plugin installer', function () {
@@ -53,7 +53,7 @@ describe('kibana cli', function () {
       describe('assertVersion', function () {
 
         beforeEach(function () {
-          rimraf.sync(testWorkingPath);
+          del.sync(testWorkingPath);
           fs.mkdirSync(testWorkingPath, { recursive: true });
           sinon.stub(logger, 'log');
           sinon.stub(logger, 'error');
@@ -62,7 +62,7 @@ describe('kibana cli', function () {
         afterEach(function () {
           logger.log.restore();
           logger.error.restore();
-          rimraf.sync(testWorkingPath);
+          del.sync(testWorkingPath);
         });
 
         it('should succeed with exact match', function () {
@@ -124,14 +124,14 @@ describe('kibana cli', function () {
         });
 
         it('should throw an error if the plugin already exists.', function () {
-          fs.statSync = jest.fn().mockImplementationOnce(() => true);
+          fs.statSync.mockImplementationOnce(() => true);
           existingInstall(settings, logger);
           expect(logger.error.firstCall.args[0]).toMatch(/already exists/);
           expect(process.exit.called).toBe(true);
         });
 
         it('should not throw an error if the plugin does not exist.', function () {
-          fs.statSync = jest.fn().mockImplementationOnce(() => {
+          fs.statSync.mockImplementationOnce(() => {
             throw { code: 'ENOENT' };
           });
           existingInstall(settings, logger);
diff --git a/src/cli_plugin/install/pack.test.js b/src/cli_plugin/install/pack.test.js
index 1bc2504397fb52..b599934b1d99bc 100644
--- a/src/cli_plugin/install/pack.test.js
+++ b/src/cli_plugin/install/pack.test.js
@@ -21,7 +21,7 @@ import Fs from 'fs';
 
 import sinon from 'sinon';
 import glob from 'glob-all';
-import rimraf from 'rimraf';
+import del from 'del';
 import Logger from '../lib/logger';
 import { extract, getPackData } from './pack';
 import { _downloadSingle }  from './download';
@@ -41,7 +41,7 @@ describe('kibana cli', function () {
 
     beforeEach(function () {
       //These tests are dependent on the file system, and I had some inconsistent
-      //behavior with rimraf.sync show up. Until these tests are re-written to not
+      //behavior with del.sync show up. Until these tests are re-written to not
       //depend on the file system, I make sure that each test uses a different
       //working directory.
       testNum += 1;
@@ -65,7 +65,7 @@ describe('kibana cli', function () {
     afterEach(function () {
       logger.log.restore();
       logger.error.restore();
-      rimraf.sync(workingPathRoot);
+      del.sync(workingPathRoot);
     });
 
     function copyReplyFile(filename) {
diff --git a/src/cli_plugin/install/zip.test.js b/src/cli_plugin/install/zip.test.js
index 340dec196eef5b..0bcc1c182ff0d7 100644
--- a/src/cli_plugin/install/zip.test.js
+++ b/src/cli_plugin/install/zip.test.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import rimraf from 'rimraf';
+import del from 'del';
 import path from 'path';
 import os from 'os';
 import glob from 'glob';
@@ -38,7 +38,7 @@ describe('kibana cli', function () {
     });
 
     afterEach(() => {
-      rimraf.sync(tempPath);
+      del.sync(tempPath, { force: true });
     });
 
     describe('analyzeArchive', function () {
diff --git a/src/cli_plugin/list/list.test.js b/src/cli_plugin/list/list.test.js
index 425a6bee5394e1..5a40fcc793e08b 100644
--- a/src/cli_plugin/list/list.test.js
+++ b/src/cli_plugin/list/list.test.js
@@ -18,7 +18,7 @@
  */
 
 import sinon from 'sinon';
-import rimraf from 'rimraf';
+import del from 'del';
 import Logger from '../lib/logger';
 import list from './list';
 import { join } from 'path';
@@ -46,14 +46,14 @@ describe('kibana cli', function () {
       logger = new Logger(settings);
       sinon.stub(logger, 'log');
       sinon.stub(logger, 'error');
-      rimraf.sync(pluginDir);
+      del.sync(pluginDir);
       mkdirSync(pluginDir, { recursive: true });
     });
 
     afterEach(function () {
       logger.log.restore();
       logger.error.restore();
-      rimraf.sync(pluginDir);
+      del.sync(pluginDir);
     });
 
     it('list all of the folders in the plugin folder', function () {
diff --git a/src/cli_plugin/remove/remove.js b/src/cli_plugin/remove/remove.js
index 7aaccd8ca05fe5..8432d0f44836ba 100644
--- a/src/cli_plugin/remove/remove.js
+++ b/src/cli_plugin/remove/remove.js
@@ -20,7 +20,7 @@
 import { statSync } from 'fs';
 import { errorIfXPackRemove } from '../lib/error_if_x_pack';
 
-import rimraf from 'rimraf';
+import del from 'del';
 
 export default function remove(settings, logger) {
   try {
@@ -37,7 +37,7 @@ export default function remove(settings, logger) {
     }
 
     logger.log(`Removing ${settings.plugin}...`);
-    rimraf.sync(settings.pluginPath);
+    del.sync(settings.pluginPath);
     logger.log('Plugin removal complete');
   } catch (err) {
     logger.error(`Unable to remove plugin because of error: "${err.message}"`);
diff --git a/src/cli_plugin/remove/remove.test.js b/src/cli_plugin/remove/remove.test.js
index 5d936d02785210..c063a713f47aca 100644
--- a/src/cli_plugin/remove/remove.test.js
+++ b/src/cli_plugin/remove/remove.test.js
@@ -19,7 +19,7 @@
 
 import sinon from 'sinon';
 import glob from 'glob-all';
-import rimraf from 'rimraf';
+import del from 'del';
 import Logger from '../lib/logger';
 import remove from './remove';
 import { join } from 'path';
@@ -40,7 +40,7 @@ describe('kibana cli', function () {
       logger = new Logger(settings);
       sinon.stub(logger, 'log');
       sinon.stub(logger, 'error');
-      rimraf.sync(pluginDir);
+      del.sync(pluginDir);
       mkdirSync(pluginDir, { recursive: true });
     });
 
@@ -48,7 +48,7 @@ describe('kibana cli', function () {
       processExitStub.restore();
       logger.log.restore();
       logger.error.restore();
-      rimraf.sync(pluginDir);
+      del.sync(pluginDir);
     });
 
     it('throw an error if the plugin is not installed.', function () {
diff --git a/src/core/MIGRATION.md b/src/core/MIGRATION.md
index 36883440e0b5dc..c26a383719fa1a 100644
--- a/src/core/MIGRATION.md
+++ b/src/core/MIGRATION.md
@@ -174,10 +174,10 @@ In the new platform, there are three lifecycle functions today: `setup`, `start`
 The table below explains how each lifecycle event relates to the state of Kibana.
 
 | lifecycle event | server                                    | browser                                             |
-|-----------------|-------------------------------------------|-----------------------------------------------------|
+| --------------- | ----------------------------------------- | --------------------------------------------------- |
 | *setup*         | bootstrapping and configuring routes      | loading plugin bundles and configuring applications |
 | *start*         | server is now serving traffic             | browser is now showing UI to the user               |
-|  *stop*         | server has received a request to shutdown | user is navigating away from Kibana                 |
+| *stop*          | server has received a request to shutdown | user is navigating away from Kibana                 |
 
 There is no equivalent behavior to `start` or `stop` in legacy plugins, so this guide primarily focuses on migrating functionality into `setup`.
 
@@ -1096,7 +1096,7 @@ import { npStart: { core } } from 'ui/new_platform';
 ```
 
 | Legacy Platform                                       | New Platform                                                                                                                                                                               | Notes                                                                                                                                          |
-|-------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
+| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------- |
 | `chrome.addBasePath`                                  | [`core.http.basePath.prepend`](/docs/development/core/public/kibana-plugin-public.httpservicebase.basepath.md)                                                                             |                                                                                                                                                |
 | `chrome.breadcrumbs.set`                              | [`core.chrome.setBreadcrumbs`](/docs/development/core/public/kibana-plugin-public.chromestart.setbreadcrumbs.md)                                                                           |                                                                                                                                                |
 | `chrome.getUiSettingsClient`                          | [`core.uiSettings`](/docs/development/core/public/kibana-plugin-public.uisettingsclient.md)                                                                                                |                                                                                                                                                |
@@ -1111,6 +1111,7 @@ import { npStart: { core } } from 'ui/new_platform';
 | `ui/notify`                                           | [`core.notifications`](/docs/development/core/public/kibana-plugin-public.notificationsstart.md) and [`core.overlays`](/docs/development/core/public/kibana-plugin-public.overlaystart.md) | Toast messages are in `notifications`, banners are in `overlays`. May be combined later.                                                       |
 | `ui/routes`                                           | --                                                                                                                                                                                         | There is no global routing mechanism. Each app [configures its own routing](/rfcs/text/0004_application_service_mounting.md#complete-example). |
 | `ui/saved_objects`                                    | [`core.savedObjects`](/docs/development/core/public/kibana-plugin-public.savedobjectsstart.md)                                                                                             | Client API is the same                                                                                                                         |
+| `ui/doc_title`                                        | [`core.chrome.docTitle`](/docs/development/core/public/kibana-plugin-public.chromedoctitle.md)                                                                                             |                                                                                                                                                |
 
 _See also: [Public's CoreStart API Docs](/docs/development/core/public/kibana-plugin-public.corestart.md)_
 
@@ -1125,24 +1126,25 @@ import { setup, start } from '../core_plugins/embeddables/public/legacy';
 import { setup, start } from '../core_plugins/visualizations/public/legacy';
 ```
 
-| Legacy Platform                                        | New Platform                               | Notes                                                                                                                                  |
-|--------------------------------------------------------|--------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|
-| `import 'ui/apply_filters'`                            | `import { ApplyFiltersPopover } from '../data/public'`         | `import '../data/public/legacy` should be called to load legacy directives                                               |
-| `import 'ui/filter_bar'`                               | `import { FilterBar } from '../data/public'`                   | `import '../data/public/legacy` should be called to load legacy directives                                               |
-| `import 'ui/query_bar'`                                | `import { QueryBar, QueryBarInput } from '../data/public'`     | Directives are deprecated.                                                                                            |
-| `import 'ui/search_bar'`                               | `import { SearchBar } from '../data/public'`           | Directive is deprecated.                                                                                              |
-| `import 'ui/kbn_top_nav'`                              | `import { TopNavMenu } from '../kibana_react/public'`          | Directive is still available in `ui/kbn_top_nav`.                                                                     |              
-| `core_plugins/interpreter`                             | `data.expressions`                                          | still in progress                                                                                                     |
-| `ui/courier`                                           | `data.search`                              | still in progress                                                                                                                  |
-| `ui/embeddable`                                        | `embeddables`                              | still in progress                                                                                                                  |
-| `ui/filter_manager`                                    | `data.filter`                              | --                                                                                                                                 |
-| `ui/index_patterns`                                    | `data.indexPatterns`                       | still in progress                                                                                                                  |
-| `ui/registry/vis_types`                                | `visualizations.types`                     | --                                                                                                                                 |
-| `ui/vis`                                               | `visualizations.types`                     | --                                                                                                                                 |
-| `ui/vis/vis_factory`                                   | `visualizations.types`                     | --                                                                                                                                 |
-| `ui/vis/vis_filters`                                   | `visualizations.filters`                   | --                                                                                                                                 |
-| `ui/utils/parse_es_interval`                           | `import { parseEsInterval } from '../data/public'`                  | `parseEsInterval`, `ParsedInterval`, `InvalidEsCalendarIntervalError`, `InvalidEsIntervalFormatError` items were moved to the `Data Plugin` as a static code    |
-
+| Legacy Platform                                   | New Platform                                                 | Notes                                                                                                                                                        |
+| ------------------------------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `import 'ui/apply_filters'`                       | `import { ApplyFiltersPopover } from '../data/public'`       | `import '../data/public/legacy` should be called to load legacy directives                                                                                   |
+| `import 'ui/filter_bar'`                          | `import { FilterBar } from '../data/public'`                 | `import '../data/public/legacy` should be called to load legacy directives                                                                                   |
+| `import 'ui/query_bar'`                           | `import { QueryBar, QueryBarInput } from '../data/public'`   | Directives are deprecated.                                                                                                                                   |
+| `import 'ui/search_bar'`                          | `import { SearchBar } from '../data/public'`                 | Directive is deprecated.                                                                                                                                     |
+| `import 'ui/kbn_top_nav'`                         | `import { TopNavMenu } from '../navigation/public'`          | Directive is still available in `ui/kbn_top_nav`.                                                                                                            |
+| `ui/saved_objects/components/saved_object_finder` | `import { SavedObjectFinder } from '../kibana_react/public'` |                                                                                                                                                              |
+| `core_plugins/interpreter`                        | `data.expressions`                                           | still in progress                                                                                                                                            |
+| `ui/courier`                                      | `data.search`                                                | still in progress                                                                                                                                            |
+| `ui/embeddable`                                   | `embeddables`                                                | still in progress                                                                                                                                            |
+| `ui/filter_manager`                               | `data.filter`                                                | --                                                                                                                                                           |
+| `ui/index_patterns`                               | `data.indexPatterns`                                         | still in progress                                                                                                                                            |
+| `ui/registry/feature_catalogue                    | `feature_catalogue.register`                                 | Must add `feature_catalogue` as a dependency in your kibana.json.                                                                                            |
+| `ui/registry/vis_types`                           | `visualizations.types`                                       | --                                                                                                                                                           |
+| `ui/vis`                                          | `visualizations.types`                                       | --                                                                                                                                                           |
+| `ui/vis/vis_factory`                              | `visualizations.types`                                       | --                                                                                                                                                           |
+| `ui/vis/vis_filters`                              | `visualizations.filters`                                     | --                                                                                                                                                           |
+| `ui/utils/parse_es_interval`                      | `import { parseEsInterval } from '../data/public'`           | `parseEsInterval`, `ParsedInterval`, `InvalidEsCalendarIntervalError`, `InvalidEsIntervalFormatError` items were moved to the `Data Plugin` as a static code |
 
 #### Server-side
 
@@ -1150,9 +1152,9 @@ import { setup, start } from '../core_plugins/visualizations/public/legacy';
 In server code, `core` can be accessed from either `server.newPlatform` or `kbnServer.newPlatform`. There are not currently very many services available on the server-side:
 
 | Legacy Platform                                    | New Platform                                                                                                                      | Notes                                                                       |
-|----------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
+| -------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
 | `server.config()`                                  | [`initializerContext.config.create()`](/docs/development/core/server/kibana-plugin-server.plugininitializercontext.config.md)     | Must also define schema. See _[how to configure plugin](#configure-plugin)_ |
-| `server.route`                                     | [`core.http.createRouter`](/docs/development/core/server/kibana-plugin-server.httpservicesetup.createrouter.md)                   | [Examples](./MIGRATION_EXAMPLES.md#route-registration) |
+| `server.route`                                     | [`core.http.createRouter`](/docs/development/core/server/kibana-plugin-server.httpservicesetup.createrouter.md)                   | [Examples](./MIGRATION_EXAMPLES.md#route-registration)                      |
 | `request.getBasePath()`                            | [`core.http.basePath.get`](/docs/development/core/server/kibana-plugin-server.httpservicesetup.basepath.md)                       |                                                                             |
 | `server.plugins.elasticsearch.getCluster('data')`  | [`core.elasticsearch.dataClient$`](/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient_.md)   | Handlers will also include a pre-configured client                          |
 | `server.plugins.elasticsearch.getCluster('admin')` | [`core.elasticsearch.adminClient$`](/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient_.md) | Handlers will also include a pre-configured client                          |
@@ -1166,7 +1168,7 @@ The legacy platform uses a set of "uiExports" to inject modules from one plugin
 This table shows where these uiExports have moved to in the New Platform. In most cases, if a uiExport you need is not yet available in the New Platform, you may leave in your legacy plugin for the time being and continue to migrate the rest of your app to the New Platform.
 
 | Legacy Platform              | New Platform                                                                                                              | Notes                                                                                                                                 |
-|------------------------------|---------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------|
+| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
 | `aliases`                    |                                                                                                                           |                                                                                                                                       |
 | `app`                        | [`core.application.register`](/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md)            |                                                                                                                                       |
 | `canvas`                     |                                                                                                                           | Should be an API on the canvas plugin.                                                                                                |
@@ -1179,7 +1181,7 @@ This table shows where these uiExports have moved to in the New Platform. In mos
 | `fieldFormatEditors`         |                                                                                                                           |                                                                                                                                       |
 | `fieldFormats`               |                                                                                                                           |                                                                                                                                       |
 | `hacks`                      | n/a                                                                                                                       | Just run the code in your plugin's `start` method.                                                                                    |
-| `home`                       |                                                                                                                           | Should be an API on the home plugin.                                                                                                  |
+| `home`                       | [`plugins.feature_catalogue.register`](./src/plugins/feature_catalogue)                                                   | Must add `feature_catalogue` as a dependency in your kibana.json.                                                                     |
 | `indexManagement`            |                                                                                                                           | Should be an API on the indexManagement plugin.                                                                                       |
 | `injectDefaultVars`          | n/a                                                                                                                       | Plugins will only be able to "whitelist" config values for the frontend. See [#41990](https://github.com/elastic/kibana/issues/41990) |
 | `inspectorViews`             |                                                                                                                           | Should be an API on the data (?) plugin.                                                                                              |
@@ -1197,7 +1199,7 @@ This table shows where these uiExports have moved to in the New Platform. In mos
 | `styleSheetPaths`            |                                                                                                                           |                                                                                                                                       |
 | `taskDefinitions`            |                                                                                                                           | Should be an API on the taskManager plugin.                                                                                           |
 | `uiCapabilities`             | [`core.application.register`](/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md)            |                                                                                                                                       |
-| `uiSettingDefaults`          |                                                                                                                           | Most likely part of server-side UiSettingsService.                                                                                    |
+| `uiSettingDefaults`          | [`core.uiSettings.register`](/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.md) |                                                                    |
 | `validations`                |                                                                                                                           | Part of SavedObjects, see [#33587](https://github.com/elastic/kibana/issues/33587)                                                    |
 | `visEditorTypes`             |                                                                                                                           |                                                                                                                                       |
 | `visTypeEnhancers`           |                                                                                                                           |                                                                                                                                       |
diff --git a/src/core/public/chrome/chrome_service.mock.ts b/src/core/public/chrome/chrome_service.mock.ts
index 3775989c5126b4..6f61ee9dc21ba5 100644
--- a/src/core/public/chrome/chrome_service.mock.ts
+++ b/src/core/public/chrome/chrome_service.mock.ts
@@ -43,6 +43,13 @@ const createStartContractMock = () => {
       get: jest.fn(),
       get$: jest.fn(),
     },
+    docTitle: {
+      change: jest.fn(),
+      reset: jest.fn(),
+      __legacy: {
+        setBaseTitle: jest.fn(),
+      },
+    },
     navControls: {
       registerLeft: jest.fn(),
       registerRight: jest.fn(),
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index 71279ad6fed03a..87389d2c10f033 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -33,10 +33,11 @@ import { HttpStart } from '../http';
 import { ChromeNavLinks, NavLinksService } from './nav_links';
 import { ChromeRecentlyAccessed, RecentlyAccessedService } from './recently_accessed';
 import { NavControlsService, ChromeNavControls } from './nav_controls';
+import { DocTitleService, ChromeDocTitle } from './doc_title';
 import { LoadingIndicator, HeaderWrapper as Header } from './ui';
 import { DocLinksStart } from '../doc_links';
 
-export { ChromeNavControls, ChromeRecentlyAccessed };
+export { ChromeNavControls, ChromeRecentlyAccessed, ChromeDocTitle };
 
 const IS_COLLAPSED_KEY = 'core.chrome.isCollapsed';
 
@@ -82,6 +83,7 @@ export class ChromeService {
   private readonly navControls = new NavControlsService();
   private readonly navLinks = new NavLinksService();
   private readonly recentlyAccessed = new RecentlyAccessedService();
+  private readonly docTitle = new DocTitleService();
 
   constructor(private readonly params: ConstructorParams) {}
 
@@ -106,6 +108,7 @@ export class ChromeService {
     const navControls = this.navControls.start();
     const navLinks = this.navLinks.start({ application, http });
     const recentlyAccessed = await this.recentlyAccessed.start({ http });
+    const docTitle = this.docTitle.start({ document: window.document });
 
     if (!this.params.browserSupportsCsp && injectedMetadata.getCspConfig().warnLegacyBrowsers) {
       notifications.toasts.addWarning(
@@ -119,6 +122,7 @@ export class ChromeService {
       navControls,
       navLinks,
       recentlyAccessed,
+      docTitle,
 
       getHeaderComponent: () => (
         <React.Fragment>
@@ -259,6 +263,8 @@ export interface ChromeStart {
   navControls: ChromeNavControls;
   /** {@inheritdoc ChromeRecentlyAccessed} */
   recentlyAccessed: ChromeRecentlyAccessed;
+  /** {@inheritdoc ChromeDocTitle} */
+  docTitle: ChromeDocTitle;
 
   /**
    * Sets the current app's title
diff --git a/src/core/public/chrome/doc_title/doc_title_service.test.ts b/src/core/public/chrome/doc_title/doc_title_service.test.ts
new file mode 100644
index 00000000000000..763e8c9ebd74a5
--- /dev/null
+++ b/src/core/public/chrome/doc_title/doc_title_service.test.ts
@@ -0,0 +1,80 @@
+/*
+ * 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 { DocTitleService } from './doc_title_service';
+
+describe('DocTitleService', () => {
+  const defaultTitle = 'KibanaTest';
+  const document = { title: '' };
+
+  const getStart = (title: string = defaultTitle) => {
+    document.title = title;
+    return new DocTitleService().start({ document });
+  };
+
+  beforeEach(() => {
+    document.title = defaultTitle;
+  });
+
+  describe('#change()', () => {
+    it('changes the title of the document', async () => {
+      getStart().change('TitleA');
+      expect(document.title).toEqual('TitleA - KibanaTest');
+    });
+
+    it('appends the baseTitle to the title', async () => {
+      const start = getStart('BaseTitle');
+      start.change('TitleA');
+      expect(document.title).toEqual('TitleA - BaseTitle');
+      start.change('TitleB');
+      expect(document.title).toEqual('TitleB - BaseTitle');
+    });
+
+    it('accepts string arrays as input', async () => {
+      const start = getStart();
+      start.change(['partA', 'partB']);
+      expect(document.title).toEqual(`partA - partB - ${defaultTitle}`);
+      start.change(['partA', 'partB', 'partC']);
+      expect(document.title).toEqual(`partA - partB - partC - ${defaultTitle}`);
+    });
+  });
+
+  describe('#reset()', () => {
+    it('resets the title to the initial value', async () => {
+      const start = getStart('InitialTitle');
+      start.change('TitleA');
+      expect(document.title).toEqual('TitleA - InitialTitle');
+      start.reset();
+      expect(document.title).toEqual('InitialTitle');
+    });
+  });
+
+  describe('#__legacy.setBaseTitle()', () => {
+    it('allows to change the baseTitle after startup', async () => {
+      const start = getStart('InitialTitle');
+      start.change('WithInitial');
+      expect(document.title).toEqual('WithInitial - InitialTitle');
+      start.__legacy.setBaseTitle('NewBaseTitle');
+      start.change('WithNew');
+      expect(document.title).toEqual('WithNew - NewBaseTitle');
+      start.reset();
+      expect(document.title).toEqual('NewBaseTitle');
+    });
+  });
+});
diff --git a/src/core/public/chrome/doc_title/doc_title_service.ts b/src/core/public/chrome/doc_title/doc_title_service.ts
new file mode 100644
index 00000000000000..9453abe54de660
--- /dev/null
+++ b/src/core/public/chrome/doc_title/doc_title_service.ts
@@ -0,0 +1,105 @@
+/*
+ * 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 { compact, flattenDeep, isString } from 'lodash';
+
+interface StartDeps {
+  document: { title: string };
+}
+
+/**
+ * APIs for accessing and updating the document title.
+ *
+ * @example
+ * How to change the title of the document
+ * ```ts
+ * chrome.docTitle.change('My application')
+ * ```
+ *
+ * @example
+ * How to reset the title of the document to it's initial value
+ * ```ts
+ * chrome.docTitle.reset()
+ * ```
+ *
+ * @public
+ * */
+export interface ChromeDocTitle {
+  /**
+   * Changes the current document title.
+   *
+   * @example
+   * How to change the title of the document
+   * ```ts
+   * chrome.docTitle.change('My application title')
+   * chrome.docTitle.change(['My application', 'My section'])
+   * ```
+   *
+   * @param newTitle The new title to set, either a string or string array
+   */
+  change(newTitle: string | string[]): void;
+  /**
+   * Resets the document title to it's initial value.
+   * (meaning the one present in the title meta at application load.)
+   */
+  reset(): void;
+
+  /** @internal */
+  __legacy: {
+    setBaseTitle(baseTitle: string): void;
+  };
+}
+
+const defaultTitle: string[] = [];
+const titleSeparator = ' - ';
+
+/** @internal */
+export class DocTitleService {
+  private document = { title: '' };
+  private baseTitle = '';
+
+  public start({ document }: StartDeps): ChromeDocTitle {
+    this.document = document;
+    this.baseTitle = document.title;
+
+    return {
+      change: (title: string | string[]) => {
+        this.applyTitle(title);
+      },
+      reset: () => {
+        this.applyTitle(defaultTitle);
+      },
+      __legacy: {
+        setBaseTitle: baseTitle => {
+          this.baseTitle = baseTitle;
+        },
+      },
+    };
+  }
+
+  private applyTitle(title: string | string[]) {
+    this.document.title = this.render(title);
+  }
+
+  private render(title: string | string[]) {
+    const parts = [...(isString(title) ? [title] : title), this.baseTitle];
+    // ensuring compat with legacy that might be passing nested arrays
+    return compact(flattenDeep(parts)).join(titleSeparator);
+  }
+}
diff --git a/src/core/public/chrome/doc_title/index.ts b/src/core/public/chrome/doc_title/index.ts
new file mode 100644
index 00000000000000..b070d01953f7ab
--- /dev/null
+++ b/src/core/public/chrome/doc_title/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './doc_title_service';
diff --git a/src/core/public/chrome/index.ts b/src/core/public/chrome/index.ts
index 6e03f9e023983f..b220a81f775f8d 100644
--- a/src/core/public/chrome/index.ts
+++ b/src/core/public/chrome/index.ts
@@ -29,3 +29,4 @@ export {
 export { ChromeNavLink, ChromeNavLinks, ChromeNavLinkUpdateableFields } from './nav_links';
 export { ChromeRecentlyAccessed, ChromeRecentlyAccessedHistoryItem } from './recently_accessed';
 export { ChromeNavControl, ChromeNavControls } from './nav_controls';
+export { ChromeDocTitle } from './doc_title';
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index bc723de06f2159..3ddbe420ba2842 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -171,7 +171,7 @@ interface Props {
   navLinks$: Rx.Observable<ChromeNavLink[]>;
   recentlyAccessed$: Rx.Observable<ChromeRecentlyAccessedHistoryItem[]>;
   forceAppSwitcherNavigation$: Rx.Observable<boolean>;
-  helpExtension$: Rx.Observable<ChromeHelpExtension>;
+  helpExtension$: Rx.Observable<ChromeHelpExtension | undefined>;
   legacyMode: boolean;
   navControlsLeft$: Rx.Observable<readonly ChromeNavControl[]>;
   navControlsRight$: Rx.Observable<readonly ChromeNavControl[]>;
diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx
index e2146f8d65bbae..688d76c9d75d9c 100644
--- a/src/core/public/chrome/ui/header/header_help_menu.tsx
+++ b/src/core/public/chrome/ui/header/header_help_menu.tsx
@@ -43,7 +43,7 @@ import { HeaderExtension } from './header_extension';
 import { ChromeHelpExtension } from '../../chrome_service';
 
 interface Props {
-  helpExtension$: Rx.Observable<ChromeHelpExtension>;
+  helpExtension$: Rx.Observable<ChromeHelpExtension | undefined>;
   intl: InjectedIntl;
   kibanaVersion: string;
   useDefaultContent?: boolean;
diff --git a/src/core/public/core_system.test.mocks.ts b/src/core/public/core_system.test.mocks.ts
index d2494badfacdb5..75ab6cdb628f79 100644
--- a/src/core/public/core_system.test.mocks.ts
+++ b/src/core/public/core_system.test.mocks.ts
@@ -31,6 +31,7 @@ import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 import { docLinksServiceMock } from './doc_links/doc_links_service.mock';
 import { renderingServiceMock } from './rendering/rendering_service.mock';
 import { contextServiceMock } from './context/context_service.mock';
+import { integrationsServiceMock } from './integrations/integrations_service.mock';
 
 export const MockLegacyPlatformService = legacyPlatformServiceMock.create();
 export const LegacyPlatformServiceConstructor = jest
@@ -127,3 +128,11 @@ export const ContextServiceConstructor = jest.fn().mockImplementation(() => Mock
 jest.doMock('./context', () => ({
   ContextService: ContextServiceConstructor,
 }));
+
+export const MockIntegrationsService = integrationsServiceMock.create();
+export const IntegrationsServiceConstructor = jest
+  .fn()
+  .mockImplementation(() => MockIntegrationsService);
+jest.doMock('./integrations', () => ({
+  IntegrationsService: IntegrationsServiceConstructor,
+}));
diff --git a/src/core/public/core_system.test.ts b/src/core/public/core_system.test.ts
index ec6f020a3490b0..d78504a899a345 100644
--- a/src/core/public/core_system.test.ts
+++ b/src/core/public/core_system.test.ts
@@ -42,6 +42,8 @@ import {
   MockRenderingService,
   RenderingServiceConstructor,
   MockContextService,
+  IntegrationsServiceConstructor,
+  MockIntegrationsService,
 } from './core_system.test.mocks';
 
 import { CoreSystem } from './core_system';
@@ -86,6 +88,7 @@ describe('constructor', () => {
     expect(ChromeServiceConstructor).toHaveBeenCalledTimes(1);
     expect(OverlayServiceConstructor).toHaveBeenCalledTimes(1);
     expect(RenderingServiceConstructor).toHaveBeenCalledTimes(1);
+    expect(IntegrationsServiceConstructor).toHaveBeenCalledTimes(1);
   });
 
   it('passes injectedMetadata param to InjectedMetadataService', () => {
@@ -213,6 +216,11 @@ describe('#setup()', () => {
     await setupCore();
     expect(MockPluginsService.setup).toHaveBeenCalledTimes(1);
   });
+
+  it('calls integrations#setup()', async () => {
+    await setupCore();
+    expect(MockIntegrationsService.setup).toHaveBeenCalledTimes(1);
+  });
 });
 
 describe('#start()', () => {
@@ -296,6 +304,11 @@ describe('#start()', () => {
       targetDomElement: expect.any(HTMLElement),
     });
   });
+
+  it('calls start#setup()', async () => {
+    await startCore();
+    expect(MockIntegrationsService.start).toHaveBeenCalledTimes(1);
+  });
 });
 
 describe('#stop()', () => {
@@ -346,6 +359,14 @@ describe('#stop()', () => {
     expect(MockI18nService.stop).toHaveBeenCalled();
   });
 
+  it('calls integrations.stop()', () => {
+    const coreSystem = createCoreSystem();
+
+    expect(MockIntegrationsService.stop).not.toHaveBeenCalled();
+    coreSystem.stop();
+    expect(MockIntegrationsService.stop).toHaveBeenCalled();
+  });
+
   it('clears the rootDomElement', async () => {
     const rootDomElement = document.createElement('div');
     const coreSystem = createCoreSystem({
diff --git a/src/core/public/core_system.ts b/src/core/public/core_system.ts
index 71e9c39df7aae2..2404459ad13834 100644
--- a/src/core/public/core_system.ts
+++ b/src/core/public/core_system.ts
@@ -41,8 +41,9 @@ import { ApplicationService } from './application';
 import { mapToObject, pick } from '../utils/';
 import { DocLinksService } from './doc_links';
 import { RenderingService } from './rendering';
-import { SavedObjectsService } from './saved_objects/saved_objects_service';
+import { SavedObjectsService } from './saved_objects';
 import { ContextService } from './context';
+import { IntegrationsService } from './integrations';
 import { InternalApplicationSetup, InternalApplicationStart } from './application/types';
 
 interface Params {
@@ -98,6 +99,7 @@ export class CoreSystem {
   private readonly docLinks: DocLinksService;
   private readonly rendering: RenderingService;
   private readonly context: ContextService;
+  private readonly integrations: IntegrationsService;
 
   private readonly rootDomElement: HTMLElement;
   private readonly coreContext: CoreContext;
@@ -134,6 +136,7 @@ export class CoreSystem {
     this.docLinks = new DocLinksService();
     this.rendering = new RenderingService();
     this.application = new ApplicationService();
+    this.integrations = new IntegrationsService();
 
     this.coreContext = { coreId: Symbol('core'), env: injectedMetadata.env };
 
@@ -155,6 +158,7 @@ export class CoreSystem {
         injectedMetadata,
         i18n: this.i18n.getContext(),
       });
+      await this.integrations.setup();
       const http = this.http.setup({ injectedMetadata, fatalErrors: this.fatalErrorsSetup });
       const uiSettings = this.uiSettings.setup({ http, injectedMetadata });
       const notifications = this.notifications.setup({ uiSettings });
@@ -211,6 +215,7 @@ export class CoreSystem {
       const savedObjects = await this.savedObjects.start({ http });
       const i18n = await this.i18n.start();
       const application = await this.application.start({ http, injectedMetadata });
+      await this.integrations.start({ uiSettings });
 
       const coreUiTargetDomElement = document.createElement('div');
       coreUiTargetDomElement.id = 'kibana-body';
@@ -297,6 +302,7 @@ export class CoreSystem {
     this.plugins.stop();
     this.notifications.stop();
     this.http.stop();
+    this.integrations.stop();
     this.uiSettings.stop();
     this.chrome.stop();
     this.i18n.stop();
diff --git a/src/core/public/http/anonymous_paths.test.ts b/src/core/public/http/anonymous_paths.test.ts
new file mode 100644
index 00000000000000..bf9212f625f1e4
--- /dev/null
+++ b/src/core/public/http/anonymous_paths.test.ts
@@ -0,0 +1,107 @@
+/*
+ * 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 { AnonymousPaths } from './anonymous_paths';
+import { BasePath } from './base_path_service';
+
+describe('#register', () => {
+  it(`allows paths that don't start with /`, () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('bar');
+  });
+
+  it(`allows paths that end with '/'`, () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/bar/');
+  });
+});
+
+describe('#isAnonymous', () => {
+  it('returns true for registered paths', () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/bar');
+    expect(anonymousPaths.isAnonymous('/foo/bar')).toBe(true);
+  });
+
+  it('returns true for paths registered with a trailing slash, but call "isAnonymous" with no trailing slash', () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/bar/');
+    expect(anonymousPaths.isAnonymous('/foo/bar')).toBe(true);
+  });
+
+  it('returns true for paths registered without a trailing slash, but call "isAnonymous" with a trailing slash', () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/bar');
+    expect(anonymousPaths.isAnonymous('/foo/bar/')).toBe(true);
+  });
+
+  it('returns true for paths registered without a starting slash', () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('bar');
+    expect(anonymousPaths.isAnonymous('/foo/bar')).toBe(true);
+  });
+
+  it('returns true for paths registered with a starting slash', () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/bar');
+    expect(anonymousPaths.isAnonymous('/foo/bar')).toBe(true);
+  });
+
+  it('when there is no basePath and calling "isAnonymous" without a starting slash, returns true for paths registered with a starting slash', () => {
+    const basePath = new BasePath('/');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/bar');
+    expect(anonymousPaths.isAnonymous('bar')).toBe(true);
+  });
+
+  it('when there is no basePath and calling "isAnonymous" with a starting slash, returns true for paths registered with a starting slash', () => {
+    const basePath = new BasePath('/');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/bar');
+    expect(anonymousPaths.isAnonymous('/bar')).toBe(true);
+  });
+
+  it('returns true for paths whose capitalization is different', () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/BAR');
+    expect(anonymousPaths.isAnonymous('/foo/bar')).toBe(true);
+  });
+
+  it('returns false for other paths', () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/bar');
+    expect(anonymousPaths.isAnonymous('/foo/foo')).toBe(false);
+  });
+
+  it('returns false for sub-paths of registered paths', () => {
+    const basePath = new BasePath('/foo');
+    const anonymousPaths = new AnonymousPaths(basePath);
+    anonymousPaths.register('/bar');
+    expect(anonymousPaths.isAnonymous('/foo/bar/baz')).toBe(false);
+  });
+});
diff --git a/src/core/public/http/anonymous_paths.ts b/src/core/public/http/anonymous_paths.ts
new file mode 100644
index 00000000000000..300c4d64df353c
--- /dev/null
+++ b/src/core/public/http/anonymous_paths.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 { IAnonymousPaths, IBasePath } from 'src/core/public';
+
+export class AnonymousPaths implements IAnonymousPaths {
+  private readonly paths = new Set<string>();
+
+  constructor(private basePath: IBasePath) {}
+
+  public isAnonymous(path: string): boolean {
+    const pathWithoutBasePath = this.basePath.remove(path);
+    return this.paths.has(this.normalizePath(pathWithoutBasePath));
+  }
+
+  public register(path: string) {
+    this.paths.add(this.normalizePath(path));
+  }
+
+  private normalizePath(path: string) {
+    // always lower-case it
+    let normalized = path.toLowerCase();
+
+    // remove the slash from the end
+    if (normalized.endsWith('/')) {
+      normalized = normalized.slice(0, normalized.length - 1);
+    }
+
+    // put a slash at the start
+    if (!normalized.startsWith('/')) {
+      normalized = `/${normalized}`;
+    }
+
+    // it's normalized!!!
+    return normalized;
+  }
+}
diff --git a/src/core/public/http/http_service.mock.ts b/src/core/public/http/http_service.mock.ts
index a94543414acfaa..52f188c7b20a0a 100644
--- a/src/core/public/http/http_service.mock.ts
+++ b/src/core/public/http/http_service.mock.ts
@@ -20,9 +20,11 @@
 import { HttpService } from './http_service';
 import { HttpSetup } from './types';
 import { BehaviorSubject } from 'rxjs';
+import { BasePath } from './base_path_service';
+import { AnonymousPaths } from './anonymous_paths';
 
 type ServiceSetupMockType = jest.Mocked<HttpSetup> & {
-  basePath: jest.Mocked<HttpSetup['basePath']>;
+  basePath: BasePath;
 };
 
 const createServiceMock = ({ basePath = '' } = {}): ServiceSetupMockType => ({
@@ -34,11 +36,8 @@ const createServiceMock = ({ basePath = '' } = {}): ServiceSetupMockType => ({
   patch: jest.fn(),
   delete: jest.fn(),
   options: jest.fn(),
-  basePath: {
-    get: jest.fn(() => basePath),
-    prepend: jest.fn(path => `${basePath}${path}`),
-    remove: jest.fn(),
-  },
+  basePath: new BasePath(basePath),
+  anonymousPaths: new AnonymousPaths(new BasePath(basePath)),
   addLoadingCount: jest.fn(),
   getLoadingCount$: jest.fn().mockReturnValue(new BehaviorSubject(0)),
   stop: jest.fn(),
diff --git a/src/core/public/http/http_setup.ts b/src/core/public/http/http_setup.ts
index a10358926de1fd..602382e3a5a60e 100644
--- a/src/core/public/http/http_setup.ts
+++ b/src/core/public/http/http_setup.ts
@@ -36,6 +36,7 @@ import { HttpInterceptController } from './http_intercept_controller';
 import { HttpFetchError } from './http_fetch_error';
 import { HttpInterceptHaltError } from './http_intercept_halt_error';
 import { BasePath } from './base_path_service';
+import { AnonymousPaths } from './anonymous_paths';
 
 const JSON_CONTENT = /^(application\/(json|x-javascript)|text\/(x-)?javascript|x-json)(;.*)?$/;
 const NDJSON_CONTENT = /^(application\/ndjson)(;.*)?$/;
@@ -57,6 +58,7 @@ export const setup = (
   const interceptors = new Set<HttpInterceptor>();
   const kibanaVersion = injectedMetadata.getKibanaVersion();
   const basePath = new BasePath(injectedMetadata.getBasePath());
+  const anonymousPaths = new AnonymousPaths(basePath);
 
   function intercept(interceptor: HttpInterceptor) {
     interceptors.add(interceptor);
@@ -318,6 +320,7 @@ export const setup = (
   return {
     stop,
     basePath,
+    anonymousPaths,
     intercept,
     removeAllInterceptors,
     fetch,
diff --git a/src/core/public/http/types.ts b/src/core/public/http/types.ts
index 96500d566b3e53..870d4af8f9e861 100644
--- a/src/core/public/http/types.ts
+++ b/src/core/public/http/types.ts
@@ -29,6 +29,11 @@ export interface HttpServiceBase {
    */
   basePath: IBasePath;
 
+  /**
+   * APIs for denoting certain paths for not requiring authentication
+   */
+  anonymousPaths: IAnonymousPaths;
+
   /**
    * Adds a new {@link HttpInterceptor} to the global HTTP client.
    * @param interceptor a {@link HttpInterceptor}
@@ -92,6 +97,21 @@ export interface IBasePath {
   remove: (url: string) => string;
 }
 
+/**
+ * APIs for denoting paths as not requiring authentication
+ */
+export interface IAnonymousPaths {
+  /**
+   * Determines whether the provided path doesn't require authentication. `path` should include the current basePath.
+   */
+  isAnonymous(path: string): boolean;
+
+  /**
+   * Register `path` as not requiring authentication. `path` should not include the current basePath.
+   */
+  register(path: string): void;
+}
+
 /**
  * See {@link HttpServiceBase}
  * @public
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index 3d8714a0011586..7391cf7f9454cc 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -45,6 +45,7 @@ import {
   ChromeNavLink,
   ChromeNavLinks,
   ChromeNavLinkUpdateableFields,
+  ChromeDocTitle,
   ChromeStart,
   ChromeRecentlyAccessed,
   ChromeRecentlyAccessedHistoryItem,
@@ -110,6 +111,7 @@ export {
   HttpHandler,
   HttpBody,
   IBasePath,
+  IAnonymousPaths,
   IHttpInterceptController,
   IHttpFetchError,
   InterceptedHttpResponse,
@@ -249,6 +251,7 @@ export {
   ChromeNavLink,
   ChromeNavLinks,
   ChromeNavLinkUpdateableFields,
+  ChromeDocTitle,
   ChromeRecentlyAccessed,
   ChromeRecentlyAccessedHistoryItem,
   ChromeStart,
diff --git a/src/core/public/injected_metadata/injected_metadata_service.ts b/src/core/public/injected_metadata/injected_metadata_service.ts
index 478285a70771ef..a5342aaa48b723 100644
--- a/src/core/public/injected_metadata/injected_metadata_service.ts
+++ b/src/core/public/injected_metadata/injected_metadata_service.ts
@@ -19,8 +19,12 @@
 
 import { get } from 'lodash';
 import { DiscoveredPlugin, PluginName } from '../../server';
-import { EnvironmentMode, PackageInfo } from '../../server/types';
-import { UiSettingsState } from '../ui_settings';
+import {
+  EnvironmentMode,
+  PackageInfo,
+  UiSettingsParams,
+  UserProvidedValues,
+} from '../../server/types';
 import { deepFreeze } from '../../utils/';
 import { Capabilities } from '..';
 
@@ -69,8 +73,8 @@ export interface InjectedMetadataParams {
       serverName: string;
       devMode: boolean;
       uiSettings: {
-        defaults: UiSettingsState;
-        user?: UiSettingsState;
+        defaults: Record<string, UiSettingsParams>;
+        user?: Record<string, UserProvidedValues>;
       };
     };
   };
@@ -179,8 +183,8 @@ export interface InjectedMetadataSetup {
     serverName: string;
     devMode: boolean;
     uiSettings: {
-      defaults: UiSettingsState;
-      user?: UiSettingsState | undefined;
+      defaults: Record<string, UiSettingsParams>;
+      user?: Record<string, UserProvidedValues> | undefined;
     };
   };
   getInjectedVar: (name: string, defaultValue?: any) => unknown;
diff --git a/src/core/public/integrations/index.ts b/src/core/public/integrations/index.ts
new file mode 100644
index 00000000000000..efa94560933599
--- /dev/null
+++ b/src/core/public/integrations/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { IntegrationsService } from './integrations_service';
diff --git a/src/core/public/integrations/integrations_service.mock.ts b/src/core/public/integrations/integrations_service.mock.ts
new file mode 100644
index 00000000000000..4f6ca0fb684597
--- /dev/null
+++ b/src/core/public/integrations/integrations_service.mock.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IntegrationsService } from './integrations_service';
+
+type IntegrationsServiceContract = PublicMethodsOf<IntegrationsService>;
+const createMock = (): jest.Mocked<IntegrationsServiceContract> => ({
+  setup: jest.fn(),
+  start: jest.fn(),
+  stop: jest.fn(),
+});
+
+export const integrationsServiceMock = {
+  create: createMock,
+};
diff --git a/src/core/public/integrations/integrations_service.test.mocks.ts b/src/core/public/integrations/integrations_service.test.mocks.ts
new file mode 100644
index 00000000000000..82535724565a71
--- /dev/null
+++ b/src/core/public/integrations/integrations_service.test.mocks.ts
@@ -0,0 +1,38 @@
+/*
+ * 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 { CoreService } from '../../types';
+
+const createCoreServiceMock = (): jest.Mocked<CoreService> => {
+  return {
+    setup: jest.fn(),
+    start: jest.fn(),
+    stop: jest.fn(),
+  };
+};
+
+export const styleServiceMock = createCoreServiceMock();
+jest.doMock('./styles', () => ({
+  StylesService: jest.fn(() => styleServiceMock),
+}));
+
+export const momentServiceMock = createCoreServiceMock();
+jest.doMock('./moment', () => ({
+  MomentService: jest.fn(() => momentServiceMock),
+}));
diff --git a/src/core/public/integrations/integrations_service.test.ts b/src/core/public/integrations/integrations_service.test.ts
new file mode 100644
index 00000000000000..03784c92e12abc
--- /dev/null
+++ b/src/core/public/integrations/integrations_service.test.ts
@@ -0,0 +1,42 @@
+/*
+ * 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 { styleServiceMock, momentServiceMock } from './integrations_service.test.mocks';
+
+import { IntegrationsService } from './integrations_service';
+import { uiSettingsServiceMock } from '../ui_settings/ui_settings_service.mock';
+
+describe('IntegrationsService', () => {
+  test('it wires up styles and moment', async () => {
+    const uiSettings = uiSettingsServiceMock.createStartContract();
+    const service = new IntegrationsService();
+
+    await service.setup();
+    expect(styleServiceMock.setup).toHaveBeenCalledWith();
+    expect(momentServiceMock.setup).toHaveBeenCalledWith();
+
+    await service.start({ uiSettings });
+    expect(styleServiceMock.start).toHaveBeenCalledWith({ uiSettings });
+    expect(momentServiceMock.start).toHaveBeenCalledWith({ uiSettings });
+
+    await service.stop();
+    expect(styleServiceMock.stop).toHaveBeenCalledWith();
+    expect(momentServiceMock.stop).toHaveBeenCalledWith();
+  });
+});
diff --git a/src/core/public/integrations/integrations_service.ts b/src/core/public/integrations/integrations_service.ts
new file mode 100644
index 00000000000000..5d5c31c2df18ce
--- /dev/null
+++ b/src/core/public/integrations/integrations_service.ts
@@ -0,0 +1,49 @@
+/*
+ * 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 { UiSettingsClientContract } from '../ui_settings';
+import { CoreService } from '../../types';
+
+import { MomentService } from './moment';
+import { StylesService } from './styles';
+
+interface Deps {
+  uiSettings: UiSettingsClientContract;
+}
+
+/** @internal */
+export class IntegrationsService implements CoreService {
+  private readonly styles = new StylesService();
+  private readonly moment = new MomentService();
+
+  public async setup() {
+    await this.styles.setup();
+    await this.moment.setup();
+  }
+
+  public async start({ uiSettings }: Deps) {
+    await this.styles.start({ uiSettings });
+    await this.moment.start({ uiSettings });
+  }
+
+  public async stop() {
+    await this.styles.stop();
+    await this.moment.stop();
+  }
+}
diff --git a/src/core/public/integrations/moment/index.ts b/src/core/public/integrations/moment/index.ts
new file mode 100644
index 00000000000000..9c7c140bff64dd
--- /dev/null
+++ b/src/core/public/integrations/moment/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { MomentService } from './moment_service';
diff --git a/src/core/public/integrations/moment/moment_service.test.mocks.ts b/src/core/public/integrations/moment/moment_service.test.mocks.ts
new file mode 100644
index 00000000000000..2fa013a6bf1321
--- /dev/null
+++ b/src/core/public/integrations/moment/moment_service.test.mocks.ts
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const momentMock = {
+  locale: jest.fn(() => 'default-locale'),
+  tz: {
+    setDefault: jest.fn(),
+  },
+  weekdays: jest.fn(() => ['dow1', 'dow2', 'dow3']),
+  updateLocale: jest.fn(),
+};
+jest.doMock('moment-timezone', () => momentMock);
diff --git a/src/core/public/integrations/moment/moment_service.test.ts b/src/core/public/integrations/moment/moment_service.test.ts
new file mode 100644
index 00000000000000..c9b4479f2f1636
--- /dev/null
+++ b/src/core/public/integrations/moment/moment_service.test.ts
@@ -0,0 +1,71 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { momentMock } from './moment_service.test.mocks';
+import { MomentService } from './moment_service';
+import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.mock';
+import { BehaviorSubject } from 'rxjs';
+
+describe('MomentService', () => {
+  let service: MomentService;
+  beforeEach(() => {
+    momentMock.tz.setDefault.mockClear();
+    momentMock.weekdays.mockClear();
+    momentMock.updateLocale.mockClear();
+    service = new MomentService();
+  });
+  afterEach(() => service.stop());
+
+  const flushPromises = () => new Promise(resolve => setTimeout(resolve, 100));
+
+  test('sets initial moment config', async () => {
+    const tz$ = new BehaviorSubject('tz1');
+    const dow$ = new BehaviorSubject('dow1');
+
+    const uiSettings = uiSettingsServiceMock.createSetupContract();
+    uiSettings.get$.mockReturnValueOnce(tz$).mockReturnValueOnce(dow$);
+
+    service.start({ uiSettings });
+    await flushPromises();
+    expect(momentMock.tz.setDefault).toHaveBeenCalledWith('tz1');
+    expect(momentMock.updateLocale).toHaveBeenCalledWith('default-locale', { week: { dow: 0 } });
+  });
+
+  test('updates moment config', async () => {
+    const tz$ = new BehaviorSubject('tz1');
+    const dow$ = new BehaviorSubject('dow1');
+
+    const uiSettings = uiSettingsServiceMock.createSetupContract();
+    uiSettings.get$.mockReturnValueOnce(tz$).mockReturnValueOnce(dow$);
+
+    service.start({ uiSettings });
+    tz$.next('tz2');
+    tz$.next('tz3');
+    dow$.next('dow3');
+    dow$.next('dow2');
+
+    await flushPromises();
+    expect(momentMock.tz.setDefault.mock.calls).toEqual([['tz1'], ['tz2'], ['tz3']]);
+    expect(momentMock.updateLocale.mock.calls).toEqual([
+      ['default-locale', { week: { dow: 0 } }],
+      ['default-locale', { week: { dow: 2 } }],
+      ['default-locale', { week: { dow: 1 } }],
+    ]);
+  });
+});
diff --git a/src/core/public/integrations/moment/moment_service.ts b/src/core/public/integrations/moment/moment_service.ts
new file mode 100644
index 00000000000000..2714750d9a65ed
--- /dev/null
+++ b/src/core/public/integrations/moment/moment_service.ts
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment-timezone';
+import { merge, Subscription } from 'rxjs';
+
+import { tap } from 'rxjs/operators';
+import { UiSettingsClientContract } from '../../ui_settings';
+import { CoreService } from '../../../types';
+
+interface StartDeps {
+  uiSettings: UiSettingsClientContract;
+}
+
+/** @internal */
+export class MomentService implements CoreService {
+  private uiSettingsSubscription?: Subscription;
+
+  public async setup() {}
+
+  public async start({ uiSettings }: StartDeps) {
+    const setDefaultTimezone = (tz: string) => moment.tz.setDefault(tz);
+    const setStartDayOfWeek = (day: string) => {
+      const dow = moment.weekdays().indexOf(day);
+      moment.updateLocale(moment.locale(), { week: { dow } } as any);
+    };
+
+    this.uiSettingsSubscription = merge(
+      uiSettings.get$('dateFormat:tz').pipe(tap(setDefaultTimezone)),
+      uiSettings.get$('dateFormat:dow').pipe(tap(setStartDayOfWeek))
+    ).subscribe();
+  }
+
+  public async stop() {
+    if (this.uiSettingsSubscription) {
+      this.uiSettingsSubscription.unsubscribe();
+      this.uiSettingsSubscription = undefined;
+    }
+  }
+}
diff --git a/src/legacy/ui/public/styles/disable_animations/disable_animations.css b/src/core/public/integrations/styles/disable_animations.css
similarity index 100%
rename from src/legacy/ui/public/styles/disable_animations/disable_animations.css
rename to src/core/public/integrations/styles/disable_animations.css
diff --git a/src/core/public/integrations/styles/index.ts b/src/core/public/integrations/styles/index.ts
new file mode 100644
index 00000000000000..6021eea8ee10ad
--- /dev/null
+++ b/src/core/public/integrations/styles/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { StylesService } from './styles_service';
diff --git a/src/core/public/integrations/styles/styles_service.test.ts b/src/core/public/integrations/styles/styles_service.test.ts
new file mode 100644
index 00000000000000..e413e9cc2f4d70
--- /dev/null
+++ b/src/core/public/integrations/styles/styles_service.test.ts
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { BehaviorSubject } from 'rxjs';
+
+jest.mock('!!raw-loader!./disable_animations.css', () => 'MOCK DISABLE ANIMATIONS CSS');
+
+import { StylesService } from './styles_service';
+import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.mock';
+
+describe('StylesService', () => {
+  const flushPromises = () => new Promise(resolve => setTimeout(resolve, 100));
+  const getDisableAnimationsTag = () => document.querySelector('style#disableAnimationsCss')!;
+
+  afterEach(() => getDisableAnimationsTag().remove());
+
+  test('sets initial disable animations style', async () => {
+    const disableAnimations$ = new BehaviorSubject(false);
+
+    const uiSettings = uiSettingsServiceMock.createSetupContract();
+    uiSettings.get$.mockReturnValueOnce(disableAnimations$);
+
+    new StylesService().start({ uiSettings });
+    await flushPromises();
+
+    const styleTag = getDisableAnimationsTag();
+    expect(styleTag).toBeDefined();
+    expect(styleTag.textContent).toEqual('');
+  });
+
+  test('updates disable animations style', async () => {
+    const disableAnimations$ = new BehaviorSubject(false);
+
+    const uiSettings = uiSettingsServiceMock.createSetupContract();
+    uiSettings.get$.mockReturnValueOnce(disableAnimations$);
+
+    new StylesService().start({ uiSettings });
+
+    disableAnimations$.next(true);
+    await flushPromises();
+    expect(getDisableAnimationsTag().textContent).toEqual('MOCK DISABLE ANIMATIONS CSS');
+
+    disableAnimations$.next(false);
+    await flushPromises();
+    expect(getDisableAnimationsTag().textContent).toEqual('');
+  });
+});
diff --git a/src/core/public/integrations/styles/styles_service.ts b/src/core/public/integrations/styles/styles_service.ts
new file mode 100644
index 00000000000000..ba8b812fe99889
--- /dev/null
+++ b/src/core/public/integrations/styles/styles_service.ts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Subscription } from 'rxjs';
+
+import { UiSettingsClientContract } from '../../ui_settings';
+import { CoreService } from '../../../types';
+// @ts-ignore
+import disableAnimationsCss from '!!raw-loader!./disable_animations.css';
+
+interface StartDeps {
+  uiSettings: UiSettingsClientContract;
+}
+
+/** @internal */
+export class StylesService implements CoreService {
+  private uiSettingsSubscription?: Subscription;
+
+  public async setup() {}
+
+  public async start({ uiSettings }: StartDeps) {
+    const disableAnimationsStyleTag = document.createElement('style');
+    disableAnimationsStyleTag.setAttribute('id', 'disableAnimationsCss');
+    document.head.appendChild(disableAnimationsStyleTag);
+
+    const setDisableAnimations = (disableAnimations: boolean) => {
+      disableAnimationsStyleTag.textContent = disableAnimations ? disableAnimationsCss : '';
+    };
+
+    this.uiSettingsSubscription = uiSettings
+      .get$('accessibility:disableAnimations')
+      .subscribe(setDisableAnimations);
+  }
+
+  public async stop() {
+    if (this.uiSettingsSubscription) {
+      this.uiSettingsSubscription.unsubscribe();
+      this.uiSettingsSubscription = undefined;
+    }
+  }
+}
diff --git a/src/core/public/mocks.ts b/src/core/public/mocks.ts
index 8345980b6869d6..b9cd2577c22172 100644
--- a/src/core/public/mocks.ts
+++ b/src/core/public/mocks.ts
@@ -18,7 +18,7 @@
  */
 import { applicationServiceMock } from './application/application_service.mock';
 import { chromeServiceMock } from './chrome/chrome_service.mock';
-import { CoreContext, CoreSetup, CoreStart, PluginInitializerContext } from '.';
+import { CoreContext, CoreSetup, CoreStart, PluginInitializerContext, NotificationsSetup } from '.';
 import { docLinksServiceMock } from './doc_links/doc_links_service.mock';
 import { fatalErrorsServiceMock } from './fatal_errors/fatal_errors_service.mock';
 import { httpServiceMock } from './http/http_service.mock';
@@ -41,12 +41,12 @@ export { notificationServiceMock } from './notifications/notifications_service.m
 export { overlayServiceMock } from './overlays/overlay_service.mock';
 export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 
-function createCoreSetupMock() {
-  const mock: MockedKeys<CoreSetup> = {
+function createCoreSetupMock({ basePath = '' } = {}) {
+  const mock: MockedKeys<CoreSetup> & { notifications: MockedKeys<NotificationsSetup> } = {
     application: applicationServiceMock.createSetupContract(),
     context: contextServiceMock.createSetupContract(),
     fatalErrors: fatalErrorsServiceMock.createSetupContract(),
-    http: httpServiceMock.createSetupContract(),
+    http: httpServiceMock.createSetupContract({ basePath }),
     notifications: notificationServiceMock.createSetupContract(),
     uiSettings: uiSettingsServiceMock.createSetupContract(),
     injectedMetadata: {
@@ -57,12 +57,12 @@ function createCoreSetupMock() {
   return mock;
 }
 
-function createCoreStartMock() {
-  const mock: MockedKeys<CoreStart> = {
+function createCoreStartMock({ basePath = '' } = {}) {
+  const mock: MockedKeys<CoreStart> & { notifications: MockedKeys<NotificationsSetup> } = {
     application: applicationServiceMock.createStartContract(),
     chrome: chromeServiceMock.createStartContract(),
     docLinks: docLinksServiceMock.createStartContract(),
-    http: httpServiceMock.createStartContract(),
+    http: httpServiceMock.createStartContract({ basePath }),
     i18n: i18nServiceMock.createStartContract(),
     notifications: notificationServiceMock.createStartContract(),
     overlays: overlayServiceMock.createStartContract(),
diff --git a/src/core/public/notifications/notifications_service.mock.ts b/src/core/public/notifications/notifications_service.mock.ts
index 8f4a1d5bcd4004..464f47e20aa3b0 100644
--- a/src/core/public/notifications/notifications_service.mock.ts
+++ b/src/core/public/notifications/notifications_service.mock.ts
@@ -23,10 +23,8 @@ import {
 } from './notifications_service';
 import { toastsServiceMock } from './toasts/toasts_service.mock';
 
-type DeeplyMocked<T> = { [P in keyof T]: jest.Mocked<T[P]> };
-
 const createSetupContractMock = () => {
-  const setupContract: DeeplyMocked<NotificationsSetup> = {
+  const setupContract: MockedKeys<NotificationsSetup> = {
     // we have to suppress type errors until decide how to mock es6 class
     toasts: toastsServiceMock.createSetupContract(),
   };
@@ -34,7 +32,7 @@ const createSetupContractMock = () => {
 };
 
 const createStartContractMock = () => {
-  const startContract: DeeplyMocked<NotificationsStart> = {
+  const startContract: MockedKeys<NotificationsStart> = {
     // we have to suppress type errors until decide how to mock es6 class
     toasts: toastsServiceMock.createStartContract(),
   };
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index ec8a22fe5953cf..a596ea394abdaf 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -11,6 +11,8 @@ import React from 'react';
 import * as Rx from 'rxjs';
 import { ShallowPromise } from '@kbn/utility-types';
 import { EuiGlobalToastListToast as Toast } from '@elastic/eui';
+import { UiSettingsParams as UiSettingsParams_2 } from 'src/core/server/types';
+import { UserProvidedValues as UserProvidedValues_2 } from 'src/core/server/types';
 
 // @public
 export interface App extends AppBase {
@@ -105,6 +107,16 @@ export interface ChromeBrand {
 // @public (undocumented)
 export type ChromeBreadcrumb = Breadcrumb;
 
+// @public
+export interface ChromeDocTitle {
+    // @internal (undocumented)
+    __legacy: {
+        setBaseTitle(baseTitle: string): void;
+    };
+    change(newTitle: string | string[]): void;
+    reset(): void;
+}
+
 // @public (undocumented)
 export type ChromeHelpExtension = (element: HTMLDivElement) => () => void;
 
@@ -186,6 +198,7 @@ export interface ChromeRecentlyAccessedHistoryItem {
 // @public
 export interface ChromeStart {
     addApplicationClass(className: string): void;
+    docTitle: ChromeDocTitle;
     getApplicationClasses$(): Observable<string[]>;
     getBadge$(): Observable<ChromeBadge | undefined>;
     getBrand$(): Observable<ChromeBrand>;
@@ -488,6 +501,7 @@ export interface HttpResponse extends InterceptedHttpResponse {
 // @public (undocumented)
 export interface HttpServiceBase {
     addLoadingCount(countSource$: Observable<number>): void;
+    anonymousPaths: IAnonymousPaths;
     basePath: IBasePath;
     delete: HttpHandler;
     fetch: HttpHandler;
@@ -517,6 +531,14 @@ export interface I18nStart {
     }) => JSX.Element;
 }
 
+// Warning: (ae-missing-release-tag) "IAnonymousPaths" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// 
+// @public
+export interface IAnonymousPaths {
+    isAnonymous(path: string): boolean;
+    register(path: string): void;
+}
+
 // @public
 export interface IBasePath {
     get: () => string;
@@ -937,7 +959,7 @@ export class UiSettingsClient {
     constructor(params: UiSettingsClientParams);
     get$(key: string, defaultOverride?: any): Rx.Observable<any>;
     get(key: string, defaultOverride?: any): any;
-    getAll(): UiSettingsState;
+    getAll(): Record<string, UiSettingsParams_2 & UserProvidedValues_2<any>>;
     getSaved$(): Rx.Observable<{
         key: string;
         newValue: any;
@@ -959,16 +981,13 @@ export class UiSettingsClient {
     stop(): void;
     }
 
-// @public (undocumented)
+// @public
 export type UiSettingsClientContract = PublicMethodsOf<UiSettingsClient>;
 
 // @public (undocumented)
 export interface UiSettingsState {
-    // Warning: (ae-forgotten-export) The symbol "InjectedUiSettingsDefault" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "InjectedUiSettingsUser" needs to be exported by the entry point index.d.ts
-    // 
     // (undocumented)
-    [key: string]: InjectedUiSettingsDefault & InjectedUiSettingsUser;
+    [key: string]: UiSettingsParams_2 & UserProvidedValues_2;
 }
 
 
diff --git a/src/core/public/rendering/rendering_service.test.tsx b/src/core/public/rendering/rendering_service.test.tsx
index 317ab5cc8b855b..ed835574a32f9c 100644
--- a/src/core/public/rendering/rendering_service.test.tsx
+++ b/src/core/public/rendering/rendering_service.test.tsx
@@ -34,7 +34,7 @@ describe('RenderingService#start', () => {
     const chrome = chromeServiceMock.createStartContract();
     chrome.getHeaderComponent.mockReturnValue(<div>Hello chrome!</div>);
     const overlays = overlayServiceMock.createStartContract();
-    overlays.banners.getComponent.mockReturnValue(<div>I'm a banner!</div>);
+    overlays.banners.getComponent.mockReturnValue(<div>I&apos;m a banner!</div>);
 
     const injectedMetadata = injectedMetadataServiceMock.createStartContract();
     injectedMetadata.getLegacyMode.mockReturnValue(legacyMode);
diff --git a/src/core/public/saved_objects/index.ts b/src/core/public/saved_objects/index.ts
index 74d33c506db48d..453c3e42a1687b 100644
--- a/src/core/public/saved_objects/index.ts
+++ b/src/core/public/saved_objects/index.ts
@@ -30,7 +30,7 @@ export {
   SavedObjectsBulkUpdateOptions,
 } from './saved_objects_client';
 export { SimpleSavedObject } from './simple_saved_object';
-export { SavedObjectsStart } from './saved_objects_service';
+export { SavedObjectsStart, SavedObjectsService } from './saved_objects_service';
 export {
   SavedObject,
   SavedObjectAttribute,
diff --git a/src/core/public/ui_settings/__snapshots__/ui_settings_service.test.ts.snap b/src/core/public/ui_settings/__snapshots__/ui_settings_service.test.ts.snap
index f607c924a9e683..84f9a5ab7c5cd3 100644
--- a/src/core/public/ui_settings/__snapshots__/ui_settings_service.test.ts.snap
+++ b/src/core/public/ui_settings/__snapshots__/ui_settings_service.test.ts.snap
@@ -20,10 +20,20 @@ exports[`#setup constructs UiSettingsClient and UiSettingsApi: UiSettingsApi arg
             },
           ],
         },
-        "basePath": Object {
-          "get": [MockFunction],
-          "prepend": [MockFunction],
-          "remove": [MockFunction],
+        "anonymousPaths": AnonymousPaths {
+          "basePath": BasePath {
+            "basePath": "",
+            "get": [Function],
+            "prepend": [Function],
+            "remove": [Function],
+          },
+          "paths": Set {},
+        },
+        "basePath": BasePath {
+          "basePath": "",
+          "get": [Function],
+          "prepend": [Function],
+          "remove": [Function],
         },
         "delete": [MockFunction],
         "fetch": [MockFunction],
diff --git a/src/core/public/ui_settings/types.ts b/src/core/public/ui_settings/types.ts
index d1cf25c3e9e6f5..24e87eb04f0264 100644
--- a/src/core/public/ui_settings/types.ts
+++ b/src/core/public/ui_settings/types.ts
@@ -17,28 +17,9 @@
  * under the License.
  */
 
-// properties that come from legacyInjectedMetadata.uiSettings.defaults
-interface InjectedUiSettingsDefault {
-  name?: string;
-  value?: any;
-  description?: string;
-  category?: string[];
-  type?: string;
-  readOnly?: boolean;
-  options?: string[] | { [key: string]: any };
-  /**
-   * Whether a change in that setting will only take affect after a page reload.
-   */
-  requiresPageReload?: boolean;
-}
-
-// properties that come from legacyInjectedMetadata.uiSettings.user
-interface InjectedUiSettingsUser {
-  userValue?: any;
-  isOverridden?: boolean;
-}
+import { UiSettingsParams, UserProvidedValues } from 'src/core/server/types';
 
 /** @public */
 export interface UiSettingsState {
-  [key: string]: InjectedUiSettingsDefault & InjectedUiSettingsUser;
+  [key: string]: UiSettingsParams & UserProvidedValues;
 }
diff --git a/src/core/public/ui_settings/ui_settings_client.ts b/src/core/public/ui_settings/ui_settings_client.ts
index 3083851dd453d5..c3190847130d5e 100644
--- a/src/core/public/ui_settings/ui_settings_client.ts
+++ b/src/core/public/ui_settings/ui_settings_client.ts
@@ -21,18 +21,25 @@ import { cloneDeep, defaultsDeep } from 'lodash';
 import * as Rx from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
+import { UiSettingsParams, UserProvidedValues } from 'src/core/server/types';
 import { UiSettingsState } from './types';
+
 import { UiSettingsApi } from './ui_settings_api';
 
 /** @public */
 interface UiSettingsClientParams {
   api: UiSettingsApi;
-  defaults: UiSettingsState;
+  defaults: Record<string, UiSettingsParams>;
   initialSettings?: UiSettingsState;
 }
 
 /**
+ * Client-side client that provides access to the advanced settings stored in elasticsearch.
+ * The settings provide control over the behavior of the Kibana application.
+ * For example, a user can specify how to display numeric or date fields.
+ * Users can adjust the settings via Management UI.
  * {@link UiSettingsClient}
+ *
  * @public
  */
 export type UiSettingsClientContract = PublicMethodsOf<UiSettingsClient>;
@@ -44,8 +51,8 @@ export class UiSettingsClient {
   private readonly updateErrors$ = new Rx.Subject<Error>();
 
   private readonly api: UiSettingsApi;
-  private readonly defaults: UiSettingsState;
-  private cache: UiSettingsState;
+  private readonly defaults: Record<string, UiSettingsParams>;
+  private cache: Record<string, UiSettingsParams & UserProvidedValues>;
 
   constructor(params: UiSettingsClientParams) {
     this.api = params.api;
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.ts b/src/core/server/elasticsearch/elasticsearch_config.test.ts
index 1a6a8929cd6a0b..383ba77f177799 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.test.ts
@@ -22,32 +22,33 @@ import { ElasticsearchConfig, config } from './elasticsearch_config';
 test('set correct defaults', () => {
   const configValue = new ElasticsearchConfig(config.schema.validate({}));
   expect(configValue).toMatchInlineSnapshot(`
-ElasticsearchConfig {
-  "apiVersion": "master",
-  "customHeaders": Object {},
-  "healthCheckDelay": "PT2.5S",
-  "hosts": Array [
-    "http://localhost:9200",
-  ],
-  "logQueries": false,
-  "password": undefined,
-  "pingTimeout": "PT30S",
-  "requestHeadersWhitelist": Array [
-    "authorization",
-  ],
-  "requestTimeout": "PT30S",
-  "shardTimeout": "PT30S",
-  "sniffInterval": false,
-  "sniffOnConnectionFault": false,
-  "sniffOnStart": false,
-  "ssl": Object {
-    "alwaysPresentCertificate": true,
-    "certificateAuthorities": undefined,
-    "verificationMode": "full",
-  },
-  "username": undefined,
-}
-`);
+    ElasticsearchConfig {
+      "apiVersion": "master",
+      "customHeaders": Object {},
+      "healthCheckDelay": "PT2.5S",
+      "hosts": Array [
+        "http://localhost:9200",
+      ],
+      "ignoreVersionMismatch": false,
+      "logQueries": false,
+      "password": undefined,
+      "pingTimeout": "PT30S",
+      "requestHeadersWhitelist": Array [
+        "authorization",
+      ],
+      "requestTimeout": "PT30S",
+      "shardTimeout": "PT30S",
+      "sniffInterval": false,
+      "sniffOnConnectionFault": false,
+      "sniffOnStart": false,
+      "ssl": Object {
+        "alwaysPresentCertificate": true,
+        "certificateAuthorities": undefined,
+        "verificationMode": "full",
+      },
+      "username": undefined,
+    }
+  `);
 });
 
 test('#hosts accepts both string and array of strings', () => {
diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
index fb585a8d672627..947a0d27546b12 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -65,6 +65,7 @@ export const config = {
     }),
     apiVersion: schema.string({ defaultValue: DEFAULT_API_VERSION }),
     healthCheck: schema.object({ delay: schema.duration({ defaultValue: 2500 }) }),
+    ignoreVersionMismatch: schema.boolean({ defaultValue: false }),
   }),
 };
 
@@ -74,6 +75,11 @@ export class ElasticsearchConfig {
    */
   public readonly healthCheckDelay: Duration;
 
+  /**
+   * Whether to allow kibana to connect to a non-compatible elasticsearch node.
+   */
+  public readonly ignoreVersionMismatch: boolean;
+
   /**
    * Version of the Elasticsearch (6.7, 7.1 or `master`) client will be connecting to.
    */
@@ -161,6 +167,7 @@ export class ElasticsearchConfig {
   public readonly customHeaders: ElasticsearchConfigType['customHeaders'];
 
   constructor(rawConfig: ElasticsearchConfigType) {
+    this.ignoreVersionMismatch = rawConfig.ignoreVersionMismatch;
     this.apiVersion = rawConfig.apiVersion;
     this.logQueries = rawConfig.logQueries;
     this.hosts = Array.isArray(rawConfig.hosts) ? rawConfig.hosts : [rawConfig.hosts];
diff --git a/src/core/server/elasticsearch/elasticsearch_service.test.ts b/src/core/server/elasticsearch/elasticsearch_service.test.ts
index 58fe2b52727efd..6c4a1f263bc713 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.test.ts
@@ -174,11 +174,55 @@ Object {
     undefined,
   ],
   "ssl": Object {
+    "certificateAuthorities": undefined,
     "verificationMode": "none",
   },
 }
 `);
     });
+
+    it('does not merge elasticsearch hosts if custom config overrides', async () => {
+      configService.atPath.mockReturnValueOnce(
+        new BehaviorSubject({
+          hosts: ['http://1.2.3.4', 'http://9.8.7.6'],
+          healthCheck: {
+            delay: 2000,
+          },
+          ssl: {
+            verificationMode: 'none',
+          },
+        } as any)
+      );
+      elasticsearchService = new ElasticsearchService(coreContext);
+      const setupContract = await elasticsearchService.setup(deps);
+      // reset all mocks called during setup phase
+      MockClusterClient.mockClear();
+
+      const customConfig = {
+        hosts: ['http://8.8.8.8'],
+        logQueries: true,
+        ssl: { certificate: 'certificate-value' },
+      };
+      setupContract.createClient('some-custom-type', customConfig);
+
+      const config = MockClusterClient.mock.calls[0][0];
+      expect(config).toMatchInlineSnapshot(`
+        Object {
+          "healthCheckDelay": 2000,
+          "hosts": Array [
+            "http://8.8.8.8",
+          ],
+          "logQueries": true,
+          "requestHeadersWhitelist": Array [
+            undefined,
+          ],
+          "ssl": Object {
+            "certificate": "certificate-value",
+            "verificationMode": "none",
+          },
+        }
+      `);
+    });
   });
 });
 
diff --git a/src/core/server/elasticsearch/elasticsearch_service.ts b/src/core/server/elasticsearch/elasticsearch_service.ts
index ed1f2a276ebc87..1f062412edaf22 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.ts
@@ -19,8 +19,9 @@
 
 import { ConnectableObservable, Observable, Subscription } from 'rxjs';
 import { filter, first, map, publishReplay, switchMap } from 'rxjs/operators';
-import { merge } from 'lodash';
+
 import { CoreService } from '../../types';
+import { merge } from '../../utils';
 import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
 import { ClusterClient } from './cluster_client';
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index f61371c5437e6b..acae9d8ff0e704 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -577,45 +577,6 @@ test('exposes route details of incoming request to a route handler', async () =>
     });
 });
 
-describe('conditional compression', () => {
-  test('disables compression when there is a referer', async () => {
-    const { registerRouter, server: innerServer } = await server.setup(config);
-
-    const router = new Router('', logger, enhanceWithContext);
-    router.get({ path: '/', validate: false }, (context, req, res) =>
-      // we need the large body here so that compression would normally be used
-      res.ok({ body: 'hello'.repeat(500), headers: { 'Content-Type': 'text/html; charset=UTF-8' } })
-    );
-    registerRouter(router);
-
-    await server.start();
-    const response = await supertest(innerServer.listener)
-      .get('/')
-      .set('accept-encoding', 'gzip')
-      .set('referer', 'http://some-other-site/');
-
-    expect(response.header).not.toHaveProperty('content-encoding');
-  });
-
-  test(`enables compression when there isn't a referer`, async () => {
-    const { registerRouter, server: innerServer } = await server.setup(config);
-
-    const router = new Router('', logger, enhanceWithContext);
-    router.get({ path: '/', validate: false }, (context, req, res) =>
-      // we need the large body here so that compression will be used
-      res.ok({ body: 'hello'.repeat(500), headers: { 'Content-Type': 'text/html; charset=UTF-8' } })
-    );
-    registerRouter(router);
-
-    await server.start();
-    const response = await supertest(innerServer.listener)
-      .get('/')
-      .set('accept-encoding', 'gzip');
-
-    expect(response.header).toHaveProperty('content-encoding', 'gzip');
-  });
-});
-
 describe('setup contract', () => {
   describe('#createSessionStorage', () => {
     it('creates session storage factory', async () => {
diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts
index d6077200d3c757..3354324c12407d 100644
--- a/src/core/server/http/http_server.ts
+++ b/src/core/server/http/http_server.ts
@@ -96,7 +96,6 @@ export class HttpServer {
 
     const basePathService = new BasePath(config.basePath);
     this.setupBasePathRewrite(config, basePathService);
-    this.setupConditionalCompression();
 
     return {
       registerRouter: this.registerRouter.bind(this),
@@ -176,23 +175,6 @@ export class HttpServer {
     });
   }
 
-  private setupConditionalCompression() {
-    if (this.server === undefined) {
-      throw new Error('Server is not created yet');
-    }
-
-    this.server.ext('onRequest', (request, h) => {
-      // whenever there is a referrer, don't use compression even if the client supports it
-      if (request.info.referrer !== '') {
-        this.log.debug(
-          `Not using compression because there is a referer: ${request.info.referrer}`
-        );
-        request.info.acceptEncoding = '';
-      }
-      return h.continue;
-    });
-  }
-
   private registerOnPostAuth(fn: OnPostAuthHandler) {
     if (this.server === undefined) {
       throw new Error('Server is not created yet');
diff --git a/src/core/server/http/router/response_adapter.ts b/src/core/server/http/router/response_adapter.ts
index fe6cb32d217760..e5dabc99f44426 100644
--- a/src/core/server/http/router/response_adapter.ts
+++ b/src/core/server/http/router/response_adapter.ts
@@ -120,7 +120,11 @@ export class HapiResponseAdapter {
     });
 
     error.output.payload.message = getErrorMessage(payload);
-    error.output.payload.attributes = getErrorAttributes(payload);
+
+    const attributes = getErrorAttributes(payload);
+    if (attributes) {
+      error.output.payload.attributes = attributes;
+    }
 
     const headers = kibanaResponse.options.headers;
     if (headers) {
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index e0d230006d5874..35e83da4ef30c8 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -49,7 +49,11 @@ import { PluginsServiceSetup, PluginsServiceStart, PluginOpaqueId } from './plug
 import { ContextSetup } from './context';
 import { SavedObjectsServiceStart } from './saved_objects';
 
-import { InternalUiSettingsServiceSetup } from './ui_settings';
+import {
+  InternalUiSettingsServiceSetup,
+  IUiSettingsClient,
+  UiSettingsServiceSetup,
+} from './ui_settings';
 import { SavedObjectsClientContract } from './saved_objects/types';
 
 export { bootstrap } from './bootstrap';
@@ -139,6 +143,7 @@ export {
   SavedObjectsBulkCreateObject,
   SavedObjectsBulkGetObject,
   SavedObjectsBulkUpdateObject,
+  SavedObjectsBulkUpdateOptions,
   SavedObjectsBulkResponse,
   SavedObjectsBulkUpdateResponse,
   SavedObjectsClient,
@@ -166,6 +171,7 @@ export {
   SavedObjectsLegacyService,
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
+  SavedObjectsDeleteOptions,
 } from './saved_objects';
 
 export {
@@ -173,6 +179,8 @@ export {
   UiSettingsParams,
   InternalUiSettingsServiceSetup,
   UiSettingsType,
+  UiSettingsServiceSetup,
+  UserProvidedValues,
 } from './ui_settings';
 
 export { RecursiveReadonly } from '../utils';
@@ -184,6 +192,7 @@ export {
   SavedObjectAttributeSingle,
   SavedObjectReference,
   SavedObjectsBaseOptions,
+  MutatingOperationRefreshSetting,
   SavedObjectsClientContract,
   SavedObjectsFindOptions,
   SavedObjectsMigrationVersion,
@@ -213,6 +222,9 @@ export interface RequestHandlerContext {
       dataClient: IScopedClusterClient;
       adminClient: IScopedClusterClient;
     };
+    uiSettings: {
+      client: IUiSettingsClient;
+    };
   };
 }
 
@@ -228,6 +240,8 @@ export interface CoreSetup {
   elasticsearch: ElasticsearchServiceSetup;
   /** {@link HttpServiceSetup} */
   http: HttpServiceSetup;
+  /** {@link UiSettingsServiceSetup} */
+  uiSettings: UiSettingsServiceSetup;
 }
 
 /**
diff --git a/src/core/server/legacy/legacy_service.test.ts b/src/core/server/legacy/legacy_service.test.ts
index 590bd192e3ded3..e2aefd846d9788 100644
--- a/src/core/server/legacy/legacy_service.test.ts
+++ b/src/core/server/legacy/legacy_service.test.ts
@@ -72,7 +72,7 @@ beforeEach(() => {
     core: {
       context: contextServiceMock.createSetupContract(),
       elasticsearch: { legacy: {} } as any,
-      uiSettings: uiSettingsServiceMock.createSetup(),
+      uiSettings: uiSettingsServiceMock.createSetupContract(),
       http: {
         ...httpServiceMock.createSetupContract(),
         auth: {
diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index dd3ee3db89153a..b7c55a8af7c18d 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -248,6 +248,9 @@ export class LegacyService implements CoreService<LegacyServiceSetup> {
         basePath: setupDeps.core.http.basePath,
         isTlsEnabled: setupDeps.core.http.isTlsEnabled,
       },
+      uiSettings: {
+        register: setupDeps.core.uiSettings.register,
+      },
     };
     const coreStart: CoreStart = {};
 
diff --git a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
index f1f4da8d0b4d75..c0a6026708af3a 100644
--- a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
+++ b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
@@ -54,7 +54,7 @@ export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: Lo
     invalidDirectoryError$: Observable<{ path: string }>;
     invalidPackError$: Observable<{ path: string }>;
     otherError$: Observable<unknown>;
-    deprecation$: Observable<unknown>;
+    deprecation$: Observable<{ spec: LegacyPluginSpec; message: string }>;
     invalidVersionSpec$: Observable<LegacyPluginSpec>;
     spec$: Observable<LegacyPluginSpec>;
     disabledSpec$: Observable<LegacyPluginSpec>;
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index fb703c6c350081..b51d5302e32746 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -22,6 +22,7 @@ import { loggingServiceMock } from './logging/logging_service.mock';
 import { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.mock';
 import { httpServiceMock } from './http/http_service.mock';
 import { contextServiceMock } from './context/context_service.mock';
+import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 
 export { httpServerMock } from './http/http_server.mocks';
 export { sessionStorageMock } from './http/cookie_session_storage.mocks';
@@ -29,7 +30,7 @@ export { configServiceMock } from './config/config_service.mock';
 export { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.mock';
 export { httpServiceMock } from './http/http_service.mock';
 export { loggingServiceMock } from './logging/logging_service.mock';
-export { SavedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
+export { savedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
 export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 
 export function pluginInitializerContextConfigMock<T>(config: T) {
@@ -79,10 +80,14 @@ function createCoreSetupMock() {
   };
   httpMock.createRouter.mockImplementation(() => httpService.createRouter(''));
 
+  const uiSettingsMock = {
+    register: uiSettingsServiceMock.createSetupContract().register,
+  };
   const mock: MockedKeys<CoreSetup> = {
     context: contextServiceMock.createSetupContract(),
     elasticsearch: elasticsearchServiceMock.createSetupContract(),
     http: httpMock,
+    uiSettings: uiSettingsMock,
   };
 
   return mock;
@@ -94,8 +99,19 @@ function createCoreStartMock() {
   return mock;
 }
 
+function createInternalCoreSetupMock() {
+  const setupDeps = {
+    context: contextServiceMock.createSetupContract(),
+    elasticsearch: elasticsearchServiceMock.createSetupContract(),
+    http: httpServiceMock.createSetupContract(),
+    uiSettings: uiSettingsServiceMock.createSetupContract(),
+  };
+  return setupDeps;
+}
+
 export const coreMock = {
   createSetup: createCoreSetupMock,
   createStart: createCoreStartMock,
+  createInternalSetup: createInternalCoreSetupMock,
   createPluginInitializerContext: pluginInitializerContextMock,
 };
diff --git a/src/core/server/plugins/discovery/plugins_discovery.ts b/src/core/server/plugins/discovery/plugins_discovery.ts
index 74e9dd709bb238..521d02e487df61 100644
--- a/src/core/server/plugins/discovery/plugins_discovery.ts
+++ b/src/core/server/plugins/discovery/plugins_discovery.ts
@@ -29,7 +29,7 @@ import { PluginsConfig } from '../plugins_config';
 import { PluginDiscoveryError } from './plugin_discovery_error';
 import { parseManifest } from './plugin_manifest_parser';
 
-const fsReadDir$ = bindNodeCallback(readdir);
+const fsReadDir$ = bindNodeCallback<string, string[]>(readdir);
 const fsStat$ = bindNodeCallback(stat);
 
 /**
diff --git a/src/core/server/plugins/plugin.test.ts b/src/core/server/plugins/plugin.test.ts
index 5c57a5fa2c8d17..e457f01a1941c3 100644
--- a/src/core/server/plugins/plugin.test.ts
+++ b/src/core/server/plugins/plugin.test.ts
@@ -24,15 +24,13 @@ import { schema } from '@kbn/config-schema';
 import { Env } from '../config';
 import { getEnvOptions } from '../config/__mocks__/env';
 import { CoreContext } from '../core_context';
+import { coreMock } from '../mocks';
 import { configServiceMock } from '../config/config_service.mock';
-import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 
 import { PluginWrapper } from './plugin';
 import { PluginManifest } from './types';
 import { createPluginInitializerContext, createPluginSetupContext } from './plugin_context';
-import { contextServiceMock } from '../context/context_service.mock';
 
 const mockPluginInitializer = jest.fn();
 const logger = loggingServiceMock.create();
@@ -68,11 +66,7 @@ configService.atPath.mockReturnValue(new BehaviorSubject({ initialize: true }));
 let coreId: symbol;
 let env: Env;
 let coreContext: CoreContext;
-const setupDeps = {
-  context: contextServiceMock.createSetupContract(),
-  elasticsearch: elasticsearchServiceMock.createSetupContract(),
-  http: httpServiceMock.createSetupContract(),
-};
+const setupDeps = coreMock.createInternalSetup();
 beforeEach(() => {
   coreId = Symbol('core');
   env = Env.createDefault(getEnvOptions());
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index edcafbb9a3dc33..9885a572ad8c00 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -123,6 +123,9 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
       basePath: deps.http.basePath,
       isTlsEnabled: deps.http.isTlsEnabled,
     },
+    uiSettings: {
+      register: deps.uiSettings.register,
+    },
   };
 }
 
diff --git a/src/core/server/plugins/plugins_service.test.ts b/src/core/server/plugins/plugins_service.test.ts
index d25f9087432bd9..0b3bc0759463c1 100644
--- a/src/core/server/plugins/plugins_service.test.ts
+++ b/src/core/server/plugins/plugins_service.test.ts
@@ -25,15 +25,13 @@ import { schema } from '@kbn/config-schema';
 
 import { Config, ConfigPath, ConfigService, Env, ObjectToConfigAdapter } from '../config';
 import { getEnvOptions } from '../config/__mocks__/env';
-import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
+import { coreMock } from '../mocks';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 import { PluginDiscoveryError } from './discovery';
 import { PluginWrapper } from './plugin';
 import { PluginsService } from './plugins_service';
 import { PluginsSystem } from './plugins_system';
 import { config } from './plugins_config';
-import { contextServiceMock } from '../context/context_service.mock';
 
 const MockPluginsSystem: jest.Mock<PluginsSystem> = PluginsSystem as any;
 
@@ -42,11 +40,7 @@ let configService: ConfigService;
 let coreId: symbol;
 let env: Env;
 let mockPluginSystem: jest.Mocked<PluginsSystem>;
-const setupDeps = {
-  context: contextServiceMock.createSetupContract(),
-  elasticsearch: elasticsearchServiceMock.createSetupContract(),
-  http: httpServiceMock.createSetupContract(),
-};
+const setupDeps = coreMock.createInternalSetup();
 const logger = loggingServiceMock.create();
 
 ['path-1', 'path-2', 'path-3', 'path-4', 'path-5'].forEach(path => {
diff --git a/src/core/server/plugins/plugins_service.ts b/src/core/server/plugins/plugins_service.ts
index 92b537deae3371..2964e34c370b1c 100644
--- a/src/core/server/plugins/plugins_service.ts
+++ b/src/core/server/plugins/plugins_service.ts
@@ -21,15 +21,14 @@ import { Observable } from 'rxjs';
 import { filter, first, map, mergeMap, tap, toArray } from 'rxjs/operators';
 import { CoreService } from '../../types';
 import { CoreContext } from '../core_context';
-import { InternalElasticsearchServiceSetup } from '../elasticsearch';
-import { InternalHttpServiceSetup } from '../http';
+
 import { Logger } from '../logging';
 import { discover, PluginDiscoveryError, PluginDiscoveryErrorType } from './discovery';
 import { PluginWrapper } from './plugin';
 import { DiscoveredPlugin, DiscoveredPluginInternal, PluginName } from './types';
 import { PluginsConfig, PluginsConfigType } from './plugins_config';
 import { PluginsSystem } from './plugins_system';
-import { ContextSetup } from '../context';
+import { InternalCoreSetup } from '..';
 
 /** @public */
 export interface PluginsServiceSetup {
@@ -46,11 +45,7 @@ export interface PluginsServiceStart {
 }
 
 /** @internal */
-export interface PluginsServiceSetupDeps {
-  context: ContextSetup;
-  elasticsearch: InternalElasticsearchServiceSetup;
-  http: InternalHttpServiceSetup;
-}
+export type PluginsServiceSetupDeps = InternalCoreSetup;
 
 /** @internal */
 export interface PluginsServiceStartDeps {} // eslint-disable-line @typescript-eslint/no-empty-interface
diff --git a/src/core/server/plugins/plugins_system.test.ts b/src/core/server/plugins/plugins_system.test.ts
index f67bd371ff5651..efd53681d6cd0d 100644
--- a/src/core/server/plugins/plugins_system.test.ts
+++ b/src/core/server/plugins/plugins_system.test.ts
@@ -28,13 +28,13 @@ import { Env } from '../config';
 import { getEnvOptions } from '../config/__mocks__/env';
 import { CoreContext } from '../core_context';
 import { configServiceMock } from '../config/config_service.mock';
-import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
 import { loggingServiceMock } from '../logging/logging_service.mock';
+
 import { PluginWrapper } from './plugin';
 import { PluginName } from './types';
 import { PluginsSystem } from './plugins_system';
-import { contextServiceMock } from '../context/context_service.mock';
+
+import { coreMock } from '../mocks';
 
 const logger = loggingServiceMock.create();
 function createPlugin(
@@ -68,11 +68,8 @@ const configService = configServiceMock.create();
 configService.atPath.mockReturnValue(new BehaviorSubject({ initialize: true }));
 let env: Env;
 let coreContext: CoreContext;
-const setupDeps = {
-  context: contextServiceMock.createSetupContract(),
-  elasticsearch: elasticsearchServiceMock.createSetupContract(),
-  http: httpServiceMock.createSetupContract(),
-};
+const setupDeps = coreMock.createInternalSetup();
+
 beforeEach(() => {
   env = Env.createDefault(getEnvOptions());
 
diff --git a/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts b/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
index 1a2a843ebb2b89..9a3449b65a9412 100644
--- a/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
+++ b/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { getSortedObjectsForExport } from './get_sorted_objects_for_export';
-import { SavedObjectsClientMock } from '../service/saved_objects_client.mock';
+import { savedObjectsClientMock } from '../service/saved_objects_client.mock';
 import { Readable } from 'stream';
 import { createPromiseFromStreams, createConcatStream } from '../../../../legacy/utils/streams';
 
@@ -27,7 +27,7 @@ async function readStreamToCompletion(stream: Readable) {
 }
 
 describe('getSortedObjectsForExport()', () => {
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   afterEach(() => {
     savedObjectsClient.find.mockReset();
diff --git a/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts b/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts
index 57feebbf67ccd0..a571f62e3d1c14 100644
--- a/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts
+++ b/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { SavedObject } from '../types';
-import { SavedObjectsClientMock } from '../../mocks';
+import { savedObjectsClientMock } from '../../mocks';
 import { getObjectReferencesToFetch, fetchNestedDependencies } from './inject_nested_depdendencies';
 
 describe('getObjectReferencesToFetch()', () => {
@@ -109,7 +109,7 @@ describe('getObjectReferencesToFetch()', () => {
 });
 
 describe('injectNestedDependencies', () => {
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   afterEach(() => {
     jest.resetAllMocks();
diff --git a/src/core/server/saved_objects/import/import_saved_objects.test.ts b/src/core/server/saved_objects/import/import_saved_objects.test.ts
index df95fb75f0f4fb..f0719cbf4c829b 100644
--- a/src/core/server/saved_objects/import/import_saved_objects.test.ts
+++ b/src/core/server/saved_objects/import/import_saved_objects.test.ts
@@ -20,7 +20,7 @@
 import { Readable } from 'stream';
 import { SavedObject } from '../types';
 import { importSavedObjects } from './import_saved_objects';
-import { SavedObjectsClientMock } from '../../mocks';
+import { savedObjectsClientMock } from '../../mocks';
 
 const emptyResponse = {
   saved_objects: [],
@@ -63,7 +63,7 @@ describe('importSavedObjects()', () => {
       references: [],
     },
   ];
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     jest.resetAllMocks();
diff --git a/src/core/server/saved_objects/import/resolve_import_errors.test.ts b/src/core/server/saved_objects/import/resolve_import_errors.test.ts
index 6aab8ef5adf9e3..c522d76f1ff041 100644
--- a/src/core/server/saved_objects/import/resolve_import_errors.test.ts
+++ b/src/core/server/saved_objects/import/resolve_import_errors.test.ts
@@ -20,7 +20,7 @@
 import { Readable } from 'stream';
 import { SavedObject } from '../types';
 import { resolveImportErrors } from './resolve_import_errors';
-import { SavedObjectsClientMock } from '../../mocks';
+import { savedObjectsClientMock } from '../../mocks';
 
 describe('resolveImportErrors()', () => {
   const savedObjects: SavedObject[] = [
@@ -63,7 +63,7 @@ describe('resolveImportErrors()', () => {
       ],
     },
   ];
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     jest.resetAllMocks();
diff --git a/src/core/server/saved_objects/import/validate_references.test.ts b/src/core/server/saved_objects/import/validate_references.test.ts
index 269cd3055b0470..6642cf149eda96 100644
--- a/src/core/server/saved_objects/import/validate_references.test.ts
+++ b/src/core/server/saved_objects/import/validate_references.test.ts
@@ -18,10 +18,10 @@
  */
 
 import { getNonExistingReferenceAsKeys, validateReferences } from './validate_references';
-import { SavedObjectsClientMock } from '../../mocks';
+import { savedObjectsClientMock } from '../../mocks';
 
 describe('getNonExistingReferenceAsKeys()', () => {
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     jest.resetAllMocks();
@@ -222,7 +222,7 @@ describe('getNonExistingReferenceAsKeys()', () => {
 });
 
 describe('validateReferences()', () => {
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     jest.resetAllMocks();
diff --git a/src/core/server/saved_objects/service/lib/repository.test.js b/src/core/server/saved_objects/service/lib/repository.test.js
index 9e4edcd8d29437..6525590ee96c5b 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.js
+++ b/src/core/server/saved_objects/service/lib/repository.test.js
@@ -417,6 +417,32 @@ describe('SavedObjectsRepository', () => {
       });
     });
 
+    it('defaults to a refresh setting of `wait_for`', async () => {
+      await savedObjectsRepository.create('index-pattern', {
+        id: 'logstash-*',
+        title: 'Logstash',
+      });
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: 'wait_for'
+      });
+    });
+
+    it('accepts custom refresh settings', async () => {
+      await savedObjectsRepository.create('index-pattern', {
+        id: 'logstash-*',
+        title: 'Logstash',
+      }, {
+        refresh: true
+      });
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: true
+      });
+    });
+
     it('should use create action if ID defined and overwrite=false', async () => {
       await savedObjectsRepository.create(
         'index-pattern',
@@ -546,6 +572,28 @@ describe('SavedObjectsRepository', () => {
       );
       expect(onBeforeWrite).toHaveBeenCalledTimes(1);
     });
+
+    it('defaults to empty references array if none are provided', async () => {
+      await savedObjectsRepository.create(
+        'index-pattern',
+        {
+          title: 'Logstash',
+        },
+        {
+          id: 'logstash-*',
+        }
+      );
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          body: expect.objectContaining({
+            references: [],
+          }),
+        })
+      );
+    });
   });
 
   describe('#bulkCreate', () => {
@@ -623,6 +671,61 @@ describe('SavedObjectsRepository', () => {
       expect(onBeforeWrite).toHaveBeenCalledTimes(1);
     });
 
+    it('defaults to a refresh setting of `wait_for`', async () => {
+      callAdminCluster.mockReturnValue({
+        items: [
+          { create: { type: 'config', id: 'config:one', _primary_term: 1, _seq_no: 1 } },
+        ],
+      });
+
+      await savedObjectsRepository.bulkCreate([
+        {
+          type: 'config',
+          id: 'one',
+          attributes: { title: 'Test One' },
+          references: [{ name: 'ref_0', type: 'test', id: '1' }],
+        }
+      ]);
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: 'wait_for'
+      });
+    });
+
+    it('accepts a custom refresh setting', async () => {
+      callAdminCluster.mockReturnValue({
+        items: [
+          { create: { type: 'config', id: 'config:one', _primary_term: 1, _seq_no: 1 } },
+          { create: { type: 'index-pattern', id: 'config:two', _primary_term: 1, _seq_no: 1 } },
+        ],
+      });
+
+      await savedObjectsRepository.bulkCreate([
+        {
+          type: 'config',
+          id: 'one',
+          attributes: { title: 'Test One' },
+          references: [{ name: 'ref_0', type: 'test', id: '1' }],
+        },
+        {
+          type: 'index-pattern',
+          id: 'two',
+          attributes: { title: 'Test Two' },
+          references: [{ name: 'ref_0', type: 'test', id: '2' }],
+        },
+      ], {
+        refresh: true
+      });
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: true
+      });
+    });
+
     it('migrates the docs', async () => {
       callAdminCluster.mockReturnValue({
         items: [
@@ -1065,6 +1168,28 @@ describe('SavedObjectsRepository', () => {
 
       expect(onBeforeWrite).toHaveBeenCalledTimes(1);
     });
+
+    it('defaults to a refresh setting of `wait_for`', async () => {
+      callAdminCluster.mockReturnValue({ result: 'deleted' });
+      await savedObjectsRepository.delete('globaltype', 'logstash-*');
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: 'wait_for'
+      });
+    });
+
+    it(`accepts a custom refresh setting`, async () => {
+      callAdminCluster.mockReturnValue({ result: 'deleted' });
+      await savedObjectsRepository.delete('globaltype', 'logstash-*', {
+        refresh: false
+      });
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: false,
+      });
+    });
   });
 
   describe('#deleteByNamespace', () => {
@@ -1104,6 +1229,26 @@ describe('SavedObjectsRepository', () => {
         refresh: 'wait_for',
       });
     });
+
+    it('defaults to a refresh setting of `wait_for`', async () => {
+      callAdminCluster.mockReturnValue(deleteByQueryResults);
+      await savedObjectsRepository.deleteByNamespace('my-namespace');
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: 'wait_for',
+      });
+    });
+
+    it('accepts a custom refresh setting', async () => {
+      callAdminCluster.mockReturnValue(deleteByQueryResults);
+      await savedObjectsRepository.deleteByNamespace('my-namespace', { refresh: true });
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: true,
+      });
+    });
   });
 
   describe('#find', () => {
@@ -1232,7 +1377,7 @@ describe('SavedObjectsRepository', () => {
       };
 
       await expect(savedObjectsRepository.find(findOpts)).rejects.toMatchInlineSnapshot(`
-        [Error: KQLSyntaxError: Expected "(", value, whitespace but "<" found.
+        [Error: KQLSyntaxError: Expected "(", "{", value, whitespace but "<" found.
         dashboard.attributes.otherField:<
         --------------------------------^: Bad Request]
       `);
@@ -1962,6 +2107,40 @@ describe('SavedObjectsRepository', () => {
 
       expect(onBeforeWrite).toHaveBeenCalledTimes(1);
     });
+
+    it('defaults to a refresh setting of `wait_for`', async () => {
+      await savedObjectsRepository.update(
+        'globaltype',
+        'foo',
+        {
+          name: 'bar',
+        }
+      );
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: 'wait_for'
+      });
+    });
+
+    it('accepts a custom refresh setting', async () => {
+      await savedObjectsRepository.update(
+        'globaltype',
+        'foo',
+        {
+          name: 'bar',
+        },
+        {
+          refresh: true,
+          namespace: 'foo-namespace',
+        }
+      );
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: true
+      });
+    });
   });
 
   describe('#bulkUpdate', () => {
@@ -2262,6 +2441,44 @@ describe('SavedObjectsRepository', () => {
       });
     });
 
+    it('defaults to a refresh setting of `wait_for`', async () => {
+      const objects = [
+        {
+          type: 'index-pattern',
+          id: `logstash-no-ref`,
+          attributes: { title: `Testing no-ref` },
+          references: []
+        }
+      ];
+
+      mockValidResponse(objects);
+
+      await savedObjectsRepository.bulkUpdate(objects);
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({ refresh: 'wait_for' });
+    });
+
+    it('accepts a custom refresh setting', async () => {
+      const objects = [
+        {
+          type: 'index-pattern',
+          id: `logstash-no-ref`,
+          attributes: { title: `Testing no-ref` },
+          references: []
+        }
+      ];
+
+      mockValidResponse(objects);
+
+      await savedObjectsRepository.bulkUpdate(objects, { refresh: true });
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({ refresh: true });
+    });
+
     it(`prepends namespace to the id but doesn't add namespace to body when providing namespace for namespaced type`, async () => {
 
       const objects = [
@@ -2504,6 +2721,29 @@ describe('SavedObjectsRepository', () => {
       });
     });
 
+    it('defaults to a refresh setting of `wait_for`', async () => {
+      await savedObjectsRepository.incrementCounter('config', 'doesnotexist', 'buildNum', {
+        namespace: 'foo-namespace'
+      });
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: 'wait_for'
+      });
+    });
+
+    it('accepts a custom refresh setting', async () => {
+      await savedObjectsRepository.incrementCounter('config', 'doesnotexist', 'buildNum', {
+        namespace: 'foo-namespace',
+        refresh: true
+      });
+
+      expect(callAdminCluster).toHaveBeenCalledTimes(1);
+      expect(callAdminCluster.mock.calls[0][1]).toMatchObject({
+        refresh: true
+      });
+    });
+
     it(`prepends namespace to the id but doesn't add namespace to body when providing namespace for namespaced type`, async () => {
       await savedObjectsRepository.incrementCounter('config', '6.0.0-alpha1', 'buildNum', {
         namespace: 'foo-namespace',
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index 898239e5736de3..54b9938decb0a9 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -40,6 +40,9 @@ import {
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
   SavedObjectsBulkUpdateObject,
+  SavedObjectsBulkUpdateOptions,
+  SavedObjectsDeleteOptions,
+  SavedObjectsDeleteByNamespaceOptions,
 } from '../saved_objects_client';
 import {
   SavedObject,
@@ -47,6 +50,7 @@ import {
   SavedObjectsBaseOptions,
   SavedObjectsFindOptions,
   SavedObjectsMigrationVersion,
+  MutatingOperationRefreshSetting,
 } from '../../types';
 import { validateConvertFilterToKueryNode } from './filter_utils';
 
@@ -83,8 +87,12 @@ export interface SavedObjectsRepositoryOptions {
 
 export interface IncrementCounterOptions extends SavedObjectsBaseOptions {
   migrationVersion?: SavedObjectsMigrationVersion;
+  /** The Elasticsearch Refresh setting for this operation */
+  refresh?: MutatingOperationRefreshSetting;
 }
 
+const DEFAULT_REFRESH_SETTING = 'wait_for';
+
 export class SavedObjectsRepository {
   private _migrator: KibanaMigrator;
   private _index: string;
@@ -146,15 +154,22 @@ export class SavedObjectsRepository {
    * @property {boolean} [options.overwrite=false]
    * @property {object} [options.migrationVersion=undefined]
    * @property {string} [options.namespace]
-   * @property {array} [options.references] - [{ name, type, id }]
+   * @property {array} [options.references=[]] - [{ name, type, id }]
    * @returns {promise} - { id, type, version, attributes }
    */
   public async create<T extends SavedObjectAttributes>(
     type: string,
     attributes: T,
-    options: SavedObjectsCreateOptions = { overwrite: false, references: [] }
+    options: SavedObjectsCreateOptions = {}
   ): Promise<SavedObject<T>> {
-    const { id, migrationVersion, overwrite, namespace, references } = options;
+    const {
+      id,
+      migrationVersion,
+      overwrite = false,
+      namespace,
+      references = [],
+      refresh = DEFAULT_REFRESH_SETTING,
+    } = options;
 
     if (!this._allowedTypes.includes(type)) {
       throw SavedObjectsErrorHelpers.createUnsupportedTypeError(type);
@@ -179,7 +194,7 @@ export class SavedObjectsRepository {
       const response = await this._writeToCluster(method, {
         id: raw._id,
         index: this.getIndexForType(type),
-        refresh: 'wait_for',
+        refresh,
         body: raw._source,
       });
 
@@ -210,7 +225,7 @@ export class SavedObjectsRepository {
     objects: Array<SavedObjectsBulkCreateObject<T>>,
     options: SavedObjectsCreateOptions = {}
   ): Promise<SavedObjectsBulkResponse<T>> {
-    const { namespace, overwrite = false } = options;
+    const { namespace, overwrite = false, refresh = DEFAULT_REFRESH_SETTING } = options;
     const time = this._getCurrentTime();
     const bulkCreateParams: object[] = [];
 
@@ -256,7 +271,7 @@ export class SavedObjectsRepository {
     });
 
     const esResponse = await this._writeToCluster('bulk', {
-      refresh: 'wait_for',
+      refresh,
       body: bulkCreateParams,
     });
 
@@ -308,17 +323,17 @@ export class SavedObjectsRepository {
    * @property {string} [options.namespace]
    * @returns {promise}
    */
-  async delete(type: string, id: string, options: SavedObjectsBaseOptions = {}): Promise<{}> {
+  async delete(type: string, id: string, options: SavedObjectsDeleteOptions = {}): Promise<{}> {
     if (!this._allowedTypes.includes(type)) {
       throw SavedObjectsErrorHelpers.createGenericNotFoundError();
     }
 
-    const { namespace } = options;
+    const { namespace, refresh = DEFAULT_REFRESH_SETTING } = options;
 
     const response = await this._writeToCluster('delete', {
       id: this._serializer.generateRawId(namespace, type, id),
       index: this.getIndexForType(type),
-      refresh: 'wait_for',
+      refresh,
       ignore: [404],
     });
 
@@ -345,11 +360,16 @@ export class SavedObjectsRepository {
    * @param {string} namespace
    * @returns {promise} - { took, timed_out, total, deleted, batches, version_conflicts, noops, retries, failures }
    */
-  async deleteByNamespace(namespace: string): Promise<any> {
+  async deleteByNamespace(
+    namespace: string,
+    options: SavedObjectsDeleteByNamespaceOptions = {}
+  ): Promise<any> {
     if (!namespace || typeof namespace !== 'string') {
       throw new TypeError(`namespace is required, and must be a string`);
     }
 
+    const { refresh = DEFAULT_REFRESH_SETTING } = options;
+
     const allTypes = Object.keys(getRootPropertiesObjects(this._mappings));
 
     const typesToDelete = allTypes.filter(type => !this._schema.isNamespaceAgnostic(type));
@@ -357,7 +377,7 @@ export class SavedObjectsRepository {
     const esOptions = {
       index: this.getIndicesForTypes(typesToDelete),
       ignore: [404],
-      refresh: 'wait_for',
+      refresh,
       body: {
         conflicts: 'proceed',
         ...getSearchDsl(this._mappings, this._schema, {
@@ -626,7 +646,7 @@ export class SavedObjectsRepository {
       throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
 
-    const { version, namespace, references } = options;
+    const { version, namespace, references, refresh = DEFAULT_REFRESH_SETTING } = options;
 
     const time = this._getCurrentTime();
 
@@ -643,7 +663,7 @@ export class SavedObjectsRepository {
       id: this._serializer.generateRawId(namespace, type, id),
       index: this.getIndexForType(type),
       ...(version && decodeRequestVersion(version)),
-      refresh: 'wait_for',
+      refresh,
       ignore: [404],
       body: {
         doc,
@@ -675,7 +695,7 @@ export class SavedObjectsRepository {
    */
   async bulkUpdate<T extends SavedObjectAttributes = any>(
     objects: Array<SavedObjectsBulkUpdateObject<T>>,
-    options: SavedObjectsBaseOptions = {}
+    options: SavedObjectsBulkUpdateOptions = {}
   ): Promise<SavedObjectsBulkUpdateResponse<T>> {
     const time = this._getCurrentTime();
     const bulkUpdateParams: object[] = [];
@@ -729,9 +749,10 @@ export class SavedObjectsRepository {
       return { tag: 'Right' as 'Right', value: expectedResult };
     });
 
+    const { refresh = DEFAULT_REFRESH_SETTING } = options;
     const esResponse = bulkUpdateParams.length
       ? await this._writeToCluster('bulk', {
-          refresh: 'wait_for',
+          refresh,
           body: bulkUpdateParams,
         })
       : {};
@@ -794,7 +815,7 @@ export class SavedObjectsRepository {
       throw SavedObjectsErrorHelpers.createUnsupportedTypeError(type);
     }
 
-    const { migrationVersion, namespace } = options;
+    const { migrationVersion, namespace, refresh = DEFAULT_REFRESH_SETTING } = options;
 
     const time = this._getCurrentTime();
 
@@ -811,7 +832,7 @@ export class SavedObjectsRepository {
     const response = await this._writeToCluster('update', {
       id: this._serializer.generateRawId(namespace, type, id),
       index: this.getIndexForType(type),
-      refresh: 'wait_for',
+      refresh,
       _source: true,
       body: {
         script: {
diff --git a/src/core/server/saved_objects/service/saved_objects_client.mock.ts b/src/core/server/saved_objects/service/saved_objects_client.mock.ts
index 63c9a0ee35ae0d..c6de9fa94291c6 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.mock.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.mock.ts
@@ -33,4 +33,4 @@ const create = () =>
     update: jest.fn(),
   } as unknown) as jest.Mocked<SavedObjectsClientContract>);
 
-export const SavedObjectsClientMock = { create };
+export const savedObjectsClientMock = { create };
diff --git a/src/core/server/saved_objects/service/saved_objects_client.ts b/src/core/server/saved_objects/service/saved_objects_client.ts
index 4e04a08bd5212a..550e8a1de0d80b 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.ts
@@ -24,6 +24,7 @@ import {
   SavedObjectReference,
   SavedObjectsMigrationVersion,
   SavedObjectsBaseOptions,
+  MutatingOperationRefreshSetting,
   SavedObjectsFindOptions,
 } from '../types';
 import { SavedObjectsErrorHelpers } from './lib/errors';
@@ -40,6 +41,8 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
   /** {@inheritDoc SavedObjectsMigrationVersion} */
   migrationVersion?: SavedObjectsMigrationVersion;
   references?: SavedObjectReference[];
+  /** The Elasticsearch Refresh setting for this operation */
+  refresh?: MutatingOperationRefreshSetting;
 }
 
 /**
@@ -101,6 +104,35 @@ export interface SavedObjectsUpdateOptions extends SavedObjectsBaseOptions {
   version?: string;
   /** {@inheritdoc SavedObjectReference} */
   references?: SavedObjectReference[];
+  /** The Elasticsearch Refresh setting for this operation */
+  refresh?: MutatingOperationRefreshSetting;
+}
+
+/**
+ *
+ * @public
+ */
+export interface SavedObjectsBulkUpdateOptions extends SavedObjectsBaseOptions {
+  /** The Elasticsearch Refresh setting for this operation */
+  refresh?: MutatingOperationRefreshSetting;
+}
+
+/**
+ *
+ * @public
+ */
+export interface SavedObjectsDeleteOptions extends SavedObjectsBaseOptions {
+  /** The Elasticsearch Refresh setting for this operation */
+  refresh?: MutatingOperationRefreshSetting;
+}
+
+/**
+ *
+ * @public
+ */
+export interface SavedObjectsDeleteByNamespaceOptions extends SavedObjectsBaseOptions {
+  /** The Elasticsearch Refresh setting for this operation */
+  refresh?: MutatingOperationRefreshSetting;
 }
 
 /**
@@ -189,7 +221,7 @@ export class SavedObjectsClient {
    * @param id
    * @param options
    */
-  async delete(type: string, id: string, options: SavedObjectsBaseOptions = {}) {
+  async delete(type: string, id: string, options: SavedObjectsDeleteOptions = {}) {
     return await this._repository.delete(type, id, options);
   }
 
@@ -260,7 +292,7 @@ export class SavedObjectsClient {
    */
   async bulkUpdate<T extends SavedObjectAttributes = any>(
     objects: Array<SavedObjectsBulkUpdateObject<T>>,
-    options?: SavedObjectsBaseOptions
+    options?: SavedObjectsBulkUpdateOptions
   ): Promise<SavedObjectsBulkUpdateResponse<T>> {
     return await this._repository.bulkUpdate(objects, options);
   }
diff --git a/src/core/server/saved_objects/types.ts b/src/core/server/saved_objects/types.ts
index a968b6d9392f88..2c6f5e4a520a7f 100644
--- a/src/core/server/saved_objects/types.ts
+++ b/src/core/server/saved_objects/types.ts
@@ -142,6 +142,12 @@ export interface SavedObjectsBaseOptions {
   namespace?: string;
 }
 
+/**
+ * Elasticsearch Refresh setting for mutating operation
+ * @public
+ */
+export type MutatingOperationRefreshSetting = boolean | 'wait_for';
+
 /**
  * Saved Objects is Kibana's data persisentence mechanism allowing plugins to
  * use Elasticsearch for storing plugin state.
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 9740f1f7032d1c..14943fc96f2681 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -511,6 +511,8 @@ export interface CoreSetup {
     elasticsearch: ElasticsearchServiceSetup;
     // (undocumented)
     http: HttpServiceSetup;
+    // (undocumented)
+    uiSettings: UiSettingsServiceSetup;
 }
 
 // @public
@@ -737,7 +739,7 @@ export interface InternalCoreStart {
 // @internal (undocumented)
 export interface InternalUiSettingsServiceSetup {
     asScopedToClient(savedObjectsClient: SavedObjectsClientContract): IUiSettingsClient;
-    setDefaults(values: Record<string, UiSettingsParams>): void;
+    register(settings: Record<string, UiSettingsParams>): void;
 }
 
 // @public
@@ -763,11 +765,8 @@ export type IScopedClusterClient = Pick<ScopedClusterClient, 'callAsCurrentUser'
 export interface IUiSettingsClient {
     get: <T extends SavedObjectAttribute = any>(key: string) => Promise<T>;
     getAll: <T extends SavedObjectAttribute = any>() => Promise<Record<string, T>>;
-    getDefaults: () => Record<string, UiSettingsParams>;
-    getUserProvided: <T extends SavedObjectAttribute = any>() => Promise<Record<string, {
-        userValue?: T;
-        isOverridden?: boolean;
-    }>>;
+    getRegistered: () => Readonly<Record<string, UiSettingsParams>>;
+    getUserProvided: <T extends SavedObjectAttribute = any>() => Promise<Record<string, UserProvidedValues<T>>>;
     isOverridden: (key: string) => boolean;
     remove: (key: string) => Promise<void>;
     removeMany: (keys: string[]) => Promise<void>;
@@ -942,6 +941,9 @@ export type MIGRATION_ASSISTANCE_INDEX_ACTION = 'upgrade' | 'reindex';
 // @public (undocumented)
 export type MIGRATION_DEPRECATION_LEVEL = 'none' | 'info' | 'warning' | 'critical';
 
+// @public
+export type MutatingOperationRefreshSetting = boolean | 'wait_for';
+
 // Warning: (ae-forgotten-export) The symbol "OnPostAuthResult" needs to be exported by the entry point index.d.ts
 // 
 // @public
@@ -1071,6 +1073,9 @@ export interface RequestHandlerContext {
             dataClient: IScopedClusterClient;
             adminClient: IScopedClusterClient;
         };
+        uiSettings: {
+            client: IUiSettingsClient;
+        };
     };
 }
 
@@ -1196,6 +1201,11 @@ export interface SavedObjectsBulkUpdateObject<T extends SavedObjectAttributes =
     type: string;
 }
 
+// @public (undocumented)
+export interface SavedObjectsBulkUpdateOptions extends SavedObjectsBaseOptions {
+    refresh?: MutatingOperationRefreshSetting;
+}
+
 // @public (undocumented)
 export interface SavedObjectsBulkUpdateResponse<T extends SavedObjectAttributes = any> {
     // (undocumented)
@@ -1208,9 +1218,9 @@ export class SavedObjectsClient {
     constructor(repository: SavedObjectsRepository);
     bulkCreate<T extends SavedObjectAttributes = any>(objects: Array<SavedObjectsBulkCreateObject<T>>, options?: SavedObjectsCreateOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkGet<T extends SavedObjectAttributes = any>(objects?: SavedObjectsBulkGetObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsBulkResponse<T>>;
-    bulkUpdate<T extends SavedObjectAttributes = any>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBaseOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
+    bulkUpdate<T extends SavedObjectAttributes = any>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
     create<T extends SavedObjectAttributes = any>(type: string, attributes: T, options?: SavedObjectsCreateOptions): Promise<SavedObject<T>>;
-    delete(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<{}>;
+    delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
     // (undocumented)
     errors: typeof SavedObjectsErrorHelpers;
     // (undocumented)
@@ -1247,6 +1257,12 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
     overwrite?: boolean;
     // (undocumented)
     references?: SavedObjectReference[];
+    refresh?: MutatingOperationRefreshSetting;
+}
+
+// @public (undocumented)
+export interface SavedObjectsDeleteOptions extends SavedObjectsBaseOptions {
+    refresh?: MutatingOperationRefreshSetting;
 }
 
 // @public (undocumented)
@@ -1554,6 +1570,7 @@ export class SavedObjectsSerializer {
 // @public (undocumented)
 export interface SavedObjectsUpdateOptions extends SavedObjectsBaseOptions {
     references?: SavedObjectReference[];
+    refresh?: MutatingOperationRefreshSetting;
     version?: string;
 }
 
@@ -1595,24 +1612,37 @@ export interface SessionStorageFactory<T> {
 
 // @public
 export interface UiSettingsParams {
-    category: string[];
-    description: string;
-    name: string;
+    category?: string[];
+    description?: string;
+    name?: string;
     optionLabels?: Record<string, string>;
     options?: string[];
     readonly?: boolean;
     requiresPageReload?: boolean;
     type?: UiSettingsType;
-    value: SavedObjectAttribute;
+    value?: SavedObjectAttribute;
+}
+
+// @public (undocumented)
+export interface UiSettingsServiceSetup {
+    register(settings: Record<string, UiSettingsParams>): void;
 }
 
 // @public
 export type UiSettingsType = 'json' | 'markdown' | 'number' | 'select' | 'boolean' | 'string';
 
+// @public
+export interface UserProvidedValues<T extends SavedObjectAttribute = any> {
+    // (undocumented)
+    isOverridden?: boolean;
+    // (undocumented)
+    userValue?: T;
+}
+
 
 // Warnings were encountered during analysis:
 // 
 // src/core/server/http/router/response.ts:316:3 - (ae-forgotten-export) The symbol "KibanaResponse" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/plugins_service.ts:39:5 - (ae-forgotten-export) The symbol "DiscoveredPluginInternal" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/plugins_service.ts:38:5 - (ae-forgotten-export) The symbol "DiscoveredPluginInternal" needs to be exported by the entry point index.d.ts
 
 ```
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index 49136c8e09768c..46974e204c7a42 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -21,7 +21,7 @@ import { take } from 'rxjs/operators';
 import { Type } from '@kbn/config-schema';
 
 import { ConfigService, Env, Config, ConfigPath } from './config';
-import { ElasticsearchService, ElasticsearchServiceSetup } from './elasticsearch';
+import { ElasticsearchService } from './elasticsearch';
 import { HttpService, InternalHttpServiceSetup } from './http';
 import { LegacyService } from './legacy';
 import { Logger, LoggerFactory } from './logging';
@@ -39,7 +39,7 @@ import { config as uiSettingsConfig } from './ui_settings';
 import { mapToObject } from '../utils/';
 import { ContextService } from './context';
 import { SavedObjectsServiceSetup } from './saved_objects/saved_objects_service';
-import { RequestHandlerContext } from '.';
+import { RequestHandlerContext, InternalCoreSetup } from '.';
 
 const coreId = Symbol('core');
 
@@ -102,7 +102,7 @@ export class Server {
       http: httpSetup,
     });
 
-    const coreSetup = {
+    const coreSetup: InternalCoreSetup = {
       context: contextServiceSetup,
       elasticsearch: elasticsearchServiceSetup,
       http: httpSetup,
@@ -121,7 +121,7 @@ export class Server {
       legacy: legacySetup,
     });
 
-    this.registerCoreContext({ ...coreSetup, savedObjects: savedObjectsSetup });
+    this.registerCoreContext(coreSetup, savedObjectsSetup);
 
     return coreSetup;
   }
@@ -163,27 +163,31 @@ export class Server {
     );
   }
 
-  private registerCoreContext(coreSetup: {
-    http: InternalHttpServiceSetup;
-    elasticsearch: ElasticsearchServiceSetup;
-    savedObjects: SavedObjectsServiceSetup;
-  }) {
+  private registerCoreContext(
+    coreSetup: InternalCoreSetup,
+    savedObjects: SavedObjectsServiceSetup
+  ) {
     coreSetup.http.registerRouteHandlerContext(
       coreId,
       'core',
       async (context, req): Promise<RequestHandlerContext['core']> => {
         const adminClient = await coreSetup.elasticsearch.adminClient$.pipe(take(1)).toPromise();
         const dataClient = await coreSetup.elasticsearch.dataClient$.pipe(take(1)).toPromise();
+        const savedObjectsClient = savedObjects.clientProvider.getClient(req);
+
         return {
           savedObjects: {
             // Note: the client provider doesn't support new ES clients
             // emitted from adminClient$
-            client: coreSetup.savedObjects.clientProvider.getClient(req),
+            client: savedObjectsClient,
           },
           elasticsearch: {
             adminClient: adminClient.asScoped(req),
             dataClient: dataClient.asScoped(req),
           },
+          uiSettings: {
+            client: coreSetup.uiSettings.asScopedToClient(savedObjectsClient),
+          },
         };
       }
     );
diff --git a/src/core/server/types.ts b/src/core/server/types.ts
index 46c70a91721b59..4878fb9ccae19c 100644
--- a/src/core/server/types.ts
+++ b/src/core/server/types.ts
@@ -20,4 +20,5 @@
 /** This module is intended for consumption by public to avoid import issues with server-side code */
 export { PluginOpaqueId } from './plugins/types';
 export * from './saved_objects/types';
+export * from './ui_settings/types';
 export { EnvironmentMode, PackageInfo } from './config/types';
diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.ts
index 5f7e9153658736..65b8792532acf5 100644
--- a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.ts
+++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.test.ts
@@ -20,6 +20,8 @@
 import sinon from 'sinon';
 import Chance from 'chance';
 
+import { SavedObjectsErrorHelpers } from '../../saved_objects';
+
 import { loggingServiceMock } from '../../logging/logging_service.mock';
 import * as getUpgradeableConfigNS from './get_upgradeable_config';
 import { createOrUpgradeSavedConfig } from './create_or_upgrade_saved_config';
@@ -50,6 +52,7 @@ describe('uiSettings/createOrUpgradeSavedConfig', function() {
         version,
         buildNum,
         log: logger.get(),
+        handleWriteErrors: false,
         ...options,
       });
 
@@ -173,85 +176,64 @@ describe('uiSettings/createOrUpgradeSavedConfig', function() {
     });
   });
 
-  describe('onWriteError()', () => {
-    it('is called with error and attributes when savedObjectsClient.create rejects', async () => {
-      const { run, savedObjectsClient } = setup();
+  describe('handleWriteErrors', () => {
+    describe('handleWriteErrors: false', () => {
+      it('throws write errors', async () => {
+        const { run, savedObjectsClient } = setup();
+        const error = new Error('foo');
+        savedObjectsClient.create.callsFake(async () => {
+          throw error;
+        });
 
-      const error = new Error('foo');
-      savedObjectsClient.create.callsFake(async () => {
-        throw error;
-      });
-
-      const onWriteError = sinon.stub();
-      await run({ onWriteError });
-      sinon.assert.calledOnce(onWriteError);
-      sinon.assert.calledWithExactly(onWriteError, error, {
-        buildNum,
+        await expect(run({ handleWriteErrors: false })).rejects.toThrowError(error);
       });
     });
+    describe('handleWriteErrors:true', () => {
+      it('returns undefined for ConflictError', async () => {
+        const { run, savedObjectsClient } = setup();
+        const error = new Error('foo');
+        savedObjectsClient.create.throws(SavedObjectsErrorHelpers.decorateConflictError(error));
 
-    it('resolves with the return value of onWriteError()', async () => {
-      const { run, savedObjectsClient } = setup();
-
-      savedObjectsClient.create.callsFake(async () => {
-        throw new Error('foo');
+        expect(await run({ handleWriteErrors: true })).toBe(undefined);
       });
 
-      const result = await run({ onWriteError: () => 123 });
-      expect(result).toBe(123);
-    });
-
-    it('rejects with the error from onWriteError() if it rejects', async () => {
-      const { run, savedObjectsClient } = setup();
+      it('returns config attributes for NotAuthorizedError', async () => {
+        const { run, savedObjectsClient } = setup();
+        const error = new Error('foo');
+        savedObjectsClient.create.throws(
+          SavedObjectsErrorHelpers.decorateNotAuthorizedError(error)
+        );
 
-      savedObjectsClient.create.callsFake(async () => {
-        throw new Error('foo');
+        expect(await run({ handleWriteErrors: true })).toEqual({
+          buildNum,
+        });
       });
 
-      try {
-        await run({
-          onWriteError: (error: Error) => Promise.reject(new Error(`${error.message} bar`)),
+      it('returns config attributes for ForbiddenError', async () => {
+        const { run, savedObjectsClient } = setup();
+        const error = new Error('foo');
+        savedObjectsClient.create.throws(SavedObjectsErrorHelpers.decorateForbiddenError(error));
+
+        expect(await run({ handleWriteErrors: true })).toEqual({
+          buildNum,
         });
-        throw new Error('expected run() to reject');
-      } catch (error) {
-        expect(error.message).toBe('foo bar');
-      }
-    });
+      });
 
-    it('rejects with the error from onWriteError() if it throws sync', async () => {
-      const { run, savedObjectsClient } = setup();
+      it('throws error for other SavedObjects exceptions', async () => {
+        const { run, savedObjectsClient } = setup();
+        const error = new Error('foo');
+        savedObjectsClient.create.throws(SavedObjectsErrorHelpers.decorateGeneralError(error));
 
-      savedObjectsClient.create.callsFake(async () => {
-        throw new Error('foo');
+        await expect(run({ handleWriteErrors: true })).rejects.toThrowError(error);
       });
 
-      try {
-        await run({
-          onWriteError: (error: Error) => {
-            throw new Error(`${error.message} bar`);
-          },
-        });
-        throw new Error('expected run() to reject');
-      } catch (error) {
-        expect(error.message).toBe('foo bar');
-      }
-    });
+      it('throws error for all other exceptions', async () => {
+        const { run, savedObjectsClient } = setup();
+        const error = new Error('foo');
+        savedObjectsClient.create.throws(error);
 
-    it('rejects with the writeError if onWriteError() is undefined', async () => {
-      const { run, savedObjectsClient } = setup();
-
-      savedObjectsClient.create.callsFake(async () => {
-        throw new Error('foo');
+        await expect(run({ handleWriteErrors: true })).rejects.toThrowError(error);
       });
-
-      try {
-        await run({
-          onWriteError: undefined,
-        });
-        throw new Error('expected run() to reject');
-      } catch (error) {
-        expect(error.message).toBe('foo');
-      }
     });
   });
 });
diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
index 1655297adb6c9c..809e15248b5b0e 100644
--- a/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
+++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/create_or_upgrade_saved_config.ts
@@ -20,6 +20,7 @@
 import { defaults } from 'lodash';
 
 import { SavedObjectsClientContract, SavedObjectAttribute } from '../../saved_objects/types';
+import { SavedObjectsErrorHelpers } from '../../saved_objects/';
 import { Logger } from '../../logging';
 
 import { getUpgradeableConfig } from './get_upgradeable_config';
@@ -29,15 +30,13 @@ interface Options {
   version: string;
   buildNum: number;
   log: Logger;
-  onWriteError?: <T extends SavedObjectAttribute = any>(
-    error: Error,
-    attributes: Record<string, any>
-  ) => Record<string, T> | undefined;
+  handleWriteErrors: boolean;
 }
+
 export async function createOrUpgradeSavedConfig<T extends SavedObjectAttribute = any>(
   options: Options
 ): Promise<Record<string, T> | undefined> {
-  const { savedObjectsClient, version, buildNum, log, onWriteError } = options;
+  const { savedObjectsClient, version, buildNum, log, handleWriteErrors } = options;
 
   // try to find an older config we can upgrade
   const upgradeableConfig = await getUpgradeableConfig({
@@ -52,8 +51,17 @@ export async function createOrUpgradeSavedConfig<T extends SavedObjectAttribute
     // create the new SavedConfig
     await savedObjectsClient.create('config', attributes, { id: version });
   } catch (error) {
-    if (onWriteError) {
-      return onWriteError(error, attributes);
+    if (handleWriteErrors) {
+      if (SavedObjectsErrorHelpers.isConflictError(error)) {
+        return;
+      }
+
+      if (
+        SavedObjectsErrorHelpers.isNotAuthorizedError(error) ||
+        SavedObjectsErrorHelpers.isForbiddenError(error)
+      ) {
+        return attributes;
+      }
     }
 
     throw error;
diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/get_upgradeable_config.test.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/get_upgradeable_config.test.ts
new file mode 100644
index 00000000000000..5e3307386bcffb
--- /dev/null
+++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/get_upgradeable_config.test.ts
@@ -0,0 +1,86 @@
+/*
+ * 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 { getUpgradeableConfig } from './get_upgradeable_config';
+import { savedObjectsClientMock } from '../../saved_objects/service/saved_objects_client.mock';
+
+describe('getUpgradeableConfig', () => {
+  it('finds saved objects with type "config"', async () => {
+    const savedObjectsClient = savedObjectsClientMock.create();
+    savedObjectsClient.find.mockResolvedValue({
+      saved_objects: [{ id: '7.5.0' }],
+    } as any);
+
+    await getUpgradeableConfig({ savedObjectsClient, version: '7.5.0' });
+    expect(savedObjectsClient.find.mock.calls[0][0].type).toBe('config');
+  });
+
+  it('finds saved config with version < than Kibana version', async () => {
+    const savedConfig = { id: '7.4.0' };
+    const savedObjectsClient = savedObjectsClientMock.create();
+    savedObjectsClient.find.mockResolvedValue({
+      saved_objects: [savedConfig],
+    } as any);
+
+    const result = await getUpgradeableConfig({ savedObjectsClient, version: '7.5.0' });
+    expect(result).toBe(savedConfig);
+  });
+
+  it('finds saved config with RC version === Kibana version', async () => {
+    const savedConfig = { id: '7.5.0-rc1' };
+    const savedObjectsClient = savedObjectsClientMock.create();
+    savedObjectsClient.find.mockResolvedValue({
+      saved_objects: [savedConfig],
+    } as any);
+
+    const result = await getUpgradeableConfig({ savedObjectsClient, version: '7.5.0' });
+    expect(result).toBe(savedConfig);
+  });
+
+  it('does not find saved config with version === Kibana version', async () => {
+    const savedConfig = { id: '7.5.0' };
+    const savedObjectsClient = savedObjectsClientMock.create();
+    savedObjectsClient.find.mockResolvedValue({
+      saved_objects: [savedConfig],
+    } as any);
+
+    const result = await getUpgradeableConfig({ savedObjectsClient, version: '7.5.0' });
+    expect(result).toBe(undefined);
+  });
+
+  it('does not find saved config with version > Kibana version', async () => {
+    const savedConfig = { id: '7.6.0' };
+    const savedObjectsClient = savedObjectsClientMock.create();
+    savedObjectsClient.find.mockResolvedValue({
+      saved_objects: [savedConfig],
+    } as any);
+
+    const result = await getUpgradeableConfig({ savedObjectsClient, version: '7.5.0' });
+    expect(result).toBe(undefined);
+  });
+
+  it('handles empty config', async () => {
+    const savedObjectsClient = savedObjectsClientMock.create();
+    savedObjectsClient.find.mockResolvedValue({
+      saved_objects: [],
+    } as any);
+
+    const result = await getUpgradeableConfig({ savedObjectsClient, version: '7.5.0' });
+    expect(result).toBe(undefined);
+  });
+});
diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
index 83f8ce03299f62..9d52a339ccf91b 100644
--- a/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
+++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
@@ -18,28 +18,31 @@
  */
 
 import expect from '@kbn/expect';
-import { UnwrapPromise } from '@kbn/utility-types';
 import { SavedObjectsClientContract } from 'src/core/server';
 
-import KbnServer from '../../../../../legacy/server/kbn_server';
-import { createTestServers } from '../../../../../test_utils/kbn_server';
+import {
+  createTestServers,
+  TestElasticsearchUtils,
+  TestKibanaUtils,
+  TestUtils,
+} from '../../../../../test_utils/kbn_server';
 import { createOrUpgradeSavedConfig } from '../create_or_upgrade_saved_config';
 import { loggingServiceMock } from '../../../logging/logging_service.mock';
 
 const logger = loggingServiceMock.create().get();
 describe('createOrUpgradeSavedConfig()', () => {
   let savedObjectsClient: SavedObjectsClientContract;
-  let kbnServer: KbnServer;
-  let servers: ReturnType<typeof createTestServers>;
-  let esServer: UnwrapPromise<ReturnType<typeof servers['startES']>>;
-  let kbn: UnwrapPromise<ReturnType<typeof servers['startKibana']>>;
+  let servers: TestUtils;
+  let esServer: TestElasticsearchUtils;
+  let kbn: TestKibanaUtils;
+
+  let kbnServer: TestKibanaUtils['kbnServer'];
 
   beforeAll(async function() {
     servers = createTestServers({
       adjustTimeout: t => {
         jest.setTimeout(t);
       },
-      settings: {},
     });
     esServer = await servers.startES();
     kbn = await servers.startKibana();
@@ -90,6 +93,7 @@ describe('createOrUpgradeSavedConfig()', () => {
       version: '5.4.0',
       buildNum: 54099,
       log: logger,
+      handleWriteErrors: false,
     });
 
     const config540 = await savedObjectsClient.get('config', '5.4.0');
@@ -116,6 +120,7 @@ describe('createOrUpgradeSavedConfig()', () => {
       version: '5.4.1',
       buildNum: 54199,
       log: logger,
+      handleWriteErrors: false,
     });
 
     const config541 = await savedObjectsClient.get('config', '5.4.1');
@@ -142,6 +147,7 @@ describe('createOrUpgradeSavedConfig()', () => {
       version: '7.0.0-rc1',
       buildNum: 70010,
       log: logger,
+      handleWriteErrors: false,
     });
 
     const config700rc1 = await savedObjectsClient.get('config', '7.0.0-rc1');
@@ -169,6 +175,7 @@ describe('createOrUpgradeSavedConfig()', () => {
       version: '7.0.0',
       buildNum: 70099,
       log: logger,
+      handleWriteErrors: false,
     });
 
     const config700 = await savedObjectsClient.get('config', '7.0.0');
@@ -197,6 +204,7 @@ describe('createOrUpgradeSavedConfig()', () => {
       version: '6.2.3-rc1',
       buildNum: 62310,
       log: logger,
+      handleWriteErrors: false,
     });
 
     const config623rc1 = await savedObjectsClient.get('config', '6.2.3-rc1');
diff --git a/src/core/server/ui_settings/index.ts b/src/core/server/ui_settings/index.ts
index edd0bfc4f3a89c..fd0a21bed4e129 100644
--- a/src/core/server/ui_settings/index.ts
+++ b/src/core/server/ui_settings/index.ts
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-export {
-  IUiSettingsClient,
-  UiSettingsClient,
-  UiSettingsServiceOptions,
-} from './ui_settings_client';
+export { UiSettingsClient, UiSettingsServiceOptions } from './ui_settings_client';
 
 export { config } from './ui_settings_config';
+export { UiSettingsService } from './ui_settings_service';
+
 export {
+  UiSettingsServiceSetup,
+  IUiSettingsClient,
   UiSettingsParams,
-  UiSettingsService,
   InternalUiSettingsServiceSetup,
   UiSettingsType,
-} from './ui_settings_service';
+  UserProvidedValues,
+} from './types';
diff --git a/src/legacy/ui/ui_settings/routes/integration_tests/doc_exists.ts b/src/core/server/ui_settings/integration_tests/doc_exists.ts
similarity index 100%
rename from src/legacy/ui/ui_settings/routes/integration_tests/doc_exists.ts
rename to src/core/server/ui_settings/integration_tests/doc_exists.ts
diff --git a/src/legacy/ui/ui_settings/routes/integration_tests/doc_missing.ts b/src/core/server/ui_settings/integration_tests/doc_missing.ts
similarity index 100%
rename from src/legacy/ui/ui_settings/routes/integration_tests/doc_missing.ts
rename to src/core/server/ui_settings/integration_tests/doc_missing.ts
diff --git a/src/legacy/ui/ui_settings/routes/integration_tests/doc_missing_and_index_read_only.ts b/src/core/server/ui_settings/integration_tests/doc_missing_and_index_read_only.ts
similarity index 100%
rename from src/legacy/ui/ui_settings/routes/integration_tests/doc_missing_and_index_read_only.ts
rename to src/core/server/ui_settings/integration_tests/doc_missing_and_index_read_only.ts
diff --git a/src/legacy/ui/ui_settings/routes/integration_tests/index.test.ts b/src/core/server/ui_settings/integration_tests/index.test.ts
similarity index 100%
rename from src/legacy/ui/ui_settings/routes/integration_tests/index.test.ts
rename to src/core/server/ui_settings/integration_tests/index.test.ts
diff --git a/src/legacy/ui/ui_settings/routes/integration_tests/lib/assert.ts b/src/core/server/ui_settings/integration_tests/lib/assert.ts
similarity index 100%
rename from src/legacy/ui/ui_settings/routes/integration_tests/lib/assert.ts
rename to src/core/server/ui_settings/integration_tests/lib/assert.ts
diff --git a/src/legacy/ui/ui_settings/routes/integration_tests/lib/chance.ts b/src/core/server/ui_settings/integration_tests/lib/chance.ts
similarity index 100%
rename from src/legacy/ui/ui_settings/routes/integration_tests/lib/chance.ts
rename to src/core/server/ui_settings/integration_tests/lib/chance.ts
diff --git a/src/legacy/ui/ui_settings/routes/integration_tests/lib/index.ts b/src/core/server/ui_settings/integration_tests/lib/index.ts
similarity index 100%
rename from src/legacy/ui/ui_settings/routes/integration_tests/lib/index.ts
rename to src/core/server/ui_settings/integration_tests/lib/index.ts
diff --git a/src/legacy/ui/ui_settings/routes/integration_tests/lib/servers.ts b/src/core/server/ui_settings/integration_tests/lib/servers.ts
similarity index 83%
rename from src/legacy/ui/ui_settings/routes/integration_tests/lib/servers.ts
rename to src/core/server/ui_settings/integration_tests/lib/servers.ts
index ae0ef1c91411e7..a1be1e7e7291e2 100644
--- a/src/legacy/ui/ui_settings/routes/integration_tests/lib/servers.ts
+++ b/src/core/server/ui_settings/integration_tests/lib/servers.ts
@@ -17,20 +17,24 @@
  * under the License.
  */
 
-import { UnwrapPromise } from '@kbn/utility-types';
 import { SavedObjectsClientContract, IUiSettingsClient } from 'src/core/server';
 
-import KbnServer from '../../../../../server/kbn_server';
-import { createTestServers } from '../../../../../../test_utils/kbn_server';
-import { CallCluster } from '../../../../../../legacy/core_plugins/elasticsearch';
+import {
+  createTestServers,
+  TestElasticsearchUtils,
+  TestKibanaUtils,
+  TestUtils,
+} from '../../../../../test_utils/kbn_server';
+import { CallCluster } from '../../../../../legacy/core_plugins/elasticsearch';
 
-let kbnServer: KbnServer;
-let servers: ReturnType<typeof createTestServers>;
-let esServer: UnwrapPromise<ReturnType<typeof servers['startES']>>;
-let kbn: UnwrapPromise<ReturnType<typeof servers['startKibana']>>;
+let servers: TestUtils;
+let esServer: TestElasticsearchUtils;
+let kbn: TestKibanaUtils;
+
+let kbnServer: TestKibanaUtils['kbnServer'];
 
 interface AllServices {
-  kbnServer: KbnServer;
+  kbnServer: TestKibanaUtils['kbnServer'];
   savedObjectsClient: SavedObjectsClientContract;
   callCluster: CallCluster;
   uiSettings: IUiSettingsClient;
diff --git a/src/core/server/ui_settings/routes/delete.ts b/src/core/server/ui_settings/routes/delete.ts
new file mode 100644
index 00000000000000..ee4c05325fcd44
--- /dev/null
+++ b/src/core/server/ui_settings/routes/delete.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 } from '@kbn/config-schema';
+
+import { IRouter } from '../../http';
+import { SavedObjectsErrorHelpers } from '../../saved_objects';
+import { CannotOverrideError } from '../ui_settings_errors';
+
+const validate = {
+  params: schema.object({
+    key: schema.string(),
+  }),
+};
+
+export function registerDeleteRoute(router: IRouter) {
+  router.delete(
+    { path: '/api/kibana/settings/{key}', validate },
+    async (context, request, response) => {
+      try {
+        const uiSettingsClient = context.core.uiSettings.client;
+
+        await uiSettingsClient.remove(request.params.key);
+
+        return response.ok({
+          body: {
+            settings: await uiSettingsClient.getUserProvided(),
+          },
+        });
+      } catch (error) {
+        if (SavedObjectsErrorHelpers.isSavedObjectsClientError(error)) {
+          return response.customError({
+            body: error,
+            statusCode: error.output.statusCode,
+          });
+        }
+
+        if (error instanceof CannotOverrideError) {
+          return response.badRequest({ body: error });
+        }
+
+        throw error;
+      }
+    }
+  );
+}
diff --git a/src/core/server/ui_settings/routes/get.ts b/src/core/server/ui_settings/routes/get.ts
new file mode 100644
index 00000000000000..d249369a1ace7d
--- /dev/null
+++ b/src/core/server/ui_settings/routes/get.ts
@@ -0,0 +1,45 @@
+/*
+ * 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 { IRouter } from '../../http';
+import { SavedObjectsErrorHelpers } from '../../saved_objects';
+
+export function registerGetRoute(router: IRouter) {
+  router.get(
+    { path: '/api/kibana/settings', validate: false },
+    async (context, request, response) => {
+      try {
+        const uiSettingsClient = context.core.uiSettings.client;
+        return response.ok({
+          body: {
+            settings: await uiSettingsClient.getUserProvided(),
+          },
+        });
+      } catch (error) {
+        if (SavedObjectsErrorHelpers.isSavedObjectsClientError(error)) {
+          return response.customError({
+            body: error,
+            statusCode: error.output.statusCode,
+          });
+        }
+
+        throw error;
+      }
+    }
+  );
+}
diff --git a/src/core/server/ui_settings/routes/index.ts b/src/core/server/ui_settings/routes/index.ts
new file mode 100644
index 00000000000000..d70d55d7259387
--- /dev/null
+++ b/src/core/server/ui_settings/routes/index.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { IRouter } from 'src/core/server';
+
+import { registerDeleteRoute } from './delete';
+import { registerGetRoute } from './get';
+import { registerSetManyRoute } from './set_many';
+import { registerSetRoute } from './set';
+
+export function registerRoutes(router: IRouter) {
+  registerGetRoute(router);
+  registerDeleteRoute(router);
+  registerSetRoute(router);
+  registerSetManyRoute(router);
+}
diff --git a/src/core/server/ui_settings/routes/set.ts b/src/core/server/ui_settings/routes/set.ts
new file mode 100644
index 00000000000000..51ad256b51335f
--- /dev/null
+++ b/src/core/server/ui_settings/routes/set.ts
@@ -0,0 +1,67 @@
+/*
+ * 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 } from '@kbn/config-schema';
+
+import { IRouter } from '../../http';
+import { SavedObjectsErrorHelpers } from '../../saved_objects';
+import { CannotOverrideError } from '../ui_settings_errors';
+
+const validate = {
+  params: schema.object({
+    key: schema.string(),
+  }),
+  body: schema.object({
+    value: schema.any(),
+  }),
+};
+
+export function registerSetRoute(router: IRouter) {
+  router.post(
+    { path: '/api/kibana/settings/{key}', validate },
+    async (context, request, response) => {
+      try {
+        const uiSettingsClient = context.core.uiSettings.client;
+
+        const { key } = request.params;
+        const { value } = request.body;
+
+        await uiSettingsClient.set(key, value);
+
+        return response.ok({
+          body: {
+            settings: await uiSettingsClient.getUserProvided(),
+          },
+        });
+      } catch (error) {
+        if (SavedObjectsErrorHelpers.isSavedObjectsClientError(error)) {
+          return response.customError({
+            body: error,
+            statusCode: error.output.statusCode,
+          });
+        }
+
+        if (error instanceof CannotOverrideError) {
+          return response.badRequest({ body: error });
+        }
+
+        throw error;
+      }
+    }
+  );
+}
diff --git a/src/core/server/ui_settings/routes/set_many.ts b/src/core/server/ui_settings/routes/set_many.ts
new file mode 100644
index 00000000000000..3794eba004beea
--- /dev/null
+++ b/src/core/server/ui_settings/routes/set_many.ts
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { schema } from '@kbn/config-schema';
+
+import { IRouter } from '../../http';
+import { SavedObjectsErrorHelpers } from '../../saved_objects';
+import { CannotOverrideError } from '../ui_settings_errors';
+
+const validate = {
+  body: schema.object({
+    changes: schema.object({}, { allowUnknowns: true }),
+  }),
+};
+
+export function registerSetManyRoute(router: IRouter) {
+  router.post({ path: '/api/kibana/settings', validate }, async (context, request, response) => {
+    try {
+      const uiSettingsClient = context.core.uiSettings.client;
+
+      const { changes } = request.body;
+
+      await uiSettingsClient.setMany(changes);
+
+      return response.ok({
+        body: {
+          settings: await uiSettingsClient.getUserProvided(),
+        },
+      });
+    } catch (error) {
+      if (SavedObjectsErrorHelpers.isSavedObjectsClientError(error)) {
+        return response.customError({
+          body: error,
+          statusCode: error.output.statusCode,
+        });
+      }
+
+      if (error instanceof CannotOverrideError) {
+        return response.badRequest({ body: error });
+      }
+
+      throw error;
+    }
+  });
+}
diff --git a/src/core/server/ui_settings/types.ts b/src/core/server/ui_settings/types.ts
new file mode 100644
index 00000000000000..0fa6b3702af241
--- /dev/null
+++ b/src/core/server/ui_settings/types.ts
@@ -0,0 +1,141 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { SavedObjectsClientContract, SavedObjectAttribute } from '../saved_objects/types';
+/**
+ * Server-side client that provides access to the advanced settings stored in elasticsearch.
+ * The settings provide control over the behavior of the Kibana application.
+ * For example, a user can specify how to display numeric or date fields.
+ * Users can adjust the settings via Management UI.
+ *
+ * @public
+ */
+export interface IUiSettingsClient {
+  /**
+   * Returns registered uiSettings values {@link UiSettingsParams}
+   */
+  getRegistered: () => Readonly<Record<string, UiSettingsParams>>;
+  /**
+   * Retrieves uiSettings values set by the user with fallbacks to default values if not specified.
+   */
+  get: <T extends SavedObjectAttribute = any>(key: string) => Promise<T>;
+  /**
+   * Retrieves a set of all uiSettings values set by the user with fallbacks to default values if not specified.
+   */
+  getAll: <T extends SavedObjectAttribute = any>() => Promise<Record<string, T>>;
+  /**
+   * Retrieves a set of all uiSettings values set by the user.
+   */
+  getUserProvided: <T extends SavedObjectAttribute = any>() => Promise<
+    Record<string, UserProvidedValues<T>>
+  >;
+  /**
+   * Writes multiple uiSettings values and marks them as set by the user.
+   */
+  setMany: <T extends SavedObjectAttribute = any>(changes: Record<string, T>) => Promise<void>;
+  /**
+   * Writes uiSettings value and marks it as set by the user.
+   */
+  set: <T extends SavedObjectAttribute = any>(key: string, value: T) => Promise<void>;
+  /**
+   * Removes uiSettings value by key.
+   */
+  remove: (key: string) => Promise<void>;
+  /**
+   * Removes multiple uiSettings values by keys.
+   */
+  removeMany: (keys: string[]) => Promise<void>;
+  /**
+   * Shows whether the uiSettings value set by the user.
+   */
+  isOverridden: (key: string) => boolean;
+}
+
+/**
+ * Describes the values explicitly set by user.
+ * @public
+ * */
+export interface UserProvidedValues<T extends SavedObjectAttribute = any> {
+  userValue?: T;
+  isOverridden?: boolean;
+}
+
+/**
+ * UI element type to represent the settings.
+ * @public
+ * */
+export type UiSettingsType = 'json' | 'markdown' | 'number' | 'select' | 'boolean' | 'string';
+
+/**
+ * UiSettings parameters defined by the plugins.
+ * @public
+ * */
+export interface UiSettingsParams {
+  /** title in the UI */
+  name?: string;
+  /** default value to fall back to if a user doesn't provide any */
+  value?: SavedObjectAttribute;
+  /** description provided to a user in UI */
+  description?: string;
+  /** used to group the configured setting in the UI */
+  category?: string[];
+  /** array of permitted values for this setting */
+  options?: string[];
+  /** text labels for 'select' type UI element */
+  optionLabels?: Record<string, string>;
+  /** a flag indicating whether new value applying requires page reloading */
+  requiresPageReload?: boolean;
+  /** a flag indicating that value cannot be changed */
+  readonly?: boolean;
+  /** defines a type of UI element {@link UiSettingsType} */
+  type?: UiSettingsType;
+}
+
+/** @internal */
+export interface InternalUiSettingsServiceSetup {
+  /**
+   * Sets settings with default values for the uiSettings.
+   * @param settings
+   */
+  register(settings: Record<string, UiSettingsParams>): void;
+  /**
+   * Creates uiSettings client with provided *scoped* saved objects client {@link IUiSettingsClient}
+   * @param savedObjectsClient
+   */
+  asScopedToClient(savedObjectsClient: SavedObjectsClientContract): IUiSettingsClient;
+}
+
+/** @public */
+export interface UiSettingsServiceSetup {
+  /**
+   * Sets settings with default values for the uiSettings.
+   * @param settings
+   *
+   * @example
+   * setup(core: CoreSetup){
+   *  core.uiSettings.register([{
+   *   foo: {
+   *    name: i18n.translate('my foo settings'),
+   *    value: true,
+   *    description: 'add some awesomeness',
+   *   },
+   *  }]);
+   * }
+   */
+  register(settings: Record<string, UiSettingsParams>): void;
+}
diff --git a/src/core/server/ui_settings/ui_settings_client.test.ts b/src/core/server/ui_settings/ui_settings_client.test.ts
index 59c13fbebee70b..1c99637a89fed3 100644
--- a/src/core/server/ui_settings/ui_settings_client.test.ts
+++ b/src/core/server/ui_settings/ui_settings_client.test.ts
@@ -24,6 +24,7 @@ import sinon from 'sinon';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 
 import { UiSettingsClient } from './ui_settings_client';
+import { CannotOverrideError } from './ui_settings_errors';
 import * as createOrUpgradeSavedConfigNS from './create_or_upgrade_saved_config/create_or_upgrade_saved_config';
 import { createObjectsClientStub, savedObjectsClientErrors } from './create_objects_client_stub';
 
@@ -119,7 +120,12 @@ describe('ui settings', () => {
 
       await uiSettings.setMany({ foo: 'bar' });
       sinon.assert.calledTwice(savedObjectsClient.update);
+
       sinon.assert.calledOnce(createOrUpgradeSavedConfig);
+      sinon.assert.calledWith(
+        createOrUpgradeSavedConfig,
+        sinon.match({ handleWriteErrors: false })
+      );
     });
 
     it('only tried to auto create once and throws NotFound', async () => {
@@ -135,9 +141,14 @@ describe('ui settings', () => {
 
       sinon.assert.calledTwice(savedObjectsClient.update);
       sinon.assert.calledOnce(createOrUpgradeSavedConfig);
+
+      sinon.assert.calledWith(
+        createOrUpgradeSavedConfig,
+        sinon.match({ handleWriteErrors: false })
+      );
     });
 
-    it('throws an error if any key is overridden', async () => {
+    it('throws CannotOverrideError if the key is overridden', async () => {
       const { uiSettings } = setup({
         overrides: {
           foo: 'bar',
@@ -150,6 +161,7 @@ describe('ui settings', () => {
           foo: 'baz',
         });
       } catch (error) {
+        expect(error).to.be.a(CannotOverrideError);
         expect(error.message).to.be('Unable to update "foo" because it is overridden');
       }
     });
@@ -167,7 +179,7 @@ describe('ui settings', () => {
       assertUpdateQuery({ one: 'value' });
     });
 
-    it('throws an error if the key is overridden', async () => {
+    it('throws CannotOverrideError if the key is overridden', async () => {
       const { uiSettings } = setup({
         overrides: {
           foo: 'bar',
@@ -177,6 +189,7 @@ describe('ui settings', () => {
       try {
         await uiSettings.set('foo', 'baz');
       } catch (error) {
+        expect(error).to.be.a(CannotOverrideError);
         expect(error.message).to.be('Unable to update "foo" because it is overridden');
       }
     });
@@ -194,7 +207,7 @@ describe('ui settings', () => {
       assertUpdateQuery({ one: null });
     });
 
-    it('throws an error if the key is overridden', async () => {
+    it('throws CannotOverrideError if the key is overridden', async () => {
       const { uiSettings } = setup({
         overrides: {
           foo: 'bar',
@@ -204,6 +217,7 @@ describe('ui settings', () => {
       try {
         await uiSettings.remove('foo');
       } catch (error) {
+        expect(error).to.be.a(CannotOverrideError);
         expect(error.message).to.be('Unable to update "foo" because it is overridden');
       }
     });
@@ -227,7 +241,7 @@ describe('ui settings', () => {
       assertUpdateQuery({ one: null, two: null, three: null });
     });
 
-    it('throws an error if any key is overridden', async () => {
+    it('throws CannotOverrideError if any key is overridden', async () => {
       const { uiSettings } = setup({
         overrides: {
           foo: 'bar',
@@ -237,18 +251,18 @@ describe('ui settings', () => {
       try {
         await uiSettings.setMany({ baz: 'baz', foo: 'foo' });
       } catch (error) {
+        expect(error).to.be.a(CannotOverrideError);
         expect(error.message).to.be('Unable to update "foo" because it is overridden');
       }
     });
   });
 
-  describe('#getDefaults()', () => {
-    it('returns the defaults passed to the constructor', () => {
+  describe('#getRegistered()', () => {
+    it('returns the registered settings passed to the constructor', () => {
       const value = chance.word();
-      const { uiSettings } = setup({ defaults: { key: { value } } });
-      expect(uiSettings.getDefaults()).to.eql({
-        key: { value },
-      });
+      const defaults = { key: { value } };
+      const { uiSettings } = setup({ defaults });
+      expect(uiSettings.getRegistered()).to.be(defaults);
     });
   });
 
@@ -284,31 +298,48 @@ describe('ui settings', () => {
       });
     });
 
-    it.skip('returns an empty object on NotFound responses', async () => {
-      const { uiSettings, savedObjectsClient } = setup();
+    it('automatically creates the savedConfig if it is missing and returns empty object', async () => {
+      const { uiSettings, savedObjectsClient, createOrUpgradeSavedConfig } = setup();
+      savedObjectsClient.get
+        .onFirstCall()
+        .throws(savedObjectsClientErrors.createGenericNotFoundError())
+        .onSecondCall()
+        .returns({ attributes: {} });
 
-      const error = savedObjectsClientErrors.createGenericNotFoundError();
-      savedObjectsClient.get.throws(error);
+      expect(await uiSettings.getUserProvided()).to.eql({});
+
+      sinon.assert.calledTwice(savedObjectsClient.get);
+
+      sinon.assert.calledOnce(createOrUpgradeSavedConfig);
+      sinon.assert.calledWith(createOrUpgradeSavedConfig, sinon.match({ handleWriteErrors: true }));
+    });
 
-      expect(await uiSettings.getUserProvided({})).to.eql({});
+    it('returns result of savedConfig creation in case of notFound error', async () => {
+      const { uiSettings, savedObjectsClient, createOrUpgradeSavedConfig } = setup();
+      createOrUpgradeSavedConfig.resolves({ foo: 'bar ' });
+      savedObjectsClient.get.throws(savedObjectsClientErrors.createGenericNotFoundError());
+
+      expect(await uiSettings.getUserProvided()).to.eql({ foo: { userValue: 'bar ' } });
     });
 
     it('returns an empty object on Forbidden responses', async () => {
-      const { uiSettings, savedObjectsClient } = setup();
+      const { uiSettings, savedObjectsClient, createOrUpgradeSavedConfig } = setup();
 
       const error = savedObjectsClientErrors.decorateForbiddenError(new Error());
       savedObjectsClient.get.throws(error);
 
       expect(await uiSettings.getUserProvided()).to.eql({});
+      sinon.assert.notCalled(createOrUpgradeSavedConfig);
     });
 
     it('returns an empty object on EsUnavailable responses', async () => {
-      const { uiSettings, savedObjectsClient } = setup();
+      const { uiSettings, savedObjectsClient, createOrUpgradeSavedConfig } = setup();
 
       const error = savedObjectsClientErrors.decorateEsUnavailableError(new Error());
       savedObjectsClient.get.throws(error);
 
       expect(await uiSettings.getUserProvided()).to.eql({});
+      sinon.assert.notCalled(createOrUpgradeSavedConfig);
     });
 
     it('throws Unauthorized errors', async () => {
@@ -346,6 +377,7 @@ describe('ui settings', () => {
 
       const overrides = {
         foo: 'bar',
+        baz: null,
       };
 
       const { uiSettings } = setup({ esDocSource, overrides });
@@ -357,57 +389,7 @@ describe('ui settings', () => {
           userValue: 'bar',
           isOverridden: true,
         },
-      });
-    });
-  });
-
-  describe('#getRaw()', () => {
-    it('pulls user configuration from ES', async () => {
-      const esDocSource = {};
-      const { uiSettings, assertGetQuery } = setup({ esDocSource });
-      await uiSettings.getRaw();
-      assertGetQuery();
-    });
-
-    it(`without user configuration it's equal to the defaults`, async () => {
-      const esDocSource = {};
-      const defaults = { key: { value: chance.word() } };
-      const { uiSettings } = setup({ esDocSource, defaults });
-      const result = await uiSettings.getRaw();
-      expect(result).to.eql(defaults);
-    });
-
-    it(`user configuration gets merged with defaults`, async () => {
-      const esDocSource = { foo: 'bar' };
-      const defaults = { key: { value: chance.word() } };
-      const { uiSettings } = setup({ esDocSource, defaults });
-      const result = await uiSettings.getRaw();
-
-      expect(result).to.eql({
-        foo: {
-          userValue: 'bar',
-        },
-        key: {
-          value: defaults.key.value,
-        },
-      });
-    });
-
-    it('includes the values for overridden keys', async () => {
-      const esDocSource = { foo: 'bar' };
-      const defaults = { key: { value: chance.word() } };
-      const overrides = { foo: true };
-      const { uiSettings } = setup({ esDocSource, defaults, overrides });
-      const result = await uiSettings.getRaw();
-
-      expect(result).to.eql({
-        foo: {
-          userValue: true,
-          isOverridden: true,
-        },
-        key: {
-          value: defaults.key.value,
-        },
+        baz: { isOverridden: true },
       });
     });
   });
@@ -545,22 +527,4 @@ describe('ui settings', () => {
       expect(uiSettings.isOverridden('bar')).to.be(true);
     });
   });
-
-  describe('#assertUpdateAllowed()', () => {
-    it('returns false if no overrides defined', () => {
-      const { uiSettings } = setup();
-      expect(uiSettings.assertUpdateAllowed('foo')).to.be(undefined);
-    });
-    it('throws 400 Boom error when keys is overridden', () => {
-      const { uiSettings } = setup({ overrides: { foo: true } });
-      expect(() => uiSettings.assertUpdateAllowed('foo')).to.throwError(error => {
-        expect(error).to.have.property(
-          'message',
-          'Unable to update "foo" because it is overridden'
-        );
-        expect(error).to.have.property('isBoom', true);
-        expect(error.output).to.have.property('statusCode', 400);
-      });
-    });
-  });
 });
diff --git a/src/core/server/ui_settings/ui_settings_client.ts b/src/core/server/ui_settings/ui_settings_client.ts
index c495d1b4c45671..423ff2a1dfd909 100644
--- a/src/core/server/ui_settings/ui_settings_client.ts
+++ b/src/core/server/ui_settings/ui_settings_client.ts
@@ -17,12 +17,13 @@
  * under the License.
  */
 import { defaultsDeep } from 'lodash';
-import Boom from 'boom';
 
+import { SavedObjectsErrorHelpers } from '../saved_objects';
 import { SavedObjectsClientContract, SavedObjectAttribute } from '../saved_objects/types';
 import { Logger } from '../logging';
 import { createOrUpgradeSavedConfig } from './create_or_upgrade_saved_config';
-import { UiSettingsParams } from './ui_settings_service';
+import { IUiSettingsClient, UiSettingsParams } from './types';
+import { CannotOverrideError } from './ui_settings_errors';
 
 export interface UiSettingsServiceOptions {
   type: string;
@@ -49,52 +50,6 @@ type UiSettingsRawValue = UiSettingsParams & UserProvidedValue;
 type UserProvided<T extends SavedObjectAttribute = any> = Record<string, UserProvidedValue<T>>;
 type UiSettingsRaw = Record<string, UiSettingsRawValue>;
 
-/**
- * Service that provides access to the UiSettings stored in elasticsearch.
- *
- * @public
- */
-export interface IUiSettingsClient {
-  /**
-   * Returns uiSettings default values {@link UiSettingsParams}
-   */
-  getDefaults: () => Record<string, UiSettingsParams>;
-  /**
-   * Retrieves uiSettings values set by the user with fallbacks to default values if not specified.
-   */
-  get: <T extends SavedObjectAttribute = any>(key: string) => Promise<T>;
-  /**
-   * Retrieves a set of all uiSettings values set by the user with fallbacks to default values if not specified.
-   */
-  getAll: <T extends SavedObjectAttribute = any>() => Promise<Record<string, T>>;
-  /**
-   * Retrieves a set of all uiSettings values set by the user.
-   */
-  getUserProvided: <T extends SavedObjectAttribute = any>() => Promise<
-    Record<string, { userValue?: T; isOverridden?: boolean }>
-  >;
-  /**
-   * Writes multiple uiSettings values and marks them as set by the user.
-   */
-  setMany: <T extends SavedObjectAttribute = any>(changes: Record<string, T>) => Promise<void>;
-  /**
-   * Writes uiSettings value and marks it as set by the user.
-   */
-  set: <T extends SavedObjectAttribute = any>(key: string, value: T) => Promise<void>;
-  /**
-   * Removes uiSettings value by key.
-   */
-  remove: (key: string) => Promise<void>;
-  /**
-   * Removes multiple uiSettings values by keys.
-   */
-  removeMany: (keys: string[]) => Promise<void>;
-  /**
-   * Shows whether the uiSettings value set by the user.
-   */
-  isOverridden: (key: string) => boolean;
-}
-
 export class UiSettingsClient implements IUiSettingsClient {
   private readonly type: UiSettingsServiceOptions['type'];
   private readonly id: UiSettingsServiceOptions['id'];
@@ -116,7 +71,7 @@ export class UiSettingsClient implements IUiSettingsClient {
     this.log = log;
   }
 
-  getDefaults() {
+  getRegistered() {
     return this.defaults;
   }
 
@@ -138,19 +93,11 @@ export class UiSettingsClient implements IUiSettingsClient {
     );
   }
 
-  // NOTE: should be a private method
-  async getRaw(): Promise<UiSettingsRaw> {
-    const userProvided = await this.getUserProvided();
-    return defaultsDeep(userProvided, this.defaults);
-  }
-
-  async getUserProvided<T extends SavedObjectAttribute = any>(
-    options: ReadOptions = {}
-  ): Promise<UserProvided<T>> {
+  async getUserProvided<T extends SavedObjectAttribute = any>(): Promise<UserProvided<T>> {
     const userProvided: UserProvided = {};
 
     // write the userValue for each key stored in the saved object that is not overridden
-    for (const [key, userValue] of Object.entries(await this.read(options))) {
+    for (const [key, userValue] of Object.entries(await this.read())) {
       if (userValue !== null && !this.isOverridden(key)) {
         userProvided[key] = {
           userValue,
@@ -192,13 +139,17 @@ export class UiSettingsClient implements IUiSettingsClient {
     return this.overrides.hasOwnProperty(key);
   }
 
-  // NOTE: should be private method
-  assertUpdateAllowed(key: string) {
+  private assertUpdateAllowed(key: string) {
     if (this.isOverridden(key)) {
-      throw Boom.badRequest(`Unable to update "${key}" because it is overridden`);
+      throw new CannotOverrideError(`Unable to update "${key}" because it is overridden`);
     }
   }
 
+  private async getRaw(): Promise<UiSettingsRaw> {
+    const userProvided = await this.getUserProvided();
+    return defaultsDeep(userProvided, this.defaults);
+  }
+
   private async write<T extends SavedObjectAttribute = any>({
     changes,
     autoCreateOrUpgradeIfMissing = true,
@@ -213,8 +164,7 @@ export class UiSettingsClient implements IUiSettingsClient {
     try {
       await this.savedObjectsClient.update(this.type, this.id, changes);
     } catch (error) {
-      const { isNotFoundError } = this.savedObjectsClient.errors;
-      if (!isNotFoundError(error) || !autoCreateOrUpgradeIfMissing) {
+      if (!SavedObjectsErrorHelpers.isNotFoundError(error) || !autoCreateOrUpgradeIfMissing) {
         throw error;
       }
 
@@ -223,6 +173,7 @@ export class UiSettingsClient implements IUiSettingsClient {
         version: this.id,
         buildNum: this.buildNum,
         log: this.log,
+        handleWriteErrors: false,
       });
 
       await this.write({
@@ -236,37 +187,17 @@ export class UiSettingsClient implements IUiSettingsClient {
     ignore401Errors = false,
     autoCreateOrUpgradeIfMissing = true,
   }: ReadOptions = {}): Promise<Record<string, T>> {
-    const {
-      isConflictError,
-      isNotFoundError,
-      isForbiddenError,
-      isNotAuthorizedError,
-    } = this.savedObjectsClient.errors;
-
     try {
       const resp = await this.savedObjectsClient.get(this.type, this.id);
       return resp.attributes;
     } catch (error) {
-      if (isNotFoundError(error) && autoCreateOrUpgradeIfMissing) {
+      if (SavedObjectsErrorHelpers.isNotFoundError(error) && autoCreateOrUpgradeIfMissing) {
         const failedUpgradeAttributes = await createOrUpgradeSavedConfig<T>({
           savedObjectsClient: this.savedObjectsClient,
           version: this.id,
           buildNum: this.buildNum,
           log: this.log,
-          onWriteError(writeError, attributes) {
-            if (isConflictError(writeError)) {
-              // trigger `!failedUpgradeAttributes` check below, since another
-              // request caused the uiSettings object to be created so we can
-              // just re-read
-              return;
-            }
-
-            if (isNotAuthorizedError(writeError) || isForbiddenError(writeError)) {
-              return attributes;
-            }
-
-            throw writeError;
-          },
+          handleWriteErrors: true,
         });
 
         if (!failedUpgradeAttributes) {
diff --git a/src/core/server/ui_settings/ui_settings_errors.ts b/src/core/server/ui_settings/ui_settings_errors.ts
new file mode 100644
index 00000000000000..d8fc32b111e448
--- /dev/null
+++ b/src/core/server/ui_settings/ui_settings_errors.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export class CannotOverrideError extends Error {
+  public cause?: Error;
+
+  constructor(message: string, cause?: Error) {
+    super(message);
+    this.cause = cause;
+
+    // Set the prototype explicitly, see:
+    // https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#extending-built-ins-like-error-array-and-map-may-no-longer-work
+    Object.setPrototypeOf(this, CannotOverrideError.prototype);
+  }
+}
diff --git a/src/core/server/ui_settings/ui_settings_service.mock.ts b/src/core/server/ui_settings/ui_settings_service.mock.ts
index 2127faf0d20299..bb21109a2f9674 100644
--- a/src/core/server/ui_settings/ui_settings_service.mock.ts
+++ b/src/core/server/ui_settings/ui_settings_service.mock.ts
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-import { IUiSettingsClient } from './ui_settings_client';
-import { InternalUiSettingsServiceSetup } from './ui_settings_service';
+import { IUiSettingsClient, InternalUiSettingsServiceSetup } from './types';
 
 const createClientMock = () => {
   const mocked: jest.Mocked<IUiSettingsClient> = {
-    getDefaults: jest.fn(),
+    getRegistered: jest.fn(),
     get: jest.fn(),
     getAll: jest.fn(),
     getUserProvided: jest.fn(),
@@ -38,7 +37,7 @@ const createClientMock = () => {
 
 const createSetupMock = () => {
   const mocked: jest.Mocked<InternalUiSettingsServiceSetup> = {
-    setDefaults: jest.fn(),
+    register: jest.fn(),
     asScopedToClient: jest.fn(),
   };
 
@@ -48,6 +47,6 @@ const createSetupMock = () => {
 };
 
 export const uiSettingsServiceMock = {
-  createSetup: createSetupMock,
+  createSetupContract: createSetupMock,
   createClient: createClientMock,
 };
diff --git a/src/core/server/ui_settings/ui_settings_service.test.ts b/src/core/server/ui_settings/ui_settings_service.test.ts
index 832d61bdb41373..d7a085a220190b 100644
--- a/src/core/server/ui_settings/ui_settings_service.test.ts
+++ b/src/core/server/ui_settings/ui_settings_service.test.ts
@@ -23,7 +23,7 @@ import { MockUiSettingsClientConstructor } from './ui_settings_service.test.mock
 import { UiSettingsService } from './ui_settings_service';
 import { httpServiceMock } from '../http/http_service.mock';
 import { loggingServiceMock } from '../logging/logging_service.mock';
-import { SavedObjectsClientMock } from '../mocks';
+import { savedObjectsClientMock } from '../mocks';
 import { mockCoreContext } from '../core_context.mock';
 
 const overrides = {
@@ -43,7 +43,7 @@ const coreContext = mockCoreContext.create();
 coreContext.configService.atPath.mockReturnValue(new BehaviorSubject({ overrides }));
 const httpSetup = httpServiceMock.createSetupContract();
 const setupDeps = { http: httpSetup };
-const savedObjectsClient = SavedObjectsClientMock.create();
+const savedObjectsClient = savedObjectsClientMock.create();
 
 afterEach(() => {
   MockUiSettingsClientConstructor.mockClear();
@@ -52,6 +52,14 @@ afterEach(() => {
 describe('uiSettings', () => {
   describe('#setup', () => {
     describe('#asScopedToClient', () => {
+      it('passes saved object type "config" to UiSettingsClient', async () => {
+        const service = new UiSettingsService(coreContext);
+        const setup = await service.setup(setupDeps);
+        setup.asScopedToClient(savedObjectsClient);
+        expect(MockUiSettingsClientConstructor).toBeCalledTimes(1);
+        expect(MockUiSettingsClientConstructor.mock.calls[0][0].type).toBe('config');
+      });
+
       it('passes overrides to UiSettingsClient', async () => {
         const service = new UiSettingsService(coreContext);
         const setup = await service.setup(setupDeps);
@@ -86,7 +94,7 @@ describe('uiSettings', () => {
         const service = new UiSettingsService(coreContext);
         const setup = await service.setup(setupDeps);
 
-        setup.setDefaults(defaults);
+        setup.register(defaults);
         setup.asScopedToClient(savedObjectsClient);
         expect(MockUiSettingsClientConstructor).toBeCalledTimes(1);
 
@@ -95,13 +103,13 @@ describe('uiSettings', () => {
       });
     });
 
-    describe('#setDefaults', () => {
-      it('throws if set defaults for the same key twice', async () => {
+    describe('#register', () => {
+      it('throws if registers the same key twice', async () => {
         const service = new UiSettingsService(coreContext);
         const setup = await service.setup(setupDeps);
-        setup.setDefaults(defaults);
-        expect(() => setup.setDefaults(defaults)).toThrowErrorMatchingInlineSnapshot(
-          `"uiSettings defaults for key [foo] has been already set"`
+        setup.register(defaults);
+        expect(() => setup.register(defaults)).toThrowErrorMatchingInlineSnapshot(
+          `"uiSettings for the key [foo] has been already registered"`
         );
       });
     });
diff --git a/src/core/server/ui_settings/ui_settings_service.ts b/src/core/server/ui_settings/ui_settings_service.ts
index 746fa514c5d4bc..a8f5663f8bd1ed 100644
--- a/src/core/server/ui_settings/ui_settings_service.ts
+++ b/src/core/server/ui_settings/ui_settings_service.ts
@@ -26,58 +26,16 @@ import { Logger } from '../logging';
 import { SavedObjectsClientContract, SavedObjectAttribute } from '../saved_objects/types';
 import { InternalHttpServiceSetup } from '../http';
 import { UiSettingsConfigType } from './ui_settings_config';
-import { IUiSettingsClient, UiSettingsClient } from './ui_settings_client';
+import { UiSettingsClient } from './ui_settings_client';
+import { InternalUiSettingsServiceSetup, UiSettingsParams } from './types';
 import { mapToObject } from '../../utils/';
 
+import { registerRoutes } from './routes';
+
 interface SetupDeps {
   http: InternalHttpServiceSetup;
 }
 
-/**
- * UI element type to represent the settings.
- * @public
- * */
-export type UiSettingsType = 'json' | 'markdown' | 'number' | 'select' | 'boolean' | 'string';
-
-/**
- * UiSettings parameters defined by the plugins.
- * @public
- * */
-export interface UiSettingsParams {
-  /** title in the UI */
-  name: string;
-  /** default value to fall back to if a user doesn't provide any */
-  value: SavedObjectAttribute;
-  /** description provided to a user in UI */
-  description: string;
-  /** used to group the configured setting in the UI */
-  category: string[];
-  /** a range of valid values */
-  options?: string[];
-  /** text labels for 'select' type UI element */
-  optionLabels?: Record<string, string>;
-  /** a flag indicating whether new value applying requires page reloading */
-  requiresPageReload?: boolean;
-  /** a flag indicating that value cannot be changed */
-  readonly?: boolean;
-  /** defines a type of UI element {@link UiSettingsType} */
-  type?: UiSettingsType;
-}
-
-/** @internal */
-export interface InternalUiSettingsServiceSetup {
-  /**
-   * Sets the parameters with default values for the uiSettings.
-   * @param values
-   */
-  setDefaults(values: Record<string, UiSettingsParams>): void;
-  /**
-   * Creates uiSettings client with provided *scoped* saved objects client {@link IUiSettingsClient}
-   * @param values
-   */
-  asScopedToClient(savedObjectsClient: SavedObjectsClientContract): IUiSettingsClient;
-}
-
 /** @internal */
 export class UiSettingsService implements CoreService<InternalUiSettingsServiceSetup> {
   private readonly log: Logger;
@@ -90,12 +48,13 @@ export class UiSettingsService implements CoreService<InternalUiSettingsServiceS
   }
 
   public async setup(deps: SetupDeps): Promise<InternalUiSettingsServiceSetup> {
+    registerRoutes(deps.http.createRouter(''));
     this.log.debug('Setting up ui settings service');
     const overrides = await this.getOverrides(deps);
     const { version, buildNum } = this.coreContext.env.packageInfo;
 
     return {
-      setDefaults: this.setDefaults.bind(this),
+      register: this.register.bind(this),
       asScopedToClient: (savedObjectsClient: SavedObjectsClientContract) => {
         return new UiSettingsClient({
           type: 'config',
@@ -114,10 +73,10 @@ export class UiSettingsService implements CoreService<InternalUiSettingsServiceS
 
   public async stop() {}
 
-  private setDefaults(values: Record<string, UiSettingsParams> = {}) {
-    Object.entries(values).forEach(([key, value]) => {
+  private register(settings: Record<string, UiSettingsParams> = {}) {
+    Object.entries(settings).forEach(([key, value]) => {
       if (this.uiSettingsDefaults.has(key)) {
-        throw new Error(`uiSettings defaults for key [${key}] has been already set`);
+        throw new Error(`uiSettings for the key [${key}] has been already registered`);
       }
       this.uiSettingsDefaults.set(key, value);
     });
diff --git a/src/core/utils/index.ts b/src/core/utils/index.ts
index b6ffb57db975c1..98f0800feae79a 100644
--- a/src/core/utils/index.ts
+++ b/src/core/utils/index.ts
@@ -22,5 +22,6 @@ export * from './context';
 export * from './deep_freeze';
 export * from './get';
 export * from './map_to_object';
+export * from './merge';
 export * from './pick';
 export * from './url';
diff --git a/src/core/utils/integration_tests/deep_freeze.test.ts b/src/core/utils/integration_tests/deep_freeze.test.ts
index a9440f70ae4707..e6625542bc38ae 100644
--- a/src/core/utils/integration_tests/deep_freeze.test.ts
+++ b/src/core/utils/integration_tests/deep_freeze.test.ts
@@ -27,16 +27,14 @@ it(
   'types return values to prevent mutations in typescript',
   async () => {
     await expect(
-      execa.stdout('tsc', ['--noEmit'], {
+      execa('tsc', ['--noEmit'], {
         cwd: resolve(__dirname, '__fixtures__/frozen_object_mutation'),
-      })
-    ).rejects.toThrowErrorMatchingInlineSnapshot(`
-"Command failed: tsc --noEmit
-
-index.ts(28,12): error TS2540: Cannot assign to 'baz' because it is a read-only property.
-index.ts(36,11): error TS2540: Cannot assign to 'bar' because it is a read-only property.
-"
-`);
+        preferLocal: true,
+      }).catch(err => err.stdout)
+    ).resolves.toMatchInlineSnapshot(`
+      "index.ts(28,12): error TS2540: Cannot assign to 'baz' because it is a read-only property.
+      index.ts(36,11): error TS2540: Cannot assign to 'bar' because it is a read-only property."
+    `);
   },
   MINUTE
 );
diff --git a/src/core/utils/merge.test.ts b/src/core/utils/merge.test.ts
new file mode 100644
index 00000000000000..aa98f510674116
--- /dev/null
+++ b/src/core/utils/merge.test.ts
@@ -0,0 +1,64 @@
+/*
+ * 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 { merge } from './merge';
+
+describe('merge', () => {
+  test('empty objects', () => expect(merge({}, {})).toEqual({}));
+
+  test('basic', () => {
+    expect(merge({}, { a: 1 })).toEqual({ a: 1 });
+    expect(merge({ a: 0 }, {})).toEqual({ a: 0 });
+    expect(merge({ a: 0 }, { a: 1 })).toEqual({ a: 1 });
+  });
+
+  test('undefined', () => {
+    expect(merge({ a: undefined }, { a: 1 })).toEqual({ a: 1 });
+    expect(merge({ a: 0 }, { a: undefined })).toEqual({ a: 0 });
+    expect(merge({ a: undefined }, { a: undefined })).toEqual({});
+    expect(merge({ a: void 0 }, { a: void 0 })).toEqual({});
+  });
+
+  test('null', () => {
+    expect(merge({ a: null }, { a: 1 })).toEqual({ a: 1 });
+    expect(merge({ a: 0 }, { a: null })).toEqual({ a: null });
+    expect(merge({ a: null }, { a: null })).toEqual({ a: null });
+  });
+
+  test('arrays', () => {
+    expect(merge({ b: [0] }, { b: [2] })).toEqual({ b: [2] });
+    expect(merge({ b: [0, 1] }, { b: [2] })).toEqual({ b: [2] });
+    expect(merge({ b: [0] }, { b: [2, 3] })).toEqual({ b: [2, 3] });
+    expect(merge({ b: [] }, { b: [2] })).toEqual({ b: [2] });
+    expect(merge({ b: [0] }, { b: [] })).toEqual({ b: [] });
+  });
+
+  test('nested objects', () => {
+    expect(merge({ top: { a: 0, b: 0 } }, { top: { a: 1, c: 1 } })).toEqual({
+      top: { a: 1, b: 0, c: 1 },
+    });
+    expect(merge({ top: { a: 0, b: 0 } }, { top: [0, 1] })).toEqual({ top: [0, 1] });
+  });
+
+  test('multiple objects', () => {
+    expect(merge({}, { a: 1 }, { a: 2 })).toEqual({ a: 2 });
+    expect(merge({ a: 0 }, {}, {})).toEqual({ a: 0 });
+    expect(merge({ a: 0 }, { a: 1 }, {})).toEqual({ a: 1 });
+  });
+});
diff --git a/src/core/utils/merge.ts b/src/core/utils/merge.ts
new file mode 100644
index 00000000000000..aead3f35ba841b
--- /dev/null
+++ b/src/core/utils/merge.ts
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+/**
+ * Deeply merges two objects, omitting undefined values, and not deeply merging Arrays.
+ *
+ * @remarks
+ * Should behave identically to lodash.merge, however it will not merge Array values like lodash does.
+ * Any properties with `undefined` values on both objects will be ommitted from the returned object.
+ */
+export function merge<TBase extends Record<string, any>, TSource1 extends Record<string, any>>(
+  baseObj: TBase,
+  source1: TSource1
+): TBase & TSource1;
+export function merge<
+  TBase extends Record<string, any>,
+  TSource1 extends Record<string, any>,
+  TSource2 extends Record<string, any>
+>(baseObj: TBase, overrideObj: TSource1, overrideObj2: TSource2): TBase & TSource1 & TSource2;
+export function merge<
+  TBase extends Record<string, any>,
+  TSource1 extends Record<string, any>,
+  TSource2 extends Record<string, any>,
+  TSource3 extends Record<string, any>
+>(
+  baseObj: TBase,
+  overrideObj: TSource1,
+  overrideObj2: TSource2
+): TBase & TSource1 & TSource2 & TSource3;
+export function merge<TReturn extends Record<string, any>>(
+  baseObj: Record<string, any>,
+  ...sources: Array<Record<string, any>>
+): TReturn {
+  const firstSource = sources[0];
+  if (firstSource === undefined) {
+    return baseObj as TReturn;
+  }
+
+  return sources
+    .slice(1)
+    .reduce(
+      (merged, nextSource) => mergeObjects(merged, nextSource),
+      mergeObjects(baseObj, firstSource)
+    ) as TReturn;
+}
+
+const isMergable = (obj: any) => typeof obj === 'object' && obj !== null && !Array.isArray(obj);
+
+const mergeObjects = <T extends Record<string, any>, U extends Record<string, any>>(
+  baseObj: T,
+  overrideObj: U
+): T & U =>
+  [...new Set([...Object.keys(baseObj), ...Object.keys(overrideObj)])].reduce(
+    (merged, key) => {
+      const baseVal = baseObj[key];
+      const overrideVal = overrideObj[key];
+
+      if (isMergable(baseVal) && isMergable(overrideVal)) {
+        merged[key] = mergeObjects(baseVal, overrideVal);
+      } else if (overrideVal !== undefined) {
+        merged[key] = overrideVal;
+      } else if (baseVal !== undefined) {
+        merged[key] = baseVal;
+      }
+
+      return merged;
+    },
+    {} as any
+  );
diff --git a/src/dev/build/build_distributables.js b/src/dev/build/build_distributables.js
index e3fcfd9536c47c..eeffc2380f38b3 100644
--- a/src/dev/build/build_distributables.js
+++ b/src/dev/build/build_distributables.js
@@ -45,7 +45,6 @@ import {
   ExtractNodeBuildsTask,
   InstallDependenciesTask,
   OptimizeBuildTask,
-  PatchNativeModulesTask,
   RemovePackageJsonDepsTask,
   RemoveWorkspacesTask,
   TranspileBabelTask,
@@ -131,7 +130,6 @@ export async function buildDistributables(options) {
    * directories and perform platform-specific steps
    */
   await run(CreateArchivesSourcesTask);
-  await run(PatchNativeModulesTask);
   await run(CleanExtraBinScriptsTask);
   await run(CleanExtraBrowsersTask);
   await run(CleanNodeBuildsTask);
diff --git a/src/dev/build/lib/exec.js b/src/dev/build/lib/exec.js
index 57dced92ca6255..82762f3bd03a9e 100644
--- a/src/dev/build/lib/exec.js
+++ b/src/dev/build/lib/exec.js
@@ -36,6 +36,7 @@ export async function exec(log, cmd, args, options = {}) {
     stdio: ['ignore', 'pipe', 'pipe'],
     cwd,
     env,
+    preferLocal: true,
   });
 
   await watchStdioForLine(proc, line => log[level](line), exitAfter);
diff --git a/src/dev/build/lib/scan_delete.ts b/src/dev/build/lib/scan_delete.ts
index f1b2a02c11a435..cb4e64ce1b5f98 100644
--- a/src/dev/build/lib/scan_delete.ts
+++ b/src/dev/build/lib/scan_delete.ts
@@ -28,7 +28,7 @@ import { count, map, mergeAll, mergeMap } from 'rxjs/operators';
 import { assertAbsolute } from './fs';
 
 const getStat$ = Rx.bindNodeCallback(Fs.stat);
-const getReadDir$ = Rx.bindNodeCallback(Fs.readdir);
+const getReadDir$ = Rx.bindNodeCallback<string, string[]>(Fs.readdir);
 
 interface Options {
   directory: string;
diff --git a/src/dev/build/lib/version_info.js b/src/dev/build/lib/version_info.js
index b0f51eaaa1d79a..8225000c13f07b 100644
--- a/src/dev/build/lib/version_info.js
+++ b/src/dev/build/lib/version_info.js
@@ -28,7 +28,9 @@ async function getBuildNumber() {
     return log.stdout.split('\n').length;
   }
 
-  const wc = await execa.shell('git log --format="%h" | wc -l');
+  const wc = await execa.command('git log --format="%h" | wc -l', {
+    shell: true
+  });
   return parseFloat(wc.stdout.trim());
 }
 
@@ -39,7 +41,7 @@ export async function getVersionInfo({ isRelease, versionQualifier, pkg }) {
   );
 
   return {
-    buildSha: await execa.stdout('git', ['rev-parse', 'HEAD']),
+    buildSha: (await execa('git', ['rev-parse', 'HEAD'])).stdout,
     buildVersion,
     buildNumber: await getBuildNumber(),
   };
diff --git a/src/dev/build/tasks/index.js b/src/dev/build/tasks/index.js
index 35c07c91873172..014cdc7ad5ea78 100644
--- a/src/dev/build/tasks/index.js
+++ b/src/dev/build/tasks/index.js
@@ -36,5 +36,4 @@ export * from './transpile_babel_task';
 export * from './transpile_scss_task';
 export * from './verify_env_task';
 export * from './write_sha_sums_task';
-export * from './patch_native_modules_task';
 export * from './path_length_task';
diff --git a/src/dev/build/tasks/nodejs/__tests__/download.js b/src/dev/build/tasks/nodejs/__tests__/download.js
index 551773a6f63253..c76ff15b892893 100644
--- a/src/dev/build/tasks/nodejs/__tests__/download.js
+++ b/src/dev/build/tasks/nodejs/__tests__/download.js
@@ -196,7 +196,7 @@ describe('src/dev/build/tasks/nodejs/download', () => {
       } catch (error) {
         expect(error)
           .to.have.property('message')
-          .contain('Unexpected status code 500');
+          .contain('Request failed with status code 500');
         expect(reqCount).to.be(6);
       }
     });
diff --git a/src/dev/build/tasks/nodejs/download.js b/src/dev/build/tasks/nodejs/download.js
index 48313c0911c247..0a030aced0d424 100644
--- a/src/dev/build/tasks/nodejs/download.js
+++ b/src/dev/build/tasks/nodejs/download.js
@@ -22,7 +22,7 @@ import { dirname } from 'path';
 
 import chalk from 'chalk';
 import { createHash } from 'crypto';
-import wreck from '@hapi/wreck';
+import Axios from 'axios';
 
 import { mkdirp } from '../../lib';
 
@@ -51,21 +51,24 @@ export async function download(options) {
   try {
     log.debug(`Attempting download of ${url}`, chalk.dim(sha256));
 
-    const response = await wreck.request('GET', url);
+    const response = await Axios.request({
+      url: url,
+      responseType: 'stream'
+    });
 
-    if (response.statusCode !== 200) {
-      throw new Error(`Unexpected status code ${response.statusCode} when downloading ${url}`);
+    if (response.status !== 200) {
+      throw new Error(`Unexpected status code ${response.status} when downloading ${url}`);
     }
 
     const hash = createHash('sha256');
     await new Promise((resolve, reject) => {
-      response.on('data', chunk => {
+      response.data.on('data', chunk => {
         hash.update(chunk);
         writeSync(fileHandle, chunk);
       });
 
-      response.on('error', reject);
-      response.on('end', resolve);
+      response.data.on('error', reject);
+      response.data.on('end', resolve);
     });
 
     const downloadedSha256 = hash.digest('hex');
diff --git a/src/dev/build/tasks/nodejs/node_download_info.js b/src/dev/build/tasks/nodejs/node_download_info.js
index 7c4fd5fde7bedc..33ffd042d85a36 100644
--- a/src/dev/build/tasks/nodejs/node_download_info.js
+++ b/src/dev/build/tasks/nodejs/node_download_info.js
@@ -27,7 +27,7 @@ export function getNodeDownloadInfo(config, platform) {
     ? 'win-x64/node.exe'
     : `node-v${version}-${arch}.tar.gz`;
 
-  const url = `https://nodejs.org/dist/v${version}/${downloadName}`;
+  const url = `https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v${version}/${downloadName}`;
   const downloadPath = config.resolveFromRepo('.node_binaries', version, basename(downloadName));
   const extractDir = config.resolveFromRepo('.node_binaries', version, arch);
 
diff --git a/src/dev/build/tasks/nodejs/node_shasums.test.ts b/src/dev/build/tasks/nodejs/node_shasums.test.ts
index ee91d2a370fb12..08ac823c7ebf03 100644
--- a/src/dev/build/tasks/nodejs/node_shasums.test.ts
+++ b/src/dev/build/tasks/nodejs/node_shasums.test.ts
@@ -60,7 +60,9 @@ c4edece2c0aa68e816c4e067f397eb12e9d0c81bb37b3d349dbaf47cf246b0b7  win-x86/node.l
 
 jest.mock('axios', () => ({
   async get(url: string) {
-    expect(url).toBe('https://nodejs.org/dist/v8.9.4/SHASUMS256.txt');
+    expect(url).toBe(
+      'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v8.9.4/SHASUMS256.txt'
+    );
     return {
       status: 200,
       data: mockResponse,
diff --git a/src/dev/build/tasks/nodejs/node_shasums.ts b/src/dev/build/tasks/nodejs/node_shasums.ts
index 1b8d01a9b1d94c..e0926aa3e49e4b 100644
--- a/src/dev/build/tasks/nodejs/node_shasums.ts
+++ b/src/dev/build/tasks/nodejs/node_shasums.ts
@@ -20,7 +20,7 @@
 import axios from 'axios';
 
 export async function getNodeShasums(nodeVersion: string) {
-  const url = `https://nodejs.org/dist/v${nodeVersion}/SHASUMS256.txt`;
+  const url = `https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v${nodeVersion}/SHASUMS256.txt`;
 
   const { status, data } = await axios.get(url);
 
diff --git a/src/dev/build/tasks/patch_native_modules_task.js b/src/dev/build/tasks/patch_native_modules_task.js
deleted file mode 100644
index 16290aca04e736..00000000000000
--- a/src/dev/build/tasks/patch_native_modules_task.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import install from '@elastic/simple-git/scripts/install';
-import { deleteAll } from '../lib';
-import path from 'path';
-
-async function patchGit(config, log, build, platform) {
-  const downloadPath = build.resolvePathForPlatform(platform, '.git_binaries', 'git.tar.gz');
-  const destination = build.resolvePathForPlatform(
-    platform,
-    'node_modules/@elastic/simple-git/native/git'
-  );
-  log.debug('Replacing git binaries from ' + downloadPath + ' to ' + destination);
-  const p = platform.isWindows() ? 'win32' : platform.getName();
-  await deleteAll([destination]);
-  await install(p, downloadPath, destination);
-  await deleteAll([path.dirname(downloadPath)], log);
-}
-
-export const PatchNativeModulesTask = {
-  description: 'Patching platform-specific native modules directories',
-  async run(config, log, build) {
-    await Promise.all(
-      config.getTargetPlatforms().map(async platform => {
-        if (!build.isOss()) {
-          await patchGit(config, log, build, platform);
-        }
-      })
-    );
-  },
-};
diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh
index b9fe8fe77d1221..805b77365e624f 100644
--- a/src/dev/ci_setup/setup_env.sh
+++ b/src/dev/ci_setup/setup_env.sh
@@ -2,6 +2,10 @@
 
 set -e
 
+if [[ "$CI_ENV_SETUP" ]]; then
+  return 0
+fi
+
 installNode=$1
 
 dir="$(pwd)"
@@ -53,10 +57,10 @@ nodeDir="$cacheDir/node/$nodeVersion"
 
 if [[ "$OS" == "win" ]]; then
   nodeBin="$HOME/node"
-  nodeUrl="https://nodejs.org/dist/v$nodeVersion/node-v$nodeVersion-win-x64.zip"
+  nodeUrl="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v$nodeVersion/node-v$nodeVersion-win-x64.zip"
 else
   nodeBin="$nodeDir/bin"
-  nodeUrl="https://nodejs.org/dist/v$nodeVersion/node-v$nodeVersion-linux-x64.tar.gz"
+  nodeUrl="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v$nodeVersion/node-v$nodeVersion-linux-x64.tar.gz"
 fi
 
 if [[ "$installNode" == "true" ]]; then
@@ -75,11 +79,11 @@ if [[ "$installNode" == "true" ]]; then
     mkdir -p "$nodeDir"
     if [[ "$OS" == "win" ]]; then
       nodePkg="$nodeDir/${nodeUrl##*/}"
-      curl --silent -o "$nodePkg" "$nodeUrl"
+      curl --silent -L -o "$nodePkg" "$nodeUrl"
       unzip -qo "$nodePkg" -d "$nodeDir"
       mv "${nodePkg%.*}" "$nodeBin"
     else
-      curl --silent "$nodeUrl" | tar -xz -C "$nodeDir" --strip-components=1
+      curl --silent -L "$nodeUrl" | tar -xz -C "$nodeDir" --strip-components=1
     fi
   fi
 fi
@@ -152,3 +156,5 @@ if [[ -d "$ES_DIR" && -f "$ES_JAVA_PROP_PATH" ]]; then
   echo "Setting JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA"
   export JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
 fi
+
+export CI_ENV_SETUP=true
diff --git a/src/dev/i18n/extractors/code.js b/src/dev/i18n/extractors/code.js
index 58ca059be54917..fa0d834824e97c 100644
--- a/src/dev/i18n/extractors/code.js
+++ b/src/dev/i18n/extractors/code.js
@@ -67,7 +67,7 @@ export function* extractCodeMessages(buffer, reporter) {
   try {
     ast = parse(buffer.toString(), {
       sourceType: 'module',
-      plugins: ['jsx', 'typescript', 'objectRestSpread', 'classProperties', 'asyncGenerators'],
+      plugins: ['jsx', 'typescript', 'objectRestSpread', 'classProperties', 'asyncGenerators', 'dynamicImport'],
     });
   } catch (error) {
     if (error instanceof SyntaxError) {
diff --git a/src/dev/jest/integration_tests/junit_reporter.test.js b/src/dev/jest/integration_tests/junit_reporter.test.js
index c26c8cfad80258..ed5d73cd87c40f 100644
--- a/src/dev/jest/integration_tests/junit_reporter.test.js
+++ b/src/dev/jest/integration_tests/junit_reporter.test.js
@@ -52,7 +52,7 @@ it(
       }
     );
 
-    expect(result.code).toBe(1);
+    expect(result.exitCode).toBe(1);
     await expect(parseXml(readFileSync(XML_PATH, 'utf8'))).resolves.toEqual({
       testsuites: {
         $: {
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index 727c51f704431b..fbd16d95ded1c9 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -106,8 +106,5 @@ export const LICENSE_OVERRIDES = {
   // TODO can be removed once we upgrade the use of walk dependency past or equal to v2.3.14
   'walk@2.3.9': ['MIT'],
 
-  // TODO remove this once we upgrade past or equal to v1.0.2
-  'babel-plugin-mock-imports@1.0.1': ['MIT'],
-
   '@elastic/node-ctags@1.0.2': ['Nuclide software'],
 };
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
index 9829de2fd39205..edd818e1b42de8 100644
--- a/src/dev/precommit_hook/casing_check_config.js
+++ b/src/dev/precommit_hook/casing_check_config.js
@@ -43,8 +43,9 @@ export const IGNORE_FILE_GLOBS = [
   'x-pack/docs/**/*',
   'src/legacy/ui/public/assets/fonts/**/*',
   'packages/kbn-utility-types/test-d/**/*',
-  'Jenkinsfile',
+  '**/Jenkinsfile*',
   'Dockerfile*',
+  'vars/*',
 
   // Files in this directory must match a pre-determined name in some cases.
   'x-pack/legacy/plugins/canvas/.storybook/*',
diff --git a/src/dev/prs/run_update_prs_cli.ts b/src/dev/prs/run_update_prs_cli.ts
index 6d99ac5fa45f30..bb7f50758a28c8 100644
--- a/src/dev/prs/run_update_prs_cli.ts
+++ b/src/dev/prs/run_update_prs_cli.ts
@@ -86,7 +86,7 @@ run(
         // attempt to init upstream remote
         await execInDir('git', ['remote', 'add', 'upstream', UPSTREAM_URL]);
       } catch (error) {
-        if (error.code !== 128) {
+        if (error.exitCode !== 128) {
           throw error;
         }
 
diff --git a/src/dev/run_check_core_api_changes.ts b/src/dev/run_check_core_api_changes.ts
index d2c75c86ce7442..ccf92cc432d2b0 100644
--- a/src/dev/run_check_core_api_changes.ts
+++ b/src/dev/run_check_core_api_changes.ts
@@ -76,12 +76,16 @@ const apiExtractorConfig = (folder: string): ExtractorConfig => {
 };
 
 const runBuildTypes = async () => {
-  await execa.shell('yarn run build:types');
+  await execa('yarn', ['run', 'build:types']);
 };
 
 const runApiDocumenter = async (folder: string) => {
-  await execa.shell(
-    `api-documenter markdown -i ./build/${folder} -o ./docs/development/core/${folder}`
+  await execa(
+    'api-documenter',
+    ['markdown', '-i', `./build/${folder}`, '-o', `./docs/development/core/${folder}`],
+    {
+      preferLocal: true,
+    }
   );
 };
 
diff --git a/src/dev/typescript/exec_in_projects.ts b/src/dev/typescript/exec_in_projects.ts
index 8895e964c78170..a34f2bdd28670e 100644
--- a/src/dev/typescript/exec_in_projects.ts
+++ b/src/dev/typescript/exec_in_projects.ts
@@ -45,6 +45,7 @@ export function execInProjects(
           cwd: process.cwd(),
           env: chalk.enabled ? { FORCE_COLOR: 'true' } : {},
           stdio: ['ignore', 'pipe', 'pipe'],
+          preferLocal: true,
         }).catch(error => {
           throw new ProjectFailure(project, error);
         }),
diff --git a/src/dev/typescript/run_check_ts_projects_cli.ts b/src/dev/typescript/run_check_ts_projects_cli.ts
index f42a4e27593709..85f3d473dce6bc 100644
--- a/src/dev/typescript/run_check_ts_projects_cli.ts
+++ b/src/dev/typescript/run_check_ts_projects_cli.ts
@@ -30,7 +30,7 @@ import { PROJECTS } from './projects';
 export async function runCheckTsProjectsCli() {
   run(
     async ({ log }) => {
-      const files = await execa.stdout('git', ['ls-tree', '--name-only', '-r', 'HEAD'], {
+      const { stdout: files } = await execa('git', ['ls-tree', '--name-only', '-r', 'HEAD'], {
         cwd: REPO_ROOT,
       });
 
diff --git a/src/dev/typescript/run_type_check_cli.ts b/src/dev/typescript/run_type_check_cli.ts
index bf6e8711fa81e9..3deebcc0c18f9a 100644
--- a/src/dev/typescript/run_type_check_cli.ts
+++ b/src/dev/typescript/run_type_check_cli.ts
@@ -88,7 +88,7 @@ export function runTypeCheckCli() {
   }
 
   execInProjects(log, projects, process.execPath, project => [
-    ...(project.name === 'x-pack' ? ['--max-old-space-size=2048'] : []),
+    ...(project.name === 'x-pack' ? ['--max-old-space-size=4096'] : []),
     require.resolve('typescript/bin/tsc'),
     ...['--project', project.tsConfigPath],
     ...tscArgs,
diff --git a/src/fixtures/logstash_fields.js b/src/fixtures/logstash_fields.js
index 8299604d3a28c5..ab96b69851b713 100644
--- a/src/fixtures/logstash_fields.js
+++ b/src/fixtures/logstash_fields.js
@@ -19,13 +19,13 @@
 
 import { castEsToKbnFieldTypeName } from '../plugins/data/common';
 // eslint-disable-next-line max-len
-import { shouldReadFieldFromDocValues } from '../legacy/server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values';
+import { shouldReadFieldFromDocValues } from '../plugins/data/server';
 
 function stubbedLogstashFields() {
   return [
     //                                  |aggregatable
     //                                  |      |searchable
-    // name               esType        |      |      |metadata       | parent      | subType
+    // name               esType        |      |      |metadata       | subType
     ['bytes',             'long',       true,  true,  { count: 10 } ],
     ['ssl',               'boolean',    true,  true,  { count: 20 } ],
     ['@timestamp',        'date',       true,  true,  { count: 30 } ],
@@ -40,9 +40,9 @@ function stubbedLogstashFields() {
     ['hashed',            'murmur3',    false, true ],
     ['geo.coordinates',   'geo_point',  true,  true ],
     ['extension',         'text',       true,  true],
-    ['extension.keyword', 'keyword',    true,  true,   {},            'extension',  'multi' ],
+    ['extension.keyword', 'keyword',    true,  true,   {},            { multi: { parent: 'extension' } } ],
     ['machine.os',        'text',       true,  true ],
-    ['machine.os.raw',    'keyword',    true,  true,   {},            'machine.os', 'multi' ],
+    ['machine.os.raw',    'keyword',    true,  true,   {},            { multi: { parent: 'machine.os' } } ],
     ['geo.src',           'keyword',    true,  true ],
     ['_id',               '_id',        true,  true ],
     ['_type',             '_type',      true,  true ],
@@ -61,7 +61,6 @@ function stubbedLogstashFields() {
       aggregatable,
       searchable,
       metadata = {},
-      parent = undefined,
       subType = undefined,
     ] = row;
 
@@ -87,7 +86,6 @@ function stubbedLogstashFields() {
       script,
       lang,
       scripted,
-      parent,
       subType,
     };
   });
diff --git a/src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts b/src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
index 1be571f2739ac1..d1605c1aefa566 100644
--- a/src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
+++ b/src/legacy/core_plugins/console/np_ready/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { throttle } from 'lodash';
 
 interface Actions {
   input: any; // TODO: Wrap this in an editor interface
@@ -24,6 +25,10 @@ interface Actions {
 }
 
 export function registerCommands({ input, sendCurrentRequestToES, openDocumentation }: Actions) {
+  const throttledAutoIndent = throttle(() => input.autoIndent(), 500, {
+    leading: true,
+    trailing: true,
+  });
   input.commands.addCommand({
     name: 'send to elasticsearch',
     bindKey: { win: 'Ctrl-Enter', mac: 'Command-Enter' },
@@ -40,7 +45,7 @@ export function registerCommands({ input, sendCurrentRequestToES, openDocumentat
     name: 'auto indent request',
     bindKey: { win: 'Ctrl-I', mac: 'Command-I' },
     exec: () => {
-      input.autoIndent();
+      throttledAutoIndent();
     },
   });
   input.commands.addCommand({
diff --git a/src/legacy/core_plugins/console/np_ready/public/application/containers/main/main.tsx b/src/legacy/core_plugins/console/np_ready/public/application/containers/main/main.tsx
index 82256cf7398820..4e5afbdb5821e9 100644
--- a/src/legacy/core_plugins/console/np_ready/public/application/containers/main/main.tsx
+++ b/src/legacy/core_plugins/console/np_ready/public/application/containers/main/main.tsx
@@ -19,7 +19,8 @@
 
 import React, { useCallback, useState } from 'react';
 import { debounce } from 'lodash';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 
 import { EditorOutput, Editor, ConsoleHistory } from '../editor';
 import { Settings } from '../settings';
@@ -77,6 +78,13 @@ export function Main() {
         responsive={false}
       >
         <EuiFlexItem grow={false}>
+          <EuiTitle className="euiScreenReaderOnly">
+            <h1>
+              {i18n.translate('console.pageHeading', {
+                defaultMessage: 'Console',
+              })}
+            </h1>
+          </EuiTitle>
           <TopNavMenu
             items={getTopNavConfig({
               onClickHistory: () => setShowHistory(!showingHistory),
diff --git a/src/legacy/core_plugins/console/np_ready/public/application/models/legacy_editor.test.ts b/src/legacy/core_plugins/console/np_ready/public/application/models/legacy_editor.test.ts
new file mode 100644
index 00000000000000..0dc1bcc96ddee2
--- /dev/null
+++ b/src/legacy/core_plugins/console/np_ready/public/application/models/legacy_editor.test.ts
@@ -0,0 +1,69 @@
+/*
+ * 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 { Range as AceRange } from 'brace';
+import { LegacyEditor } from './legacy_editor';
+
+describe('Legacy Editor', () => {
+  const aceMock: any = {
+    getValue() {
+      return 'ok';
+    },
+
+    getCursorPosition() {
+      return {
+        row: 1,
+        column: 1,
+      };
+    },
+
+    getSession() {
+      return {
+        replace(range: AceRange, value: string) {},
+        getLine(n: number) {
+          return 'line';
+        },
+        doc: {
+          getTextRange(r: any) {
+            return '';
+          },
+        },
+        getState(n: number) {
+          return n;
+        },
+      };
+    },
+  };
+
+  // This is to ensure that we are correctly importing Ace's Range component
+  it('smoke tests for updates to ranges', () => {
+    const legacyEditor = new LegacyEditor(aceMock);
+    legacyEditor.getValueInRange({
+      start: { lineNumber: 1, column: 1 },
+      end: { lineNumber: 2, column: 2 },
+    });
+    legacyEditor.replace(
+      {
+        start: { lineNumber: 1, column: 1 },
+        end: { lineNumber: 2, column: 2 },
+      },
+      'test!'
+    );
+  });
+});
diff --git a/src/legacy/core_plugins/console/np_ready/public/application/models/legacy_editor.ts b/src/legacy/core_plugins/console/np_ready/public/application/models/legacy_editor.ts
index 1b083adcfea76a..f8c3f425a10320 100644
--- a/src/legacy/core_plugins/console/np_ready/public/application/models/legacy_editor.ts
+++ b/src/legacy/core_plugins/console/np_ready/public/application/models/legacy_editor.ts
@@ -17,10 +17,13 @@
  * under the License.
  */
 
-import { Editor as IAceEditor, Range as AceRange } from 'brace';
+import ace from 'brace';
+import { Editor as IAceEditor } from 'brace';
 import { CoreEditor, Position, Range, Token, TokensProvider } from '../../types';
 import { AceTokensProvider } from '../../lib/ace_token_provider';
 
+const _AceRange = ace.acequire('ace/range').Range;
+
 export class LegacyEditor implements CoreEditor {
   constructor(private readonly editor: IAceEditor) {}
 
@@ -31,7 +34,7 @@ export class LegacyEditor implements CoreEditor {
 
   getValueInRange({ start, end }: Range): string {
     const session = this.editor.getSession();
-    const aceRange = new AceRange(
+    const aceRange = new _AceRange(
       start.lineNumber - 1,
       start.column - 1,
       end.lineNumber - 1,
@@ -90,7 +93,7 @@ export class LegacyEditor implements CoreEditor {
   }
 
   replace({ start, end }: Range, value: string): void {
-    const aceRange = new AceRange(
+    const aceRange = new _AceRange(
       start.lineNumber - 1,
       start.column - 1,
       end.lineNumber - 1,
diff --git a/src/legacy/core_plugins/console/np_ready/public/legacy.ts b/src/legacy/core_plugins/console/np_ready/public/legacy.ts
index af9803c97749e8..1a2d312823f6f2 100644
--- a/src/legacy/core_plugins/console/np_ready/public/legacy.ts
+++ b/src/legacy/core_plugins/console/np_ready/public/legacy.ts
@@ -30,7 +30,6 @@ import uiRoutes from 'ui/routes';
 import { DOC_LINK_VERSION } from 'ui/documentation_links';
 import { I18nContext } from 'ui/i18n';
 import { ResizeChecker } from 'ui/resize_checker';
-import 'ui/autoload/styles';
 import 'ui/capabilities/route_setup';
 /* eslint-enable @kbn/eslint/no-restricted-paths */
 
diff --git a/src/legacy/core_plugins/console/public/quarantined/src/autocomplete.ts b/src/legacy/core_plugins/console/public/quarantined/src/autocomplete.ts
index 41869f41c222f8..47edf42f0eec55 100644
--- a/src/legacy/core_plugins/console/public/quarantined/src/autocomplete.ts
+++ b/src/legacy/core_plugins/console/public/quarantined/src/autocomplete.ts
@@ -317,16 +317,16 @@ export default function({
   coreEditor: editor,
   parser,
   execCommand,
-  getCursor,
-  isCompleteActive,
+  getCursorPosition,
+  isCompleterActive,
   addChangeListener,
   removeChangeListener,
 }: {
   coreEditor: LegacyEditor;
   parser: any;
   execCommand: (cmd: string) => void;
-  getCursor: () => any;
-  isCompleteActive: () => boolean;
+  getCursorPosition: () => Position | null;
+  isCompleterActive: () => boolean;
   addChangeListener: (fn: any) => void;
   removeChangeListener: (fn: any) => void;
 }) {
@@ -969,11 +969,10 @@ export default function({
   100);
 
   function editorChangeListener() {
-    const cursor = getCursor();
-    if (isCompleteActive()) {
-      return;
+    const position = getCursorPosition();
+    if (position && !isCompleterActive()) {
+      evaluateCurrentTokenAfterAChange(position);
     }
-    evaluateCurrentTokenAfterAChange(cursor);
   }
 
   function getCompletions(
diff --git a/src/legacy/core_plugins/console/public/quarantined/src/input.ts b/src/legacy/core_plugins/console/public/quarantined/src/input.ts
index a5e38e7a06e0e2..eb93f8e165cb57 100644
--- a/src/legacy/core_plugins/console/public/quarantined/src/input.ts
+++ b/src/legacy/core_plugins/console/public/quarantined/src/input.ts
@@ -24,6 +24,7 @@ import { LegacyEditor } from '../../../np_ready/public/application/models';
 
 // @ts-ignore
 import SenseEditor from './sense_editor/editor';
+import { Position } from '../../../np_ready/public/types';
 
 let input: any;
 export function initializeEditor($el: JQuery<HTMLElement>, $actionsEl: JQuery<HTMLElement>) {
@@ -35,8 +36,18 @@ export function initializeEditor($el: JQuery<HTMLElement>, $actionsEl: JQuery<HT
     coreEditor: new LegacyEditor(input),
     parser: input.parser,
     execCommand: (cmd: string) => input.execCommand(cmd),
-    getCursor: () => input.selection.lead,
-    isCompleteActive: () => input.__ace.completer && input.__ace.completer.activated,
+    getCursorPosition: (): Position | null => {
+      if (input.selection && input.selection.lead) {
+        return {
+          lineNumber: input.selection.lead.row + 1,
+          column: input.selection.lead.column + 1,
+        };
+      }
+      return null;
+    },
+    isCompleterActive: () => {
+      return Boolean(input.__ace.completer && input.__ace.completer.activated);
+    },
     addChangeListener: (fn: any) => input.on('changeSelection', fn),
     removeChangeListener: (fn: any) => input.off('changeSelection', fn),
   };
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/index.ts b/src/legacy/core_plugins/dashboard_embeddable_container/index.ts
index 74682722e9b893..714203de203851 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/index.ts
+++ b/src/legacy/core_plugins/dashboard_embeddable_container/index.ts
@@ -23,7 +23,6 @@ import { resolve } from 'path';
 export default function(kibana: any) {
   return new kibana.Plugin({
     uiExports: {
-      hacks: ['plugins/dashboard_embeddable_container/initialize'],
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
     },
   });
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/index.scss b/src/legacy/core_plugins/dashboard_embeddable_container/public/index.scss
index 88e570d1378938..548e85746f866d 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/index.scss
+++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/index.scss
@@ -1,6 +1,3 @@
 @import 'src/legacy/ui/public/styles/styling_constants';
-@import 'src/legacy/core_plugins/embeddable_api/public/variables';
 
-@import './np_ready/public/lib/embeddable/grid/index';
-@import './np_ready/public/lib/embeddable/panel/index';
-@import './np_ready/public/lib/embeddable/viewport/index';
+@import '../../../../plugins/dashboard_embeddable_container/public/index';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/initialize.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/initialize.ts
index a4bc3cf17026c3..9880b336e76e5c 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/initialize.ts
+++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/initialize.ts
@@ -16,5 +16,3 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import './np_ready/public/legacy';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/kibana.json b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/kibana.json
deleted file mode 100644
index 417168ba61dd94..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/kibana.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "id": "dashboard_embeddable_container",
-  "version": "kibana",
-  "requiredPlugins": [
-    "embeddable",
-    "inspector",
-    "ui_actions"
-  ],
-  "server": false,
-  "ui": true
-}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts
index cbbbd41827853a..d8c0de2bce3f4a 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts
+++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts
@@ -17,13 +17,4 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
-import { DashboardEmbeddableContainerPublicPlugin } from './plugin';
-
-export * from './lib';
-
-export function plugin(initializerContext: PluginInitializerContext) {
-  return new DashboardEmbeddableContainerPublicPlugin(initializerContext);
-}
-
-export { DashboardEmbeddableContainerPublicPlugin as Plugin };
+export * from '../../../../../../plugins/dashboard_embeddable_container/public';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/legacy.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/legacy.ts
index ccb04d8c2e0276..9880b336e76e5c 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/legacy.ts
+++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/legacy.ts
@@ -16,32 +16,3 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-/* eslint-disable @kbn/eslint/no-restricted-paths */
-import { npSetup, npStart } from 'ui/new_platform';
-import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
-import { ExitFullScreenButton } from 'ui/exit_full_screen';
-/* eslint-enable @kbn/eslint/no-restricted-paths */
-
-import { plugin } from '.';
-import {
-  setup as embeddableSetup,
-  start as embeddableStart,
-} from '../../../../embeddable_api/public/np_ready/public/legacy';
-
-const pluginInstance = plugin({} as any);
-
-export const setup = pluginInstance.setup(npSetup.core, {
-  embeddable: embeddableSetup,
-  uiActions: npSetup.plugins.uiActions,
-});
-
-export const start = pluginInstance.start(npStart.core, {
-  embeddable: embeddableStart,
-  inspector: npStart.plugins.inspector,
-  __LEGACY: {
-    SavedObjectFinder,
-    ExitFullScreenButton,
-  },
-  uiActions: npStart.plugins.uiActions,
-});
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts
deleted file mode 100644
index b0707610cf21b4..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { ExpandPanelAction, EXPAND_PANEL_ACTION } from './expand_panel_action';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.test.tsx b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.test.tsx
deleted file mode 100644
index 06bc696b95193d..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.test.tsx
+++ /dev/null
@@ -1,141 +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.
- */
-
-// @ts-ignore
-import { findTestSubject } from '@elastic/eui/lib/test';
-import { nextTick } from 'test_utils/enzyme_helpers';
-import { isErrorEmbeddable, ViewMode, EmbeddableFactory } from '../embeddable_api';
-import { DashboardContainer, DashboardContainerOptions } from './dashboard_container';
-import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
-import {
-  CONTACT_CARD_EMBEDDABLE,
-  ContactCardEmbeddableFactory,
-  ContactCardEmbeddableInput,
-  ContactCardEmbeddable,
-  ContactCardEmbeddableOutput,
-} from '../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-
-const options: DashboardContainerOptions = {
-  application: {} as any,
-  embeddable: {
-    getTriggerCompatibleActions: (() => []) as any,
-    getEmbeddableFactories: (() => []) as any,
-    getEmbeddableFactory: undefined as any,
-  } as any,
-  notifications: {} as any,
-  overlays: {} as any,
-  inspector: {} as any,
-  SavedObjectFinder: () => null,
-  ExitFullScreenButton: () => null,
-  uiActions: {} as any,
-};
-
-beforeEach(() => {
-  const embeddableFactories = new Map<string, EmbeddableFactory>();
-  embeddableFactories.set(
-    CONTACT_CARD_EMBEDDABLE,
-    new ContactCardEmbeddableFactory({} as any, (() => null) as any, {} as any)
-  );
-  options.embeddable.getEmbeddableFactory = (id: string) => embeddableFactories.get(id) as any;
-});
-
-test('DashboardContainer initializes embeddables', async done => {
-  const initialInput = getSampleDashboardInput({
-    panels: {
-      '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
-        explicitInput: { firstName: 'Sam', id: '123' },
-        type: CONTACT_CARD_EMBEDDABLE,
-      }),
-    },
-  });
-  const container = new DashboardContainer(initialInput, options);
-
-  const subscription = container.getOutput$().subscribe(output => {
-    if (container.getOutput().embeddableLoaded['123']) {
-      const embeddable = container.getChild<ContactCardEmbeddable>('123');
-      expect(embeddable).toBeDefined();
-      expect(embeddable.id).toBe('123');
-      done();
-    }
-  });
-
-  if (container.getOutput().embeddableLoaded['123']) {
-    const embeddable = container.getChild<ContactCardEmbeddable>('123');
-    expect(embeddable).toBeDefined();
-    expect(embeddable.id).toBe('123');
-    subscription.unsubscribe();
-    done();
-  }
-});
-
-test('DashboardContainer.addNewEmbeddable', async () => {
-  const container = new DashboardContainer(getSampleDashboardInput(), options);
-  const embeddable = await container.addNewEmbeddable<ContactCardEmbeddableInput>(
-    CONTACT_CARD_EMBEDDABLE,
-    {
-      firstName: 'Kibana',
-    }
-  );
-  expect(embeddable).toBeDefined();
-
-  if (!isErrorEmbeddable(embeddable)) {
-    expect(embeddable.getInput().firstName).toBe('Kibana');
-  } else {
-    expect(false).toBe(true);
-  }
-
-  const embeddableInContainer = container.getChild<ContactCardEmbeddable>(embeddable.id);
-  expect(embeddableInContainer).toBeDefined();
-  expect(embeddableInContainer.id).toBe(embeddable.id);
-});
-
-test('Container view mode change propagates to existing children', async () => {
-  const initialInput = getSampleDashboardInput({
-    panels: {
-      '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
-        explicitInput: { firstName: 'Sam', id: '123' },
-        type: CONTACT_CARD_EMBEDDABLE,
-      }),
-    },
-  });
-  const container = new DashboardContainer(initialInput, options);
-  await nextTick();
-
-  const embeddable = await container.getChild('123');
-  expect(embeddable.getInput().viewMode).toBe(ViewMode.VIEW);
-  container.updateInput({ viewMode: ViewMode.EDIT });
-  expect(embeddable.getInput().viewMode).toBe(ViewMode.EDIT);
-});
-
-test('Container view mode change propagates to new children', async () => {
-  const container = new DashboardContainer(getSampleDashboardInput(), options);
-  const embeddable = await container.addNewEmbeddable<
-    ContactCardEmbeddableInput,
-    ContactCardEmbeddableOutput,
-    ContactCardEmbeddable
-  >(CONTACT_CARD_EMBEDDABLE, {
-    firstName: 'Bob',
-  });
-
-  expect(embeddable.getInput().viewMode).toBe(ViewMode.VIEW);
-
-  container.updateInput({ viewMode: ViewMode.EDIT });
-
-  expect(embeddable.getInput().viewMode).toBe(ViewMode.EDIT);
-});
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container_factory.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container_factory.ts
deleted file mode 100644
index 29ce9bcb0da2e8..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container_factory.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';
-import { SavedObjectAttributes } from '../../../../../../../../core/server';
-import { SavedObjectMetaData } from '../types';
-import { ContainerOutput, EmbeddableFactory, ErrorEmbeddable, Container } from '../embeddable_api';
-import {
-  DashboardContainer,
-  DashboardContainerInput,
-  DashboardContainerOptions,
-} from './dashboard_container';
-import { DashboardCapabilities } from '../types';
-
-export const DASHBOARD_CONTAINER_TYPE = 'dashboard';
-
-export interface DashboardOptions extends DashboardContainerOptions {
-  savedObjectMetaData?: SavedObjectMetaData<SavedObjectAttributes>;
-}
-
-export class DashboardContainerFactory extends EmbeddableFactory<
-  DashboardContainerInput,
-  ContainerOutput
-> {
-  public readonly isContainerType = true;
-  public readonly type = DASHBOARD_CONTAINER_TYPE;
-
-  private readonly allowEditing: boolean;
-
-  constructor(private readonly options: DashboardOptions) {
-    super({ savedObjectMetaData: options.savedObjectMetaData });
-
-    const capabilities = (options.application.capabilities
-      .dashboard as unknown) as DashboardCapabilities;
-
-    if (!capabilities || typeof capabilities !== 'object') {
-      throw new TypeError('Dashboard capabilities not found.');
-    }
-
-    this.allowEditing = !!capabilities.createNew && !!capabilities.showWriteControls;
-  }
-
-  public isEditable() {
-    return this.allowEditing;
-  }
-
-  public getDisplayName() {
-    return i18n.translate('dashboardEmbeddableContainer.factory.displayName', {
-      defaultMessage: 'dashboard',
-    });
-  }
-
-  public getDefaultInput(): Partial<DashboardContainerInput> {
-    return {
-      panels: {},
-      isFullScreenMode: false,
-      useMargins: true,
-    };
-  }
-
-  public async create(
-    initialInput: DashboardContainerInput,
-    parent?: Container
-  ): Promise<DashboardContainer | ErrorEmbeddable> {
-    return new DashboardContainer(initialInput, this.options, parent);
-  }
-}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/index.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/index.ts
deleted file mode 100644
index 2a6a56e3300bcb..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/index.ts
+++ /dev/null
@@ -1,30 +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 { DASHBOARD_CONTAINER_TYPE, DashboardContainerFactory } from './dashboard_container_factory';
-export { DashboardContainer, DashboardContainerInput } from './dashboard_container';
-export { createPanelState } from './panel';
-
-export { DashboardPanelState, GridData } from './types';
-
-export {
-  DASHBOARD_GRID_COLUMN_COUNT,
-  DEFAULT_PANEL_HEIGHT,
-  DEFAULT_PANEL_WIDTH,
-} from './dashboard_constants';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/types.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/types.ts
deleted file mode 100644
index 6e5257f0d1ee0b..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/types.ts
+++ /dev/null
@@ -1,34 +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 { PanelState, EmbeddableInput } from '../embeddable_api';
-export type PanelId = string;
-export type SavedObjectId = string;
-
-export interface GridData {
-  w: number;
-  h: number;
-  x: number;
-  y: number;
-  i: string;
-}
-
-export interface DashboardPanelState<TEmbeddableInput extends EmbeddableInput = EmbeddableInput>
-  extends PanelState<TEmbeddableInput> {
-  readonly gridData: GridData;
-}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable_api.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable_api.ts
deleted file mode 100644
index 17911b908d3b3f..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable_api.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from '../../../../../embeddable_api/public/np_ready/public';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/index.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/index.ts
deleted file mode 100644
index 03ba836462c608..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from './types';
-export * from './actions';
-export * from './embeddable';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/types.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/types.ts
deleted file mode 100644
index fe6f4bcdafec92..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/types.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { IconType } from '@elastic/eui';
-import {
-  SavedObject as SavedObjectType,
-  SavedObjectAttributes,
-} from '../../../../../../../core/server';
-
-export interface DashboardCapabilities {
-  showWriteControls: boolean;
-  createNew: boolean;
-}
-
-// TODO: Replace Saved object interfaces by the ones Core will provide when it is ready.
-export type SavedObjectAttribute =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | SavedObjectAttributes
-  | SavedObjectAttributes[];
-
-export interface SimpleSavedObject<T extends SavedObjectAttributes> {
-  attributes: T;
-  _version?: SavedObjectType<T>['version'];
-  id: SavedObjectType<T>['id'];
-  type: SavedObjectType<T>['type'];
-  migrationVersion: SavedObjectType<T>['migrationVersion'];
-  error: SavedObjectType<T>['error'];
-  references: SavedObjectType<T>['references'];
-  get(key: string): any;
-  set(key: string, value: any): T;
-  has(key: string): boolean;
-  save(): Promise<SimpleSavedObject<T>>;
-  delete(): void;
-}
-
-export interface SavedObjectMetaData<T extends SavedObjectAttributes> {
-  type: string;
-  name: string;
-  getIconForSavedObject(savedObject: SimpleSavedObject<T>): IconType;
-  getTooltipForSavedObject?(savedObject: SimpleSavedObject<T>): string;
-  showSavedObject?(savedObject: SimpleSavedObject<T>): boolean;
-}
-
-export interface Field {
-  name: string;
-  type: string;
-  // esTypes might be undefined on old index patterns that have not been refreshed since we added
-  // this prop. It is also undefined on scripted fields.
-  esTypes?: string[];
-  aggregatable: boolean;
-  filterable: boolean;
-  searchable: boolean;
-  parent?: string;
-  subType?: string;
-}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/plugin.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/plugin.ts
deleted file mode 100644
index 3d243ab3aa37a0..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/plugin.ts
+++ /dev/null
@@ -1,73 +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 { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import { IUiActionsSetup, IUiActionsStart } from '../../../../../../plugins/ui_actions/public';
-import { CONTEXT_MENU_TRIGGER, Plugin as EmbeddablePlugin } from './lib/embeddable_api';
-import { ExpandPanelAction, DashboardContainerFactory } from './lib';
-import { Start as InspectorStartContract } from '../../../../../../plugins/inspector/public';
-
-interface SetupDependencies {
-  embeddable: ReturnType<EmbeddablePlugin['setup']>;
-  uiActions: IUiActionsSetup;
-}
-
-interface StartDependencies {
-  embeddable: ReturnType<EmbeddablePlugin['start']>;
-  inspector: InspectorStartContract;
-  uiActions: IUiActionsStart;
-  __LEGACY: {
-    SavedObjectFinder: React.ComponentType<any>;
-    ExitFullScreenButton: React.ComponentType<any>;
-  };
-}
-
-export type Setup = void;
-export type Start = void;
-
-export class DashboardEmbeddableContainerPublicPlugin
-  implements Plugin<Setup, Start, SetupDependencies, StartDependencies> {
-  constructor(initializerContext: PluginInitializerContext) {}
-
-  public setup(core: CoreSetup, { embeddable, uiActions }: SetupDependencies): Setup {
-    const expandPanelAction = new ExpandPanelAction();
-    uiActions.registerAction(expandPanelAction);
-    uiActions.attachAction(CONTEXT_MENU_TRIGGER, expandPanelAction.id);
-  }
-
-  public start(core: CoreStart, plugins: StartDependencies): Start {
-    const { application, notifications, overlays } = core;
-    const { embeddable, inspector, __LEGACY, uiActions } = plugins;
-
-    const factory = new DashboardContainerFactory({
-      application,
-      notifications,
-      overlays,
-      embeddable,
-      inspector,
-      SavedObjectFinder: __LEGACY.SavedObjectFinder,
-      ExitFullScreenButton: __LEGACY.ExitFullScreenButton,
-      uiActions,
-    });
-
-    embeddable.registerEmbeddableFactory(factory.type, factory);
-  }
-
-  public stop() {}
-}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/tests/dashboard_container.test.tsx b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/tests/dashboard_container.test.tsx
deleted file mode 100644
index 6cf409581b76d0..00000000000000
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/tests/dashboard_container.test.tsx
+++ /dev/null
@@ -1,131 +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.
- */
-
-// @ts-ignore
-import { findTestSubject } from '@elastic/eui/lib/test';
-import React from 'react';
-import { mount } from 'enzyme';
-import { nextTick } from 'test_utils/enzyme_helpers';
-import { I18nProvider } from '@kbn/i18n/react';
-import { ViewMode, CONTEXT_MENU_TRIGGER, EmbeddablePanel } from '../lib/embeddable_api';
-import {
-  DashboardContainer,
-  DashboardContainerOptions,
-} from '../lib/embeddable/dashboard_container';
-import { getSampleDashboardInput } from '../lib/test_helpers';
-import {
-  CONTACT_CARD_EMBEDDABLE,
-  ContactCardEmbeddableFactory,
-} from '../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-import {
-  ContactCardEmbeddableInput,
-  ContactCardEmbeddable,
-  ContactCardEmbeddableOutput,
-} from '../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-import { embeddablePluginMock } from '../../../../../embeddable_api/public/np_ready/public/mocks';
-import { createEditModeAction } from '../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-// eslint-disable-next-line
-import { inspectorPluginMock } from '../../../../../../../plugins/inspector/public/mocks';
-import { KibanaContextProvider } from '../../../../../../../plugins/kibana_react/public';
-// eslint-disable-next-line
-import { uiActionsPluginMock } from 'src/plugins/ui_actions/public/mocks';
-
-test('DashboardContainer in edit mode shows edit mode actions', async () => {
-  const inspector = inspectorPluginMock.createStartContract();
-  const { setup, doStart } = embeddablePluginMock.createInstance();
-  const uiActionsSetup = uiActionsPluginMock.createSetupContract();
-
-  const editModeAction = createEditModeAction();
-  uiActionsSetup.registerAction(editModeAction);
-  uiActionsSetup.attachAction(CONTEXT_MENU_TRIGGER, editModeAction.id);
-  setup.registerEmbeddableFactory(
-    CONTACT_CARD_EMBEDDABLE,
-    new ContactCardEmbeddableFactory({} as any, (() => null) as any, {} as any)
-  );
-
-  const start = doStart();
-
-  const initialInput = getSampleDashboardInput({ viewMode: ViewMode.VIEW });
-  const options: DashboardContainerOptions = {
-    application: {} as any,
-    embeddable: start,
-    notifications: {} as any,
-    overlays: {} as any,
-    inspector: {} as any,
-    SavedObjectFinder: () => null,
-    ExitFullScreenButton: () => null,
-    uiActions: {} as any,
-  };
-  const container = new DashboardContainer(initialInput, options);
-
-  const embeddable = await container.addNewEmbeddable<
-    ContactCardEmbeddableInput,
-    ContactCardEmbeddableOutput,
-    ContactCardEmbeddable
-  >(CONTACT_CARD_EMBEDDABLE, {
-    firstName: 'Bob',
-  });
-
-  const component = mount(
-    <I18nProvider>
-      <KibanaContextProvider services={options}>
-        <EmbeddablePanel
-          embeddable={embeddable}
-          getActions={() => Promise.resolve([])}
-          getAllEmbeddableFactories={(() => []) as any}
-          getEmbeddableFactory={(() => null) as any}
-          notifications={{} as any}
-          overlays={{} as any}
-          inspector={inspector}
-          SavedObjectFinder={() => null}
-        />
-      </KibanaContextProvider>
-    </I18nProvider>
-  );
-
-  const button = findTestSubject(component, 'embeddablePanelToggleMenuIcon');
-
-  expect(button.length).toBe(1);
-  findTestSubject(component, 'embeddablePanelToggleMenuIcon').simulate('click');
-
-  expect(findTestSubject(component, `embeddablePanelContextMenuOpen`).length).toBe(1);
-
-  const editAction = findTestSubject(component, `embeddablePanelAction-${editModeAction.id}`);
-
-  expect(editAction.length).toBe(0);
-
-  container.updateInput({ viewMode: ViewMode.EDIT });
-  await nextTick();
-  component.update();
-  findTestSubject(component, 'embeddablePanelToggleMenuIcon').simulate('click');
-  await nextTick();
-  component.update();
-  expect(findTestSubject(component, 'embeddablePanelContextMenuOpen').length).toBe(0);
-  findTestSubject(component, 'embeddablePanelToggleMenuIcon').simulate('click');
-  await nextTick();
-  component.update();
-  expect(findTestSubject(component, 'embeddablePanelContextMenuOpen').length).toBe(1);
-
-  await nextTick();
-  component.update();
-
-  // TODO: Address this.
-  // const action = findTestSubject(component, `embeddablePanelAction-${editModeAction.id}`);
-  // expect(action.length).toBe(1);
-});
diff --git a/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts b/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts
index c436e1d45c6d86..abe9ec6d6e8731 100644
--- a/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts
+++ b/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts
@@ -18,21 +18,25 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Filter } from '@kbn/es-query';
-import { npStart } from 'ui/new_platform';
+import { CoreStart } from 'src/core/public';
 import {
   IAction,
   createAction,
   IncompatibleActionError,
 } from '../../../../../../plugins/ui_actions/public';
-import { changeTimeFilter, extractTimeFilter, FilterManager } from '../filter_manager';
-import { TimefilterContract } from '../../timefilter';
+import {
+  esFilters,
+  FilterManager,
+  TimefilterContract,
+  changeTimeFilter,
+  extractTimeFilter,
+} from '../../../../../../plugins/data/public';
 import { applyFiltersPopover } from '../apply_filters/apply_filters_popover';
 import { IndexPatternsStart } from '../../index_patterns';
 export const GLOBAL_APPLY_FILTER_ACTION = 'GLOBAL_APPLY_FILTER_ACTION';
 
 interface ActionContext {
-  filters: Filter[];
+  filters: esFilters.Filter[];
   timeFieldName?: string;
 }
 
@@ -41,6 +45,7 @@ async function isCompatible(context: ActionContext) {
 }
 
 export function createFilterAction(
+  overlays: CoreStart['overlays'],
   filterManager: FilterManager,
   timeFilter: TimefilterContract,
   indexPatternsService: IndexPatternsStart
@@ -63,7 +68,7 @@ export function createFilterAction(
         throw new IncompatibleActionError();
       }
 
-      let selectedFilters: Filter[] = filters;
+      let selectedFilters: esFilters.Filter[] = filters;
 
       if (selectedFilters.length > 1) {
         const indexPatterns = await Promise.all(
@@ -72,8 +77,8 @@ export function createFilterAction(
           })
         );
 
-        const filterSelectionPromise: Promise<Filter[]> = new Promise(resolve => {
-          const overlay = npStart.core.overlays.openModal(
+        const filterSelectionPromise: Promise<esFilters.Filter[]> = new Promise(resolve => {
+          const overlay = overlays.openModal(
             applyFiltersPopover(
               filters,
               indexPatterns,
@@ -81,7 +86,7 @@ export function createFilterAction(
                 overlay.close();
                 resolve([]);
               },
-              (filterSelection: Filter[]) => {
+              (filterSelection: esFilters.Filter[]) => {
                 overlay.close();
                 resolve(filterSelection);
               }
diff --git a/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filter_popover_content.tsx b/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filter_popover_content.tsx
index 5f7fbc19964335..e9d05d6340e584 100644
--- a/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filter_popover_content.tsx
+++ b/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filter_popover_content.tsx
@@ -28,19 +28,18 @@ import {
   EuiModalHeaderTitle,
   EuiSwitch,
 } from '@elastic/eui';
-import { Filter } from '@kbn/es-query';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import { IndexPattern } from '../../index_patterns';
 import { getFilterDisplayText } from '../filter_bar/filter_editor/lib/get_filter_display_text';
-import { mapAndFlattenFilters } from '../filter_manager/lib/map_and_flatten_filters';
+import { mapAndFlattenFilters, esFilters } from '../../../../../../plugins/data/public';
 import { getDisplayValueFromFilter } from '../filter_bar/filter_editor/lib/get_display_value';
 
 interface Props {
-  filters: Filter[];
+  filters: esFilters.Filter[];
   indexPatterns: IndexPattern[];
   onCancel: () => void;
-  onSubmit: (filters: Filter[]) => void;
+  onSubmit: (filters: esFilters.Filter[]) => void;
 }
 
 interface State {
@@ -58,7 +57,7 @@ export class ApplyFiltersPopoverContent extends Component<Props, State> {
       isFilterSelected: props.filters.map(() => true),
     };
   }
-  private getLabel(filter: Filter) {
+  private getLabel(filter: esFilters.Filter) {
     const filterDisplayValue = getDisplayValueFromFilter(filter, this.props.indexPatterns);
     return getFilterDisplayText(filter, filterDisplayValue);
   }
diff --git a/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filters_popover.tsx b/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filters_popover.tsx
index 0687701429866d..41f757e726c40b 100644
--- a/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filters_popover.tsx
+++ b/src/legacy/core_plugins/data/public/filter/apply_filters/apply_filters_popover.tsx
@@ -18,15 +18,15 @@
  */
 
 import { EuiModal, EuiOverlayMask } from '@elastic/eui';
-import { Filter } from '@kbn/es-query';
 import React, { Component } from 'react';
 import { ApplyFiltersPopoverContent } from './apply_filter_popover_content';
 import { IndexPattern } from '../../index_patterns/index_patterns';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 interface Props {
-  filters: Filter[];
+  filters: esFilters.Filter[];
   onCancel: () => void;
-  onSubmit: (filters: Filter[]) => void;
+  onSubmit: (filters: esFilters.Filter[]) => void;
   indexPatterns: IndexPattern[];
 }
 
@@ -56,9 +56,9 @@ export class ApplyFiltersPopover extends Component<Props, State> {
 }
 
 type cancelFunction = () => void;
-type submitFunction = (filters: Filter[]) => void;
+type submitFunction = (filters: esFilters.Filter[]) => void;
 export const applyFiltersPopover = (
-  filters: Filter[],
+  filters: esFilters.Filter[],
   indexPatterns: IndexPattern[],
   onCancel: cancelFunction,
   onSubmit: submitFunction
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_group.scss b/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_group.scss
index 3c90e18aecd5d6..1c47c28097454e 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_group.scss
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_group.scss
@@ -11,6 +11,10 @@
   margin-top: $euiSizeXS;
 }
 
+.globalFilterBar__addButton {
+  min-height: $euiSizeL + $euiSizeXS; // same height as the badges
+}
+
 // sass-lint:disable quotes
 .globalFilterGroup__branch {
   padding: $euiSizeS $euiSizeM 0 0;
@@ -40,4 +44,3 @@
     margin-top: $euiSize * -1;
   }
 }
-
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_item.scss b/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_item.scss
index caf3b0b796b9e2..84538a62ca005f 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_item.scss
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/_global_filter_item.scss
@@ -1,5 +1,5 @@
-@import '@elastic/eui/src/components/form/mixins';
 @import '@elastic/eui/src/components/form/variables';
+@import '@elastic/eui/src/components/form/mixins';
 
 /**
  * 1.  Allow wrapping of long filter items
@@ -19,11 +19,17 @@
 
   &:not(.globalFilterItem-isDisabled) {
     @include euiFormControlDefaultShadow;
+    box-shadow: #{$euiFormControlBoxShadow}, inset 0 0 0 1px $kbnGlobalFilterItemBorderColor; // Make the actual border more visible
+  }
+
+  &:focus-within {
+    animation: none !important; // Remove focus ring animation otherwise it overrides simulated border via box-shadow
   }
 }
 
 .globalFilterItem-isDisabled {
-  background-color: transparentize($euiColorLightShade, .4);
+  color: $euiColorDarkShade;
+  background-color: transparentize($euiColorLightShade, 0.5);
   text-decoration: line-through;
   font-weight: $euiFontWeightRegular;
   font-style: italic;
@@ -39,12 +45,22 @@
     bottom: 0;
     left: 0;
     width: $euiSizeXS;
-    background-color: $euiColorVis0;
+    background-color: $kbnGlobalFilterItemBorderColor;
     border-top-left-radius: $euiBorderRadius / 2;
     border-bottom-left-radius: $euiBorderRadius / 2;
   }
 }
 
+.globalFilterItem-isExcluded {
+  &:not(.globalFilterItem-isDisabled) {
+    box-shadow: #{$euiFormControlBoxShadow}, inset 0 0 0 1px $kbnGlobalFilterItemBorderColorExcluded;
+
+    &::before {
+      background-color: $kbnGlobalFilterItemPinnedColorExcluded;
+    }
+  }
+}
+
 .globalFilterItem__editorForm {
   padding: $euiSizeM;
 }
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/_index.scss b/src/legacy/core_plugins/data/public/filter/filter_bar/_index.scss
index 3c57b7fe2ca3ad..5333aff8b87da3 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/_index.scss
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/_index.scss
@@ -1,2 +1,3 @@
+@import 'variables';
 @import 'global_filter_group';
 @import 'global_filter_item';
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/_variables.scss b/src/legacy/core_plugins/data/public/filter/filter_bar/_variables.scss
new file mode 100644
index 00000000000000..3a9a0df4332c81
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/_variables.scss
@@ -0,0 +1,3 @@
+$kbnGlobalFilterItemBorderColor: tintOrShade($euiColorMediumShade, 35%, 20%);
+$kbnGlobalFilterItemBorderColorExcluded: tintOrShade($euiColorDanger, 70%, 50%);
+$kbnGlobalFilterItemPinnedColorExcluded: tintOrShade($euiColorDanger, 30%, 20%);
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx
index 066adb1e3275e8..333e1e328651d4 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_bar.tsx
@@ -18,16 +18,6 @@
  */
 
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiPopover } from '@elastic/eui';
-import {
-  buildEmptyFilter,
-  disableFilter,
-  enableFilter,
-  Filter,
-  pinFilter,
-  toggleFilterDisabled,
-  toggleFilterNegated,
-  unpinFilter,
-} from '@kbn/es-query';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import classNames from 'classnames';
 import React, { useState } from 'react';
@@ -38,10 +28,11 @@ import { FilterEditor } from './filter_editor';
 import { FilterItem } from './filter_item';
 import { FilterOptions } from './filter_options';
 import { useKibana, KibanaContextProvider } from '../../../../../../plugins/kibana_react/public';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 interface Props {
-  filters: Filter[];
-  onFiltersUpdated?: (filters: Filter[]) => void;
+  filters: esFilters.Filter[];
+  onFiltersUpdated?: (filters: esFilters.Filter[]) => void;
   className: string;
   indexPatterns: IndexPattern[];
   intl: InjectedIntl;
@@ -87,7 +78,7 @@ function FilterBarUI(props: Props) {
     return content;
   }
 
-  function onFiltersUpdated(filters: Filter[]) {
+  function onFiltersUpdated(filters: esFilters.Filter[]) {
     if (props.onFiltersUpdated) {
       props.onFiltersUpdated(filters);
     }
@@ -112,13 +103,14 @@ function FilterBarUI(props: Props) {
     const isPinned = uiSettings!.get('filters:pinnedByDefault');
     const [indexPattern] = props.indexPatterns;
     const index = indexPattern && indexPattern.id;
-    const newFilter = buildEmptyFilter(isPinned, index);
+    const newFilter = esFilters.buildEmptyFilter(isPinned, index);
 
     const button = (
       <EuiButtonEmpty
         size="xs"
         onClick={() => setIsAddFilterPopoverOpen(true)}
         data-test-subj="addFilter"
+        className="globalFilterBar__addButton"
       >
         +{' '}
         <FormattedMessage
@@ -156,7 +148,7 @@ function FilterBarUI(props: Props) {
     );
   }
 
-  function onAdd(filter: Filter) {
+  function onAdd(filter: esFilters.Filter) {
     setIsAddFilterPopoverOpen(false);
     const filters = [...props.filters, filter];
     onFiltersUpdated(filters);
@@ -168,39 +160,39 @@ function FilterBarUI(props: Props) {
     onFiltersUpdated(filters);
   }
 
-  function onUpdate(i: number, filter: Filter) {
+  function onUpdate(i: number, filter: esFilters.Filter) {
     const filters = [...props.filters];
     filters[i] = filter;
     onFiltersUpdated(filters);
   }
 
   function onEnableAll() {
-    const filters = props.filters.map(enableFilter);
+    const filters = props.filters.map(esFilters.enableFilter);
     onFiltersUpdated(filters);
   }
 
   function onDisableAll() {
-    const filters = props.filters.map(disableFilter);
+    const filters = props.filters.map(esFilters.disableFilter);
     onFiltersUpdated(filters);
   }
 
   function onPinAll() {
-    const filters = props.filters.map(pinFilter);
+    const filters = props.filters.map(esFilters.pinFilter);
     onFiltersUpdated(filters);
   }
 
   function onUnpinAll() {
-    const filters = props.filters.map(unpinFilter);
+    const filters = props.filters.map(esFilters.unpinFilter);
     onFiltersUpdated(filters);
   }
 
   function onToggleAllNegated() {
-    const filters = props.filters.map(toggleFilterNegated);
+    const filters = props.filters.map(esFilters.toggleFilterNegated);
     onFiltersUpdated(filters);
   }
 
   function onToggleAllDisabled() {
-    const filters = props.filters.map(toggleFilterDisabled);
+    const filters = props.filters.map(esFilters.toggleFilterDisabled);
     onFiltersUpdated(filters);
   }
 
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/index.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/index.tsx
index 5b295a759d694d..5dd5c056477896 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/index.tsx
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/index.tsx
@@ -31,7 +31,6 @@ import {
   EuiSpacer,
   EuiSwitch,
 } from '@elastic/eui';
-import { FieldFilter, Filter } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { get } from 'lodash';
@@ -54,11 +53,12 @@ import { Operator } from './lib/filter_operators';
 import { PhraseValueInput } from './phrase_value_input';
 import { PhrasesValuesInput } from './phrases_values_input';
 import { RangeValueInput } from './range_value_input';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 interface Props {
-  filter: Filter;
+  filter: esFilters.Filter;
   indexPatterns: IndexPattern[];
-  onSubmit: (filter: Filter) => void;
+  onSubmit: (filter: esFilters.Filter) => void;
   onCancel: () => void;
   intl: InjectedIntl;
 }
@@ -379,7 +379,9 @@ class FilterEditorUI extends Component<Props, State> {
 
   private getFieldFromFilter() {
     const indexPattern = this.getIndexPatternFromFilter();
-    return indexPattern && getFieldFromFilter(this.props.filter as FieldFilter, indexPattern);
+    return (
+      indexPattern && getFieldFromFilter(this.props.filter as esFilters.FieldFilter, indexPattern)
+    );
   }
 
   private getSelectedOperator() {
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.test.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
index 734c5d00e58d5d..dbff5096f2287d 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.test.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { FilterStateStore, toggleFilterNegated } from '@kbn/es-query';
 import { mockFields, mockIndexPattern } from '../../../../index_patterns';
 import { IndexPattern, Field } from '../../../../index';
 import {
@@ -42,6 +41,7 @@ import { existsFilter } from './fixtures/exists_filter';
 import { phraseFilter } from './fixtures/phrase_filter';
 import { phrasesFilter } from './fixtures/phrases_filter';
 import { rangeFilter } from './fixtures/range_filter';
+import { esFilters } from '../../../../../../../../plugins/data/public';
 
 jest.mock('ui/new_platform');
 
@@ -81,7 +81,7 @@ describe('Filter editor utils', () => {
     });
 
     it('should return "is not" for phrase filter', () => {
-      const negatedPhraseFilter = toggleFilterNegated(phraseFilter);
+      const negatedPhraseFilter = esFilters.toggleFilterNegated(phraseFilter);
       const operator = getOperatorFromFilter(negatedPhraseFilter);
       expect(operator).not.toBeUndefined();
       expect(operator && operator.type).toBe('phrase');
@@ -96,7 +96,7 @@ describe('Filter editor utils', () => {
     });
 
     it('should return "is not one of" for negated phrases filter', () => {
-      const negatedPhrasesFilter = toggleFilterNegated(phrasesFilter);
+      const negatedPhrasesFilter = esFilters.toggleFilterNegated(phrasesFilter);
       const operator = getOperatorFromFilter(negatedPhrasesFilter);
       expect(operator).not.toBeUndefined();
       expect(operator && operator.type).toBe('phrases');
@@ -111,7 +111,7 @@ describe('Filter editor utils', () => {
     });
 
     it('should return "is not between" for negated range filter', () => {
-      const negatedRangeFilter = toggleFilterNegated(rangeFilter);
+      const negatedRangeFilter = esFilters.toggleFilterNegated(rangeFilter);
       const operator = getOperatorFromFilter(negatedRangeFilter);
       expect(operator).not.toBeUndefined();
       expect(operator && operator.type).toBe('range');
@@ -126,7 +126,7 @@ describe('Filter editor utils', () => {
     });
 
     it('should return "does not exists" for negated exists filter', () => {
-      const negatedExistsFilter = toggleFilterNegated(existsFilter);
+      const negatedExistsFilter = esFilters.toggleFilterNegated(existsFilter);
       const operator = getOperatorFromFilter(negatedExistsFilter);
       expect(operator).not.toBeUndefined();
       expect(operator && operator.type).toBe('exists');
@@ -246,7 +246,7 @@ describe('Filter editor utils', () => {
     it('should build phrase filters', () => {
       const params = 'foo';
       const alias = 'bar';
-      const state = FilterStateStore.APP_STATE;
+      const state = esFilters.FilterStateStore.APP_STATE;
       const filter = buildFilter(
         mockedIndexPattern,
         mockedFields[0],
@@ -268,7 +268,7 @@ describe('Filter editor utils', () => {
     it('should build phrases filters', () => {
       const params = ['foo', 'bar'];
       const alias = 'bar';
-      const state = FilterStateStore.APP_STATE;
+      const state = esFilters.FilterStateStore.APP_STATE;
       const filter = buildFilter(
         mockedIndexPattern,
         mockedFields[0],
@@ -290,7 +290,7 @@ describe('Filter editor utils', () => {
     it('should build range filters', () => {
       const params = { from: 'foo', to: 'qux' };
       const alias = 'bar';
-      const state = FilterStateStore.APP_STATE;
+      const state = esFilters.FilterStateStore.APP_STATE;
       const filter = buildFilter(
         mockedIndexPattern,
         mockedFields[0],
@@ -311,7 +311,7 @@ describe('Filter editor utils', () => {
     it('should build exists filters', () => {
       const params = undefined;
       const alias = 'bar';
-      const state = FilterStateStore.APP_STATE;
+      const state = esFilters.FilterStateStore.APP_STATE;
       const filter = buildFilter(
         mockedIndexPattern,
         mockedFields[0],
@@ -332,7 +332,7 @@ describe('Filter editor utils', () => {
     it('should include disabled state', () => {
       const params = undefined;
       const alias = 'bar';
-      const state = FilterStateStore.APP_STATE;
+      const state = esFilters.FilterStateStore.APP_STATE;
       const filter = buildFilter(
         mockedIndexPattern,
         mockedFields[0],
@@ -348,7 +348,7 @@ describe('Filter editor utils', () => {
     it('should negate based on operator', () => {
       const params = undefined;
       const alias = 'bar';
-      const state = FilterStateStore.APP_STATE;
+      const state = esFilters.FilterStateStore.APP_STATE;
       const filter = buildFilter(
         mockedIndexPattern,
         mockedFields[0],
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts
index f0628f03c173e1..b7d20526a6b924 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts
@@ -18,42 +18,30 @@
  */
 
 import dateMath from '@elastic/datemath';
-import {
-  buildExistsFilter,
-  buildPhraseFilter,
-  buildPhrasesFilter,
-  buildRangeFilter,
-  FieldFilter,
-  Filter,
-  FilterMeta,
-  FilterStateStore,
-  PhraseFilter,
-  PhrasesFilter,
-  RangeFilter,
-} from '@kbn/es-query';
 import { omit } from 'lodash';
 import { Ipv4Address } from '../../../../../../../../plugins/kibana_utils/public';
 import { Field, IndexPattern, isFilterable } from '../../../../index_patterns';
 import { FILTER_OPERATORS, Operator } from './filter_operators';
+import { esFilters } from '../../../../../../../../plugins/data/public';
 
 export function getIndexPatternFromFilter(
-  filter: Filter,
+  filter: esFilters.Filter,
   indexPatterns: IndexPattern[]
 ): IndexPattern | undefined {
   return indexPatterns.find(indexPattern => indexPattern.id === filter.meta.index);
 }
 
-export function getFieldFromFilter(filter: FieldFilter, indexPattern: IndexPattern) {
+export function getFieldFromFilter(filter: esFilters.FieldFilter, indexPattern: IndexPattern) {
   return indexPattern.fields.find(field => field.name === filter.meta.key);
 }
 
-export function getOperatorFromFilter(filter: Filter) {
+export function getOperatorFromFilter(filter: esFilters.Filter) {
   return FILTER_OPERATORS.find(operator => {
     return filter.meta.type === operator.type && filter.meta.negate === operator.negate;
   });
 }
 
-export function getQueryDslFromFilter(filter: Filter) {
+export function getQueryDslFromFilter(filter: esFilters.Filter) {
   return omit(filter, ['$state', 'meta']);
 }
 
@@ -67,16 +55,16 @@ export function getOperatorOptions(field: Field) {
   });
 }
 
-export function getFilterParams(filter: Filter) {
+export function getFilterParams(filter: esFilters.Filter) {
   switch (filter.meta.type) {
     case 'phrase':
-      return (filter as PhraseFilter).meta.params.query;
+      return (filter as esFilters.PhraseFilter).meta.params.query;
     case 'phrases':
-      return (filter as PhrasesFilter).meta.params;
+      return (filter as esFilters.PhrasesFilter).meta.params;
     case 'range':
       return {
-        from: (filter as RangeFilter).meta.params.gte,
-        to: (filter as RangeFilter).meta.params.lt,
+        from: (filter as esFilters.RangeFilter).meta.params.gte,
+        to: (filter as esFilters.RangeFilter).meta.params.lt,
       };
   }
 }
@@ -133,8 +121,8 @@ export function buildFilter(
   disabled: boolean,
   params: any,
   alias: string | null,
-  store: FilterStateStore
-): Filter {
+  store: esFilters.FilterStateStore
+): esFilters.Filter {
   const filter = buildBaseFilter(indexPattern, field, operator, params);
   filter.meta.alias = alias;
   filter.meta.negate = operator.negate;
@@ -148,17 +136,17 @@ function buildBaseFilter(
   field: Field,
   operator: Operator,
   params: any
-): Filter {
+): esFilters.Filter {
   switch (operator.type) {
     case 'phrase':
-      return buildPhraseFilter(field, params, indexPattern);
+      return esFilters.buildPhraseFilter(field, params, indexPattern);
     case 'phrases':
-      return buildPhrasesFilter(field, params, indexPattern);
+      return esFilters.buildPhrasesFilter(field, params, indexPattern);
     case 'range':
       const newParams = { gte: params.from, lt: params.to };
-      return buildRangeFilter(field, newParams, indexPattern);
+      return esFilters.buildRangeFilter(field, newParams, indexPattern);
     case 'exists':
-      return buildExistsFilter(field, indexPattern);
+      return esFilters.buildExistsFilter(field, indexPattern);
     default:
       throw new Error(`Unknown operator type: ${operator.type}`);
   }
@@ -170,10 +158,10 @@ export function buildCustomFilter(
   disabled: boolean,
   negate: boolean,
   alias: string | null,
-  store: FilterStateStore
-): Filter {
-  const meta: FilterMeta = { index, type: 'custom', disabled, negate, alias };
-  const filter: Filter = { ...queryDsl, meta };
+  store: esFilters.FilterStateStore
+): esFilters.Filter {
+  const meta: esFilters.FilterMeta = { index, type: 'custom', disabled, negate, alias };
+  const filter: esFilters.Filter = { ...queryDsl, meta };
   filter.$state = { store };
   return filter;
 }
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/exists_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/exists_filter.ts
index a17f767006f3ea..5af97818f9bfbd 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/exists_filter.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/exists_filter.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { ExistsFilter, FilterStateStore } from '@kbn/es-query';
+import { esFilters } from '../../../../../../../../../plugins/data/public';
 
-export const existsFilter: ExistsFilter = {
+export const existsFilter: esFilters.ExistsFilter = {
   meta: {
     index: 'logstash-*',
     negate: false,
@@ -29,6 +29,6 @@ export const existsFilter: ExistsFilter = {
     alias: null,
   },
   $state: {
-    store: FilterStateStore.APP_STATE,
+    store: esFilters.FilterStateStore.APP_STATE,
   },
 };
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrase_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrase_filter.ts
index 77bb8e06c801ad..b6c8b9905e6b33 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrase_filter.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrase_filter.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { FilterStateStore, PhraseFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../../../../plugins/data/public';
 
-export const phraseFilter: PhraseFilter = {
+export const phraseFilter: esFilters.PhraseFilter = {
   meta: {
     negate: false,
     index: 'logstash-*',
@@ -33,6 +33,6 @@ export const phraseFilter: PhraseFilter = {
     },
   },
   $state: {
-    store: FilterStateStore.APP_STATE,
+    store: esFilters.FilterStateStore.APP_STATE,
   },
 };
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrases_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrases_filter.ts
index e86c3ee1318e34..2e2ba4f798bddf 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrases_filter.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/phrases_filter.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { FilterStateStore, PhrasesFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../../../../plugins/data/public';
 
-export const phrasesFilter: PhrasesFilter = {
+export const phrasesFilter: esFilters.PhrasesFilter = {
   meta: {
     index: 'logstash-*',
     type: 'phrases',
@@ -31,6 +31,6 @@ export const phrasesFilter: PhrasesFilter = {
     alias: null,
   },
   $state: {
-    store: FilterStateStore.APP_STATE,
+    store: esFilters.FilterStateStore.APP_STATE,
   },
 };
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/range_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/range_filter.ts
index 46a5181450feae..c6438e30ecec61 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/range_filter.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/fixtures/range_filter.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { FilterStateStore, RangeFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../../../../plugins/data/public';
 
-export const rangeFilter: RangeFilter = {
+export const rangeFilter: esFilters.RangeFilter = {
   meta: {
     index: 'logstash-*',
     negate: false,
@@ -34,7 +34,7 @@ export const rangeFilter: RangeFilter = {
     },
   },
   $state: {
-    store: FilterStateStore.APP_STATE,
+    store: esFilters.FilterStateStore.APP_STATE,
   },
   range: {},
 };
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_display_value.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_display_value.ts
index 551b99d01b7da8..d8af7b3e97ad23 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_display_value.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_display_value.ts
@@ -18,7 +18,7 @@
  */
 
 import { get } from 'lodash';
-import { Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../../../plugins/data/public';
 import { IndexPattern } from '../../../../index_patterns/index_patterns';
 import { Field } from '../../../../index_patterns/fields';
 import { getIndexPatternFromFilter } from './filter_editor_utils';
@@ -33,7 +33,10 @@ function getValueFormatter(indexPattern?: IndexPattern, key?: string) {
   return format;
 }
 
-export function getDisplayValueFromFilter(filter: Filter, indexPatterns: IndexPattern[]): string {
+export function getDisplayValueFromFilter(
+  filter: esFilters.Filter,
+  indexPatterns: IndexPattern[]
+): string {
   const indexPattern = getIndexPatternFromFilter(filter, indexPatterns);
 
   if (typeof filter.meta.value === 'function') {
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.ts b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.ts
deleted file mode 100644
index 73ee1a69a2ce38..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.ts
+++ /dev/null
@@ -1,53 +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 { Filter } from '@kbn/es-query';
-import { i18n } from '@kbn/i18n';
-import { existsOperator, isOneOfOperator } from './filter_operators';
-
-export function getFilterDisplayText(filter: Filter, filterDisplayName: string) {
-  const prefix = filter.meta.negate
-    ? ` ${i18n.translate('data.filter.filterBar.negatedFilterPrefix', {
-        defaultMessage: 'NOT ',
-      })}`
-    : '';
-
-  if (filter.meta.alias !== null) {
-    return `${prefix}${filter.meta.alias}`;
-  }
-
-  switch (filter.meta.type) {
-    case 'exists':
-      return `${prefix}${filter.meta.key} ${existsOperator.message}`;
-    case 'geo_bounding_box':
-      return `${prefix}${filter.meta.key}: ${filterDisplayName}`;
-    case 'geo_polygon':
-      return `${prefix}${filter.meta.key}: ${filterDisplayName}`;
-    case 'phrase':
-      return `${prefix}${filter.meta.key}: ${filterDisplayName}`;
-    case 'phrases':
-      return `${prefix}${filter.meta.key} ${isOneOfOperator.message} ${filterDisplayName}`;
-    case 'query_string':
-      return `${prefix}${filterDisplayName}`;
-    case 'range':
-      return `${prefix}${filter.meta.key}: ${filterDisplayName}`;
-    default:
-      return `${prefix}${JSON.stringify(filter.query)}`;
-  }
-}
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.tsx
new file mode 100644
index 00000000000000..21abcd8510046d
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/get_filter_display_text.tsx
@@ -0,0 +1,102 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { Fragment } from 'react';
+import { EuiTextColor } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { existsOperator, isOneOfOperator } from './filter_operators';
+import { esFilters } from '../../../../../../../../plugins/data/public';
+
+export function getFilterDisplayText(filter: esFilters.Filter, filterDisplayName: string) {
+  const prefixText = filter.meta.negate
+    ? ` ${i18n.translate('data.filter.filterBar.negatedFilterPrefix', {
+        defaultMessage: 'NOT ',
+      })}`
+    : '';
+  const prefix =
+    filter.meta.negate && !filter.meta.disabled ? (
+      <EuiTextColor color="danger">{prefixText}</EuiTextColor>
+    ) : (
+      prefixText
+    );
+
+  if (filter.meta.alias !== null) {
+    return `${prefix}${filter.meta.alias}`;
+  }
+
+  switch (filter.meta.type) {
+    case 'exists':
+      return (
+        <Fragment>
+          {prefix}
+          {filter.meta.key} {existsOperator.message}
+        </Fragment>
+      );
+    case 'geo_bounding_box':
+      return (
+        <Fragment>
+          {prefix}
+          {filter.meta.key}: {filterDisplayName}
+        </Fragment>
+      );
+    case 'geo_polygon':
+      return (
+        <Fragment>
+          {prefix}
+          {filter.meta.key}: {filterDisplayName}
+        </Fragment>
+      );
+    case 'phrase':
+      return (
+        <Fragment>
+          {prefix}
+          {filter.meta.key}: {filterDisplayName}
+        </Fragment>
+      );
+    case 'phrases':
+      return (
+        <Fragment>
+          {prefix}
+          {filter.meta.key} {isOneOfOperator.message} {filterDisplayName}
+        </Fragment>
+      );
+    case 'query_string':
+      return (
+        <Fragment>
+          {prefix}
+          {filterDisplayName}
+        </Fragment>
+      );
+    case 'range':
+    case 'phrase':
+      return (
+        <Fragment>
+          {prefix}
+          {filter.meta.key}: {filterDisplayName}
+        </Fragment>
+      );
+    default:
+      return (
+        <Fragment>
+          {prefix}
+          {JSON.stringify(filter.query)}
+        </Fragment>
+      );
+  }
+}
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx
index 2e98cbd306e9c6..50c1672333801e 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx
@@ -18,13 +18,6 @@
  */
 
 import { EuiContextMenu, EuiPopover } from '@elastic/eui';
-import {
-  Filter,
-  isFilterPinned,
-  toggleFilterDisabled,
-  toggleFilterNegated,
-  toggleFilterPinned,
-} from '@kbn/es-query';
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import classNames from 'classnames';
 import React, { Component } from 'react';
@@ -33,13 +26,14 @@ import { IndexPattern } from '../../index_patterns';
 import { FilterEditor } from './filter_editor';
 import { FilterView } from './filter_view';
 import { getDisplayValueFromFilter } from './filter_editor/lib/get_display_value';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 interface Props {
   id: string;
-  filter: Filter;
+  filter: esFilters.Filter;
   indexPatterns: IndexPattern[];
   className?: string;
-  onUpdate: (filter: Filter) => void;
+  onUpdate: (filter: esFilters.Filter) => void;
   onRemove: () => void;
   intl: InjectedIntl;
   uiSettings: UiSettingsClientContract;
@@ -62,7 +56,7 @@ class FilterItemUI extends Component<Props, State> {
       'globalFilterItem',
       {
         'globalFilterItem-isDisabled': disabled,
-        'globalFilterItem-isPinned': isFilterPinned(filter),
+        'globalFilterItem-isPinned': esFilters.isFilterPinned(filter),
         'globalFilterItem-isExcluded': negate,
       },
       this.props.className
@@ -91,7 +85,7 @@ class FilterItemUI extends Component<Props, State> {
         id: 0,
         items: [
           {
-            name: isFilterPinned(filter)
+            name: esFilters.isFilterPinned(filter)
               ? this.props.intl.formatMessage({
                   id: 'data.filter.filterBar.unpinFilterButtonLabel',
                   defaultMessage: 'Unpin',
@@ -209,23 +203,23 @@ class FilterItemUI extends Component<Props, State> {
     });
   };
 
-  private onSubmit = (filter: Filter) => {
+  private onSubmit = (filter: esFilters.Filter) => {
     this.closePopover();
     this.props.onUpdate(filter);
   };
 
   private onTogglePinned = () => {
-    const filter = toggleFilterPinned(this.props.filter);
+    const filter = esFilters.toggleFilterPinned(this.props.filter);
     this.props.onUpdate(filter);
   };
 
   private onToggleNegated = () => {
-    const filter = toggleFilterNegated(this.props.filter);
+    const filter = esFilters.toggleFilterNegated(this.props.filter);
     this.props.onUpdate(filter);
   };
 
   private onToggleDisabled = () => {
-    const filter = toggleFilterDisabled(this.props.filter);
+    const filter = esFilters.toggleFilterDisabled(this.props.filter);
     this.props.onUpdate(filter);
   };
 }
diff --git a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx
index a7ea23efce49ed..6421691c4ef416 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx
+++ b/src/legacy/core_plugins/data/public/filter/filter_bar/filter_view/index.tsx
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import { EuiBadge } from '@elastic/eui';
-import { Filter, isFilterPinned } from '@kbn/es-query';
+import { EuiBadge, useInnerText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { SFC } from 'react';
 import { getFilterDisplayText } from '../filter_editor/lib/get_filter_display_text';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 interface Props {
-  filter: Filter;
+  filter: esFilters.Filter;
   displayName: string;
   [propName: string]: any;
 }
@@ -36,12 +36,15 @@ export const FilterView: SFC<Props> = ({
   displayName,
   ...rest
 }: Props) => {
+  const [ref, innerText] = useInnerText();
+  const displayText = <span ref={ref}>{getFilterDisplayText(filter, displayName)}</span>;
+
   let title = i18n.translate('data.filter.filterBar.moreFilterActionsMessage', {
-    defaultMessage: 'Filter: {displayText}. Select for more filter actions.',
-    values: { displayText: getFilterDisplayText(filter, displayName) },
+    defaultMessage: 'Filter: {innerText}. Select for more filter actions.',
+    values: { innerText },
   });
 
-  if (isFilterPinned(filter)) {
+  if (esFilters.isFilterPinned(filter)) {
     title = `${i18n.translate('data.filter.filterBar.pinnedFilterPrefix', {
       defaultMessage: 'Pinned',
     })} ${title}`;
@@ -72,7 +75,7 @@ export const FilterView: SFC<Props> = ({
       })}
       {...rest}
     >
-      <span>{getFilterDisplayText(filter, displayName)}</span>
+      {displayText}
     </EuiBadge>
   );
 };
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.test.ts
deleted file mode 100644
index 21c51c9f68f41d..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.test.ts
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import sinon from 'sinon';
-
-import { Subscription } from 'rxjs';
-import { Filter, FilterStateStore } from '@kbn/es-query';
-
-import { FilterStateManager } from './filter_state_manager';
-import { FilterManager } from './filter_manager';
-
-import { getFilter } from './test_helpers/get_stub_filter';
-import { StubState } from './test_helpers/stub_state';
-import { getFiltersArray } from './test_helpers/get_filters_array';
-
-import { coreMock } from '../../../../../../core/public/mocks';
-const setupMock = coreMock.createSetup();
-
-setupMock.uiSettings.get.mockImplementation((key: string) => {
-  return true;
-});
-
-describe('filter_manager', () => {
-  let appStateStub: StubState;
-  let globalStateStub: StubState;
-
-  let updateSubscription: Subscription | undefined;
-  let fetchSubscription: Subscription | undefined;
-  let updateListener: sinon.SinonSpy<any[], any>;
-
-  let filterManager: FilterManager;
-  let readyFilters: Filter[];
-
-  beforeEach(() => {
-    updateListener = sinon.stub();
-    appStateStub = new StubState();
-    globalStateStub = new StubState();
-    filterManager = new FilterManager(setupMock.uiSettings);
-    readyFilters = getFiltersArray();
-
-    // FilterStateManager is tested indirectly.
-    // Therefore, we don't need it's instance.
-    new FilterStateManager(
-      globalStateStub,
-      () => {
-        return appStateStub;
-      },
-      filterManager
-    );
-  });
-
-  afterEach(async () => {
-    if (updateSubscription) {
-      updateSubscription.unsubscribe();
-    }
-    if (fetchSubscription) {
-      fetchSubscription.unsubscribe();
-    }
-
-    filterManager.removeAll();
-  });
-
-  describe('observing', () => {
-    test('should return observable', () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      fetchSubscription = filterManager.getUpdates$().subscribe(() => {});
-      expect(updateSubscription).toBeInstanceOf(Subscription);
-      expect(fetchSubscription).toBeInstanceOf(Subscription);
-    });
-
-    test('should observe global state', done => {
-      updateSubscription = filterManager.getUpdates$().subscribe(() => {
-        expect(filterManager.getGlobalFilters()).toHaveLength(1);
-        if (updateSubscription) {
-          updateSubscription.unsubscribe();
-        }
-        done();
-      });
-
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, true, true, 'age', 34);
-      globalStateStub.filters.push(f1);
-    });
-
-    test('should observe app state', done => {
-      updateSubscription = filterManager.getUpdates$().subscribe(() => {
-        expect(filterManager.getAppFilters()).toHaveLength(1);
-        if (updateSubscription) {
-          updateSubscription.unsubscribe();
-        }
-        done();
-      });
-
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      appStateStub.filters.push(f1);
-    });
-  });
-
-  describe('get \\ set filters', () => {
-    test('should be empty', () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      expect(filterManager.getAppFilters()).toHaveLength(0);
-      expect(filterManager.getGlobalFilters()).toHaveLength(0);
-      expect(filterManager.getFilters()).toHaveLength(0);
-
-      const partitionedFiltres = filterManager.getPartitionedFilters();
-      expect(partitionedFiltres.appFilters).toHaveLength(0);
-      expect(partitionedFiltres.globalFilters).toHaveLength(0);
-      expect(updateListener.called).toBeFalsy();
-    });
-
-    test('app state should be set', async () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      filterManager.setFilters([f1]);
-      expect(filterManager.getAppFilters()).toHaveLength(1);
-      expect(filterManager.getGlobalFilters()).toHaveLength(0);
-      expect(filterManager.getFilters()).toHaveLength(1);
-
-      const partitionedFiltres = filterManager.getPartitionedFilters();
-      expect(partitionedFiltres.appFilters).toHaveLength(1);
-      expect(partitionedFiltres.globalFilters).toHaveLength(0);
-      expect(updateListener.called).toBeTruthy();
-    });
-
-    test('global state should be set', async () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      filterManager.setFilters([f1]);
-      expect(filterManager.getAppFilters()).toHaveLength(0);
-      expect(filterManager.getGlobalFilters()).toHaveLength(1);
-      expect(filterManager.getFilters()).toHaveLength(1);
-
-      const partitionedFiltres = filterManager.getPartitionedFilters();
-      expect(partitionedFiltres.appFilters).toHaveLength(0);
-      expect(partitionedFiltres.globalFilters).toHaveLength(1);
-      expect(updateListener.called).toBeTruthy();
-    });
-
-    test('both states should be set', async () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
-      filterManager.setFilters([f1, f2]);
-      expect(filterManager.getAppFilters()).toHaveLength(1);
-      expect(filterManager.getGlobalFilters()).toHaveLength(1);
-      expect(filterManager.getFilters()).toHaveLength(2);
-
-      const partitionedFiltres = filterManager.getPartitionedFilters();
-      expect(partitionedFiltres.appFilters).toHaveLength(1);
-      expect(partitionedFiltres.globalFilters).toHaveLength(1);
-
-      // listener should be called just once
-      expect(updateListener.called).toBeTruthy();
-      expect(updateListener.callCount).toBe(1);
-    });
-
-    test('set state should override previous state', async () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
-
-      filterManager.setFilters([f1]);
-      filterManager.setFilters([f2]);
-
-      expect(filterManager.getAppFilters()).toHaveLength(1);
-      expect(filterManager.getGlobalFilters()).toHaveLength(0);
-      expect(filterManager.getFilters()).toHaveLength(1);
-
-      const partitionedFiltres = filterManager.getPartitionedFilters();
-      expect(partitionedFiltres.appFilters).toHaveLength(1);
-      expect(partitionedFiltres.globalFilters).toHaveLength(0);
-
-      // listener should be called just once
-      expect(updateListener.called).toBeTruthy();
-      expect(updateListener.callCount).toBe(2);
-    });
-
-    test('changing a disabled filter should fire only update event', async function() {
-      const updateStub = jest.fn();
-      const fetchStub = jest.fn();
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, true, false, 'age', 34);
-
-      filterManager.setFilters([f1]);
-
-      filterManager.getUpdates$().subscribe({
-        next: updateStub,
-      });
-
-      filterManager.getFetches$().subscribe({
-        next: fetchStub,
-      });
-
-      const f2 = _.cloneDeep(f1);
-      f2.meta.negate = true;
-      filterManager.setFilters([f2]);
-
-      // this time, events should be emitted
-      expect(fetchStub).toBeCalledTimes(0);
-      expect(updateStub).toBeCalledTimes(1);
-    });
-  });
-
-  describe('add filters', () => {
-    test('app state should accept a single filter', async function() {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      filterManager.addFilters(f1);
-      expect(filterManager.getAppFilters()).toHaveLength(1);
-      expect(filterManager.getGlobalFilters()).toHaveLength(0);
-      expect(updateListener.callCount).toBe(1);
-      expect(appStateStub.filters.length).toBe(1);
-    });
-
-    test('app state should accept array', async () => {
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'female');
-      filterManager.addFilters([f1]);
-      filterManager.addFilters([f2]);
-      expect(filterManager.getAppFilters()).toHaveLength(2);
-      expect(filterManager.getGlobalFilters()).toHaveLength(0);
-      expect(appStateStub.filters.length).toBe(2);
-    });
-
-    test('global state should accept a single filer', async () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      filterManager.addFilters(f1);
-      expect(filterManager.getAppFilters()).toHaveLength(0);
-      expect(filterManager.getGlobalFilters()).toHaveLength(1);
-      expect(updateListener.callCount).toBe(1);
-      expect(globalStateStub.filters.length).toBe(1);
-    });
-
-    test('global state should be accept array', async () => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'gender', 'female');
-      filterManager.addFilters([f1, f2]);
-      expect(filterManager.getAppFilters()).toHaveLength(0);
-      expect(filterManager.getGlobalFilters()).toHaveLength(2);
-      expect(globalStateStub.filters.length).toBe(2);
-    });
-
-    test('add multiple filters at once', async () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'gender', 'female');
-      filterManager.addFilters([f1, f2]);
-      expect(filterManager.getAppFilters()).toHaveLength(0);
-      expect(filterManager.getGlobalFilters()).toHaveLength(2);
-      expect(updateListener.callCount).toBe(1);
-    });
-
-    test('add same filter to global and app', async () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      filterManager.addFilters([f1, f2]);
-
-      // FILTER SHOULD BE ADDED ONLY ONCE, TO GLOBAL
-      expect(filterManager.getAppFilters()).toHaveLength(0);
-      expect(filterManager.getGlobalFilters()).toHaveLength(1);
-      expect(updateListener.callCount).toBe(1);
-    });
-
-    test('add same filter with different values to global and app', async () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
-      const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      filterManager.addFilters([f1, f2]);
-
-      // FILTER SHOULD BE ADDED TWICE
-      expect(filterManager.getAppFilters()).toHaveLength(1);
-      expect(filterManager.getGlobalFilters()).toHaveLength(1);
-      expect(updateListener.callCount).toBe(1);
-    });
-
-    test('add filter with no state, and force pin', async () => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
-      f1.$state = undefined;
-
-      filterManager.addFilters([f1], true);
-
-      // FILTER SHOULD BE GLOBAL
-      const f1Output = filterManager.getFilters()[0];
-      expect(f1Output.$state).toBeDefined();
-      if (f1Output.$state) {
-        expect(f1Output.$state.store).toBe(FilterStateStore.GLOBAL_STATE);
-      }
-    });
-
-    test('add filter with no state, and dont force pin', async () => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
-      f1.$state = undefined;
-
-      filterManager.addFilters([f1], false);
-
-      // FILTER SHOULD BE APP
-      const f1Output = filterManager.getFilters()[0];
-      expect(f1Output.$state).toBeDefined();
-      if (f1Output.$state) {
-        expect(f1Output.$state.store).toBe(FilterStateStore.APP_STATE);
-      }
-    });
-
-    test('should return app and global filters', async function() {
-      const filters = getFiltersArray();
-      filterManager.addFilters(filters[0], false);
-      filterManager.addFilters(filters[1], true);
-
-      // global filters should be listed first
-      let res = filterManager.getFilters();
-      expect(res).toHaveLength(2);
-      expect(res[0].$state && res[0].$state.store).toEqual(FilterStateStore.GLOBAL_STATE);
-      expect(res[0].meta.disabled).toEqual(filters[1].meta.disabled);
-      expect(res[0].query).toEqual(filters[1].query);
-
-      expect(res[1].$state && res[1].$state.store).toEqual(FilterStateStore.APP_STATE);
-      expect(res[1].meta.disabled).toEqual(filters[0].meta.disabled);
-      expect(res[1].query).toEqual(filters[0].query);
-
-      // should return updated version of filters
-      filterManager.addFilters(filters[2], false);
-
-      res = filterManager.getFilters();
-      expect(res).toHaveLength(3);
-    });
-
-    test('should skip appStateStub filters that match globalStateStub filters', async function() {
-      filterManager.addFilters(readyFilters, true);
-      const appFilter = _.cloneDeep(readyFilters[1]);
-      filterManager.addFilters(appFilter, false);
-
-      // global filters should be listed first
-      const res = filterManager.getFilters();
-      expect(res).toHaveLength(3);
-      _.each(res, function(filter) {
-        expect(filter.$state && filter.$state.store).toBe(FilterStateStore.GLOBAL_STATE);
-      });
-    });
-
-    test('should allow overwriting a positive filter by a negated one', async function() {
-      // Add negate: false version of the filter
-      const filter = _.cloneDeep(readyFilters[0]);
-      filter.meta.negate = false;
-
-      filterManager.addFilters(filter);
-      expect(filterManager.getFilters()).toHaveLength(1);
-      expect(filterManager.getFilters()[0]).toEqual(filter);
-
-      // Add negate: true version of the same filter
-      const negatedFilter = _.cloneDeep(readyFilters[0]);
-      negatedFilter.meta.negate = true;
-
-      filterManager.addFilters(negatedFilter);
-      // The negated filter should overwrite the positive one
-      expect(globalStateStub.filters.length).toBe(1);
-      expect(filterManager.getFilters()).toHaveLength(1);
-      expect(filterManager.getFilters()[0]).toEqual(negatedFilter);
-    });
-
-    test('should allow overwriting a negated filter by a positive one', async function() {
-      // Add negate: true version of the same filter
-      const negatedFilter = _.cloneDeep(readyFilters[0]);
-      negatedFilter.meta.negate = true;
-
-      filterManager.addFilters(negatedFilter);
-
-      // The negated filter should overwrite the positive one
-      expect(globalStateStub.filters.length).toBe(1);
-      expect(globalStateStub.filters[0]).toEqual(negatedFilter);
-
-      // Add negate: false version of the filter
-      const filter = _.cloneDeep(readyFilters[0]);
-      filter.meta.negate = false;
-
-      filterManager.addFilters(filter);
-      expect(globalStateStub.filters.length).toBe(1);
-      expect(globalStateStub.filters[0]).toEqual(filter);
-    });
-
-    test('should fire the update and fetch events', async function() {
-      const updateStub = jest.fn();
-      const fetchStub = jest.fn();
-
-      filterManager.getUpdates$().subscribe({
-        next: updateStub,
-      });
-
-      filterManager.getFetches$().subscribe({
-        next: fetchStub,
-      });
-
-      filterManager.addFilters(readyFilters);
-
-      // updates should trigger state saves
-      expect(appStateStub.save.callCount).toBe(1);
-      expect(globalStateStub.save.callCount).toBe(1);
-
-      // this time, events should be emitted
-      expect(fetchStub).toBeCalledTimes(1);
-      expect(updateStub).toBeCalledTimes(1);
-    });
-  });
-
-  describe('filter reconciliation', function() {
-    test('should de-dupe appStateStub filters being added', async function() {
-      const newFilter = _.cloneDeep(readyFilters[1]);
-      filterManager.addFilters(readyFilters, false);
-      expect(appStateStub.filters.length).toBe(3);
-
-      filterManager.addFilters(newFilter, false);
-      expect(appStateStub.filters.length).toBe(3);
-    });
-
-    test('should de-dupe globalStateStub filters being added', async function() {
-      const newFilter = _.cloneDeep(readyFilters[1]);
-      filterManager.addFilters(readyFilters, true);
-      expect(globalStateStub.filters.length).toBe(3);
-
-      filterManager.addFilters(newFilter, true);
-      expect(globalStateStub.filters.length).toBe(3);
-    });
-
-    test('should de-dupe globalStateStub filters being set', async () => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      const f2 = _.cloneDeep(f1);
-      filterManager.setFilters([f1, f2]);
-      expect(filterManager.getAppFilters()).toHaveLength(0);
-      expect(filterManager.getGlobalFilters()).toHaveLength(1);
-      expect(filterManager.getFilters()).toHaveLength(1);
-    });
-
-    test('should de-dupe appStateStub filters being set', async () => {
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      const f2 = _.cloneDeep(f1);
-      filterManager.setFilters([f1, f2]);
-      expect(filterManager.getAppFilters()).toHaveLength(1);
-      expect(filterManager.getGlobalFilters()).toHaveLength(0);
-      expect(filterManager.getFilters()).toHaveLength(1);
-    });
-
-    test('should mutate global filters on appStateStub filter changes', async function() {
-      const idx = 1;
-      filterManager.addFilters(readyFilters, true);
-
-      const appFilter = _.cloneDeep(readyFilters[idx]);
-      appFilter.meta.negate = true;
-      appFilter.$state = {
-        store: FilterStateStore.APP_STATE,
-      };
-      filterManager.addFilters(appFilter);
-      const res = filterManager.getFilters();
-      expect(res).toHaveLength(3);
-      _.each(res, function(filter, i) {
-        expect(filter.$state && filter.$state.store).toBe('globalState');
-        // make sure global filter actually mutated
-        expect(filter.meta.negate).toBe(i === idx);
-      });
-    });
-
-    test('should merge conflicting appStateStub filters', async function() {
-      filterManager.addFilters(readyFilters, true);
-      const appFilter = _.cloneDeep(readyFilters[1]);
-      appFilter.meta.negate = true;
-      appFilter.$state = {
-        store: FilterStateStore.APP_STATE,
-      };
-      filterManager.addFilters(appFilter, false);
-
-      // global filters should be listed first
-      const res = filterManager.getFilters();
-      expect(res).toHaveLength(3);
-      expect(
-        res.filter(function(filter) {
-          return filter.$state && filter.$state.store === FilterStateStore.GLOBAL_STATE;
-        }).length
-      ).toBe(3);
-    });
-
-    test('should enable disabled filters - global state', async function() {
-      // test adding to globalStateStub
-      const disabledFilters = _.map(readyFilters, function(filter) {
-        const f = _.cloneDeep(filter);
-        f.meta.disabled = true;
-        return f;
-      });
-      filterManager.addFilters(disabledFilters, true);
-      filterManager.addFilters(readyFilters, true);
-
-      const res = filterManager.getFilters();
-      expect(res).toHaveLength(3);
-      expect(
-        res.filter(function(filter) {
-          return filter.meta.disabled === false;
-        }).length
-      ).toBe(3);
-    });
-
-    test('should enable disabled filters - app state', async function() {
-      // test adding to appStateStub
-      const disabledFilters = _.map(readyFilters, function(filter) {
-        const f = _.cloneDeep(filter);
-        f.meta.disabled = true;
-        return f;
-      });
-      filterManager.addFilters(disabledFilters, true);
-      filterManager.addFilters(readyFilters, false);
-
-      const res = filterManager.getFilters();
-      expect(res).toHaveLength(3);
-      expect(
-        res.filter(function(filter) {
-          return filter.meta.disabled === false;
-        }).length
-      ).toBe(3);
-    });
-  });
-
-  describe('remove filters', () => {
-    test('remove on empty should do nothing and not fire events', async () => {
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      filterManager.removeAll();
-      expect(updateListener.called).toBeFalsy();
-      expect(filterManager.getFilters()).toHaveLength(0);
-    });
-
-    test('remove on full should clean and fire events', async () => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
-      filterManager.setFilters([f1, f2]);
-
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      filterManager.removeAll();
-      expect(updateListener.called).toBeTruthy();
-      expect(filterManager.getFilters()).toHaveLength(0);
-    });
-
-    test('remove non existing filter should do nothing and not fire events', async () => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
-      const f3 = getFilter(FilterStateStore.APP_STATE, false, false, 'country', 'US');
-      filterManager.setFilters([f1, f2]);
-      expect(filterManager.getFilters()).toHaveLength(2);
-
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      await filterManager.removeFilter(f3);
-      expect(updateListener.called).toBeFalsy();
-      expect(filterManager.getFilters()).toHaveLength(2);
-    });
-
-    test('remove existing filter should remove and fire events', async () => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
-      const f3 = getFilter(FilterStateStore.APP_STATE, false, false, 'country', 'US');
-      filterManager.setFilters([f1, f2, f3]);
-      expect(filterManager.getFilters()).toHaveLength(3);
-
-      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
-      await filterManager.removeFilter(f3);
-      expect(updateListener.called).toBeTruthy();
-      expect(filterManager.getFilters()).toHaveLength(2);
-    });
-
-    test('should remove the filter from appStateStub', async function() {
-      filterManager.addFilters(readyFilters, false);
-      expect(appStateStub.filters).toHaveLength(3);
-      filterManager.removeFilter(readyFilters[0]);
-      expect(appStateStub.filters).toHaveLength(2);
-    });
-
-    test('should remove the filter from globalStateStub', async function() {
-      filterManager.addFilters(readyFilters, true);
-      expect(globalStateStub.filters).toHaveLength(3);
-      filterManager.removeFilter(readyFilters[0]);
-      expect(globalStateStub.filters).toHaveLength(2);
-    });
-
-    test('should fire the update and fetch events', async function() {
-      const updateStub = jest.fn();
-      const fetchStub = jest.fn();
-
-      filterManager.addFilters(readyFilters, false);
-
-      filterManager.getUpdates$().subscribe({
-        next: updateStub,
-      });
-
-      filterManager.getFetches$().subscribe({
-        next: fetchStub,
-      });
-
-      filterManager.removeFilter(readyFilters[0]);
-
-      // this time, events should be emitted
-      expect(fetchStub).toBeCalledTimes(1);
-      expect(updateStub).toBeCalledTimes(1);
-    });
-
-    test('should remove matching filters', async function() {
-      filterManager.addFilters([readyFilters[0], readyFilters[1]], true);
-      filterManager.addFilters([readyFilters[2]], false);
-
-      filterManager.removeFilter(readyFilters[0]);
-
-      expect(globalStateStub.filters).toHaveLength(1);
-      expect(appStateStub.filters).toHaveLength(1);
-    });
-
-    test('should remove matching filters by comparison', async function() {
-      filterManager.addFilters([readyFilters[0], readyFilters[1]], true);
-      filterManager.addFilters([readyFilters[2]], false);
-
-      filterManager.removeFilter(_.cloneDeep(readyFilters[0]));
-
-      expect(globalStateStub.filters).toHaveLength(1);
-      expect(appStateStub.filters).toHaveLength(1);
-
-      filterManager.removeFilter(_.cloneDeep(readyFilters[2]));
-      expect(globalStateStub.filters).toHaveLength(1);
-      expect(appStateStub.filters).toHaveLength(0);
-    });
-
-    test('should do nothing with a non-matching filter', async function() {
-      filterManager.addFilters([readyFilters[0], readyFilters[1]], true);
-      filterManager.addFilters([readyFilters[2]], false);
-
-      const missedFilter = _.cloneDeep(readyFilters[0]);
-      missedFilter.meta.negate = !readyFilters[0].meta.negate;
-
-      filterManager.removeFilter(missedFilter);
-      expect(globalStateStub.filters).toHaveLength(2);
-      expect(appStateStub.filters).toHaveLength(1);
-    });
-
-    test('should remove all the filters from both states', async function() {
-      filterManager.addFilters([readyFilters[0], readyFilters[1]], true);
-      filterManager.addFilters([readyFilters[2]], false);
-      expect(globalStateStub.filters).toHaveLength(2);
-      expect(appStateStub.filters).toHaveLength(1);
-
-      filterManager.removeAll();
-      expect(globalStateStub.filters).toHaveLength(0);
-      expect(appStateStub.filters).toHaveLength(0);
-    });
-  });
-
-  describe('invert', () => {
-    test('should fire the update and fetch events', async function() {
-      filterManager.addFilters(readyFilters);
-      expect(filterManager.getFilters()).toHaveLength(3);
-
-      const updateStub = jest.fn();
-      const fetchStub = jest.fn();
-      filterManager.getUpdates$().subscribe({
-        next: updateStub,
-      });
-
-      filterManager.getFetches$().subscribe({
-        next: fetchStub,
-      });
-
-      readyFilters[1].meta.negate = !readyFilters[1].meta.negate;
-      filterManager.addFilters(readyFilters[1]);
-      expect(filterManager.getFilters()).toHaveLength(3);
-      expect(fetchStub).toBeCalledTimes(1);
-      expect(updateStub).toBeCalledTimes(1);
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts
index d1cad9a8123999..08d5955d3fae9c 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts
@@ -19,12 +19,11 @@
 
 import sinon from 'sinon';
 
-import { FilterStateStore } from '@kbn/es-query';
 import { FilterStateManager } from './filter_state_manager';
 
 import { StubState } from './test_helpers/stub_state';
 import { getFilter } from './test_helpers/get_stub_filter';
-import { FilterManager } from './filter_manager';
+import { FilterManager, esFilters } from '../../../../../../plugins/data/public';
 
 import { coreMock } from '../../../../../../core/public/mocks';
 const setupMock = coreMock.createSetup();
@@ -59,7 +58,7 @@ describe('filter_state_manager', () => {
     });
 
     test('should NOT watch state until both app and global state are defined', done => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
       globalStateStub.filters.push(f1);
 
       setTimeout(() => {
@@ -72,8 +71,8 @@ describe('filter_state_manager', () => {
       appStateStub.save = sinon.stub();
       globalStateStub.save = sinon.stub();
 
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
 
       filterManager.setFilters([f1, f2]);
 
@@ -101,33 +100,37 @@ describe('filter_state_manager', () => {
     });
 
     test('should update filter manager global filters', done => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      globalStateStub.filters.push(f1);
-
-      setTimeout(() => {
+      const updateSubscription = filterManager.getUpdates$().subscribe(() => {
         expect(filterManager.getGlobalFilters()).toHaveLength(1);
+        if (updateSubscription) {
+          updateSubscription.unsubscribe();
+        }
         done();
-      }, 100);
-    });
-
-    test('should update filter manager app filters', done => {
-      expect(filterManager.getAppFilters()).toHaveLength(0);
+      });
 
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      appStateStub.filters.push(f1);
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, true, true, 'age', 34);
+      globalStateStub.filters.push(f1);
+    });
 
-      setTimeout(() => {
+    test('should update filter manager app filter', done => {
+      const updateSubscription = filterManager.getUpdates$().subscribe(() => {
         expect(filterManager.getAppFilters()).toHaveLength(1);
+        if (updateSubscription) {
+          updateSubscription.unsubscribe();
+        }
         done();
-      }, 100);
+      });
+
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      appStateStub.filters.push(f1);
     });
 
     test('should update URL when filter manager filters are set', () => {
       appStateStub.save = sinon.stub();
       globalStateStub.save = sinon.stub();
 
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
 
       filterManager.setFilters([f1, f2]);
 
@@ -139,8 +142,8 @@ describe('filter_state_manager', () => {
       appStateStub.save = sinon.stub();
       globalStateStub.save = sinon.stub();
 
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
-      const f2 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
 
       filterManager.addFilters([f1, f2]);
 
@@ -156,7 +159,7 @@ describe('filter_state_manager', () => {
      ** And triggers *another* filter manager update.
      */
     test('should NOT re-trigger filter manager', done => {
-      const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
       filterManager.setFilters([f1]);
       const setFiltersSpy = sinon.spy(filterManager, 'setFilters');
 
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts
index 06f91e35db96e8..61821b7ad45e94 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts
@@ -17,11 +17,9 @@
  * under the License.
  */
 
-import { FilterStateStore } from '@kbn/es-query';
-
 import _ from 'lodash';
 import { State } from 'ui/state_management/state';
-import { FilterManager } from './filter_manager';
+import { FilterManager, esFilters } from '../../../../../../plugins/data/public';
 
 type GetAppStateFunc = () => State | undefined | null;
 
@@ -73,8 +71,8 @@ export class FilterStateManager {
 
       const newGlobalFilters = _.cloneDeep(globalFilters);
       const newAppFilters = _.cloneDeep(appFilters);
-      FilterManager.setFiltersStore(newAppFilters, FilterStateStore.APP_STATE);
-      FilterManager.setFiltersStore(newGlobalFilters, FilterStateStore.GLOBAL_STATE);
+      FilterManager.setFiltersStore(newAppFilters, esFilters.FilterStateStore.APP_STATE);
+      FilterManager.setFiltersStore(newGlobalFilters, esFilters.FilterStateStore.GLOBAL_STATE);
 
       this.filterManager.setFilters(newGlobalFilters.concat(newAppFilters));
     }, 10);
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts
index ac533eaaf89ea1..ebb622783c3d1c 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts
@@ -17,10 +17,4 @@
  * under the License.
  */
 
-export { FilterManager } from './filter_manager';
 export { FilterStateManager } from './filter_state_manager';
-
-export { uniqFilters } from './lib/uniq_filters';
-export { extractTimeFilter } from './lib/extract_time_filter';
-export { changeTimeFilter } from './lib/change_time_filter';
-export { onlyDisabledFiltersChanged } from './lib/only_disabled';
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.test.ts
deleted file mode 100644
index e8244feb988b6e..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.test.ts
+++ /dev/null
@@ -1,73 +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 { buildQueryFilter, buildEmptyFilter, FilterStateStore } from '@kbn/es-query';
-import { compareFilters } from './compare_filters';
-
-describe('filter manager utilities', () => {
-  describe('compare filters', () => {
-    test('should compare filters', () => {
-      const f1 = buildQueryFilter(
-        { _type: { match: { query: 'apache', type: 'phrase' } } },
-        'index'
-      );
-      const f2 = buildEmptyFilter(true);
-
-      expect(compareFilters(f1, f2)).toBeFalsy();
-    });
-
-    test('should compare duplicates', () => {
-      const f1 = buildQueryFilter(
-        { _type: { match: { query: 'apache', type: 'phrase' } } },
-        'index'
-      );
-      const f2 = buildQueryFilter(
-        { _type: { match: { query: 'apache', type: 'phrase' } } },
-        'index'
-      );
-
-      expect(compareFilters(f1, f2)).toBeTruthy();
-    });
-
-    test('should compare duplicates, ignoring meta attributes', () => {
-      const f1 = buildQueryFilter(
-        { _type: { match: { query: 'apache', type: 'phrase' } } },
-        'index1'
-      );
-      const f2 = buildQueryFilter(
-        { _type: { match: { query: 'apache', type: 'phrase' } } },
-        'index2'
-      );
-
-      expect(compareFilters(f1, f2)).toBeTruthy();
-    });
-
-    test('should compare duplicates, ignoring $state attributes', () => {
-      const f1 = {
-        $state: { store: FilterStateStore.APP_STATE },
-        ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
-      };
-      const f2 = {
-        $state: { store: FilterStateStore.GLOBAL_STATE },
-        ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
-      };
-
-      expect(compareFilters(f1, f2)).toBeTruthy();
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.test.ts
deleted file mode 100644
index 75bd9d5dfbd81a..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.test.ts
+++ /dev/null
@@ -1,79 +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 { Filter, buildRangeFilter, FilterStateStore, buildQueryFilter } from '@kbn/es-query';
-import { dedupFilters } from './dedup_filters';
-
-describe('filter manager utilities', () => {
-  describe('dedupFilters(existing, filters)', () => {
-    test('should return only filters which are not in the existing', () => {
-      const existing: Filter[] = [
-        buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index'),
-        buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
-      ];
-      const filters: Filter[] = [
-        buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index'),
-        buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
-      ];
-      const results = dedupFilters(existing, filters);
-
-      expect(results).toContain(filters[0]);
-      expect(results).not.toContain(filters[1]);
-    });
-
-    test('should ignore the disabled attribute when comparing ', () => {
-      const existing: Filter[] = [
-        buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index'),
-        {
-          ...buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
-          meta: { disabled: true, negate: false, alias: null },
-        },
-      ];
-      const filters: Filter[] = [
-        buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index'),
-        buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
-      ];
-      const results = dedupFilters(existing, filters);
-
-      expect(results).toContain(filters[0]);
-      expect(results).not.toContain(filters[1]);
-    });
-
-    test('should ignore $state attribute', () => {
-      const existing: Filter[] = [
-        buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index'),
-        {
-          ...buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
-          $state: { store: FilterStateStore.APP_STATE },
-        },
-      ];
-      const filters: Filter[] = [
-        buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index'),
-        {
-          ...buildQueryFilter({ match: { _term: { query: 'apache', type: 'phrase' } } }, 'index'),
-          $state: { store: FilterStateStore.GLOBAL_STATE },
-        },
-      ];
-      const results = dedupFilters(existing, filters);
-
-      expect(results).toContain(filters[0]);
-      expect(results).not.toContain(filters[1]);
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.test.ts
deleted file mode 100644
index d55c9babeed796..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.test.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 { Filter, buildRangeFilter, buildQueryFilter, buildPhraseFilter } from '@kbn/es-query';
-import { extractTimeFilter } from './extract_time_filter';
-
-describe('filter manager utilities', () => {
-  describe('extractTimeFilter()', () => {
-    test('should detect timeFilter', async () => {
-      const filters: Filter[] = [
-        buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'logstash-*'),
-        buildRangeFilter({ name: 'time' }, { gt: 1388559600000, lt: 1388646000000 }, 'logstash-*'),
-      ];
-      const result = await extractTimeFilter('time', filters);
-
-      expect(result.timeRangeFilter).toEqual(filters[1]);
-      expect(result.restOfFilters[0]).toEqual(filters[0]);
-    });
-
-    test("should not return timeFilter when name doesn't match", async () => {
-      const filters: Filter[] = [
-        buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'logstash-*'),
-        buildRangeFilter({ name: '@timestamp' }, { from: 1, to: 2 }, 'logstash-*'),
-      ];
-      const result = await extractTimeFilter('time', filters);
-
-      expect(result.timeRangeFilter).toBeUndefined();
-      expect(result.restOfFilters).toEqual(filters);
-    });
-
-    test('should not return a non range filter, even when names match', async () => {
-      const filters: Filter[] = [
-        buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'logstash-*'),
-        buildPhraseFilter({ name: 'time' }, 'banana', 'logstash-*'),
-      ];
-      const result = await extractTimeFilter('time', filters);
-
-      expect(result.timeRangeFilter).toBeUndefined();
-      expect(result.restOfFilters).toEqual(filters);
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.ts
deleted file mode 100644
index efa348c9ad3206..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.ts
+++ /dev/null
@@ -1,65 +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 { get } from 'lodash';
-import {
-  PhraseFilter,
-  Filter,
-  FILTERS,
-  isPhraseFilter,
-  isScriptedPhraseFilter,
-  getPhraseFilterField,
-  getPhraseFilterValue,
-  FilterValueFormatter,
-} from '@kbn/es-query';
-
-const getScriptedPhraseValue = (filter: PhraseFilter) =>
-  get(filter, ['script', 'script', 'params', 'value']);
-
-const getFormattedValueFn = (value: any) => {
-  return (formatter?: FilterValueFormatter) => {
-    return formatter ? formatter.convert(value) : value;
-  };
-};
-
-const getParams = (filter: PhraseFilter) => {
-  const scriptedPhraseValue = getScriptedPhraseValue(filter);
-  const isScriptedFilter = Boolean(scriptedPhraseValue);
-  const key = isScriptedFilter ? filter.meta.field || '' : getPhraseFilterField(filter);
-  const query = scriptedPhraseValue || getPhraseFilterValue(filter);
-  const params = { query };
-
-  return {
-    key,
-    params,
-    type: FILTERS.PHRASE,
-    value: getFormattedValueFn(query),
-  };
-};
-
-export const isMapPhraseFilter = (filter: any): filter is PhraseFilter =>
-  isPhraseFilter(filter) || isScriptedPhraseFilter(filter);
-
-export const mapPhrase = (filter: Filter) => {
-  if (!isMapPhraseFilter(filter)) {
-    throw filter;
-  }
-
-  return getParams(filter);
-};
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.test.ts
deleted file mode 100644
index 12d2919e2d47b6..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.test.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 { mapRange } from './map_range';
-import { RangeFilter, Filter, FilterMeta } from '@kbn/es-query';
-
-describe('filter manager utilities', () => {
-  describe('mapRange()', () => {
-    test('should return the key and value for matching filters with gt/lt', async () => {
-      const filter = {
-        meta: { index: 'logstash-*' } as FilterMeta,
-        range: { bytes: { lt: 2048, gt: 1024 } },
-      } as RangeFilter;
-      const result = mapRange(filter);
-
-      expect(result).toHaveProperty('key', 'bytes');
-      expect(result).toHaveProperty('value');
-      if (result.value) {
-        const displayName = result.value();
-        expect(displayName).toBe('1024 to 2048');
-      }
-    });
-
-    test('should return the key and value for matching filters with gte/lte', async () => {
-      const filter = {
-        meta: { index: 'logstash-*' } as FilterMeta,
-        range: { bytes: { lte: 2048, gte: 1024 } },
-      } as RangeFilter;
-      const result = mapRange(filter);
-
-      expect(result).toHaveProperty('key', 'bytes');
-      expect(result).toHaveProperty('value');
-      if (result.value) {
-        const displayName = result.value();
-        expect(displayName).toBe('1024 to 2048');
-      }
-    });
-
-    test('should return undefined for none matching', async done => {
-      const filter = {
-        meta: { index: 'logstash-*' },
-        query: { query_string: { query: 'foo:bar' } },
-      } as Filter;
-
-      try {
-        mapRange(filter);
-      } catch (e) {
-        expect(e).toBe(filter);
-
-        done();
-      }
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.ts
deleted file mode 100644
index 76f9d3621e1717..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import {
-  Filter,
-  RangeFilter,
-  FILTERS,
-  isRangeFilter,
-  isScriptedRangeFilter,
-  FilterValueFormatter,
-} from '@kbn/es-query';
-import { get, has } from 'lodash';
-
-const getFormattedValueFn = (left: any, right: any) => {
-  return (formatter?: FilterValueFormatter) => {
-    let displayValue = `${left} to ${right}`;
-    if (formatter) {
-      const convert = formatter.getConverterFor('text');
-      displayValue = `${convert(left)} to ${convert(right)}`;
-    }
-    return displayValue;
-  };
-};
-
-const getFirstRangeKey = (filter: RangeFilter) => filter.range && Object.keys(filter.range)[0];
-const getRangeByKey = (filter: RangeFilter, key: string) => get(filter, ['range', key]);
-
-function getParams(filter: RangeFilter) {
-  const isScriptedRange = isScriptedRangeFilter(filter);
-  const key: string = (isScriptedRange ? filter.meta.field : getFirstRangeKey(filter)) || '';
-  const params: any = isScriptedRange
-    ? get(filter, 'script.script.params')
-    : getRangeByKey(filter, key);
-
-  let left = has(params, 'gte') ? params.gte : params.gt;
-  if (left == null) left = -Infinity;
-
-  let right = has(params, 'lte') ? params.lte : params.lt;
-  if (right == null) right = Infinity;
-
-  const value = getFormattedValueFn(left, right);
-
-  return { type: FILTERS.RANGE, key, value, params };
-}
-
-export const isMapRangeFilter = (filter: any): filter is RangeFilter =>
-  isRangeFilter(filter) || isScriptedRangeFilter(filter);
-
-export const mapRange = (filter: Filter) => {
-  if (!isMapRangeFilter(filter)) {
-    throw filter;
-  }
-
-  return getParams(filter);
-};
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.test.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.test.ts
deleted file mode 100644
index 86f059913cd96a..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { Filter, buildQueryFilter, FilterStateStore } from '@kbn/es-query';
-import { uniqFilters } from './uniq_filters';
-
-describe('filter manager utilities', () => {
-  describe('niqFilter', () => {
-    test('should filter out dups', () => {
-      const before: Filter[] = [
-        buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
-        buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
-      ];
-      const results = uniqFilters(before);
-
-      expect(results).toHaveLength(1);
-    });
-
-    test('should filter out duplicates, ignoring meta attributes', () => {
-      const before: Filter[] = [
-        buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index1'),
-        buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index2'),
-      ];
-      const results = uniqFilters(before);
-
-      expect(results).toHaveLength(1);
-    });
-
-    test('should filter out duplicates, ignoring $state attributes', () => {
-      const before: Filter[] = [
-        {
-          $state: { store: FilterStateStore.APP_STATE },
-          ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
-        },
-        {
-          $state: { store: FilterStateStore.GLOBAL_STATE },
-          ...buildQueryFilter({ _type: { match: { query: 'apache', type: 'phrase' } } }, 'index'),
-        },
-      ];
-      const results = uniqFilters(before);
-
-      expect(results).toHaveLength(1);
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/partitioned_filters.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/partitioned_filters.ts
deleted file mode 100644
index e74b48b722cc45..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/partitioned_filters.ts
+++ /dev/null
@@ -1,25 +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 { Filter } from '@kbn/es-query';
-
-export interface PartitionedFilters {
-  globalFilters: Filter[];
-  appFilters: Filter[];
-}
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_stub_filter.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_stub_filter.ts
index 20d9e236f49be8..5238efe5efa59c 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_stub_filter.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_stub_filter.ts
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-import { Filter, FilterStateStore } from '@kbn/es-query';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 export function getFilter(
-  store: FilterStateStore,
+  store: esFilters.FilterStateStore,
   disabled: boolean,
   negated: boolean,
   queryKey: string,
   queryValue: any
-): Filter {
+): esFilters.Filter {
   return {
     $state: {
       store,
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_index_pattern.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_index_pattern.ts
deleted file mode 100644
index d429fc7f70f387..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_index_pattern.ts
+++ /dev/null
@@ -1,28 +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 class StubIndexPatterns {
-  async get(index: string) {
-    return {
-      fields: {
-        getByName: () => undefined,
-      },
-    };
-  }
-}
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_state.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_state.ts
index ab92016d1b9ab3..f0a4bdef0229d0 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_state.ts
+++ b/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/stub_state.ts
@@ -19,11 +19,11 @@
 
 import sinon from 'sinon';
 
-import { Filter } from '@kbn/es-query';
 import { State } from 'ui/state_management/state';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 export class StubState implements State {
-  filters: Filter[];
+  filters: esFilters.Filter[];
   save: sinon.SinonSpy<any[], any>;
 
   constructor() {
diff --git a/src/legacy/core_plugins/data/public/filter/filter_service.mock.ts b/src/legacy/core_plugins/data/public/filter/filter_service.mock.ts
deleted file mode 100644
index 94268ef69c49a8..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_service.mock.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { FilterService, FilterStart, FilterSetup } from '.';
-
-type FilterServiceClientContract = PublicMethodsOf<FilterService>;
-
-const createSetupContractMock = () => {
-  const setupContract: jest.Mocked<FilterSetup> = {
-    filterManager: jest.fn() as any,
-  };
-
-  return setupContract;
-};
-
-const createStartContractMock = () => {
-  const startContract: jest.Mocked<FilterStart> = {
-    filterManager: jest.fn() as any,
-  };
-
-  return startContract;
-};
-
-const createMock = () => {
-  const mocked: jest.Mocked<FilterServiceClientContract> = {
-    setup: jest.fn(),
-    start: jest.fn(),
-    stop: jest.fn(),
-  };
-
-  mocked.setup.mockReturnValue(createSetupContractMock());
-  mocked.start.mockReturnValue(createStartContractMock());
-  return mocked;
-};
-
-export const filterServiceMock = {
-  create: createMock,
-  createSetupContract: createSetupContractMock,
-  createStartContract: createStartContractMock,
-};
diff --git a/src/legacy/core_plugins/data/public/filter/filter_service.ts b/src/legacy/core_plugins/data/public/filter/filter_service.ts
deleted file mode 100644
index 0c46259ef0e00a..00000000000000
--- a/src/legacy/core_plugins/data/public/filter/filter_service.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { UiSettingsClientContract } from 'src/core/public';
-import { FilterManager } from './filter_manager';
-
-/**
- * Filter Service
- * @internal
- */
-
-export interface FilterServiceDependencies {
-  uiSettings: UiSettingsClientContract;
-}
-
-export class FilterService {
-  filterManager!: FilterManager;
-
-  public setup({ uiSettings }: FilterServiceDependencies) {
-    this.filterManager = new FilterManager(uiSettings);
-
-    return {
-      filterManager: this.filterManager,
-    };
-  }
-
-  public start() {
-    return {
-      filterManager: this.filterManager,
-    };
-  }
-
-  public stop() {
-    // nothing to do here yet
-  }
-}
-
-/** @public */
-export type FilterSetup = ReturnType<FilterService['setup']>;
-export type FilterStart = ReturnType<FilterService['start']>;
diff --git a/src/legacy/core_plugins/data/public/filter/index.tsx b/src/legacy/core_plugins/data/public/filter/index.tsx
index cda7350ecadef1..005c4904a4f392 100644
--- a/src/legacy/core_plugins/data/public/filter/index.tsx
+++ b/src/legacy/core_plugins/data/public/filter/index.tsx
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-export * from './filter_service';
-
 export { FilterBar } from './filter_bar';
 
 export { ApplyFiltersPopover } from './apply_filters';
diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts
index cb3869ff57711f..60828b4a2a2025 100644
--- a/src/legacy/core_plugins/data/public/index.ts
+++ b/src/legacy/core_plugins/data/public/index.ts
@@ -43,14 +43,7 @@ export { SearchBar, SearchBarProps, SavedQueryAttributes, SavedQuery } from './s
 
 /** @public static code */
 export * from '../common';
-export {
-  FilterManager,
-  FilterStateManager,
-  uniqFilters,
-  extractTimeFilter,
-  changeTimeFilter,
-  onlyDisabledFiltersChanged,
-} from './filter/filter_manager';
+export { FilterStateManager } from './filter/filter_manager';
 export {
   CONTAINS_SPACES,
   getFromSavedObject,
@@ -68,5 +61,3 @@ export {
   mockFields,
   mockIndexPattern,
 } from './index_patterns';
-
-export { TimeHistoryContract, TimefilterContract, getTime, InputTimeRange } from './timefilter';
diff --git a/src/legacy/core_plugins/data/public/index_patterns/fields/field.ts b/src/legacy/core_plugins/data/public/index_patterns/fields/field.ts
index 628b1999b1c231..dc5023795bf19b 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/fields/field.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/fields/field.ts
@@ -19,7 +19,6 @@
 
 // @ts-ignore
 import { fieldFormats } from 'ui/registry/field_formats';
-import { NotificationsSetup } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
 import { ObjDefine } from './obj_define';
@@ -27,9 +26,15 @@ import { FieldFormat } from '../../../../../../plugins/data/common/field_formats
 // @ts-ignore
 import { shortenDottedString } from '../../../../../core_plugins/kibana/common/utils/shorten_dotted_string';
 import { IndexPattern } from '../index_patterns';
+import { getNotifications } from '../services';
 
 import { getKbnFieldType } from '../../../../../../plugins/data/public';
 
+interface FieldSubType {
+  multi?: { parent: string };
+  nested?: { path: string };
+}
+
 export type FieldSpec = Record<string, any>;
 export interface FieldType {
   name: string;
@@ -47,8 +52,7 @@ export interface FieldType {
   visualizable?: boolean;
   readFromDocValues?: boolean;
   scripted?: boolean;
-  parent?: string;
-  subType?: string;
+  subType?: FieldSubType;
   displayName?: string;
   format?: any;
 }
@@ -68,8 +72,7 @@ export class Field implements FieldType {
   sortable?: boolean;
   visualizable?: boolean;
   scripted?: boolean;
-  parent?: string;
-  subType?: string;
+  subType?: FieldSubType;
   displayName?: string;
   format: any;
   routes: Record<string, string> = {
@@ -80,8 +83,7 @@ export class Field implements FieldType {
   constructor(
     indexPattern: IndexPattern,
     spec: FieldSpec | Field,
-    shortDotsEnable: boolean = false,
-    notifications: NotificationsSetup
+    shortDotsEnable: boolean = false
   ) {
     // unwrap old instances of Field
     if (spec instanceof Field) spec = spec.$$spec;
@@ -106,8 +108,9 @@ export class Field implements FieldType {
         values: { name: spec.name, title: indexPattern.title },
         defaultMessage: 'Field {name} in indexPattern {title} is using an unknown field type.',
       });
+      const { toasts } = getNotifications();
 
-      notifications.toasts.addDanger({
+      toasts.addDanger({
         title,
         text,
       });
@@ -165,7 +168,6 @@ export class Field implements FieldType {
     obj.writ('conflictDescriptions');
 
     // multi info
-    obj.fact('parent');
     obj.fact('subType');
 
     return obj.create();
diff --git a/src/legacy/core_plugins/data/public/index_patterns/fields/field_list.ts b/src/legacy/core_plugins/data/public/index_patterns/fields/field_list.ts
index 30f4df66f38636..108aacc8e07def 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/fields/field_list.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/fields/field_list.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { NotificationsSetup } from 'kibana/public';
 import { findIndex } from 'lodash';
 import { IndexPattern } from '../index_patterns';
 import { Field, FieldType, FieldSpec } from './field';
@@ -36,7 +35,6 @@ export class FieldList extends Array<Field> implements FieldListInterface {
   private groups: Map<Field['type'], FieldMap> = new Map();
   private indexPattern: IndexPattern;
   private shortDotsEnable: boolean;
-  private notifications: NotificationsSetup;
   private setByName = (field: Field) => this.byName.set(field.name, field);
   private setByGroup = (field: Field) => {
     if (typeof this.groups.get(field.type) === 'undefined') {
@@ -45,23 +43,19 @@ export class FieldList extends Array<Field> implements FieldListInterface {
     this.groups.get(field.type)!.set(field.name, field);
   };
   private removeByGroup = (field: FieldType) => this.groups.get(field.type)!.delete(field.name);
-  constructor(
-    indexPattern: IndexPattern,
-    specs: FieldSpec[] = [],
-    shortDotsEnable = false,
-    notifications: NotificationsSetup
-  ) {
+
+  constructor(indexPattern: IndexPattern, specs: FieldSpec[] = [], shortDotsEnable = false) {
     super();
     this.indexPattern = indexPattern;
     this.shortDotsEnable = shortDotsEnable;
-    this.notifications = notifications;
+
     specs.map(field => this.add(field));
   }
 
   getByName = (name: Field['name']) => this.byName.get(name);
   getByType = (type: Field['type']) => [...(this.groups.get(type) || new Map()).values()];
   add = (field: FieldSpec) => {
-    const newField = new Field(this.indexPattern, field, this.shortDotsEnable, this.notifications);
+    const newField = new Field(this.indexPattern, field, this.shortDotsEnable);
     this.push(newField);
     this.setByName(newField);
     this.setByGroup(newField);
diff --git a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/_pattern_cache.ts b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/_pattern_cache.ts
index adc34e34f58e56..a3653bb529fa38 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/_pattern_cache.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/_pattern_cache.ts
@@ -21,7 +21,7 @@ import { IndexPattern } from './index_pattern';
 
 export interface PatternCache {
   get: (id: string) => IndexPattern;
-  set: (id: string, value: Promise<IndexPattern>) => Promise<IndexPattern>;
+  set: (id: string, value: IndexPattern) => IndexPattern;
   clear: (id: string) => void;
   clearAll: () => void;
 }
diff --git a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/flatten_hit.ts b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/flatten_hit.ts
index 1ab229f802ab26..18c6578e3142de 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/flatten_hit.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/flatten_hit.ts
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { IndexPattern } from './';
+import { IndexPattern } from './index_pattern';
 
 // Takes a hit, merges it with any stored/scripted fields, and with the metaFields
 // returns a flattened version
diff --git a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
index d8bd9623f5c088..2d43faf49f63db 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
@@ -27,6 +27,11 @@ import mockLogStashFields from '../../../../../../fixtures/logstash_fields';
 
 import { stubbedSavedObjectIndexPattern } from '../../../../../../fixtures/stubbed_saved_object_index_pattern';
 import { Field } from '../index_patterns_service';
+import { setNotifications } from '../services';
+
+// Temporary disable eslint, will be removed after moving to new platform folder
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { notificationServiceMock } from '../../../../../../core/public/notifications/notifications_service.mock';
 
 jest.mock('ui/registry/field_formats', () => ({
   fieldFormats: {
@@ -109,18 +114,6 @@ const apiClient = {
   getFieldsForWildcard: jest.fn(),
 };
 
-const notifications = {
-  toasts: {
-    addDanger: jest.fn(),
-    addError: jest.fn(),
-    add: jest.fn(),
-    addWarning: jest.fn(),
-    addSuccess: jest.fn(),
-    remove: jest.fn(),
-    get$: jest.fn(),
-  },
-};
-
 // helper function to create index patterns
 function create(id: string, payload?: any): Promise<IndexPattern> {
   const indexPattern = new IndexPattern(
@@ -128,8 +121,7 @@ function create(id: string, payload?: any): Promise<IndexPattern> {
     (cfg: any) => config.get(cfg),
     savedObjectsClient as any,
     apiClient,
-    patternCache,
-    notifications
+    patternCache
   );
 
   setDocsourcePayload(id, payload);
@@ -143,11 +135,14 @@ function setDocsourcePayload(id: string | null, providedPayload: any) {
 
 describe('IndexPattern', () => {
   const indexPatternId = 'test-pattern';
+  const notifications = notificationServiceMock.createStartContract();
 
   let indexPattern: IndexPattern;
 
   // create an indexPattern instance for each test
   beforeEach(() => {
+    setNotifications(notifications);
+
     return create(indexPatternId).then((pattern: IndexPattern) => {
       indexPattern = pattern;
     });
@@ -392,8 +387,7 @@ describe('IndexPattern', () => {
       (cfg: any) => config.get(cfg),
       savedObjectsClient as any,
       apiClient,
-      patternCache,
-      notifications
+      patternCache
     );
     await pattern.init();
 
@@ -405,8 +399,7 @@ describe('IndexPattern', () => {
       (cfg: any) => config.get(cfg),
       savedObjectsClient as any,
       apiClient,
-      patternCache,
-      notifications
+      patternCache
     );
     await samePattern.init();
 
diff --git a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_pattern.ts b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_pattern.ts
index 0a1eb4c36ae7bf..bf0d79e960d9b8 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_pattern.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_pattern.ts
@@ -21,7 +21,7 @@ import _, { each, reject } from 'lodash';
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
 import { fieldFormats } from 'ui/registry/field_formats';
-import { NotificationsSetup, SavedObjectsClientContract } from 'src/core/public';
+import { SavedObjectsClientContract } from 'src/core/public';
 import {
   DuplicateField,
   SavedObjectNotFound,
@@ -38,6 +38,7 @@ import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
 import { IIndexPatternsApiClient } from './index_patterns_api_client';
 import { ES_FIELD_TYPES } from '../../../../../../plugins/data/common';
+import { getNotifications } from '../services';
 
 const MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS = 3;
 const type = 'index-pattern';
@@ -64,7 +65,6 @@ export class IndexPattern implements StaticIndexPattern {
   public formatField: any;
   public flattenHit: any;
   public metaFields: string[];
-  public notifications: NotificationsSetup;
 
   private version: string | undefined;
   private savedObjectsClient: SavedObjectsClientContract;
@@ -102,8 +102,7 @@ export class IndexPattern implements StaticIndexPattern {
     getConfig: any,
     savedObjectsClient: SavedObjectsClientContract,
     apiClient: IIndexPatternsApiClient,
-    patternCache: any,
-    notifications: NotificationsSetup
+    patternCache: any
   ) {
     this.id = id;
     this.savedObjectsClient = savedObjectsClient;
@@ -111,12 +110,11 @@ export class IndexPattern implements StaticIndexPattern {
     // instead of storing config we rather store the getter only as np uiSettingsClient has circular references
     // which cause problems when being consumed from angular
     this.getConfig = getConfig;
-    this.notifications = notifications;
 
     this.shortDotsEnable = this.getConfig('shortDots:enable');
     this.metaFields = this.getConfig('metaFields');
 
-    this.fields = new FieldList(this, [], this.shortDotsEnable, notifications);
+    this.fields = new FieldList(this, [], this.shortDotsEnable);
     this.fieldsFetcher = createFieldsFetcher(this, apiClient, this.getConfig('metaFields'));
     this.flattenHit = flattenHitWrapper(this, this.getConfig('metaFields'));
     this.formatHit = formatHitProvider(this, fieldFormats.getDefaultInstance('string'));
@@ -136,7 +134,7 @@ export class IndexPattern implements StaticIndexPattern {
 
   private initFields(input?: any) {
     const newValue = input || this.fields;
-    this.fields = new FieldList(this, newValue, this.shortDotsEnable, this.notifications);
+    this.fields = new FieldList(this, newValue, this.shortDotsEnable);
   }
 
   private isFieldRefreshRequired(): boolean {
@@ -286,8 +284,7 @@ export class IndexPattern implements StaticIndexPattern {
           filterable: true,
           searchable: true,
         },
-        false,
-        this.notifications
+        false
       )
     );
 
@@ -370,8 +367,7 @@ export class IndexPattern implements StaticIndexPattern {
           this.getConfig,
           this.savedObjectsClient,
           this.patternCache,
-          this.fieldsFetcher,
-          this.notifications
+          this.fieldsFetcher
         );
         await duplicatePattern.destroy();
       }
@@ -423,8 +419,7 @@ export class IndexPattern implements StaticIndexPattern {
             this.getConfig,
             this.savedObjectsClient,
             this.patternCache,
-            this.fieldsFetcher,
-            this.notifications
+            this.fieldsFetcher
           );
           return samePattern.init().then(() => {
             // What keys changed from now and what the server returned
@@ -456,7 +451,9 @@ export class IndexPattern implements StaticIndexPattern {
                     'Unable to write index pattern! Refresh the page to get the most up to date changes for this index pattern.',
                 } // eslint-disable-line max-len
               );
-              this.notifications.toasts.addDanger(message);
+              const { toasts } = getNotifications();
+
+              toasts.addDanger(message);
               throw err;
             }
 
@@ -494,12 +491,14 @@ export class IndexPattern implements StaticIndexPattern {
         // we still want to notify the user that there is a problem
         // but we do not want to potentially make any pages unusable
         // so do not rethrow the error here
+        const { toasts } = getNotifications();
+
         if (err instanceof IndexPatternMissingIndices) {
-          this.notifications.toasts.addDanger((err as any).message);
+          toasts.addDanger((err as any).message);
           return [];
         }
 
-        this.notifications.toasts.addError(err, {
+        toasts.addError(err, {
           title: i18n.translate('data.indexPatterns.fetchFieldErrorTitle', {
             defaultMessage: 'Error fetching fields',
           }),
diff --git a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts
index f573f33ef7a527..8a5c78d13c251c 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts
@@ -23,7 +23,6 @@ import {
   SavedObjectsClientContract,
   UiSettingsClientContract,
   HttpServiceBase,
-  NotificationsSetup,
 } from 'kibana/public';
 
 jest.mock('../errors', () => ({
@@ -65,14 +64,15 @@ describe('IndexPatterns', () => {
     const savedObjectsClient = {} as SavedObjectsClientContract;
     const uiSettings = {} as UiSettingsClientContract;
     const http = {} as HttpServiceBase;
-    const notifications = {} as NotificationsSetup;
 
-    indexPatterns = new IndexPatterns(uiSettings, savedObjectsClient, http, notifications);
+    indexPatterns = new IndexPatterns(uiSettings, savedObjectsClient, http);
   });
 
-  test('does cache gets for the same id', () => {
+  test('does cache gets for the same id', async () => {
     const id = '1';
+    const indexPattern = await indexPatterns.get(id);
 
-    expect(indexPatterns.get(id)).toBe(indexPatterns.get(id));
+    expect(indexPattern).toBeDefined();
+    expect(indexPattern).toBe(await indexPatterns.get(id));
   });
 });
diff --git a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.ts b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.ts
index fc5ef6cb75355a..4767b6d3a3ca7a 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/index_patterns/index_patterns.ts
@@ -23,14 +23,13 @@ import {
   SimpleSavedObject,
   UiSettingsClientContract,
   HttpServiceBase,
-  NotificationsSetup,
 } from 'src/core/public';
 // @ts-ignore
 import { fieldFormats } from 'ui/registry/field_formats';
 
 import { createIndexPatternCache } from './_pattern_cache';
 import { IndexPattern } from './index_pattern';
-import { IndexPatternsApiClient } from './index_patterns_api_client';
+import { IndexPatternsApiClient, GetFieldsOptions } from './index_patterns_api_client';
 
 const indexPatternCache = createIndexPatternCache();
 
@@ -41,17 +40,13 @@ export class IndexPatterns {
   private savedObjectsClient: SavedObjectsClientContract;
   private savedObjectsCache?: Array<SimpleSavedObject<Record<string, any>>> | null;
   private apiClient: IndexPatternsApiClient;
-  private notifications: NotificationsSetup;
 
   constructor(
     config: UiSettingsClientContract,
     savedObjectsClient: SavedObjectsClientContract,
-    http: HttpServiceBase,
-    notifications: NotificationsSetup
+    http: HttpServiceBase
   ) {
     this.apiClient = new IndexPatternsApiClient(http);
-    this.notifications = notifications;
-
     this.config = config;
     this.savedObjectsClient = savedObjectsClient;
   }
@@ -98,6 +93,14 @@ export class IndexPatterns {
     });
   };
 
+  getFieldsForTimePattern = (options: GetFieldsOptions = {}) => {
+    return this.apiClient.getFieldsForTimePattern(options);
+  };
+
+  getFieldsForWildcard = (options: GetFieldsOptions = {}) => {
+    return this.apiClient.getFieldsForWildcard(options);
+  };
+
   clearCache = (id?: string) => {
     this.savedObjectsCache = null;
     if (id) {
@@ -122,19 +125,26 @@ export class IndexPatterns {
     return null;
   };
 
-  get = (id: string) => {
+  get = async (id: string): Promise<IndexPattern> => {
     const cache = indexPatternCache.get(id);
-    return cache || indexPatternCache.set(id, this.make(id));
+    if (cache) {
+      return cache;
+    }
+
+    const indexPattern = await this.make(id);
+
+    return indexPatternCache.set(id, indexPattern);
   };
 
   make = (id?: string): Promise<IndexPattern> => {
-    return new IndexPattern(
+    const indexPattern = new IndexPattern(
       id,
       (cfg: any) => this.config.get(cfg),
       this.savedObjectsClient,
       this.apiClient,
-      indexPatternCache,
-      this.notifications
-    ).init();
+      indexPatternCache
+    );
+
+    return indexPattern.init();
   };
 }
diff --git a/src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts b/src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts
index 562dcb248edae1..bdeeb787c983d6 100644
--- a/src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts
+++ b/src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts
@@ -21,11 +21,13 @@ import {
   UiSettingsClientContract,
   SavedObjectsClientContract,
   HttpServiceBase,
-  NotificationsSetup,
+  NotificationsStart,
 } from 'src/core/public';
 import { Field, FieldList, FieldListInterface, FieldType } from './fields';
 import { createFlattenHitWrapper } from './index_patterns';
 import { createIndexPatternSelect } from './components';
+import { setNotifications } from './services';
+
 import {
   formatHitProvider,
   IndexPattern,
@@ -37,7 +39,7 @@ export interface IndexPatternDependencies {
   uiSettings: UiSettingsClientContract;
   savedObjectsClient: SavedObjectsClientContract;
   http: HttpServiceBase;
-  notifications: NotificationsSetup;
+  notifications: NotificationsStart;
 }
 
 /**
@@ -63,9 +65,11 @@ export class IndexPatternsService {
   }
 
   public start({ uiSettings, savedObjectsClient, http, notifications }: IndexPatternDependencies) {
+    setNotifications(notifications);
+
     return {
       ...this.setupApi,
-      indexPatterns: new IndexPatterns(uiSettings, savedObjectsClient, http, notifications),
+      indexPatterns: new IndexPatterns(uiSettings, savedObjectsClient, http),
       IndexPatternSelect: createIndexPatternSelect(savedObjectsClient),
     };
   }
diff --git a/src/legacy/core_plugins/data/public/index_patterns/services.ts b/src/legacy/core_plugins/data/public/index_patterns/services.ts
new file mode 100644
index 00000000000000..5cc087548d6fb1
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/index_patterns/services.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { NotificationsStart } from 'src/core/public';
+import { createGetterSetter } from '../../../../../plugins/kibana_utils/public';
+
+export const [getNotifications, setNotifications] = createGetterSetter<NotificationsStart>(
+  'Notifications'
+);
diff --git a/src/legacy/core_plugins/data/public/legacy.ts b/src/legacy/core_plugins/data/public/legacy.ts
index e151726a6d702d..b1d838aed992da 100644
--- a/src/legacy/core_plugins/data/public/legacy.ts
+++ b/src/legacy/core_plugins/data/public/legacy.ts
@@ -35,18 +35,13 @@
  */
 
 import { npSetup, npStart } from 'ui/new_platform';
-import { LegacyDependenciesPlugin } from './shim/legacy_dependencies_plugin';
 import { plugin } from '.';
 
 const dataPlugin = plugin();
-const legacyPlugin = new LegacyDependenciesPlugin();
 
-export const setup = dataPlugin.setup(npSetup.core, {
-  __LEGACY: legacyPlugin.setup(),
-});
+export const setup = dataPlugin.setup(npSetup.core);
 
 export const start = dataPlugin.start(npStart.core, {
   data: npStart.plugins.data,
   uiActions: npSetup.plugins.uiActions,
-  __LEGACY: legacyPlugin.start(),
 });
diff --git a/src/legacy/core_plugins/data/public/mocks.ts b/src/legacy/core_plugins/data/public/mocks.ts
index 2a82927bb3ebfb..d3b5944127965d 100644
--- a/src/legacy/core_plugins/data/public/mocks.ts
+++ b/src/legacy/core_plugins/data/public/mocks.ts
@@ -17,17 +17,13 @@
  * under the License.
  */
 
-import { filterServiceMock } from './filter/filter_service.mock';
 import { indexPatternsServiceMock } from './index_patterns/index_patterns_service.mock';
 import { queryServiceMock } from './query/query_service.mock';
-import { timefilterServiceMock } from './timefilter/timefilter_service.mock';
 
 function createDataSetupMock() {
   return {
-    filter: filterServiceMock.createSetupContract(),
     indexPatterns: indexPatternsServiceMock.createSetupContract(),
     query: queryServiceMock.createSetupContract(),
-    timefilter: timefilterServiceMock.createSetupContract(),
   };
 }
 
diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
index 5c9d9317d8270c..76beb4ee560535 100644
--- a/src/legacy/core_plugins/data/public/plugin.ts
+++ b/src/legacy/core_plugins/data/public/plugin.ts
@@ -20,14 +20,10 @@
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import { SearchService, SearchStart, createSearchBar, StatetfulSearchBarProps } from './search';
 import { QueryService, QuerySetup } from './query';
-import { FilterService, FilterSetup, FilterStart } from './filter';
-import { TimefilterService, TimefilterSetup } from './timefilter';
 import { IndexPatternsService, IndexPatternsSetup, IndexPatternsStart } from './index_patterns';
-import {
-  LegacyDependenciesPluginSetup,
-  LegacyDependenciesPluginStart,
-} from './shim/legacy_dependencies_plugin';
+import { Storage, IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { initLegacyModule } from './shim/legacy_module';
 import { IUiActionsSetup } from '../../../../plugins/ui_actions/public';
 import {
   createFilterAction,
@@ -35,19 +31,9 @@ import {
 } from './filter/action/apply_filter_action';
 import { APPLY_FILTER_TRIGGER } from '../../../../plugins/embeddable/public';
 
-/**
- * Interface for any dependencies on other plugins' `setup` contracts.
- *
- * @internal
- */
-export interface DataPluginSetupDependencies {
-  __LEGACY: LegacyDependenciesPluginSetup;
-}
-
 export interface DataPluginStartDependencies {
   data: DataPublicPluginStart;
   uiActions: IUiActionsSetup;
-  __LEGACY: LegacyDependenciesPluginStart;
 }
 
 /**
@@ -57,9 +43,7 @@ export interface DataPluginStartDependencies {
  */
 export interface DataSetup {
   query: QuerySetup;
-  timefilter: TimefilterSetup;
   indexPatterns: IndexPatternsSetup;
-  filter: FilterSetup;
 }
 
 /**
@@ -69,9 +53,7 @@ export interface DataSetup {
  */
 export interface DataStart {
   query: QuerySetup;
-  timefilter: TimefilterSetup;
   indexPatterns: IndexPatternsStart;
-  filter: FilterStart;
   search: SearchStart;
   ui: {
     SearchBar: React.ComponentType<StatetfulSearchBarProps>;
@@ -89,42 +71,27 @@ export interface DataStart {
  * in the setup/start interfaces. The remaining items exported here are either types,
  * or static code.
  */
-export class DataPlugin
-  implements
-    Plugin<DataSetup, DataStart, DataPluginSetupDependencies, DataPluginStartDependencies> {
-  // Exposed services, sorted alphabetically
-  private readonly filter: FilterService = new FilterService();
+
+export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginStartDependencies> {
   private readonly indexPatterns: IndexPatternsService = new IndexPatternsService();
   private readonly query: QueryService = new QueryService();
   private readonly search: SearchService = new SearchService();
-  private readonly timefilter: TimefilterService = new TimefilterService();
 
   private setupApi!: DataSetup;
+  private storage!: IStorageWrapper;
 
-  public setup(core: CoreSetup, { __LEGACY }: DataPluginSetupDependencies): DataSetup {
-    const { uiSettings } = core;
+  public setup(core: CoreSetup): DataSetup {
+    this.storage = new Storage(window.localStorage);
 
-    const timefilterService = this.timefilter.setup({
-      uiSettings,
-      store: __LEGACY.storage,
-    });
-    const filterService = this.filter.setup({
-      uiSettings,
-    });
     this.setupApi = {
       indexPatterns: this.indexPatterns.setup(),
       query: this.query.setup(),
-      timefilter: timefilterService,
-      filter: filterService,
     };
 
     return this.setupApi;
   }
 
-  public start(
-    core: CoreStart,
-    { __LEGACY, data, uiActions }: DataPluginStartDependencies
-  ): DataStart {
+  public start(core: CoreStart, { data, uiActions }: DataPluginStartDependencies): DataStart {
     const { uiSettings, http, notifications, savedObjects } = core;
 
     const indexPatternsService = this.indexPatterns.start({
@@ -134,18 +101,19 @@ export class DataPlugin
       notifications,
     });
 
+    initLegacyModule(indexPatternsService.indexPatterns);
+
     const SearchBar = createSearchBar({
       core,
       data,
-      store: __LEGACY.storage,
-      timefilter: this.setupApi.timefilter,
-      filterManager: this.setupApi.filter.filterManager,
+      storage: this.storage,
     });
 
     uiActions.registerAction(
       createFilterAction(
-        this.setupApi.filter.filterManager,
-        this.setupApi.timefilter.timefilter,
+        core.overlays,
+        data.query.filterManager,
+        data.query.timefilter.timefilter,
         indexPatternsService
       )
     );
@@ -164,9 +132,7 @@ export class DataPlugin
 
   public stop() {
     this.indexPatterns.stop();
-    this.filter.stop();
     this.query.stop();
     this.search.stop();
-    this.timefilter.stop();
   }
 }
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
index 06f9e6081e5222..5dc8702411783d 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
@@ -103,6 +103,13 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
             },
             "chrome": Object {
               "addApplicationClass": [MockFunction],
+              "docTitle": Object {
+                "__legacy": Object {
+                  "setBaseTitle": [MockFunction],
+                },
+                "change": [MockFunction],
+                "reset": [MockFunction],
+              },
               "getApplicationClasses$": [MockFunction],
               "getBadge$": [MockFunction],
               "getBrand$": [MockFunction],
@@ -229,10 +236,20 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
             },
             "http": Object {
               "addLoadingCount": [MockFunction],
-              "basePath": Object {
-                "get": [MockFunction],
-                "prepend": [MockFunction],
-                "remove": [MockFunction],
+              "anonymousPaths": AnonymousPaths {
+                "basePath": BasePath {
+                  "basePath": "",
+                  "get": [Function],
+                  "prepend": [Function],
+                  "remove": [Function],
+                },
+                "paths": Set {},
+              },
+              "basePath": BasePath {
+                "basePath": "",
+                "get": [Function],
+                "prepend": [Function],
+                "remove": [Function],
               },
               "delete": [MockFunction],
               "fetch": [MockFunction],
@@ -287,12 +304,12 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
                 "update": [MockFunction],
               },
             },
-            "store": Object {
+            "storage": Object {
               "clear": [MockFunction],
               "get": [MockFunction],
               "remove": [MockFunction],
               "set": [MockFunction],
-              "store": Object {
+              "storage": Object {
                 "clear": [MockFunction],
                 "getItem": [MockFunction],
                 "key": [MockFunction],
@@ -332,7 +349,7 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
           }
         }
       >
-        <InjectIntl(enhancedType)
+        <InjectIntl(EnhancedType)
           disableAutoFocus={true}
           indexPatterns={
             Array [
@@ -364,7 +381,7 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
           }
           screenTitle="Another Screen"
         >
-          <enhancedType
+          <EnhancedType
             disableAutoFocus={true}
             indexPatterns={
               Array [
@@ -649,6 +666,13 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
                     },
                     "chrome": Object {
                       "addApplicationClass": [MockFunction],
+                      "docTitle": Object {
+                        "__legacy": Object {
+                          "setBaseTitle": [MockFunction],
+                        },
+                        "change": [MockFunction],
+                        "reset": [MockFunction],
+                      },
                       "getApplicationClasses$": [MockFunction],
                       "getBadge$": [MockFunction],
                       "getBrand$": [MockFunction],
@@ -775,10 +799,20 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
                     },
                     "http": Object {
                       "addLoadingCount": [MockFunction],
-                      "basePath": Object {
-                        "get": [MockFunction],
-                        "prepend": [MockFunction],
-                        "remove": [MockFunction],
+                      "anonymousPaths": AnonymousPaths {
+                        "basePath": BasePath {
+                          "basePath": "",
+                          "get": [Function],
+                          "prepend": [Function],
+                          "remove": [Function],
+                        },
+                        "paths": Set {},
+                      },
+                      "basePath": BasePath {
+                        "basePath": "",
+                        "get": [Function],
+                        "prepend": [Function],
+                        "remove": [Function],
                       },
                       "delete": [MockFunction],
                       "fetch": [MockFunction],
@@ -833,12 +867,12 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
                         "update": [MockFunction],
                       },
                     },
-                    "store": Object {
+                    "storage": Object {
                       "clear": [MockFunction],
                       "get": [MockFunction],
                       "remove": [MockFunction],
                       "set": [MockFunction],
-                      "store": Object {
+                      "storage": Object {
                         "clear": [MockFunction],
                         "getItem": [MockFunction],
                         "key": [MockFunction],
@@ -1072,8 +1106,8 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
                 </div>
               </EuiOutsideClickDetector>
             </QueryBarInputUI>
-          </enhancedType>
-        </InjectIntl(enhancedType)>
+          </EnhancedType>
+        </InjectIntl(EnhancedType)>
       </Provider>
     </PseudoLocaleWrapper>
   </IntlProvider>
@@ -1183,6 +1217,13 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
             },
             "chrome": Object {
               "addApplicationClass": [MockFunction],
+              "docTitle": Object {
+                "__legacy": Object {
+                  "setBaseTitle": [MockFunction],
+                },
+                "change": [MockFunction],
+                "reset": [MockFunction],
+              },
               "getApplicationClasses$": [MockFunction],
               "getBadge$": [MockFunction],
               "getBrand$": [MockFunction],
@@ -1309,10 +1350,20 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
             },
             "http": Object {
               "addLoadingCount": [MockFunction],
-              "basePath": Object {
-                "get": [MockFunction],
-                "prepend": [MockFunction],
-                "remove": [MockFunction],
+              "anonymousPaths": AnonymousPaths {
+                "basePath": BasePath {
+                  "basePath": "",
+                  "get": [Function],
+                  "prepend": [Function],
+                  "remove": [Function],
+                },
+                "paths": Set {},
+              },
+              "basePath": BasePath {
+                "basePath": "",
+                "get": [Function],
+                "prepend": [Function],
+                "remove": [Function],
               },
               "delete": [MockFunction],
               "fetch": [MockFunction],
@@ -1367,12 +1418,12 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
                 "update": [MockFunction],
               },
             },
-            "store": Object {
+            "storage": Object {
               "clear": [MockFunction],
               "get": [MockFunction],
               "remove": [MockFunction],
               "set": [MockFunction],
-              "store": Object {
+              "storage": Object {
                 "clear": [MockFunction],
                 "getItem": [MockFunction],
                 "key": [MockFunction],
@@ -1412,7 +1463,7 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
           }
         }
       >
-        <InjectIntl(enhancedType)
+        <InjectIntl(EnhancedType)
           indexPatterns={
             Array [
               Object {
@@ -1443,7 +1494,7 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
           }
           screenTitle="Another Screen"
         >
-          <enhancedType
+          <EnhancedType
             indexPatterns={
               Array [
                 Object {
@@ -1726,6 +1777,13 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
                     },
                     "chrome": Object {
                       "addApplicationClass": [MockFunction],
+                      "docTitle": Object {
+                        "__legacy": Object {
+                          "setBaseTitle": [MockFunction],
+                        },
+                        "change": [MockFunction],
+                        "reset": [MockFunction],
+                      },
                       "getApplicationClasses$": [MockFunction],
                       "getBadge$": [MockFunction],
                       "getBrand$": [MockFunction],
@@ -1852,10 +1910,20 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
                     },
                     "http": Object {
                       "addLoadingCount": [MockFunction],
-                      "basePath": Object {
-                        "get": [MockFunction],
-                        "prepend": [MockFunction],
-                        "remove": [MockFunction],
+                      "anonymousPaths": AnonymousPaths {
+                        "basePath": BasePath {
+                          "basePath": "",
+                          "get": [Function],
+                          "prepend": [Function],
+                          "remove": [Function],
+                        },
+                        "paths": Set {},
+                      },
+                      "basePath": BasePath {
+                        "basePath": "",
+                        "get": [Function],
+                        "prepend": [Function],
+                        "remove": [Function],
                       },
                       "delete": [MockFunction],
                       "fetch": [MockFunction],
@@ -1910,12 +1978,12 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
                         "update": [MockFunction],
                       },
                     },
-                    "store": Object {
+                    "storage": Object {
                       "clear": [MockFunction],
                       "get": [MockFunction],
                       "remove": [MockFunction],
                       "set": [MockFunction],
-                      "store": Object {
+                      "storage": Object {
                         "clear": [MockFunction],
                         "getItem": [MockFunction],
                         "key": [MockFunction],
@@ -2149,8 +2217,8 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
                 </div>
               </EuiOutsideClickDetector>
             </QueryBarInputUI>
-          </enhancedType>
-        </InjectIntl(enhancedType)>
+          </EnhancedType>
+        </InjectIntl(EnhancedType)>
       </Provider>
     </PseudoLocaleWrapper>
   </IntlProvider>
@@ -2260,6 +2328,13 @@ exports[`QueryBarInput Should render the given query 1`] = `
             },
             "chrome": Object {
               "addApplicationClass": [MockFunction],
+              "docTitle": Object {
+                "__legacy": Object {
+                  "setBaseTitle": [MockFunction],
+                },
+                "change": [MockFunction],
+                "reset": [MockFunction],
+              },
               "getApplicationClasses$": [MockFunction],
               "getBadge$": [MockFunction],
               "getBrand$": [MockFunction],
@@ -2386,10 +2461,20 @@ exports[`QueryBarInput Should render the given query 1`] = `
             },
             "http": Object {
               "addLoadingCount": [MockFunction],
-              "basePath": Object {
-                "get": [MockFunction],
-                "prepend": [MockFunction],
-                "remove": [MockFunction],
+              "anonymousPaths": AnonymousPaths {
+                "basePath": BasePath {
+                  "basePath": "",
+                  "get": [Function],
+                  "prepend": [Function],
+                  "remove": [Function],
+                },
+                "paths": Set {},
+              },
+              "basePath": BasePath {
+                "basePath": "",
+                "get": [Function],
+                "prepend": [Function],
+                "remove": [Function],
               },
               "delete": [MockFunction],
               "fetch": [MockFunction],
@@ -2444,12 +2529,12 @@ exports[`QueryBarInput Should render the given query 1`] = `
                 "update": [MockFunction],
               },
             },
-            "store": Object {
+            "storage": Object {
               "clear": [MockFunction],
               "get": [MockFunction],
               "remove": [MockFunction],
               "set": [MockFunction],
-              "store": Object {
+              "storage": Object {
                 "clear": [MockFunction],
                 "getItem": [MockFunction],
                 "key": [MockFunction],
@@ -2489,7 +2574,7 @@ exports[`QueryBarInput Should render the given query 1`] = `
           }
         }
       >
-        <InjectIntl(enhancedType)
+        <InjectIntl(EnhancedType)
           indexPatterns={
             Array [
               Object {
@@ -2520,7 +2605,7 @@ exports[`QueryBarInput Should render the given query 1`] = `
           }
           screenTitle="Another Screen"
         >
-          <enhancedType
+          <EnhancedType
             indexPatterns={
               Array [
                 Object {
@@ -2803,6 +2888,13 @@ exports[`QueryBarInput Should render the given query 1`] = `
                     },
                     "chrome": Object {
                       "addApplicationClass": [MockFunction],
+                      "docTitle": Object {
+                        "__legacy": Object {
+                          "setBaseTitle": [MockFunction],
+                        },
+                        "change": [MockFunction],
+                        "reset": [MockFunction],
+                      },
                       "getApplicationClasses$": [MockFunction],
                       "getBadge$": [MockFunction],
                       "getBrand$": [MockFunction],
@@ -2929,10 +3021,20 @@ exports[`QueryBarInput Should render the given query 1`] = `
                     },
                     "http": Object {
                       "addLoadingCount": [MockFunction],
-                      "basePath": Object {
-                        "get": [MockFunction],
-                        "prepend": [MockFunction],
-                        "remove": [MockFunction],
+                      "anonymousPaths": AnonymousPaths {
+                        "basePath": BasePath {
+                          "basePath": "",
+                          "get": [Function],
+                          "prepend": [Function],
+                          "remove": [Function],
+                        },
+                        "paths": Set {},
+                      },
+                      "basePath": BasePath {
+                        "basePath": "",
+                        "get": [Function],
+                        "prepend": [Function],
+                        "remove": [Function],
                       },
                       "delete": [MockFunction],
                       "fetch": [MockFunction],
@@ -2987,12 +3089,12 @@ exports[`QueryBarInput Should render the given query 1`] = `
                         "update": [MockFunction],
                       },
                     },
-                    "store": Object {
+                    "storage": Object {
                       "clear": [MockFunction],
                       "get": [MockFunction],
                       "remove": [MockFunction],
                       "set": [MockFunction],
-                      "store": Object {
+                      "storage": Object {
                         "clear": [MockFunction],
                         "getItem": [MockFunction],
                         "key": [MockFunction],
@@ -3226,8 +3328,8 @@ exports[`QueryBarInput Should render the given query 1`] = `
                 </div>
               </EuiOutsideClickDetector>
             </QueryBarInputUI>
-          </enhancedType>
-        </InjectIntl(enhancedType)>
+          </EnhancedType>
+        </InjectIntl(EnhancedType)>
       </Provider>
     </PseudoLocaleWrapper>
   </IntlProvider>
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts
index 80ee38ea1b076e..d0abed8e862641 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.mocks.ts
@@ -45,7 +45,7 @@ export const mockFetchIndexPatterns = jest
   .fn()
   .mockReturnValue(Promise.resolve([mockIndexPattern]));
 
-jest.mock('../../persisted_log', () => ({
+jest.mock('../../../../../../../plugins/data/public/query/persisted_log', () => ({
   PersistedLog: mockPersistedLogFactory,
 }));
 
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx
index f1249da997dfe9..3edb689ca2bfeb 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx
@@ -58,7 +58,7 @@ const createMockWebStorage = () => ({
 });
 
 const createMockStorage = () => ({
-  store: createMockWebStorage(),
+  storage: createMockWebStorage(),
   get: jest.fn(),
   set: jest.fn(),
   remove: jest.fn(),
@@ -80,7 +80,7 @@ const mockIndexPattern = {
   ],
 } as IndexPattern;
 
-function wrapQueryBarInputInContext(testProps: any, store?: any) {
+function wrapQueryBarInputInContext(testProps: any, storage?: any) {
   const defaultOptions = {
     screenTitle: 'Another Screen',
     intl: null as any,
@@ -89,7 +89,7 @@ function wrapQueryBarInputInContext(testProps: any, store?: any) {
   const services = {
     ...startMock,
     appName: testProps.appName || 'test',
-    store: store || createMockStorage(),
+    storage: storage || createMockStorage(),
   };
 
   return (
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
index a57018b1181850..5576427b1592a6 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
@@ -21,14 +21,23 @@ import { Component } from 'react';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { EuiFieldText, EuiOutsideClickDetector, PopoverAnchorPosition } from '@elastic/eui';
-
-import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
+import {
+  EuiFieldText,
+  EuiOutsideClickDetector,
+  PopoverAnchorPosition,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButton,
+  EuiLink,
+} from '@elastic/eui';
+
+import { InjectedIntl, injectI18n, FormattedMessage } from '@kbn/i18n/react';
 import { debounce, compact, isEqual } from 'lodash';
-
+import { Toast } from 'src/core/public';
 import {
   AutocompleteSuggestion,
   AutocompleteSuggestionType,
+  PersistedLog,
 } from '../../../../../../../plugins/data/public';
 import {
   withKibana,
@@ -39,7 +48,6 @@ import { Query, getQueryLog } from '../index';
 import { fromUser, matchPairs, toUser } from '../lib';
 import { QueryLanguageSwitcher } from './language_switcher';
 import { SuggestionsComponent } from './typeahead/suggestions_component';
-import { PersistedLog } from '../../persisted_log';
 import { fetchIndexPatterns } from '../lib/fetch_index_patterns';
 import { IDataPluginServices } from '../../../types';
 
@@ -302,20 +310,13 @@ export class QueryBarInputUI extends Component<Props, State> {
     }
   };
 
-  private selectSuggestion = ({
-    type,
-    text,
-    start,
-    end,
-  }: {
-    type: AutocompleteSuggestionType;
-    text: string;
-    start: number;
-    end: number;
-  }) => {
+  private selectSuggestion = (suggestion: AutocompleteSuggestion) => {
     if (!this.inputRef) {
       return;
     }
+    const { type, text, start, end, cursorIndex } = suggestion;
+
+    this.handleNestedFieldSyntaxNotification(suggestion);
 
     const query = this.getQueryString();
     const { selectionStart, selectionEnd } = this.inputRef;
@@ -328,12 +329,75 @@ export class QueryBarInputUI extends Component<Props, State> {
 
     this.onQueryStringChange(newQueryString);
 
+    this.setState({
+      selectionStart: start + (cursorIndex ? cursorIndex : text.length),
+      selectionEnd: start + (cursorIndex ? cursorIndex : text.length),
+    });
+
     if (type === recentSearchType) {
       this.setState({ isSuggestionsVisible: false, index: null });
       this.onSubmit({ query: newQueryString, language: this.props.query.language });
     }
   };
 
+  private handleNestedFieldSyntaxNotification = (suggestion: AutocompleteSuggestion) => {
+    if (
+      'field' in suggestion &&
+      suggestion.field.subType &&
+      suggestion.field.subType.nested &&
+      !this.services.storage.get('kibana.KQLNestedQuerySyntaxInfoOptOut')
+    ) {
+      const { notifications, docLinks } = this.services;
+
+      const onKQLNestedQuerySyntaxInfoOptOut = (toast: Toast) => {
+        if (!this.services.storage) return;
+        this.services.storage.set('kibana.KQLNestedQuerySyntaxInfoOptOut', true);
+        notifications!.toasts.remove(toast);
+      };
+
+      if (notifications && docLinks) {
+        const toast = notifications.toasts.add({
+          title: this.props.intl.formatMessage({
+            id: 'data.query.queryBar.KQLNestedQuerySyntaxInfoTitle',
+            defaultMessage: 'KQL nested query syntax',
+          }),
+          text: (
+            <div>
+              <p>
+                <FormattedMessage
+                  id="data.query.queryBar.KQLNestedQuerySyntaxInfoText"
+                  defaultMessage="It looks like you're querying on a nested field.
+                  You can construct KQL syntax for nested queries in different ways, depending on the results you want.
+                  Learn more in our {link}."
+                  values={{
+                    link: (
+                      <EuiLink href={docLinks.links.query.kueryQuerySyntax} target="_blank">
+                        <FormattedMessage
+                          id="data.query.queryBar.KQLNestedQuerySyntaxInfoDocLinkText"
+                          defaultMessage="docs"
+                        />
+                      </EuiLink>
+                    ),
+                  }}
+                />
+              </p>
+              <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
+                <EuiFlexItem grow={false}>
+                  <EuiButton size="s" onClick={() => onKQLNestedQuerySyntaxInfoOptOut(toast)}>
+                    <FormattedMessage
+                      id="data.query.queryBar.KQLNestedQuerySyntaxInfoOptOutText"
+                      defaultMessage="Don't show again"
+                    />
+                  </EuiButton>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </div>
+          ),
+        });
+      }
+    }
+  };
+
   private increaseLimit = () => {
     this.setState({
       suggestionLimit: this.state.suggestionLimit + 50,
@@ -365,7 +429,7 @@ export class QueryBarInputUI extends Component<Props, State> {
       body: JSON.stringify({ opt_in: language === 'kuery' }),
     });
 
-    this.services.store.set('kibana.userQueryLanguage', language);
+    this.services.storage.set('kibana.userQueryLanguage', language);
 
     const newQuery = { query: '', language };
     this.onChange(newQuery);
@@ -387,10 +451,10 @@ export class QueryBarInputUI extends Component<Props, State> {
   };
 
   private initPersistedLog = () => {
-    const { uiSettings, store, appName } = this.services;
+    const { uiSettings, storage, appName } = this.services;
     this.persistedLog = this.props.persistedLog
       ? this.props.persistedLog
-      : getQueryLog(uiSettings, store, appName, this.props.query.language);
+      : getQueryLog(uiSettings, storage, appName, this.props.query.language);
   };
 
   public onMouseEnterSuggestion = (index: number) => {
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx
index 7ab191062e32dc..ae08083f82af3e 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.test.tsx
@@ -29,12 +29,11 @@ import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
 import { I18nProvider } from '@kbn/i18n/react';
 const startMock = coreMock.createStart();
 
-import { timefilterServiceMock } from '../../../timefilter/timefilter_service.mock';
-const timefilterSetupMock = timefilterServiceMock.createSetupContract();
-
-timefilterSetupMock.history.get.mockImplementation(() => {
-  return [];
-});
+const mockTimeHistory = {
+  get: () => {
+    return [];
+  },
+};
 
 startMock.uiSettings.get.mockImplementation((key: string) => {
   switch (key) {
@@ -79,7 +78,7 @@ const createMockWebStorage = () => ({
 });
 
 const createMockStorage = () => ({
-  store: createMockWebStorage(),
+  storage: createMockWebStorage(),
   get: jest.fn(),
   set: jest.fn(),
   remove: jest.fn(),
@@ -112,7 +111,7 @@ function wrapQueryBarTopRowInContext(testProps: any) {
   const services = {
     ...startMock,
     appName: 'discover',
-    store: createMockStorage(),
+    storage: createMockStorage(),
   };
 
   return (
@@ -140,7 +139,7 @@ describe('QueryBarTopRowTopRow', () => {
         screenTitle: 'Another Screen',
         isDirty: false,
         indexPatterns: [mockIndexPattern],
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -154,7 +153,7 @@ describe('QueryBarTopRowTopRow', () => {
         query: kqlQuery,
         screenTitle: 'Another Screen',
         indexPatterns: [mockIndexPattern],
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
         disableAutoFocus: true,
         isDirty: false,
       })
@@ -167,7 +166,7 @@ describe('QueryBarTopRowTopRow', () => {
     const component = mount(
       wrapQueryBarTopRowInContext({
         isDirty: false,
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -179,7 +178,7 @@ describe('QueryBarTopRowTopRow', () => {
     const component = mount(
       wrapQueryBarTopRowInContext({
         showDatePicker: false,
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
         isDirty: false,
       })
     );
@@ -196,7 +195,7 @@ describe('QueryBarTopRowTopRow', () => {
         showDatePicker: true,
         dateRangeFrom: 'now-7d',
         dateRangeTo: 'now',
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -212,7 +211,7 @@ describe('QueryBarTopRowTopRow', () => {
         showDatePicker: true,
         dateRangeFrom: 'now-7d',
         dateRangeTo: 'now',
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -232,7 +231,7 @@ describe('QueryBarTopRowTopRow', () => {
         showDatePicker: false,
         dateRangeFrom: 'now-7d',
         dateRangeTo: 'now',
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -249,7 +248,7 @@ describe('QueryBarTopRowTopRow', () => {
         indexPatterns: [mockIndexPattern],
         showQueryInput: false,
         showDatePicker: false,
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
@@ -263,7 +262,7 @@ describe('QueryBarTopRowTopRow', () => {
         isDirty: false,
         screenTitle: 'Another Screen',
         showDatePicker: false,
-        timeHistory: timefilterSetupMock.history,
+        timeHistory: mockTimeHistory,
       })
     );
 
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx
index 9a846ab82f47cf..d31ac2d76d0d9a 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsx
@@ -21,7 +21,7 @@ import dateMath from '@elastic/datemath';
 import { doesKueryExpressionHaveLuceneSyntaxError } from '@kbn/es-query';
 
 import classNames from 'classnames';
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 
 import {
   EuiButton,
@@ -35,15 +35,14 @@ import {
 import { EuiSuperUpdateButton, OnRefreshProps } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { Toast } from 'src/core/public';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange, TimeHistoryContract } from 'src/plugins/data/public';
 import { useKibana } from '../../../../../../../plugins/kibana_react/public';
+import { PersistedLog } from '../../../../../../../plugins/data/public';
 
 import { IndexPattern } from '../../../index_patterns';
 import { QueryBarInput } from './query_bar_input';
 import { Query, getQueryLog } from '../index';
-import { TimeHistoryContract } from '../../../timefilter';
 import { IDataPluginServices } from '../../../types';
-import { PersistedLog } from '../../persisted_log';
 
 interface Props {
   query?: Query;
@@ -73,17 +72,15 @@ function QueryBarTopRowUI(props: Props) {
   const [isDateRangeInvalid, setIsDateRangeInvalid] = useState(false);
 
   const kibana = useKibana<IDataPluginServices>();
-  const { uiSettings, notifications, store, appName, docLinks } = kibana.services;
+  const { uiSettings, notifications, storage, appName, docLinks } = kibana.services;
 
   const kueryQuerySyntaxLink: string = docLinks!.links.query.kueryQuerySyntax;
 
   const queryLanguage = props.query && props.query.language;
-  let persistedLog: PersistedLog | undefined;
-
-  useEffect(() => {
-    if (!props.query) return;
-    persistedLog = getQueryLog(uiSettings!, store, appName, props.query.language);
-  }, [queryLanguage]);
+  const persistedLog: PersistedLog | undefined = React.useMemo(
+    () => (queryLanguage ? getQueryLog(uiSettings!, storage, appName, queryLanguage) : undefined),
+    [queryLanguage]
+  );
 
   function onClickSubmitButton(event: React.MouseEvent<HTMLButtonElement>) {
     if (persistedLog && props.query) {
@@ -211,7 +208,7 @@ function QueryBarTopRowUI(props: Props) {
   }
 
   function shouldRenderQueryInput(): boolean {
-    return Boolean(props.showQueryInput && props.indexPatterns && props.query && store);
+    return Boolean(props.showQueryInput && props.indexPatterns && props.query && storage);
   }
 
   function renderUpdateButton() {
@@ -293,7 +290,7 @@ function QueryBarTopRowUI(props: Props) {
     if (
       language === 'kuery' &&
       typeof query === 'string' &&
-      (!store || !store.get('kibana.luceneSyntaxWarningOptOut')) &&
+      (!storage || !storage.get('kibana.luceneSyntaxWarningOptOut')) &&
       doesKueryExpressionHaveLuceneSyntaxError(query)
     ) {
       const toast = notifications!.toasts.addWarning({
@@ -337,8 +334,8 @@ function QueryBarTopRowUI(props: Props) {
   }
 
   function onLuceneSyntaxWarningOptOut(toast: Toast) {
-    if (!store) return;
-    store.set('kibana.luceneSyntaxWarningOptOut', true);
+    if (!storage) return;
+    storage.set('kibana.luceneSyntaxWarningOptOut', true);
     notifications!.toasts.remove(toast);
   }
 
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts b/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts
index 8b26e14c6ed7bd..66424d9a1d6a35 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts
+++ b/src/legacy/core_plugins/data/public/query/query_bar/lib/get_query_log.ts
@@ -18,12 +18,12 @@
  */
 
 import { UiSettingsClientContract } from 'src/core/public';
-import { PersistedLog } from '../../persisted_log';
-import { Storage } from '../../../types';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { PersistedLog } from '../../../../../../../plugins/data/public';
 
 export function getQueryLog(
   uiSettings: UiSettingsClientContract,
-  store: Storage,
+  storage: IStorageWrapper,
   appName: string,
   language: string
 ) {
@@ -33,6 +33,6 @@ export function getQueryLog(
       maxLength: uiSettings.get('history:limit'),
       filterDuplicates: true,
     },
-    store
+    storage
   );
 }
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx
index d801f8a69e2d64..4485b74ca09010 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx
@@ -19,52 +19,45 @@
 
 import React, { useState, useEffect } from 'react';
 import { Subscription } from 'rxjs';
-import { Filter } from '@kbn/es-query';
 import { CoreStart } from 'src/core/public';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { Storage } from '../../../types';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
-import { TimefilterSetup } from '../../../timefilter';
-import { FilterManager, SearchBar } from '../../../';
+import { SearchBar } from '../../../';
 import { SearchBarOwnProps } from '.';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 interface StatefulSearchBarDeps {
   core: CoreStart;
   data: DataPublicPluginStart;
-  store: Storage;
-  timefilter: TimefilterSetup;
-  filterManager: FilterManager;
+  storage: IStorageWrapper;
 }
 
 export type StatetfulSearchBarProps = SearchBarOwnProps & {
   appName: string;
 };
 
-const defaultFiltersUpdated = (filterManager: FilterManager) => {
-  return (filters: Filter[]) => {
-    filterManager.setFilters(filters);
+const defaultFiltersUpdated = (data: DataPublicPluginStart) => {
+  return (filters: esFilters.Filter[]) => {
+    data.query.filterManager.setFilters(filters);
   };
 };
 
-const defaultOnRefreshChange = (timefilter: TimefilterSetup) => {
+const defaultOnRefreshChange = (data: DataPublicPluginStart) => {
+  const { timefilter } = data.query.timefilter;
   return (options: { isPaused: boolean; refreshInterval: number }) => {
-    timefilter.timefilter.setRefreshInterval({
+    timefilter.setRefreshInterval({
       value: options.refreshInterval,
       pause: options.isPaused,
     });
   };
 };
 
-export function createSearchBar({
-  core,
-  store,
-  timefilter,
-  filterManager,
-  data,
-}: StatefulSearchBarDeps) {
+export function createSearchBar({ core, storage, data }: StatefulSearchBarDeps) {
   // App name should come from the core application service.
   // Until it's available, we'll ask the user to provide it for the pre-wired component.
   return (props: StatetfulSearchBarProps) => {
+    const { filterManager, timefilter } = data.query;
     const tfRefreshInterval = timefilter.timefilter.getRefreshInterval();
     const fmFilters = filterManager.getFilters();
     const [refreshInterval, setRefreshInterval] = useState(tfRefreshInterval.value);
@@ -113,7 +106,7 @@ export function createSearchBar({
         services={{
           appName: props.appName,
           data,
-          store,
+          storage,
           ...core,
         }}
       >
@@ -124,8 +117,8 @@ export function createSearchBar({
           refreshInterval={refreshInterval}
           isRefreshPaused={refreshPaused}
           filters={filters}
-          onFiltersUpdated={defaultFiltersUpdated(filterManager)}
-          onRefreshChange={defaultOnRefreshChange(timefilter)}
+          onFiltersUpdated={defaultFiltersUpdated(data)}
+          onRefreshChange={defaultOnRefreshChange(data)}
           {...props}
         />
       </KibanaContextProvider>
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsx
index 6fd5274d09ec68..7a9786f5f9ce82 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsx
@@ -83,7 +83,7 @@ export const SaveQueryForm: FunctionComponent<Props> = ({
       setSavedQueries(sortedAllSavedQueries);
     };
     fetchQueries();
-  }, []);
+  }, [savedQueryService]);
 
   const savedQueryDescriptionText = i18n.translate(
     'data.search.searchBar.savedQueryDescriptionText',
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsx
index b2e47e8b4e850a..b73b8edb39e547 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsx
@@ -29,6 +29,7 @@ import {
   EuiPagination,
   EuiText,
   EuiSpacer,
+  EuiIcon,
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
@@ -75,7 +76,7 @@ export const SavedQueryManagementComponent: FunctionComponent<Props> = ({
     if (isOpen) {
       fetchCountAndSavedQueries();
     }
-  }, [isOpen, activePage]);
+  }, [isOpen, activePage, savedQueryService]);
 
   const goToPage = (pageNumber: number) => {
     setActivePage(pageNumber);
@@ -116,8 +117,6 @@ export const SavedQueryManagementComponent: FunctionComponent<Props> = ({
 
   const savedQueryPopoverButton = (
     <EuiButtonEmpty
-      iconType="arrowDown"
-      iconSide="right"
       onClick={() => {
         setIsOpen(!isOpen);
       }}
@@ -129,7 +128,8 @@ export const SavedQueryManagementComponent: FunctionComponent<Props> = ({
       })}
       data-test-subj="saved-query-management-popover-button"
     >
-      #
+      <EuiIcon type="save" className="euiQuickSelectPopover__buttonText" />
+      <EuiIcon type="arrowDown" />
     </EuiButtonEmpty>
   );
 
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
index 73e81a38572c39..44637365247fbd 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
@@ -27,20 +27,24 @@ import { I18nProvider } from '@kbn/i18n/react';
 import { coreMock } from '../../../../../../../../src/core/public/mocks';
 const startMock = coreMock.createStart();
 
-import { timefilterServiceMock } from '../../../timefilter/timefilter_service.mock';
 import { mount } from 'enzyme';
-const timefilterSetupMock = timefilterServiceMock.createSetupContract();
+
+const mockTimeHistory = {
+  get: () => {
+    return [];
+  },
+};
 
 jest.mock('../../../../../data/public', () => {
   return {
-    FilterBar: () => <div className="filterBar"></div>,
-    QueryBarInput: () => <div className="queryBar"></div>,
+    FilterBar: () => <div className="filterBar" />,
+    QueryBarInput: () => <div className="queryBar" />,
   };
 });
 
 jest.mock('../../../query/query_bar', () => {
   return {
-    QueryBarTopRow: () => <div className="queryBar"></div>,
+    QueryBarTopRow: () => <div className="queryBar" />,
   };
 });
 
@@ -56,7 +60,7 @@ const createMockWebStorage = () => ({
 });
 
 const createMockStorage = () => ({
-  store: createMockWebStorage(),
+  storage: createMockWebStorage(),
   get: jest.fn(),
   set: jest.fn(),
   remove: jest.fn(),
@@ -86,7 +90,7 @@ const kqlQuery = {
 function wrapSearchBarInContext(testProps: any) {
   const defaultOptions = {
     appName: 'test',
-    timeHistory: timefilterSetupMock.history,
+    timeHistory: mockTimeHistory,
     intl: null as any,
   };
 
@@ -95,7 +99,7 @@ function wrapSearchBarInContext(testProps: any) {
     savedObjects: startMock.savedObjects,
     notifications: startMock.notifications,
     http: startMock.http,
-    store: createMockStorage(),
+    storage: createMockStorage(),
   };
 
   return (
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
index a03019da4e0d7a..a57b7b17a0da66 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
@@ -18,7 +18,6 @@
  */
 
 import { compact } from 'lodash';
-import { Filter } from '@kbn/es-query';
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import classNames from 'classnames';
 import React, { Component } from 'react';
@@ -26,6 +25,7 @@ import ResizeObserver from 'resize-observer-polyfill';
 import { get, isEqual } from 'lodash';
 
 import { TimeRange } from 'src/plugins/data/common/types';
+import { TimeHistoryContract } from 'src/plugins/data/public';
 import { IndexPattern, Query, FilterBar } from '../../../../../data/public';
 import { QueryBarTopRow } from '../../../query';
 import { SavedQuery, SavedQueryAttributes } from '../index';
@@ -33,20 +33,20 @@ import { SavedQueryMeta, SaveQueryForm } from './saved_query_management/save_que
 import { SavedQueryManagementComponent } from './saved_query_management/saved_query_management_component';
 import { SavedQueryService } from '../lib/saved_query_service';
 import { createSavedQueryService } from '../lib/saved_query_service';
-import { TimeHistoryContract } from '../../../timefilter';
 import {
   withKibana,
   KibanaReactContextValue,
 } from '../../../../../../../plugins/kibana_react/public';
 import { IDataPluginServices } from '../../../types';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 interface SearchBarInjectedDeps {
   kibana: KibanaReactContextValue<IDataPluginServices>;
   intl: InjectedIntl;
   timeHistory: TimeHistoryContract;
   // Filter bar
-  onFiltersUpdated?: (filters: Filter[]) => void;
-  filters?: Filter[];
+  onFiltersUpdated?: (filters: esFilters.Filter[]) => void;
+  filters?: esFilters.Filter[];
   // Date picker
   dateRangeFrom?: string;
   dateRangeTo?: string;
@@ -368,7 +368,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
         onLoad={this.onLoadSavedQuery}
         savedQueryService={this.savedQueryService}
         onClearSavedQuery={this.props.onClearSavedQuery}
-      ></SavedQueryManagementComponent>
+      />
     );
 
     let queryBar;
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/index.tsx b/src/legacy/core_plugins/data/public/search/search_bar/index.tsx
index 0c677bea985365..ebde9d60b0b51e 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/index.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/index.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { RefreshInterval, TimeRange } from 'src/plugins/data/public';
 import { Query } from '../../query/query_bar';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export * from './components';
 
@@ -36,6 +36,6 @@ export interface SavedQueryAttributes {
   title: string;
   description: string;
   query: Query;
-  filters?: Filter[];
+  filters?: esFilters.Filter[];
   timefilter?: SavedQueryTimeFilter;
 }
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/lib/saved_query_service.test.ts b/src/legacy/core_plugins/data/public/search/search_bar/lib/saved_query_service.test.ts
index ac5fdb7fe99d54..415da8a2c32cc1 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/lib/saved_query_service.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_bar/lib/saved_query_service.test.ts
@@ -19,7 +19,7 @@
 
 import { SavedQueryAttributes } from '../index';
 import { createSavedQueryService } from './saved_query_service';
-import { FilterStateStore } from '@kbn/es-query';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 const savedQueryAttributes: SavedQueryAttributes = {
   title: 'foo',
@@ -43,7 +43,7 @@ const savedQueryAttributesWithFilters: SavedQueryAttributes = {
   filters: [
     {
       query: { match_all: {} },
-      $state: { store: FilterStateStore.APP_STATE },
+      $state: { store: esFilters.FilterStateStore.APP_STATE },
       meta: {
         disabled: false,
         negate: false,
diff --git a/src/legacy/core_plugins/data/public/shim/legacy_dependencies_plugin.ts b/src/legacy/core_plugins/data/public/shim/legacy_dependencies_plugin.ts
deleted file mode 100644
index 5b12d56dc7b00c..00000000000000
--- a/src/legacy/core_plugins/data/public/shim/legacy_dependencies_plugin.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Storage } from 'ui/storage';
-import { Plugin } from '../../../../../../src/core/public';
-import { initLegacyModule } from './legacy_module';
-
-/** @internal */
-export interface LegacyDependenciesPluginSetup {
-  storage: Storage;
-}
-
-export interface LegacyDependenciesPluginStart {
-  storage: Storage;
-}
-
-export class LegacyDependenciesPlugin implements Plugin<any, any> {
-  public setup() {
-    initLegacyModule();
-
-    return {
-      storage: new Storage(window.localStorage),
-    } as LegacyDependenciesPluginSetup;
-  }
-
-  public start() {
-    return {
-      storage: new Storage(window.localStorage),
-    } as LegacyDependenciesPluginStart;
-  }
-}
diff --git a/src/legacy/core_plugins/data/public/shim/legacy_module.ts b/src/legacy/core_plugins/data/public/shim/legacy_module.ts
index 0b5ca72599208a..b0ed3d43a4c8cf 100644
--- a/src/legacy/core_plugins/data/public/shim/legacy_module.ts
+++ b/src/legacy/core_plugins/data/public/shim/legacy_module.ts
@@ -25,13 +25,10 @@ import { wrapInI18nContext } from 'ui/i18n';
 import { uiModules } from 'ui/modules';
 import { npStart } from 'ui/new_platform';
 import { FilterBar, ApplyFiltersPopover } from '../filter';
-
-// @ts-ignore
-import { mapAndFlattenFilters } from '../filter/filter_manager/lib/map_and_flatten_filters';
 import { IndexPatterns } from '../index_patterns/index_patterns';
 
 /** @internal */
-export const initLegacyModule = once((): void => {
+export const initLegacyModule = once((indexPatterns: IndexPatterns): void => {
   uiModules
     .get('app/kibana', ['react'])
     .directive('filterBar', () => {
@@ -122,16 +119,5 @@ export const initLegacyModule = once((): void => {
       ])
     );
 
-  const module = uiModules.get('kibana/index_patterns');
-  let _service: any;
-  module.service('indexPatterns', function() {
-    if (!_service)
-      _service = new IndexPatterns(
-        npStart.core.uiSettings,
-        npStart.core.savedObjects.client,
-        npStart.core.http,
-        npStart.core.notifications
-      );
-    return _service;
-  });
+  uiModules.get('kibana/index_patterns').value('indexPatterns', indexPatterns);
 });
diff --git a/src/legacy/core_plugins/data/public/timefilter/index.ts b/src/legacy/core_plugins/data/public/timefilter/index.ts
deleted file mode 100644
index 17564801cf1481..00000000000000
--- a/src/legacy/core_plugins/data/public/timefilter/index.ts
+++ /dev/null
@@ -1,25 +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 { TimefilterService, TimefilterSetup } from './timefilter_service';
-
-export * from './types';
-export { Timefilter, TimefilterContract } from './timefilter';
-export { TimeHistory, TimeHistoryContract } from './time_history';
-export { getTime } from './get_time';
diff --git a/src/legacy/core_plugins/data/public/types.ts b/src/legacy/core_plugins/data/public/types.ts
index 2c02a9b7647555..b6c9c47cc0ae69 100644
--- a/src/legacy/core_plugins/data/public/types.ts
+++ b/src/legacy/core_plugins/data/public/types.ts
@@ -19,13 +19,7 @@
 
 import { UiSettingsClientContract, CoreStart } from 'src/core/public';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
-
-export interface Storage {
-  get: (key: string) => any;
-  set: (key: string, value: any) => void;
-  remove: (key: string) => any;
-  clear: () => void;
-}
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 
 export interface IDataPluginServices extends Partial<CoreStart> {
   appName: string;
@@ -33,6 +27,6 @@ export interface IDataPluginServices extends Partial<CoreStart> {
   savedObjects: CoreStart['savedObjects'];
   notifications: CoreStart['notifications'];
   http: CoreStart['http'];
-  store: Storage;
+  storage: IStorageWrapper;
   data: DataPublicPluginStart;
 }
diff --git a/src/legacy/core_plugins/elasticsearch/index.js b/src/legacy/core_plugins/elasticsearch/index.js
index ed6e2d7f7f1c8d..f92f920d1afb74 100644
--- a/src/legacy/core_plugins/elasticsearch/index.js
+++ b/src/legacy/core_plugins/elasticsearch/index.js
@@ -98,10 +98,14 @@ export default function (kibana) {
       createProxy(server);
 
       // Set up the health check service and start it.
-      const { start, waitUntilReady } = healthCheck(this, server, esConfig.healthCheckDelay.asMilliseconds());
+      const { start, waitUntilReady } = healthCheck(
+        this,
+        server,
+        esConfig.healthCheckDelay.asMilliseconds(),
+        esConfig.ignoreVersionMismatch
+      );
       server.expose('waitUntilReady', waitUntilReady);
       start();
-    }
+    },
   });
-
 }
diff --git a/src/legacy/core_plugins/elasticsearch/lib/__tests__/ensure_es_version.js b/src/legacy/core_plugins/elasticsearch/lib/__tests__/ensure_es_version.js
index baf728262aad1e..a31c7830f8d5c7 100644
--- a/src/legacy/core_plugins/elasticsearch/lib/__tests__/ensure_es_version.js
+++ b/src/legacy/core_plugins/elasticsearch/lib/__tests__/ensure_es_version.js
@@ -105,6 +105,51 @@ describe('plugins/elasticsearch', () => {
       }
     });
 
+    it('does not throw on outdated nodes, if `ignoreVersionMismatch` is enabled in development mode', async () => {
+      // set config values
+      server.config = () => ({
+        get: name => {
+          switch (name) {
+            case 'env.dev':
+              return true;
+            default:
+              throw new Error(`Unknown option "${name}"`);
+          }
+        },
+      });
+
+      // 5.0.0 ES is too old to work with a 5.1.0 version of Kibana.
+      setNodes('5.1.0', '5.2.0', '5.0.0');
+
+      const ignoreVersionMismatch = true;
+      const result =  await ensureEsVersion(server, KIBANA_VERSION, ignoreVersionMismatch);
+      expect(result).to.be(true);
+    });
+
+    it('throws an error if `ignoreVersionMismatch` is enabled in production mode', async () => {
+      // set config values
+      server.config = () => ({
+        get: name => {
+          switch (name) {
+            case 'env.dev':
+              return false;
+            default:
+              throw new Error(`Unknown option "${name}"`);
+          }
+        },
+      });
+
+      // 5.0.0 ES is too old to work with a 5.1.0 version of Kibana.
+      setNodes('5.1.0', '5.2.0', '5.0.0');
+
+      try {
+        const ignoreVersionMismatch = true;
+        await ensureEsVersion(server, KIBANA_VERSION, ignoreVersionMismatch);
+      } catch (e) {
+        expect(e).to.be.a(Error);
+      }
+    });
+
     it('fails if that single node is a client node', async () => {
       setNodes(
         '5.1.0',
diff --git a/src/legacy/core_plugins/elasticsearch/lib/ensure_es_version.js b/src/legacy/core_plugins/elasticsearch/lib/ensure_es_version.js
index 95c7db36d5fb4e..cb3ed1886b4a12 100644
--- a/src/legacy/core_plugins/elasticsearch/lib/ensure_es_version.js
+++ b/src/legacy/core_plugins/elasticsearch/lib/ensure_es_version.js
@@ -36,7 +36,7 @@ import isEsCompatibleWithKibana from './is_es_compatible_with_kibana';
  */
 const lastWarnedNodesForServer = new WeakMap();
 
-export function ensureEsVersion(server, kibanaVersion) {
+export function ensureEsVersion(server, kibanaVersion, ignoreVersionMismatch = false) {
   const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
 
   server.logWithMetadata(['plugin', 'debug'], 'Checking Elasticsearch version');
@@ -102,7 +102,7 @@ export function ensureEsVersion(server, kibanaVersion) {
         }
       }
 
-      if (incompatibleNodes.length) {
+      if (incompatibleNodes.length && !shouldIgnoreVersionMismatch(server, ignoreVersionMismatch)) {
         const incompatibleNodeNames = getHumanizedNodeNames(incompatibleNodes);
         throw new Error(
           `This version of Kibana requires Elasticsearch v` +
@@ -114,3 +114,12 @@ export function ensureEsVersion(server, kibanaVersion) {
       return true;
     });
 }
+
+function shouldIgnoreVersionMismatch(server, ignoreVersionMismatch) {
+  const isDevMode = server.config().get('env.dev');
+  if(!isDevMode && ignoreVersionMismatch) {
+    throw new Error(`Option "elasticsearch.ignoreVersionMismatch" can only be used in development mode`);
+  }
+
+  return isDevMode && ignoreVersionMismatch;
+}
diff --git a/src/legacy/core_plugins/elasticsearch/lib/health_check.js b/src/legacy/core_plugins/elasticsearch/lib/health_check.js
index 1b05d51b02494c..ac8e6caab94960 100644
--- a/src/legacy/core_plugins/elasticsearch/lib/health_check.js
+++ b/src/legacy/core_plugins/elasticsearch/lib/health_check.js
@@ -21,7 +21,7 @@ import Bluebird from 'bluebird';
 import kibanaVersion from './kibana_version';
 import { ensureEsVersion } from './ensure_es_version';
 
-export default function (plugin, server, requestDelay) {
+export default function (plugin, server, requestDelay, ignoreVersionMismatch) {
   plugin.status.yellow('Waiting for Elasticsearch');
 
   function waitUntilReady() {
@@ -31,7 +31,7 @@ export default function (plugin, server, requestDelay) {
   }
 
   function check() {
-    return ensureEsVersion(server, kibanaVersion.get())
+    return ensureEsVersion(server, kibanaVersion.get(), ignoreVersionMismatch)
       .then(() => plugin.status.green('Ready'))
       .catch(err => plugin.status.red(err));
   }
diff --git a/src/legacy/core_plugins/embeddable_api/public/index.scss b/src/legacy/core_plugins/embeddable_api/public/index.scss
index b4e170e6cb65c7..3f1977b909c31c 100644
--- a/src/legacy/core_plugins/embeddable_api/public/index.scss
+++ b/src/legacy/core_plugins/embeddable_api/public/index.scss
@@ -1,5 +1,3 @@
 @import 'src/legacy/ui/public/styles/styling_constants';
 
-@import './variables';
-@import '../../../../plugins/embeddable/public/lib/panel/index';
-@import '../../../../plugins/embeddable/public/lib/panel/panel_header/index';
+@import '../../../../plugins/embeddable/public/index';
diff --git a/src/legacy/core_plugins/expressions/index.ts b/src/legacy/core_plugins/expressions/index.ts
index b10e9a8dd5442a..4ba9a74795d4c9 100644
--- a/src/legacy/core_plugins/expressions/index.ts
+++ b/src/legacy/core_plugins/expressions/index.ts
@@ -34,6 +34,7 @@ export default function DataExpressionsPlugin(kibana: any) {
     init: (server: Legacy.Server) => ({}),
     uiExports: {
       injectDefaultVars: () => ({}),
+      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
     },
   };
 
diff --git a/src/legacy/core_plugins/expressions/public/index.scss b/src/legacy/core_plugins/expressions/public/index.scss
new file mode 100644
index 00000000000000..6efc552bf319bd
--- /dev/null
+++ b/src/legacy/core_plugins/expressions/public/index.scss
@@ -0,0 +1,13 @@
+// Import the EUI global scope so we can use EUI constants
+@import 'src/legacy/ui/public/styles/_styling_constants';
+
+/* Expressions plugin styles */
+
+// Prefix all styles with "exp" to avoid conflicts.
+// Examples
+//  expChart
+//  expChart__legend
+//  expChart__legend--small
+//  expChart__legend-isLoading
+
+@import './np_ready/public/index';
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/_expression_renderer.scss b/src/legacy/core_plugins/expressions/public/np_ready/public/_expression_renderer.scss
new file mode 100644
index 00000000000000..4f030384ed883d
--- /dev/null
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/_expression_renderer.scss
@@ -0,0 +1,20 @@
+.expExpressionRenderer {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+}
+
+.expExpressionRenderer__expression {
+  width: 100%;
+  height: 100%;
+}
+
+.expExpressionRenderer-isEmpty,
+.expExpressionRenderer-hasError {
+  .expExpressionRenderer__expression {
+    display: none;
+  }
+}
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/_index.scss b/src/legacy/core_plugins/expressions/public/np_ready/public/_index.scss
new file mode 100644
index 00000000000000..b9df491cd6e790
--- /dev/null
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/_index.scss
@@ -0,0 +1 @@
+@import './expression_renderer';
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/execute.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/execute.ts
index b4b11588b91bf4..8043e0fb6e3f98 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/execute.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/execute.ts
@@ -61,6 +61,7 @@ export class ExpressionDataHandler {
     this.promise = interpreter.interpretAst(this.ast, params.context || defaultContext, {
       getInitialContext,
       inspectorAdapters: this.inspectorAdapters,
+      abortSignal: this.abortController.signal,
     });
   }
 
@@ -69,7 +70,18 @@ export class ExpressionDataHandler {
   };
 
   getData = async () => {
-    return await this.promise;
+    try {
+      return await this.promise;
+    } catch (e) {
+      return {
+        type: 'error',
+        error: {
+          type: e.type,
+          message: e.message,
+          stack: e.stack,
+        },
+      };
+    }
   };
 
   getExpression = () => {
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.test.tsx b/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.test.tsx
new file mode 100644
index 00000000000000..26db8753e64035
--- /dev/null
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.test.tsx
@@ -0,0 +1,141 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { Subject } from 'rxjs';
+import { share } from 'rxjs/operators';
+import { ExpressionRendererImplementation } from './expression_renderer';
+import { ExpressionLoader } from './loader';
+import { mount } from 'enzyme';
+import { EuiProgress } from '@elastic/eui';
+
+jest.mock('./loader', () => {
+  return {
+    ExpressionLoader: jest.fn().mockImplementation(() => {
+      return {};
+    }),
+    loader: jest.fn(),
+  };
+});
+
+describe('ExpressionRenderer', () => {
+  it('starts to load, resolves, and goes back to loading', () => {
+    const dataSubject = new Subject();
+    const data$ = dataSubject.asObservable().pipe(share());
+    const renderSubject = new Subject();
+    const render$ = renderSubject.asObservable().pipe(share());
+    const loadingSubject = new Subject();
+    const loading$ = loadingSubject.asObservable().pipe(share());
+
+    (ExpressionLoader as jest.Mock).mockImplementation(() => {
+      return {
+        render$,
+        data$,
+        loading$,
+        update: jest.fn(),
+      };
+    });
+
+    const instance = mount(<ExpressionRendererImplementation expression="" />);
+
+    loadingSubject.next();
+    instance.update();
+
+    expect(instance.find(EuiProgress)).toHaveLength(1);
+
+    renderSubject.next(1);
+
+    instance.update();
+
+    expect(instance.find(EuiProgress)).toHaveLength(0);
+
+    instance.setProps({ expression: 'something new' });
+    loadingSubject.next();
+    instance.update();
+
+    expect(instance.find(EuiProgress)).toHaveLength(1);
+
+    renderSubject.next(1);
+    instance.update();
+
+    expect(instance.find(EuiProgress)).toHaveLength(0);
+  });
+
+  it('should display an error message when the expression fails', () => {
+    const dataSubject = new Subject();
+    const data$ = dataSubject.asObservable().pipe(share());
+    const renderSubject = new Subject();
+    const render$ = renderSubject.asObservable().pipe(share());
+    const loadingSubject = new Subject();
+    const loading$ = loadingSubject.asObservable().pipe(share());
+
+    (ExpressionLoader as jest.Mock).mockImplementation(() => {
+      return {
+        render$,
+        data$,
+        loading$,
+        update: jest.fn(),
+      };
+    });
+
+    const instance = mount(<ExpressionRendererImplementation expression="" />);
+
+    dataSubject.next('good data');
+    renderSubject.next({
+      type: 'error',
+      error: { message: 'render error' },
+    });
+    instance.update();
+
+    expect(instance.find(EuiProgress)).toHaveLength(0);
+    expect(instance.find('[data-test-subj="expression-renderer-error"]')).toHaveLength(1);
+  });
+
+  it('should display a custom error message if the user provides one', () => {
+    const dataSubject = new Subject();
+    const data$ = dataSubject.asObservable().pipe(share());
+    const renderSubject = new Subject();
+    const render$ = renderSubject.asObservable().pipe(share());
+    const loadingSubject = new Subject();
+    const loading$ = loadingSubject.asObservable().pipe(share());
+
+    (ExpressionLoader as jest.Mock).mockImplementation(() => {
+      return {
+        render$,
+        data$,
+        loading$,
+        update: jest.fn(),
+      };
+    });
+
+    const renderErrorFn = jest.fn().mockReturnValue(null);
+
+    const instance = mount(
+      <ExpressionRendererImplementation expression="" renderError={renderErrorFn} />
+    );
+
+    renderSubject.next({
+      type: 'error',
+      error: { message: 'render error' },
+    });
+    instance.update();
+
+    expect(renderErrorFn).toHaveBeenCalledWith('render error');
+  });
+});
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx b/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx
index 9edb5f098ba2e7..208bdbe5d0288f 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsx
@@ -17,49 +17,50 @@
  * under the License.
  */
 
-import { useRef, useEffect } from 'react';
+import { useRef, useEffect, useState } from 'react';
 import React from 'react';
-import { ExpressionAST, IExpressionLoaderParams, IInterpreterResult } from './types';
-import { IExpressionLoader, ExpressionLoader } from './loader';
+import classNames from 'classnames';
+import { EuiLoadingChart, EuiProgress } from '@elastic/eui';
+import { ExpressionAST, IExpressionLoaderParams } from './types';
+import { ExpressionLoader } from './loader';
 
 // Accept all options of the runner as props except for the
 // dom element which is provided by the component itself
 export interface ExpressionRendererProps extends IExpressionLoaderParams {
-  className: string;
   dataAttrs?: string[];
   expression: string | ExpressionAST;
-  /**
-   * If an element is specified, but the response of the expression run can't be rendered
-   * because it isn't a valid response or the specified renderer isn't available,
-   * this callback is called with the given result.
-   */
-  onRenderFailure?: (result: IInterpreterResult) => void;
+  renderError?: (error?: string | null) => React.ReactElement | React.ReactElement[];
+}
+
+interface State {
+  isEmpty: boolean;
+  isLoading: boolean;
+  error: null | { message: string };
 }
 
 export type ExpressionRenderer = React.FC<ExpressionRendererProps>;
 
-export const createRenderer = (loader: IExpressionLoader): ExpressionRenderer => ({
-  className,
+const defaultState: State = {
+  isEmpty: true,
+  isLoading: false,
+  error: null,
+};
+
+export const ExpressionRendererImplementation = ({
   dataAttrs,
   expression,
-  onRenderFailure,
+  renderError,
   ...options
 }: ExpressionRendererProps) => {
   const mountpoint: React.MutableRefObject<null | HTMLDivElement> = useRef(null);
   const handlerRef: React.MutableRefObject<null | ExpressionLoader> = useRef(null);
+  const [state, setState] = useState<State>({ ...defaultState });
 
+  // Re-fetch data automatically when the inputs change
+  /* eslint-disable react-hooks/exhaustive-deps */
   useEffect(() => {
-    if (mountpoint.current) {
-      if (!handlerRef.current) {
-        handlerRef.current = loader(mountpoint.current, expression, options);
-      } else {
-        handlerRef.current.update(expression, options);
-      }
-      handlerRef.current.data$.toPromise().catch(result => {
-        if (onRenderFailure) {
-          onRenderFailure(result);
-        }
-      });
+    if (handlerRef.current) {
+      handlerRef.current.update(expression, options);
     }
   }, [
     expression,
@@ -67,8 +68,67 @@ export const createRenderer = (loader: IExpressionLoader): ExpressionRenderer =>
     options.context,
     options.variables,
     options.disableCaching,
-    mountpoint.current,
   ]);
+  /* eslint-enable react-hooks/exhaustive-deps */
+
+  // Initialize the loader only once
+  useEffect(() => {
+    if (mountpoint.current && !handlerRef.current) {
+      handlerRef.current = new ExpressionLoader(mountpoint.current, expression, options);
+
+      handlerRef.current.loading$.subscribe(() => {
+        if (!handlerRef.current) {
+          return;
+        }
+        setState(prevState => ({ ...prevState, isLoading: true }));
+      });
+      handlerRef.current.render$.subscribe(item => {
+        if (!handlerRef.current) {
+          return;
+        }
+        if (typeof item !== 'number') {
+          setState(() => ({
+            ...defaultState,
+            isEmpty: false,
+            error: item.error,
+          }));
+        } else {
+          setState(() => ({
+            ...defaultState,
+            isEmpty: false,
+          }));
+        }
+      });
+    }
+  }, [mountpoint.current]);
+
+  useEffect(() => {
+    // We only want a clean up to run when the entire component is unloaded, not on every render
+    return function cleanup() {
+      if (handlerRef.current) {
+        handlerRef.current.destroy();
+        handlerRef.current = null;
+      }
+    };
+  }, []);
+
+  const classes = classNames('expExpressionRenderer', {
+    'expExpressionRenderer-isEmpty': state.isEmpty,
+    'expExpressionRenderer-hasError': !!state.error,
+  });
 
-  return <div {...dataAttrs} className={className} ref={mountpoint} />;
+  return (
+    <div {...dataAttrs} className={classes}>
+      {state.isEmpty ? <EuiLoadingChart mono size="l" /> : null}
+      {state.isLoading ? <EuiProgress size="xs" color="accent" position="absolute" /> : null}
+      {!state.isLoading && state.error ? (
+        renderError ? (
+          renderError(state.error.message)
+        ) : (
+          <div data-test-subj="expression-renderer-error">{state.error.message}</div>
+        )
+      ) : null}
+      <div className="expExpressionRenderer__expression" ref={mountpoint} />
+    </div>
+  );
 };
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/index.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/index.ts
index 428b431d298ad9..2ff71a6df60cf8 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/index.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/index.ts
@@ -22,7 +22,7 @@ import { ExpressionsPublicPlugin } from './plugin';
 
 export * from './plugin';
 export { ExpressionRenderer, ExpressionRendererProps } from './expression_renderer';
-export { IInterpreterRenderFunction } from './types';
+export { IInterpreterRenderFunction, IInterpreterRenderHandlers } from './types';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new ExpressionsPublicPlugin(initializerContext);
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts
index df695c039e02ed..a3caa1c47b150b 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts
@@ -19,10 +19,11 @@
 
 import { first } from 'rxjs/operators';
 import { loader, ExpressionLoader } from './loader';
+import { ExpressionDataHandler } from './execute';
 import { fromExpression } from '@kbn/interpreter/common';
 import { IInterpreterRenderHandlers } from './types';
 import { Observable } from 'rxjs';
-import { ExpressionAST } from '../../../../../../plugins/expressions/common';
+import { ExpressionAST } from '../../../../../../plugins/expressions/public';
 
 const element: HTMLElement = null as any;
 
@@ -48,27 +49,37 @@ jest.mock('./services', () => {
   };
 });
 
+jest.mock('./execute', () => {
+  const actual = jest.requireActual('./execute');
+  return {
+    ExpressionDataHandler: jest
+      .fn()
+      .mockImplementation((...args) => new actual.ExpressionDataHandler(...args)),
+    execute: jest.fn().mockReturnValue(actual.execute),
+  };
+});
+
 describe('execute helper function', () => {
-  it('returns ExpressionDataHandler instance', () => {
+  it('returns ExpressionLoader instance', () => {
     const response = loader(element, '', {});
     expect(response).toBeInstanceOf(ExpressionLoader);
   });
 });
 
-describe('ExpressionDataHandler', () => {
+describe('ExpressionLoader', () => {
   const expressionString = '';
 
   describe('constructor', () => {
     it('accepts expression string', () => {
-      const expressionDataHandler = new ExpressionLoader(element, expressionString, {});
-      expect(expressionDataHandler.getExpression()).toEqual(expressionString);
+      const expressionLoader = new ExpressionLoader(element, expressionString, {});
+      expect(expressionLoader.getExpression()).toEqual(expressionString);
     });
 
     it('accepts expression AST', () => {
       const expressionAST = fromExpression(expressionString) as ExpressionAST;
-      const expressionDataHandler = new ExpressionLoader(element, expressionAST, {});
-      expect(expressionDataHandler.getExpression()).toEqual(expressionString);
-      expect(expressionDataHandler.getAst()).toEqual(expressionAST);
+      const expressionLoader = new ExpressionLoader(element, expressionAST, {});
+      expect(expressionLoader.getExpression()).toEqual(expressionString);
+      expect(expressionLoader.getAst()).toEqual(expressionAST);
     });
 
     it('creates observables', () => {
@@ -117,9 +128,86 @@ describe('ExpressionDataHandler', () => {
     expect(response).toBe(2);
   });
 
-  it('cancel() aborts request', () => {
-    const expressionDataHandler = new ExpressionLoader(element, expressionString, {});
-    expressionDataHandler.cancel();
+  it('cancels the previous request when the expression is updated', () => {
+    const cancelMock = jest.fn();
+
+    (ExpressionDataHandler as jest.Mock).mockImplementationOnce(() => ({
+      getData: () => true,
+      cancel: cancelMock,
+    }));
+
+    const expressionLoader = new ExpressionLoader(element, expressionString, {});
+    expressionLoader.update('new', {});
+
+    expect(cancelMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not send an observable message if a request was aborted', () => {
+    const cancelMock = jest.fn();
+
+    const getData = jest
+      .fn()
+      .mockResolvedValueOnce({
+        type: 'error',
+        error: {
+          name: 'AbortError',
+        },
+      })
+      .mockResolvedValueOnce({
+        type: 'real',
+      });
+
+    (ExpressionDataHandler as jest.Mock).mockImplementationOnce(() => ({
+      getData,
+      cancel: cancelMock,
+    }));
+    (ExpressionDataHandler as jest.Mock).mockImplementationOnce(() => ({
+      getData,
+      cancel: cancelMock,
+    }));
+
+    const expressionLoader = new ExpressionLoader(element, expressionString, {});
+
+    expect.assertions(2);
+    expressionLoader.data$.subscribe({
+      next(data) {
+        expect(data).toEqual({
+          type: 'real',
+        });
+      },
+      error() {
+        expect(false).toEqual('Should not be called');
+      },
+    });
+
+    expressionLoader.update('new expression', {});
+
+    expect(getData).toHaveBeenCalledTimes(2);
+  });
+
+  it('sends an observable error if the data fetching failed', () => {
+    const cancelMock = jest.fn();
+
+    const getData = jest.fn().mockResolvedValue('rejected');
+
+    (ExpressionDataHandler as jest.Mock).mockImplementationOnce(() => ({
+      getData,
+      cancel: cancelMock,
+    }));
+
+    const expressionLoader = new ExpressionLoader(element, expressionString, {});
+
+    expect.assertions(2);
+    expressionLoader.data$.subscribe({
+      next(data) {
+        expect(data).toEqual('Should not be called');
+      },
+      error(error) {
+        expect(error.message).toEqual('Could not fetch data');
+      },
+    });
+
+    expect(getData).toHaveBeenCalledTimes(1);
   });
 
   it('inspect() returns correct inspector adapters', () => {
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.ts
index b07b0048bfd521..709fbc78a9b524 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.ts
@@ -18,11 +18,11 @@
  */
 
 import { Observable, Subject } from 'rxjs';
-import { first, share } from 'rxjs/operators';
+import { share } from 'rxjs/operators';
 import { Adapters, InspectorSession } from '../../../../../../plugins/inspector/public';
-import { execute, ExpressionDataHandler } from './execute';
+import { ExpressionDataHandler } from './execute';
 import { ExpressionRenderHandler } from './render';
-import { RenderId, Data, IExpressionLoaderParams, ExpressionAST } from './types';
+import { Data, IExpressionLoaderParams, ExpressionAST } from './types';
 import { getInspector } from './services';
 
 export class ExpressionLoader {
@@ -32,12 +32,12 @@ export class ExpressionLoader {
   events$: ExpressionRenderHandler['events$'];
   loading$: Observable<void>;
 
-  private dataHandler!: ExpressionDataHandler;
+  private dataHandler: ExpressionDataHandler | undefined;
   private renderHandler: ExpressionRenderHandler;
   private dataSubject: Subject<Data>;
   private loadingSubject: Subject<void>;
   private data: Data;
-  private params: IExpressionLoaderParams;
+  private params: IExpressionLoaderParams = {};
 
   constructor(
     element: HTMLElement,
@@ -63,76 +63,108 @@ export class ExpressionLoader {
       this.render(data);
     });
 
-    this.params = {
-      searchContext: { type: 'kibana_context' },
-      extraHandlers: params.extraHandlers,
-    };
+    this.setParams(params);
 
-    this.execute(expression, params);
+    this.loadData(expression, this.params);
   }
 
-  destroy() {}
+  destroy() {
+    this.dataSubject.complete();
+    this.loadingSubject.complete();
+    this.renderHandler.destroy();
+    if (this.dataHandler) {
+      this.dataHandler.cancel();
+    }
+  }
 
   cancel() {
-    this.dataHandler.cancel();
+    if (this.dataHandler) {
+      this.dataHandler.cancel();
+    }
   }
 
-  getExpression(): string {
-    return this.dataHandler.getExpression();
+  getExpression(): string | undefined {
+    if (this.dataHandler) {
+      return this.dataHandler.getExpression();
+    }
   }
 
-  getAst(): ExpressionAST {
-    return this.dataHandler.getAst();
+  getAst(): ExpressionAST | undefined {
+    if (this.dataHandler) {
+      return this.dataHandler.getAst();
+    }
   }
 
   getElement(): HTMLElement {
     return this.renderHandler.getElement();
   }
 
-  openInspector(title: string): InspectorSession {
-    return getInspector().open(this.inspect(), {
-      title,
-    });
+  openInspector(title: string): InspectorSession | undefined {
+    const inspector = this.inspect();
+    if (inspector) {
+      return getInspector().open(inspector, {
+        title,
+      });
+    }
   }
 
-  inspect(): Adapters {
-    return this.dataHandler.inspect();
+  inspect(): Adapters | undefined {
+    if (this.dataHandler) {
+      return this.dataHandler.inspect();
+    }
   }
 
-  update(expression?: string | ExpressionAST, params?: IExpressionLoaderParams): Promise<RenderId> {
-    const promise = this.render$.pipe(first()).toPromise();
-    if (params && params.searchContext && this.params.searchContext) {
-      this.params.searchContext = _.defaults(
-        {},
-        params.searchContext,
-        this.params.searchContext
-      ) as any;
-    }
+  update(expression?: string | ExpressionAST, params?: IExpressionLoaderParams): void {
+    this.setParams(params);
 
-    this.loadingSubject.next();
     if (expression) {
-      this.execute(expression, this.params);
+      this.loadData(expression, this.params);
     } else {
       this.render(this.data);
     }
-    return promise;
   }
 
-  private execute = async (
+  private loadData = async (
     expression: string | ExpressionAST,
-    params?: IExpressionLoaderParams
-  ): Promise<Data> => {
+    params: IExpressionLoaderParams
+  ): Promise<void> => {
+    this.loadingSubject.next();
     if (this.dataHandler) {
       this.dataHandler.cancel();
     }
-    this.dataHandler = execute(expression, params);
-    this.data = await this.dataHandler.getData();
-    this.dataSubject.next(this.data);
-    return this.data;
+    this.setParams(params);
+    this.dataHandler = new ExpressionDataHandler(expression, params);
+    const data = await this.dataHandler.getData();
+    this.dataSubject.next(data);
   };
 
-  private async render(data: Data): Promise<RenderId> {
-    return this.renderHandler.render(data, this.params.extraHandlers);
+  private render(data: Data): void {
+    this.loadingSubject.next();
+    this.renderHandler.render(data, this.params.extraHandlers);
+  }
+
+  private setParams(params?: IExpressionLoaderParams) {
+    if (!params || !Object.keys(params).length) {
+      return;
+    }
+
+    if (params.searchContext && this.params.searchContext) {
+      this.params.searchContext = _.defaults(
+        {},
+        params.searchContext,
+        this.params.searchContext
+      ) as any;
+    }
+    if (params.extraHandlers && this.params) {
+      this.params.extraHandlers = params.extraHandlers;
+    }
+
+    if (!Object.keys(this.params).length) {
+      this.params = {
+        ...params,
+        searchContext: { type: 'kibana_context', ...(params.searchContext || {}) },
+      };
+    }
   }
 }
 
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.ts
deleted file mode 100644
index 6569e8d8d1ec5b..00000000000000
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.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 { ExpressionsSetup, ExpressionsStart, plugin as pluginInitializer } from '.';
-/* eslint-disable */
-import { coreMock } from '../../../../../../core/public/mocks';
-import { inspectorPluginMock } from '../../../../../../plugins/inspector/public/mocks';
-/* eslint-enable */
-
-const createExpressionsSetupMock = (): ExpressionsSetup => {
-  return {
-    registerFunction: jest.fn(),
-    registerRenderer: jest.fn(),
-    registerType: jest.fn(),
-    __LEGACY: {
-      functions: {
-        register: () => {},
-      } as any,
-      renderers: {
-        register: () => {},
-      } as any,
-      types: {
-        register: () => {},
-      } as any,
-    },
-  };
-};
-
-function createExpressionsStartMock(): ExpressionsStart {
-  return {
-    ExpressionRenderer: jest.fn(() => null),
-    execute: jest.fn(),
-    loader: jest.fn(),
-    render: jest.fn(),
-    ExpressionRenderHandler: jest.fn(),
-    ExpressionDataHandler: jest.fn(),
-    ExpressionLoader: jest.fn(),
-  };
-}
-
-const createPlugin = async () => {
-  const pluginInitializerContext = coreMock.createPluginInitializerContext();
-  const coreSetup = coreMock.createSetup();
-  const coreStart = coreMock.createStart();
-  const plugin = pluginInitializer(pluginInitializerContext);
-  const setup = await plugin.setup(coreSetup, {
-    inspector: inspectorPluginMock.createSetupContract(),
-  });
-
-  return {
-    pluginInitializerContext,
-    coreSetup,
-    coreStart,
-    plugin,
-    setup,
-    doStart: async () =>
-      await plugin.start(coreStart, {
-        inspector: inspectorPluginMock.createStartContract(),
-      }),
-  };
-};
-
-export const expressionsPluginMock = {
-  createSetup: createExpressionsSetupMock,
-  createStart: createExpressionsStartMock,
-  createPlugin,
-};
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.tsx b/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.tsx
new file mode 100644
index 00000000000000..b17cd454b65eab
--- /dev/null
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/mocks.tsx
@@ -0,0 +1,89 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { ExpressionsSetup, ExpressionsStart, plugin as pluginInitializer } from '.';
+/* eslint-disable */
+import { coreMock } from '../../../../../../core/public/mocks';
+import { inspectorPluginMock } from '../../../../../../plugins/inspector/public/mocks';
+/* eslint-enable */
+
+const createExpressionsSetupMock = (): ExpressionsSetup => {
+  return {
+    registerFunction: jest.fn(),
+    registerRenderer: jest.fn(),
+    registerType: jest.fn(),
+    __LEGACY: {
+      functions: {
+        register: () => {},
+      } as any,
+      renderers: {
+        register: () => {},
+      } as any,
+      types: {
+        register: () => {},
+      } as any,
+      getExecutor: () => ({
+        interpreter: {
+          interpretAst: () => {},
+        },
+      }),
+    },
+  };
+};
+
+function createExpressionsStartMock(): ExpressionsStart {
+  return {
+    ExpressionRenderer: jest.fn(props => <></>),
+    execute: jest.fn(),
+    loader: jest.fn(),
+    render: jest.fn(),
+    ExpressionRenderHandler: jest.fn(),
+    ExpressionDataHandler: jest.fn(),
+    ExpressionLoader: jest.fn(),
+  };
+}
+
+const createPlugin = async () => {
+  const pluginInitializerContext = coreMock.createPluginInitializerContext();
+  const coreSetup = coreMock.createSetup();
+  const coreStart = coreMock.createStart();
+  const plugin = pluginInitializer(pluginInitializerContext);
+  const setup = await plugin.setup(coreSetup, {
+    inspector: inspectorPluginMock.createSetupContract(),
+  });
+
+  return {
+    pluginInitializerContext,
+    coreSetup,
+    coreStart,
+    plugin,
+    setup,
+    doStart: async () =>
+      await plugin.start(coreStart, {
+        inspector: inspectorPluginMock.createStartContract(),
+      }),
+  };
+};
+
+export const expressionsPluginMock = {
+  createSetup: createExpressionsSetupMock,
+  createStart: createExpressionsStartMock,
+  createPlugin,
+};
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/plugin.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/plugin.ts
index 5a0eecc51ef19e..d2c6c14c17de1b 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/plugin.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/plugin.ts
@@ -19,9 +19,10 @@
 
 /* eslint-disable */
 import { npSetup } from 'ui/new_platform';
-import { ExpressionsSetupContract } from '../../../../../../plugins/expressions/public/expressions/expressions_service';
 /* eslint-enable */
 
+import { ExpressionsSetup } from '../../../../../../plugins/expressions/public';
+
 import {
   CoreSetup,
   CoreStart,
@@ -32,9 +33,9 @@ import {
   Start as InspectorStart,
   Setup as InspectorSetup,
 } from '../../../../../../plugins/inspector/public';
-import { IInterpreter } from './types';
+import { ExpressionInterpreter } from './types';
 import { setInterpreter, setInspector, setRenderersRegistry } from './services';
-import { createRenderer } from './expression_renderer';
+import { ExpressionRendererImplementation } from './expression_renderer';
 import { ExpressionLoader, loader } from './loader';
 import { ExpressionDataHandler, execute } from './execute';
 import { ExpressionRenderHandler, render } from './render';
@@ -47,7 +48,7 @@ export interface ExpressionsStartDeps {
   inspector: InspectorStart;
 }
 
-export type ExpressionsSetup = ExpressionsSetupContract;
+export { ExpressionsSetup };
 export type ExpressionsStart = ReturnType<ExpressionsPublicPlugin['start']>;
 
 export class ExpressionsPublicPlugin
@@ -61,7 +62,7 @@ export class ExpressionsPublicPlugin
     // eslint-disable-next-line
     const { getInterpreter } = require('../../../../interpreter/public/interpreter');
     getInterpreter()
-      .then(({ interpreter }: { interpreter: IInterpreter }) => {
+      .then(({ interpreter }: { interpreter: ExpressionInterpreter }) => {
         setInterpreter(interpreter);
       })
       .catch((e: Error) => {
@@ -77,17 +78,16 @@ export class ExpressionsPublicPlugin
   }
 
   public start(core: CoreStart, { inspector }: ExpressionsStartDeps) {
-    const ExpressionRenderer = createRenderer(loader);
     setInspector(inspector);
 
     return {
       execute,
       render,
       loader,
+      ExpressionRenderer: ExpressionRendererImplementation,
       ExpressionDataHandler,
       ExpressionRenderHandler,
       ExpressionLoader,
-      ExpressionRenderer,
     };
   }
 
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/render.test.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/render.test.ts
index cf606b8fabec22..9d555f9760ee77 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/render.test.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/render.test.ts
@@ -20,6 +20,8 @@
 import { render, ExpressionRenderHandler } from './render';
 import { Observable } from 'rxjs';
 import { IInterpreterRenderHandlers } from './types';
+import { getRenderersRegistry } from './services';
+import { first } from 'rxjs/operators';
 
 const element: HTMLElement = {} as HTMLElement;
 
@@ -31,10 +33,11 @@ jest.mock('./services', () => {
       },
     },
   };
+
   return {
-    getRenderersRegistry: () => ({
-      get: (id: string) => renderers[id],
-    }),
+    getRenderersRegistry: jest.fn(() => ({
+      get: jest.fn((id: string) => renderers[id]),
+    })),
   };
 });
 
@@ -46,8 +49,6 @@ describe('render helper function', () => {
 });
 
 describe('ExpressionRenderHandler', () => {
-  const data = { type: 'render', as: 'test' };
-
   it('constructor creates observers', () => {
     const expressionRenderHandler = new ExpressionRenderHandler(element);
     expect(expressionRenderHandler.events$).toBeInstanceOf(Observable);
@@ -61,27 +62,71 @@ describe('ExpressionRenderHandler', () => {
   });
 
   describe('render()', () => {
-    it('throws if invalid data is provided', async () => {
+    it('sends an observable error and keeps it open if invalid data is provided', async () => {
       const expressionRenderHandler = new ExpressionRenderHandler(element);
-      await expect(expressionRenderHandler.render({})).rejects.toThrow();
+      const promise1 = expressionRenderHandler.render$.pipe(first()).toPromise();
+      expressionRenderHandler.render(false);
+      await expect(promise1).resolves.toEqual({
+        type: 'error',
+        error: {
+          message: 'invalid data provided to the expression renderer',
+        },
+      });
+
+      const promise2 = expressionRenderHandler.render$.pipe(first()).toPromise();
+      expressionRenderHandler.render(false);
+      await expect(promise2).resolves.toEqual({
+        type: 'error',
+        error: {
+          message: 'invalid data provided to the expression renderer',
+        },
+      });
     });
 
-    it('throws if renderer does not exist', async () => {
+    it('sends an observable error if renderer does not exist', async () => {
       const expressionRenderHandler = new ExpressionRenderHandler(element);
-      await expect(
-        expressionRenderHandler.render({ type: 'render', as: 'something' })
-      ).rejects.toThrow();
+      const promise = expressionRenderHandler.render$.pipe(first()).toPromise();
+      expressionRenderHandler.render({ type: 'render', as: 'something' });
+      await expect(promise).resolves.toEqual({
+        type: 'error',
+        error: {
+          message: `invalid renderer id 'something'`,
+        },
+      });
     });
 
-    it('returns a promise', () => {
+    it('sends an observable error if the rendering function throws', async () => {
+      (getRenderersRegistry as jest.Mock).mockReturnValueOnce({ get: () => true });
+      (getRenderersRegistry as jest.Mock).mockReturnValueOnce({
+        get: () => ({
+          render: () => {
+            throw new Error('renderer error');
+          },
+        }),
+      });
+
       const expressionRenderHandler = new ExpressionRenderHandler(element);
-      expect(expressionRenderHandler.render(data)).toBeInstanceOf(Promise);
+      const promise = expressionRenderHandler.render$.pipe(first()).toPromise();
+      expressionRenderHandler.render({ type: 'render', as: 'something' });
+      await expect(promise).resolves.toEqual({
+        type: 'error',
+        error: {
+          message: 'renderer error',
+        },
+      });
     });
 
-    it('resolves a promise once rendering is complete', async () => {
+    it('sends a next observable once rendering is complete', () => {
       const expressionRenderHandler = new ExpressionRenderHandler(element);
-      const response = await expressionRenderHandler.render(data);
-      expect(response).toBe(1);
+      expect.assertions(1);
+      return new Promise(resolve => {
+        expressionRenderHandler.render$.subscribe(renderCount => {
+          expect(renderCount).toBe(1);
+          resolve();
+        });
+
+        expressionRenderHandler.render({ type: 'render', as: 'test' });
+      });
     });
   });
 });
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/render.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/render.ts
index 96f56a4b362024..8475325a2c6258 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/render.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/render.ts
@@ -19,33 +19,41 @@
 
 import { Observable } from 'rxjs';
 import * as Rx from 'rxjs';
-import { share, first } from 'rxjs/operators';
+import { share } from 'rxjs/operators';
 import { event, RenderId, Data, IInterpreterRenderHandlers } from './types';
 import { getRenderersRegistry } from './services';
 
+interface RenderError {
+  type: 'error';
+  error: { type?: string; message: string };
+}
+
 export type IExpressionRendererExtraHandlers = Record<string, any>;
 
 export class ExpressionRenderHandler {
-  render$: Observable<RenderId>;
+  render$: Observable<RenderId | RenderError>;
   update$: Observable<any>;
   events$: Observable<event>;
 
   private element: HTMLElement;
   private destroyFn?: any;
   private renderCount: number = 0;
+  private renderSubject: Rx.Subject<RenderId | RenderError>;
+  private eventsSubject: Rx.Subject<unknown>;
+  private updateSubject: Rx.Subject<unknown>;
   private handlers: IInterpreterRenderHandlers;
 
   constructor(element: HTMLElement) {
     this.element = element;
 
-    const eventsSubject = new Rx.Subject();
-    this.events$ = eventsSubject.asObservable().pipe(share());
+    this.eventsSubject = new Rx.Subject();
+    this.events$ = this.eventsSubject.asObservable().pipe(share());
 
-    const renderSubject = new Rx.Subject();
-    this.render$ = renderSubject.asObservable().pipe(share());
+    this.renderSubject = new Rx.Subject();
+    this.render$ = this.renderSubject.asObservable().pipe(share());
 
-    const updateSubject = new Rx.Subject();
-    this.update$ = updateSubject.asObservable().pipe(share());
+    this.updateSubject = new Rx.Subject();
+    this.update$ = this.updateSubject.asObservable().pipe(share());
 
     this.handlers = {
       onDestroy: (fn: any) => {
@@ -53,39 +61,68 @@ export class ExpressionRenderHandler {
       },
       done: () => {
         this.renderCount++;
-        renderSubject.next(this.renderCount);
+        this.renderSubject.next(this.renderCount);
       },
       reload: () => {
-        updateSubject.next(null);
+        this.updateSubject.next(null);
       },
       update: params => {
-        updateSubject.next(params);
+        this.updateSubject.next(params);
       },
       event: data => {
-        eventsSubject.next(data);
+        this.eventsSubject.next(data);
       },
     };
   }
 
-  render = async (data: Data, extraHandlers: IExpressionRendererExtraHandlers = {}) => {
-    if (!data || data.type !== 'render' || !data.as) {
-      throw new Error('invalid data provided to expression renderer');
+  render = (data: Data, extraHandlers: IExpressionRendererExtraHandlers = {}) => {
+    if (!data || typeof data !== 'object') {
+      this.renderSubject.next({
+        type: 'error',
+        error: {
+          message: 'invalid data provided to the expression renderer',
+        },
+      });
+      return;
     }
 
-    if (!getRenderersRegistry().get(data.as)) {
-      throw new Error(`invalid renderer id '${data.as}'`);
+    if (data.type !== 'render' || !data.as) {
+      if (data.type === 'error') {
+        this.renderSubject.next(data);
+      } else {
+        this.renderSubject.next({
+          type: 'error',
+          error: { message: 'invalid data provided to the expression renderer' },
+        });
+      }
+      return;
     }
 
-    const promise = this.render$.pipe(first()).toPromise();
-
-    getRenderersRegistry()
-      .get(data.as)
-      .render(this.element, data.value, { ...this.handlers, ...extraHandlers });
+    if (!getRenderersRegistry().get(data.as)) {
+      this.renderSubject.next({
+        type: 'error',
+        error: { message: `invalid renderer id '${data.as}'` },
+      });
+      return;
+    }
 
-    return promise;
+    try {
+      // Rendering is asynchronous, completed by handlers.done()
+      getRenderersRegistry()
+        .get(data.as)!
+        .render(this.element, data.value, { ...this.handlers, ...extraHandlers });
+    } catch (e) {
+      this.renderSubject.next({
+        type: 'error',
+        error: { type: e.type, message: e.message },
+      });
+    }
   };
 
   destroy = () => {
+    this.renderSubject.complete();
+    this.eventsSubject.complete();
+    this.updateSubject.complete();
     if (this.destroyFn) {
       this.destroyFn();
     }
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/services.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/services.ts
index 4d95a8a91d0bb6..5c357b5dcd2bb7 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/services.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/services.ts
@@ -17,27 +17,15 @@
  * under the License.
  */
 
-import { IInterpreter } from './types';
+import { ExpressionInterpreter } from './types';
+import { createGetterSetter } from '../../../../../../plugins/kibana_utils/public';
 import { Start as IInspector } from '../../../../../../plugins/inspector/public';
 import { ExpressionsSetup } from './plugin';
 
-const createGetterSetter = <T extends object>(name: string): [() => T, (value: T) => void] => {
-  let value: T;
-
-  const get = (): T => {
-    if (!value) throw new Error(`${name} was not set`);
-    return value;
-  };
-
-  const set = (newValue: T) => {
-    value = newValue;
-  };
-
-  return [get, set];
-};
-
 export const [getInspector, setInspector] = createGetterSetter<IInspector>('Inspector');
-export const [getInterpreter, setInterpreter] = createGetterSetter<IInterpreter>('Interpreter');
+export const [getInterpreter, setInterpreter] = createGetterSetter<ExpressionInterpreter>(
+  'Interpreter'
+);
 export const [getRenderersRegistry, setRenderersRegistry] = createGetterSetter<
   ExpressionsSetup['__LEGACY']['renderers']
 >('Renderers registry');
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/types.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/types.ts
index 09aaa363c94928..9d7b4fb6d04806 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/types.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/types.ts
@@ -17,71 +17,9 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { TimeRange } from '../../../../../../plugins/data/public';
 import { Adapters } from '../../../../../../plugins/inspector/public';
 import { Query } from '../../../../../../plugins/data/public';
-import { ExpressionAST } from '../../../../../../plugins/expressions/common';
 
-export { ExpressionAST, TimeRange, Adapters, Filter, Query };
-
-export type RenderId = number;
-export type Data = any;
-export type event = any;
-export type Context = object;
-
-export interface SearchContext {
-  type: 'kibana_context';
-  filters?: Filter[];
-  query?: Query;
-  timeRange?: TimeRange;
-}
-
-export type IGetInitialContext = () => SearchContext | Context;
-
-export interface IExpressionLoaderParams {
-  searchContext?: SearchContext;
-  context?: Context;
-  variables?: Record<string, any>;
-  disableCaching?: boolean;
-  customFunctions?: [];
-  customRenderers?: [];
-  extraHandlers?: Record<string, any>;
-}
-
-export interface IInterpreterHandlers {
-  getInitialContext: IGetInitialContext;
-  inspectorAdapters?: Adapters;
-}
-
-export interface IInterpreterResult {
-  type: string;
-  as?: string;
-  value?: unknown;
-  error?: unknown;
-}
-
-export interface IInterpreterRenderHandlers {
-  done: () => void;
-  onDestroy: (fn: () => void) => void;
-  reload: () => void;
-  update: (params: any) => void;
-  event: (event: event) => void;
-}
-
-export interface IInterpreterRenderFunction<T = unknown> {
-  name: string;
-  displayName: string;
-  help: string;
-  validate: () => void;
-  reuseDomNode: boolean;
-  render: (domNode: Element, data: T, handlers: IInterpreterRenderHandlers) => void | Promise<void>;
-}
-
-export interface IInterpreter {
-  interpretAst(
-    ast: ExpressionAST,
-    context: Context,
-    handlers: IInterpreterHandlers
-  ): Promise<IInterpreterResult>;
-}
+export { TimeRange, Adapters, Query };
+export * from '../../../../../../plugins/expressions/public';
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js
index 9f0ed1dfb5097b..65b1d41fa82393 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js
+++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js
@@ -20,12 +20,8 @@
 import _ from 'lodash';
 import { FilterManager } from './filter_manager.js';
 import {
-  buildPhraseFilter,
-  buildPhrasesFilter,
-  getPhraseFilterField,
-  getPhraseFilterValue,
-  isPhraseFilter,
-} from '@kbn/es-query';
+  esFilters,
+} from '../../../../../../plugins/data/public';
 
 export class PhraseFilterManager extends FilterManager {
   constructor(controlId, fieldName, indexPattern, queryFilter) {
@@ -43,12 +39,12 @@ export class PhraseFilterManager extends FilterManager {
   createFilter(phrases) {
     let newFilter;
     if (phrases.length === 1) {
-      newFilter = buildPhraseFilter(
+      newFilter = esFilters.buildPhraseFilter(
         this.indexPattern.fields.getByName(this.fieldName),
         phrases[0],
         this.indexPattern);
     } else {
-      newFilter = buildPhrasesFilter(
+      newFilter = esFilters.buildPhrasesFilter(
         this.indexPattern.fields.getByName(this.fieldName),
         phrases,
         this.indexPattern);
@@ -107,12 +103,12 @@ export class PhraseFilterManager extends FilterManager {
     }
 
     // single phrase filter
-    if (isPhraseFilter(kbnFilter)) {
-      if (getPhraseFilterField(kbnFilter) !== this.fieldName) {
+    if (esFilters.isPhraseFilter(kbnFilter)) {
+      if (esFilters.getPhraseFilterField(kbnFilter) !== this.fieldName) {
         return;
       }
 
-      return getPhraseFilterValue(kbnFilter);
+      return esFilters.getPhraseFilterValue(kbnFilter);
     }
 
     // single phrase filter from bool filter
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js
index 1c8f5e2aa5a3e3..3a232fd8b543d7 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js
+++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import { FilterManager } from './filter_manager.js';
-import { buildRangeFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 // Convert slider value into ES range filter
 function toRange(sliderValue) {
@@ -55,7 +55,7 @@ export class RangeFilterManager extends FilterManager {
    * @return {object} range filter
    */
   createFilter(value) {
-    const newFilter = buildRangeFilter(
+    const newFilter = esFilters.buildRangeFilter(
       this.indexPattern.fields.getByName(this.fieldName),
       toRange(value),
       this.indexPattern);
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js
index 44c68c84579c6f..86fe6db9b0778e 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js
+++ b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js
@@ -26,6 +26,7 @@ import {
 import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
 import { createSearchSource } from './create_search_source';
 import { i18n } from '@kbn/i18n';
+import { npStart } from 'ui/new_platform';
 import chrome from 'ui/chrome';
 import { start as data } from '../../../../core_plugins/data/public/legacy';
 
@@ -187,9 +188,10 @@ export async function listControlFactory(controlParams, useTimeFilter, SearchSou
     // ignore not found error and return control so it can be displayed in disabled state.
   }
 
+  const { filterManager } = npStart.plugins.data.query;
   return new ListControl(
     controlParams,
-    new PhraseFilterManager(controlParams.id, controlParams.fieldName, indexPattern, data.filter.filterManager),
+    new PhraseFilterManager(controlParams.id, controlParams.fieldName, indexPattern, filterManager),
     useTimeFilter,
     SearchSource,
   );
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js
index d5c23c2c1c8551..b40a9f8e6efd40 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js
+++ b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js
@@ -24,6 +24,28 @@ jest.mock('ui/timefilter', () => ({
   createFilter: jest.fn(),
 }));
 
+jest.mock('ui/new_platform', () => ({
+  npStart: {
+    plugins: {
+      data: {
+        query: {
+          filterManager: {
+            fieldName: 'myNumberField',
+            getIndexPattern: () => ({
+              fields: { getByName: name => {
+                const fields = { myField: { name: 'myField' } };
+                return fields[name];
+              } }
+            }),
+            getAppFilters: jest.fn().mockImplementation(() => ([])),
+            getGlobalFilters: jest.fn().mockImplementation(() => ([])),
+          }
+        }
+      }
+    },
+  },
+}));
+
 jest.mock('../../../../core_plugins/data/public/legacy', () => ({
   start: {
     indexPatterns: {
@@ -36,19 +58,6 @@ jest.mock('../../../../core_plugins/data/public/legacy', () => ({
         }),
       }
     },
-    filter: {
-      filterManager: {
-        fieldName: 'myNumberField',
-        getIndexPattern: () => ({
-          fields: { getByName: name => {
-            const fields = { myField: { name: 'myField' } };
-            return fields[name];
-          } }
-        }),
-        getAppFilters: jest.fn().mockImplementation(() => ([])),
-        getGlobalFilters: jest.fn().mockImplementation(() => ([])),
-      }
-    }
   }
 }));
 
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js
index efb208bd800453..2a05a1224aab98 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js
+++ b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js
@@ -27,6 +27,7 @@ import { RangeFilterManager } from './filter_manager/range_filter_manager';
 import { createSearchSource } from './create_search_source';
 import { i18n } from '@kbn/i18n';
 import { start as data } from '../../../../core_plugins/data/public/legacy';
+import { npStart } from 'ui/new_platform';
 
 const minMaxAgg = (field) => {
   const aggBody = {};
@@ -106,9 +107,10 @@ export async function rangeControlFactory(controlParams, useTimeFilter, SearchSo
   } catch (err) {
     // ignore not found error and return control so it can be displayed in disabled state.
   }
+  const { filterManager } = npStart.plugins.data.query;
   return new RangeControl(
     controlParams,
-    new RangeFilterManager(controlParams.id, controlParams.fieldName, indexPattern, data.filter.filterManager),
+    new RangeFilterManager(controlParams.id, controlParams.fieldName, indexPattern, filterManager),
     useTimeFilter,
     SearchSource,
   );
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.js b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.js
index c746d116c70b21..3e6d6a49a11184 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.js
+++ b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.js
@@ -32,6 +32,28 @@ jest.mock('ui/timefilter', () => ({
   createFilter: jest.fn(),
 }));
 
+jest.mock('ui/new_platform', () => ({
+  npStart: {
+    plugins: {
+      data: {
+        query: {
+          filterManager: {
+            fieldName: 'myNumberField',
+            getIndexPattern: () => ({
+              fields: { getByName: name => {
+                const fields = { myNumberField: { name: 'myNumberField' } };
+                return fields[name];
+              }
+              } }),
+            getAppFilters: jest.fn().mockImplementation(() => ([])),
+            getGlobalFilters: jest.fn().mockImplementation(() => ([])),
+          }
+        }
+      }
+    },
+  },
+}));
+
 jest.mock('../../../../core_plugins/data/public/legacy', () => ({
   start: {
     indexPatterns: {
@@ -44,19 +66,6 @@ jest.mock('../../../../core_plugins/data/public/legacy', () => ({
           } }),
       }
     },
-    filter: {
-      filterManager: {
-        fieldName: 'myNumberField',
-        getIndexPattern: () => ({
-          fields: { getByName: name => {
-            const fields = { myNumberField: { name: 'myNumberField' } };
-            return fields[name];
-          }
-          } }),
-        getAppFilters: jest.fn().mockImplementation(() => ([])),
-        getGlobalFilters: jest.fn().mockImplementation(() => ([])),
-      }
-    }
   }
 }));
 
diff --git a/src/legacy/core_plugins/input_control_vis/public/vis_controller.js b/src/legacy/core_plugins/input_control_vis/public/vis_controller.js
index 1edf5652a76c53..792ff3fe85479f 100644
--- a/src/legacy/core_plugins/input_control_vis/public/vis_controller.js
+++ b/src/legacy/core_plugins/input_control_vis/public/vis_controller.js
@@ -23,7 +23,7 @@ import { I18nContext } from 'ui/i18n';
 import { InputControlVis } from './components/vis/input_control_vis';
 import { controlFactory } from './control/control_factory';
 import { getLineageMap } from './lineage';
-import { start as data } from '../../../core_plugins/data/public/legacy';
+import { npStart } from 'ui/new_platform';
 import { SearchSource } from '../../../ui/public/courier/search_source/search_source';
 
 class VisController {
@@ -34,7 +34,7 @@ class VisController {
 
     this.queryBarUpdateHandler = this.updateControlsFromKbn.bind(this);
 
-    this.filterManager = data.filter.filterManager;
+    this.filterManager = npStart.plugins.data.query.filterManager;
     this.updateSubsciption = this.filterManager.getUpdates$()
       .subscribe(this.queryBarUpdateHandler);
   }
diff --git a/src/legacy/core_plugins/interpreter/common/index.ts b/src/legacy/core_plugins/interpreter/common/index.ts
index 0251faa69fccf3..8a54741e9d3e1b 100644
--- a/src/legacy/core_plugins/interpreter/common/index.ts
+++ b/src/legacy/core_plugins/interpreter/common/index.ts
@@ -36,7 +36,8 @@ export {
   PointSeriesColumn,
   PointSeriesColumnName,
   Render,
+  ExpressionTypeStyle,
   Style,
   Type,
-} from '../../../../plugins/expressions/common';
+} from '../../../../plugins/expressions/public';
 export const API_ROUTE = '/api/interpreter';
diff --git a/src/legacy/core_plugins/interpreter/common/lib/fonts.ts b/src/legacy/core_plugins/interpreter/common/lib/fonts.ts
index cdf3d4c16f3b57..1594f42abf2eba 100644
--- a/src/legacy/core_plugins/interpreter/common/lib/fonts.ts
+++ b/src/legacy/core_plugins/interpreter/common/lib/fonts.ts
@@ -17,135 +17,5 @@
  * under the License.
  */
 
-/**
- * This type contains a unions of all supported font labels, or the the name of
- * the font the user would see in a UI.
- */
-export type FontLabel = typeof fonts[number]['label'];
-
-/**
- * This type contains a union of all supported font values, equivalent to the CSS
- * `font-value` property.
- */
-export type FontValue = typeof fonts[number]['value'];
-
-/**
- * An interface representing a font in Canvas, with a textual label and the CSS
- * `font-value`.
- */
-export interface Font {
-  label: FontLabel;
-  value: FontValue;
-}
-
-// This function allows one to create a strongly-typed font for inclusion in
-// the font collection.  As a result, the values and labels are known to the
-// type system, preventing one from specifying a non-existent font at build
-// time.
-function createFont<
-  RawFont extends { value: RawFontValue; label: RawFontLabel },
-  RawFontValue extends string,
-  RawFontLabel extends string
->(font: RawFont) {
-  return font;
-}
-
-export const americanTypewriter = createFont({
-  label: 'American Typewriter',
-  value: "'American Typewriter', 'Courier New', Courier, Monaco, mono",
-});
-
-export const arial = createFont({ label: 'Arial', value: 'Arial, sans-serif' });
-
-export const baskerville = createFont({
-  label: 'Baskerville',
-  value: "Baskerville, Georgia, Garamond, 'Times New Roman', Times, serif",
-});
-
-export const bookAntiqua = createFont({
-  label: 'Book Antiqua',
-  value: "'Book Antiqua', Georgia, Garamond, 'Times New Roman', Times, serif",
-});
-
-export const brushScript = createFont({
-  label: 'Brush Script',
-  value: "'Brush Script MT', 'Comic Sans', sans-serif",
-});
-
-export const chalkboard = createFont({
-  label: 'Chalkboard',
-  value: "Chalkboard, 'Comic Sans', sans-serif",
-});
-
-export const didot = createFont({
-  label: 'Didot',
-  value: "Didot, Georgia, Garamond, 'Times New Roman', Times, serif",
-});
-
-export const futura = createFont({
-  label: 'Futura',
-  value: 'Futura, Impact, Helvetica, Arial, sans-serif',
-});
-
-export const gillSans = createFont({
-  label: 'Gill Sans',
-  value:
-    "'Gill Sans', 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, Arial, sans-serif",
-});
-
-export const helveticaNeue = createFont({
-  label: 'Helvetica Neue',
-  value: "'Helvetica Neue', Helvetica, Arial, sans-serif",
-});
-
-export const hoeflerText = createFont({
-  label: 'Hoefler Text',
-  value: "'Hoefler Text', Garamond, Georgia, 'Times New Roman', Times, serif",
-});
-
-export const lucidaGrande = createFont({
-  label: 'Lucida Grande',
-  value: "'Lucida Grande', 'Lucida Sans Unicode', Lucida, Verdana, Helvetica, Arial, sans-serif",
-});
-
-export const myriad = createFont({
-  label: 'Myriad',
-  value: 'Myriad, Helvetica, Arial, sans-serif',
-});
-
-export const openSans = createFont({
-  label: 'Open Sans',
-  value: "'Open Sans', Helvetica, Arial, sans-serif",
-});
-
-export const optima = createFont({
-  label: 'Optima',
-  value: "Optima, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, Arial, sans-serif",
-});
-
-export const palatino = createFont({
-  label: 'Palatino',
-  value: "Palatino, 'Book Antiqua', Georgia, Garamond, 'Times New Roman', Times, serif",
-});
-
-/**
- * A collection of supported fonts.
- */
-export const fonts = [
-  americanTypewriter,
-  arial,
-  baskerville,
-  bookAntiqua,
-  brushScript,
-  chalkboard,
-  didot,
-  futura,
-  gillSans,
-  helveticaNeue,
-  hoeflerText,
-  lucidaGrande,
-  myriad,
-  openSans,
-  optima,
-  palatino,
-];
+// eslint-disable-next-line
+export * from '../../../../../plugins/expressions/public/fonts';
diff --git a/src/legacy/core_plugins/interpreter/init.ts b/src/legacy/core_plugins/interpreter/init.ts
index fc93346f280249..f09ffd4697e74e 100644
--- a/src/legacy/core_plugins/interpreter/init.ts
+++ b/src/legacy/core_plugins/interpreter/init.ts
@@ -25,7 +25,7 @@ import { register, registryFactory, Registry, Fn } from '@kbn/interpreter/common
 // @ts-ignore
 import { routes } from './server/routes';
 
-import { typeSpecs as types } from '../../../plugins/expressions/common';
+import { typeSpecs as types } from '../../../plugins/expressions/public';
 
 import { Type } from './common';
 import { Legacy } from '../../../../kibana';
diff --git a/src/legacy/core_plugins/interpreter/public/functions/clog.ts b/src/legacy/core_plugins/interpreter/public/functions/clog.ts
index 586584b498ac72..65362fe3633745 100644
--- a/src/legacy/core_plugins/interpreter/public/functions/clog.ts
+++ b/src/legacy/core_plugins/interpreter/public/functions/clog.ts
@@ -17,19 +17,5 @@
  * under the License.
  */
 
-import { ExpressionFunction } from '../../types';
-
-const name = 'clog';
-
-type Context = any;
-type ClogExpressionFunction = ExpressionFunction<typeof name, Context, {}, Context>;
-
-export const clog = (): ClogExpressionFunction => ({
-  name,
-  args: {},
-  help: 'Outputs the context to the console',
-  fn: context => {
-    console.log(context); // eslint-disable-line no-console
-    return context;
-  },
-});
+// eslint-disable-next-line
+export * from '../../../../../plugins/expressions/public/functions/clog';
diff --git a/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts b/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts
index 6fcfde0a5b06b5..d232a97c3c34c4 100644
--- a/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts
+++ b/src/legacy/core_plugins/interpreter/public/functions/esaggs.ts
@@ -19,18 +19,12 @@
 
 import { get, has } from 'lodash';
 import { i18n } from '@kbn/i18n';
-// @ts-ignore
 import { AggConfigs } from 'ui/agg_types/agg_configs';
 import { createFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import chrome from 'ui/chrome';
-
-// need to get rid of angular from these
-// @ts-ignore
 import { TimeRange } from 'src/plugins/data/public';
 import { SearchSource } from '../../../../ui/public/courier/search_source';
-// @ts-ignore
 import { FilterBarQueryFilterProvider } from '../../../../ui/public/filter_manager/query_filter';
-
 import { buildTabularInspectorData } from '../../../../ui/public/inspector/build_tabular_inspector_data';
 import {
   getRequestInspectorStats,
@@ -39,12 +33,15 @@ import {
 import { calculateObjectHash } from '../../../../ui/public/vis/lib/calculate_object_hash';
 import { getTime } from '../../../../ui/public/timefilter';
 import { RequestHandlerParams } from '../../../../ui/public/visualize/loader/embedded_visualize_handler';
-// @ts-ignore
-import { tabifyAggResponse } from '../../../../ui/public/agg_response/tabify/tabify';
 import { KibanaContext, KibanaDatatable } from '../../common';
 import { ExpressionFunction, KibanaDatatableColumn } from '../../types';
 import { start as data } from '../../../data/public/legacy';
 
+// @ts-ignore
+import { tabifyAggResponse } from '../../../../ui/public/agg_response/tabify/tabify';
+// @ts-ignore
+import { SearchSourceProvider } from '../../../../ui/public/courier/search_source';
+
 const name = 'esaggs';
 
 type Context = KibanaContext | null;
diff --git a/src/legacy/core_plugins/interpreter/public/functions/font.ts b/src/legacy/core_plugins/interpreter/public/functions/font.ts
index 5cd5add318e26c..2f3bc1ff37e2c4 100644
--- a/src/legacy/core_plugins/interpreter/public/functions/font.ts
+++ b/src/legacy/core_plugins/interpreter/public/functions/font.ts
@@ -17,161 +17,5 @@
  * under the License.
  */
 
-// @ts-ignore no @typed def
-import inlineStyle from 'inline-style';
-import { i18n } from '@kbn/i18n';
-import { openSans } from '../../common/lib/fonts';
-import { ExpressionFunction } from '../../types';
-import {
-  CSSStyle,
-  FontFamily,
-  FontStyle,
-  FontWeight,
-  Style,
-  TextAlignment,
-  TextDecoration,
-} from '../types';
-
-interface Arguments {
-  align?: TextAlignment;
-  color?: string;
-  family?: FontFamily;
-  italic?: boolean;
-  lHeight?: number | null;
-  size?: number;
-  underline?: boolean;
-  weight?: FontWeight;
-}
-
-export function font(): ExpressionFunction<'font', null, Arguments, Style> {
-  return {
-    name: 'font',
-    aliases: [],
-    type: 'style',
-    help: i18n.translate('interpreter.functions.fontHelpText', {
-      defaultMessage: 'Create a font style.',
-    }),
-    context: {
-      types: ['null'],
-    },
-    args: {
-      align: {
-        default: 'left',
-        help: i18n.translate('interpreter.functions.font.args.alignHelpText', {
-          defaultMessage: 'The horizontal text alignment.',
-        }),
-        options: Object.values(TextAlignment),
-        types: ['string'],
-      },
-      color: {
-        help: i18n.translate('interpreter.functions.font.args.colorHelpText', {
-          defaultMessage: 'The text color.',
-        }),
-        types: ['string'],
-      },
-      family: {
-        default: `"${openSans.value}"`,
-        help: i18n.translate('interpreter.functions.font.args.familyHelpText', {
-          defaultMessage: 'An acceptable {css} web font string',
-          values: {
-            css: 'CSS',
-          },
-        }),
-        types: ['string'],
-      },
-      italic: {
-        default: false,
-        help: i18n.translate('interpreter.functions.font.args.italicHelpText', {
-          defaultMessage: 'Italicize the text?',
-        }),
-        options: [true, false],
-        types: ['boolean'],
-      },
-      lHeight: {
-        default: null,
-        aliases: ['lineHeight'],
-        help: i18n.translate('interpreter.functions.font.args.lHeightHelpText', {
-          defaultMessage: 'The line height in pixels',
-        }),
-        types: ['number', 'null'],
-      },
-      size: {
-        default: 14,
-        help: i18n.translate('interpreter.functions.font.args.sizeHelpText', {
-          defaultMessage: 'The font size in pixels',
-        }),
-        types: ['number'],
-      },
-      underline: {
-        default: false,
-        help: i18n.translate('interpreter.functions.font.args.underlineHelpText', {
-          defaultMessage: 'Underline the text?',
-        }),
-        options: [true, false],
-        types: ['boolean'],
-      },
-      weight: {
-        default: 'normal',
-        help: i18n.translate('interpreter.functions.font.args.weightHelpText', {
-          defaultMessage: 'The font weight. For example, {list}, or {end}.',
-          values: {
-            list: Object.values(FontWeight)
-              .slice(0, -1)
-              .map(weight => `\`"${weight}"\``)
-              .join(', '),
-            end: `\`"${Object.values(FontWeight).slice(-1)[0]}"\``,
-          },
-        }),
-        options: Object.values(FontWeight),
-        types: ['string'],
-      },
-    },
-    fn: (_context, args) => {
-      if (!Object.values(FontWeight).includes(args.weight!)) {
-        throw new Error(
-          i18n.translate('interpreter.functions.font.invalidFontWeightErrorMessage', {
-            defaultMessage: "Invalid font weight: '{weight}'",
-            values: {
-              weight: args.weight,
-            },
-          })
-        );
-      }
-      if (!Object.values(TextAlignment).includes(args.align!)) {
-        throw new Error(
-          i18n.translate('interpreter.functions.font.invalidTextAlignmentErrorMessage', {
-            defaultMessage: "Invalid text alignment: '{align}'",
-            values: {
-              align: args.align,
-            },
-          })
-        );
-      }
-
-      // the line height shouldn't ever be lower than the size, and apply as a
-      // pixel setting
-      const lineHeight = args.lHeight != null ? `${args.lHeight}px` : '1';
-
-      const spec: CSSStyle = {
-        fontFamily: args.family,
-        fontWeight: args.weight,
-        fontStyle: args.italic ? FontStyle.ITALIC : FontStyle.NORMAL,
-        textDecoration: args.underline ? TextDecoration.UNDERLINE : TextDecoration.NONE,
-        textAlign: args.align,
-        fontSize: `${args.size}px`, // apply font size as a pixel setting
-        lineHeight, // apply line height as a pixel setting
-      };
-
-      // conditionally apply styles based on input
-      if (args.color) {
-        spec.color = args.color;
-      }
-
-      return {
-        type: 'style',
-        spec,
-        css: inlineStyle(spec),
-      };
-    },
-  };
-}
+// eslint-disable-next-line
+export * from '../../../../../plugins/expressions/public/functions/font';
diff --git a/src/legacy/core_plugins/interpreter/public/functions/index.ts b/src/legacy/core_plugins/interpreter/public/functions/index.ts
deleted file mode 100644
index d86f033acb3d13..00000000000000
--- a/src/legacy/core_plugins/interpreter/public/functions/index.ts
+++ /dev/null
@@ -1,38 +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 { clog } from './clog';
-import { esaggs } from './esaggs';
-import { font } from './font';
-import { kibana } from './kibana';
-import { kibanaContext } from './kibana_context';
-import { range } from './range';
-import { visualization } from './visualization';
-import { visDimension } from './vis_dimension';
-
-export const functions = [
-  clog,
-  esaggs,
-  font,
-  kibana,
-  kibanaContext,
-  range,
-  visualization,
-  visDimension,
-];
diff --git a/src/legacy/core_plugins/interpreter/public/functions/kibana.ts b/src/legacy/core_plugins/interpreter/public/functions/kibana.ts
index c027b220ad0d0c..7da284d9672a55 100644
--- a/src/legacy/core_plugins/interpreter/public/functions/kibana.ts
+++ b/src/legacy/core_plugins/interpreter/public/functions/kibana.ts
@@ -17,47 +17,5 @@
  * under the License.
  */
 
-import { i18n } from '@kbn/i18n';
-import { ExpressionFunction, KibanaContext } from '../../types';
-
-export type ExpressionFunctionKibana = ExpressionFunction<
-  'kibana',
-  KibanaContext | null,
-  object,
-  KibanaContext
->;
-
-export const kibana = (): ExpressionFunctionKibana => ({
-  name: 'kibana',
-  type: 'kibana_context',
-
-  context: {
-    types: ['kibana_context', 'null'],
-  },
-
-  help: i18n.translate('interpreter.functions.kibana.help', {
-    defaultMessage: 'Gets kibana global context',
-  }),
-  args: {},
-  fn(context, args, handlers) {
-    const initialContext = handlers.getInitialContext ? handlers.getInitialContext() : {};
-
-    if (context && context.query) {
-      initialContext.query = initialContext.query.concat(context.query);
-    }
-
-    if (context && context.filters) {
-      initialContext.filters = initialContext.filters.concat(context.filters);
-    }
-
-    const timeRange = initialContext.timeRange || (context ? context.timeRange : undefined);
-
-    return {
-      ...context,
-      type: 'kibana_context',
-      query: initialContext.query,
-      filters: initialContext.filters,
-      timeRange,
-    };
-  },
-});
+// eslint-disable-next-line
+export * from '../../../../../plugins/expressions/public/functions/kibana';
diff --git a/src/legacy/core_plugins/interpreter/public/functions/kibana_context.ts b/src/legacy/core_plugins/interpreter/public/functions/kibana_context.ts
deleted file mode 100644
index 1ba7b450c5409a..00000000000000
--- a/src/legacy/core_plugins/interpreter/public/functions/kibana_context.ts
+++ /dev/null
@@ -1,114 +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 chrome from 'ui/chrome';
-import { i18n } from '@kbn/i18n';
-import { ExpressionFunction, KibanaContext } from '../../types';
-
-interface Arguments {
-  q?: string | null;
-  filters?: string | null;
-  timeRange?: string | null;
-  savedSearchId?: string | null;
-}
-
-export type ExpressionFunctionKibanaContext = ExpressionFunction<
-  'kibana_context',
-  KibanaContext | null,
-  Arguments,
-  Promise<KibanaContext>
->;
-
-export const kibanaContext = (): ExpressionFunctionKibanaContext => ({
-  name: 'kibana_context',
-  type: 'kibana_context',
-  context: {
-    types: ['kibana_context', 'null'],
-  },
-  help: i18n.translate('interpreter.functions.kibana_context.help', {
-    defaultMessage: 'Updates kibana global context',
-  }),
-  args: {
-    q: {
-      types: ['string', 'null'],
-      aliases: ['query', '_'],
-      default: null,
-      help: i18n.translate('interpreter.functions.kibana_context.q.help', {
-        defaultMessage: 'Specify Kibana free form text query',
-      }),
-    },
-    filters: {
-      types: ['string', 'null'],
-      default: '"[]"',
-      help: i18n.translate('interpreter.functions.kibana_context.filters.help', {
-        defaultMessage: 'Specify Kibana generic filters',
-      }),
-    },
-    timeRange: {
-      types: ['string', 'null'],
-      default: null,
-      help: i18n.translate('interpreter.functions.kibana_context.timeRange.help', {
-        defaultMessage: 'Specify Kibana time range filter',
-      }),
-    },
-    savedSearchId: {
-      types: ['string', 'null'],
-      default: null,
-      help: i18n.translate('interpreter.functions.kibana_context.savedSearchId.help', {
-        defaultMessage: 'Specify saved search ID to be used for queries and filters',
-      }),
-    },
-  },
-  async fn(context, args, handlers) {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
-    const savedSearches = $injector.get('savedSearches') as any;
-    const queryArg = args.q ? JSON.parse(args.q) : [];
-    let queries = Array.isArray(queryArg) ? queryArg : [queryArg];
-    let filters = args.filters ? JSON.parse(args.filters) : [];
-
-    if (args.savedSearchId) {
-      const savedSearch = await savedSearches.get(args.savedSearchId);
-      const searchQuery = savedSearch.searchSource.getField('query');
-      const searchFilters = savedSearch.searchSource.getField('filter');
-      queries = queries.concat(searchQuery);
-      filters = filters.concat(searchFilters);
-    }
-
-    if (context && context.query) {
-      queries = queries.concat(context.query);
-    }
-
-    if (context && context.filters) {
-      filters = filters.concat(context.filters).filter((f: any) => !f.meta.disabled);
-    }
-
-    const timeRange = args.timeRange
-      ? JSON.parse(args.timeRange)
-      : context
-      ? context.timeRange
-      : undefined;
-
-    return {
-      type: 'kibana_context',
-      query: queries,
-      filters,
-      timeRange,
-    };
-  },
-});
diff --git a/src/legacy/core_plugins/interpreter/public/functions/range.ts b/src/legacy/core_plugins/interpreter/public/functions/range.ts
index 8ae07dd82a22c0..322bda983a8ff8 100644
--- a/src/legacy/core_plugins/interpreter/public/functions/range.ts
+++ b/src/legacy/core_plugins/interpreter/public/functions/range.ts
@@ -17,48 +17,5 @@
  * under the License.
  */
 
-import { i18n } from '@kbn/i18n';
-import { KibanaDatatable, Range } from '../../types';
-import { ExpressionFunction } from '../../types';
-
-const name = 'range';
-
-type Context = KibanaDatatable | null;
-
-interface Arguments {
-  from: number;
-  to: number;
-}
-
-type Return = Range; // imported from type
-
-export const range = (): ExpressionFunction<typeof name, Context, Arguments, Return> => ({
-  name,
-  help: i18n.translate('interpreter.function.range.help', {
-    defaultMessage: 'Generates range object',
-  }),
-  type: 'range',
-  args: {
-    from: {
-      types: ['number'],
-      help: i18n.translate('interpreter.function.range.from.help', {
-        defaultMessage: 'Start of range',
-      }),
-      required: true,
-    },
-    to: {
-      types: ['number'],
-      help: i18n.translate('interpreter.function.range.to.help', {
-        defaultMessage: 'End of range',
-      }),
-      required: true,
-    },
-  },
-  fn: (context, args) => {
-    return {
-      type: 'range',
-      from: args.from,
-      to: args.to,
-    };
-  },
-});
+// eslint-disable-next-line
+export * from '../../../../../plugins/visualizations/public/expression_functions/range';
diff --git a/src/legacy/core_plugins/interpreter/public/functions/vis_dimension.ts b/src/legacy/core_plugins/interpreter/public/functions/vis_dimension.ts
index 4190a597b0120f..d4ebeeb5267e1b 100644
--- a/src/legacy/core_plugins/interpreter/public/functions/vis_dimension.ts
+++ b/src/legacy/core_plugins/interpreter/public/functions/vis_dimension.ts
@@ -17,73 +17,5 @@
  * under the License.
  */
 
-import { i18n } from '@kbn/i18n';
-import { ExpressionFunction, KibanaDatatable } from '../../types';
-
-const name = 'visdimension';
-
-type Context = KibanaDatatable | null;
-
-interface Arguments {
-  accessor: string | number;
-  format?: string;
-  formatParams?: string;
-}
-
-type Return = any;
-
-export const visDimension = (): ExpressionFunction<typeof name, Context, Arguments, Return> => ({
-  name: 'visdimension',
-  help: i18n.translate('interpreter.function.visDimension.help', {
-    defaultMessage: 'Generates visConfig dimension object',
-  }),
-  type: 'vis_dimension',
-  context: {
-    types: ['kibana_datatable'],
-  },
-  args: {
-    accessor: {
-      types: ['string', 'number'],
-      aliases: ['_'],
-      help: i18n.translate('interpreter.function.visDimension.accessor.help', {
-        defaultMessage: 'Column in your dataset to use (either column index or column name)',
-      }),
-    },
-    format: {
-      types: ['string'],
-      default: 'string',
-      help: i18n.translate('interpreter.function.visDimension.format.help', {
-        defaultMessage: 'Format',
-      }),
-    },
-    formatParams: {
-      types: ['string'],
-      default: '"{}"',
-      help: i18n.translate('interpreter.function.visDimension.formatParams.help', {
-        defaultMessage: 'Format params',
-      }),
-    },
-  },
-  fn: (context, args) => {
-    const accessor =
-      typeof args.accessor === 'number'
-        ? args.accessor
-        : context!.columns.find(c => c.id === args.accessor);
-    if (accessor === undefined) {
-      throw new Error(
-        i18n.translate('interpreter.function.visDimension.error.accessor', {
-          defaultMessage: 'Column name provided is invalid',
-        })
-      );
-    }
-
-    return {
-      type: 'vis_dimension',
-      accessor,
-      format: {
-        id: args.format,
-        params: JSON.parse(args.formatParams!),
-      },
-    };
-  },
-});
+// eslint-disable-next-line
+export * from '../../../../../plugins/visualizations/public/expression_functions/vis_dimension';
diff --git a/src/legacy/core_plugins/interpreter/public/interpreter.test.ts b/src/legacy/core_plugins/interpreter/public/interpreter.test.ts
deleted file mode 100644
index 429a943c3ff362..00000000000000
--- a/src/legacy/core_plugins/interpreter/public/interpreter.test.ts
+++ /dev/null
@@ -1,120 +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.
- */
-
-jest.mock('ui/new_platform', () => ({
-  npSetup: {
-    core: {
-      http: {},
-      injectedMetadata: {
-        getKibanaVersion: () => '8.0.0',
-        getBasePath: () => '/lol',
-      },
-    },
-  },
-}));
-jest.mock('uiExports/interpreter');
-
-jest.mock('@kbn/interpreter/common', () => ({
-  register: jest.fn(),
-  registryFactory: jest.fn(),
-}));
-
-const mockExecutor = {
-  interpreter: {
-    interpretAst: jest.fn(),
-  },
-};
-jest.mock('./lib/interpreter', () => ({
-  initializeExecutor: jest.fn().mockReturnValue(Promise.resolve(mockExecutor)),
-}));
-
-jest.mock('./registries', () => ({
-  registries: {
-    browserFunctions: jest.fn(),
-    renderers: jest.fn(),
-    types: jest.fn(),
-  },
-}));
-
-jest.mock('../../../ui/public/new_platform');
-jest.mock('./functions', () => ({ functions: [{}, {}, {}] }));
-jest.mock('./renderers/visualization', () => ({ visualization: {} }));
-
-describe('interpreter/interpreter', () => {
-  let getInterpreter: any;
-  let interpretAst: any;
-  let initializeExecutor: any;
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    jest.resetModules();
-    getInterpreter = require('./interpreter').getInterpreter;
-    interpretAst = require('./interpreter').interpretAst;
-    initializeExecutor = require('./lib/interpreter').initializeExecutor;
-  });
-
-  describe('getInterpreter', () => {
-    it('initializes interpreter', async () => {
-      await getInterpreter();
-      expect(initializeExecutor).toHaveBeenCalledTimes(1);
-    });
-
-    it('only initializes interpreter once', async () => {
-      await getInterpreter();
-      await getInterpreter();
-      expect(initializeExecutor).toHaveBeenCalledTimes(1);
-    });
-
-    it('resolves', async () => {
-      await expect(getInterpreter()).resolves;
-    });
-
-    it('resolves with interpreter object', async () => {
-      const interpreter = await getInterpreter();
-      await expect(Object.keys(interpreter)).toEqual(['interpreter']);
-    });
-  });
-
-  describe('interpretAst', () => {
-    it('resolves', async () => {
-      const params = [{}];
-      await expect(interpretAst(...params)).resolves;
-    });
-
-    it('initializes interpreter if needed', async () => {
-      const params = [{}];
-      await interpretAst(...params);
-      expect(initializeExecutor).toHaveBeenCalledTimes(1);
-    });
-
-    it('calls interpreter.interpretAst with the provided params', async () => {
-      const params = [{}];
-      await interpretAst(...params);
-      expect(mockExecutor.interpreter.interpretAst).toHaveBeenCalledTimes(1);
-      expect(mockExecutor.interpreter.interpretAst).toHaveBeenCalledWith({}, undefined, undefined);
-    });
-
-    it('calls interpreter.interpretAst each time', async () => {
-      const params = [{}];
-      await interpretAst(...params);
-      await interpretAst(...params);
-      expect(mockExecutor.interpreter.interpretAst).toHaveBeenCalledTimes(2);
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/interpreter/public/interpreter.ts b/src/legacy/core_plugins/interpreter/public/interpreter.ts
index 1f0f8141345d20..a337f7e4ebfea2 100644
--- a/src/legacy/core_plugins/interpreter/public/interpreter.ts
+++ b/src/legacy/core_plugins/interpreter/public/interpreter.ts
@@ -20,38 +20,42 @@
 import 'uiExports/interpreter';
 // @ts-ignore
 import { register, registryFactory } from '@kbn/interpreter/common';
-import {
-  initializeExecutor,
-  ExpressionExecutor,
-  ExpressionInterpretWithHandlers,
-} from './lib/interpreter';
+import { npSetup } from 'ui/new_platform';
 import { registries } from './registries';
-import { functions } from './functions';
 import { visualization } from './renderers/visualization';
-import { typeSpecs } from '../../../../plugins/expressions/common';
+import {
+  ExpressionInterpretWithHandlers,
+  ExpressionExecutor,
+} from '../../../../plugins/expressions/public';
+import { esaggs as esaggsFn } from './functions/esaggs';
+import { visualization as visualizationFn } from './functions/visualization';
 
 // Expose kbnInterpreter.register(specs) and kbnInterpreter.registries() globally so that plugins
 // can register without a transpile step.
+// TODO: This will be left behind in then legacy platform?
 (global as any).kbnInterpreter = Object.assign(
   (global as any).kbnInterpreter || {},
   registryFactory(registries)
 );
 
-register(registries, {
-  types: typeSpecs,
-  browserFunctions: functions,
-  renderers: [visualization],
-});
+// TODO: This needs to be moved to `data` plugin Search service.
+registries.browserFunctions.register(esaggsFn);
 
-let executorPromise: Promise<ExpressionExecutor> | undefined;
+// TODO: This needs to be moved to `visualizations` plugin.
+registries.browserFunctions.register(visualizationFn);
+registries.renderers.register(visualization);
 
+// TODO: This function will be left behind in the legacy platform.
+let executorPromise: Promise<ExpressionExecutor> | undefined;
 export const getInterpreter = async () => {
   if (!executorPromise) {
-    executorPromise = initializeExecutor();
+    const executor = npSetup.plugins.expressions.__LEGACY.getExecutor();
+    executorPromise = Promise.resolve(executor);
   }
   return await executorPromise;
 };
 
+// TODO: This function will be left behind in the legacy platform.
 export const interpretAst: ExpressionInterpretWithHandlers = async (ast, context, handlers) => {
   const { interpreter } = await getInterpreter();
   return await interpreter.interpretAst(ast, context, handlers);
diff --git a/src/legacy/core_plugins/interpreter/public/lib/create_handlers.ts b/src/legacy/core_plugins/interpreter/public/lib/create_handlers.ts
index 46e85411c58956..c14272fbf8def5 100644
--- a/src/legacy/core_plugins/interpreter/public/lib/create_handlers.ts
+++ b/src/legacy/core_plugins/interpreter/public/lib/create_handlers.ts
@@ -17,8 +17,5 @@
  * under the License.
  */
 
-export function createHandlers() {
-  return {
-    environment: 'client',
-  };
-}
+// eslint-disable-next-line
+export * from '../../../../../plugins/expressions/public/create_handlers';
diff --git a/src/legacy/core_plugins/interpreter/public/lib/interpreter.ts b/src/legacy/core_plugins/interpreter/public/lib/interpreter.ts
deleted file mode 100644
index 399ecc59502681..00000000000000
--- a/src/legacy/core_plugins/interpreter/public/lib/interpreter.ts
+++ /dev/null
@@ -1,51 +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 { ExpressionInterpret } from 'src/plugins/expressions/common/expressions/interpreter_provider';
-import { interpreterProvider } from '../../common';
-import { createHandlers } from './create_handlers';
-import { registries } from '../registries';
-import { FunctionHandlers } from '../../types';
-
-export type ExpressionInterpretWithHandlers = (
-  ast: Parameters<ExpressionInterpret>[0],
-  context: Parameters<ExpressionInterpret>[1],
-  handlers: FunctionHandlers
-) => ReturnType<ExpressionInterpret>;
-
-export interface ExpressionInterpreter {
-  interpretAst: ExpressionInterpretWithHandlers;
-}
-
-export interface ExpressionExecutor {
-  interpreter: ExpressionInterpreter;
-}
-
-export async function initializeExecutor(): Promise<ExpressionExecutor> {
-  const interpretAst: ExpressionInterpretWithHandlers = async (ast, context, handlers) => {
-    const interpret = await interpreterProvider({
-      types: registries.types.toJS(),
-      handlers: { ...handlers, ...createHandlers() },
-      functions: registries.browserFunctions.toJS(),
-    });
-    return interpret(ast, context);
-  };
-
-  return { interpreter: { interpretAst } };
-}
diff --git a/src/legacy/core_plugins/interpreter/public/renderers/visualization.ts b/src/legacy/core_plugins/interpreter/public/renderers/visualization.ts
index 90020f819dbe24..bedba6bfacedec 100644
--- a/src/legacy/core_plugins/interpreter/public/renderers/visualization.ts
+++ b/src/legacy/core_plugins/interpreter/public/renderers/visualization.ts
@@ -38,7 +38,11 @@ export const visualization = () => ({
       // special case in visualize, we need to render first (without executing the expression), for maps to work
       if (visConfig) {
         $rootScope.$apply(() => {
-          handlers.vis.setCurrentState({ type: visType, params: visConfig });
+          handlers.vis.setCurrentState({
+            type: visType,
+            params: visConfig,
+            title: handlers.vis.title,
+          });
         });
       }
     } else {
diff --git a/src/legacy/core_plugins/interpreter/public/types/style.ts b/src/legacy/core_plugins/interpreter/public/types/style.ts
index fd22b9bae2e950..7386048a4ae042 100644
--- a/src/legacy/core_plugins/interpreter/public/types/style.ts
+++ b/src/legacy/core_plugins/interpreter/public/types/style.ts
@@ -17,120 +17,10 @@
  * under the License.
  */
 
-import { FontLabel } from '../../common/lib/fonts';
-export { FontLabel as FontFamily, FontValue } from '../../common/lib/fonts';
-
-/**
- * Enum of supported CSS `background-repeat` properties.
- */
-export enum BackgroundRepeat {
-  REPEAT = 'repeat',
-  REPEAT_NO = 'no-repeat',
-  REPEAT_X = 'repeat-x',
-  REPEAT_Y = 'repeat-y',
-  ROUND = 'round',
-  SPACE = 'space',
-}
-
-/**
- * Enum of supported CSS `background-size` properties.
- */
-export enum BackgroundSize {
-  AUTO = 'auto',
-  CONTAIN = 'contain',
-  COVER = 'cover',
-}
-
-/**
- * Enum of supported CSS `font-style` properties.
- */
-export enum FontStyle {
-  ITALIC = 'italic',
-  NORMAL = 'normal',
-}
-
-/**
- * Enum of supported CSS `font-weight` properties.
- */
-export enum FontWeight {
-  NORMAL = 'normal',
-  BOLD = 'bold',
-  BOLDER = 'bolder',
-  LIGHTER = 'lighter',
-  ONE = '100',
-  TWO = '200',
-  THREE = '300',
-  FOUR = '400',
-  FIVE = '500',
-  SIX = '600',
-  SEVEN = '700',
-  EIGHT = '800',
-  NINE = '900',
-}
-
-/**
- * Enum of supported CSS `overflow` properties.
- */
-export enum Overflow {
-  AUTO = 'auto',
-  HIDDEN = 'hidden',
-  SCROLL = 'scroll',
-  VISIBLE = 'visible',
-}
-
-/**
- * Enum of supported CSS `text-align` properties.
- */
-export enum TextAlignment {
-  CENTER = 'center',
-  JUSTIFY = 'justify',
-  LEFT = 'left',
-  RIGHT = 'right',
-}
-
-/**
- * Enum of supported CSS `text-decoration` properties.
- */
-export enum TextDecoration {
-  NONE = 'none',
-  UNDERLINE = 'underline',
-}
-
-/**
- * Represents the various style properties that can be applied to an element.
- */
-export interface CSSStyle {
-  color?: string;
-  fill?: string;
-  fontFamily?: FontLabel;
-  fontSize?: string;
-  fontStyle?: FontStyle;
-  fontWeight?: FontWeight;
-  lineHeight?: number | string;
-  textAlign?: TextAlignment;
-  textDecoration?: TextDecoration;
-}
-
-/**
- * Represents an object containing style information for a Container.
- */
-export interface ContainerStyle {
-  border: string | null;
-  borderRadius: string | null;
-  padding: string | null;
-  backgroundColor: string | null;
-  backgroundImage: string | null;
-  backgroundSize: BackgroundSize;
-  backgroundRepeat: BackgroundRepeat;
-  opacity: number | null;
-  overflow: Overflow;
-}
-
-/**
- * An object that represents style information, typically CSS.
- */
-export interface Style {
-  type: 'style';
-  spec: CSSStyle;
-  css: string;
-}
+/* eslint-disable */
+export * from '../../../../../plugins/expressions/public/types/style';
+export {
+  FontLabel as FontFamily,
+  FontValue,
+} from '../../../../../plugins/expressions/public/fonts';
+/* eslint-enable */
diff --git a/src/legacy/core_plugins/interpreter/test_helpers.ts b/src/legacy/core_plugins/interpreter/test_helpers.ts
index 1f39a8271367c6..0e34f42b01544f 100644
--- a/src/legacy/core_plugins/interpreter/test_helpers.ts
+++ b/src/legacy/core_plugins/interpreter/test_helpers.ts
@@ -17,17 +17,5 @@
  * under the License.
  */
 
-import { mapValues } from 'lodash';
-import { AnyExpressionFunction, FunctionHandlers } from './types';
-
-// Takes a function spec and passes in default args,
-// overriding with any provided args.
-export const functionWrapper = <T extends AnyExpressionFunction>(fnSpec: () => T) => {
-  const spec = fnSpec();
-  const defaultArgs = mapValues(spec.args, argSpec => argSpec.default);
-  return (
-    context: object | null,
-    args: Record<string, any> = {},
-    handlers: FunctionHandlers = {}
-  ) => spec.fn(context, { ...defaultArgs, ...args }, handlers);
-};
+// eslint-disable-next-line
+export * from '../../../plugins/expressions/public/functions/tests/utils';
diff --git a/src/legacy/core_plugins/interpreter/types/arguments.ts b/src/legacy/core_plugins/interpreter/types/arguments.ts
index 3e17166a7c434a..35566381d010d8 100644
--- a/src/legacy/core_plugins/interpreter/types/arguments.ts
+++ b/src/legacy/core_plugins/interpreter/types/arguments.ts
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-export * from '../../../../plugins/expressions/common/expressions/types/arguments';
+// eslint-disable-next-line
+export * from '../../../../plugins/expressions/public/types/arguments';
diff --git a/src/legacy/core_plugins/interpreter/types/common.ts b/src/legacy/core_plugins/interpreter/types/common.ts
index dce984a0bd5568..99a7d2dc92f062 100644
--- a/src/legacy/core_plugins/interpreter/types/common.ts
+++ b/src/legacy/core_plugins/interpreter/types/common.ts
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-export * from '../../../../plugins/expressions/common/expressions/types/common';
+// eslint-disable-next-line
+export * from '../../../../plugins/expressions/public/types/common';
diff --git a/src/legacy/core_plugins/interpreter/types/functions.ts b/src/legacy/core_plugins/interpreter/types/functions.ts
index 789bb29990cb44..9a99a78281a0c1 100644
--- a/src/legacy/core_plugins/interpreter/types/functions.ts
+++ b/src/legacy/core_plugins/interpreter/types/functions.ts
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-export * from '../../../../plugins/expressions/common/expressions/types/functions';
+// eslint-disable-next-line
+export * from '../../../../plugins/expressions/public/types/functions';
diff --git a/src/legacy/core_plugins/interpreter/types/index.ts b/src/legacy/core_plugins/interpreter/types/index.ts
index c178bee26a7cdf..6cefc47a678d4a 100644
--- a/src/legacy/core_plugins/interpreter/types/index.ts
+++ b/src/legacy/core_plugins/interpreter/types/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export * from '../../../../plugins/expressions/common';
+export * from '../../../../plugins/expressions/public';
diff --git a/src/legacy/core_plugins/interpreter/types/types.ts b/src/legacy/core_plugins/interpreter/types/types.ts
index d3f1cb3987b000..aacb63eaace0c8 100644
--- a/src/legacy/core_plugins/interpreter/types/types.ts
+++ b/src/legacy/core_plugins/interpreter/types/types.ts
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-export * from '../../../../plugins/expressions/common/expressions/types';
+// eslint-disable-next-line
+export * from '../../../../plugins/expressions/public/types';
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
index f7e16ead932fa3..e341b7c4a5a866 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
+++ b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
@@ -65,7 +65,7 @@ const indexPattern = {
   },
   metaFields: ['_index', '_score'],
   flattenHit: undefined,
-  formatHit: jest.fn(hit => hit),
+  formatHit: jest.fn(hit => hit._source),
 } as IndexPattern;
 
 indexPattern.flattenHit = flattenHitWrapper(indexPattern, indexPattern.metaFields);
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx
index 8309eaa403f4c9..7158739e5d4375 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx
+++ b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx
@@ -19,7 +19,7 @@
 import React, { useState } from 'react';
 import { DocViewRenderProps } from 'ui/registry/doc_views';
 import { DocViewTableRow } from './table_row';
-import { formatValue, arrayContainsObjects } from './table_helper';
+import { arrayContainsObjects, trimAngularSpan } from './table_helper';
 
 const COLLAPSE_LINE_LENGTH = 350;
 
@@ -48,8 +48,9 @@ export function DocViewTable({
           .sort()
           .map(field => {
             const valueRaw = flattened[field];
-            const value = formatValue(valueRaw, formatted[field]);
-            const isCollapsible = typeof value === 'string' && value.length > COLLAPSE_LINE_LENGTH;
+            const value = trimAngularSpan(String(formatted[field]));
+
+            const isCollapsible = value.length > COLLAPSE_LINE_LENGTH;
             const isCollapsed = isCollapsible && !fieldRowOpen[field];
             const toggleColumn =
               onRemoveColumn && onAddColumn && Array.isArray(columns)
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.test.ts b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.test.ts
index f075e06c7651f5..2402d4dddb874f 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.test.ts
+++ b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.test.ts
@@ -16,91 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  replaceMarkWithReactDom,
-  convertAngularHtml,
-  arrayContainsObjects,
-  formatValue,
-} from './table_helper';
-
-describe('replaceMarkWithReactDom', () => {
-  it(`converts <mark>test</mark> to react nodes`, () => {
-    const actual = replaceMarkWithReactDom(
-      '<mark>marked1</mark> blablabla <mark>marked2</mark> end'
-    );
-    expect(actual).toMatchInlineSnapshot(`
-                                    <React.Fragment>
-                                      
-                                      <span>
-                                        <mark>
-                                          marked1
-                                        </mark>
-                                         blablabla 
-                                      </span>
-                                      <span>
-                                        <mark>
-                                          marked2
-                                        </mark>
-                                         end
-                                      </span>
-                                    </React.Fragment>
-                        `);
-  });
-
-  it(`doesn't convert invalid markup to react dom nodes`, () => {
-    const actual = replaceMarkWithReactDom('<mark>test sdf <mark>sdf</mark>');
-    expect(actual).toMatchInlineSnapshot(`
-                                                <React.Fragment>
-                                                  
-                                                  test sdf 
-                                                  <span>
-                                                    <mark>
-                                                      sdf
-                                                    </mark>
-                                                    
-                                                  </span>
-                                                </React.Fragment>
-                                `);
-  });
-
-  it(`returns strings without markup unchanged `, () => {
-    const actual = replaceMarkWithReactDom('blablabla');
-    expect(actual).toMatchInlineSnapshot(`
-                                                <React.Fragment>
-                                                  blablabla
-                                                </React.Fragment>
-                                `);
-  });
-});
-
-describe('convertAngularHtml', () => {
-  it(`converts html for usage in angular to usage in react`, () => {
-    const actual = convertAngularHtml('<span ng-non-bindable>Good morning!</span>');
-    expect(actual).toMatchInlineSnapshot(`"Good morning!"`);
-  });
-  it(`converts html containing <mark> for usage in react`, () => {
-    const actual = convertAngularHtml(
-      '<span ng-non-bindable>Good <mark>morning</mark>dear <mark>reviewer</mark>!</span>'
-    );
-    expect(actual).toMatchInlineSnapshot(`
-                        <React.Fragment>
-                          Good 
-                          <span>
-                            <mark>
-                              morning
-                            </mark>
-                            dear 
-                          </span>
-                          <span>
-                            <mark>
-                              reviewer
-                            </mark>
-                            !
-                          </span>
-                        </React.Fragment>
-                `);
-  });
-});
+import { arrayContainsObjects } from './table_helper';
 
 describe('arrayContainsObjects', () => {
   it(`returns false for an array of primitives`, () => {
@@ -128,50 +44,3 @@ describe('arrayContainsObjects', () => {
     expect(actual).toBeFalsy();
   });
 });
-
-describe('formatValue', () => {
-  it(`formats an array of objects`, () => {
-    const actual = formatValue([{ test: '123' }, ''], '');
-    expect(actual).toMatchInlineSnapshot(`
-      "{
-        \\"test\\": \\"123\\"
-      }
-      \\"\\""
-    `);
-  });
-  it(`formats an array of primitives`, () => {
-    const actual = formatValue(['test1', 'test2'], '');
-    expect(actual).toMatchInlineSnapshot(`"test1, test2"`);
-  });
-  it(`formats an object`, () => {
-    const actual = formatValue({ test: 1 }, '');
-    expect(actual).toMatchInlineSnapshot(`
-      "{
-        \\"test\\": 1
-      }"
-    `);
-  });
-  it(`formats an angular formatted string `, () => {
-    const actual = formatValue(
-      '',
-      '<span ng-non-bindable>Good <mark>morning</mark>dear <mark>reviewer</mark>!</span>'
-    );
-    expect(actual).toMatchInlineSnapshot(`
-      <React.Fragment>
-        Good 
-        <span>
-          <mark>
-            morning
-          </mark>
-          dear 
-        </span>
-        <span>
-          <mark>
-            reviewer
-          </mark>
-          !
-        </span>
-      </React.Fragment>
-    `);
-  });
-});
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.tsx b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.tsx
index e959ec336bf3a1..8835e95022d7c6 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.tsx
+++ b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.tsx
@@ -16,70 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
-import { unescape } from 'lodash';
 
-/**
- * Convert <mark> markup of the given string to ReactNodes
- * @param text
- */
-export function replaceMarkWithReactDom(text: string): React.ReactNode {
-  return (
-    <>
-      {text.split('<mark>').map((markedText, idx) => {
-        const sub = markedText.split('</mark>');
-        if (sub.length === 1) {
-          return markedText;
-        }
-        return (
-          <span key={idx}>
-            <mark>{sub[0]}</mark>
-            {sub[1]}
-          </span>
-        );
-      })}
-    </>
-  );
-}
-
-/**
- * Current html of the formatter is angular flavored, this current workaround
- * should be removed when all consumers of the formatHit function are react based
- */
-export function convertAngularHtml(html: string): string | React.ReactNode {
-  if (typeof html === 'string') {
-    const cleaned = html.replace('<span ng-non-bindable>', '').replace('</span>', '');
-    const unescaped = unescape(cleaned);
-    if (unescaped.indexOf('<mark>') !== -1) {
-      return replaceMarkWithReactDom(unescaped);
-    }
-    return unescaped;
-  }
-  return html;
-}
 /**
  * Returns true if the given array contains at least 1 object
  */
-export function arrayContainsObjects(value: unknown[]) {
+export function arrayContainsObjects(value: unknown[]): boolean {
   return Array.isArray(value) && value.some(v => typeof v === 'object' && v !== null);
 }
 
 /**
- * The current field formatter provides html for angular usage
- * This html is cleaned up and prepared for usage in the react world
- * Furthermore <mark>test</mark> are converted to ReactNodes
+ * Removes markup added by kibana fields html formatter
  */
-export function formatValue(
-  value: null | string | number | boolean | object | Array<string | object | null>,
-  valueFormatted: string
-): string | React.ReactNode {
-  if (Array.isArray(value) && arrayContainsObjects(value)) {
-    return value.map(v => JSON.stringify(v, null, 2)).join('\n');
-  } else if (Array.isArray(value)) {
-    return value.join(', ');
-  } else if (typeof value === 'object' && value !== null) {
-    return JSON.stringify(value, null, 2);
-  } else {
-    return typeof valueFormatted === 'string' ? convertAngularHtml(valueFormatted) : String(value);
-  }
+export function trimAngularSpan(text: string): string {
+  return text.replace(/^<span ng-non-bindable>/, '').replace(/<\/span>$/, '');
 }
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx
index 2059e35b2c42ea..045e8093124a6c 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx
+++ b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx
@@ -85,7 +85,7 @@ export function DocViewTableRow({
         </td>
       )}
       <td className="kbnDocViewer__field">
-        <FieldName field={fieldMapping} fieldName={field}></FieldName>
+        <FieldName field={fieldMapping} fieldName={field} />
       </td>
       <td>
         {isCollapsible && (
@@ -93,9 +93,16 @@ export function DocViewTableRow({
         )}
         {displayUnderscoreWarning && <DocViewTableRowIconUnderscore />}
         {displayNoMappingWarning && <DocViewTableRowIconNoMapping />}
-        <div className={valueClassName} data-test-subj={`tableDocViewRow-${field}-value`}>
-          {value}
-        </div>
+        <div
+          className={valueClassName}
+          data-test-subj={`tableDocViewRow-${field}-value`}
+          /*
+           * Justification for dangerouslySetInnerHTML:
+           * We just use values encoded by our field formatters
+           */
+          // eslint-disable-next-line react/no-danger
+          dangerouslySetInnerHTML={{ __html: value as string }}
+        />
       </td>
     </tr>
   );
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx
index 282c2e6a356bff..b614e00ba8cd08 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx
@@ -34,6 +34,12 @@ interface NumberInputOptionProps<ParamName extends string> {
   setValue: (paramName: ParamName, value: number | '') => void;
 }
 
+/**
+ * Do not use this component anymore.
+ * Please, use NumberInputOption in 'required_number_input.tsx'.
+ * It is required for compatibility with TS 3.7.0
+ * This should be removed in the future
+ */
 function NumberInputOption<ParamName extends string>({
   disabled,
   error,
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/required_number_input.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/required_number_input.tsx
new file mode 100644
index 00000000000000..7b62016c4e502c
--- /dev/null
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/required_number_input.tsx
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { ReactNode, useCallback, ChangeEvent } from 'react';
+import { EuiFormRow, EuiFieldNumber } from '@elastic/eui';
+import { useValidation } from './utils';
+
+interface NumberInputOptionProps<ParamName extends string> {
+  disabled?: boolean;
+  error?: ReactNode;
+  isInvalid?: boolean;
+  label?: React.ReactNode;
+  max?: number;
+  min?: number;
+  paramName: ParamName;
+  step?: number;
+  value: number | null;
+  'data-test-subj'?: string;
+  setValue(paramName: ParamName, value: number | null): void;
+  setValidity(paramName: ParamName, isValid: boolean): void;
+}
+
+/**
+ * Use only this component instead of NumberInputOption in 'number_input.tsx'.
+ * It is required for compatibility with TS 3.7.0
+ *
+ * @param {number} props.value Should be numeric only
+ */
+function NumberInputOption<ParamName extends string>({
+  disabled,
+  error,
+  isInvalid,
+  label,
+  max,
+  min,
+  paramName,
+  step,
+  value,
+  setValue,
+  setValidity,
+  'data-test-subj': dataTestSubj,
+}: NumberInputOptionProps<ParamName>) {
+  const isValid = value !== null;
+  useValidation(setValidity, paramName, isValid);
+
+  const onChange = useCallback(
+    (ev: ChangeEvent<HTMLInputElement>) =>
+      setValue(paramName, isNaN(ev.target.valueAsNumber) ? null : ev.target.valueAsNumber),
+    [setValue, paramName]
+  );
+
+  return (
+    <EuiFormRow label={label} error={error} isInvalid={isInvalid} fullWidth compressed>
+      <EuiFieldNumber
+        compressed
+        fullWidth
+        required
+        data-test-subj={dataTestSubj}
+        disabled={disabled}
+        isInvalid={!isValid}
+        step={step}
+        max={max}
+        min={min}
+        value={value === null ? '' : value}
+        onChange={onChange}
+      />
+    </EuiFormRow>
+  );
+}
+
+export { NumberInputOption };
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/utils.ts b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/utils.ts
new file mode 100644
index 00000000000000..d51631106dda76
--- /dev/null
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/utils.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { useEffect } from 'react';
+
+function useValidation<ParamName extends string>(
+  setValidity: (paramName: ParamName, isValid: boolean) => void,
+  paramName: ParamName,
+  isValid: boolean
+) {
+  useEffect(() => {
+    setValidity(paramName, isValid);
+
+    return () => setValidity(paramName, true);
+  }, [isValid, paramName, setValidity]);
+}
+
+export { useValidation };
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/validation_wrapper.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/validation_wrapper.tsx
index a3a41d2249b329..1dd1ab49d9a47d 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/validation_wrapper.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/validation_wrapper.tsx
@@ -29,7 +29,7 @@ interface ValidationWrapperProps<T> extends VisOptionsProps<T> {
 }
 
 interface Item {
-  valid: boolean;
+  isValid: boolean;
 }
 
 function ValidationWrapper<T = unknown>({
@@ -37,20 +37,17 @@ function ValidationWrapper<T = unknown>({
   ...rest
 }: ValidationWrapperProps<T>) {
   const [panelState, setPanelState] = useState({} as { [key: string]: Item });
-  const isPanelValid = Object.values(panelState).every(item => item.valid);
+  const isPanelValid = Object.values(panelState).every(item => item.isValid);
   const { setValidity } = rest;
 
-  const setValidityHandler = useCallback(
-    (paramName: string, isValid: boolean) => {
-      setPanelState({
-        ...panelState,
-        [paramName]: {
-          valid: isValid,
-        },
-      });
-    },
-    [panelState]
-  );
+  const setValidityHandler = useCallback((paramName: string, isValid: boolean) => {
+    setPanelState(state => ({
+      ...state,
+      [paramName]: {
+        isValid,
+      },
+    }));
+  }, []);
 
   useEffect(() => {
     setValidity(isPanelValid);
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/ranges_panel.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/ranges_panel.tsx
index c1fa3475470f13..1045543512c6b6 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/ranges_panel.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/ranges_panel.tsx
@@ -17,14 +17,16 @@
  * under the License.
  */
 
-import React from 'react';
+import React, { useCallback } from 'react';
 import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
+import { ColorSchemas } from 'ui/vislib/components/color/colormaps';
 import { ColorRanges, ColorSchemaOptions, SwitchOption } from '../../common';
-import { SetColorSchemaOptionsValue } from '../../common/color_schema';
 import { GaugeOptionsInternalProps } from '.';
+import { ColorSchemaVislibParams } from '../../../types';
+import { Gauge } from '../../../gauge';
 
 function RangesPanel({
   setGaugeValue,
@@ -35,6 +37,22 @@ function RangesPanel({
   uiState,
   vis,
 }: GaugeOptionsInternalProps) {
+  const setColorSchemaOptions = useCallback(
+    <T extends keyof ColorSchemaVislibParams>(paramName: T, value: ColorSchemaVislibParams[T]) => {
+      setGaugeValue(paramName, value as Gauge[T]);
+      // set outline if color schema is changed to greys
+      // if outline wasn't set explicitly yet
+      if (
+        paramName === 'colorSchema' &&
+        (value as string) === ColorSchemas.Greys &&
+        typeof stateParams.gauge.outline === 'undefined'
+      ) {
+        setGaugeValue('outline', true);
+      }
+    },
+    [setGaugeValue, stateParams]
+  );
+
   return (
     <EuiPanel paddingSize="s">
       <EuiTitle size="xs">
@@ -84,7 +102,16 @@ function RangesPanel({
         colorSchemas={vis.type.editorConfig.collections.colorSchemas}
         invertColors={stateParams.gauge.invertColors}
         uiState={uiState}
-        setValue={setGaugeValue as SetColorSchemaOptionsValue}
+        setValue={setColorSchemaOptions}
+      />
+
+      <SwitchOption
+        label={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.showOutline', {
+          defaultMessage: 'Show outline',
+        })}
+        paramName="outline"
+        value={stateParams.gauge.outline}
+        setValue={setGaugeValue}
       />
 
       <SwitchOption
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/custom_extents_options.test.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/custom_extents_options.test.tsx
index b55d363fa56c8e..5f1779ad353040 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/custom_extents_options.test.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/custom_extents_options.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import React from 'react';
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
 import { CustomExtentsOptions, CustomExtentsOptionsProps } from './custom_extents_options';
 import { YExtents } from './y_extents';
 import { valueAxis } from './mocks';
@@ -55,23 +55,27 @@ describe('CustomExtentsOptions component', () => {
 
   describe('boundsMargin', () => {
     it('should set validity as true when value is positive', () => {
-      const comp = shallow(<CustomExtentsOptions {...defaultProps} />);
-      comp.find({ paramName: BOUNDS_MARGIN }).prop('setValue')(BOUNDS_MARGIN, 5);
+      defaultProps.axis.scale.boundsMargin = 5;
+      mount(<CustomExtentsOptions {...defaultProps} />);
 
       expect(setMultipleValidity).toBeCalledWith(BOUNDS_MARGIN, true);
     });
 
     it('should set validity as true when value is empty', () => {
-      const comp = shallow(<CustomExtentsOptions {...defaultProps} />);
-      comp.find({ paramName: BOUNDS_MARGIN }).prop('setValue')(BOUNDS_MARGIN, '');
+      const comp = mount(<CustomExtentsOptions {...defaultProps} />);
+      comp.setProps({
+        axis: { ...valueAxis, scale: { ...valueAxis.scale, boundsMargin: undefined } },
+      });
 
       expect(setMultipleValidity).toBeCalledWith(BOUNDS_MARGIN, true);
     });
 
     it('should set validity as false when value is negative', () => {
       defaultProps.axis.scale.defaultYExtents = true;
-      const comp = shallow(<CustomExtentsOptions {...defaultProps} />);
-      comp.find({ paramName: BOUNDS_MARGIN }).prop('setValue')(BOUNDS_MARGIN, -1);
+      const comp = mount(<CustomExtentsOptions {...defaultProps} />);
+      comp.setProps({
+        axis: { ...valueAxis, scale: { ...valueAxis.scale, boundsMargin: -1 } },
+      });
 
       expect(setMultipleValidity).toBeCalledWith(BOUNDS_MARGIN, false);
     });
@@ -103,7 +107,6 @@ describe('CustomExtentsOptions component', () => {
       const comp = shallow(<CustomExtentsOptions {...defaultProps} />);
       comp.find({ paramName: DEFAULT_Y_EXTENTS }).prop('setValue')(DEFAULT_Y_EXTENTS, false);
 
-      expect(setMultipleValidity).toBeCalledWith(BOUNDS_MARGIN, true);
       const newScale = {
         ...defaultProps.axis.scale,
         boundsMargin: undefined,
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/custom_extents_options.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/custom_extents_options.tsx
index e04d8e646160e0..df7eedd2c0ea18 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/custom_extents_options.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/custom_extents_options.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import React, { useState, useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import { ValueAxis } from '../../../types';
@@ -38,21 +38,18 @@ function CustomExtentsOptions({
   setValueAxis,
   setValueAxisScale,
 }: CustomExtentsOptionsProps) {
-  const [isBoundsMarginValid, setIsBoundsMarginValid] = useState(true);
   const invalidBoundsMarginMessage = i18n.translate(
     'kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBounds.minNeededBoundsMargin',
     { defaultMessage: 'Bounds margin must be greater than or equal to 0.' }
   );
 
-  const setBoundsMargin = useCallback(
-    (paramName: 'boundsMargin', value: number | '') => {
-      const isValid = value === '' ? true : value >= 0;
-      setIsBoundsMarginValid(isValid);
-      setMultipleValidity('boundsMargin', isValid);
+  const isBoundsMarginValid =
+    !axis.scale.defaultYExtents || !axis.scale.boundsMargin || axis.scale.boundsMargin >= 0;
 
-      setValueAxisScale(paramName, value);
-    },
-    [setMultipleValidity, setValueAxisScale]
+  const setBoundsMargin = useCallback(
+    (paramName: 'boundsMargin', value: number | '') =>
+      setValueAxisScale(paramName, value === '' ? undefined : value),
+    [setValueAxisScale]
   );
 
   const onDefaultYExtentsChange = useCallback(
@@ -60,7 +57,6 @@ function CustomExtentsOptions({
       const scale = { ...axis.scale, [paramName]: value };
       if (!scale.defaultYExtents) {
         delete scale.boundsMargin;
-        setMultipleValidity('boundsMargin', true);
       }
       setValueAxis('scale', scale);
     },
@@ -79,6 +75,12 @@ function CustomExtentsOptions({
     [setValueAxis, axis.scale]
   );
 
+  useEffect(() => {
+    setMultipleValidity('boundsMargin', isBoundsMarginValid);
+
+    return () => setMultipleValidity('boundsMargin', true);
+  }, [isBoundsMarginValid, setMultipleValidity]);
+
   return (
     <>
       <SwitchOption
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/y_extents.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/y_extents.tsx
index a5318f0ec3f00f..dee8d5d28afe4e 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/y_extents.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/metrics_axes/y_extents.tsx
@@ -80,7 +80,7 @@ function YExtents({ scale, setScale, setMultipleValidity }: YExtentsProps) {
     setMultipleValidity('yExtents', isValid);
 
     return () => setMultipleValidity('yExtents', true);
-  }, [isValid]);
+  }, [isValid, setMultipleValidity]);
 
   return (
     <EuiFormRow error={errors} isInvalid={!!errors.length} fullWidth compressed>
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx
index 8e3f66d12b9bdf..ed3b52b83c2345 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx
@@ -21,13 +21,12 @@ import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { VisOptionsProps } from 'ui/vis/editors/default';
-import { BasicOptions, SwitchOption } from '../../common';
+import { BasicOptions, SwitchOption, ValidationVisOptionsProps } from '../../common';
 import { GridPanel } from './grid_panel';
 import { ThresholdPanel } from './threshold_panel';
 import { BasicVislibParams } from '../../../types';
 
-function PointSeriesOptions(props: VisOptionsProps<BasicVislibParams>) {
+function PointSeriesOptions(props: ValidationVisOptionsProps<BasicVislibParams>) {
   const { stateParams, setValue, vis } = props;
 
   return (
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/threshold_panel.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/threshold_panel.tsx
index 49e56e377a8d56..591ad2eb3a001a 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/threshold_panel.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/threshold_panel.tsx
@@ -21,11 +21,16 @@ import { EuiPanel, EuiTitle, EuiColorPicker, EuiFormRow, EuiSpacer } from '@elas
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { VisOptionsProps } from 'ui/vis/editors/default';
-import { NumberInputOption, SelectOption, SwitchOption } from '../../common';
+import { SelectOption, SwitchOption, ValidationVisOptionsProps } from '../../common';
+import { NumberInputOption } from '../../common/required_number_input';
 import { BasicVislibParams } from '../../../types';
 
-function ThresholdPanel({ stateParams, setValue, vis }: VisOptionsProps<BasicVislibParams>) {
+function ThresholdPanel({
+  stateParams,
+  setValue,
+  setMultipleValidity,
+  vis,
+}: ValidationVisOptionsProps<BasicVislibParams>) {
   const setThresholdLine = useCallback(
     <T extends keyof BasicVislibParams['thresholdLine']>(
       paramName: T,
@@ -39,6 +44,12 @@ function ThresholdPanel({ stateParams, setValue, vis }: VisOptionsProps<BasicVis
     [setThresholdLine]
   );
 
+  const setThresholdLineValidity = useCallback(
+    (paramName: keyof BasicVislibParams['thresholdLine'], isValid: boolean) =>
+      setMultipleValidity(`thresholdLine__${paramName}`, isValid),
+    [setMultipleValidity]
+  );
+
   return (
     <EuiPanel paddingSize="s">
       <EuiTitle size="xs">
@@ -72,6 +83,7 @@ function ThresholdPanel({ stateParams, setValue, vis }: VisOptionsProps<BasicVis
             paramName="value"
             value={stateParams.thresholdLine.value}
             setValue={setThresholdLine}
+            setValidity={setThresholdLineValidity}
           />
 
           <NumberInputOption
@@ -86,6 +98,7 @@ function ThresholdPanel({ stateParams, setValue, vis }: VisOptionsProps<BasicVis
             step={1}
             value={stateParams.thresholdLine.width}
             setValue={setThresholdLine}
+            setValidity={setThresholdLineValidity}
           />
 
           <SelectOption
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/gauge.d.ts b/src/legacy/core_plugins/kbn_vislib_vis_types/public/gauge.d.ts
index bb042abfdcca73..ff8345e9a5b257 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/gauge.d.ts
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/gauge.d.ts
@@ -32,6 +32,7 @@ interface Gauge extends ColorSchemaVislibParams {
   gaugeType: GaugeTypes;
   labels: Labels;
   percentageMode: boolean;
+  outline?: boolean;
   scale: {
     show: boolean;
     labels: false;
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/types.ts b/src/legacy/core_plugins/kbn_vislib_vis_types/public/types.ts
index 008f2a0e0ce623..b023eb54f72954 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/types.ts
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/types.ts
@@ -70,8 +70,8 @@ export interface Scale {
 
 interface ThresholdLine {
   show: boolean;
-  value: number;
-  width: number;
+  value: number | null;
+  width: number | null;
   style: ThresholdLineStyles;
   color: string;
 }
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/utils/common_config.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/utils/common_config.tsx
index 5a1043537d6ec9..7e4140606762fe 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/utils/common_config.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/utils/common_config.tsx
@@ -40,7 +40,9 @@ function getAreaOptionTabs() {
       title: i18n.translate('kbnVislibVisTypes.area.tabs.panelSettingsTitle', {
         defaultMessage: 'Panel settings',
       }),
-      editor: PointSeriesOptions,
+      editor: (props: VisOptionsProps<BasicVislibParams>) => (
+        <ValidationWrapper {...props} component={PointSeriesOptions} />
+      ),
     },
   ];
 }
diff --git a/src/legacy/core_plugins/kibana/migrations/migrations.js b/src/legacy/core_plugins/kibana/migrations/migrations.js
index 03b2f5b898345c..e024e98acb343b 100644
--- a/src/legacy/core_plugins/kibana/migrations/migrations.js
+++ b/src/legacy/core_plugins/kibana/migrations/migrations.js
@@ -285,6 +285,50 @@ function transformFilterStringToQueryObject(doc) {
   }
   return newDoc;
 }
+function transformSplitFiltersStringToQueryObject(doc) {
+  // Migrate split_filters in TSVB objects that weren't migrated in 7.3
+  // If any filters exist and they are a string, we assume them to be lucene syntax and transform the filter into an object accordingly
+  const newDoc = cloneDeep(doc);
+  const visStateJSON = get(doc, 'attributes.visState');
+  if (visStateJSON) {
+    let visState;
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // let it go, the data is invalid and we'll leave it as is
+    }
+    if (visState) {
+      const visType = get(visState, 'params.type');
+      const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries'];
+      if (tsvbTypes.indexOf(visType) === -1) {
+        // skip
+        return doc;
+      }
+      // migrate the series split_filter filters
+      const series = get(visState, 'params.series') || [];
+      series.forEach(item => {
+        // series item split filters filter
+        if (item.split_filters) {
+          const splitFilters = get(item, 'split_filters') || [];
+          if (splitFilters.length > 0) {
+            // only transform split_filter filters if we have filters
+            splitFilters.forEach(filter => {
+              if (typeof filter.filter === 'string') {
+                const filterfilterObject = {
+                  query: filter.filter,
+                  language: 'lucene',
+                };
+                filter.filter = filterfilterObject;
+              }
+            });
+          }
+        }
+      });
+      newDoc.attributes.visState = JSON.stringify(visState);
+    }
+  }
+  return newDoc;
+}
 
 function migrateFiltersAggQuery(doc) {
   const visStateJSON = get(doc, 'attributes.visState');
@@ -416,6 +460,31 @@ function migrateFiltersAggQueryStringQueries(doc) {
 
 }
 
+function migrateSubTypeAndParentFieldProperties(doc) {
+  if (!doc.attributes.fields) return doc;
+
+  const fieldsString = doc.attributes.fields;
+  const fields = JSON.parse(fieldsString);
+  const migratedFields = fields.map(field => {
+    if (field.subType === 'multi') {
+      return {
+        ...omit(field, 'parent'),
+        subType: { multi: { parent: field.parent } }
+      };
+    }
+
+    return field;
+  });
+
+  return {
+    ...doc,
+    attributes: {
+      ...doc.attributes,
+      fields: JSON.stringify(migratedFields),
+    }
+  };
+}
+
 const executeMigrations720 = flow(
   migratePercentileRankAggregation,
   migrateDateHistogramAggregation
@@ -435,6 +504,10 @@ const executeSearchMigrations740 = flow(
   migrateSearchSortToNestedArray,
 );
 
+const executeMigrations742 = flow(
+  transformSplitFiltersStringToQueryObject
+);
+
 export const migrations = {
   'index-pattern': {
     '6.5.0': doc => {
@@ -442,6 +515,9 @@ export const migrations = {
       doc.attributes.typeMeta = doc.attributes.typeMeta || undefined;
       return doc;
     },
+    '7.6.0': flow(
+      migrateSubTypeAndParentFieldProperties
+    )
   },
   visualization: {
     /**
@@ -541,6 +617,8 @@ export const migrations = {
     '7.2.0': doc => executeMigrations720(doc),
     '7.3.0': executeMigrations730,
     '7.3.1': executeVisualizationMigrations731,
+    // migrate split_filters that were not migrated in 7.3.0 (transformFilterStringToQueryObject).
+    '7.4.2': executeMigrations742,
   },
   dashboard: {
     '7.0.0': doc => {
diff --git a/src/legacy/core_plugins/kibana/migrations/migrations.test.js b/src/legacy/core_plugins/kibana/migrations/migrations.test.js
index 77a4c7eabe86e3..14f1e8c80e349c 100644
--- a/src/legacy/core_plugins/kibana/migrations/migrations.test.js
+++ b/src/legacy/core_plugins/kibana/migrations/migrations.test.js
@@ -56,6 +56,29 @@ Object {
 `);
     });
   });
+
+  describe('7.6.0', function () {
+    const migrate = doc => migrations['index-pattern']['7.6.0'](doc);
+
+    it('should remove the parent property and update the subType prop on every field that has them', () => {
+      const input = {
+        attributes: {
+          title: 'test',
+          // eslint-disable-next-line max-len
+          fields: '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":"multi","parent":"customer_name"}]',
+        },
+      };
+      const expected = {
+        attributes: {
+          title: 'test',
+          // eslint-disable-next-line max-len
+          fields: '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_name"}}}]',
+        },
+      };
+
+      expect(migrate(input)).toEqual(expected);
+    });
+  });
 });
 
 describe('visualization', () => {
@@ -1180,6 +1203,123 @@ Array [
       expect(migratedDoc).toEqual({ attributes: { visState: JSON.stringify(expected) } });
     });
   });
+  describe('7.4.2 tsvb split_filters migration', () => {
+    const migrate = doc => migrations.visualization['7.4.2'](doc);
+    const generateDoc = ({ params }) => ({
+      attributes: {
+        title: 'My Vis',
+        description: 'This is my super cool vis.',
+        visState: JSON.stringify({ params }),
+        uiStateJSON: '{}',
+        version: 1,
+        kibanaSavedObjectMeta: {
+          searchSourceJSON: '{}',
+        },
+      },
+    });
+    it('should change series item filters from a string into an object for all filters', () => {
+      const params = {
+        type: 'timeseries',
+        filter: {
+          query: 'bytes:>1000',
+          language: 'lucene'
+        },
+        series: [
+          {
+            split_filters: [{ filter: 'bytes:>1000' }],
+          },
+        ]
+      };
+      const timeSeriesDoc = generateDoc({ params: params });
+      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
+      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
+      expect(Object.keys(timeSeriesParams.filter)).toEqual(
+        expect.arrayContaining(['query', 'language'])
+      );
+      expect(timeSeriesParams.series[0].split_filters[0].filter).toEqual(
+        { query: 'bytes:>1000', language: 'lucene' }
+      );
+    });
+    it('should change series item split filters when there is no filter item', () => {
+      const params = {
+        type: 'timeseries',
+        filter: {
+          query: 'bytes:>1000',
+          language: 'lucene'
+        },
+        series: [
+          {
+            split_filters: [{ filter: 'bytes:>1000' }],
+          },
+        ],
+        annotations: [
+          {
+            query_string: {
+              query: 'bytes:>1000',
+              language: 'lucene'
+            }
+          }
+        ],
+      };
+      const timeSeriesDoc = generateDoc({ params: params });
+      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
+      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
+      expect(timeSeriesParams.series[0].split_filters[0].filter).toEqual(
+        { query: 'bytes:>1000', language: 'lucene' }
+      );
+    });
+    it('should not convert split_filters to objects if there are no split filter filters', () => {
+      const params = {
+        type: 'timeseries',
+        filter: {
+          query: 'bytes:>1000',
+          language: 'lucene'
+        },
+        series: [
+          {
+            split_filters: [],
+          },
+        ]
+      };
+      const timeSeriesDoc = generateDoc({ params: params });
+      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
+      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
+      expect(timeSeriesParams.series[0].split_filters).not.toHaveProperty('query');
+    });
+    it('should do nothing if a split_filter is already a query:language object', () => {
+      const params = {
+        type: 'timeseries',
+        filter: {
+          query: 'bytes:>1000',
+          language: 'lucene'
+        },
+        series: [
+          {
+            split_filters: [{
+              filter: {
+                query: 'bytes:>1000',
+                language: 'lucene',
+              }
+            }],
+          },
+        ],
+        annotations: [
+          {
+            query_string: {
+              query: 'bytes:>1000',
+              language: 'lucene'
+            }
+          }
+        ],
+      };
+      const timeSeriesDoc = generateDoc({ params: params });
+      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
+      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
+      expect(timeSeriesParams.series[0].split_filters[0].filter.query).toEqual('bytes:>1000');
+      expect(timeSeriesParams.series[0].split_filters[0].filter.language).toEqual('lucene');
+
+    });
+  });
 });
 
 describe('dashboard', () => {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx
index 7a0398e86a60da..5fa3a938ed9dfc 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx
@@ -35,7 +35,6 @@ import {
 } from 'ui/state_management/app_state';
 
 import { KbnUrl } from 'ui/url/kbn_url';
-import { Filter } from '@kbn/es-query';
 import { TimeRange } from 'src/plugins/data/public';
 import { IndexPattern } from 'ui/index_patterns';
 import { IPrivate } from 'ui/private';
@@ -46,6 +45,7 @@ import { Subscription } from 'rxjs';
 import { ViewMode } from '../../../embeddable_api/public/np_ready/public';
 import { SavedObjectDashboard } from './saved_dashboard/saved_dashboard';
 import { DashboardAppState, SavedDashboardPanel, ConfirmModalFn } from './types';
+import { esFilters } from '../../../../../../src/plugins/data/public';
 
 import { DashboardAppController } from './dashboard_app_controller';
 
@@ -55,7 +55,7 @@ export interface DashboardAppScope extends ng.IScope {
   screenTitle: string;
   model: {
     query: Query;
-    filters: Filter[];
+    filters: esFilters.Filter[];
     timeRestore: boolean;
     title: string;
     description: string;
@@ -81,9 +81,9 @@ export interface DashboardAppScope extends ng.IScope {
     isPaused: boolean;
     refreshInterval: any;
   }) => void;
-  onFiltersUpdated: (filters: Filter[]) => void;
+  onFiltersUpdated: (filters: esFilters.Filter[]) => void;
   onCancelApplyFilters: () => void;
-  onApplyFilters: (filters: Filter[]) => void;
+  onApplyFilters: (filters: esFilters.Filter[]) => void;
   onQuerySaved: (savedQuery: SavedQuery) => void;
   onSavedQueryUpdated: (savedQuery: SavedQuery) => void;
   onClearSavedQuery: () => void;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
index abf7b22a6e48c6..adf0e1e084a644 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
@@ -48,7 +48,6 @@ import {
 } from 'ui/state_management/app_state';
 
 import { KbnUrl } from 'ui/url/kbn_url';
-import { Filter } from '@kbn/es-query';
 import { IndexPattern } from 'ui/index_patterns';
 import { IPrivate } from 'ui/private';
 import { Query, SavedQuery } from 'src/legacy/core_plugins/data/public';
@@ -57,8 +56,9 @@ import { capabilities } from 'ui/capabilities';
 import { Subscription } from 'rxjs';
 import { npStart } from 'ui/new_platform';
 import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
-import { extractTimeFilter, changeTimeFilter } from '../../../data/public';
+import { extractTimeFilter, changeTimeFilter } from '../../../../../plugins/data/public';
 import { start as data } from '../../../data/public/legacy';
+import { esFilters } from '../../../../../plugins/data/public';
 
 import {
   DashboardContainer,
@@ -514,7 +514,7 @@ export class DashboardAppController {
       }
     );
 
-    $scope.$watch('appState.$newFilters', (filters: Filter[] = []) => {
+    $scope.$watch('appState.$newFilters', (filters: esFilters.Filter[] = []) => {
       if (filters.length === 1) {
         $scope.onApplyFilters(filters);
       }
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
index a25ce1e607f9a4..5e81373001bf57 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
@@ -23,7 +23,7 @@ import { DashboardStateManager } from './dashboard_state_manager';
 import { getAppStateMock, getSavedDashboardMock } from './__tests__';
 import { AppStateClass } from 'ui/state_management/app_state';
 import { DashboardAppState } from './types';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange, TimefilterContract } from 'src/plugins/data/public';
 import { ViewMode } from 'src/plugins/embeddable/public';
 import { InputTimeRange } from 'ui/timefilter';
 
@@ -33,22 +33,19 @@ jest.mock('ui/registry/field_formats', () => ({
   },
 }));
 
-import { dataPluginMock } from '../../../../core_plugins/data/public/mocks';
-const dataSetupMock = dataPluginMock.createSetup();
-
 describe('DashboardState', function() {
   let dashboardState: DashboardStateManager;
   const savedDashboard = getSavedDashboardMock();
 
   let mockTime: TimeRange = { to: 'now', from: 'now-15m' };
-  const mockTimefilter = dataSetupMock.timefilter!.timefilter;
-
-  mockTimefilter.setTime.mockImplementation((time: InputTimeRange) => {
-    mockTime = time as TimeRange;
-  });
-  mockTimefilter.getTime.mockImplementation(() => {
-    return mockTime;
-  });
+  const mockTimefilter = {
+    getTime: () => {
+      return mockTime;
+    },
+    setTime: (time: InputTimeRange) => {
+      mockTime = time as TimeRange;
+    },
+  } as TimefilterContract;
 
   function initDashboardState() {
     dashboardState = new DashboardStateManager({
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts
index 7c1fc771de3491..8ffabe5add1c34 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts
@@ -20,7 +20,6 @@
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
 
-import { Filter } from '@kbn/es-query';
 import { stateMonitorFactory, StateMonitor } from 'ui/state_management/state_monitor_factory';
 import { Timefilter } from 'ui/timefilter';
 import { AppStateClass as TAppStateClass } from 'ui/state_management/app_state';
@@ -29,6 +28,7 @@ import { Moment } from 'moment';
 
 import { DashboardContainer } from 'src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
 import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
+import { esFilters } from '../../../../../../src/plugins/data/public';
 import { Query } from '../../../data/public';
 
 import { getAppStateDefaults, migrateAppState } from './lib';
@@ -50,7 +50,7 @@ export class DashboardStateManager {
   public lastSavedDashboardFilters: {
     timeTo?: string | Moment;
     timeFrom?: string | Moment;
-    filterBars: Filter[];
+    filterBars: esFilters.Filter[];
     query: Query;
   };
   private stateDefaults: DashboardAppStateDefaults;
@@ -303,7 +303,7 @@ export class DashboardStateManager {
     return this.savedDashboard.timeRestore;
   }
 
-  public getLastSavedFilterBars(): Filter[] {
+  public getLastSavedFilterBars(): esFilters.Filter[] {
     return this.lastSavedDashboardFilters.filterBars;
   }
 
@@ -461,7 +461,7 @@ export class DashboardStateManager {
    * Applies the current filter state to the dashboard.
    * @param filter An array of filter bar filters.
    */
-  public applyFilters(query: Query, filters: Filter[]) {
+  public applyFilters(query: Query, filters: esFilters.Filter[]) {
     this.appState.query = query;
     this.savedDashboard.searchSource.setField('query', query);
     this.savedDashboard.searchSource.setField('filter', filters);
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts b/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts
index 1fd50081c58bd6..19a0c32210737b 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import moment, { Moment } from 'moment';
-import { Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 /**
  * @typedef {Object} QueryFilter
@@ -65,9 +65,9 @@ export class FilterUtils {
    * @param filters {Array.<Object>}
    * @returns {Array.<Object>}
    */
-  public static cleanFiltersForComparison(filters: Filter[]) {
+  public static cleanFiltersForComparison(filters: esFilters.Filter[]) {
     return _.map(filters, filter => {
-      const f: Partial<Filter> = _.omit(filter, ['$$hashKey', '$state']);
+      const f: Partial<esFilters.Filter> = _.omit(filter, ['$$hashKey', '$state']);
       if (f.meta) {
         // f.meta.value is the value displayed in the filter bar.
         // It may also be loaded differently and shouldn't be used in this comparison.
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.test.ts
index 1f503ee6754070..ae3edae3b85d61 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.test.ts
@@ -18,12 +18,12 @@
  */
 
 import { moveFiltersToQuery, Pre600FilterQuery } from './move_filters_to_query';
-import { Filter, FilterStateStore } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
 
-const filter: Filter = {
+const filter: esFilters.Filter = {
   meta: { disabled: false, negate: false, alias: '' },
   query: {},
-  $state: { store: FilterStateStore.APP_STATE },
+  $state: { store: esFilters.FilterStateStore.APP_STATE },
 };
 
 const queryFilter: Pre600FilterQuery = {
@@ -38,7 +38,7 @@ test('Migrates an old filter query into the query field', () => {
   expect(newSearchSource).toEqual({
     filter: [
       {
-        $state: { store: FilterStateStore.APP_STATE },
+        $state: { store: esFilters.FilterStateStore.APP_STATE },
         meta: {
           alias: '',
           disabled: false,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts
index 153bdeba9d35f1..8522495b9dedb2 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts
@@ -18,7 +18,7 @@
  */
 
 import { Query } from 'src/legacy/core_plugins/data/public';
-import { Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export interface Pre600FilterQuery {
   // pre 6.0.0 global query:queryString:options were stored per dashboard and would
@@ -30,18 +30,18 @@ export interface Pre600FilterQuery {
 export interface SearchSourcePre600 {
   // I encountered at least one export from 7.0.0-alpha that was missing the filter property in here.
   // The maps data in esarchives actually has it, but I don't know how/when they created it.
-  filter?: Array<Filter | Pre600FilterQuery>;
+  filter?: Array<esFilters.Filter | Pre600FilterQuery>;
 }
 
 export interface SearchSource730 {
-  filter: Filter[];
+  filter: esFilters.Filter[];
   query: Query;
   highlightAll?: boolean;
   version?: boolean;
 }
 
-function isQueryFilter(filter: Filter | { query: unknown }): filter is Pre600FilterQuery {
-  return filter.query && !(filter as Filter).meta;
+function isQueryFilter(filter: esFilters.Filter | { query: unknown }): filter is Pre600FilterQuery {
+  return filter.query && !(filter as esFilters.Filter).meta;
 }
 
 export function moveFiltersToQuery(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts
index 1231ca28ed014b..5b860b0a2cc7c1 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts
@@ -19,10 +19,9 @@
 
 import { SearchSource } from 'ui/courier';
 import { SavedObject } from 'ui/saved_objects/saved_object';
-import moment from 'moment';
 import { RefreshInterval } from 'src/plugins/data/public';
 import { Query } from 'src/legacy/core_plugins/data/public';
-import { Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export interface SavedObjectDashboard extends SavedObject {
   id?: string;
@@ -41,5 +40,5 @@ export interface SavedObjectDashboard extends SavedObject {
   destroy: () => void;
   refreshInterval?: RefreshInterval;
   getQuery(): Query;
-  getFilters(): Filter[];
+  getFilters(): esFilters.Filter[];
 }
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/types.ts b/src/legacy/core_plugins/kibana/public/dashboard/types.ts
index ccccc89004e365..5aaca7b62094f8 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/types.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/types.ts
@@ -18,7 +18,6 @@
  */
 
 import { AppState } from 'ui/state_management/app_state';
-import { Filter } from '@kbn/es-query';
 import { Query } from 'src/legacy/core_plugins/data/public';
 import { AppState as TAppState } from 'ui/state_management/app_state';
 import { ViewMode } from 'src/plugins/embeddable/public';
@@ -30,6 +29,7 @@ import {
   RawSavedDashboardPanel640To720,
   RawSavedDashboardPanel730ToLatest,
 } from './migrations/types';
+import { esFilters } from '../../../../../plugins/data/public';
 
 export type NavAction = (anchorElement?: any) => void;
 
@@ -110,7 +110,7 @@ export interface DashboardAppStateParameters {
     useMargins: boolean;
   };
   query: Query | string;
-  filters: Filter[];
+  filters: esFilters.Filter[];
   viewMode: ViewMode;
   savedQuery?: string;
 }
diff --git a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js
index 5e8cfc8e1609cf..9ac76bfcfe04e2 100644
--- a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js
@@ -23,7 +23,6 @@ import _ from 'lodash';
 import sinon from 'sinon';
 import ngMock from 'ng_mock';
 import expect from '@kbn/expect';
-import 'ui/private';
 import '../../components/field_chooser/discover_field';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_calculator.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_calculator.js
index 3130ac29eb84db..3ddee3495f36d8 100644
--- a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_calculator.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_calculator.js
@@ -22,7 +22,6 @@ import _ from 'lodash';
 import ngMock from 'ng_mock';
 import { fieldCalculator } from '../../components/field_chooser/lib/field_calculator';
 import expect from '@kbn/expect';
-import 'ui/private';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 // Load the kibana app dependencies.
diff --git a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_chooser.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_chooser.js
index c2be750ec7f631..a5b55e50eb90e9 100644
--- a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_chooser.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_chooser.js
@@ -23,7 +23,6 @@ import _ from 'lodash';
 import sinon from 'sinon';
 import expect from '@kbn/expect';
 import $ from 'jquery';
-import 'ui/private';
 import '../../components/field_chooser/field_chooser';
 import FixturesHitsProvider from 'fixtures/hits';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/legacy/core_plugins/kibana/public/discover/_index.scss b/src/legacy/core_plugins/kibana/public/discover/_index.scss
index 0b0bd12cb268b8..b311dd8a347789 100644
--- a/src/legacy/core_plugins/kibana/public/discover/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/discover/_index.scss
@@ -11,7 +11,7 @@
 @import 'components/fetch_error/index';
 @import 'components/field_chooser/index';
 @import 'angular/directives/index';
-@import 'doc_table/index';
+@import 'angular/doc_table/index';
 
 @import 'hacks';
 
@@ -23,4 +23,4 @@
 @import 'doc_viewer/index';
 
 // Context styles
-@import 'context/index';
+@import 'angular/context/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/index.html b/src/legacy/core_plugins/kibana/public/discover/angular/context.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/index.html
rename to src/legacy/core_plugins/kibana/public/discover/angular/context.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context.js b/src/legacy/core_plugins/kibana/public/discover/angular/context.js
new file mode 100644
index 00000000000000..58d1626ca4b14d
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context.js
@@ -0,0 +1,103 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+import { i18n } from '@kbn/i18n';
+import { getServices, subscribeWithScope } from './../kibana_services';
+
+import './context_app';
+import contextAppRouteTemplate from './context.html';
+import { getRootBreadcrumbs } from '../breadcrumbs';
+const { FilterBarQueryFilterProvider, uiRoutes, chrome } = getServices();
+
+const k7Breadcrumbs = $route => {
+  const { indexPattern } = $route.current.locals;
+  const { id } = $route.current.params;
+
+  return [
+    ...getRootBreadcrumbs(),
+    {
+      text: i18n.translate('kbn.context.breadcrumb', {
+        defaultMessage: 'Context of {indexPatternTitle}#{docId}',
+        values: {
+          indexPatternTitle: indexPattern.title,
+          docId: id,
+        },
+      }),
+    },
+  ];
+};
+
+uiRoutes
+  // deprecated route, kept for compatibility
+  // should be removed in the future
+  .when('/context/:indexPatternId/:type/:id*', {
+    redirectTo: '/context/:indexPatternId/:id',
+  })
+  .when('/context/:indexPatternId/:id*', {
+    controller: ContextAppRouteController,
+    k7Breadcrumbs,
+    controllerAs: 'contextAppRoute',
+    resolve: {
+      indexPattern: function ($route, indexPatterns) {
+        return indexPatterns.get($route.current.params.indexPatternId);
+      },
+    },
+    template: contextAppRouteTemplate,
+  });
+
+function ContextAppRouteController($routeParams, $scope, AppState, config, indexPattern, Private) {
+  const queryFilter = Private(FilterBarQueryFilterProvider);
+
+  this.state = new AppState(createDefaultAppState(config, indexPattern));
+  this.state.save(true);
+
+  $scope.$watchGroup(
+    [
+      'contextAppRoute.state.columns',
+      'contextAppRoute.state.predecessorCount',
+      'contextAppRoute.state.successorCount',
+    ],
+    () => this.state.save(true)
+  );
+
+  const updateSubsciption = subscribeWithScope($scope, queryFilter.getUpdates$(), {
+    next: () => {
+      this.filters = _.cloneDeep(queryFilter.getFilters());
+    },
+  });
+
+  $scope.$on('$destroy', function () {
+    updateSubsciption.unsubscribe();
+  });
+  this.anchorId = $routeParams.id;
+  this.indexPattern = indexPattern;
+  this.discoverUrl = chrome.navLinks.get('kibana:discover').url;
+  this.filters = _.cloneDeep(queryFilter.getFilters());
+}
+
+function createDefaultAppState(config, indexPattern) {
+  return {
+    columns: ['_source'],
+    filters: [],
+    predecessorCount: parseInt(config.get('context:defaultSize'), 10),
+    sort: [indexPattern.timeFieldName, 'desc'],
+    successorCount: parseInt(config.get('context:defaultSize'), 10),
+  };
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/NOTES.md b/src/legacy/core_plugins/kibana/public/discover/angular/context/NOTES.md
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/NOTES.md
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/NOTES.md
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/context/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/_stubs.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/_stubs.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
index ecb22b20e4d86e..f472ff9250eb5b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/_stubs.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
@@ -19,7 +19,7 @@
 
 import sinon from 'sinon';
 import moment from 'moment';
-import { SearchSource } from 'ui/courier';
+import { SearchSource } from '../../../../kibana_services';
 
 export function createIndexPatternsStub() {
   return {
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/anchor.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/anchor.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/anchor.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/anchor.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/predecessors.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/predecessors.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/predecessors.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/predecessors.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/successors.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/successors.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/successors.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/successors.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/anchor.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/anchor.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/anchor.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/anchor.js
index 02a309eaa01659..62bbc6166662f8 100644
--- a/src/legacy/core_plugins/kibana/public/discover/context/api/anchor.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/anchor.js
@@ -18,11 +18,10 @@
  */
 
 import _ from 'lodash';
-
 import { i18n } from '@kbn/i18n';
+import { getServices } from '../../../kibana_services';
 
-import { SearchSource } from 'ui/courier';
-
+const { SearchSource } = getServices();
 export function fetchAnchorProvider(indexPatterns) {
   return async function fetchAnchor(
     indexPatternId,
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/context.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/context.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts
index 48ac59f1f08552..3314bbbf189c4b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/context/api/context.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts
@@ -17,16 +17,14 @@
  * under the License.
  */
 
-// @ts-ignore
-import { SearchSource } from 'ui/courier';
-import { Filter } from '@kbn/es-query';
-import { IndexPatterns, IndexPattern } from 'ui/index_patterns';
+import { IndexPatterns, IndexPattern, getServices } from '../../../kibana_services';
 import { reverseSortDir, SortDirection } from './utils/sorting';
 import { extractNanos, convertIsoToMillis } from './utils/date_conversion';
 import { fetchHitsInInterval } from './utils/fetch_hits_in_interval';
 import { generateIntervals } from './utils/generate_intervals';
 import { getEsQuerySearchAfter } from './utils/get_es_query_search_after';
 import { getEsQuerySort } from './utils/get_es_query_sort';
+import { esFilters } from '../../../../../../../../plugins/data/public';
 
 export type SurrDocType = 'successors' | 'predecessors';
 export interface EsHitRecord {
@@ -36,6 +34,8 @@ export interface EsHitRecord {
 }
 export type EsHitRecordList = EsHitRecord[];
 
+const { SearchSource } = getServices();
+
 const DAY_MILLIS = 24 * 60 * 60 * 1000;
 
 // look from 1 day up to 10000 days into the past and future
@@ -67,7 +67,7 @@ function fetchContextProvider(indexPatterns: IndexPatterns) {
     tieBreakerField: string,
     sortDir: SortDirection,
     size: number,
-    filters: Filter[]
+    filters: esFilters.Filter[]
   ) {
     if (typeof anchor !== 'object' || anchor === null) {
       return [];
@@ -112,7 +112,7 @@ function fetchContextProvider(indexPatterns: IndexPatterns) {
     return documents;
   }
 
-  async function createSearchSource(indexPattern: IndexPattern, filters: Filter[]) {
+  async function createSearchSource(indexPattern: IndexPattern, filters: esFilters.Filter[]) {
     return new SearchSource()
       .setParent(false)
       .setField('index', indexPattern)
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/__tests__/date_conversion.test.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/date_conversion.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/utils/__tests__/date_conversion.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/date_conversion.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/__tests__/sorting.test.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/sorting.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/utils/__tests__/sorting.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/sorting.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/date_conversion.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/date_conversion.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/utils/date_conversion.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/date_conversion.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/fetch_hits_in_interval.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/utils/fetch_hits_in_interval.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts
index 9a5436b59714d8..2810e5d9d7e663 100644
--- a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/fetch_hits_in_interval.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SearchSource } from 'ui/courier';
+import { SearchSource } from '../../../../kibana_services';
 import { convertTimeValueToIso } from './date_conversion';
 import { SortDirection } from './sorting';
 import { EsHitRecordList } from '../context';
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/generate_intervals.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/generate_intervals.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/utils/generate_intervals.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/generate_intervals.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/get_es_query_search_after.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_search_after.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/utils/get_es_query_search_after.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_search_after.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/get_es_query_sort.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_sort.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/utils/get_es_query_sort.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_sort.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/sorting.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/sorting.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/context/api/utils/sorting.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/sorting.ts
index b673270d7a6457..4a0f531845f46e 100644
--- a/src/legacy/core_plugins/kibana/public/discover/context/api/utils/sorting.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/sorting.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexPattern } from 'src/legacy/core_plugins/data/public';
+import { IndexPattern } from '../../../../kibana_services';
 
 export enum SortDirection {
   asc = 'asc',
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_action_bar.scss b/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_action_bar.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_action_bar.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_action_bar.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar.test.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar_directive.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_directive.ts
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_directive.ts
index 0942539e63785a..579d9d95c6f719 100644
--- a/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar_directive.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_directive.ts
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-// @ts-ignore
-import { uiModules } from 'ui/modules';
-import { wrapInI18nContext } from 'ui/i18n';
+import { getServices } from '../../../../kibana_services';
 import { ActionBar } from './action_bar';
 
+const { uiModules, wrapInI18nContext } = getServices();
+
 uiModules.get('apps/context').directive('contextActionBar', function(reactDirective: any) {
   return reactDirective(wrapInI18nContext(ActionBar));
 });
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar_warning.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_warning.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar_warning.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_warning.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/index.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query/actions.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query/actions.js
new file mode 100644
index 00000000000000..b88e54379f448e
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/query/actions.js
@@ -0,0 +1,192 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { toastNotifications } from '../../../kibana_services';
+
+import { fetchAnchorProvider } from '../api/anchor';
+import { fetchContextProvider } from '../api/context';
+import { QueryParameterActionsProvider } from '../query_parameters';
+import { FAILURE_REASONS, LOADING_STATUS } from './constants';
+import { MarkdownSimple } from '../../../../../../kibana_react/public';
+
+export function QueryActionsProvider(Private, Promise) {
+  const fetchAnchor = Private(fetchAnchorProvider);
+  const { fetchSurroundingDocs } = Private(fetchContextProvider);
+  const {
+    setPredecessorCount,
+    setQueryParameters,
+    setSuccessorCount,
+  } = Private(QueryParameterActionsProvider);
+
+  const setFailedStatus = (state) => (subject, details = {}) => (
+    state.loadingStatus[subject] = {
+      status: LOADING_STATUS.FAILED,
+      reason: FAILURE_REASONS.UNKNOWN,
+      ...details,
+    }
+  );
+
+  const setLoadedStatus = (state) => (subject) => (
+    state.loadingStatus[subject] = {
+      status: LOADING_STATUS.LOADED,
+    }
+  );
+
+  const setLoadingStatus = (state) => (subject) => (
+    state.loadingStatus[subject] = {
+      status: LOADING_STATUS.LOADING,
+    }
+  );
+
+  const fetchAnchorRow = (state) => () => {
+    const { queryParameters: { indexPatternId, anchorId, sort, tieBreakerField } } = state;
+
+    if (!tieBreakerField) {
+      return Promise.reject(setFailedStatus(state)('anchor', {
+        reason: FAILURE_REASONS.INVALID_TIEBREAKER
+      }));
+    }
+
+    setLoadingStatus(state)('anchor');
+
+    return Promise.try(() => (
+      fetchAnchor(indexPatternId, anchorId, [_.zipObject([sort]), { [tieBreakerField]: sort[1] }])
+    ))
+      .then(
+        (anchorDocument) => {
+          setLoadedStatus(state)('anchor');
+          state.rows.anchor = anchorDocument;
+          return anchorDocument;
+        },
+        (error) => {
+          setFailedStatus(state)('anchor', { error });
+          toastNotifications.addDanger({
+            title: i18n.translate('kbn.context.unableToLoadAnchorDocumentDescription', {
+              defaultMessage: 'Unable to load the anchor document'
+            }),
+            text: <MarkdownSimple>{error.message}</MarkdownSimple>,
+          });
+          throw error;
+        }
+      );
+  };
+
+  const fetchSurroundingRows = (type, state) => {
+    const {
+      queryParameters: { indexPatternId, filters,  sort, tieBreakerField },
+      rows: { anchor },
+    } = state;
+    const count = type === 'successors'
+      ? state.queryParameters.successorCount
+      : state.queryParameters.predecessorCount;
+
+    if (!tieBreakerField) {
+      return Promise.reject(setFailedStatus(state)(type, {
+        reason: FAILURE_REASONS.INVALID_TIEBREAKER
+      }));
+    }
+
+    setLoadingStatus(state)(type);
+    const [sortField, sortDir] = sort;
+
+    return Promise.try(() => (
+      fetchSurroundingDocs(
+        type,
+        indexPatternId,
+        anchor,
+        sortField,
+        tieBreakerField,
+        sortDir,
+        count,
+        filters
+      )
+    ))
+      .then(
+        (documents) => {
+          setLoadedStatus(state)(type);
+          state.rows[type] = documents;
+          return documents;
+        },
+        (error) => {
+          setFailedStatus(state)(type, { error });
+          toastNotifications.addDanger({
+            title: i18n.translate('kbn.context.unableToLoadDocumentDescription', {
+              defaultMessage: 'Unable to load documents'
+            }),
+            text: <MarkdownSimple>{error.message}</MarkdownSimple>,
+          });
+          throw error;
+        },
+      );
+  };
+
+  const fetchContextRows = (state) => () => (
+    Promise.all([
+      fetchSurroundingRows('predecessors', state),
+      fetchSurroundingRows('successors', state),
+    ])
+  );
+
+  const fetchAllRows = (state) => () => (
+    Promise.try(fetchAnchorRow(state))
+      .then(fetchContextRows(state))
+  );
+
+  const fetchContextRowsWithNewQueryParameters = (state) => (queryParameters) => {
+    setQueryParameters(state)(queryParameters);
+    return fetchContextRows(state)();
+  };
+
+  const fetchAllRowsWithNewQueryParameters = (state) => (queryParameters) => {
+    setQueryParameters(state)(queryParameters);
+    return fetchAllRows(state)();
+  };
+
+  const fetchGivenPredecessorRows = (state) => (count) => {
+    setPredecessorCount(state)(count);
+    return fetchSurroundingRows('predecessors', state);
+  };
+
+  const fetchGivenSuccessorRows = (state) => (count) => {
+    setSuccessorCount(state)(count);
+    return fetchSurroundingRows('successors', state);
+  };
+
+  const setAllRows = (state) => (predecessorRows, anchorRow, successorRows) => (
+    state.rows.all = [
+      ...(predecessorRows || []),
+      ...(anchorRow ? [anchorRow] : []),
+      ...(successorRows || []),
+    ]
+  );
+
+  return {
+    fetchAllRows,
+    fetchAllRowsWithNewQueryParameters,
+    fetchAnchorRow,
+    fetchContextRows,
+    fetchContextRowsWithNewQueryParameters,
+    fetchGivenPredecessorRows,
+    fetchGivenSuccessorRows,
+    setAllRows,
+  };
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query/constants.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query/constants.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query/constants.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query/constants.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query/index.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query/index.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query/state.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query/state.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query/state.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query/state.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/_utils.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/_utils.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/_utils.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/_utils.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_add_filter.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_add_filter.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
index 1c96cbeec04a3a..b136b03bd500bf 100644
--- a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_add_filter.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
@@ -20,9 +20,7 @@
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import sinon from 'sinon';
-
-import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
-
+import { getServices } from '../../../../kibana_services';
 import { createStateStub } from './_utils';
 import { QueryParameterActionsProvider } from '../actions';
 
@@ -36,7 +34,7 @@ describe('context app', function () {
 
     beforeEach(ngMock.inject(function createPrivateStubs(Private) {
       filterManagerStub = createQueryFilterStub();
-      Private.stub(FilterBarQueryFilterProvider, filterManagerStub);
+      Private.stub(getServices().FilterBarQueryFilterProvider, filterManagerStub);
 
       addFilter = Private(QueryParameterActionsProvider).addFilter;
     }));
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_predecessor_count.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_predecessor_count.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_predecessor_count.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_predecessor_count.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_query_parameters.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_query_parameters.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_query_parameters.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_query_parameters.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_successor_count.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_successor_count.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_successor_count.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_successor_count.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js
new file mode 100644
index 00000000000000..9f7b180e8fe7db
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js
@@ -0,0 +1,80 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+import { getServices, getFilterGenerator } from '../../../kibana_services';
+
+import {
+  MAX_CONTEXT_SIZE,
+  MIN_CONTEXT_SIZE,
+  QUERY_PARAMETER_KEYS,
+} from './constants';
+
+
+export function QueryParameterActionsProvider(indexPatterns, Private) {
+  const queryFilter = Private(getServices().FilterBarQueryFilterProvider);
+  const filterGen = getFilterGenerator(queryFilter);
+
+  const setPredecessorCount = (state) => (predecessorCount) => (
+    state.queryParameters.predecessorCount = clamp(
+      MIN_CONTEXT_SIZE,
+      MAX_CONTEXT_SIZE,
+      predecessorCount,
+    )
+  );
+
+  const setSuccessorCount = (state) => (successorCount) => (
+    state.queryParameters.successorCount = clamp(
+      MIN_CONTEXT_SIZE,
+      MAX_CONTEXT_SIZE,
+      successorCount,
+    )
+  );
+
+  const setQueryParameters = (state) => (queryParameters) => (
+    Object.assign(
+      state.queryParameters,
+      _.pick(queryParameters, QUERY_PARAMETER_KEYS),
+    )
+  );
+
+  const updateFilters = () => filters => {
+    queryFilter.setFilters(filters);
+  };
+
+  const addFilter = (state) => async (field, values, operation) => {
+    const indexPatternId = state.queryParameters.indexPatternId;
+    const newFilters = filterGen.generate(field, values, operation, indexPatternId);
+    queryFilter.addFilters(newFilters);
+    const indexPattern = await indexPatterns.get(indexPatternId);
+    indexPattern.popularizeField(field.name, 1);
+  };
+
+  return {
+    addFilter,
+    updateFilters,
+    setPredecessorCount,
+    setQueryParameters,
+    setSuccessorCount,
+  };
+}
+
+function clamp(minimum, maximum, value) {
+  return Math.max(Math.min(maximum, value), minimum);
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/constants.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query_parameters/constants.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/index.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query_parameters/index.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/state.ts b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/state.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/query_parameters/state.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/state.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/app.html b/src/legacy/core_plugins/kibana/public/discover/angular/context_app.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/context/app.html
rename to src/legacy/core_plugins/kibana/public/discover/angular/context_app.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context_app.js b/src/legacy/core_plugins/kibana/public/discover/angular/context_app.js
new file mode 100644
index 00000000000000..c9856ad7949523
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/context_app.js
@@ -0,0 +1,155 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+import { getServices, callAfterBindingsWorkaround } from './../kibana_services';
+import contextAppTemplate from './context_app.html';
+import './context/components/action_bar';
+import { getFirstSortableField } from './context/api/utils/sorting';
+import {
+  createInitialQueryParametersState,
+  QueryParameterActionsProvider,
+  QUERY_PARAMETER_KEYS,
+} from './context/query_parameters';
+import {
+  createInitialLoadingStatusState,
+  FAILURE_REASONS,
+  LOADING_STATUS,
+  QueryActionsProvider,
+} from './context/query';
+
+const { uiModules, timefilter } = getServices();
+
+// load directives
+import '../../../../data/public/legacy';
+
+const module = uiModules.get('apps/context', [
+  'elasticsearch',
+  'kibana',
+  'kibana/config',
+  'ngRoute',
+]);
+
+module.directive('contextApp', function ContextApp() {
+  return {
+    bindToController: true,
+    controller: callAfterBindingsWorkaround(ContextAppController),
+    controllerAs: 'contextApp',
+    restrict: 'E',
+    scope: {
+      anchorId: '=',
+      columns: '=',
+      indexPattern: '=',
+      filters: '=',
+      predecessorCount: '=',
+      successorCount: '=',
+      sort: '=',
+      discoverUrl: '=',
+    },
+    template: contextAppTemplate,
+  };
+});
+
+function ContextAppController($scope, config, Private) {
+  const queryParameterActions = Private(QueryParameterActionsProvider);
+  const queryActions = Private(QueryActionsProvider);
+
+  timefilter.disableAutoRefreshSelector();
+  timefilter.disableTimeRangeSelector();
+
+  this.state = createInitialState(
+    parseInt(config.get('context:step'), 10),
+    getFirstSortableField(this.indexPattern, config.get('context:tieBreakerFields')),
+    this.discoverUrl,
+  );
+
+  this.actions = _.mapValues({
+    ...queryParameterActions,
+    ...queryActions,
+  }, (action) => (...args) => action(this.state)(...args));
+
+  this.constants = {
+    FAILURE_REASONS,
+    LOADING_STATUS,
+  };
+
+  $scope.$watchGroup([
+    () => this.state.rows.predecessors,
+    () => this.state.rows.anchor,
+    () => this.state.rows.successors,
+  ], (newValues) => this.actions.setAllRows(...newValues));
+
+  /**
+   * Sync properties to state
+   */
+  $scope.$watchCollection(
+    () => ({
+      ...(_.pick(this, QUERY_PARAMETER_KEYS)),
+      indexPatternId: this.indexPattern.id,
+    }),
+    (newQueryParameters) => {
+      const { queryParameters } = this.state;
+      if (
+        (newQueryParameters.indexPatternId !== queryParameters.indexPatternId)
+        || (newQueryParameters.anchorId !== queryParameters.anchorId)
+        || (!_.isEqual(newQueryParameters.sort, queryParameters.sort))
+      ) {
+        this.actions.fetchAllRowsWithNewQueryParameters(_.cloneDeep(newQueryParameters));
+      } else if (
+        (newQueryParameters.predecessorCount !== queryParameters.predecessorCount)
+        || (newQueryParameters.successorCount !== queryParameters.successorCount)
+        || (!_.isEqual(newQueryParameters.filters, queryParameters.filters))
+      ) {
+        this.actions.fetchContextRowsWithNewQueryParameters(_.cloneDeep(newQueryParameters));
+      }
+    },
+  );
+
+  /**
+   * Sync state to properties
+   */
+  $scope.$watchCollection(
+    () => ({
+      predecessorCount: this.state.queryParameters.predecessorCount,
+      successorCount: this.state.queryParameters.successorCount,
+    }),
+    (newParameters) => {
+      _.assign(this, newParameters);
+    },
+  );
+}
+
+
+function createInitialState(defaultStepSize, tieBreakerField, discoverUrl) {
+  return {
+    queryParameters: createInitialQueryParametersState(defaultStepSize, tieBreakerField),
+    rows: {
+      all: [],
+      anchor: null,
+      predecessors: [],
+      successors: [],
+    },
+    loadingStatus: createInitialLoadingStatusState(),
+    navigation: {
+      discover: {
+        url: discoverUrl,
+      },
+    },
+  };
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx
index 0dca912653f6c5..ab336396b5bed2 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx
@@ -23,7 +23,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import lightEuiTheme from '@elastic/eui/dist/eui_theme_light.json';
 import darkEuiTheme from '@elastic/eui/dist/eui_theme_dark.json';
-import { npStart } from 'ui/new_platform';
 
 import {
   AnnotationDomainTypes,
@@ -44,12 +43,9 @@ import {
 } from '@elastic/charts';
 
 import { i18n } from '@kbn/i18n';
-
-import chrome from 'ui/chrome';
-// @ts-ignore: path dynamic for kibana
-import { timezoneProvider } from 'ui/vis/lib/timezone';
 import { EuiChartThemeType } from '@elastic/eui/src/themes/charts/themes';
 import { Subscription } from 'rxjs';
+import { getServices, timezoneProvider } from '../../kibana_services';
 
 export interface DiscoverHistogramProps {
   chartData: any;
@@ -68,12 +64,12 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
 
   private subscription?: Subscription;
   public state = {
-    chartsTheme: npStart.plugins.eui_utils.getChartsThemeDefault(),
+    chartsTheme: getServices().eui_utils.getChartsThemeDefault(),
   };
 
   componentDidMount() {
-    this.subscription = npStart.plugins.eui_utils
-      .getChartsTheme$()
+    this.subscription = getServices()
+      .eui_utils.getChartsTheme$()
       .subscribe(chartsTheme => this.setState({ chartsTheme }));
   }
 
@@ -145,7 +141,7 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
   };
 
   public render() {
-    const uiSettings = chrome.getUiSettingsClient();
+    const uiSettings = getServices().uiSettings;
     const timeZone = timezoneProvider(uiSettings)();
     const { chartData } = this.props;
     const { chartsTheme } = this.state;
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js b/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
index 27918bd704f5a9..b0b766478450fc 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
@@ -17,16 +17,15 @@
  * under the License.
  */
 
-import 'ngreact';
-import { wrapInI18nContext } from 'ui/i18n';
-import { uiModules } from 'ui/modules';
-import '../../../../../../ui/public/render_complete/directive';
 
+import '../../../../../../ui/public/render_complete/directive';
 import { DiscoverNoResults } from './no_results';
 import { DiscoverUninitialized } from './uninitialized';
 import { DiscoverUnsupportedIndexPattern } from './unsupported_index_pattern';
 import { DiscoverHistogram } from './histogram';
+import { getServices } from '../../kibana_services';
 
+const { wrapInI18nContext, uiModules } = getServices();
 const app = uiModules.get('apps/discover', ['react']);
 
 app.directive('discoverNoResults', reactDirective =>
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js b/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js
index 5f6d32681b50e4..b5d3e8a5a01ca2 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js
@@ -32,6 +32,7 @@ import {
   EuiSpacer,
   EuiText,
 } from '@elastic/eui';
+import { getServices } from '../../kibana_services';
 
 // eslint-disable-next-line react/prefer-stateless-function
 export class DiscoverNoResults extends Component {
@@ -39,7 +40,6 @@ export class DiscoverNoResults extends Component {
     shardFailures: PropTypes.array,
     timeFieldName: PropTypes.string,
     queryLanguage: PropTypes.string,
-    getDocLink: PropTypes.func.isRequired,
   };
 
   render() {
@@ -47,7 +47,6 @@ export class DiscoverNoResults extends Component {
       shardFailures,
       timeFieldName,
       queryLanguage,
-      getDocLink,
     } = this.props;
 
     let shardFailuresMessage;
@@ -226,7 +225,7 @@ export class DiscoverNoResults extends Component {
                   queryStringSyntaxLink: (
                     <EuiLink
                       target="_blank"
-                      href={getDocLink('query.luceneQuerySyntax')}
+                      href={getServices().docLinks.links.query.luceneQuerySyntax}
                     >
                       <FormattedMessage
                         id="kbn.discover.noResults.searchExamples.queryStringSyntaxLinkText"
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js b/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js
index afc9ec14f51c07..33dff54f94c7f2 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js
@@ -20,30 +20,44 @@
 import React from 'react';
 import { renderWithIntl } from 'test_utils/enzyme_helpers';
 
-import {
-  DiscoverNoResults,
-} from './no_results';
+import { DiscoverNoResults } from './no_results';
+
+jest.mock('../../kibana_services', () => {
+  return {
+    getServices: () => ({
+      docLinks: {
+        links: {
+          query: {
+            luceneQuerySyntax: 'documentation-link',
+          },
+        },
+      },
+    }),
+  };
+});
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
 
 describe('DiscoverNoResults', () => {
   describe('props', () => {
     describe('shardFailures', () => {
       test('renders failures list when there are failures', () => {
-        const shardFailures = [{
-          index: 'A',
-          shard: '1',
-          reason: { reason: 'Awful error' },
-        }, {
-          index: 'B',
-          shard: '2',
-          reason: { reason: 'Bad error' },
-        }];
+        const shardFailures = [
+          {
+            index: 'A',
+            shard: '1',
+            reason: { reason: 'Awful error' },
+          },
+          {
+            index: 'B',
+            shard: '2',
+            reason: { reason: 'Bad error' },
+          },
+        ];
 
-        const component = renderWithIntl(
-          <DiscoverNoResults
-            shardFailures={shardFailures}
-            getDocLink={() => ''}
-          />
-        );
+        const component = renderWithIntl(<DiscoverNoResults shardFailures={shardFailures} />);
 
         expect(component).toMatchSnapshot();
       });
@@ -51,12 +65,7 @@ describe('DiscoverNoResults', () => {
       test(`doesn't render failures list when there are no failures`, () => {
         const shardFailures = [];
 
-        const component = renderWithIntl(
-          <DiscoverNoResults
-            shardFailures={shardFailures}
-            getDocLink={() => ''}
-          />
-        );
+        const component = renderWithIntl(<DiscoverNoResults shardFailures={shardFailures} />);
 
         expect(component).toMatchSnapshot();
       });
@@ -64,12 +73,7 @@ describe('DiscoverNoResults', () => {
 
     describe('timeFieldName', () => {
       test('renders time range feedback', () => {
-        const component = renderWithIntl(
-          <DiscoverNoResults
-            timeFieldName="awesome_time_field"
-            getDocLink={() => ''}
-          />
-        );
+        const component = renderWithIntl(<DiscoverNoResults timeFieldName="awesome_time_field" />);
 
         expect(component).toMatchSnapshot();
       });
@@ -78,10 +82,7 @@ describe('DiscoverNoResults', () => {
     describe('queryLanguage', () => {
       test('supports lucene and renders doc link', () => {
         const component = renderWithIntl(
-          <DiscoverNoResults
-            queryLanguage="lucene"
-            getDocLink={() => 'documentation-link'}
-          />
+          <DiscoverNoResults queryLanguage="lucene" getDocLink={() => 'documentation-link'} />
         );
 
         expect(component).toMatchSnapshot();
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js b/src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js
index ac26203dafc4ad..b1c1c47e39291d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js
@@ -18,7 +18,6 @@
  */
 
 import React, { Fragment } from 'react';
-
 import {
   EuiCallOut,
   EuiFlexGroup,
diff --git a/src/legacy/core_plugins/kibana/public/discover/index.html b/src/legacy/core_plugins/kibana/public/discover/angular/discover.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/index.html
rename to src/legacy/core_plugins/kibana/public/discover/angular/discover.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
index 840152fc40ced3..ed5049aa912e0a 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
@@ -18,63 +18,65 @@
  */
 
 import _ from 'lodash';
-import { i18n } from '@kbn/i18n';
 import React from 'react';
-import angular from 'angular';
 import { Subscription } from 'rxjs';
 import moment from 'moment';
-import chrome from 'ui/chrome';
 import dateMath from '@elastic/datemath';
+import { i18n } from '@kbn/i18n';
+import '../saved_searches/saved_searches';
+import '../components/field_chooser/field_chooser';
 
 // doc table
-import '../doc_table';
-import { getSort } from '../doc_table/lib/get_sort';
-import { getSortForSearchSource } from '../doc_table/lib/get_sort_for_search_source';
-import * as columnActions from '../doc_table/actions/columns';
-import * as filterActions from '../doc_table/actions/filter';
-
-import 'ui/directives/listen';
-import 'ui/visualize';
-import 'ui/fixed_scroll';
-import 'ui/index_patterns';
-import 'ui/state_management/app_state';
-import { timefilter } from 'ui/timefilter';
-import { hasSearchStategyForIndexPattern, isDefaultTypeIndexPattern } from 'ui/courier';
-import { toastNotifications } from 'ui/notify';
-import { VisProvider } from 'ui/vis';
-import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
-import { vislibSeriesResponseHandlerProvider } from 'ui/vis/response_handlers/vislib';
-import { docTitle } from 'ui/doc_title';
-import { intervalOptions } from 'ui/agg_types/buckets/_interval_options';
-import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
-import uiRoutes from 'ui/routes';
-import { uiModules } from 'ui/modules';
-import indexTemplate from '../index.html';
-import { StateProvider } from 'ui/state_management/state';
-import { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
-import { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
-import { getFilterGenerator } from 'ui/filter_manager';
-
-import { getDocLink } from 'ui/documentation_links';
-import '../components/fetch_error';
-import { getPainlessError } from './get_painless_error';
-import { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share';
-import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
-import { Inspector } from 'ui/inspector';
-import { RequestAdapter } from 'ui/inspector/adapters';
-import { getRequestInspectorStats, getResponseInspectorStats } from 'ui/courier/utils/courier_inspector_utils';
+import './doc_table';
+import { getSort } from './doc_table/lib/get_sort';
+import { getSortForSearchSource } from './doc_table/lib/get_sort_for_search_source';
+import * as columnActions from './doc_table/actions/columns';
+import * as filterActions from './doc_table/actions/filter';
+
+import indexTemplate from './discover.html';
 import { showOpenSearchPanel } from '../top_nav/show_open_search_panel';
-import { tabifyAggResponse } from 'ui/agg_response/tabify';
-import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
-import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
-import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../breadcrumbs';
-import { buildVislibDimensions } from 'ui/visualize/loader/pipeline_helpers/build_pipeline';
-import 'ui/capabilities/route_setup';
 import { addHelpMenuToAppChrome } from '../components/help_menu/help_menu_util';
+import '../components/fetch_error';
+import { getPainlessError } from './get_painless_error';
+import {
+  angular,
+  buildVislibDimensions,
+  getFilterGenerator,
+  getRequestInspectorStats,
+  getResponseInspectorStats,
+  getServices,
+  getUnhashableStatesProvider,
+  hasSearchStategyForIndexPattern,
+  intervalOptions,
+  isDefaultTypeIndexPattern,
+  migrateLegacyQuery,
+  RequestAdapter,
+  showSaveModal,
+  showShareContextMenu,
+  stateMonitorFactory,
+  subscribeWithScope,
+  tabifyAggResponse,
+  vislibSeriesResponseHandlerProvider,
+  VisProvider,
+  SavedObjectSaveModal,
+} from '../kibana_services';
+
+const {
+  chrome,
+  docTitle,
+  FilterBarQueryFilterProvider,
+  ShareContextMenuExtensionsRegistryProvider,
+  StateProvider,
+  timefilter,
+  toastNotifications,
+  uiModules,
+  uiRoutes,
+}  = getServices();
 
+import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../breadcrumbs';
 import { extractTimeFilter, changeTimeFilter } from '../../../../data/public';
 import { start as data } from '../../../../data/public/legacy';
-import { npStart } from 'ui/new_platform';
+
 
 const { savedQueryService } = data.search.services;
 
@@ -151,7 +153,7 @@ uiRoutes
         return savedSearches.get(savedSearchId)
           .then((savedSearch) => {
             if (savedSearchId) {
-              npStart.core.chrome.recentlyAccessed.add(
+              chrome.recentlyAccessed.add(
                 savedSearch.getFullPath(),
                 savedSearch.title,
                 savedSearchId);
@@ -211,8 +213,6 @@ function discoverController(
       mode: 'absolute',
     });
   };
-
-  $scope.getDocLink = getDocLink;
   $scope.intervalOptions = intervalOptions;
   $scope.showInterval = false;
   $scope.minimumVisibleRows = 50;
@@ -354,7 +354,7 @@ function discoverController(
       }),
       testId: 'openInspectorButton',
       run() {
-        Inspector.open(inspectorAdapters, {
+        getServices().inspector.open(inspectorAdapters, {
           title: savedSearch.title
         });
       }
@@ -401,12 +401,12 @@ function discoverController(
   });
 
   if (savedSearch.id && savedSearch.title) {
-    chrome.breadcrumbs.set([{
+    chrome.setBreadcrumbs([{
       text: discoverBreadcrumbsTitle,
       href: '#/discover',
     }, { text: savedSearch.title }]);
   } else {
-    chrome.breadcrumbs.set([{
+    chrome.setBreadcrumbs([{
       text: discoverBreadcrumbsTitle,
     }]);
   }
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc/index.html b/src/legacy/core_plugins/kibana/public/discover/angular/doc.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc/index.html
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc.ts b/src/legacy/core_plugins/kibana/public/discover/angular/doc.ts
new file mode 100644
index 00000000000000..e6c890c9a66a22
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc.ts
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { getServices, IndexPatterns } from '../kibana_services';
+// @ts-ignore
+import { getRootBreadcrumbs } from '../breadcrumbs';
+import html from './doc.html';
+import { Doc } from '../doc/doc';
+const { uiRoutes, uiModules, wrapInI18nContext, timefilter } = getServices();
+uiModules.get('apps/discover').directive('discoverDoc', function(reactDirective: any) {
+  return reactDirective(
+    wrapInI18nContext(Doc),
+    [
+      ['id', { watchDepth: 'value' }],
+      ['index', { watchDepth: 'value' }],
+      ['indexPatternId', { watchDepth: 'reference' }],
+      ['indexPatternService', { watchDepth: 'reference' }],
+      ['esClient', { watchDepth: 'reference' }],
+    ],
+    { restrict: 'E' }
+  );
+});
+
+uiRoutes
+  // the old, pre 8.0 route, no longer used, keep it to stay compatible
+  // somebody might have bookmarked his favorite log messages
+  .when('/doc/:indexPattern/:index/:type', {
+    redirectTo: '/doc/:indexPattern/:index',
+  })
+  // the new route, es 7 deprecated types, es 8 removed them
+  .when('/doc/:indexPattern/:index', {
+    controller: ($scope: any, $route: any, es: any, indexPatterns: IndexPatterns) => {
+      timefilter.disableAutoRefreshSelector();
+      timefilter.disableTimeRangeSelector();
+      $scope.esClient = es;
+      $scope.id = $route.current.params.id;
+      $scope.index = $route.current.params.index;
+      $scope.indexPatternId = $route.current.params.indexPattern;
+      $scope.indexPatternService = indexPatterns;
+    },
+    template: html,
+    k7Breadcrumbs: ($route: any) => [
+      ...getRootBreadcrumbs(),
+      {
+        text: `${$route.current.params.index}#${$route.current.params.id}`,
+      },
+    ],
+  });
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/actions/filter.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/actions/filter.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/actions/filter.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/actions/filter.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/doc_table.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/doc_table.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/doc_table.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/doc_table.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/get_sort.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/lib/get_sort.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/get_sort.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/lib/rows_headers.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/__tests__/lib/rows_headers.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/_doc_table.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/_doc_table.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/actions/columns.ts b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/actions/columns.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/actions/columns.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/actions/columns.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/actions/filter.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/actions/filter.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/actions/filter.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/actions/filter.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/_table_header.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_table_header.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/_table_header.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_table_header.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/index.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/index.js
new file mode 100644
index 00000000000000..7462de544dbce3
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/index.js
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { getServices } from '../../../../kibana_services';
+import { ToolBarPagerText } from './tool_bar_pager_text';
+import { ToolBarPagerButtons } from './tool_bar_pager_buttons';
+
+const { wrapInI18nContext, uiModules } = getServices();
+
+const app = uiModules.get('kibana');
+
+app.directive('toolBarPagerText', function (reactDirective) {
+  return reactDirective(wrapInI18nContext(ToolBarPagerText));
+});
+
+app.directive('toolBarPagerButtons', function (reactDirective) {
+  return reactDirective(wrapInI18nContext(ToolBarPagerButtons));
+});
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/tool_bar_pager_buttons.test.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/tool_bar_pager_buttons.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/tool_bar_pager_buttons.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/tool_bar_pager_buttons.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx
index 6ce987028c197e..3edcda8c3bea99 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/tool_bar_pager_buttons.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx
@@ -34,7 +34,7 @@ export function ToolBarPagerButtons(props: Props) {
         disabled={!props.hasPreviousPage}
         data-test-subj="btnPrevPage"
       >
-        <span className="kuiButton__icon kuiIcon fa-chevron-left"></span>
+        <span className="kuiButton__icon kuiIcon fa-chevron-left" />
       </button>
       <button
         className="kuiButton kuiButton--basic kuiButton--icon"
@@ -42,7 +42,7 @@ export function ToolBarPagerButtons(props: Props) {
         disabled={!props.hasNextPage}
         data-test-subj="btnNextPage"
       >
-        <span className="kuiButton__icon kuiIcon fa-chevron-right"></span>
+        <span className="kuiButton__icon kuiIcon fa-chevron-right" />
       </button>
     </div>
   );
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/tool_bar_pager_text.test.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/tool_bar_pager_text.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/tool_bar_pager_text.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/tool_bar_pager_text.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header.ts b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header.ts
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header.ts
index e054120c084749..f447c545077293 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header.ts
@@ -17,10 +17,9 @@
  * under the License.
  */
 import { wrapInI18nContext } from 'ui/i18n';
-// @ts-ignore
-import { uiModules } from 'ui/modules';
+import { getServices } from '../../../kibana_services';
 import { TableHeader } from './table_header/table_header';
-const module = uiModules.get('app/discover');
+const module = getServices().uiModules.get('app/discover');
 
 module.directive('kbnTableHeader', function(reactDirective: any, config: any) {
   return reactDirective(
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/helpers.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/helpers.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/helpers.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/helpers.tsx
index ddf960091d4761..80f963c8ccb3ee 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/helpers.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/helpers.tsx
@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../kibana_services';
 // @ts-ignore
-import { shortenDottedString } from '../../../../../common/utils/shorten_dotted_string';
+import { shortenDottedString } from '../../../../../../common/utils/shorten_dotted_string';
 
 export type SortOrder = [string, 'asc' | 'desc'];
 export interface ColumnProps {
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.test.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.test.tsx
index ea2c65b1b84879..09ba77c7c49992 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.test.tsx
@@ -23,7 +23,7 @@ import { TableHeader } from './table_header';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { SortOrder } from './helpers';
-import { IndexPattern, FieldType } from 'ui/index_patterns';
+import { IndexPattern, FieldType } from '../../../../kibana_services';
 
 function getMockIndexPattern() {
   return ({
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.tsx
similarity index 91%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.tsx
index abc8077afb6698..71674710ac8559 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.tsx
@@ -17,9 +17,8 @@
  * under the License.
  */
 import React from 'react';
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../kibana_services';
 // @ts-ignore
-import { shortenDottedString } from '../../../../../common/utils/shorten_dotted_string';
 import { TableHeaderColumn } from './table_header_column';
 import { SortOrder, getDisplayedColumns } from './helpers';
 
@@ -48,7 +47,7 @@ export function TableHeader({
 
   return (
     <tr data-test-subj="docTableHeader" className="kbnDocTableHeader">
-      <th style={{ width: '24px' }}></th>
+      <th style={{ width: '24px' }} />
       {displayedColumns.map(col => {
         return (
           <TableHeaderColumn
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header_column.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header_column.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header_column.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header_column.tsx
index 87d04820531885..1940c6b0bff9ea 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_header/table_header_column.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header_column.tsx
@@ -17,11 +17,8 @@
  * under the License.
  */
 import React from 'react';
-import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { EuiToolTip } from '@elastic/eui';
-// @ts-ignore
-import { shortenDottedString } from '../../../../../common/utils/shorten_dotted_string';
 import { SortOrder } from './helpers';
 
 interface Props {
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.js
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.js
index 8e4105bac827e2..6f5a94442e9774 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.js
@@ -21,16 +21,17 @@ import _ from 'lodash';
 import $ from 'jquery';
 import rison from 'rison-node';
 import '../../doc_viewer';
-import { noWhiteSpace } from '../../../../common/utils/no_white_space';
+import { noWhiteSpace } from '../../../../../common/utils/no_white_space';
+
 import openRowHtml from './table_row/open.html';
 import detailsHtml from './table_row/details.html';
-import { uiModules } from 'ui/modules';
-import { disableFilter } from '@kbn/es-query';
-import { dispatchRenderComplete } from '../../../../../../../plugins/kibana_utils/public';
+import { getServices } from '../../../kibana_services';
+import { dispatchRenderComplete } from '../../../../../../../../plugins/kibana_utils/public';
 import cellTemplateHtml from '../components/table_row/cell.html';
 import truncateByHeightTemplateHtml from '../components/table_row/truncate_by_height.html';
+import { esFilters } from '../../../../../../../../plugins/data/public';
 
-const module = uiModules.get('app/discover');
+const module = getServices().uiModules.get('app/discover');
 
 // guesstimate at the minimum number of chars wide cells in the table should be
 const MIN_LINE_LENGTH = 20;
@@ -116,7 +117,7 @@ module.directive('kbnTableRow', function ($compile, $httpParamSerializer, kbnUrl
         const hash = $httpParamSerializer({
           _a: rison.encode({
             columns: $scope.columns,
-            filters: ($scope.filters || []).map(disableFilter),
+            filters: ($scope.filters || []).map(esFilters.disableFilter),
           }),
         });
         return `${path}?${hash}`;
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/_cell.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_cell.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/_cell.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_cell.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/_details.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_details.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/_details.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_details.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/_open.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_open.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/_open.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_open.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/cell.html b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/cell.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/cell.html
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/cell.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/details.html b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/details.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/details.html
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/details.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/open.html b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/open.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/open.html
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/open.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/truncate_by_height.html b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/truncate_by_height.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row/truncate_by_height.html
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/truncate_by_height.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.html b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.html
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.js
index 7f0046dbe06148..72943671fec22d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.js
@@ -22,13 +22,15 @@ import html from './doc_table.html';
 import './infinite_scroll';
 import './components/table_header';
 import './components/table_row';
-import { dispatchRenderComplete } from '../../../../../../plugins/kibana_utils/public';
-import { uiModules } from 'ui/modules';
+import { dispatchRenderComplete } from '../../../../../../../plugins/kibana_utils/public';
+import { getServices } from '../../kibana_services';
 import './components/pager';
 import './lib/pager';
 
 import { getLimitedSearchResultsMessage } from './doc_table_strings';
 
+const { uiModules } = getServices();
+
 uiModules.get('app/discover')
   .directive('docTable', function (config, getAppState, pagerFactory, $filter) {
     return {
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table_strings.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table_strings.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table_strings.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table_strings.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/index.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/index.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/infinite_scroll.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/infinite_scroll.js
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/infinite_scroll.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/infinite_scroll.js
index 8459cc70ff6583..bf12deeb6b05fa 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/infinite_scroll.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/infinite_scroll.js
@@ -18,8 +18,9 @@
  */
 
 import $ from 'jquery';
-import { uiModules } from 'ui/modules';
-const module = uiModules.get('app/discover');
+import { getServices } from '../../kibana_services';
+
+const module = getServices().uiModules.get('app/discover');
 
 module.directive('kbnInfiniteScroll', function () {
   return {
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort.d.ts b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.d.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort.d.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.d.ts
index 50c63a514da04a..bb32da0d11fc0f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort.d.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.d.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { StaticIndexPattern } from 'ui/index_patterns';
+import { StaticIndexPattern } from '../../../kibana_services';
 import { SortOrder } from '../components/table_header/helpers';
 
 export function getSort(
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort_for_search_source.ts b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort_for_search_source.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort_for_search_source.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort_for_search_source.ts
index 95adc20d89f817..952eadf7cbd942 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort_for_search_source.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort_for_search_source.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../kibana_services';
 import { SortOrder } from '../components/table_header/helpers';
 import { getSort } from './get_sort';
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/pager/index.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/lib/pager/index.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/pager/pager.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/lib/pager/pager.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/pager/pager_factory.js b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager_factory.js
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/discover/doc_table/lib/pager/pager_factory.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager_factory.js
index 034160e9e2ca09..5d488fab0c87ff 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/lib/pager/pager_factory.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager_factory.js
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { uiModules } from 'ui/modules';
+import { getServices } from '../../../../kibana_services';
 import { Pager } from './pager';
 
-const app = uiModules.get('kibana');
+const app = getServices().uiModules.get('kibana');
 
 app.factory('pagerFactory', () => {
   return {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_viewer.ts b/src/legacy/core_plugins/kibana/public/discover/angular/doc_viewer.ts
new file mode 100644
index 00000000000000..c13c3545284139
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/doc_viewer.ts
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+// @ts-ignore
+import { getServices } from '../kibana_services';
+import { DocViewer } from '../doc_viewer/doc_viewer';
+
+const { uiModules } = getServices();
+
+uiModules.get('apps/discover').directive('docViewer', (reactDirective: any) => {
+  return reactDirective(
+    DocViewer,
+    [
+      'hit',
+      ['indexPattern', { watchDepth: 'reference' }],
+      ['filter', { watchDepth: 'reference' }],
+      ['columns', { watchDepth: 'collection' }],
+      ['onAddColumn', { watchDepth: 'reference' }],
+      ['onRemoveColumn', { watchDepth: 'reference' }],
+    ],
+    {
+      restrict: 'E',
+      scope: {
+        hit: '=',
+        indexPattern: '=',
+        filter: '=?',
+        columns: '=?',
+        onAddColumn: '=?',
+        onRemoveColumn: '=?',
+      },
+    }
+  );
+});
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/index.ts b/src/legacy/core_plugins/kibana/public/discover/angular/index.ts
new file mode 100644
index 00000000000000..5bae0d9d551e53
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/index.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 './discover';
+import './doc';
+import './context';
+import './doc_viewer';
+import './directives';
diff --git a/src/legacy/core_plugins/kibana/public/discover/breadcrumbs.js b/src/legacy/core_plugins/kibana/public/discover/breadcrumbs.js
deleted file mode 100644
index 1220c99b5ee568..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/breadcrumbs.js
+++ /dev/null
@@ -1,40 +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';
-
-export function getRootBreadcrumbs() {
-  return [
-    {
-      text: i18n.translate('kbn.discover.rootBreadcrumb', {
-        defaultMessage: 'Discover'
-      }),
-      href: '#/discover'
-    }
-  ];
-}
-
-export function getSavedSearchBreadcrumbs($route) {
-  return [
-    ...getRootBreadcrumbs(),
-    {
-      text: $route.current.locals.savedSearch.id,
-    }
-  ];
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/breadcrumbs.ts b/src/legacy/core_plugins/kibana/public/discover/breadcrumbs.ts
new file mode 100644
index 00000000000000..51e0dcba1cad0b
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/breadcrumbs.ts
@@ -0,0 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export function getRootBreadcrumbs() {
+  return [
+    {
+      text: i18n.translate('kbn.discover.rootBreadcrumb', {
+        defaultMessage: 'Discover',
+      }),
+      href: '#/discover',
+    },
+  ];
+}
+
+export function getSavedSearchBreadcrumbs($route: any) {
+  return [
+    ...getRootBreadcrumbs(),
+    {
+      text: $route.current.locals.savedSearch.id,
+    },
+  ];
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js b/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js
index 670e9446c6e4f9..612ca860f80317 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js
+++ b/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js
@@ -16,21 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import 'ngreact';
 import React, { Fragment } from 'react';
-import { uiModules } from 'ui/modules';
-import { wrapInI18nContext } from 'ui/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { npStart } from 'ui/new_platform';
-
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiCallOut,
-  EuiCodeBlock,
-  EuiSpacer,
-} from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiCallOut, EuiCodeBlock, EuiSpacer } from '@elastic/eui';
+import { getServices } from '../../kibana_services';
+const { uiModules, wrapInI18nContext, chrome } = getServices();
 
 const DiscoverFetchError = ({ fetchError }) => {
   if (!fetchError) {
@@ -40,7 +30,7 @@ const DiscoverFetchError = ({ fetchError }) => {
   let body;
 
   if (fetchError.lang === 'painless') {
-    const managementUrl = npStart.core.chrome.navLinks.get('kibana:management').url;
+    const managementUrl = chrome.navLinks.get('kibana:management').url;
     const url = `${managementUrl}/kibana/index_patterns`;
 
     body = (
@@ -51,10 +41,12 @@ const DiscoverFetchError = ({ fetchError }) => {
             in {managementLink}, under the {scriptedFields} tab."
           values={{
             fetchErrorScript: `'${fetchError.script}'`,
-            scriptedFields: <FormattedMessage
-              id="kbn.discover.fetchError.scriptedFieldsText"
-              defaultMessage="&ldquo;Scripted fields&rdquo;"
-            />,
+            scriptedFields: (
+              <FormattedMessage
+                id="kbn.discover.fetchError.scriptedFieldsText"
+                defaultMessage="&ldquo;Scripted fields&rdquo;"
+              />
+            ),
             managementLink: (
               <a href={url}>
                 <FormattedMessage
@@ -62,7 +54,7 @@ const DiscoverFetchError = ({ fetchError }) => {
                   defaultMessage="Management &gt; Index Patterns"
                 />
               </a>
-            )
+            ),
           }}
         />
       </p>
@@ -75,16 +67,10 @@ const DiscoverFetchError = ({ fetchError }) => {
 
       <EuiFlexGroup justifyContent="center" data-test-subj="discoverFetchError">
         <EuiFlexItem grow={false} className="discoverFetchError">
-          <EuiCallOut
-            title={fetchError.message}
-            color="danger"
-            iconType="cross"
-          >
+          <EuiCallOut title={fetchError.message} color="danger" iconType="cross">
             {body}
 
-            <EuiCodeBlock>
-              {fetchError.error}
-            </EuiCodeBlock>
+            <EuiCodeBlock>{fetchError.error}</EuiCodeBlock>
           </EuiCallOut>
         </EuiFlexItem>
       </EuiFlexGroup>
@@ -96,4 +82,6 @@ const DiscoverFetchError = ({ fetchError }) => {
 
 const app = uiModules.get('apps/discover', ['react']);
 
-app.directive('discoverFetchError', reactDirective => reactDirective(wrapInI18nContext(DiscoverFetchError)));
+app.directive('discoverFetchError', reactDirective =>
+  reactDirective(wrapInI18nContext(DiscoverFetchError))
+);
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss
index 6960c7101fa10a..fe13ac2fafa01f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss
@@ -27,3 +27,11 @@
   padding-left: $euiSizeXS;
   margin-left: $euiSizeXS;
 }
+
+.dscFieldSearch__filterWrapper {
+  flex-grow: 0;
+}
+
+.dscFieldSearch__formWrapper {
+  padding: $euiSizeM;
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
index f7469d0142d57c..cfcb6540771523 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
@@ -18,15 +18,15 @@
  */
 
 import $ from 'jquery';
+import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { getServices } from '../../kibana_services';
 import html from './discover_field.html';
-import _ from 'lodash';
 import 'ui/directives/css_truncate';
 import 'ui/directives/field_name';
 import './string_progress_bar';
 import detailsHtml from './lib/detail_views/string.html';
-import { capabilities } from 'ui/capabilities';
-import { uiModules } from 'ui/modules';
+const { uiModules, capabilities } = getServices();
 const app = uiModules.get('apps/discover');
 
 app.directive('discoverField', function ($compile) {
@@ -78,7 +78,7 @@ app.directive('discoverField', function ($compile) {
 
       };
 
-      $scope.canVisualize = capabilities.get().visualize.show;
+      $scope.canVisualize = capabilities.visualize.show;
 
       $scope.toggleDisplay = function (field) {
         if (field.display) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx
index 2655d28af985bc..badfbb4b14a4c1 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx
@@ -16,55 +16,164 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { EventHandler, MouseEvent as ReactMouseEvent } from 'react';
+import { act } from 'react-dom/test-utils';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { DiscoverFieldSearch } from './discover_field_search';
+import { DiscoverFieldSearch, Props } from './discover_field_search';
+import { EuiButtonGroupProps, EuiPopover } from '@elastic/eui';
+import { ReactWrapper } from 'enzyme';
 
 describe('DiscoverFieldSearch', () => {
-  function mountComponent() {
-    const props = {
-      onChange: jest.fn(),
-      onShowFilter: jest.fn(),
-      showFilter: false,
-      filtersActive: 0,
-      value: 'test',
-    };
-    const comp = mountWithIntl(<DiscoverFieldSearch {...props} />);
-    const input = findTestSubject(comp, 'fieldFilterSearchInput');
-    const btn = findTestSubject(comp, 'toggleFieldFilterButton');
-    return { comp, input, btn, props };
+  const defaultProps = {
+    onChange: jest.fn(),
+    value: 'test',
+    types: ['any', 'string', '_source'],
+  };
+
+  function mountComponent(props?: Props) {
+    const compProps = props || defaultProps;
+    const comp = mountWithIntl(<DiscoverFieldSearch {...compProps} />);
+    return comp;
+  }
+
+  function findButtonGroup(component: ReactWrapper, id: string) {
+    return component.find(`[data-test-subj="${id}ButtonGroup"]`).first();
   }
 
   test('enter value', () => {
-    const { input, props } = mountComponent();
+    const component = mountComponent();
+    const input = findTestSubject(component, 'fieldFilterSearchInput');
     input.simulate('change', { target: { value: 'new filter' } });
-    expect(props.onChange).toBeCalledTimes(1);
+    expect(defaultProps.onChange).toBeCalledTimes(1);
   });
 
-  // this should work, but doesn't, have to do some research
-  test('click toggle filter button', () => {
-    const { btn, props } = mountComponent();
+  test('change in active filters should change facet selection and call onChange', () => {
+    const onChange = jest.fn();
+    const component = mountComponent({ ...defaultProps, ...{ onChange } });
+    let btn = findTestSubject(component, 'toggleFieldFilterButton');
+    expect(btn.hasClass('euiFacetButton--isSelected')).toBeFalsy();
     btn.simulate('click');
-    expect(props.onShowFilter).toBeCalledTimes(1);
+    const aggregatableButtonGroup = findButtonGroup(component, 'aggregatable');
+    act(() => {
+      // @ts-ignore
+      (aggregatableButtonGroup.props() as EuiButtonGroupProps).onChange('aggregatable-true', null);
+    });
+    component.update();
+    btn = findTestSubject(component, 'toggleFieldFilterButton');
+    expect(btn.hasClass('euiFacetButton--isSelected')).toBe(true);
+    expect(onChange).toBeCalledWith('aggregatable', true);
   });
 
-  test('change showFilter value should change aria label', () => {
-    const { comp } = mountComponent();
-    let btn = findTestSubject(comp, 'toggleFieldFilterButton');
-    expect(btn.prop('aria-label')).toEqual('Show field filter settings');
-    comp.setProps({ showFilter: true });
-    btn = findTestSubject(comp, 'toggleFieldFilterButton');
-    expect(btn.prop('aria-label')).toEqual('Hide field filter settings');
+  test('change in active filters should change filters count', () => {
+    const component = mountComponent();
+    let btn = findTestSubject(component, 'toggleFieldFilterButton');
+    btn.simulate('click');
+    btn = findTestSubject(component, 'toggleFieldFilterButton');
+    const badge = btn.find('.euiNotificationBadge');
+    // no active filters
+    expect(badge.text()).toEqual('0');
+    // change value of aggregatable select
+    const aggregatableButtonGroup = findButtonGroup(component, 'aggregatable');
+    act(() => {
+      // @ts-ignore
+      (aggregatableButtonGroup.props() as EuiButtonGroupProps).onChange('aggregatable-true', null);
+    });
+    component.update();
+    expect(badge.text()).toEqual('1');
+    // change value of searchable select
+    const searchableButtonGroup = findButtonGroup(component, 'searchable');
+    act(() => {
+      // @ts-ignore
+      (searchableButtonGroup.props() as EuiButtonGroupProps).onChange('searchable-true', null);
+    });
+    component.update();
+    expect(badge.text()).toEqual('2');
+    // change value of searchable select
+    act(() => {
+      // @ts-ignore
+      (searchableButtonGroup.props() as EuiButtonGroupProps).onChange('searchable-any', null);
+    });
+    component.update();
+    expect(badge.text()).toEqual('1');
   });
 
-  test('change filtersActive should change facet selection', () => {
-    const { comp } = mountComponent();
-    let btn = findTestSubject(comp, 'toggleFieldFilterButton');
-    expect(btn.hasClass('euiFacetButton--isSelected')).toBeFalsy();
-    comp.setProps({ filtersActive: 3 });
-    btn = findTestSubject(comp, 'toggleFieldFilterButton');
-    expect(btn.hasClass('euiFacetButton--isSelected')).toBe(true);
+  test('change in missing fields switch should not change filter count', () => {
+    const component = mountComponent();
+    const btn = findTestSubject(component, 'toggleFieldFilterButton');
+    btn.simulate('click');
+    const badge = btn.find('.euiNotificationBadge');
+    expect(badge.text()).toEqual('0');
+    const missingSwitch = findTestSubject(component, 'missingSwitch');
+    missingSwitch.simulate('change', { target: { value: false } });
+    expect(badge.text()).toEqual('0');
+  });
+
+  test('change in filters triggers onChange', () => {
+    const onChange = jest.fn();
+    const component = mountComponent({ ...defaultProps, ...{ onChange } });
+    const btn = findTestSubject(component, 'toggleFieldFilterButton');
+    btn.simulate('click');
+    const aggregtableButtonGroup = findButtonGroup(component, 'aggregatable');
+    const missingSwitch = findTestSubject(component, 'missingSwitch');
+    act(() => {
+      // @ts-ignore
+      (aggregtableButtonGroup.props() as EuiButtonGroupProps).onChange('aggregatable-true', null);
+    });
+    missingSwitch.simulate('change', { target: { value: false } });
+    expect(onChange).toBeCalledTimes(2);
+  });
+
+  test('change in type filters triggers onChange with appropriate value', () => {
+    const onChange = jest.fn();
+    const component = mountComponent({ ...defaultProps, ...{ onChange } });
+    const btn = findTestSubject(component, 'toggleFieldFilterButton');
+    btn.simulate('click');
+    const typeSelector = findTestSubject(component, 'typeSelect');
+    typeSelector.simulate('change', { target: { value: 'string' } });
+    expect(onChange).toBeCalledWith('type', 'string');
+    typeSelector.simulate('change', { target: { value: 'any' } });
+    expect(onChange).toBeCalledWith('type', 'any');
+  });
+
+  test('click on filter button should open and close popover', () => {
+    const component = mountComponent();
+    const btn = findTestSubject(component, 'toggleFieldFilterButton');
+    btn.simulate('click');
+    let popover = component.find(EuiPopover);
+    expect(popover.prop('isOpen')).toBe(true);
+    btn.simulate('click');
+    popover = component.find(EuiPopover);
+    expect(popover.prop('isOpen')).toBe(false);
+  });
+
+  test('click outside popover should close popover', () => {
+    const triggerDocumentMouseDown: EventHandler<any> = (e: ReactMouseEvent<any>) => {
+      const event = new Event('mousedown');
+      // @ts-ignore
+      event.euiGeneratedBy = e.nativeEvent.euiGeneratedBy;
+      document.dispatchEvent(event);
+    };
+    const triggerDocumentMouseUp: EventHandler<any> = (e: ReactMouseEvent<any>) => {
+      const event = new Event('mouseup');
+      // @ts-ignore
+      event.euiGeneratedBy = e.nativeEvent.euiGeneratedBy;
+      document.dispatchEvent(event);
+    };
+    const component = mountWithIntl(
+      <div onMouseDown={triggerDocumentMouseDown} onMouseUp={triggerDocumentMouseUp} id="wrapperId">
+        <DiscoverFieldSearch {...defaultProps} />
+      </div>
+    );
+    const btn = findTestSubject(component, 'toggleFieldFilterButton');
+    btn.simulate('click');
+    let popover = component.find(EuiPopover);
+    expect(popover.length).toBe(1);
+    expect(popover.prop('isOpen')).toBe(true);
+    component.find('#wrapperId').simulate('mousedown');
+    component.find('#wrapperId').simulate('mouseup');
+    popover = component.find(EuiPopover);
+    expect(popover.prop('isOpen')).toBe(false);
   });
 });
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx
index f748cdae1b4fcb..3d93487d9e6ccd 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx
@@ -16,60 +16,235 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { OptionHTMLAttributes, ReactNode, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiFacetButton, EuiFieldSearch, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elastic/eui';
+import {
+  EuiFacetButton,
+  EuiFieldSearch,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiPopover,
+  EuiPopoverFooter,
+  EuiPopoverTitle,
+  EuiSelect,
+  EuiSwitch,
+  EuiForm,
+  EuiFormRow,
+  EuiButtonGroup,
+  EuiOutsideClickDetector,
+} from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
+export interface State {
+  searchable: string;
+  aggregatable: string;
+  type: string;
+  missing: boolean;
+  [index: string]: string | boolean;
+}
+
 export interface Props {
   /**
    * triggered on input of user into search field
    */
-  onChange: (field: string, value: string) => void;
-  /**
-   * triggered when the "additional filter btn" is clicked
-   */
-  onShowFilter: () => void;
-  /**
-   * determines whether additional filter fields are displayed
-   */
-  showFilter: boolean;
+  onChange: (field: string, value: string | boolean | undefined) => void;
+
   /**
    * the input value of the user
    */
   value?: string;
+
   /**
-   * the number of selected filters
+   * types for the type filter
    */
-  filtersActive: number;
+  types: string[];
 }
 
 /**
  * Component is Discover's side bar to  search of available fields
  * Additionally there's a button displayed that allows the user to show/hide more filter fields
  */
-export function DiscoverFieldSearch({
-  showFilter,
-  onChange,
-  onShowFilter,
-  value,
-  filtersActive,
-}: Props) {
+export function DiscoverFieldSearch({ onChange, value, types }: Props) {
   if (typeof value !== 'string') {
     // at initial rendering value is undefined (angular related), this catches the warning
     // should be removed once all is react
     return null;
   }
-  const filterBtnAriaLabel = showFilter
+  const searchPlaceholder = i18n.translate('kbn.discover.fieldChooser.searchPlaceHolder', {
+    defaultMessage: 'Search field names',
+  });
+  const aggregatableLabel = i18n.translate('kbn.discover.fieldChooser.filter.aggregatableLabel', {
+    defaultMessage: 'Aggregatable',
+  });
+  const searchableLabel = i18n.translate('kbn.discover.fieldChooser.filter.searchableLabel', {
+    defaultMessage: 'Searchable',
+  });
+  const typeLabel = i18n.translate('kbn.discover.fieldChooser.filter.typeLabel', {
+    defaultMessage: 'Type',
+  });
+  const typeOptions = types
+    ? types.map(type => {
+        return { value: type, text: type };
+      })
+    : [{ value: 'any', text: 'any' }];
+
+  const [activeFiltersCount, setActiveFiltersCount] = useState(0);
+  const [isPopoverOpen, setPopoverOpen] = useState(false);
+  const [values, setValues] = useState<State>({
+    searchable: 'any',
+    aggregatable: 'any',
+    type: 'any',
+    missing: true,
+  });
+
+  const filterBtnAriaLabel = isPopoverOpen
     ? i18n.translate('kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel', {
         defaultMessage: 'Hide field filter settings',
       })
     : i18n.translate('kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel', {
         defaultMessage: 'Show field filter settings',
       });
-  const searchPlaceholder = i18n.translate('kbn.discover.fieldChooser.searchPlaceHolder', {
-    defaultMessage: 'Search fields',
-  });
+
+  const handleFacetButtonClicked = () => {
+    setPopoverOpen(!isPopoverOpen);
+  };
+
+  const applyFilterValue = (id: string, filterValue: string | boolean) => {
+    switch (filterValue) {
+      case 'any':
+        if (id !== 'type') {
+          onChange(id, undefined);
+        } else {
+          onChange(id, filterValue);
+        }
+        break;
+      case 'true':
+        onChange(id, true);
+        break;
+      case 'false':
+        onChange(id, false);
+        break;
+      default:
+        onChange(id, filterValue);
+    }
+  };
+
+  const isFilterActive = (name: string, filterValue: string | boolean) => {
+    return name !== 'missing' && filterValue !== 'any';
+  };
+
+  const handleValueChange = (name: string, filterValue: string | boolean) => {
+    const previousValue = values[name];
+    updateFilterCount(name, previousValue, filterValue);
+    const updatedValues = { ...values };
+    updatedValues[name] = filterValue;
+    setValues(updatedValues);
+    applyFilterValue(name, filterValue);
+  };
+
+  const updateFilterCount = (
+    name: string,
+    previousValue: string | boolean,
+    currentValue: string | boolean
+  ) => {
+    const previouslyFilterActive = isFilterActive(name, previousValue);
+    const filterActive = isFilterActive(name, currentValue);
+    const diff = Number(filterActive) - Number(previouslyFilterActive);
+    setActiveFiltersCount(activeFiltersCount + diff);
+  };
+
+  const handleMissingChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const missingValue = e.target.checked;
+    handleValueChange('missing', missingValue);
+  };
+
+  const buttonContent = (
+    <EuiFacetButton
+      aria-label={filterBtnAriaLabel}
+      data-test-subj="toggleFieldFilterButton"
+      className="dscToggleFieldFilterButton"
+      icon={<EuiIcon type="filter" />}
+      isSelected={activeFiltersCount > 0}
+      quantity={activeFiltersCount}
+      onClick={handleFacetButtonClicked}
+    >
+      <FormattedMessage
+        id="kbn.discover.fieldChooser.fieldFilterFacetButtonLabel"
+        defaultMessage="Filter by type"
+      />
+    </EuiFacetButton>
+  );
+
+  const select = (
+    id: string,
+    selectOptions: Array<{ text: ReactNode } & OptionHTMLAttributes<HTMLOptionElement>>,
+    selectValue: string
+  ) => {
+    return (
+      <EuiSelect
+        id={`${id}-select`}
+        options={selectOptions}
+        value={selectValue}
+        onChange={(e: React.ChangeEvent<HTMLSelectElement>) =>
+          handleValueChange(id, e.target.value)
+        }
+        aria-label={i18n.translate('kbn.discover.fieldChooser.filter.fieldSelectorLabel', {
+          defaultMessage: 'Selection of {id} filter options',
+          values: { id },
+        })}
+        data-test-subj={`${id}Select`}
+        compressed
+      />
+    );
+  };
+
+  const toggleButtons = (id: string) => {
+    return [
+      {
+        id: `${id}-any`,
+        label: 'any',
+      },
+      {
+        id: `${id}-true`,
+        label: 'yes',
+      },
+      {
+        id: `${id}-false`,
+        label: 'no',
+      },
+    ];
+  };
+
+  const buttonGroup = (id: string, legend: string) => {
+    return (
+      <EuiButtonGroup
+        legend={legend}
+        options={toggleButtons(id)}
+        idSelected={`${id}-${values[id]}`}
+        onChange={optionId => handleValueChange(id, optionId.replace(`${id}-`, ''))}
+        buttonSize="compressed"
+        isFullWidth
+        data-test-subj={`${id}ButtonGroup`}
+      />
+    );
+  };
+
+  const selectionPanel = (
+    <div className="dscFieldSearch__formWrapper">
+      <EuiForm data-test-subj="filterSelectionPanel">
+        <EuiFormRow fullWidth label={aggregatableLabel} display="columnCompressed">
+          {buttonGroup('aggregatable', aggregatableLabel)}
+        </EuiFormRow>
+        <EuiFormRow fullWidth label={searchableLabel} display="columnCompressed">
+          {buttonGroup('searchable', searchableLabel)}
+        </EuiFormRow>
+        <EuiFormRow fullWidth label={typeLabel} display="columnCompressed">
+          {select('type', typeOptions, values.type)}
+        </EuiFormRow>
+      </EuiForm>
+    </div>
+  );
 
   return (
     <React.Fragment>
@@ -86,20 +261,39 @@ export function DiscoverFieldSearch({
           />
         </EuiFlexItem>
       </EuiFlexGroup>
-      <EuiFacetButton
-        aria-label={filterBtnAriaLabel}
-        data-test-subj="toggleFieldFilterButton"
-        className="dscToggleFieldFilterButton"
-        icon={<EuiIcon type="filter" />}
-        isSelected={filtersActive > 0}
-        quantity={filtersActive}
-        onClick={() => onShowFilter()}
-      >
-        <FormattedMessage
-          id="kbn.discover.fieldChooser.fieldFilterFacetButtonLabel"
-          defaultMessage="Fields filtered"
-        />
-      </EuiFacetButton>
+      <div className="dscFieldSearch__filterWrapper">
+        <EuiOutsideClickDetector onOutsideClick={() => {}} isDisabled={!isPopoverOpen}>
+          <EuiPopover
+            id="dataPanelTypeFilter"
+            panelClassName="euiFilterGroup__popoverPanel"
+            panelPaddingSize="none"
+            anchorPosition="downLeft"
+            display="block"
+            isOpen={isPopoverOpen}
+            closePopover={() => {
+              setPopoverOpen(false);
+            }}
+            button={buttonContent}
+          >
+            <EuiPopoverTitle>
+              {i18n.translate('kbn.discover.fieldChooser.filter.filterByTypeLabel', {
+                defaultMessage: 'Filter by type',
+              })}
+            </EuiPopoverTitle>
+            {selectionPanel}
+            <EuiPopoverFooter>
+              <EuiSwitch
+                label={i18n.translate('kbn.discover.fieldChooser.filter.hideMissingFieldsLabel', {
+                  defaultMessage: 'Hide missing fields',
+                })}
+                checked={values.missing}
+                onChange={handleMissingChange}
+                data-test-subj="missingSwitch"
+              />
+            </EuiPopoverFooter>
+          </EuiPopover>
+        </EuiOutsideClickDetector>
+      </div>
     </React.Fragment>
   );
 }
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts
index 8af23caedd78ae..b78f993e187725 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts
@@ -17,18 +17,17 @@
  * under the License.
  */
 // @ts-ignore
-import { uiModules } from 'ui/modules';
-import { wrapInI18nContext } from 'ui/i18n';
+import { getServices } from '../../kibana_services';
 import { DiscoverFieldSearch } from './discover_field_search';
 
+const { wrapInI18nContext, uiModules } = getServices();
+
 const app = uiModules.get('apps/discover');
 
 app.directive('discoverFieldSearch', function(reactDirective: any) {
   return reactDirective(wrapInI18nContext(DiscoverFieldSearch), [
     ['onChange', { watchDepth: 'reference' }],
-    ['onShowFilter', { watchDepth: 'reference' }],
-    ['showFilter', { watchDepth: 'value' }],
     ['value', { watchDepth: 'value' }],
-    ['filtersActive', { watchDepth: 'value' }],
+    ['types', { watchDepth: 'value' }],
   ]);
 });
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_directive.ts b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_directive.ts
index 938d6cc226f2f3..5e3f678e388ad3 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_directive.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_directive.ts
@@ -17,10 +17,11 @@
  * under the License.
  */
 // @ts-ignore
-import { uiModules } from 'ui/modules';
-import { wrapInI18nContext } from 'ui/i18n';
+import { getServices } from '../../kibana_services';
 import { DiscoverIndexPattern } from './discover_index_pattern';
 
+const { wrapInI18nContext, uiModules } = getServices();
+
 const app = uiModules.get('apps/discover');
 
 app.directive('discoverIndexPatternSelect', function(reactDirective: any) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html
index 3d8b38c278f318..adf4b1b4326e88 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html
@@ -9,10 +9,8 @@
     <form>
       <discover-field-search
         on-change="setFilterValue"
-        on-show-filter="toggleShowFilter"
-        show-filter="showFilter"
         value="filter.vals.name"
-        filters-active="filtersActive"
+        types="fieldTypes"
       >
       </discover-field-search>
       <div data-test-subj="discoverFieldFilter" class="dscFieldFilter" ng-show="showFilter">
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
index 3e0172dec1ff42..99a63efc0e0fca 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
@@ -16,20 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import 'ui/directives/css_truncate';
+//field_name directive will be replaced very soon
 import 'ui/directives/field_name';
 import './discover_field';
-import 'ui/angular_ui_select';
 import './discover_field_search_directive';
 import './discover_index_pattern_directive';
 import _ from 'lodash';
 import $ from 'jquery';
 import rison from 'rison-node';
 import { fieldCalculator } from './lib/field_calculator';
-import { FieldList } from 'ui/index_patterns';
-import { uiModules } from 'ui/modules';
+import {
+  getServices,
+  FieldList
+} from '../../kibana_services';
 import fieldChooserTemplate from './field_chooser.html';
+
+const { uiModules } =  getServices();
 const app = uiModules.get('apps/discover');
 
 app.directive('discFieldChooser', function ($location, config, $route) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.js b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.js
index ae00df6dfbbf8a..ca3a47cad50757 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.js
+++ b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.js
@@ -16,13 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-
-import { wrapInI18nContext } from 'ui/i18n';
-import { uiModules } from 'ui/modules';
-
 import React from 'react';
-
+import { getServices } from '../../kibana_services';
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -31,6 +26,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 
+const { wrapInI18nContext, uiModules } = getServices();
 const module = uiModules.get('discover/field_chooser');
 
 function StringFieldProgressBar(props) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu.js b/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu.js
index 95db1b686f7aaa..ad68e55e71622c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu.js
+++ b/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu.js
@@ -20,7 +20,8 @@
 import React, { Fragment, PureComponent } from 'react';
 import { EuiButton, EuiHorizontalRule, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
+import { getServices } from '../../kibana_services';
+const { docLinks } = getServices();
 
 export class HelpMenu extends PureComponent {
   render() {
@@ -31,7 +32,7 @@ export class HelpMenu extends PureComponent {
         <EuiButton
           fill
           iconType="popout"
-          href={`${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/discover.html`}
+          href={`${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/discover.html`}
           target="_blank"
         >
           <FormattedMessage id="kbn.discover.helpMenu.docLabel" defaultMessage="Discover documentation" />
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu_util.js b/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu_util.js
index aeabff2d97007b..58a92193de63e8 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu_util.js
+++ b/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu_util.js
@@ -22,7 +22,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { HelpMenu } from './help_menu';
 
 export function addHelpMenuToAppChrome(chrome) {
-  chrome.helpExtension.set(domElement => {
+  chrome.setHelpExtension(domElement => {
     render(<HelpMenu/>, domElement);
     return () => {
       unmountComponentAtNode(domElement);
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/README.md b/src/legacy/core_plugins/kibana/public/discover/context/README.md
new file mode 100644
index 00000000000000..18ba118b4da798
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/context/README.md
@@ -0,0 +1,4 @@
+# DISCOVER CONTEXT
+
+Placeholder for Discover's context functionality, that's currently in [../angular/context](../angular/context).
+Once fully de-angularized it should be moved to this location
\ No newline at end of file
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/app.js b/src/legacy/core_plugins/kibana/public/discover/context/app.js
deleted file mode 100644
index 7754f743632cb8..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/context/app.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-
-import { callAfterBindingsWorkaround } from 'ui/compat';
-import { uiModules } from 'ui/modules';
-import contextAppTemplate from './app.html';
-import './components/action_bar';
-import { getFirstSortableField } from './api/utils/sorting';
-import {
-  createInitialQueryParametersState,
-  QueryParameterActionsProvider,
-  QUERY_PARAMETER_KEYS,
-} from './query_parameters';
-import {
-  createInitialLoadingStatusState,
-  FAILURE_REASONS,
-  LOADING_STATUS,
-  QueryActionsProvider,
-} from './query';
-import { timefilter } from 'ui/timefilter';
-
-// load directives
-import '../../../../data/public/legacy';
-
-const module = uiModules.get('apps/context', [
-  'elasticsearch',
-  'kibana',
-  'kibana/config',
-  'ngRoute',
-]);
-
-module.directive('contextApp', function ContextApp() {
-  return {
-    bindToController: true,
-    controller: callAfterBindingsWorkaround(ContextAppController),
-    controllerAs: 'contextApp',
-    restrict: 'E',
-    scope: {
-      anchorId: '=',
-      columns: '=',
-      indexPattern: '=',
-      filters: '=',
-      predecessorCount: '=',
-      successorCount: '=',
-      sort: '=',
-      discoverUrl: '=',
-    },
-    template: contextAppTemplate,
-  };
-});
-
-function ContextAppController($scope, config, Private) {
-  const queryParameterActions = Private(QueryParameterActionsProvider);
-  const queryActions = Private(QueryActionsProvider);
-
-  timefilter.disableAutoRefreshSelector();
-  timefilter.disableTimeRangeSelector();
-
-  this.state = createInitialState(
-    parseInt(config.get('context:step'), 10),
-    getFirstSortableField(this.indexPattern, config.get('context:tieBreakerFields')),
-    this.discoverUrl,
-  );
-
-  this.actions = _.mapValues({
-    ...queryParameterActions,
-    ...queryActions,
-  }, (action) => (...args) => action(this.state)(...args));
-
-  this.constants = {
-    FAILURE_REASONS,
-    LOADING_STATUS,
-  };
-
-  $scope.$watchGroup([
-    () => this.state.rows.predecessors,
-    () => this.state.rows.anchor,
-    () => this.state.rows.successors,
-  ], (newValues) => this.actions.setAllRows(...newValues));
-
-  /**
-   * Sync properties to state
-   */
-  $scope.$watchCollection(
-    () => ({
-      ...(_.pick(this, QUERY_PARAMETER_KEYS)),
-      indexPatternId: this.indexPattern.id,
-    }),
-    (newQueryParameters) => {
-      const { queryParameters } = this.state;
-      if (
-        (newQueryParameters.indexPatternId !== queryParameters.indexPatternId)
-        || (newQueryParameters.anchorId !== queryParameters.anchorId)
-        || (!_.isEqual(newQueryParameters.sort, queryParameters.sort))
-      ) {
-        this.actions.fetchAllRowsWithNewQueryParameters(_.cloneDeep(newQueryParameters));
-      } else if (
-        (newQueryParameters.predecessorCount !== queryParameters.predecessorCount)
-        || (newQueryParameters.successorCount !== queryParameters.successorCount)
-        || (!_.isEqual(newQueryParameters.filters, queryParameters.filters))
-      ) {
-        this.actions.fetchContextRowsWithNewQueryParameters(_.cloneDeep(newQueryParameters));
-      }
-    },
-  );
-
-  /**
-   * Sync state to properties
-   */
-  $scope.$watchCollection(
-    () => ({
-      predecessorCount: this.state.queryParameters.predecessorCount,
-      successorCount: this.state.queryParameters.successorCount,
-    }),
-    (newParameters) => {
-      _.assign(this, newParameters);
-    },
-  );
-}
-
-
-function createInitialState(defaultStepSize, tieBreakerField, discoverUrl) {
-  return {
-    queryParameters: createInitialQueryParametersState(defaultStepSize, tieBreakerField),
-    rows: {
-      all: [],
-      anchor: null,
-      predecessors: [],
-      successors: [],
-    },
-    loadingStatus: createInitialLoadingStatusState(),
-    navigation: {
-      discover: {
-        url: discoverUrl,
-      },
-    },
-  };
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/index.js b/src/legacy/core_plugins/kibana/public/discover/context/index.js
deleted file mode 100644
index 902bee2badb7cc..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/context/index.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-
-import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
-import uiRoutes from 'ui/routes';
-import { i18n } from '@kbn/i18n';
-
-import './app';
-import contextAppRouteTemplate from './index.html';
-import { getRootBreadcrumbs } from '../breadcrumbs';
-import { npStart } from 'ui/new_platform';
-import { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
-
-const k7Breadcrumbs = $route => {
-  const { indexPattern } = $route.current.locals;
-  const { id } = $route.current.params;
-
-  return [
-    ...getRootBreadcrumbs(),
-    {
-      text: i18n.translate('kbn.context.breadcrumb', {
-        defaultMessage: 'Context of {indexPatternTitle}#{docId}',
-        values: {
-          indexPatternTitle: indexPattern.title,
-          docId: id,
-        },
-      }),
-    },
-  ];
-};
-
-
-uiRoutes
-  // deprecated route, kept for compatibility
-  // should be removed in the future
-  .when('/context/:indexPatternId/:type/:id*', {
-    redirectTo: '/context/:indexPatternId/:id'
-  })
-  .when('/context/:indexPatternId/:id*', {
-    controller: ContextAppRouteController,
-    k7Breadcrumbs,
-    controllerAs: 'contextAppRoute',
-    resolve: {
-      indexPattern: function ($route, indexPatterns) {
-        return indexPatterns.get($route.current.params.indexPatternId);
-      },
-    },
-    template: contextAppRouteTemplate,
-  });
-
-function ContextAppRouteController($routeParams, $scope, AppState, config, indexPattern, Private) {
-  const queryFilter = Private(FilterBarQueryFilterProvider);
-
-  this.state = new AppState(createDefaultAppState(config, indexPattern));
-  this.state.save(true);
-
-  $scope.$watchGroup(
-    [
-      'contextAppRoute.state.columns',
-      'contextAppRoute.state.predecessorCount',
-      'contextAppRoute.state.successorCount',
-    ],
-    () => this.state.save(true)
-  );
-
-  const updateSubsciption = subscribeWithScope($scope, queryFilter.getUpdates$(), {
-    next: () => {
-      this.filters = _.cloneDeep(queryFilter.getFilters());
-    },
-  });
-
-  $scope.$on('$destroy', function () {
-    updateSubsciption.unsubscribe();
-  });
-  this.anchorId = $routeParams.id;
-  this.indexPattern = indexPattern;
-  this.discoverUrl = npStart.core.chrome.navLinks.get('kibana:discover').url;
-  this.filters = _.cloneDeep(queryFilter.getFilters());
-}
-
-function createDefaultAppState(config, indexPattern) {
-  return {
-    columns: ['_source'],
-    filters: [],
-    predecessorCount: parseInt(config.get('context:defaultSize'), 10),
-    sort: [indexPattern.timeFieldName, 'desc'],
-    successorCount: parseInt(config.get('context:defaultSize'), 10),
-  };
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query/actions.js b/src/legacy/core_plugins/kibana/public/discover/context/query/actions.js
deleted file mode 100644
index c55dcc374fa5ad..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/context/query/actions.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import { i18n } from '@kbn/i18n';
-import React from 'react';
-import { toastNotifications } from 'ui/notify';
-
-import { fetchAnchorProvider } from '../api/anchor';
-import { fetchContextProvider } from '../api/context';
-import { QueryParameterActionsProvider } from '../query_parameters';
-import { FAILURE_REASONS, LOADING_STATUS } from './constants';
-import { MarkdownSimple } from '../../../../../kibana_react/public';
-
-export function QueryActionsProvider(Private, Promise) {
-  const fetchAnchor = Private(fetchAnchorProvider);
-  const { fetchSurroundingDocs } = Private(fetchContextProvider);
-  const {
-    setPredecessorCount,
-    setQueryParameters,
-    setSuccessorCount,
-  } = Private(QueryParameterActionsProvider);
-
-  const setFailedStatus = (state) => (subject, details = {}) => (
-    state.loadingStatus[subject] = {
-      status: LOADING_STATUS.FAILED,
-      reason: FAILURE_REASONS.UNKNOWN,
-      ...details,
-    }
-  );
-
-  const setLoadedStatus = (state) => (subject) => (
-    state.loadingStatus[subject] = {
-      status: LOADING_STATUS.LOADED,
-    }
-  );
-
-  const setLoadingStatus = (state) => (subject) => (
-    state.loadingStatus[subject] = {
-      status: LOADING_STATUS.LOADING,
-    }
-  );
-
-  const fetchAnchorRow = (state) => () => {
-    const { queryParameters: { indexPatternId, anchorId, sort, tieBreakerField } } = state;
-
-    if (!tieBreakerField) {
-      return Promise.reject(setFailedStatus(state)('anchor', {
-        reason: FAILURE_REASONS.INVALID_TIEBREAKER
-      }));
-    }
-
-    setLoadingStatus(state)('anchor');
-
-    return Promise.try(() => (
-      fetchAnchor(indexPatternId, anchorId, [_.zipObject([sort]), { [tieBreakerField]: sort[1] }])
-    ))
-      .then(
-        (anchorDocument) => {
-          setLoadedStatus(state)('anchor');
-          state.rows.anchor = anchorDocument;
-          return anchorDocument;
-        },
-        (error) => {
-          setFailedStatus(state)('anchor', { error });
-          toastNotifications.addDanger({
-            title: i18n.translate('kbn.context.unableToLoadAnchorDocumentDescription', {
-              defaultMessage: 'Unable to load the anchor document'
-            }),
-            text: <MarkdownSimple>{error.message}</MarkdownSimple>,
-          });
-          throw error;
-        }
-      );
-  };
-
-  const fetchSurroundingRows = (type, state) => {
-    const {
-      queryParameters: { indexPatternId, filters,  sort, tieBreakerField },
-      rows: { anchor },
-    } = state;
-    const count = type === 'successors'
-      ? state.queryParameters.successorCount
-      : state.queryParameters.predecessorCount;
-
-    if (!tieBreakerField) {
-      return Promise.reject(setFailedStatus(state)(type, {
-        reason: FAILURE_REASONS.INVALID_TIEBREAKER
-      }));
-    }
-
-    setLoadingStatus(state)(type);
-    const [sortField, sortDir] = sort;
-
-    return Promise.try(() => (
-      fetchSurroundingDocs(
-        type,
-        indexPatternId,
-        anchor,
-        sortField,
-        tieBreakerField,
-        sortDir,
-        count,
-        filters
-      )
-    ))
-      .then(
-        (documents) => {
-          setLoadedStatus(state)(type);
-          state.rows[type] = documents;
-          return documents;
-        },
-        (error) => {
-          setFailedStatus(state)(type, { error });
-          toastNotifications.addDanger({
-            title: i18n.translate('kbn.context.unableToLoadDocumentDescription', {
-              defaultMessage: 'Unable to load documents'
-            }),
-            text: <MarkdownSimple>{error.message}</MarkdownSimple>,
-          });
-          throw error;
-        },
-      );
-  };
-
-  const fetchContextRows = (state) => () => (
-    Promise.all([
-      fetchSurroundingRows('predecessors', state),
-      fetchSurroundingRows('successors', state),
-    ])
-  );
-
-  const fetchAllRows = (state) => () => (
-    Promise.try(fetchAnchorRow(state))
-      .then(fetchContextRows(state))
-  );
-
-  const fetchContextRowsWithNewQueryParameters = (state) => (queryParameters) => {
-    setQueryParameters(state)(queryParameters);
-    return fetchContextRows(state)();
-  };
-
-  const fetchAllRowsWithNewQueryParameters = (state) => (queryParameters) => {
-    setQueryParameters(state)(queryParameters);
-    return fetchAllRows(state)();
-  };
-
-  const fetchGivenPredecessorRows = (state) => (count) => {
-    setPredecessorCount(state)(count);
-    return fetchSurroundingRows('predecessors', state);
-  };
-
-  const fetchGivenSuccessorRows = (state) => (count) => {
-    setSuccessorCount(state)(count);
-    return fetchSurroundingRows('successors', state);
-  };
-
-  const setAllRows = (state) => (predecessorRows, anchorRow, successorRows) => (
-    state.rows.all = [
-      ...(predecessorRows || []),
-      ...(anchorRow ? [anchorRow] : []),
-      ...(successorRows || []),
-    ]
-  );
-
-  return {
-    fetchAllRows,
-    fetchAllRowsWithNewQueryParameters,
-    fetchAnchorRow,
-    fetchContextRows,
-    fetchContextRowsWithNewQueryParameters,
-    fetchGivenPredecessorRows,
-    fetchGivenSuccessorRows,
-    setAllRows,
-  };
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/actions.js b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/actions.js
deleted file mode 100644
index 1c895b8d9e1c5c..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/actions.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-
-import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
-import { getFilterGenerator } from 'ui/filter_manager';
-import {
-  MAX_CONTEXT_SIZE,
-  MIN_CONTEXT_SIZE,
-  QUERY_PARAMETER_KEYS,
-} from './constants';
-
-
-export function QueryParameterActionsProvider(indexPatterns, Private) {
-  const queryFilter = Private(FilterBarQueryFilterProvider);
-  const filterGen = getFilterGenerator(queryFilter);
-
-  const setPredecessorCount = (state) => (predecessorCount) => (
-    state.queryParameters.predecessorCount = clamp(
-      MIN_CONTEXT_SIZE,
-      MAX_CONTEXT_SIZE,
-      predecessorCount,
-    )
-  );
-
-  const setSuccessorCount = (state) => (successorCount) => (
-    state.queryParameters.successorCount = clamp(
-      MIN_CONTEXT_SIZE,
-      MAX_CONTEXT_SIZE,
-      successorCount,
-    )
-  );
-
-  const setQueryParameters = (state) => (queryParameters) => (
-    Object.assign(
-      state.queryParameters,
-      _.pick(queryParameters, QUERY_PARAMETER_KEYS),
-    )
-  );
-
-  const updateFilters = () => filters => {
-    queryFilter.setFilters(filters);
-  };
-
-  const addFilter = (state) => async (field, values, operation) => {
-    const indexPatternId = state.queryParameters.indexPatternId;
-    const newFilters = filterGen.generate(field, values, operation, indexPatternId);
-    queryFilter.addFilters(newFilters);
-    const indexPattern = await indexPatterns.get(indexPatternId);
-    indexPattern.popularizeField(field.name, 1);
-  };
-
-  return {
-    addFilter,
-    updateFilters,
-    setPredecessorCount,
-    setQueryParameters,
-    setSuccessorCount,
-  };
-}
-
-function clamp(minimum, maximum, value) {
-  return Math.max(Math.min(maximum, value), minimum);
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc/doc.test.tsx b/src/legacy/core_plugins/kibana/public/discover/doc/doc.test.tsx
index 6612097620b44b..b3efd23ea48d03 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc/doc.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc/doc.test.tsx
@@ -24,6 +24,27 @@ import { ReactWrapper } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { Doc, DocProps } from './doc';
 
+jest.mock('../doc_viewer/doc_viewer', () => ({
+  DocViewer: 'test',
+}));
+
+jest.mock('../kibana_services', () => {
+  return {
+    getServices: () => ({
+      metadata: {
+        branch: 'test',
+      },
+      getDocViewsSorted: () => {
+        return [];
+      },
+    }),
+  };
+});
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
 // Suppress warnings about "act" until we use React 16.9
 /* eslint-disable no-console */
 const originalError = console.error;
@@ -68,30 +89,30 @@ async function mountDoc(search: () => void, update = false, indexPatternGetter:
 }
 
 describe('Test of <Doc /> of Discover', () => {
-  it('renders loading msg', async () => {
+  test('renders loading msg', async () => {
     const comp = await mountDoc(jest.fn());
     expect(findTestSubject(comp, 'doc-msg-loading').length).toBe(1);
   });
 
-  it('renders IndexPattern notFound msg', async () => {
+  test('renders IndexPattern notFound msg', async () => {
     const indexPatternGetter = jest.fn(() => Promise.reject({ savedObjectId: '007' }));
     const comp = await mountDoc(jest.fn(), true, indexPatternGetter);
     expect(findTestSubject(comp, 'doc-msg-notFoundIndexPattern').length).toBe(1);
   });
 
-  it('renders notFound msg', async () => {
+  test('renders notFound msg', async () => {
     const search = jest.fn(() => Promise.reject({ status: 404 }));
     const comp = await mountDoc(search, true);
     expect(findTestSubject(comp, 'doc-msg-notFound').length).toBe(1);
   });
 
-  it('renders error msg', async () => {
+  test('renders error msg', async () => {
     const search = jest.fn(() => Promise.reject('whatever'));
     const comp = await mountDoc(search, true);
     expect(findTestSubject(comp, 'doc-msg-error').length).toBe(1);
   });
 
-  it('renders elasticsearch hit ', async () => {
+  test('renders elasticsearch hit ', async () => {
     const hit = { hits: { total: 1, hits: [{ _id: 1, _source: { test: 1 } }] } };
     const search = jest.fn(() => Promise.resolve(hit));
     const comp = await mountDoc(search, true);
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc/doc.tsx b/src/legacy/core_plugins/kibana/public/discover/doc/doc.tsx
index 1f2d2fc532b578..0e0e6ed110ca67 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc/doc.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc/doc.tsx
@@ -19,11 +19,9 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiCallOut, EuiLink, EuiLoadingSpinner, EuiPageContent } from '@elastic/eui';
-import { IndexPatterns } from 'ui/index_patterns';
-import { metadata } from 'ui/metadata';
-import { ElasticSearchHit } from 'ui/registry/doc_views_types';
-import { DocViewer } from '../doc_viewer';
+import { DocViewer } from '../doc_viewer/doc_viewer';
 import { ElasticRequestState, useEsDocSearch } from './use_es_doc_search';
+import { IndexPatterns, ElasticSearchHit, getServices } from '../kibana_services';
 
 export interface ElasticSearchResult {
   hits: {
@@ -117,7 +115,9 @@ export function Doc(props: DocProps) {
             values={{ indexName: props.index }}
           />{' '}
           <EuiLink
-            href={`https://www.elastic.co/guide/en/elasticsearch/reference/${metadata.branch}/indices-exists.html`}
+            href={`https://www.elastic.co/guide/en/elasticsearch/reference/${
+              getServices().metadata.branch
+            }/indices-exists.html`}
             target="_blank"
           >
             <FormattedMessage
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc/doc_directive.ts b/src/legacy/core_plugins/kibana/public/discover/doc/doc_directive.ts
deleted file mode 100644
index 3ee510f47ce5b3..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/doc/doc_directive.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.
- */
-import { wrapInI18nContext } from 'ui/i18n';
-// @ts-ignore
-import { uiModules } from 'ui/modules';
-import { Doc } from './doc';
-
-uiModules.get('apps/discover').directive('discoverDoc', function(reactDirective: any) {
-  return reactDirective(
-    wrapInI18nContext(Doc),
-    [
-      ['id', { watchDepth: 'value' }],
-      ['index', { watchDepth: 'value' }],
-      ['indexPatternId', { watchDepth: 'reference' }],
-      ['indexPatternService', { watchDepth: 'reference' }],
-      ['esClient', { watchDepth: 'reference' }],
-    ],
-    { restrict: 'E' }
-  );
-});
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc/index.ts b/src/legacy/core_plugins/kibana/public/discover/doc/index.ts
deleted file mode 100644
index b969bd6a481263..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/doc/index.ts
+++ /dev/null
@@ -1,52 +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 uiRoutes from 'ui/routes';
-import { IndexPatterns } from 'ui/index_patterns';
-import { timefilter } from 'ui/timefilter';
-// @ts-ignore
-import { getRootBreadcrumbs } from 'plugins/kibana/discover/breadcrumbs';
-// @ts-ignore
-import html from './index.html';
-import './doc_directive';
-
-uiRoutes
-  // the old, pre 8.0 route, no longer used, keep it to stay compatible
-  // somebody might have bookmarked his favorite log messages
-  .when('/doc/:indexPattern/:index/:type', {
-    redirectTo: '/doc/:indexPattern/:index',
-  })
-  // the new route, es 7 deprecated types, es 8 removed them
-  .when('/doc/:indexPattern/:index', {
-    controller: ($scope: any, $route: any, es: any, indexPatterns: IndexPatterns) => {
-      timefilter.disableAutoRefreshSelector();
-      timefilter.disableTimeRangeSelector();
-      $scope.esClient = es;
-      $scope.id = $route.current.params.id;
-      $scope.index = $route.current.params.index;
-      $scope.indexPatternId = $route.current.params.indexPattern;
-      $scope.indexPatternService = indexPatterns;
-    },
-    template: html,
-    k7Breadcrumbs: ($route: any) => [
-      ...getRootBreadcrumbs(),
-      {
-        text: `${$route.current.params.index}#${$route.current.params.id}`,
-      },
-    ],
-  });
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc/use_es_doc_search.ts b/src/legacy/core_plugins/kibana/public/discover/doc/use_es_doc_search.ts
index d1a01dadb72be8..538fbed821f00b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc/use_es_doc_search.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/doc/use_es_doc_search.ts
@@ -17,9 +17,8 @@
  * under the License.
  */
 import { useEffect, useState } from 'react';
-import { ElasticSearchHit } from 'ui/registry/doc_views_types';
+import { ElasticSearchHit, IndexPattern } from '../kibana_services';
 import { DocProps } from './doc';
-import { IndexPattern } from '../../../../data/public/index_patterns';
 
 export enum ElasticRequestState {
   Loading,
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/index.js b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/index.js
deleted file mode 100644
index e6d638d88bc279..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/pager/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { uiModules } from 'ui/modules';
-import { ToolBarPagerText } from './tool_bar_pager_text';
-import { ToolBarPagerButtons } from './tool_bar_pager_buttons';
-import { wrapInI18nContext } from 'ui/i18n';
-
-const app = uiModules.get('kibana');
-
-app.directive('toolBarPagerText', function (reactDirective) {
-  return reactDirective(wrapInI18nContext(ToolBarPagerText));
-});
-
-app.directive('toolBarPagerButtons', function (reactDirective) {
-  return reactDirective(wrapInI18nContext(ToolBarPagerButtons));
-});
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.test.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.test.tsx
index 433dca65f428e9..12473b25802f23 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.test.tsx
@@ -21,10 +21,28 @@ import { mount, shallow } from 'enzyme';
 import { DocViewer } from './doc_viewer';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { addDocView, emptyDocViews, DocViewRenderProps } from 'ui/registry/doc_views';
+import {
+  addDocView,
+  emptyDocViews,
+  DocViewRenderProps,
+  getDocViewsSorted as mockGetDocViewsSorted,
+} from 'ui/registry/doc_views';
+
+jest.mock('../kibana_services', () => {
+  return {
+    getServices: () => ({
+      docViewsRegistry: {
+        getDocViewsSorted: (hit: any) => {
+          return mockGetDocViewsSorted(hit);
+        },
+      },
+    }),
+  };
+});
 
 beforeEach(() => {
   emptyDocViews();
+  jest.clearAllMocks();
 });
 
 test('Render <DocViewer/> with 3 different tabs', () => {
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.tsx
index 1c7aba9bcd7b2d..aa737ebd8dcf18 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { EuiTabbedContent } from '@elastic/eui';
-import { getDocViewsSorted, DocViewRenderProps } from 'ui/registry/doc_views';
+import { getServices, DocViewRenderProps } from '../kibana_services';
 import { DocViewerTab } from './doc_viewer_tab';
 
 /**
@@ -28,21 +28,24 @@ import { DocViewerTab } from './doc_viewer_tab';
  * a `render` function.
  */
 export function DocViewer(renderProps: DocViewRenderProps) {
-  const tabs = getDocViewsSorted(renderProps.hit).map(({ title, render, component }, idx) => {
-    return {
-      id: title,
-      name: title,
-      content: (
-        <DocViewerTab
-          id={idx}
-          title={title}
-          component={component}
-          renderProps={renderProps}
-          render={render}
-        />
-      ),
-    };
-  });
+  const { docViewsRegistry } = getServices();
+  const tabs = docViewsRegistry
+    .getDocViewsSorted(renderProps.hit)
+    .map(({ title, render, component }, idx) => {
+      return {
+        id: title,
+        name: title,
+        content: (
+          <DocViewerTab
+            id={idx}
+            title={title}
+            component={component}
+            renderProps={renderProps}
+            render={render}
+          />
+        ),
+      };
+    });
 
   if (!tabs.length) {
     // There there's a minimum of 2 tabs active in Discover.
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_directive.ts b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_directive.ts
deleted file mode 100644
index fa6145c45f55fc..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_directive.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// @ts-ignore
-import { uiModules } from 'ui/modules';
-import { DocViewer } from './doc_viewer';
-
-uiModules.get('apps/discover').directive('docViewer', (reactDirective: any) => {
-  return reactDirective(
-    DocViewer,
-    [
-      'hit',
-      ['indexPattern', { watchDepth: 'reference' }],
-      ['filter', { watchDepth: 'reference' }],
-      ['columns', { watchDepth: 'collection' }],
-      ['onAddColumn', { watchDepth: 'reference' }],
-      ['onRemoveColumn', { watchDepth: 'reference' }],
-    ],
-    {
-      restrict: 'E',
-      scope: {
-        hit: '=',
-        indexPattern: '=',
-        filter: '=?',
-        columns: '=?',
-        onAddColumn: '=?',
-        onRemoveColumn: '=?',
-      },
-    }
-  );
-});
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.test.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.test.tsx
index 3bb59a8dc958c9..5fa2d24dfa04cf 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.test.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { DocViewRenderTab } from './doc_viewer_render_tab';
-import { DocViewRenderProps } from 'ui/registry/doc_views';
+import { DocViewRenderProps } from '../kibana_services';
 
 test('Mounting and unmounting DocViewerRenderTab', () => {
   const unmountFn = jest.fn();
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.tsx
index 185ff163dad2a5..750ef6b6061e13 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useRef, useEffect } from 'react';
-import { DocViewRenderFn, DocViewRenderProps } from 'ui/registry/doc_views';
+import { DocViewRenderFn, DocViewRenderProps } from '../kibana_services';
 
 interface Props {
   render: DocViewRenderFn;
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_tab.tsx
index 0b25421d8aff3c..3721ba5818d412 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_tab.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_tab.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
-import { DocViewRenderProps, DocViewRenderFn } from 'ui/registry/doc_views';
+import { DocViewRenderProps, DocViewRenderFn } from '../kibana_services';
 import { DocViewRenderTab } from './doc_viewer_render_tab';
 import { DocViewerError } from './doc_viewer_render_error';
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/index.ts b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/index.ts
deleted file mode 100644
index 8ce94f24128df4..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/index.ts
+++ /dev/null
@@ -1,22 +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 './doc_viewer_directive';
-
-export * from './doc_viewer';
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/constants.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/constants.ts
new file mode 100644
index 00000000000000..cdb8a6ad3ad46a
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/embeddable/constants.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 SEARCH_EMBEDDABLE_TYPE = 'search';
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/index.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/index.ts
index 3138008f3e3a00..beeb6a7338f9d2 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/index.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/embeddable/index.ts
@@ -20,3 +20,4 @@
 export * from './types';
 export * from './search_embeddable_factory';
 export * from './search_embeddable';
+export { SEARCH_EMBEDDABLE_TYPE } from './constants';
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
index eaec11ff893ed2..732fb6d2e4e709 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
@@ -16,42 +16,44 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-// @ts-ignore
-import { getFilterGenerator } from 'ui/filter_manager';
-import angular from 'angular';
 import _ from 'lodash';
-import { SearchSource } from 'ui/courier';
-import {
-  getRequestInspectorStats,
-  getResponseInspectorStats,
-} from 'ui/courier/utils/courier_inspector_utils';
-import { IndexPattern } from 'ui/index_patterns';
-import { RequestAdapter } from 'ui/inspector/adapters';
-import { Adapters } from 'ui/inspector/types';
-import { Subscription } from 'rxjs';
 import * as Rx from 'rxjs';
-import { Filter, FilterStateStore } from '@kbn/es-query';
-import chrome from 'ui/chrome';
+import { Subscription } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import { toastNotifications } from 'ui/notify';
-import { TimeRange } from 'src/plugins/data/public';
 import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public';
-import { setup as data } from '../../../../data/public/legacy';
-import { Query, onlyDisabledFiltersChanged, getTime } from '../../../../data/public';
+import { npStart } from 'ui/new_platform';
+import {
+  esFilters,
+  TimeRange,
+  onlyDisabledFiltersChanged,
+  getTime,
+} from '../../../../../../plugins/data/public';
+import { Query } from '../../../../data/public';
 import {
   APPLY_FILTER_TRIGGER,
-  Embeddable,
   Container,
+  Embeddable,
 } from '../../../../embeddable_api/public/np_ready/public';
-import * as columnActions from '../doc_table/actions/columns';
+import * as columnActions from '../angular/doc_table/actions/columns';
 import { SavedSearch } from '../types';
 import searchTemplate from './search_template.html';
 import { ISearchEmbeddable, SearchInput, SearchOutput } from './types';
-import { SortOrder } from '../doc_table/components/table_header/helpers';
-import { getSortForSearchSource } from '../doc_table/lib/get_sort_for_search_source';
+import { SortOrder } from '../angular/doc_table/components/table_header/helpers';
+import { getSortForSearchSource } from '../angular/doc_table/lib/get_sort_for_search_source';
+import {
+  Adapters,
+  angular,
+  getFilterGenerator,
+  getRequestInspectorStats,
+  getResponseInspectorStats,
+  getServices,
+  IndexPattern,
+  RequestAdapter,
+  SearchSource,
+} from '../kibana_services';
+import { SEARCH_EMBEDDABLE_TYPE } from './constants';
 
-const config = chrome.getUiSettingsClient();
+const { data } = npStart.plugins;
 
 interface SearchScope extends ng.IScope {
   columns?: string[];
@@ -79,7 +81,7 @@ export interface FilterManager {
     values: string | string[],
     operation: string,
     index: number
-  ) => Filter[];
+  ) => esFilters.Filter[];
 }
 
 interface SearchEmbeddableConfig {
@@ -92,8 +94,6 @@ interface SearchEmbeddableConfig {
   queryFilter: unknown;
 }
 
-export const SEARCH_EMBEDDABLE_TYPE = 'search';
-
 export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
   implements ISearchEmbeddable {
   private readonly savedSearch: SavedSearch;
@@ -111,7 +111,7 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
   private abortController?: AbortController;
 
   private prevTimeRange?: TimeRange;
-  private prevFilters?: Filter[];
+  private prevFilters?: esFilters.Filter[];
   private prevQuery?: Query;
 
   constructor(
@@ -142,9 +142,9 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
       requests: new RequestAdapter(),
     };
     this.initializeSearchScope();
-    this.autoRefreshFetchSubscription = data.timefilter.timefilter
-      .getAutoRefreshFetch$()
-      .subscribe(this.fetch);
+    const { timefilter } = data.query.timefilter;
+
+    this.autoRefreshFetchSubscription = timefilter.getAutoRefreshFetch$().subscribe(this.fetch);
 
     this.subscription = Rx.merge(this.getOutput$(), this.getInput$()).subscribe(() => {
       this.panelTitle = this.output.title || '';
@@ -254,7 +254,7 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
       let filters = this.filterGen.generate(field, value, operator, indexPattern.id);
       filters = filters.map(filter => ({
         ...filter,
-        $state: { store: FilterStateStore.APP_STATE },
+        $state: { store: esFilters.FilterStateStore.APP_STATE },
       }));
 
       await this.executeTriggerActions(APPLY_FILTER_TRIGGER, {
@@ -277,7 +277,7 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
     if (this.abortController) this.abortController.abort();
     this.abortController = new AbortController();
 
-    searchSource.setField('size', config.get('discover:sampleSize'));
+    searchSource.setField('size', getServices().uiSettings.get('discover:sampleSize'));
     searchSource.setField(
       'sort',
       getSortForSearchSource(this.searchScope.sort, this.searchScope.indexPattern)
@@ -319,7 +319,7 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
       // If the fetch was aborted, no need to surface this in the UI
       if (error.name === 'AbortError') return;
 
-      toastNotifications.addError(error, {
+      getServices().toastNotifications.addError(error, {
         title: i18n.translate('kbn.embeddable.errorTitle', {
           defaultMessage: 'Error fetching data',
         }),
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts
index d7b51b39e2a16d..1939cc70606217 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts
@@ -16,24 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import '../doc_table';
-import { capabilities } from 'ui/capabilities';
-import { npStart, npSetup } from 'ui/new_platform';
-import { i18n } from '@kbn/i18n';
-import chrome from 'ui/chrome';
 import { IPrivate } from 'ui/private';
-import { TimeRange } from 'src/plugins/data/public';
-import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
+import { i18n } from '@kbn/i18n';
 import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public';
+import '../angular/doc_table';
+import { getServices } from '../kibana_services';
 import {
   EmbeddableFactory,
   ErrorEmbeddable,
   Container,
 } from '../../../../../../plugins/embeddable/public';
+import { TimeRange } from '../../../../../../plugins/data/public';
 import { SavedSearchLoader } from '../types';
-import { SearchEmbeddable, SEARCH_EMBEDDABLE_TYPE } from './search_embeddable';
+import { SearchEmbeddable } from './search_embeddable';
 import { SearchInput, SearchOutput } from './types';
+import { SEARCH_EMBEDDABLE_TYPE } from './constants';
 
 export class SearchEmbeddableFactory extends EmbeddableFactory<
   SearchInput,
@@ -55,7 +52,7 @@ export class SearchEmbeddableFactory extends EmbeddableFactory<
   }
 
   public isEditable() {
-    return capabilities.get().discover.save as boolean;
+    return getServices().capabilities.discover.save as boolean;
   }
 
   public canCreateNew() {
@@ -73,16 +70,18 @@ export class SearchEmbeddableFactory extends EmbeddableFactory<
     input: Partial<SearchInput> & { id: string; timeRange: TimeRange },
     parent?: Container
   ): Promise<SearchEmbeddable | ErrorEmbeddable> {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
+    const $injector = await getServices().getInjector();
 
     const $compile = $injector.get<ng.ICompileService>('$compile');
     const $rootScope = $injector.get<ng.IRootScopeService>('$rootScope');
     const searchLoader = $injector.get<SavedSearchLoader>('savedSearches');
-    const editUrl = chrome.addBasePath(`/app/kibana${searchLoader.urlFor(savedObjectId)}`);
+    const editUrl = await getServices().addBasePath(
+      `/app/kibana${searchLoader.urlFor(savedObjectId)}`
+    );
 
     const Private = $injector.get<IPrivate>('Private');
 
-    const queryFilter = Private(FilterBarQueryFilterProvider);
+    const queryFilter = Private(getServices().FilterBarQueryFilterProvider);
     try {
       const savedObject = await searchLoader.get(savedObjectId);
       return new SearchEmbeddable(
@@ -92,7 +91,7 @@ export class SearchEmbeddableFactory extends EmbeddableFactory<
           $compile,
           editUrl,
           queryFilter,
-          editable: capabilities.get().discover.save as boolean,
+          editable: getServices().capabilities.discover.save as boolean,
           indexPatterns: _.compact([savedObject.searchSource.getField('index')]),
         },
         input,
@@ -110,5 +109,5 @@ export class SearchEmbeddableFactory extends EmbeddableFactory<
   }
 }
 
-const factory = new SearchEmbeddableFactory(npStart.plugins.uiActions.executeTriggerActions);
-npSetup.plugins.embeddable.registerEmbeddableFactory(factory.type, factory);
+const factory = new SearchEmbeddableFactory(getServices().uiActions.executeTriggerActions);
+getServices().embeddable.registerEmbeddableFactory(factory.type, factory);
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts
index bc46cdbe82981b..5473ec0e7b8b4d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-import { StaticIndexPattern } from 'ui/index_patterns';
 import { TimeRange } from 'src/plugins/data/public';
 import { Query } from 'src/legacy/core_plugins/data/public';
-import { Filter } from '@kbn/es-query';
 import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from 'src/plugins/embeddable/public';
+import { StaticIndexPattern } from '../kibana_services';
 import { SavedSearch } from '../types';
-import { SortOrder } from '../doc_table/components/table_header/helpers';
+import { SortOrder } from '../angular/doc_table/components/table_header/helpers';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export interface SearchInput extends EmbeddableInput {
   timeRange: TimeRange;
   query?: Query;
-  filters?: Filter[];
+  filters?: esFilters.Filter[];
   hidePanelTitles?: boolean;
   columns?: string[];
   sort?: SortOrder[];
diff --git a/src/legacy/core_plugins/kibana/public/discover/helpers/register_feature.ts b/src/legacy/core_plugins/kibana/public/discover/helpers/register_feature.ts
new file mode 100644
index 00000000000000..eb8c2aec915581
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/helpers/register_feature.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 { i18n } from '@kbn/i18n';
+import {
+  FeatureCatalogueRegistryProvider,
+  FeatureCatalogueCategory,
+} from 'ui/registry/feature_catalogue';
+
+export function registerFeature() {
+  FeatureCatalogueRegistryProvider.register(() => {
+    return {
+      id: 'discover',
+      title: i18n.translate('kbn.discover.discoverTitle', {
+        defaultMessage: 'Discover',
+      }),
+      description: i18n.translate('kbn.discover.discoverDescription', {
+        defaultMessage: 'Interactively explore your data by querying and filtering raw documents.',
+      }),
+      icon: 'discoverApp',
+      path: '/app/kibana#/discover',
+      showOnHomePage: true,
+      category: FeatureCatalogueCategory.DATA,
+    };
+  });
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/index.js b/src/legacy/core_plugins/kibana/public/discover/index.js
deleted file mode 100644
index e5099363062750..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import './saved_searches/saved_searches';
-import { i18n } from '@kbn/i18n';
-
-import './angular/directives';
-import 'ui/collapsible_sidebar';
-import './components/field_chooser/field_chooser';
-import './angular/discover';
-import './doc_table/components/table_row';
-import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
-import './doc';
-import './context';
-
-FeatureCatalogueRegistryProvider.register(() => {
-  return {
-    id: 'discover',
-    title: i18n.translate('kbn.discover.discoverTitle', {
-      defaultMessage: 'Discover',
-    }),
-    description: i18n.translate('kbn.discover.discoverDescription', {
-      defaultMessage: 'Interactively explore your data by querying and filtering raw documents.',
-    }),
-    icon: 'discoverApp',
-    path: '/app/kibana#/discover',
-    showOnHomePage: true,
-    category: FeatureCatalogueCategory.DATA
-  };
-});
diff --git a/src/legacy/core_plugins/kibana/public/discover/index.ts b/src/legacy/core_plugins/kibana/public/discover/index.ts
new file mode 100644
index 00000000000000..35e48598f07a80
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/index.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import { npSetup, npStart } from 'ui/new_platform';
+import { DiscoverPlugin, DiscoverSetup, DiscoverStart } from './plugin';
+
+// Core will be looking for this when loading our plugin in the new platform
+export const plugin: PluginInitializer<DiscoverSetup, DiscoverStart> = (
+  initializerContext: PluginInitializerContext
+) => {
+  return new DiscoverPlugin(initializerContext);
+};
+
+const pluginInstance = plugin({} as PluginInitializerContext);
+export const setup = pluginInstance.setup(npSetup.core, npSetup.plugins);
+export const start = pluginInstance.start(npStart.core, npStart.plugins);
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
new file mode 100644
index 00000000000000..b78d05e68acade
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -0,0 +1,122 @@
+/*
+ * 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 'ui/collapsible_sidebar';
+import 'ui/directives/listen';
+import 'ui/directives/storage';
+import 'ui/fixed_scroll';
+import 'ui/directives/css_truncate';
+
+import { npStart } from 'ui/new_platform';
+import chromeLegacy from 'ui/chrome';
+import angular from 'angular'; // just used in embeddables and discover controller
+import uiRoutes from 'ui/routes';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+import { SearchSource } from 'ui/courier';
+// @ts-ignore
+import { StateProvider } from 'ui/state_management/state';
+// @ts-ignore
+import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
+import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
+import { timefilter } from 'ui/timefilter';
+import { ShareContextMenuExtensionsRegistryProvider } from 'ui/share';
+// @ts-ignore
+import { IndexPattern, IndexPatterns } from 'ui/index_patterns';
+import { wrapInI18nContext } from 'ui/i18n';
+// @ts-ignore
+import { docTitle } from 'ui/doc_title';
+// @ts-ignore
+import * as docViewsRegistry from 'ui/registry/doc_views';
+
+const services = {
+  // new plattform
+  addBasePath: npStart.core.http.basePath.prepend,
+  capabilities: npStart.core.application.capabilities,
+  chrome: npStart.core.chrome,
+  docLinks: npStart.core.docLinks,
+  eui_utils: npStart.plugins.eui_utils,
+  inspector: npStart.plugins.inspector,
+  metadata: npStart.core.injectedMetadata.getLegacyMetadata(),
+  toastNotifications: npStart.core.notifications.toasts,
+  uiSettings: npStart.core.uiSettings,
+  uiActions: npStart.plugins.uiActions,
+  embeddable: npStart.plugins.embeddable,
+  // legacy
+  docTitle,
+  docViewsRegistry,
+  FilterBarQueryFilterProvider,
+  getInjector: () => {
+    return chromeLegacy.dangerouslyGetActiveInjector();
+  },
+  SavedObjectRegistryProvider,
+  SavedObjectProvider,
+  SearchSource,
+  ShareContextMenuExtensionsRegistryProvider,
+  StateProvider,
+  timefilter,
+  uiModules,
+  uiRoutes,
+  wrapInI18nContext,
+};
+export function getServices() {
+  return services;
+}
+
+// EXPORT legacy static dependencies
+export { angular };
+export { buildVislibDimensions } from 'ui/visualize/loader/pipeline_helpers/build_pipeline';
+// @ts-ignore
+export { callAfterBindingsWorkaround } from 'ui/compat';
+// @ts-ignore
+export { getFilterGenerator } from 'ui/filter_manager';
+export {
+  getRequestInspectorStats,
+  getResponseInspectorStats,
+} from 'ui/courier/utils/courier_inspector_utils';
+// @ts-ignore
+export { hasSearchStategyForIndexPattern, isDefaultTypeIndexPattern } from 'ui/courier';
+// @ts-ignore
+export { intervalOptions } from 'ui/agg_types/buckets/_interval_options';
+// @ts-ignore
+export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
+// @ts-ignore
+export { RequestAdapter } from 'ui/inspector/adapters';
+export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
+export { FieldList } from 'ui/index_patterns';
+export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
+export { showShareContextMenu } from 'ui/share';
+export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
+export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
+// @ts-ignore
+export { timezoneProvider } from 'ui/vis/lib/timezone';
+// @ts-ignore
+export { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
+// @ts-ignore
+export { tabifyAggResponse } from 'ui/agg_response/tabify';
+// @ts-ignore
+export { vislibSeriesResponseHandlerProvider } from 'ui/vis/response_handlers/vislib';
+
+// EXPORT types
+export { VisProvider } from 'ui/vis';
+export { StaticIndexPattern, IndexPatterns, IndexPattern, FieldType } from 'ui/index_patterns';
+export { SearchSource } from 'ui/courier';
+export { ElasticSearchHit } from 'ui/registry/doc_views_types';
+export { DocViewRenderProps, DocViewRenderFn } from 'ui/registry/doc_views';
+export { Adapters } from 'ui/inspector/types';
diff --git a/src/legacy/core_plugins/kibana/public/discover/plugin.ts b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
new file mode 100644
index 00000000000000..873c429bf705db
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'kibana/public';
+import { IUiActionsStart } from 'src/plugins/ui_actions/public';
+import { registerFeature } from './helpers/register_feature';
+import './kibana_services';
+import {
+  Start as EmbeddableStart,
+  Setup as EmbeddableSetup,
+} from '../../../../../plugins/embeddable/public';
+
+/**
+ * These are the interfaces with your public contracts. You should export these
+ * for other plugins to use in _their_ `SetupDeps`/`StartDeps` interfaces.
+ * @public
+ */
+export type DiscoverSetup = void;
+export type DiscoverStart = void;
+interface DiscoverSetupPlugins {
+  uiActions: IUiActionsStart;
+  embeddable: EmbeddableSetup;
+}
+interface DiscoverStartPlugins {
+  uiActions: IUiActionsStart;
+  embeddable: EmbeddableStart;
+}
+
+export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
+  constructor(initializerContext: PluginInitializerContext) {}
+  setup(core: CoreSetup, plugins: DiscoverSetupPlugins): DiscoverSetup {
+    registerFeature();
+    require('./angular');
+  }
+
+  start(core: CoreStart, plugins: DiscoverStartPlugins): DiscoverStart {
+    // TODO enable this when possible, seems it broke a functional test:
+    // dashboard mode Dashboard View Mode Dashboard viewer can paginate on a saved search
+    // const factory = new SearchEmbeddableFactory(plugins.uiActions.executeTriggerActions);
+    // plugins.embeddable.registerEmbeddableFactory(factory.type, factory);
+  }
+
+  stop() {}
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.js b/src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.js
index 3903dc08454500..9bbc5baf4fc229 100644
--- a/src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.js
+++ b/src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.js
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import 'ui/notify';
-import { uiModules } from 'ui/modules';
 import { createLegacyClass } from 'ui/utils/legacy_class';
-import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
+import { getServices } from '../kibana_services';
+
+const { uiModules, SavedObjectProvider } = getServices();
 
 const module = uiModules.get('discover/saved_searches', []);
 
@@ -40,7 +40,7 @@ module.factory('SavedSearch', function (Private) {
         columns: [],
         hits: 0,
         sort: [],
-        version: 1
+        version: 1,
       },
     });
 
@@ -55,7 +55,7 @@ module.factory('SavedSearch', function (Private) {
     hits: 'integer',
     columns: 'keyword',
     sort: 'keyword',
-    version: 'integer'
+    version: 'integer',
   };
 
   // Order these fields to the top, the rest are alphabetical
diff --git a/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js
index 8460ccf923cf3a..9554642c225fd5 100644
--- a/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js
+++ b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+import { getServices } from '../kibana_services';
 import './saved_searches';
 
 
-SavedObjectRegistryProvider.register((savedSearches) => {
+getServices().SavedObjectRegistryProvider.register((savedSearches) => {
   return savedSearches;
 });
diff --git a/src/legacy/core_plugins/kibana/public/discover/top_nav/open_search_panel.js b/src/legacy/core_plugins/kibana/public/discover/top_nav/open_search_panel.js
index f29ebe6a47141b..0c3b52fbf0640c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/top_nav/open_search_panel.js
+++ b/src/legacy/core_plugins/kibana/public/discover/top_nav/open_search_panel.js
@@ -19,11 +19,9 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
 import rison from 'rison-node';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-
 import {
   EuiButton,
   EuiFlexGroup,
@@ -34,6 +32,7 @@ import {
   EuiFlyoutBody,
   EuiTitle,
 } from '@elastic/eui';
+import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
 
 const SEARCH_OBJECT_TYPE = 'search';
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/top_nav/open_search_panel.test.js b/src/legacy/core_plugins/kibana/public/discover/top_nav/open_search_panel.test.js
index 2bec532110379e..3531088e3847c9 100644
--- a/src/legacy/core_plugins/kibana/public/discover/top_nav/open_search_panel.test.js
+++ b/src/legacy/core_plugins/kibana/public/discover/top_nav/open_search_panel.test.js
@@ -20,6 +20,14 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
+jest.mock('../kibana_services', () => {
+  return {
+    getServices: () => ({
+      SavedObjectFinder: jest.fn()
+    }),
+  };
+});
+
 import {
   OpenSearchPanel,
 } from './open_search_panel';
diff --git a/src/legacy/core_plugins/kibana/public/discover/types.d.ts b/src/legacy/core_plugins/kibana/public/discover/types.d.ts
index f285e943698936..7d8740243ec02b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/types.d.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/types.d.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { SearchSource } from 'ui/courier';
-import { SortOrder } from './doc_table/components/table_header/helpers';
+import { SearchSource } from './kibana_services';
+import { SortOrder } from './angular/doc_table/components/table_header/helpers';
 
 export interface SavedSearch {
   readonly id: string;
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
index fcf60a6009b29c..71c336b1d48d20 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
@@ -2,6 +2,7 @@
 
 exports[`home directories should not render directory entry when showOnHomePage is false 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
@@ -117,6 +118,7 @@ exports[`home directories should not render directory entry when showOnHomePage
 
 exports[`home directories should render ADMIN directory entry in "Manage" panel 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
@@ -245,6 +247,7 @@ exports[`home directories should render ADMIN directory entry in "Manage" panel
 
 exports[`home directories should render DATA directory entry in "Explore Data" panel 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
@@ -373,6 +376,7 @@ exports[`home directories should render DATA directory entry in "Explore Data" p
 
 exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
@@ -488,6 +492,7 @@ exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
 
 exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when there are index patterns 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
@@ -603,6 +608,7 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when t
 
 exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when there are no index patterns 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
@@ -718,6 +724,7 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when th
 
 exports[`home should render home component 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
@@ -833,6 +840,7 @@ exports[`home should render home component 1`] = `
 
 exports[`home welcome should show the normal home page if loading fails 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
@@ -948,6 +956,7 @@ exports[`home welcome should show the normal home page if loading fails 1`] = `
 
 exports[`home welcome should show the normal home page if welcome screen is disabled locally 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
@@ -1073,6 +1082,7 @@ exports[`home welcome should show the welcome screen if enabled, and there are n
 
 exports[`home welcome stores skip welcome setting if skipped 1`] = `
 <EuiPage
+  data-test-subj="homeApp"
   restrictWidth={1200}
 >
   <EuiPageBody
diff --git a/src/legacy/core_plugins/kibana/public/home/components/add_data.js b/src/legacy/core_plugins/kibana/public/home/components/add_data.js
index f8c8e0ec8411fc..0a3adfa430a45c 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/add_data.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/add_data.js
@@ -21,7 +21,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-import chrome from 'ui/chrome';
+import { getServices } from '../kibana_services';
 
 import {
   EuiButton,
@@ -38,10 +38,9 @@ import {
   EuiFlexGrid,
 } from '@elastic/eui';
 
-/* istanbul ignore next */
-const basePath = chrome.getBasePath();
 
 const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl, mlEnabled }) => {
+  const basePath = getServices().getBasePath();
   const renderCards = () => {
     const apmData = {
       title: intl.formatMessage({
diff --git a/src/legacy/core_plugins/kibana/public/home/components/add_data.test.js b/src/legacy/core_plugins/kibana/public/home/components/add_data.test.js
index d7c8e9daa99dae..07f415cfcb1c9d 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/add_data.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/add_data.test.js
@@ -20,15 +20,20 @@
 import React from 'react';
 import { AddData } from './add_data';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import chrome from 'ui/chrome';
+import { getServices } from '../kibana_services';
 
-jest.mock(
-  'ui/chrome',
-  () => ({
+jest.mock('../kibana_services', () =>{
+  const mock = {
     getBasePath: jest.fn(() => 'path'),
-  }),
-  { virtual: true }
-);
+  };
+  return {
+    getServices: () => mock,
+  };
+});
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
 
 test('render', () => {
   const component = shallowWithIntl(<AddData.WrappedComponent
@@ -37,7 +42,7 @@ test('render', () => {
     isNewKibanaInstance={false}
   />);
   expect(component).toMatchSnapshot(); // eslint-disable-line
-  expect(chrome.getBasePath).toHaveBeenCalledTimes(1);
+  expect(getServices().getBasePath).toHaveBeenCalledTimes(1);
 });
 
 test('mlEnabled', () => {
@@ -47,7 +52,7 @@ test('mlEnabled', () => {
     isNewKibanaInstance={false}
   />);
   expect(component).toMatchSnapshot(); // eslint-disable-line
-  expect(chrome.getBasePath).toHaveBeenCalledTimes(1);
+  expect(getServices().getBasePath).toHaveBeenCalledTimes(1);
 });
 
 test('apmUiEnabled', () => {
@@ -57,7 +62,7 @@ test('apmUiEnabled', () => {
     isNewKibanaInstance={false}
   />);
   expect(component).toMatchSnapshot(); // eslint-disable-line
-  expect(chrome.getBasePath).toHaveBeenCalledTimes(1);
+  expect(getServices().getBasePath).toHaveBeenCalledTimes(1);
 });
 
 test('isNewKibanaInstance', () => {
@@ -67,5 +72,5 @@ test('isNewKibanaInstance', () => {
     isNewKibanaInstance={true}
   />);
   expect(component).toMatchSnapshot(); // eslint-disable-line
-  expect(chrome.getBasePath).toHaveBeenCalledTimes(1);
+  expect(getServices().getBasePath).toHaveBeenCalledTimes(1);
 });
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home.js b/src/legacy/core_plugins/kibana/public/home/components/home.js
index 6a8dff2ad4fa72..7f67b7ea0f3e1b 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/home.js
@@ -22,7 +22,6 @@ import PropTypes from 'prop-types';
 import { Synopsis } from './synopsis';
 import { AddData } from './add_data';
 import { FormattedMessage } from '@kbn/i18n/react';
-import chrome from 'ui/chrome';
 
 import {
   EuiButton,
@@ -40,6 +39,7 @@ import {
 
 import { Welcome } from './welcome';
 import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
+import { getServices } from '../kibana_services';
 
 const KEY_ENABLE_WELCOME = 'home:welcome:show';
 
@@ -47,7 +47,10 @@ export class Home extends Component {
   constructor(props) {
     super(props);
 
-    const isWelcomeEnabled = !(chrome.getInjected('disableWelcomeScreen') || props.localStorage.getItem(KEY_ENABLE_WELCOME) === 'false');
+    const isWelcomeEnabled = !(
+      getServices().getInjected('disableWelcomeScreen') ||
+      props.localStorage.getItem(KEY_ENABLE_WELCOME) === 'false'
+    );
 
     this.state = {
       // If welcome is enabled, we wait for loading to complete
@@ -133,7 +136,7 @@ export class Home extends Component {
     const { apmUiEnabled, mlEnabled } = this.props;
 
     return (
-      <EuiPage restrictWidth={1200}>
+      <EuiPage restrictWidth={1200} data-test-subj="homeApp">
         <EuiPageBody className="eui-displayBlock">
 
           <EuiScreenReaderOnly>
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home.test.js b/src/legacy/core_plugins/kibana/public/home/components/home.test.js
index aa520ba2ed5f92..c21c6fa3d98a56 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/home.test.js
@@ -25,6 +25,13 @@ import { shallow } from 'enzyme';
 import { Home } from './home';
 import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
 
+jest.mock('../kibana_services', () =>({
+  getServices: () => ({
+    getBasePath: () => 'path',
+    getInjected: () => ''
+  })
+}));
+
 describe('home', () => {
   let defaultProps;
 
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts b/src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts
index 621c058c803db0..cd7bc82fe33459 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts
+++ b/src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts
@@ -17,7 +17,12 @@
  * under the License.
  */
 
-import { notificationServiceMock, overlayServiceMock } from '../../../../../../core/public/mocks';
+import {
+  notificationServiceMock,
+  overlayServiceMock,
+  httpServiceMock,
+  injectedMetadataServiceMock,
+} from '../../../../../../core/public/mocks';
 
 jest.doMock('ui/new_platform', () => {
   return {
@@ -29,22 +34,9 @@ jest.doMock('ui/new_platform', () => {
     npStart: {
       core: {
         overlays: overlayServiceMock.createStartContract(),
+        http: httpServiceMock.createStartContract({ basePath: 'path' }),
+        injectedMetadata: injectedMetadataServiceMock.createStartContract(),
       },
     },
   };
 });
-
-jest.doMock(
-  'ui/chrome',
-  () => ({
-    getBasePath: jest.fn(() => 'path'),
-    getInjected: jest.fn(() => ''),
-  }),
-  { virtual: true }
-);
-
-jest.doMock('ui/capabilities', () => ({
-  catalogue: {},
-  management: {},
-  navLinks: {},
-}));
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home_app.js b/src/legacy/core_plugins/kibana/public/home/components/home_app.js
index 9aa44863f6d70c..e4a6753e0771a2 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home_app.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/home_app.js
@@ -18,41 +18,46 @@
  */
 
 import React from 'react';
+import { I18nProvider } from '@kbn/i18n/react';
 import PropTypes from 'prop-types';
 import { Home } from './home';
 import { FeatureDirectory } from './feature_directory';
 import { TutorialDirectory } from './tutorial_directory';
 import { Tutorial } from './tutorial/tutorial';
-import {
-  HashRouter as Router,
-  Switch,
-  Route
-} from 'react-router-dom';
+import { HashRouter as Router, Switch, Route, Redirect } from 'react-router-dom';
 import { getTutorial } from '../load_tutorials';
 import { replaceTemplateStrings } from './tutorial/replace_template_strings';
-import { telemetryOptInProvider, shouldShowTelemetryOptIn } from '../kibana_services';
-import chrome from 'ui/chrome';
+import { getServices } from '../kibana_services';
 
 export function HomeApp({ directories }) {
-  const isCloudEnabled = chrome.getInjected('isCloudEnabled', false);
-  const apmUiEnabled = chrome.getInjected('apmUiEnabled', true);
-  const mlEnabled = chrome.getInjected('mlEnabled', false);
-  const savedObjectsClient = chrome.getSavedObjectsClient();
+  const {
+    telemetryOptInProvider,
+    shouldShowTelemetryOptIn,
+    getInjected,
+    savedObjectsClient,
+    getBasePath,
+    addBasePath,
+  } = getServices();
 
-  const renderTutorialDirectory = (props) => {
+  const isCloudEnabled = getInjected('isCloudEnabled', false);
+  const apmUiEnabled = getInjected('apmUiEnabled', true);
+  const mlEnabled = getInjected('mlEnabled', false);
+  const defaultAppId = getInjected('kbnDefaultAppId', 'discover');
+
+  const renderTutorialDirectory = props => {
     return (
       <TutorialDirectory
-        addBasePath={chrome.addBasePath}
+        addBasePath={addBasePath}
         openTab={props.match.params.tab}
         isCloudEnabled={isCloudEnabled}
       />
     );
   };
 
-  const renderTutorial = (props) => {
+  const renderTutorial = props => {
     return (
       <Tutorial
-        addBasePath={chrome.addBasePath}
+        addBasePath={addBasePath}
         isCloudEnabled={isCloudEnabled}
         getTutorial={getTutorial}
         replaceTemplateStrings={replaceTemplateStrings}
@@ -63,54 +68,48 @@ export function HomeApp({ directories }) {
   };
 
   return (
-    <Router>
-      <Switch>
-        <Route
-          path="/home/tutorial/:id"
-          render={renderTutorial}
-        />
-        <Route
-          path="/home/tutorial_directory/:tab?"
-          render={renderTutorialDirectory}
-        />
-        <Route
-          path="/home/feature_directory"
-        >
-          <FeatureDirectory
-            addBasePath={chrome.addBasePath}
-            directories={directories}
-          />
-        </Route>
-        <Route
-          path="/home"
-        >
-          <Home
-            addBasePath={chrome.addBasePath}
-            directories={directories}
-            apmUiEnabled={apmUiEnabled}
-            mlEnabled={mlEnabled}
-            find={savedObjectsClient.find}
-            localStorage={localStorage}
-            urlBasePath={chrome.getBasePath()}
-            shouldShowTelemetryOptIn={shouldShowTelemetryOptIn}
-            setOptIn={telemetryOptInProvider.setOptIn}
-            fetchTelemetry={telemetryOptInProvider.fetchExample}
-            getTelemetryBannerId={telemetryOptInProvider.getBannerId}
-          />
-        </Route>
-      </Switch>
-    </Router>
+    <I18nProvider>
+      <Router>
+        <Switch>
+          <Route path="/home/tutorial/:id" render={renderTutorial} />
+          <Route path="/home/tutorial_directory/:tab?" render={renderTutorialDirectory} />
+          <Route exact path="/home/feature_directory">
+            <FeatureDirectory addBasePath={addBasePath} directories={directories} />
+          </Route>
+          <Route exact path="/home">
+            <Home
+              addBasePath={addBasePath}
+              directories={directories}
+              apmUiEnabled={apmUiEnabled}
+              mlEnabled={mlEnabled}
+              find={savedObjectsClient.find}
+              localStorage={localStorage}
+              urlBasePath={getBasePath()}
+              shouldShowTelemetryOptIn={shouldShowTelemetryOptIn}
+              setOptIn={telemetryOptInProvider.setOptIn}
+              fetchTelemetry={telemetryOptInProvider.fetchExample}
+              getTelemetryBannerId={telemetryOptInProvider.getBannerId}
+            />
+          </Route>
+          <Route path="/home">
+            <Redirect to={`/${defaultAppId}`} />
+          </Route>
+        </Switch>
+      </Router>
+    </I18nProvider>
   );
 }
 
 HomeApp.propTypes = {
-  directories: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    title: PropTypes.string.isRequired,
-    description: PropTypes.string.isRequired,
-    icon: PropTypes.string.isRequired,
-    path: PropTypes.string.isRequired,
-    showOnHomePage: PropTypes.bool.isRequired,
-    category: PropTypes.string.isRequired
-  })),
+  directories: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      title: PropTypes.string.isRequired,
+      description: PropTypes.string.isRequired,
+      icon: PropTypes.string.isRequired,
+      path: PropTypes.string.isRequired,
+      showOnHomePage: PropTypes.bool.isRequired,
+      category: PropTypes.string.isRequired,
+    })
+  ),
 };
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js b/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js
index 5556a70b7d6b83..53d922c4e0a26d 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js
@@ -31,7 +31,7 @@ import {
   UNINSTALLED_STATUS,
 } from './sample_data_set_card';
 
-import { toastNotifications } from 'ui/notify';
+import { getServices } from '../kibana_services';
 
 import {
   listSampleDataSets,
@@ -40,15 +40,14 @@ import {
 } from '../sample_data_client';
 
 import { i18n } from '@kbn/i18n';
-import chrome from 'ui/chrome';
-
-const IS_DARK_THEME = chrome.getUiSettingsClient().get('theme:darkMode');
 
 export class SampleDataSetCards extends React.Component {
 
   constructor(props) {
     super(props);
 
+    this.toastNotifications = getServices().toastNotifications;
+
     this.state = {
       sampleDataSets: [],
       processingStatus: {},
@@ -70,7 +69,7 @@ export class SampleDataSetCards extends React.Component {
     try {
       sampleDataSets = await listSampleDataSets();
     } catch (fetchError) {
-      toastNotifications.addDanger({
+      this.toastNotifications.addDanger({
         title: i18n.translate('kbn.home.sampleDataSet.unableToLoadListErrorMessage', {
           defaultMessage: 'Unable to load sample data sets list' }
         ),
@@ -109,7 +108,7 @@ export class SampleDataSetCards extends React.Component {
           processingStatus: { ...prevState.processingStatus, [id]: false }
         }));
       }
-      toastNotifications.addDanger({
+      this.toastNotifications.addDanger({
         title: i18n.translate('kbn.home.sampleDataSet.unableToInstallErrorMessage', {
           defaultMessage: 'Unable to install sample data set: {name}', values: { name: targetSampleDataSet.name } }
         ),
@@ -130,7 +129,7 @@ export class SampleDataSetCards extends React.Component {
       }));
     }
 
-    toastNotifications.addSuccess({
+    this.toastNotifications.addSuccess({
       title: i18n.translate('kbn.home.sampleDataSet.installedLabel', {
         defaultMessage: '{name} installed', values: { name: targetSampleDataSet.name } }
       ),
@@ -155,7 +154,7 @@ export class SampleDataSetCards extends React.Component {
           processingStatus: { ...prevState.processingStatus, [id]: false }
         }));
       }
-      toastNotifications.addDanger({
+      this.toastNotifications.addDanger({
         title: i18n.translate('kbn.home.sampleDataSet.unableToUninstallErrorMessage', {
           defaultMessage: 'Unable to uninstall sample data set: {name}', values: { name: targetSampleDataSet.name } }
         ),
@@ -176,7 +175,7 @@ export class SampleDataSetCards extends React.Component {
       }));
     }
 
-    toastNotifications.addSuccess({
+    this.toastNotifications.addSuccess({
       title: i18n.translate('kbn.home.sampleDataSet.uninstalledLabel', {
         defaultMessage: '{name} uninstalled', values: { name: targetSampleDataSet.name } }
       ),
@@ -185,7 +184,9 @@ export class SampleDataSetCards extends React.Component {
   }
 
   lightOrDarkImage = (sampleDataSet) => {
-    return IS_DARK_THEME && sampleDataSet.darkPreviewImagePath ? sampleDataSet.darkPreviewImagePath : sampleDataSet.previewImagePath;
+    return getServices().uiSettings.get('theme:darkMode') && sampleDataSet.darkPreviewImagePath
+      ? sampleDataSet.darkPreviewImagePath
+      : sampleDataSet.previewImagePath;
   }
 
   render() {
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.js b/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.js
index 1df99e9b03d11c..89d4909b0c66f5 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.js
@@ -27,9 +27,10 @@ import {
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
-import chrome from 'ui/chrome';
+import { getServices } from '../kibana_services';
 
 export class SampleDataViewDataButton extends React.Component {
+  addBasePath = getServices().addBasePath;
 
   state = {
     isPopoverOpen: false
@@ -56,7 +57,7 @@ export class SampleDataViewDataButton extends React.Component {
         datasetName: this.props.name,
       },
     });
-    const dashboardPath = chrome.addBasePath(`/app/kibana#/dashboard/${this.props.overviewDashboard}`);
+    const dashboardPath = this.addBasePath(`/app/kibana#/dashboard/${this.props.overviewDashboard}`);
 
     if (this.props.appLinks.length === 0) {
       return (
@@ -79,7 +80,7 @@ export class SampleDataViewDataButton extends React.Component {
             size="m"
           />
         ),
-        href: chrome.addBasePath(path)
+        href: this.addBasePath(path)
       };
     });
     const panels = [
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.test.js b/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.test.js
index b0551341965fa1..cc515993ac0614 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.test.js
@@ -17,19 +17,18 @@
  * under the License.
  */
 
-jest.mock('ui/chrome', () => {
-  return {
-    addBasePath: (path) => {
-      return `root${path}`;
-    },
-  };
-});
 
 import React from 'react';
 import { shallow } from 'enzyme';
 
 import { SampleDataViewDataButton } from './sample_data_view_data_button';
 
+jest.mock('../kibana_services', () =>({
+  getServices: () =>({
+    addBasePath: path => `root${path}`
+  })
+}));
+
 test('should render simple button when appLinks is empty', () => {
   const component = shallow(<SampleDataViewDataButton
     id="ecommerce"
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js b/src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js
index 7875c629306c58..e68307b58cdaf6 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js
@@ -18,13 +18,8 @@
  */
 
 import { Writer } from 'mustache';
-import chrome from 'ui/chrome';
-import { metadata } from 'ui/metadata';
-import {
-  DOC_LINK_VERSION,
-  ELASTIC_WEBSITE_URL,
-  documentationLinks
-} from 'ui/documentation_links/documentation_links';
+import { getServices } from '../../kibana_services';
+
 
 const TEMPLATE_TAGS = ['{', '}'];
 
@@ -39,6 +34,8 @@ mustacheWriter.escapedValue = function escapedValue(token, context) {
 };
 
 export function replaceTemplateStrings(text, params = {}) {
+  const { getInjected, metadata, docLinks } = getServices();
+
   const variables = {
     // '{' and '}' can not be used in template since they are used as template tags.
     // Must use '{curlyOpen}'' and '{curlyClose}'
@@ -46,20 +43,20 @@ export function replaceTemplateStrings(text, params = {}) {
     curlyClose: '}',
     config: {
       cloud: {
-        id: chrome.getInjected('cloudId')
+        id: getInjected('cloudId')
       },
       docs: {
-        base_url: ELASTIC_WEBSITE_URL,
+        base_url: docLinks.ELASTIC_WEBSITE_URL,
         beats: {
-          filebeat: documentationLinks.filebeat.base,
-          metricbeat: documentationLinks.metricbeat.base,
-          heartbeat: documentationLinks.heartbeat.base,
-          functionbeat: documentationLinks.functionbeat.base,
-          winlogbeat: documentationLinks.winlogbeat.base,
-          auditbeat: documentationLinks.auditbeat.base,
+          filebeat: docLinks.links.filebeat.base,
+          metricbeat: docLinks.links.metricbeat.base,
+          heartbeat: docLinks.links.heartbeat.base,
+          functionbeat: docLinks.links.functionbeat.base,
+          winlogbeat: docLinks.links.winlogbeat.base,
+          auditbeat: docLinks.links.auditbeat.base,
         },
-        logstash: documentationLinks.logstash.base,
-        version: DOC_LINK_VERSION
+        logstash: docLinks.links.logstash.base,
+        version: docLinks.DOC_LINK_VERSION
       },
       kibana: {
         version: metadata.version
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js b/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js
index 3d8ea4815dfffd..086fa5a0591216 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js
@@ -37,7 +37,7 @@ import {
 import * as StatusCheckStates from './status_check_states';
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import chrome from 'ui/chrome';
+import { getServices } from '../../kibana_services';
 
 const INSTRUCTIONS_TYPE = {
   ELASTIC_CLOUD: 'elasticCloud',
@@ -94,7 +94,7 @@ class TutorialUi extends React.Component {
       });
     }
 
-    chrome.breadcrumbs.set([
+    getServices().chrome.setBreadcrumbs([
       {
         text: homeTitle,
         href: '#/home'
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js b/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js
index 4e13155e2061a4..150ab4451e46d5 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js
@@ -25,6 +25,14 @@ import {
 } from './tutorial';
 
 
+jest.mock('../../kibana_services', () =>({
+  getServices: () =>({
+    getBasePath: jest.fn(() => 'path'),
+    chrome: {
+      setBreadcrumbs: () => {}
+    }
+  })
+}));
 jest.mock('../../../../../kibana_react/public', () => {
   return {
     Markdown: () => <div className="markdown"/>,
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial_directory.js b/src/legacy/core_plugins/kibana/public/home/components/tutorial_directory.js
index eae549f8a6ac0c..0c537c8e9ae8ac 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial_directory.js
+++ b/src/legacy/core_plugins/kibana/public/home/components/tutorial_directory.js
@@ -22,7 +22,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Synopsis } from './synopsis';
 import { SampleDataSetCards } from './sample_data_set_cards';
-import chrome from 'ui/chrome';
+import { getServices } from '../kibana_services';
 
 import {
   EuiPage,
@@ -112,7 +112,7 @@ class TutorialDirectoryUi extends React.Component {
   async componentDidMount() {
     this._isMounted = true;
 
-    chrome.breadcrumbs.set([
+    getServices().chrome.setBreadcrumbs([
       {
         text: homeTitle,
         href: '#/home',
diff --git a/src/legacy/core_plugins/kibana/public/home/components/welcome.tsx b/src/legacy/core_plugins/kibana/public/home/components/welcome.tsx
index 8869819290263c..afe43a23e18cb0 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/welcome.tsx
+++ b/src/legacy/core_plugins/kibana/public/home/components/welcome.tsx
@@ -33,15 +33,11 @@ import {
   EuiIcon,
   EuiPortal,
 } from '@elastic/eui';
-// @ts-ignore
-import { banners } from 'ui/notify';
-
 import { FormattedMessage } from '@kbn/i18n/react';
-import chrome from 'ui/chrome';
+import { getServices } from '../kibana_services';
+
 import { SampleDataCard } from './sample_data';
 import { TelemetryOptInCard } from './telemetry_opt_in';
-// @ts-ignore
-import { trackUiMetric, METRIC_TYPE } from '../kibana_services';
 
 interface Props {
   urlBasePath: string;
@@ -51,6 +47,7 @@ interface Props {
   getTelemetryBannerId: () => string;
   shouldShowTelemetryOptIn: boolean;
 }
+
 interface State {
   step: number;
 }
@@ -59,6 +56,7 @@ interface State {
  * Shows a full-screen welcome page that gives helpful quick links to beginners.
  */
 export class Welcome extends React.PureComponent<Props, State> {
+  private services = getServices();
   public readonly state: State = {
     step: 0,
   };
@@ -70,31 +68,35 @@ export class Welcome extends React.PureComponent<Props, State> {
   };
 
   private redirecToSampleData() {
-    const path = chrome.addBasePath('#/home/tutorial_directory/sampleData');
+    const path = this.services.addBasePath('#/home/tutorial_directory/sampleData');
     window.location.href = path;
   }
+
   private async handleTelemetrySelection(confirm: boolean) {
     const metricName = `telemetryOptIn${confirm ? 'Confirm' : 'Decline'}`;
-    trackUiMetric(METRIC_TYPE.CLICK, metricName);
+    this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, metricName);
     await this.props.setOptIn(confirm);
     const bannerId = this.props.getTelemetryBannerId();
-    banners.remove(bannerId);
+    this.services.banners.remove(bannerId);
     this.setState(() => ({ step: 1 }));
   }
 
   private onSampleDataDecline = () => {
-    trackUiMetric(METRIC_TYPE.CLICK, 'sampleDataDecline');
+    this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, 'sampleDataDecline');
     this.props.onSkip();
   };
   private onSampleDataConfirm = () => {
-    trackUiMetric(METRIC_TYPE.CLICK, 'sampleDataConfirm');
+    this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, 'sampleDataConfirm');
     this.redirecToSampleData();
   };
 
   componentDidMount() {
-    trackUiMetric(METRIC_TYPE.LOADED, 'welcomeScreenMount');
+    this.services.trackUiMetric(this.services.METRIC_TYPE.LOADED, 'welcomeScreenMount');
     if (this.props.shouldShowTelemetryOptIn) {
-      trackUiMetric(METRIC_TYPE.COUNT, 'welcomeScreenWithTelemetryOptIn');
+      this.services.trackUiMetric(
+        this.services.METRIC_TYPE.COUNT,
+        'welcomeScreenWithTelemetryOptIn'
+      );
     }
     document.addEventListener('keydown', this.hideOnEsc);
   }
diff --git a/src/legacy/core_plugins/kibana/public/home/home_ng_wrapper.html b/src/legacy/core_plugins/kibana/public/home/home_ng_wrapper.html
deleted file mode 100644
index 645855766fab8e..00000000000000
--- a/src/legacy/core_plugins/kibana/public/home/home_ng_wrapper.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<home-app
-  directories="directories"
-  recently-accessed="recentlyAccessed"
-  data-test-subj="homeApp"
-/>
diff --git a/src/legacy/core_plugins/kibana/public/home/index.js b/src/legacy/core_plugins/kibana/public/home/index.js
deleted file mode 100644
index 8233df680edfdf..00000000000000
--- a/src/legacy/core_plugins/kibana/public/home/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import chrome from 'ui/chrome';
-import routes from 'ui/routes';
-import template from './home_ng_wrapper.html';
-import { FeatureCatalogueRegistryProvider } from 'ui/registry/feature_catalogue';
-import { wrapInI18nContext } from 'ui/i18n';
-import { uiModules } from 'ui/modules';
-import {
-  HomeApp
-} from './components/home_app';
-import { i18n } from '@kbn/i18n';
-import { npStart } from 'ui/new_platform';
-
-const app = uiModules.get('apps/home', []);
-app.directive('homeApp', function (reactDirective) {
-  return reactDirective(wrapInI18nContext(HomeApp));
-});
-
-const homeTitle = i18n.translate('kbn.home.breadcrumbs.homeTitle', { defaultMessage: 'Home' });
-
-function getRoute() {
-  return {
-    template,
-    controller($scope, Private) {
-      $scope.directories = Private(FeatureCatalogueRegistryProvider).inTitleOrder;
-      $scope.recentlyAccessed = npStart.core.chrome.recentlyAccessed.get().map(item => {
-        item.link = chrome.addBasePath(item.link);
-        return item;
-      });
-    },
-    k7Breadcrumbs: () => [
-      { text: homeTitle },
-    ]
-  };
-}
-
-// All routing will be handled inside HomeApp via react, we just need to make sure angular doesn't
-// redirect us to the default page by encountering a url it isn't marked as being able to handle.
-routes.when('/home', getRoute());
-routes.when('/home/feature_directory', getRoute());
-routes.when('/home/tutorial_directory/:tab?', getRoute());
-routes.when('/home/tutorial/:id', getRoute());
diff --git a/src/legacy/core_plugins/kibana/public/home/index.ts b/src/legacy/core_plugins/kibana/public/home/index.ts
new file mode 100644
index 00000000000000..4ebf719b86233a
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/index.ts
@@ -0,0 +1,80 @@
+/*
+ * 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 { FeatureCatalogueRegistryProvider } from 'ui/registry/feature_catalogue';
+import { npSetup, npStart } from 'ui/new_platform';
+import chrome from 'ui/chrome';
+import { IPrivate } from 'ui/private';
+import { HomePlugin, LegacyAngularInjectedDependencies } from './plugin';
+import { createUiStatsReporter, METRIC_TYPE } from '../../../ui_metric/public';
+import { start as data } from '../../../data/public/legacy';
+import { TelemetryOptInProvider } from '../../../telemetry/public/services';
+import { localApplicationService } from '../local_application_service';
+
+export const trackUiMetric = createUiStatsReporter('Kibana_home');
+
+/**
+ * Get dependencies relying on the global angular context.
+ * They also have to get resolved together with the legacy imports above
+ */
+async function getAngularDependencies(): Promise<LegacyAngularInjectedDependencies> {
+  const injector = await chrome.dangerouslyGetActiveInjector();
+
+  const Private = injector.get<IPrivate>('Private');
+
+  const telemetryEnabled = npStart.core.injectedMetadata.getInjectedVar('telemetryEnabled');
+  const telemetryBanner = npStart.core.injectedMetadata.getInjectedVar('telemetryBanner');
+  const telemetryOptInProvider = Private(TelemetryOptInProvider);
+
+  return {
+    telemetryOptInProvider,
+    shouldShowTelemetryOptIn:
+      telemetryEnabled && telemetryBanner && !telemetryOptInProvider.getOptIn(),
+  };
+}
+
+let copiedLegacyCatalogue = false;
+
+(async () => {
+  const instance = new HomePlugin();
+  instance.setup(npSetup.core, {
+    __LEGACY: {
+      trackUiMetric,
+      metadata: npStart.core.injectedMetadata.getLegacyMetadata(),
+      METRIC_TYPE,
+      getFeatureCatalogueEntries: async () => {
+        if (!copiedLegacyCatalogue) {
+          const injector = await chrome.dangerouslyGetActiveInjector();
+          const Private = injector.get<IPrivate>('Private');
+          // Merge legacy registry with new registry
+          (Private(FeatureCatalogueRegistryProvider as any) as any).inTitleOrder.map(
+            npSetup.plugins.feature_catalogue.register
+          );
+          copiedLegacyCatalogue = true;
+        }
+        return npStart.plugins.feature_catalogue.get();
+      },
+      getAngularDependencies,
+      localApplicationService,
+    },
+  });
+  instance.start(npStart.core, {
+    data,
+  });
+})();
diff --git a/src/legacy/core_plugins/kibana/public/home/kibana_services.js b/src/legacy/core_plugins/kibana/public/home/kibana_services.js
deleted file mode 100644
index 792c5e09435a49..00000000000000
--- a/src/legacy/core_plugins/kibana/public/home/kibana_services.js
+++ /dev/null
@@ -1,40 +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 { uiModules } from 'ui/modules';
-import { npStart } from 'ui/new_platform';
-import { createUiStatsReporter, METRIC_TYPE } from '../../../ui_metric/public';
-import { TelemetryOptInProvider } from '../../../telemetry/public/services';
-
-export let indexPatternService;
-export let shouldShowTelemetryOptIn;
-export let telemetryOptInProvider;
-
-export const trackUiMetric = createUiStatsReporter('Kibana_home');
-export { METRIC_TYPE };
-
-uiModules.get('kibana').run(($injector) => {
-  const telemetryEnabled = npStart.core.injectedMetadata.getInjectedVar('telemetryEnabled');
-  const telemetryBanner = npStart.core.injectedMetadata.getInjectedVar('telemetryBanner');
-  const Private = $injector.get('Private');
-
-  telemetryOptInProvider = Private(TelemetryOptInProvider);
-  shouldShowTelemetryOptIn = telemetryEnabled && telemetryBanner && !telemetryOptInProvider.getOptIn();
-  indexPatternService = $injector.get('indexPatterns');
-});
diff --git a/src/legacy/core_plugins/kibana/public/home/kibana_services.ts b/src/legacy/core_plugins/kibana/public/home/kibana_services.ts
new file mode 100644
index 00000000000000..6189204ee4cfc9
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/kibana_services.ts
@@ -0,0 +1,79 @@
+/*
+ * 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 {
+  ChromeStart,
+  DocLinksStart,
+  HttpStart,
+  LegacyNavLink,
+  NotificationsSetup,
+  OverlayStart,
+  SavedObjectsClientContract,
+  UiSettingsClientContract,
+  UiSettingsState,
+} from 'kibana/public';
+import { UiStatsMetricType } from '@kbn/analytics';
+import { FeatureCatalogueEntry } from '../../../../../plugins/feature_catalogue/public';
+
+export interface HomeKibanaServices {
+  indexPatternService: any;
+  getFeatureCatalogueEntries: () => Promise<readonly FeatureCatalogueEntry[]>;
+  metadata: {
+    app: unknown;
+    bundleId: string;
+    nav: LegacyNavLink[];
+    version: string;
+    branch: string;
+    buildNum: number;
+    buildSha: string;
+    basePath: string;
+    serverName: string;
+    devMode: boolean;
+    uiSettings: { defaults: UiSettingsState; user?: UiSettingsState | undefined };
+  };
+  getInjected: (name: string, defaultValue?: any) => unknown;
+  chrome: ChromeStart;
+  telemetryOptInProvider: any;
+  uiSettings: UiSettingsClientContract;
+  http: HttpStart;
+  savedObjectsClient: SavedObjectsClientContract;
+  toastNotifications: NotificationsSetup['toasts'];
+  banners: OverlayStart['banners'];
+  METRIC_TYPE: any;
+  trackUiMetric: (type: UiStatsMetricType, eventNames: string | string[], count?: number) => void;
+  getBasePath: () => string;
+  shouldShowTelemetryOptIn: boolean;
+  docLinks: DocLinksStart;
+  addBasePath: (url: string) => string;
+}
+
+let services: HomeKibanaServices | null = null;
+
+export function setServices(newServices: HomeKibanaServices) {
+  services = newServices;
+}
+
+export function getServices() {
+  if (!services) {
+    throw new Error(
+      'Kibana services not set - are you trying to import this module from outside of the home app?'
+    );
+  }
+  return services;
+}
diff --git a/src/legacy/core_plugins/kibana/public/home/load_tutorials.js b/src/legacy/core_plugins/kibana/public/home/load_tutorials.js
index d6b264154d4248..a6f19bc166dc74 100644
--- a/src/legacy/core_plugins/kibana/public/home/load_tutorials.js
+++ b/src/legacy/core_plugins/kibana/public/home/load_tutorials.js
@@ -18,11 +18,10 @@
  */
 
 import _ from 'lodash';
-import chrome from 'ui/chrome';
+import { getServices } from './kibana_services';
 import { i18n } from '@kbn/i18n';
-import { toastNotifications } from 'ui/notify';
 
-const baseUrl = chrome.addBasePath('/api/kibana/home/tutorials');
+const baseUrl = getServices().addBasePath('/api/kibana/home/tutorials');
 const headers = new Headers();
 headers.append('Accept', 'application/json');
 headers.append('Content-Type', 'application/json');
@@ -47,7 +46,7 @@ async function loadTutorials() {
     tutorials = await response.json();
     tutorialsLoaded = true;
   } catch(err) {
-    toastNotifications.addDanger({
+    getServices().toastNotifications.addDanger({
       title: i18n.translate('kbn.home.loadTutorials.unableToLoadErrorMessage', {
         defaultMessage: 'Unable to load tutorials' }
       ),
diff --git a/src/legacy/core_plugins/kibana/public/home/plugin.ts b/src/legacy/core_plugins/kibana/public/home/plugin.ts
new file mode 100644
index 00000000000000..2a2ea371d7f3bd
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/plugin.ts
@@ -0,0 +1,103 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreSetup, CoreStart, LegacyNavLink, Plugin, UiSettingsState } from 'kibana/public';
+import { UiStatsMetricType } from '@kbn/analytics';
+
+import { DataStart } from '../../../data/public';
+import { LocalApplicationService } from '../local_application_service';
+import { setServices } from './kibana_services';
+import { FeatureCatalogueEntry } from '../../../../../plugins/feature_catalogue/public';
+
+export interface LegacyAngularInjectedDependencies {
+  telemetryOptInProvider: any;
+  shouldShowTelemetryOptIn: boolean;
+}
+
+export interface HomePluginStartDependencies {
+  data: DataStart;
+}
+
+export interface HomePluginSetupDependencies {
+  __LEGACY: {
+    trackUiMetric: (type: UiStatsMetricType, eventNames: string | string[], count?: number) => void;
+    METRIC_TYPE: any;
+    metadata: {
+      app: unknown;
+      bundleId: string;
+      nav: LegacyNavLink[];
+      version: string;
+      branch: string;
+      buildNum: number;
+      buildSha: string;
+      basePath: string;
+      serverName: string;
+      devMode: boolean;
+      uiSettings: { defaults: UiSettingsState; user?: UiSettingsState | undefined };
+    };
+    getFeatureCatalogueEntries: () => Promise<readonly FeatureCatalogueEntry[]>;
+    getAngularDependencies: () => Promise<LegacyAngularInjectedDependencies>;
+    localApplicationService: LocalApplicationService;
+  };
+}
+
+export class HomePlugin implements Plugin {
+  private dataStart: DataStart | null = null;
+  private savedObjectsClient: any = null;
+
+  setup(
+    core: CoreSetup,
+    {
+      __LEGACY: { localApplicationService, getAngularDependencies, ...legacyServices },
+    }: HomePluginSetupDependencies
+  ) {
+    localApplicationService.register({
+      id: 'home',
+      title: 'Home',
+      mount: async ({ core: contextCore }, params) => {
+        const angularDependencies = await getAngularDependencies();
+        setServices({
+          ...legacyServices,
+          http: contextCore.http,
+          toastNotifications: core.notifications.toasts,
+          banners: contextCore.overlays.banners,
+          getInjected: core.injectedMetadata.getInjectedVar,
+          docLinks: contextCore.docLinks,
+          savedObjectsClient: this.savedObjectsClient!,
+          chrome: contextCore.chrome,
+          uiSettings: core.uiSettings,
+          addBasePath: core.http.basePath.prepend,
+          getBasePath: core.http.basePath.get,
+          indexPatternService: this.dataStart!.indexPatterns.indexPatterns,
+          ...angularDependencies,
+        });
+        const { renderApp } = await import('./render_app');
+        return await renderApp(params.element);
+      },
+    });
+  }
+
+  start(core: CoreStart, { data }: HomePluginStartDependencies) {
+    // TODO is this really the right way? I though the app context would give us those
+    this.dataStart = data;
+    this.savedObjectsClient = core.savedObjects.client;
+  }
+
+  stop() {}
+}
diff --git a/src/legacy/core_plugins/kibana/public/home/render_app.tsx b/src/legacy/core_plugins/kibana/public/home/render_app.tsx
new file mode 100644
index 00000000000000..a8c35144a45b01
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/render_app.tsx
@@ -0,0 +1,38 @@
+/*
+ * 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 { render, unmountComponentAtNode } from 'react-dom';
+import { i18n } from '@kbn/i18n';
+// @ts-ignore
+import { HomeApp } from './components/home_app';
+import { getServices } from './kibana_services';
+
+export const renderApp = async (element: HTMLElement) => {
+  const homeTitle = i18n.translate('kbn.home.breadcrumbs.homeTitle', { defaultMessage: 'Home' });
+  const { getFeatureCatalogueEntries, chrome } = getServices();
+  const directories = await getFeatureCatalogueEntries();
+  chrome.setBreadcrumbs([{ text: homeTitle }]);
+
+  render(<HomeApp directories={directories} />, element);
+
+  return () => {
+    unmountComponentAtNode(element);
+  };
+};
diff --git a/src/legacy/core_plugins/kibana/public/home/sample_data_client.js b/src/legacy/core_plugins/kibana/public/home/sample_data_client.js
index da46b3e16c0936..eca88604a559da 100644
--- a/src/legacy/core_plugins/kibana/public/home/sample_data_client.js
+++ b/src/legacy/core_plugins/kibana/public/home/sample_data_client.js
@@ -17,36 +17,36 @@
  * under the License.
  */
 
-import { kfetch } from 'ui/kfetch';
-import chrome from 'ui/chrome';
-import { indexPatternService } from './kibana_services';
+import { getServices } from './kibana_services';
 
 const sampleDataUrl = '/api/sample_data';
 
 function clearIndexPatternsCache() {
-  indexPatternService.clearCache();
+  getServices().indexPatternService.clearCache();
 }
 
 export async function listSampleDataSets() {
-  return await kfetch({ method: 'GET', pathname: sampleDataUrl });
+  return await getServices().http.get(sampleDataUrl);
 }
 
 export async function installSampleDataSet(id, sampleDataDefaultIndex) {
-  await kfetch({ method: 'POST', pathname: `${sampleDataUrl}/${id}` });
+  await getServices().http.post(`${sampleDataUrl}/${id}`);
 
-  if (chrome.getUiSettingsClient().isDefault('defaultIndex')) {
-    chrome.getUiSettingsClient().set('defaultIndex', sampleDataDefaultIndex);
+  if (getServices().uiSettings.isDefault('defaultIndex')) {
+    getServices().uiSettings.set('defaultIndex', sampleDataDefaultIndex);
   }
 
   clearIndexPatternsCache();
 }
 
 export async function uninstallSampleDataSet(id, sampleDataDefaultIndex) {
-  await kfetch({ method: 'DELETE', pathname: `${sampleDataUrl}/${id}` });
+  await getServices().http.delete(`${sampleDataUrl}/${id}`);
 
-  if (!chrome.getUiSettingsClient().isDefault('defaultIndex')
-    && chrome.getUiSettingsClient().get('defaultIndex') === sampleDataDefaultIndex) {
-    chrome.getUiSettingsClient().set('defaultIndex', null);
+  const uiSettings = getServices().uiSettings;
+
+  if (!uiSettings.isDefault('defaultIndex')
+    && uiSettings.get('defaultIndex') === sampleDataDefaultIndex) {
+    uiSettings.set('defaultIndex', null);
   }
 
   clearIndexPatternsCache();
diff --git a/src/legacy/core_plugins/kibana/public/home/tutorial_resources/cockroachdb_metrics/screenshot.png b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/cockroachdb_metrics/screenshot.png
new file mode 100644
index 00000000000000..4b3020d91d57da
Binary files /dev/null and b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/cockroachdb_metrics/screenshot.png differ
diff --git a/src/legacy/core_plugins/kibana/public/home/tutorial_resources/consul_metrics/screenshot.png b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/consul_metrics/screenshot.png
new file mode 100644
index 00000000000000..90aaa7477e8eb2
Binary files /dev/null and b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/consul_metrics/screenshot.png differ
diff --git a/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/cockroachdb.svg b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/cockroachdb.svg
new file mode 100644
index 00000000000000..72f0958f528245
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/cockroachdb.svg
@@ -0,0 +1,666 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="-12.06 13.62 35.251247 35.398594"
+   xml:space="preserve"
+   sodipodi:docname="cockroachdb-logo.svg"
+   width="35.251247"
+   height="35.398594"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata32"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs30">
+	
+	<defs
+   id="defs9">
+		<filter
+   height="71.5"
+   width="56.200001"
+   y="41.400002"
+   x="555.70001"
+   filterUnits="userSpaceOnUse"
+   id="Adobe_OpacityMaskFilter">
+			<feColorMatrix
+   id="feColorMatrix6"
+   values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"
+   type="matrix" />
+		</filter>
+	</defs>
+	<mask
+   id="b_1_"
+   height="71.5"
+   width="56.2"
+   y="41.4"
+   x="555.7"
+   maskUnits="userSpaceOnUse">
+		<g
+   style="filter:url(#Adobe_OpacityMaskFilter)"
+   id="g12"
+   class="st549">
+			<path
+   style="fill:#ffffff"
+   inkscape:connector-curvature="0"
+   d="M 306.3,12.4 H 0.8 V 133.3 H 611.9 V 12.4 Z"
+   class="st550"
+   id="a_1_" />
+		</g>
+	</mask>
+	
+	
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1025"
+   id="namedview28"
+   showgrid="false"
+   inkscape:zoom="3.2474375"
+   inkscape:cx="122.58339"
+   inkscape:cy="-49.295899"
+   inkscape:window-x="6"
+   inkscape:window-y="27"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"
+   fit-margin-top="1"
+   fit-margin-left="1"
+   fit-margin-right="1"
+   fit-margin-bottom="1" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#4A8FE1;}
+	.st1{fill:#FEFEFE;}
+	.st2{fill:#716F73;}
+	.st3{fill:#4D8951;}
+	.st4{fill:#A6D3EA;}
+	.st5{fill:#3A3868;}
+	.st6{fill:#717073;}
+	.st7{fill:#1B995A;}
+	.st8{fill:#717B83;}
+	.st9{fill:#2BA3A4;}
+	.st10{fill:#717074;}
+	.st11{fill:#717173;}
+	.st12{fill:#707B83;}
+	.st13{fill:#67A3D1;}
+	.st14{fill:#2B5B68;}
+	.st15{fill:#B9DCF3;}
+	.st16{fill:#2A4B38;}
+	.st17{fill:#83939F;}
+	.st18{fill:#9DCCE8;}
+	.st19{fill:#85939C;}
+	.st20{fill:#82929C;}
+	.st21{fill:#40A6D5;}
+	.st22{fill:#2B4B39;}
+	.st23{fill:#28493A;}
+	.st24{fill:#2EA3A7;}
+	.st25{fill:#F8FCFC;}
+	.st26{fill:#568F52;}
+	.st27{fill:#94C453;}
+	.st28{fill:#206289;}
+	.st29{fill:#F1FBFD;}
+	.st30{fill:#F6FDFE;}
+	.st31{fill:#F8FCFB;}
+	.st32{fill:#FAFDFB;}
+	.st33{fill:#F4FCFD;}
+	.st34{fill:#65AC62;}
+	.st35{fill:#F8FAF3;}
+	.st36{fill:#5EAD5A;}
+	.st37{fill:#F6FCFA;}
+	.st38{fill:#85C5B8;}
+	.st39{fill:#3CA0D5;}
+	.st40{fill:#727A80;}
+	.st41{fill:#F6FCFD;}
+	.st42{fill:#FEFEFA;}
+	.st43{fill:#459ED2;}
+	.st44{fill:#5DAE5B;}
+	.st45{fill:#5E7F47;}
+	.st46{fill:#FCFCFC;}
+	.st47{fill:#C1DBED;}
+	.st48{fill:#FBFDF8;}
+	.st49{fill:#EBF5F7;}
+	.st50{fill:#294949;}
+	.st51{fill:#8FC8E5;}
+	.st52{fill:#F7FCFC;}
+	.st53{fill:#FCFEFA;}
+	.st54{fill:#4E8A56;}
+	.st55{fill:#64BDE8;}
+	.st56{fill:#FEFDFA;}
+	.st57{fill:#FBFDFC;}
+	.st58{fill:#449DD5;}
+	.st59{fill:#F6FBF7;}
+	.st60{fill:#279A5B;}
+	.st61{fill:#30493D;}
+	.st62{fill:#F5FBF9;}
+	.st63{fill:#35583B;}
+	.st64{fill:#323C62;}
+	.st65{fill:#F8FBF9;}
+	.st66{fill:#E7EFF2;}
+	.st67{fill:#8DC1B6;}
+	.st68{fill:#FAFCFA;}
+	.st69{fill:#F1FBF9;}
+	.st70{fill:#F7FEFE;}
+	.st71{fill:#FDFEFA;}
+	.st72{fill:#31A1A1;}
+	.st73{fill:#F9FEFD;}
+	.st74{fill:#FAFAFC;}
+	.st75{fill:#FDFCF8;}
+	.st76{fill:#2D5C60;}
+	.st77{fill:#FDFCF9;}
+	.st78{fill:#F9FDFB;}
+	.st79{fill:#FBFBFB;}
+	.st80{fill:#518B58;}
+	.st81{fill:#5A82AF;}
+	.st82{fill:#FDFEF8;}
+	.st83{fill:#244C40;}
+	.st84{fill:#266495;}
+	.st85{fill:#42A0D3;}
+	.st86{fill:#5B80A9;}
+	.st87{fill:#2E5B63;}
+	.st88{fill:#FDFBF9;}
+	.st89{fill:#F8FDFB;}
+	.st90{fill:#FDFDF7;}
+	.st91{fill:#F3F9FB;}
+	.st92{fill:#309F96;}
+	.st93{fill:#93C367;}
+	.st94{fill:#3B3C68;}
+	.st95{fill:#E0F1F9;}
+	.st96{fill:#E4F6F9;}
+	.st97{fill:#FEFEF9;}
+	.st98{fill:#224C38;}
+	.st99{fill:#498AB2;}
+	.st100{fill:#FDFDF9;}
+	.st101{fill:#F9FEFE;}
+	.st102{fill:#F6FCF2;}
+	.st103{fill:#FEFCF9;}
+	.st104{fill:#EEFCFE;}
+	.st105{fill:#FDFDF8;}
+	.st106{fill:#FBFDFA;}
+	.st107{fill:#275962;}
+	.st108{fill:#FDFEF9;}
+	.st109{fill:#F2F8F2;}
+	.st110{fill:#F8FBFB;}
+	.st111{fill:#8A8A8A;}
+	.st112{fill:#F7FEFD;}
+	.st113{fill:#EFF8FB;}
+	.st114{fill:#FAFCFB;}
+	.st115{fill:#E5F3F8;}
+	.st116{fill:#ECF7FA;}
+	.st117{fill:#FDFDF6;}
+	.st118{fill:#F5FDFD;}
+	.st119{fill:#7799BF;}
+	.st120{fill:#5C8055;}
+	.st121{fill:#6EAECC;}
+	.st122{fill:#FEFEF7;}
+	.st123{fill:#3282B5;}
+	.st124{fill:#F3FCF5;}
+	.st125{fill:#F4FAFB;}
+	.st126{fill:#FEF8FA;}
+	.st127{fill:#F5FCF9;}
+	.st128{fill:#3C9392;}
+	.st129{fill:#EBF6F6;}
+	.st130{fill:#98BFD6;}
+	.st131{fill:#FEFDF7;}
+	.st132{fill:#658796;}
+	.st133{fill:#EEF7F6;}
+	.st134{fill:#FAFBF5;}
+	.st135{fill:#F8FCF9;}
+	.st136{fill:#FDFDF4;}
+	.st137{fill:#FDFBF8;}
+	.st138{fill:#FDFDF5;}
+	.st139{fill:#EFF9FD;}
+	.st140{fill:#FDFEF6;}
+	.st141{fill:#37586D;}
+	.st142{fill:#FDFEF5;}
+	.st143{fill:#FDFBF6;}
+	.st144{fill:#324A49;}
+	.st145{fill:#F8F8F9;}
+	.st146{fill:#CDF5CD;}
+	.st147{fill:#FEFDF3;}
+	.st148{fill:#ECFBFE;}
+	.st149{fill:#858585;}
+	.st150{fill:#C5C5C5;}
+	.st151{fill:#6C6C6C;}
+	.st152{fill:#498B4F;}
+	.st153{fill:#478A4D;}
+	.st154{fill:#4A884D;}
+	.st155{fill:#429169;}
+	.st156{fill:#3CA29D;}
+	.st157{fill:#518654;}
+	.st158{fill:#51855F;}
+	.st159{fill:#289FA0;}
+	.st160{fill:#448E49;}
+	.st161{fill:#458B55;}
+	.st162{fill:#568356;}
+	.st163{fill:#89C9ED;}
+	.st164{fill:#246081;}
+	.st165{fill:#206186;}
+	.st166{fill:#8EC8E9;}
+	.st167{fill:#2B5D7D;}
+	.st168{fill:#215F80;}
+	.st169{fill:#A0D4EF;}
+	.st170{fill:#A4D3F2;}
+	.st171{fill:#245E84;}
+	.st172{fill:#69BADA;}
+	.st173{fill:#9AC9D1;}
+	.st174{fill:#9AC7DD;}
+	.st175{fill:#3B396C;}
+	.st176{fill:#3A376D;}
+	.st177{fill:#3D366C;}
+	.st178{fill:#6A9BC9;}
+	.st179{fill:#57B156;}
+	.st180{fill:#2A9762;}
+	.st181{fill:#139C59;}
+	.st182{fill:#169A5E;}
+	.st183{fill:#139C5D;}
+	.st184{fill:#129652;}
+	.st185{fill:#61839B;}
+	.st186{fill:#637F92;}
+	.st187{fill:#289193;}
+	.st188{fill:#288F8D;}
+	.st189{fill:#34A3A8;}
+	.st190{fill:#23A7A5;}
+	.st191{fill:#36A2A8;}
+	.st192{fill:#32A1A0;}
+	.st193{fill:#23A7A2;}
+	.st194{fill:#249A96;}
+	.st195{fill:#FCFCFD;}
+	.st196{fill:#FDFDFD;}
+	.st197{fill:#6B7B8C;}
+	.st198{fill:#4C84B0;}
+	.st199{fill:#4F81BA;}
+	.st200{fill:#5280B6;}
+	.st201{fill:#6CA1CE;}
+	.st202{fill:#6CA0CF;}
+	.st203{fill:#7AA4CC;}
+	.st204{fill:#71A3D5;}
+	.st205{fill:#6AA3C9;}
+	.st206{fill:#6EA5D6;}
+	.st207{fill:#6C97B9;}
+	.st208{fill:#4F6684;}
+	.st209{fill:#2D5D62;}
+	.st210{fill:#275C5E;}
+	.st211{fill:#2B5859;}
+	.st212{fill:#285C5E;}
+	.st213{fill:#9FCCE5;}
+	.st214{fill:#BCDBEF;}
+	.st215{fill:#B5DDF9;}
+	.st216{fill:#234D37;}
+	.st217{fill:#2E483A;}
+	.st218{fill:#8294A2;}
+	.st219{fill:#256286;}
+	.st220{fill:#8095A3;}
+	.st221{fill:#3FA6DA;}
+	.st222{fill:#62BEEC;}
+	.st223{fill:#40A7D6;}
+	.st224{fill:#43A3DF;}
+	.st225{fill:#274C3B;}
+	.st226{fill:#4C9FC8;}
+	.st227{fill:#234D32;}
+	.st228{fill:#2C473D;}
+	.st229{fill:#27572D;}
+	.st230{fill:#2D473F;}
+	.st231{fill:#22A69E;}
+	.st232{fill:#22A1A1;}
+	.st233{fill:#378E8D;}
+	.st234{fill:#268C8A;}
+	.st235{fill:#40817E;}
+	.st236{fill:#528E4D;}
+	.st237{fill:#94C15C;}
+	.st238{fill:#518D4F;}
+	.st239{fill:#4B954A;}
+	.st240{fill:#95C350;}
+	.st241{fill:#93C451;}
+	.st242{fill:#90C147;}
+	.st243{fill:#90B254;}
+	.st244{fill:#1A6292;}
+	.st245{fill:#2F82B5;}
+	.st246{fill:#3FA7DA;}
+	.st247{fill:#43A5D7;}
+	.st248{fill:#51ADD8;}
+	.st249{fill:#57B0E2;}
+	.st250{fill:#4C95B8;}
+	.st251{fill:#7BC2EB;}
+	.st252{fill:#7BC2E8;}
+	.st253{fill:#439DCE;}
+	.st254{fill:#1A66A0;}
+	.st255{fill:#429FD0;}
+	.st256{fill:#22669E;}
+	.st257{fill:#42A1D2;}
+	.st258{fill:#42A6D7;}
+	.st259{fill:#4EA6CD;}
+	.st260{fill:#90B15F;}
+	.st261{fill:#5EAF59;}
+	.st262{fill:#1568A3;}
+	.st263{fill:#44A4D8;}
+	.st264{fill:#2D5F86;}
+	.st265{fill:#82C6B7;}
+	.st266{fill:#93C6B3;}
+	.st267{fill:#81C7BD;}
+	.st268{fill:#8CC3BB;}
+	.st269{fill:#3EA0D1;}
+	.st270{fill:#429ED2;}
+	.st271{fill:#449DD7;}
+	.st272{fill:#3AA1DA;}
+	.st273{fill:#3D9FD7;}
+	.st274{fill:#439DD3;}
+	.st275{fill:#69A46E;}
+	.st276{fill:#74B273;}
+	.st277{fill:#58AB52;}
+	.st278{fill:#325946;}
+	.st279{fill:#214A49;}
+	.st280{fill:#244B3F;}
+	.st281{fill:#3181B4;}
+	.st282{fill:#1DA3A4;}
+	.st283{fill:#346E9F;}
+	.st284{fill:#869197;}
+	.st285{fill:#53B0EA;}
+	.st286{fill:#5181C0;}
+	.st287{fill:#1767A6;}
+	.st288{fill:#3F9FD5;}
+	.st289{fill:#399291;}
+	.st290{fill:#27A2A7;}
+	.st291{fill:#81969C;}
+	.st292{fill:#46A4D7;}
+	.st293{fill:#C7DCB8;}
+	.st294{fill:#B5B5B5;}
+	.st295{fill:#4F9A83;}
+	.st296{fill:#63BDE8;}
+	.st297{fill:#95C3E7;}
+	.st298{fill:#1D618B;}
+	.st299{fill:#1D6286;}
+	.st300{fill:#3181B5;}
+	.st301{fill:#249190;}
+	.st302{fill:#2C9096;}
+	.st303{fill:#23918E;}
+	.st304{fill:#2E939A;}
+	.st305{fill:#469DD6;}
+	.st306{fill:#40A0D2;}
+	.st307{fill:#4B82C0;}
+	.st308{fill:#809398;}
+	.st309{fill:#69BCE2;}
+	.st310{fill:#5BBFEB;}
+	.st311{fill:#5DBEF5;}
+	.st312{fill:#42A6D8;}
+	.st313{fill:#39A4DC;}
+	.st314{fill:#94C356;}
+	.st315{fill:#95C446;}
+	.st316{fill:#2B83B5;}
+	.st317{fill:#2A83B8;}
+	.st318{fill:#3EA7DE;}
+	.st319{fill:#37A8DF;}
+	.st320{fill:#7CC9F7;}
+	.st321{fill:#1568A7;}
+	.st322{fill:#3EA7DD;}
+	.st323{fill:#3AA9DA;}
+	.st324{fill:#55B0E2;}
+	.st325{fill:#5FAF60;}
+	.st326{fill:#16639A;}
+	.st327{fill:#16689E;}
+	.st328{fill:#419FCE;}
+	.st329{fill:#216186;}
+	.st330{fill:#21607D;}
+	.st331{fill:#3BA7DD;}
+	.st332{fill:#6E408A;}
+	.st333{fill:#3A3A3C;}
+	.st334{fill:none;}
+	.st335{fill:#44546A;}
+	.st336{fill:#E67C0C;}
+	.st337{fill:#922A50;}
+	.st338{fill:#E67C0D;}
+	.st339{fill:#4471CD;}
+	.st340{fill:#922B50;}
+	.st341{fill:#45556B;}
+	.st342{fill:#922B51;}
+	.st343{fill:#4571CD;}
+	.st344{fill:#46556B;}
+	.st345{fill:#45556A;}
+	.st346{fill:#F0B272;}
+	.st347{fill:#1D94D2;}
+	.st348{fill:#3C3F3F;}
+	.st349{fill:#080809;}
+	.st350{fill:#048DC9;}
+	.st351{fill:#7496A2;}
+	.st352{fill:#9DAAC1;}
+	.st353{fill:#868689;}
+	.st354{fill:#052C50;}
+	.st355{fill:#101214;}
+	.st356{fill:#191C1E;}
+	.st357{fill:#242C35;}
+	.st358{fill:#343C42;}
+	.st359{fill:#343B44;}
+	.st360{fill:#3D4A5B;}
+	.st361{fill:#73AAFE;}
+	.st362{fill:#4CCAFE;}
+	.st363{fill:#CFE1FD;}
+	.st364{fill:#87DCFE;}
+	.st365{fill:#0090CC;}
+	.st366{fill:#008FCC;}
+	.st367{fill:none;stroke:#407DCC;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;}
+	.st368{fill:#407DCC;}
+	.st369{fill:#15191E;}
+	.st370{fill:#10191F;}
+	.st371{fill:#12161B;}
+	.st372{fill:#0E181E;}
+	.st373{fill:#121D24;}
+	.st374{fill:#3F7BC7;}
+	.st375{fill:#222932;}
+	.st376{fill:#22404E;}
+	.st377{fill:#202831;}
+	.st378{fill:#010101;}
+	.st379{fill:#161A1F;}
+	.st380{fill:#323C47;}
+	.st381{fill:#303B48;}
+	.st382{fill:#14181B;}
+	.st383{fill:#353F4A;}
+	.st384{fill:#194691;}
+	.st385{fill:#164C96;}
+	.st386{fill:#184893;}
+	.st387{fill:#174A94;}
+	.st388{fill:#184792;}
+	.st389{fill:#184892;}
+	.st390{fill:#0090CD;}
+	.st391{fill:#018CCA;}
+	.st392{fill:#FDBB87;}
+	.st393{fill:#FE9545;}
+	.st394{fill:#FE8B00;}
+	.st395{fill:#DC5900;}
+	.st396{fill:#DE6D45;}
+	.st397{fill:#292925;}
+	.st398{fill:#63A1BF;}
+	.st399{fill:#61A1BF;}
+	.st400{fill:#8DC53F;}
+	.st401{fill:#8EC642;}
+	.st402{fill:#61853A;}
+	.st403{fill:#424243;}
+	.st404{fill:#8EC641;}
+	.st405{fill:#8DC640;}
+	.st406{fill:#414142;}
+	.st407{fill:#94C94C;}
+	.st408{fill:#4C4C4D;}
+	.st409{fill:#62863C;}
+	.st410{fill:#8DC540;}
+	.st411{fill:#577138;}
+	.st412{fill:#A2B24F;}
+	.st413{fill:#DCDF72;}
+	.st414{fill:#5E3108;}
+	.st415{fill:#074354;}
+	.st416{fill:#04C594;}
+	.st417{fill:#95AEB6;}
+	.st418{fill:#4B4B4B;}
+	.st419{fill:#5C5B5B;}
+	.st420{fill:#ABABAB;}
+	.st421{fill:#474646;}
+	.st422{fill:#454444;}
+	.st423{fill:#8C8C8C;}
+	.st424{fill:#292828;}
+	.st425{fill:#818181;}
+	.st426{fill:#C1C1C1;}
+	.st427{fill:#AAAAAA;}
+	.st428{fill:#A1A0A0;}
+	.st429{fill:#7A7879;}
+	.st430{fill:#C9C9C9;}
+	.st431{fill:#787878;}
+	.st432{fill:#474747;}
+	.st433{fill:#939393;}
+	.st434{fill:#9D9D9D;}
+	.st435{fill:#323131;}
+	.st436{fill:#646464;}
+	.st437{fill:#5F5F5F;}
+	.st438{fill:#454545;}
+	.st439{fill:#565555;}
+	.st440{fill:#504F4F;}
+	.st441{fill:#464646;}
+	.st442{fill:#807F7F;}
+	.st443{fill:#515050;}
+	.st444{fill:#444242;}
+	.st445{fill:#A8A8A8;}
+	.st446{fill:#B6B6B6;}
+	.st447{fill:#545454;}
+	.st448{fill:#6E6E6E;}
+	.st449{fill:#9C9C9C;}
+	.st450{fill:#A9A9A9;}
+	.st451{fill:#949494;}
+	.st452{fill:#353434;}
+	.st453{fill:#727272;}
+	.st454{fill:#585858;}
+	.st455{fill:#585757;}
+	.st456{fill:#7E7D7D;}
+	.st457{fill:#4C4B4B;}
+	.st458{fill:#3A3A3A;}
+	.st459{fill:#989898;}
+	.st460{fill:#484848;}
+	.st461{fill:#817F80;}
+	.st462{fill:#7A7A7A;}
+	.st463{fill:#5B5A5B;}
+	.st464{fill:#ADADAD;}
+	.st465{fill:#737373;}
+	.st466{fill:#2E2D2D;}
+	.st467{fill:#757575;}
+	.st468{fill:#5A5959;}
+	.st469{fill:#717171;}
+	.st470{fill:#595859;}
+	.st471{fill:#989797;}
+	.st472{fill:#393939;}
+	.st473{fill:#818080;}
+	.st474{fill:#929292;}
+	.st475{fill:#3F3F3F;}
+	.st476{fill:#BEBEBE;}
+	.st477{fill:#494949;}
+	.st478{fill:#494848;}
+	.st479{fill:#696868;}
+	.st480{fill:#828181;}
+	.st481{fill:#C8C8C8;}
+	.st482{fill:#616060;}
+	.st483{fill:#615F60;}
+	.st484{fill:#686767;}
+	.st485{fill:#7F7E7E;}
+	.st486{fill:#B3B3B3;}
+	.st487{fill:#A09F9F;}
+	.st488{fill:#4D4C4C;}
+	.st489{fill:#E2E2E2;}
+	.st490{fill:#D8D8D8;}
+	.st491{fill:#3E3E3E;}
+	.st492{fill:#A4A4A4;}
+	.st493{fill:#8B898A;}
+	.st494{fill:#4C4C4C;}
+	.st495{fill:#A3A3A3;}
+	.st496{fill:#333232;}
+	.st497{fill:#6C6B6B;}
+	.st498{fill:#7B7A7A;}
+	.st499{fill:#C0C0C0;}
+	.st500{fill:#313131;}
+	.st501{fill:#7C7B7B;}
+	.st502{fill:#393838;}
+	.st503{fill:#414141;}
+	.st504{fill:#676666;}
+	.st505{fill:#6F6E6E;}
+	.st506{fill:#414040;}
+	.st507{fill:#7F7F7F;}
+	.st508{fill:#4D4D4D;}
+	.st509{fill:#6A6969;}
+	.st510{fill:#6B6A6A;}
+	.st511{fill:#7E7E7E;}
+	.st512{fill:#787777;}
+	.st513{fill:#777777;}
+	.st514{fill:#D5D5D5;}
+	.st515{fill:#A1A1A1;}
+	.st516{fill:#848384;}
+	.st517{fill:#595959;}
+	.st518{fill:#575757;}
+	.st519{fill:#ACACAC;}
+	.st520{fill:#8A8889;}
+	.st521{fill:#CFCFCF;}
+	.st522{fill:#CACACA;}
+	.st523{fill:#8D8D8D;}
+	.st524{fill:none;stroke:#A3A3A3;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;}
+	.st525{fill:#4D4C4D;}
+	.st526{fill:#9F9F9F;}
+	.st527{fill:#8B8A8A;}
+	.st528{fill:#BBBBBB;}
+	.st529{fill:#5B5A5A;}
+	.st530{fill:#C2C2C2;}
+	.st531{fill:#A6A6A6;}
+	.st532{fill:#B4B4B4;}
+	.st533{fill:#C6C6C6;}
+	.st534{fill:#A3A2A2;}
+	.st535{fill:#B7B7B7;}
+	.st536{fill:#828081;}
+	.st537{fill:#AFAFAF;}
+	.st538{fill:#D1D1D1;}
+	.st539{fill:#D3D3D3;}
+	.st540{fill:#CECECE;}
+	.st541{fill:#BABABA;}
+	.st542{fill:#A4A3A3;}
+	.st543{fill:#E0E0E0;}
+	.st544{fill:#D7D7D7;}
+	.st545{fill:#B1B1B1;}
+	.st546{fill:#A7A7A7;}
+	.st547{fill:#D2D2D2;}
+	.st548{fill:#151F34;}
+	.st549{filter:url(#Adobe_OpacityMaskFilter);}
+	.st550{fill:#FFFFFF;}
+	.st551{mask:url(#b_1_);fill:#151F34;}
+	.st552{fill:#348540;}
+	.st553{fill:#7DBC42;}
+</style>
+<g
+   id="g859"
+   transform="matrix(1.7707274,0,0,1.7707274,0.85183359,-43.009452)"><path
+     class="st548"
+     d="m 4.7276613,37.955902 c -0.680236,0.165912 -1.3770631,0.232276 -2.0738902,0.232276 -0.7134182,0 -1.4102454,-0.08296 -2.07389025,-0.232276 0.54750705,-0.879329 1.26092525,-1.659112 2.07389025,-2.306166 0.812965,0.647054 1.5263832,1.426837 2.0738902,2.306166 z m 6.2548527,-5.076883 c -0.862738,-0.232276 -1.7420675,-0.348414 -2.6213969,-0.331822 -2.0241169,0 -4.0150516,0.59728 -5.707346,1.725476 -1.69229445,-1.128196 -3.666638,-1.742068 -5.707346,-1.725476 -0.9125117,0 -1.7918411,0.116137 -2.6213972,0.331822 -0.3484136,0.08296 -0.6968272,0.199093 -1.0286496,0.331822 -0.016591,0.01659 -0.033182,0.03318 -0.016591,0.04977 0,0 0,0 0,0 0.1493201,0.315231 0.3152313,0.630462 0.4811425,0.929103 0.016591,0.01659 0.033182,0.01659 0.049773,0.01659 1.0120584,-0.365005 2.0738902,-0.547507 3.135722,-0.547507 1.7420678,0 3.3679978,0.481142 4.761652,1.327289 -0.87932942,0.746601 -1.64252103,1.642522 -2.2232103,2.637989 -0.31523132,0.514325 -0.5640982,1.061832 -0.7797827,1.62593 -0.4313692,1.144787 -0.6470538,2.37253 -0.6470538,3.583682 0,2.920038 1.22774303,5.558026 3.1854954,7.432823 0.1493201,0.14932 0.3152313,0.29864 0.4811426,0.431369 0.1327289,0.116138 0.2654579,0.215685 0.3981869,0.315231 0.1659112,0.132729 0.3484136,0.265458 0.5309159,0.381596 0.016591,0.01659 0.033182,0.01659 0.049773,0 C 2.8860461,51.278568 3.0519573,51.145839 3.2344597,51.01311 3.3671886,50.91356 3.4999176,50.814017 3.6326466,50.697879 3.7985578,50.56515 3.964469,50.41583 4.1137891,50.26651 c 1.9577524,-1.874797 3.1689043,-4.512785 3.1689043,-7.432823 0,-1.460019 -0.3152313,-2.903446 -0.9125117,-4.230736 C 6.3038179,38.470227 6.2374534,38.320907 6.171089,38.188178 6.0715422,37.989085 5.9554044,37.789991 5.8392665,37.607489 5.2419861,36.612021 4.4953856,35.716101 3.6160562,34.9695 c 1.4434276,-0.862738 3.0859487,-1.327289 4.761652,-1.327289 1.0618318,0 2.1402548,0.182502 3.1357218,0.547507 0.01659,0 0.03318,0 0.04977,-0.01659 0.182502,-0.29864 0.331822,-0.613871 0.481142,-0.912511 0.01659,-0.01659 0,-0.04977 -0.01659,-0.04977 0,0 0,0 0,0 -0.348414,-0.132729 -0.696827,-0.248866 -1.045241,-0.331822 z"
+     id="path19"
+     inkscape:connector-curvature="0"
+     style="fill:#151f34;stroke-width:0.16591121" /><path
+     class="st552"
+     d="m 6.1379067,42.850283 c 0,2.438895 -0.9456939,4.662106 -2.5052594,6.304627 -0.2820491,-0.895921 -0.4147781,-1.825024 -0.4147781,-2.754127 0,-2.438895 0.945694,-4.662105 2.5052595,-6.304626 0.2654579,0.862738 0.414778,1.791841 0.414778,2.754126"
+     id="path21"
+     inkscape:connector-curvature="0"
+     style="fill:#348540;stroke-width:0.16591121" /><path
+     class="st553"
+     d="m 2.1062641,46.384192 c 0,0.962285 -0.1493201,1.891388 -0.4147781,2.754127 -1.60933881,-1.708886 -2.5052594,-3.965279 -2.5052594,-6.304627 0,-0.962285 0.1493201,-1.891388 0.43136917,-2.754126 1.59274773,1.708885 2.48866833,3.965278 2.48866833,6.304626"
+     id="path23"
+     inkscape:connector-curvature="0"
+     style="fill:#7dbc42;stroke-width:0.16591121" /></g>
+</svg>
diff --git a/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/consul.svg b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/consul.svg
new file mode 100644
index 00000000000000..28bbadd24c8a65
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/consul.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 79.97 113.78"><defs><style>.cls-1{fill:#961d59;}.cls-1,.cls-2{fill-rule:evenodd;}.cls-2,.cls-3{fill:#d62783;}</style></defs><title>Asset 1</title><g id="Layer_2" data-name="Layer 2"><g id="Logo"><path d="M0,98.24c0-3.85,2.24-6.08,7.47-6.08a23.78,23.78,0,0,1,5.71.69l-.44,3.44a30.92,30.92,0,0,0-5.14-.54C4.86,95.75,4,96.7,4,98.94V107c0,2.24.88,3.18,3.62,3.18a30.92,30.92,0,0,0,5.14-.54l.44,3.44a23.78,23.78,0,0,1-5.71.69c-5.23,0-7.47-2.24-7.47-6.08Z"/><path d="M21.69,113.78c-5.26,0-6.68-2.9-6.68-6.05v-3.88c0-3.15,1.42-6.05,6.68-6.05s6.68,2.9,6.68,6.05v3.88C28.37,110.88,27,113.78,21.69,113.78Zm0-12.7c-2,0-2.84.91-2.84,2.65v4.13c0,1.73.79,2.65,2.84,2.65s2.84-.91,2.84-2.65v-4.13C24.53,102,23.74,101.08,21.69,101.08Z"/><path d="M40.06,113.47V102.75c0-.82-.35-1.23-1.23-1.23a10.61,10.61,0,0,0-4,1.29v10.65H31V98.12h2.93l.38,1.29a15.39,15.39,0,0,1,6.15-1.61c2.55,0,3.47,1.8,3.47,4.54v11.13Z"/><path d="M51.82,113.78a18.08,18.08,0,0,1-5.3-.88l.54-2.93a17.18,17.18,0,0,0,4.57.66c1.7,0,2-.38,2-1.54,0-.95-.19-1.42-2.68-2-3.75-.91-4.19-1.86-4.19-4.82s1.36-4.44,5.74-4.44a20.18,20.18,0,0,1,4.6.54l-.38,3.06a27,27,0,0,0-4.22-.44c-1.67,0-2,.38-2,1.32,0,1.23.09,1.32,2.18,1.86,4.29,1.13,4.7,1.7,4.7,4.85C57.37,112,56.45,113.78,51.82,113.78Z"/><path d="M63.73,98.12v10.72c0,.82.35,1.23,1.23,1.23a10.61,10.61,0,0,0,4-1.29V98.12h3.85v15.35H69.88l-.38-1.29a15.39,15.39,0,0,1-6.15,1.61c-2.55,0-3.47-1.8-3.47-4.54V98.12Z"/><path d="M76.12,113.47V91.84L80,91.31v22.16Z"/><path d="M2.93,88.42V86.3H1v2.12H0V83.33H1v2.13H2.93V83.33h1v5.09Zm4.62,0H6.76l-.07-.25a2.15,2.15,0,0,1-1.14.32c-.7,0-1-.46-1-1.09s.34-1,1.11-1h.92V86c0-.41-.12-.55-.73-.55a5.56,5.56,0,0,0-1.06.11l-.12-.7A5.18,5.18,0,0,1,6,84.67c1.2,0,1.55.41,1.55,1.33ZM6.59,87H5.88c-.31,0-.4.08-.4.36s.09.37.38.37a1.55,1.55,0,0,0,.72-.19Zm3,1.46a4.68,4.68,0,0,1-1.32-.21l.13-.7a4.45,4.45,0,0,0,1.14.16c.42,0,.49-.09.49-.37s0-.34-.67-.48c-.93-.22-1-.44-1-1.15s.34-1.06,1.43-1.06a5.23,5.23,0,0,1,1.15.13l-.09.73a7,7,0,0,0-1.05-.11c-.42,0-.49.09-.49.32s0,.32.54.44c1.07.27,1.17.41,1.17,1.16S10.7,88.49,9.55,88.49Zm4.38-.08V85.86c0-.2-.09-.29-.31-.29a2.72,2.72,0,0,0-1,.31v2.55h-1V83.26l1,.14V85a3.48,3.48,0,0,1,1.4-.35c.64,0,.86.43.86,1.09v2.66Zm1.76-4.19v-.9h1v.9Zm0,4.19V84.75h1v3.67Zm1.72-3.64c0-.92.56-1.45,1.86-1.45a6.15,6.15,0,0,1,1.42.17l-.11.82a8,8,0,0,0-1.28-.13c-.68,0-.9.23-.9.76v1.93c0,.54.22.76.9.76a8,8,0,0,0,1.28-.13l.11.82a6.15,6.15,0,0,1-1.42.17c-1.3,0-1.86-.54-1.86-1.45Zm5.4,3.72c-1.31,0-1.66-.69-1.66-1.45v-.93c0-.75.35-1.45,1.66-1.45s1.66.69,1.66,1.45V87C24.48,87.8,24.13,88.49,22.82,88.49Zm0-3c-.51,0-.71.22-.71.63v1c0,.41.2.63.71.63s.71-.22.71-.63v-1C23.52,85.68,23.33,85.46,22.82,85.46Zm4.36.06a7.59,7.59,0,0,0-1,.54v2.37h-1V84.75H26l.06.41a4.35,4.35,0,0,1,1-.48ZM31,87.2a1.13,1.13,0,0,1-1.26,1.3,5.49,5.49,0,0,1-1-.11v1.5l-1,.14V84.75h.76l.09.31a2.07,2.07,0,0,1,1.21-.38c.77,0,1.18.44,1.18,1.27Zm-2.28.41a4.41,4.41,0,0,0,.85.1c.35,0,.48-.16.48-.49v-1.3c0-.3-.12-.47-.47-.47a1.38,1.38,0,0,0-.86.33Z"/><path class="cls-1" d="M38.56,47A8.35,8.35,0,1,1,46.9,38.6,8.33,8.33,0,0,1,38.56,47"/><path class="cls-2" d="M54.81,42.46a3.85,3.85,0,1,1,3.85-3.85,3.84,3.84,0,0,1-3.85,3.85"/><path class="cls-2" d="M68.9,46.09h0a3.69,3.69,0,1,1,.08-.3c0,.1,0,.19-.08.3"/><path class="cls-2" d="M66.18,36.17A3.86,3.86,0,1,1,69,31.54a4,4,0,0,1,0,1.51,3.71,3.71,0,0,1-2.9,3.13"/><path class="cls-2" d="M79.88,45.67a3.85,3.85,0,1,1-3.13-4.46A3.87,3.87,0,0,1,80,45.32a1,1,0,0,0-.08.34"/><path class="cls-2" d="M76.74,36a3.84,3.84,0,1,1,3.16-4.42,4.29,4.29,0,0,1,0,1A3.82,3.82,0,0,1,76.74,36"/><path class="cls-2" d="M74.06,59h0a3.9,3.9,0,1,1,.48-1.58A3.47,3.47,0,0,1,74.06,59"/><path class="cls-2" d="M72.67,23.62a3.86,3.86,0,1,1,1.47-5.26,3.6,3.6,0,0,1,.48,2.23,3.86,3.86,0,0,1-1.94,3"/><path class="cls-3" d="M38.71,77.41A38.71,38.71,0,1,1,38.71,0,38.33,38.33,0,0,1,62.21,8l-4.73,6.17A30.91,30.91,0,0,0,7.78,38.71,30.94,30.94,0,0,0,57.49,63.29l4.72,6.18A38.37,38.37,0,0,1,38.71,77.41Z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/legacy/core_plugins/kibana/public/kibana.js b/src/legacy/core_plugins/kibana/public/kibana.js
index 6c809e84c8c847..fe741a357cbfe7 100644
--- a/src/legacy/core_plugins/kibana/public/kibana.js
+++ b/src/legacy/core_plugins/kibana/public/kibana.js
@@ -58,6 +58,9 @@ import 'ui/agg_response';
 import 'ui/agg_types';
 import { showAppRedirectNotification } from 'ui/notify';
 import 'leaflet';
+import { localApplicationService } from './local_application_service';
+
+localApplicationService.attachToAngular(routes);
 
 routes.enable();
 
diff --git a/src/legacy/core_plugins/kibana/public/local_application_service/index.ts b/src/legacy/core_plugins/kibana/public/local_application_service/index.ts
new file mode 100644
index 00000000000000..2128355ca906ad
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/local_application_service/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './local_application_service';
diff --git a/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts b/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts
new file mode 100644
index 00000000000000..9d87e187fd1e1f
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts
@@ -0,0 +1,145 @@
+/*
+ * 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 { App, AppUnmount } from 'kibana/public';
+import { UIRoutes } from 'ui/routes';
+import { ILocationService, IScope } from 'angular';
+import { npStart } from 'ui/new_platform';
+import { htmlIdGenerator } from '@elastic/eui';
+
+interface ForwardDefinition {
+  legacyAppId: string;
+  newAppId: string;
+  keepPrefix: boolean;
+}
+
+const matchAllWithPrefix = (prefixOrApp: string | App) =>
+  `/${typeof prefixOrApp === 'string' ? prefixOrApp : prefixOrApp.id}/:tail*?`;
+
+/**
+ * To be able to migrate and shim parts of the Kibana app plugin
+ * while still running some parts of it in the legacy world, this
+ * service emulates the core application service while using the global
+ * angular router to switch between apps without page reload.
+ *
+ * The id of the apps is used as prefix of the route - when switching between
+ * to apps, the current application is unmounted.
+ *
+ * This service becomes unnecessary once the platform provides a central
+ * router that handles switching between applications without page reload.
+ */
+export class LocalApplicationService {
+  private apps: App[] = [];
+  private forwards: ForwardDefinition[] = [];
+  private idGenerator = htmlIdGenerator('kibanaAppLocalApp');
+
+  /**
+   * Register an app to be managed by the application service.
+   * This method works exactly as `core.application.register`.
+   *
+   * When an app is mounted, it is responsible for routing. The app
+   * won't be mounted again if the route changes within the prefix
+   * of the app (its id). It is fine to use whatever means for handling
+   * routing within the app.
+   *
+   * When switching to a URL outside of the current prefix, the app router
+   * shouldn't do anything because it doesn't own the routing anymore -
+   * the local application service takes over routing again,
+   * unmounts the current app and mounts the next app.
+   *
+   * @param app The app descriptor
+   */
+  register(app: App) {
+    this.apps.push(app);
+  }
+
+  /**
+   * Forwards every URL starting with `legacyAppId` to the same URL starting
+   * with `newAppId` - e.g. `/legacy/my/legacy/path?q=123` gets forwarded to
+   * `/newApp/my/legacy/path?q=123`.
+   *
+   * When setting the `keepPrefix` option, the new app id is simply prepended.
+   * The example above would become `/newApp/legacy/my/legacy/path?q=123`.
+   *
+   * This method can be used to provide backwards compatibility for URLs when
+   * renaming or nesting plugins. For route changes after the prefix, please
+   * use the routing mechanism of your app.
+   *
+   * @param legacyAppId The name of the old app to forward URLs from
+   * @param newAppId The name of the new app that handles the URLs now
+   * @param options Whether the prefix of the old app is kept to nest the legacy
+   * path into the new path
+   */
+  forwardApp(
+    legacyAppId: string,
+    newAppId: string,
+    options: { keepPrefix: boolean } = { keepPrefix: false }
+  ) {
+    this.forwards.push({ legacyAppId, newAppId, ...options });
+  }
+
+  /**
+   * Wires up listeners to handle mounting and unmounting of apps to
+   * the legacy angular route manager. Once all apps within the Kibana
+   * plugin are using the local route manager, this implementation can
+   * be switched to a more lightweight implementation.
+   *
+   * @param angularRouteManager The current `ui/routes` instance
+   */
+  attachToAngular(angularRouteManager: UIRoutes) {
+    this.apps.forEach(app => {
+      const wrapperElementId = this.idGenerator();
+      angularRouteManager.when(matchAllWithPrefix(app), {
+        outerAngularWrapperRoute: true,
+        reloadOnSearch: false,
+        reloadOnUrl: false,
+        template: `<div style="height:100%" id="${wrapperElementId}"></div>`,
+        controller($scope: IScope) {
+          const element = document.getElementById(wrapperElementId)!;
+          let unmountHandler: AppUnmount | null = null;
+          let isUnmounted = false;
+          $scope.$on('$destroy', () => {
+            if (unmountHandler) {
+              unmountHandler();
+            }
+            isUnmounted = true;
+          });
+          (async () => {
+            unmountHandler = await app.mount({ core: npStart.core }, { element, appBasePath: '' });
+            // immediately unmount app if scope got destroyed in the meantime
+            if (isUnmounted) {
+              unmountHandler();
+            }
+          })();
+        },
+      });
+    });
+
+    this.forwards.forEach(({ legacyAppId, newAppId, keepPrefix }) => {
+      angularRouteManager.when(matchAllWithPrefix(legacyAppId), {
+        resolveRedirectTo: ($location: ILocationService) => {
+          const url = $location.url();
+          return `/${newAppId}${keepPrefix ? url : url.replace(legacyAppId, '')}`;
+        },
+      });
+    });
+  }
+}
+
+export const localApplicationService = new LocalApplicationService();
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
index 08a8cf3898e948..8e7ae33a600682 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap
@@ -463,7 +463,7 @@ exports[`Field for boolean setting should render as read only if saving is disab
         display="row"
         error={null}
         fullWidth={false}
-        hasChildLabel={true}
+        hasChildLabel={false}
         hasEmptyLabelSpace={false}
         helpText={null}
         isInvalid={false}
@@ -557,7 +557,7 @@ exports[`Field for boolean setting should render as read only with help text if
         display="row"
         error={null}
         fullWidth={false}
-        hasChildLabel={true}
+        hasChildLabel={false}
         hasEmptyLabelSpace={false}
         helpText={
           <EuiText
@@ -650,7 +650,7 @@ exports[`Field for boolean setting should render custom setting icon if it is cu
         display="row"
         error={null}
         fullWidth={false}
-        hasChildLabel={true}
+        hasChildLabel={false}
         hasEmptyLabelSpace={false}
         helpText={null}
         isInvalid={false}
@@ -722,7 +722,7 @@ exports[`Field for boolean setting should render default value if there is no us
         display="row"
         error={null}
         fullWidth={false}
-        hasChildLabel={true}
+        hasChildLabel={false}
         hasEmptyLabelSpace={false}
         helpText={null}
         isInvalid={false}
@@ -816,7 +816,7 @@ exports[`Field for boolean setting should render user value if there is user val
         display="row"
         error={null}
         fullWidth={false}
-        hasChildLabel={true}
+        hasChildLabel={false}
         hasEmptyLabelSpace={false}
         helpText={
           <span>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
index e52f789eb8af78..a953d09906ed11 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js
@@ -195,7 +195,7 @@ export class Field extends PureComponent {
     this.setState({
       unsavedValue: newUnsavedValue,
       isInvalid,
-      error
+      error,
     });
   };
 
@@ -764,6 +764,7 @@ export class Field extends PureComponent {
               helpText={this.renderHelpText(setting)}
               describedByIds={[`${setting.name}-aria`]}
               className="mgtAdvancedSettings__fieldRow"
+              hasChildLabel={setting.type !== 'boolean'}
             >
               {this.renderField(setting)}
             </EuiFormRow>
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html
index 50e921e14973b6..0ef3cce832bc7b 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html
+++ b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html
@@ -72,14 +72,6 @@
     index-patterns="[indexPattern]"
   ></filter-bar>
 
-  <apply-filters-popover
-    key="applyFiltersKey"
-    filters="state.$newFilters"
-    on-cancel="onCancelApplyFilters"
-    on-submit="onApplyFilters"
-    index-patterns="indexPatterns"
-  ></apply-filters-popover>
-
   <div
     class="euiCallOut euiCallOut--primary euiCallOut--small hide-for-sharing"
     ng-if="vis.type.shouldMarkAsExperimentalInUI()"
@@ -90,7 +82,14 @@
     </div>
   </div>
 
-  <div class="visualize" ng-if="!chrome.getVisible()"/>
+  <visualization-embedded
+    ng-if="!chrome.getVisible()"
+    class="visualize"
+    saved-obj="savedVis"
+    ui-state="uiState"
+    time-range="timeRange"
+    filters="filters"
+    query="query"/>
 
   <h1
     class="euiScreenReaderOnly"
@@ -107,7 +106,8 @@
     saved-obj="savedVis"
     ui-state="uiState"
     time-range="timeRange"
-    filters="globalFilters"
+    filters="filters"
+    query="query"
     class="visEditor__content"
   />
 
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
index dac0880e6fec44..f5011611368012 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
@@ -22,43 +22,48 @@ import { Subscription } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import '../saved_visualizations/saved_visualizations';
 import './visualization_editor';
-import 'ui/vis/editors/default/sidebar';
-import 'ui/visualize';
-import 'ui/collapsible_sidebar';
+import './visualization';
 
-import { capabilities } from 'ui/capabilities';
-import chrome from 'ui/chrome';
 import React from 'react';
-import angular from 'angular';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { toastNotifications } from 'ui/notify';
-import { docTitle } from 'ui/doc_title';
-import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
-import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 import { migrateAppState } from './lib';
-import uiRoutes from 'ui/routes';
-import { uiModules } from 'ui/modules';
 import editorTemplate from './editor.html';
 import { DashboardConstants } from '../../dashboard/dashboard_constants';
 import { VisualizeConstants } from '../visualize_constants';
-import { KibanaParsedUrl } from 'ui/url/kibana_parsed_url';
-import { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
-import { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
-import { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
-import { timefilter } from 'ui/timefilter';
-import { getVisualizeLoader } from '../../../../../ui/public/visualize/loader';
-import { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share';
-import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
-import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
-import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
 import { getEditBreadcrumbs, getCreateBreadcrumbs } from '../breadcrumbs';
-import { npStart } from 'ui/new_platform';
-import { extractTimeFilter, changeTimeFilter } from '../../../../data/public';
-import { start as data } from '../../../../data/public/legacy';
-import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy';
-
+import { extractTimeFilter, changeTimeFilter } from '../../../../../../plugins/data/public';
 import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
 
+import {
+  getServices,
+  angular,
+  absoluteToParsedUrl,
+  getUnhashableStatesProvider,
+  KibanaParsedUrl,
+  migrateLegacyQuery,
+  SavedObjectSaveModal,
+  showShareContextMenu,
+  showSaveModal,
+  stateMonitorFactory,
+  subscribeWithScope,
+} from '../kibana_services';
+
+const {
+  capabilities,
+  chrome,
+  chromeLegacy,
+  data,
+  docTitle,
+  FilterBarQueryFilterProvider,
+  getBasePath,
+  ShareContextMenuExtensionsRegistryProvider,
+  toastNotifications,
+  timefilter,
+  uiModules,
+  uiRoutes,
+  visualizations,
+} = getServices();
+
 const { savedQueryService } = data.search.services;
 
 uiRoutes
@@ -100,7 +105,7 @@ uiRoutes
       savedVis: function (savedVisualizations, redirectWhenMissing, $route) {
         return savedVisualizations.get($route.current.params.id)
           .then((savedVis) => {
-            npStart.core.chrome.recentlyAccessed.add(
+            chrome.recentlyAccessed.add(
               savedVis.getFullPath(),
               savedVis.title,
               savedVis.id);
@@ -142,6 +147,7 @@ function VisEditor(
   AppState,
   $window,
   $injector,
+  $timeout,
   indexPatterns,
   kbnUrl,
   redirectWhenMissing,
@@ -167,7 +173,7 @@ function VisEditor(
     dirty: !savedVis.id
   };
 
-  $scope.topNavMenu = [...(capabilities.get().visualize.save ? [{
+  $scope.topNavMenu = [...(capabilities.visualize.save ? [{
     id: 'save',
     label: i18n.translate('kbn.topNavMenu.saveVisualizationButtonLabel', { defaultMessage: 'save' }),
     description: i18n.translate('kbn.visualize.topNavMenu.saveVisualizationButtonAriaLabel', {
@@ -236,7 +242,7 @@ function VisEditor(
       showShareContextMenu({
         anchorElement,
         allowEmbed: true,
-        allowShortUrl: capabilities.get().visualize.createShortUrl,
+        allowShortUrl: capabilities.visualize.createShortUrl,
         getUnhashableStates,
         objectId: savedVis.id,
         objectType: 'visualization',
@@ -353,9 +359,9 @@ function VisEditor(
     }
   });
 
-  $scope.showSaveQuery = capabilities.get().visualize.saveQuery;
+  $scope.showSaveQuery = capabilities.visualize.saveQuery;
 
-  $scope.$watch(() => capabilities.get().visualize.saveQuery, (newCapability) => {
+  $scope.$watch(() => capabilities.visualize.saveQuery, (newCapability) => {
     $scope.showSaveQuery = newCapability;
   });
 
@@ -403,22 +409,21 @@ function VisEditor(
       $appStatus.dirty = status.dirty || !savedVis.id;
     });
 
-    $scope.$watch('state.query', (newQuery) => {
-      const query = migrateLegacyQuery(newQuery);
-      $scope.updateQueryAndFetch({ query });
+    $scope.$watch('state.query', (newQuery, oldQuery) => {
+      if (!_.isEqual(newQuery, oldQuery)) {
+        const query = migrateLegacyQuery(newQuery);
+        if (!_.isEqual(query, newQuery)) {
+          $state.query = query;
+        }
+        $scope.fetch();
+      }
     });
 
     $state.replace();
 
     const updateTimeRange = () => {
       $scope.timeRange = timefilter.getTime();
-      // In case we are running in embedded mode (i.e. we used the visualize loader to embed)
-      // the visualization, we need to update the timeRange on the visualize handler.
-      if ($scope._handler) {
-        $scope._handler.update({
-          timeRange: $scope.timeRange,
-        });
-      }
+      $scope.$broadcast('render');
     };
 
     const subscriptions = new Subscription();
@@ -435,9 +440,10 @@ function VisEditor(
     // update the searchSource when query updates
     $scope.fetch = function () {
       $state.save();
+      $scope.query = $state.query;
       savedVis.searchSource.setField('query', $state.query);
       savedVis.searchSource.setField('filter', $state.filters);
-      $scope.vis.forceReload();
+      $scope.$broadcast('render');
     };
 
     // update the searchSource when filters update
@@ -460,16 +466,8 @@ function VisEditor(
       subscriptions.unsubscribe();
     });
 
-    if (!$scope.chrome.getVisible()) {
-      getVisualizeLoader().then(loader => {
-        $scope._handler = loader.embedVisualizationWithSavedObject($element.find('.visualize')[0], savedVis, {
-          timeRange: $scope.timeRange,
-          uiState: $scope.uiState,
-          appState: $state,
-          listenOnChange: false
-        });
-      });
-    }
+
+    $timeout(() => { $scope.$broadcast('render'); });
   }
 
   $scope.updateQueryAndFetch = function ({ query, dateRange }) {
@@ -482,7 +480,9 @@ function VisEditor(
     timefilter.setTime(dateRange);
 
     // If nothing has changed, trigger the fetch manually, otherwise it will happen as a result of the changes
-    if (!isUpdate) $scope.fetch();
+    if (!isUpdate) {
+      $scope.vis.forceReload();
+    }
   };
 
   $scope.onRefreshChange = function ({ isPaused, refreshInterval }) {
@@ -582,7 +582,7 @@ function VisEditor(
 
             if ($scope.isAddToDashMode()) {
               const savedVisualizationParsedUrl = new KibanaParsedUrl({
-                basePath: chrome.getBasePath(),
+                basePath: getBasePath(),
                 appId: kbnBaseUrl.slice('/app/'.length),
                 appPath: kbnUrl.eval(`${VisualizeConstants.EDIT_PATH}/{{id}}`, { id: savedVis.id }),
               });
@@ -591,15 +591,19 @@ function VisEditor(
               // Since we aren't reloading the page, only inserting a new browser history item, we need to manually update
               // the last url for this app, so directly clicking on the Visualize tab will also bring the user to the saved
               // url, not the unsaved one.
-              chrome.trackSubUrlForApp('kibana:visualize', savedVisualizationParsedUrl);
+              chromeLegacy.trackSubUrlForApp('kibana:visualize', savedVisualizationParsedUrl);
 
-              const lastDashboardAbsoluteUrl = npStart.core.chrome.navLinks.get('kibana:dashboard').url;
-              const dashboardParsedUrl = absoluteToParsedUrl(lastDashboardAbsoluteUrl, chrome.getBasePath());
+              const lastDashboardAbsoluteUrl = chrome.navLinks.get('kibana:dashboard').url;
+              const dashboardParsedUrl = absoluteToParsedUrl(lastDashboardAbsoluteUrl, getBasePath());
               dashboardParsedUrl.addQueryParameter(DashboardConstants.NEW_VISUALIZATION_ID_PARAM, savedVis.id);
               kbnUrl.change(dashboardParsedUrl.appPath);
             } else if (savedVis.id === $route.current.params.id) {
               docTitle.change(savedVis.lastSavedTitle);
-              chrome.breadcrumbs.set($injector.invoke(getEditBreadcrumbs));
+              chrome.setBreadcrumbs($injector.invoke(getEditBreadcrumbs));
+              savedVis.vis.title = savedVis.title;
+              savedVis.vis.description = savedVis.description;
+              // it's needed to save the state to update url string
+              $state.save();
             } else {
               kbnUrl.change(`${VisualizeConstants.EDIT_PATH}/{{id}}`, { id: savedVis.id });
             }
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js b/src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js
new file mode 100644
index 00000000000000..198fbe19a0b7aa
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js
@@ -0,0 +1,68 @@
+/*
+ * 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 { getServices } from '../kibana_services';
+
+const { embeddables, uiModules } = getServices();
+
+uiModules
+  .get('kibana/directive', ['ngSanitize'])
+  .directive('visualizationEmbedded', function (Private, $timeout, getAppState) {
+
+    return {
+      restrict: 'E',
+      scope: {
+        savedObj: '=',
+        uiState: '=?',
+        timeRange: '=',
+        filters: '=',
+        query: '=',
+      },
+      link: function ($scope, element) {
+        $scope.renderFunction = async () => {
+          if (!$scope._handler) {
+            $scope._handler = await embeddables.getEmbeddableFactory('visualization').createFromObject($scope.savedObj, {
+              timeRange: $scope.timeRange,
+              filters: $scope.filters || [],
+              query: $scope.query,
+              appState: getAppState(),
+              uiState: $scope.uiState,
+            });
+            $scope._handler.render(element[0]);
+
+          } else {
+            $scope._handler.updateInput({
+              timeRange: $scope.timeRange,
+              filters: $scope.filters || [],
+              query: $scope.query,
+            });
+          }
+        };
+
+        $scope.$on('render', (event) => {
+          event.preventDefault();
+          $timeout(() => { $scope.renderFunction(); });
+        });
+
+        $scope.$on('$destroy', () => {
+          $scope._handler.destroy();
+        });
+      }
+    };
+  });
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js b/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js
index a2ed44df2f5b08..ead77e6bc41d50 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-import { debounce } from 'lodash';
-import { uiModules } from 'ui/modules';
-import 'angular-sanitize';
-import { VisEditorTypesRegistryProvider } from 'ui/registry/vis_editor_types';
+import { getServices, VisEditorTypesRegistryProvider } from '../kibana_services';
+
+const { uiModules } = getServices();
 
 uiModules
   .get('kibana/directive', ['ngSanitize'])
@@ -34,6 +33,7 @@ uiModules
         uiState: '=?',
         timeRange: '=',
         filters: '=',
+        query: '=',
       },
       link: function ($scope, element) {
         const editorType = $scope.savedObj.vis.type.editor;
@@ -46,6 +46,7 @@ uiModules
             uiState: $scope.uiState,
             timeRange: $scope.timeRange,
             filters: $scope.filters,
+            query: $scope.query,
             appState: getAppState(),
           });
         };
@@ -58,10 +59,6 @@ uiModules
         $scope.$on('$destroy', () => {
           editor.destroy();
         });
-
-        $scope.$watchGroup(['timeRange', 'filters'], debounce(() => {
-          $scope.renderFunction();
-        }, 100));
       }
     };
   });
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx b/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx
index 92bd0fa345fa0c..065feae0455972 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx
@@ -19,7 +19,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Embeddable, EmbeddableOutput } from '../../../../../../plugins/embeddable/public';
+
+import { Embeddable, EmbeddableOutput } from '../kibana_services';
 import { DisabledLabVisualization } from './disabled_lab_visualization';
 import { VisualizeInput } from './visualize_embeddable';
 import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts b/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts
index 699fa68b4528bd..b6d5adcd98bd02 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts
@@ -17,9 +17,14 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
-import { StaticIndexPattern, getFromSavedObject } from 'ui/index_patterns';
-import { VisSavedObject } from 'ui/visualize/loader/types';
+import {
+  getServices,
+  getFromSavedObject,
+  StaticIndexPattern,
+  VisSavedObject,
+} from '../kibana_services';
+
+const { savedObjectsClient, uiSettings } = getServices();
 
 export async function getIndexPattern(
   savedVis: VisSavedObject
@@ -28,9 +33,7 @@ export async function getIndexPattern(
     return savedVis.vis.indexPattern;
   }
 
-  const config = chrome.getUiSettingsClient();
-  const savedObjectsClient = chrome.getSavedObjectsClient();
-  const defaultIndex = config.get('defaultIndex');
+  const defaultIndex = uiSettings.get('defaultIndex');
 
   if (savedVis.vis.params.index_pattern) {
     const indexPatternObjects = await savedObjectsClient.find({
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts
index b9febc3af54ea6..318686b26f6f27 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts
@@ -18,27 +18,30 @@
  */
 
 import _ from 'lodash';
-import { StaticIndexPattern } from 'ui/index_patterns';
-import { PersistedState } from 'ui/persisted_state';
-import { VisualizeLoader } from 'ui/visualize/loader';
 import { EmbeddedVisualizeHandler } from 'ui/visualize/loader/embedded_visualize_handler';
-import {
-  VisSavedObject,
-  VisualizeLoaderParams,
-  VisualizeUpdateParams,
-} from 'ui/visualize/loader/types';
 import { Subscription } from 'rxjs';
 import * as Rx from 'rxjs';
-import { Filter } from '@kbn/es-query';
-import { TimeRange } from '../../../../../../plugins/data/public';
 import {
+  TimeRange,
+  onlyDisabledFiltersChanged,
+  esFilters,
+} from '../../../../../../plugins/data/public';
+import { Query } from '../../../../data/public';
+import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
+
+import {
+  AppState,
+  Container,
+  Embeddable,
   EmbeddableInput,
   EmbeddableOutput,
-  Embeddable,
-  Container,
-} from '../../../../../../plugins/embeddable/public';
-import { Query, onlyDisabledFiltersChanged } from '../../../../data/public';
-import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
+  PersistedState,
+  StaticIndexPattern,
+  VisSavedObject,
+  VisualizeLoader,
+  VisualizeLoaderParams,
+  VisualizeUpdateParams,
+} from '../kibana_services';
 
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;
 
@@ -48,15 +51,19 @@ export interface VisualizeEmbeddableConfiguration {
   editUrl: string;
   loader: VisualizeLoader;
   editable: boolean;
+  appState?: AppState;
+  uiState?: PersistedState;
 }
 
 export interface VisualizeInput extends EmbeddableInput {
   timeRange?: TimeRange;
   query?: Query;
-  filters?: Filter[];
+  filters?: esFilters.Filter[];
   vis?: {
     colors?: { [key: string]: string };
   };
+  appState?: AppState;
+  uiState?: PersistedState;
 }
 
 export interface VisualizeOutput extends EmbeddableOutput {
@@ -69,12 +76,13 @@ export interface VisualizeOutput extends EmbeddableOutput {
 export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOutput> {
   private savedVisualization: VisSavedObject;
   private loader: VisualizeLoader;
+  private appState: AppState | undefined;
   private uiState: PersistedState;
   private handler?: EmbeddedVisualizeHandler;
   private timeRange?: TimeRange;
   private query?: Query;
   private title?: string;
-  private filters?: Filter[];
+  private filters?: esFilters.Filter[];
   private visCustomizations: VisualizeInput['vis'];
   private subscription: Subscription;
   public readonly type = VISUALIZE_EMBEDDABLE_TYPE;
@@ -86,6 +94,8 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       editUrl,
       indexPatterns,
       editable,
+      appState,
+      uiState,
     }: VisualizeEmbeddableConfiguration,
     initialInput: VisualizeInput,
     parent?: Container
@@ -105,12 +115,18 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
     this.savedVisualization = savedVisualization;
     this.loader = loader;
 
-    const parsedUiState = savedVisualization.uiStateJSON
-      ? JSON.parse(savedVisualization.uiStateJSON)
-      : {};
-    this.uiState = new PersistedState(parsedUiState);
+    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.uiState.on('change', this.uiStateChangeHandler);
+    this.appState = appState;
 
     this.subscription = Rx.merge(this.getOutput$(), this.getInput$()).subscribe(() => {
       this.handleChanges();
@@ -149,7 +165,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
         });
         this.uiState.on('change', this.uiStateChangeHandler);
       }
-    } else {
+    } else if (!this.appState) {
       this.uiState.clearAllKeys();
     }
   }
@@ -211,6 +227,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
     }
 
     const handlerParams: VisualizeLoaderParams = {
+      appState: this.appState,
       uiState: this.uiState,
       // Append visualization to container instead of replacing its content
       append: true,
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx b/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx
index 8448b65e0994e3..c1ce4f67cfdb30 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx
@@ -17,42 +17,11 @@
  * under the License.
  */
 
-import 'ui/registry/field_formats';
-import 'uiExports/contextMenuActions';
-import 'uiExports/devTools';
-import 'uiExports/docViews';
-import 'uiExports/embeddableFactories';
-import 'uiExports/embeddableActions';
-import 'uiExports/fieldFormatEditors';
-import 'uiExports/fieldFormats';
-import 'uiExports/home';
-import 'uiExports/indexManagement';
-import 'uiExports/inspectorViews';
-import 'uiExports/savedObjectTypes';
-import 'uiExports/search';
-import 'uiExports/shareContextMenuExtensions';
-import 'uiExports/visEditorTypes';
-import 'uiExports/visTypes';
-import 'uiExports/visualize';
-
 import { i18n } from '@kbn/i18n';
 
-import { capabilities } from 'ui/capabilities';
-
-import chrome from 'ui/chrome';
-import { getVisualizeLoader } from 'ui/visualize/loader';
-
 import { Legacy } from 'kibana';
 
 import { SavedObjectAttributes } from 'kibana/server';
-import { npSetup } from 'ui/new_platform';
-import {
-  EmbeddableFactory,
-  ErrorEmbeddable,
-  Container,
-  EmbeddableOutput,
-} from '../../../../../../plugins/embeddable/public';
-import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy';
 import { showNewVisModal } from '../wizard';
 import { SavedVisualizations } from '../types';
 import { DisabledLabEmbeddable } from './disabled_lab_embeddable';
@@ -61,6 +30,25 @@ import { VisualizeEmbeddable, VisualizeInput, VisualizeOutput } from './visualiz
 import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
 import { TypesStart } from '../../../../visualizations/public/np_ready/public/types';
 
+import {
+  getServices,
+  Container,
+  EmbeddableFactory,
+  EmbeddableOutput,
+  ErrorEmbeddable,
+  getVisualizeLoader,
+  VisSavedObject,
+} from '../kibana_services';
+
+const {
+  addBasePath,
+  capabilities,
+  embeddable,
+  getInjector,
+  uiSettings,
+  visualizations,
+} = getServices();
+
 interface VisualizationAttributes extends SavedObjectAttributes {
   visState: string;
 }
@@ -109,7 +97,7 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
           if (!visType) {
             return false;
           }
-          if (chrome.getUiSettingsClient().get('visualize:enableLabs')) {
+          if (uiSettings.get('visualize:enableLabs')) {
             return true;
           }
           return visType.stage !== 'experimental';
@@ -121,7 +109,7 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
   }
 
   public isEditable() {
-    return capabilities.get().visualize.save as boolean;
+    return capabilities.visualize.save as boolean;
   }
 
   public getDisplayName() {
@@ -130,21 +118,20 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
     });
   }
 
-  public async createFromSavedObject(
-    savedObjectId: string,
+  public async createFromObject(
+    savedObject: VisSavedObject,
     input: Partial<VisualizeInput> & { id: string },
     parent?: Container
   ): Promise<VisualizeEmbeddable | ErrorEmbeddable | DisabledLabEmbeddable> {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
+    const $injector = await getInjector();
     const config = $injector.get<Legacy.KibanaConfig>('config');
     const savedVisualizations = $injector.get<SavedVisualizations>('savedVisualizations');
 
     try {
-      const visId = savedObjectId;
+      const visId = savedObject.id as string;
 
-      const editUrl = chrome.addBasePath(`/app/kibana${savedVisualizations.urlFor(visId)}`);
+      const editUrl = visId ? addBasePath(`/app/kibana${savedVisualizations.urlFor(visId)}`) : '';
       const loader = await getVisualizeLoader();
-      const savedObject = await savedVisualizations.get(visId);
       const isLabsEnabled = config.get<boolean>('visualize:enableLabs');
 
       if (!isLabsEnabled && savedObject.vis.type.stage === 'experimental') {
@@ -160,6 +147,8 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
           indexPatterns,
           editUrl,
           editable: this.isEditable(),
+          appState: input.appState,
+          uiState: input.uiState,
         },
         input,
         parent
@@ -170,6 +159,25 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
     }
   }
 
+  public async createFromSavedObject(
+    savedObjectId: string,
+    input: Partial<VisualizeInput> & { id: string },
+    parent?: Container
+  ): Promise<VisualizeEmbeddable | ErrorEmbeddable | DisabledLabEmbeddable> {
+    const $injector = await getInjector();
+    const savedVisualizations = $injector.get<SavedVisualizations>('savedVisualizations');
+
+    try {
+      const visId = savedObjectId;
+
+      const savedObject = await savedVisualizations.get(visId);
+      return this.createFromObject(savedObject, input, parent);
+    } catch (e) {
+      console.error(e); // eslint-disable-line no-console
+      return new ErrorEmbeddable(e, input, parent);
+    }
+  }
+
   public async create() {
     // TODO: This is a bit of a hack to preserve the original functionality. Ideally we will clean this up
     // to allow for in place creation of visualizations without having to navigate away to a new URL.
@@ -183,8 +191,5 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
 }
 
 VisualizeEmbeddableFactory.createVisualizeEmbeddableFactory().then(embeddableFactory => {
-  npSetup.plugins.embeddable.registerEmbeddableFactory(
-    VISUALIZE_EMBEDDABLE_TYPE,
-    embeddableFactory
-  );
+  embeddable.registerEmbeddableFactory(VISUALIZE_EMBEDDABLE_TYPE, embeddableFactory);
 });
diff --git a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu.js b/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu.js
index d95f7ea85c5db2..40a1b79ea35203 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu.js
@@ -20,7 +20,10 @@
 import React, { Fragment, PureComponent } from 'react';
 import { EuiButton, EuiHorizontalRule, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
+
+import { getServices } from '../kibana_services';
+
+const { docLinks } = getServices();
 
 export class HelpMenu extends PureComponent {
   render() {
@@ -31,7 +34,7 @@ export class HelpMenu extends PureComponent {
         <EuiButton
           fill
           iconType="popout"
-          href={`${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/visualize.html`}
+          href={`${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/visualize.html`}
           target="_blank"
         >
           <FormattedMessage id="kbn.visualize.helpMenu.docLabel" defaultMessage="Visualize documentation" />
diff --git a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js b/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js
index aeabff2d97007b..58a92193de63e8 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js
@@ -22,7 +22,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { HelpMenu } from './help_menu';
 
 export function addHelpMenuToAppChrome(chrome) {
-  chrome.helpExtension.set(domElement => {
+  chrome.setHelpExtension(domElement => {
     render(<HelpMenu/>, domElement);
     return () => {
       unmountComponentAtNode(domElement);
diff --git a/src/legacy/core_plugins/kibana/public/visualize/index.js b/src/legacy/core_plugins/kibana/public/visualize/index.js
index b3c16fb94d7fbc..592a355a71b0d7 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/index.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/index.js
@@ -21,16 +21,14 @@ import './editor/editor';
 import { i18n } from '@kbn/i18n';
 import './saved_visualizations/_saved_vis';
 import './saved_visualizations/saved_visualizations';
-import uiRoutes from 'ui/routes';
-import 'ui/capabilities/route_setup';
 import visualizeListingTemplate from './listing/visualize_listing.html';
 import { VisualizeListingController } from './listing/visualize_listing';
 import { VisualizeConstants } from './visualize_constants';
-import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
 import { getLandingBreadcrumbs, getWizardStep1Breadcrumbs } from './breadcrumbs';
 
-// load directives
-import '../../../data/public';
+import { getServices, FeatureCatalogueCategory } from './kibana_services';
+
+const { FeatureCatalogueRegistryProvider, uiRoutes } = getServices();
 
 uiRoutes
   .defaults(/visualize/, {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts b/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts
new file mode 100644
index 00000000000000..7e8435bbdc65ea
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts
@@ -0,0 +1,132 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import 'angular-sanitize'; // used in visualization_editor.js and visualization.js
+import 'ui/collapsible_sidebar'; // used in default editor
+import 'ui/vis/editors/default/sidebar';
+// load directives
+import '../../../data/public';
+
+import { npStart } from 'ui/new_platform';
+import angular from 'angular'; // just used in editor.js
+import chromeLegacy from 'ui/chrome';
+
+import uiRoutes from 'ui/routes';
+
+// @ts-ignore
+import { docTitle } from 'ui/doc_title';
+import { FilterBarQueryFilterProvider } from 'ui/filter_manager/query_filter';
+import { wrapInI18nContext } from 'ui/i18n';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+import { FeatureCatalogueRegistryProvider } from 'ui/registry/feature_catalogue';
+import { ShareContextMenuExtensionsRegistryProvider } from 'ui/share';
+import { timefilter } from 'ui/timefilter';
+
+// Saved objects
+import { SavedObjectsClientProvider } from 'ui/saved_objects';
+// @ts-ignore
+import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
+import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+
+import { createUiStatsReporter, METRIC_TYPE } from '../../../ui_metric/public';
+import { start as visualizations } from '../../../visualizations/public/np_ready/public/legacy';
+import { start as data } from '../../../data/public/legacy';
+import { start as embeddables } from '../../../../core_plugins/embeddable_api/public/np_ready/public/legacy';
+
+const services = {
+  // new platform
+  addBasePath: npStart.core.http.basePath.prepend,
+  capabilities: npStart.core.application.capabilities,
+  chrome: npStart.core.chrome,
+  docLinks: npStart.core.docLinks,
+  embeddable: npStart.plugins.embeddable,
+  getBasePath: npStart.core.http.basePath.get,
+  savedObjectsClient: npStart.core.savedObjects.client,
+  toastNotifications: npStart.core.notifications.toasts,
+  uiSettings: npStart.core.uiSettings,
+
+  data,
+  embeddables,
+  visualizations,
+
+  // legacy
+  chromeLegacy,
+  docTitle,
+  FeatureCatalogueRegistryProvider,
+  FilterBarQueryFilterProvider,
+  getInjector: () => {
+    return chromeLegacy.dangerouslyGetActiveInjector();
+  },
+  SavedObjectProvider,
+  SavedObjectRegistryProvider,
+  SavedObjectsClientProvider,
+  ShareContextMenuExtensionsRegistryProvider,
+  timefilter,
+  uiModules,
+  uiRoutes,
+  wrapInI18nContext,
+
+  createUiStatsReporter,
+};
+
+export function getServices() {
+  return services;
+}
+
+// export legacy static dependencies
+export { angular };
+export { getFromSavedObject } from 'ui/index_patterns';
+export { PersistedState } from 'ui/persisted_state';
+// @ts-ignore
+export { VisEditorTypesRegistryProvider } from 'ui/registry/vis_editor_types';
+// @ts-ignore
+export { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
+export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
+export { showShareContextMenu } from 'ui/share';
+export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
+export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
+export { KibanaParsedUrl } from 'ui/url/kibana_parsed_url';
+export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
+export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
+export { getVisualizeLoader } from 'ui/visualize/loader';
+export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
+export {
+  Container,
+  Embeddable,
+  EmbeddableFactory,
+  EmbeddableInput,
+  EmbeddableOutput,
+  ErrorEmbeddable,
+} from '../../../../../plugins/embeddable/public';
+
+// export types
+export { METRIC_TYPE };
+export { StaticIndexPattern } from 'ui/index_patterns';
+export { AppState } from 'ui/state_management/app_state';
+export { VisType } from 'ui/vis';
+export { VisualizeLoader } from 'ui/visualize/loader';
+export {
+  VisSavedObject,
+  VisualizeLoaderParams,
+  VisualizeUpdateParams,
+} from 'ui/visualize/loader/types';
+
+// export const
+export { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/no_visualizations_prompt.js b/src/legacy/core_plugins/kibana/public/visualize/listing/no_visualizations_prompt.js
index 54a6048a22dafa..34b662838880e3 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/no_visualizations_prompt.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/listing/no_visualizations_prompt.js
@@ -18,7 +18,8 @@
  */
 
 import React from 'react';
-import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 import {
   KuiEmptyTablePrompt,
@@ -27,7 +28,7 @@ import {
   KuiButtonIcon,
 } from '@kbn/ui-framework/components';
 
-function NoVisualizationsPromptUi({ onCreateVis, intl }) {
+function NoVisualizationsPrompt({ onCreateVis }) {
   return (
     <KuiEmptyTablePromptPanel>
       <KuiEmptyTablePrompt
@@ -35,7 +36,7 @@ function NoVisualizationsPromptUi({ onCreateVis, intl }) {
           <KuiButton
             onClick={onCreateVis}
             buttonType="primary"
-            icon={<KuiButtonIcon type="create"/>}
+            icon={<KuiButtonIcon type="create" />}
           >
             <FormattedMessage
               id="kbn.visualize.listing.noVisualizations.createVisualizationButtonLabel"
@@ -43,8 +44,7 @@ function NoVisualizationsPromptUi({ onCreateVis, intl }) {
             />
           </KuiButton>
         }
-        message={intl.formatMessage({
-          id: 'kbn.visualize.listing.noVisualizationsText',
+        message={i18n.translate('kbn.visualize.listing.noVisualizationsText', {
           defaultMessage: `Looks like you don't have any visualizations. Let's create some!`,
         })}
       />
@@ -52,4 +52,4 @@ function NoVisualizationsPromptUi({ onCreateVis, intl }) {
   );
 }
 
-export const NoVisualizationsPrompt = injectI18n(NoVisualizationsPromptUi);
+export { NoVisualizationsPrompt };
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
index bb05ce34413db1..f9e3a1a90115a3 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
@@ -17,21 +17,27 @@
  * under the License.
  */
 
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
-import 'ui/directives/kbn_href';
-import { uiModules } from 'ui/modules';
-import { timefilter } from 'ui/timefilter';
-import chrome from 'ui/chrome';
-import { wrapInI18nContext } from 'ui/i18n';
-import { toastNotifications } from 'ui/notify';
 import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
-import { SavedObjectsClientProvider } from 'ui/saved_objects';
 import { VisualizeListingTable } from './visualize_listing_table';
 import { NewVisModal } from '../wizard/new_vis_modal';
 import { VisualizeConstants } from '../visualize_constants';
-import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy';
 import { i18n } from '@kbn/i18n';
 
+import { getServices } from '../kibana_services';
+
+const {
+  addBasePath,
+  chrome,
+  chromeLegacy,
+  SavedObjectRegistryProvider,
+  SavedObjectsClientProvider,
+  timefilter,
+  toastNotifications,
+  uiModules,
+  wrapInI18nContext,
+  visualizations,
+} = getServices();
+
 const app = uiModules.get('app/visualize', ['ngRoute', 'react']);
 app.directive('visualizeListingTable', reactDirective =>
   reactDirective(wrapInI18nContext(VisualizeListingTable))
@@ -55,11 +61,11 @@ export function VisualizeListingController($injector, createNewVis) {
 
   this.editItem = ({ editUrl }) => {
     // for visualizations the edit and view URLs are the same
-    window.location = chrome.addBasePath(editUrl);
+    window.location.href = addBasePath(editUrl);
   };
 
   this.getViewUrl = ({ editUrl }) => {
-    return chrome.addBasePath(editUrl);
+    return addBasePath(editUrl);
   };
 
   this.closeNewVisModal = () => {
@@ -101,7 +107,7 @@ export function VisualizeListingController($injector, createNewVis) {
       })
     )
       .then(() => {
-        chrome.untrackNavLinksForDeletedSavedObjects(selectedItems.map(item => item.id));
+        chromeLegacy.untrackNavLinksForDeletedSavedObjects(selectedItems.map(item => item.id));
       })
       .catch(error => {
         toastNotifications.addError(error, {
@@ -112,7 +118,7 @@ export function VisualizeListingController($injector, createNewVis) {
       });
   };
 
-  chrome.breadcrumbs.set([
+  chrome.setBreadcrumbs([
     {
       text: i18n.translate('kbn.visualize.visualizeListingBreadcrumbsTitle', {
         defaultMessage: 'Visualize',
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
index c909b6003516f4..fbd70a0d8c0f77 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
@@ -19,69 +19,53 @@
 
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { capabilities } from 'ui/capabilities';
 import { TableListView } from './../../table_list_view';
 
-import {
-  EuiIcon,
-  EuiBetaBadge,
-  EuiLink,
-  EuiButton,
-  EuiEmptyPrompt,
-} from '@elastic/eui';
+import { EuiIcon, EuiBetaBadge, EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 
-class VisualizeListingTableUi extends Component {
+import { getServices } from '../kibana_services';
 
+const { capabilities } = getServices();
+
+class VisualizeListingTable extends Component {
   constructor(props) {
     super(props);
   }
 
   render() {
-    const { intl } = this.props;
     return (
       <TableListView
         // we allow users to create visualizations even if they can't save them
         // for data exploration purposes
         createItem={this.props.createItem}
         findItems={this.props.findItems}
-        deleteItems={capabilities.get().visualize.delete ? this.props.deleteItems : null}
-        editItem={capabilities.get().visualize.save ? this.props.editItem : null}
+        deleteItems={capabilities.visualize.delete ? this.props.deleteItems : null}
+        editItem={capabilities.visualize.save ? this.props.editItem : null}
         tableColumns={this.getTableColumns()}
         listingLimit={this.props.listingLimit}
         selectable={item => item.canDelete}
         initialFilter={''}
         noItemsFragment={this.getNoItemsMessage()}
-        entityName={
-          intl.formatMessage({
-            id: 'kbn.visualize.listing.table.entityName',
-            defaultMessage: 'visualization',
-          })
-        }
-        entityNamePlural={
-          intl.formatMessage({
-            id: 'kbn.visualize.listing.table.entityNamePlural',
-            defaultMessage: 'visualizations',
-          })
-        }
-        tableListTitle={
-          intl.formatMessage({
-            id: 'kbn.visualize.listing.table.listTitle',
-            defaultMessage: 'Visualizations',
-          })
-        }
+        entityName={i18n.translate('kbn.visualize.listing.table.entityName', {
+          defaultMessage: 'visualization',
+        })}
+        entityNamePlural={i18n.translate('kbn.visualize.listing.table.entityNamePlural', {
+          defaultMessage: 'visualizations',
+        })}
+        tableListTitle={i18n.translate('kbn.visualize.listing.table.listTitle', {
+          defaultMessage: 'Visualizations',
+        })}
       />
     );
   }
 
   getTableColumns() {
-    const { intl } = this.props;
     const tableColumns = [
       {
         field: 'title',
-        name: intl.formatMessage({
-          id: 'kbn.visualize.listing.table.titleColumnName',
+        name: i18n.translate('kbn.visualize.listing.table.titleColumnName', {
           defaultMessage: 'Title',
         }),
         sortable: true,
@@ -92,35 +76,29 @@ class VisualizeListingTableUi extends Component {
           >
             {field}
           </EuiLink>
-        )
+        ),
       },
       {
         field: 'typeTitle',
-        name: intl.formatMessage({
-          id: 'kbn.visualize.listing.table.typeColumnName',
+        name: i18n.translate('kbn.visualize.listing.table.typeColumnName', {
           defaultMessage: 'Type',
         }),
         sortable: true,
-        render: (field, record) =>  (
+        render: (field, record) => (
           <span>
             {this.renderItemTypeIcon(record)}
             {record.typeTitle}
             {this.getBadge(record)}
           </span>
-        )
+        ),
       },
       {
         field: 'description',
-        name: intl.formatMessage({
-          id: 'kbn.dashboard.listing.table.descriptionColumnName',
+        name: i18n.translate('kbn.dashboard.listing.table.descriptionColumnName', {
           defaultMessage: 'Description',
         }),
         sortable: true,
-        render: (field, record) =>  (
-          <span>
-            {record.description}
-          </span>
-        )
+        render: (field, record) => <span>{record.description}</span>,
       },
     ];
 
@@ -184,19 +162,13 @@ class VisualizeListingTableUi extends Component {
         />
       </div>
     );
-
   }
 
   renderItemTypeIcon(item) {
     let icon;
     if (item.image) {
       icon = (
-        <img
-          className="visListingTable__typeImage"
-          aria-hidden="true"
-          alt=""
-          src={item.image}
-        />
+        <img className="visListingTable__typeImage" aria-hidden="true" alt="" src={item.image} />
       );
     } else {
       icon = (
@@ -214,38 +186,40 @@ class VisualizeListingTableUi extends Component {
 
   getBadge(item) {
     if (item.stage === 'beta') {
-      return (<EuiBetaBadge
-        className="visListingTable__betaIcon"
-        label="B"
-        title={i18n.translate('kbn.visualize.listing.betaTitle', {
-          defaultMessage: 'Beta',
-        })}
-        tooltipContent={
-          i18n.translate('kbn.visualize.listing.betaTooltip', {
-            defaultMessage: 'This visualization is in beta and is subject to change. The design and code is less mature than official GA ' +
-            'features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA ' +
-            'features',
-          })
-        }
-      />);
+      return (
+        <EuiBetaBadge
+          className="visListingTable__betaIcon"
+          label="B"
+          title={i18n.translate('kbn.visualize.listing.betaTitle', {
+            defaultMessage: 'Beta',
+          })}
+          tooltipContent={i18n.translate('kbn.visualize.listing.betaTooltip', {
+            defaultMessage:
+              'This visualization is in beta and is subject to change. The design and code is less mature than official GA ' +
+              'features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA ' +
+              'features',
+          })}
+        />
+      );
     } else if (item.stage === 'experimental') {
-      return (<EuiBetaBadge
-        className="visListingTable__experimentalIcon"
-        label="E"
-        title={i18n.translate('kbn.visualize.listing.experimentalTitle', {
-          defaultMessage: 'Experimental',
-        })}
-        tooltipContent={
-          i18n.translate('kbn.visualize.listing.experimentalTooltip', {
-            defaultMessage: 'This visualization might be changed or removed in a future release and is not subject to the support SLA.',
-          })
-        }
-      />);
+      return (
+        <EuiBetaBadge
+          className="visListingTable__experimentalIcon"
+          label="E"
+          title={i18n.translate('kbn.visualize.listing.experimentalTitle', {
+            defaultMessage: 'Experimental',
+          })}
+          tooltipContent={i18n.translate('kbn.visualize.listing.experimentalTooltip', {
+            defaultMessage:
+              'This visualization might be changed or removed in a future release and is not subject to the support SLA.',
+          })}
+        />
+      );
     }
   }
 }
 
-VisualizeListingTableUi.propTypes = {
+VisualizeListingTable.propTypes = {
   deleteItems: PropTypes.func.isRequired,
   findItems: PropTypes.func.isRequired,
   createItem: PropTypes.func.isRequired,
@@ -254,4 +228,4 @@ VisualizeListingTableUi.propTypes = {
   listingLimit: PropTypes.number.isRequired,
 };
 
-export const VisualizeListingTable = injectI18n(VisualizeListingTableUi);
+export { VisualizeListingTable };
diff --git a/src/legacy/core_plugins/kibana/public/visualize/types.d.ts b/src/legacy/core_plugins/kibana/public/visualize/types.d.ts
index b321e5563eb60b..c83f7f5a5da8b0 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/types.d.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/types.d.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { VisSavedObject } from 'ui/visualize/loader/types';
+import { VisSavedObject } from './kibana_services';
 
 export interface SavedVisualizations {
   urlFor: (id: string) => string;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap
index 341a839e9c776c..4aa614b68ea232 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap
+++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap
@@ -349,7 +349,11 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
             as="div"
             autoFocus={true}
             disabled={false}
-            lockProps={Object {}}
+            lockProps={
+              Object {
+                "style": undefined,
+              }
+            }
             noFocusGuards={false}
             persistentFocus={false}
             returnFocus={true}
@@ -1627,7 +1631,11 @@ exports[`NewVisModal should render as expected 1`] = `
             as="div"
             autoFocus={true}
             disabled={false}
-            lockProps={Object {}}
+            lockProps={
+              Object {
+                "style": undefined,
+              }
+            }
             noFocusGuards={false}
             persistentFocus={false}
             returnFocus={true}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.mocks.ts b/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.mocks.ts
deleted file mode 100644
index 04c99a1547ba93..00000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.mocks.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.
- */
-
-export const settingsGet = jest.fn();
-
-jest.doMock('ui/chrome', () => ({
-  getUiSettingsClient: () => ({
-    get: settingsGet,
-  }),
-}));
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx
index 6b2f51c3dcf2b1..99d9590e750fd0 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx
@@ -20,14 +20,33 @@
 import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
-import { settingsGet } from './new_vis_modal.test.mocks';
-
 import { NewVisModal } from './new_vis_modal';
-
-import { VisType } from 'ui/vis';
+import { VisType } from '../kibana_services';
 import { TypesStart } from '../../../../visualizations/public/np_ready/public/types';
 
+jest.mock('../kibana_services', () => {
+  const mock = {
+    addBasePath: jest.fn(path => `root${path}`),
+    uiSettings: { get: jest.fn() },
+    createUiStatsReporter: () => jest.fn(),
+  };
+
+  return {
+    getServices: () => mock,
+    VisType: {},
+    METRIC_TYPE: 'metricType',
+  };
+});
+
+import { getServices } from '../kibana_services';
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
 describe('NewVisModal', () => {
+  const settingsGet = getServices().uiSettings.get as jest.Mock;
+
   const defaultVisTypeParams = {
     hidden: false,
     visualization: class Controller {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx
index 31ddafb4ec719a..420f0e5198056c 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx
@@ -22,14 +22,15 @@ import React from 'react';
 import { EuiModal, EuiOverlayMask } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import chrome from 'ui/chrome';
-import { VisType } from 'ui/vis';
 import { VisualizeConstants } from '../visualize_constants';
-import { createUiStatsReporter, METRIC_TYPE } from '../../../../ui_metric/public';
 import { SearchSelection } from './search_selection';
 import { TypeSelection } from './type_selection';
 import { TypesStart, VisTypeAlias } from '../../../../visualizations/public/np_ready/public/types';
 
+import { getServices, METRIC_TYPE, VisType } from '../kibana_services';
+
+const { addBasePath, createUiStatsReporter, uiSettings } = getServices();
+
 interface TypeSelectionProps {
   isOpen: boolean;
   onClose: () => void;
@@ -54,7 +55,7 @@ class NewVisModal extends React.Component<TypeSelectionProps, TypeSelectionState
 
   constructor(props: TypeSelectionProps) {
     super(props);
-    this.isLabsEnabled = chrome.getUiSettingsClient().get('visualize:enableLabs');
+    this.isLabsEnabled = uiSettings.get('visualize:enableLabs');
 
     this.state = {
       showSearchVisModal: false,
@@ -123,7 +124,7 @@ class NewVisModal extends React.Component<TypeSelectionProps, TypeSelectionState
     this.trackUiMetric(METRIC_TYPE.CLICK, visType.name);
 
     if ('aliasUrl' in visType) {
-      window.location = chrome.addBasePath(visType.aliasUrl);
+      window.location.href = addBasePath(visType.aliasUrl);
 
       return;
     }
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx
index 34c95b43991e8e..88dbbb8de7df90 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx
@@ -22,10 +22,10 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 
-import { VisType } from 'ui/vis';
-
 import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
 
+import { VisType } from '../../kibana_services';
+
 interface SearchSelectionProps {
   onSearchSelected: (searchId: string, searchType: string) => void;
   visType: VisType;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx
index 7fd1df85cee067..382f475669f5dc 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx
@@ -20,14 +20,21 @@
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { NewVisHelp } from './new_vis_help';
-import chrome from 'ui/chrome';
 
-jest.doMock('ui/chrome');
+jest.mock('../../kibana_services', () => {
+  return {
+    getServices: () => ({
+      addBasePath: jest.fn((url: string) => `testbasepath${url}`),
+    }),
+  };
+});
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
 
 describe('NewVisHelp', () => {
   it('should render as expected', () => {
-    (chrome.addBasePath as unknown) = (url: string) => `testbasepath${url}`;
-
     expect(
       shallowWithIntl(
         <NewVisHelp
@@ -36,7 +43,7 @@ describe('NewVisHelp', () => {
               aliasUrl: '/my/fancy/new/thing',
               description: 'Some desc',
               highlighted: false,
-              icon: 'wahtever',
+              icon: 'whatever',
               name: 'whatever',
               promotion: {
                 buttonText: 'Do it now!',
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx
index 3877c01dcc6729..44c36f7d17d550 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx
@@ -20,9 +20,10 @@
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Fragment } from 'react';
 import { EuiText, EuiButton } from '@elastic/eui';
-import chrome from 'ui/chrome';
 import { VisTypeAliasListEntry } from './type_selection';
 
+import { getServices } from '../../kibana_services';
+
 interface Props {
   promotedTypes: VisTypeAliasListEntry[];
 }
@@ -42,7 +43,7 @@ export function NewVisHelp(props: Props) {
             <strong>{t.promotion!.description}</strong>
           </p>
           <EuiButton
-            href={chrome.addBasePath(t.aliasUrl)}
+            href={getServices().addBasePath(t.aliasUrl)}
             fill
             size="s"
             iconType="popout"
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
index 4963cfb8803a1a..245b4270c6aea1 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
@@ -35,7 +35,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { memoizeLast } from 'ui/utils/memoize';
-import { VisType } from 'ui/vis';
+import { VisType } from '../../kibana_services';
 import { VisTypeAlias } from '../../../../../visualizations/public';
 import { NewVisHelp } from './new_vis_help';
 import { VisHelpText } from './vis_help_text';
diff --git a/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.test.ts b/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.test.ts
index b5e112a489ce4a..8aedc6f7332dc7 100644
--- a/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.test.ts
+++ b/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.test.ts
@@ -19,7 +19,7 @@
 
 import { SavedObject, SavedObjectAttributes } from 'src/core/server';
 import { collectReferencesDeep } from './collect_references_deep';
-import { SavedObjectsClientMock } from '../../../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../../../core/server/mocks';
 
 const data: Array<SavedObject<SavedObjectAttributes>> = [
   {
@@ -102,7 +102,7 @@ const data: Array<SavedObject<SavedObjectAttributes>> = [
 ];
 
 test('collects dashboard and all dependencies', async () => {
-  const savedObjectClient = SavedObjectsClientMock.create();
+  const savedObjectClient = savedObjectsClientMock.create();
   savedObjectClient.bulkGet.mockImplementation(objects => {
     if (!objects) {
       throw new Error('Invalid test data');
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js b/src/legacy/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js
index 44fd6833c68f88..4ffe790bd51a18 100644
--- a/src/legacy/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js
+++ b/src/legacy/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js
@@ -28,16 +28,28 @@ export function registerValueSuggestions(server) {
     method: ['POST'],
     handler: async function (req) {
       const { index } = req.params;
-      const { field, query, boolFilter } = req.payload;
+      const { field: fieldName, query, boolFilter } = req.payload;
       const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
+
+      const savedObjectsClient = req.getSavedObjectsClient();
+      const savedObjectsResponse = await savedObjectsClient.find(
+        { type: 'index-pattern', fields: ['fields'], search: `"${index}"`, searchFields: ['title'] }
+      );
+      const indexPattern = savedObjectsResponse.total > 0 ? savedObjectsResponse.saved_objects[0] : null;
+      const fields = indexPattern ? JSON.parse(indexPattern.attributes.fields) : null;
+      const field = fields ? fields.find((field) => field.name === fieldName) : fieldName;
+
       const body = getBody(
         { field, query, boolFilter },
         autocompleteTerminateAfter,
         autocompleteTimeout
       );
+
       try {
         const response = await callWithRequest(req, 'search', { index, body });
-        const buckets = get(response, 'aggregations.suggestions.buckets') || [];
+        const buckets = get(response, 'aggregations.suggestions.buckets')
+          || get(response, 'aggregations.nestedSuggestions.suggestions.buckets')
+          || [];
         const suggestions = map(buckets, 'key');
         return suggestions;
       } catch (error) {
@@ -55,7 +67,7 @@ function getBody({ field, query, boolFilter = [] }, terminateAfter, timeout) {
   // the amount of information that needs to be transmitted to the coordinating node
   const shardSize = 10;
 
-  return {
+  const body = {
     size: 0,
     timeout: `${timeout}ms`,
     terminate_after: terminateAfter,
@@ -67,7 +79,7 @@ function getBody({ field, query, boolFilter = [] }, terminateAfter, timeout) {
     aggs: {
       suggestions: {
         terms: {
-          field,
+          field: field.name || field,
           include: `${getEscapedQuery(query)}.*`,
           execution_hint: executionHint,
           shard_size: shardSize,
@@ -75,6 +87,22 @@ function getBody({ field, query, boolFilter = [] }, terminateAfter, timeout) {
       },
     },
   };
+
+  if (field.subType && field.subType.nested) {
+    return {
+      ...body,
+      aggs: {
+        nestedSuggestions: {
+          nested: {
+            path: field.subType.nested.path,
+          },
+          aggs: body.aggs,
+        },
+      }
+    };
+  }
+
+  return body;
 }
 
 function getEscapedQuery(query = '') {
diff --git a/src/legacy/core_plugins/kibana/server/tutorials/cockroachdb_metrics/index.js b/src/legacy/core_plugins/kibana/server/tutorials/cockroachdb_metrics/index.js
new file mode 100644
index 00000000000000..e05be3bda145f7
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/server/tutorials/cockroachdb_metrics/index.js
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n }  from '@kbn/i18n';
+import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category';
+import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions';
+
+export function cockroachdbMetricsSpecProvider(server, context) {
+  const moduleName = 'cockroachdb';
+  return {
+    id: 'cockroachdbMetrics',
+    name: i18n.translate('kbn.server.tutorials.cockroachdbMetrics.nameTitle', {
+      defaultMessage: 'CockroachDB metrics',
+    }),
+    category: TUTORIAL_CATEGORY.METRICS,
+    shortDescription: i18n.translate('kbn.server.tutorials.cockroachdbMetrics.shortDescription', {
+      defaultMessage: 'Fetch monitoring metrics from the CockroachDB server.',
+    }),
+    longDescription: i18n.translate('kbn.server.tutorials.cockroachdbMetrics.longDescription', {
+      defaultMessage: 'The `cockroachdb` Metricbeat module fetches monitoring metrics from CockroachDB. \
+[Learn more]({learnMoreLink}).',
+      values: {
+        learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-cockroachdb.html',
+      },
+    }),
+    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/cockroachdb.svg',
+    artifacts: {
+      dashboards: [
+        {
+          id: 'e3ba0c30-9766-11e9-9eea-6f554992ec1f',
+          linkLabel: i18n.translate('kbn.server.tutorials.cockroachdbMetrics.artifacts.dashboards.linkLabel', {
+            defaultMessage: 'CockroachDB metrics dashboard',
+          }),
+          isOverview: true
+        }
+      ],
+      exportedFields: {
+        documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-cockroachdb.html'
+      }
+    },
+    completionTimeMinutes: 10,
+    previewImagePath: '/plugins/kibana/home/tutorial_resources/cockroachdb_metrics/screenshot.png',
+    onPrem: onPremInstructions(moduleName, null, null, null, context),
+    elasticCloud: cloudInstructions(moduleName),
+    onPremElasticCloud: onPremCloudInstructions(moduleName)
+  };
+}
diff --git a/src/legacy/core_plugins/kibana/server/tutorials/consul_metrics/index.js b/src/legacy/core_plugins/kibana/server/tutorials/consul_metrics/index.js
new file mode 100644
index 00000000000000..8823fe5ee5067e
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/server/tutorials/consul_metrics/index.js
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n }  from '@kbn/i18n';
+import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category';
+import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions';
+
+export function consulMetricsSpecProvider(server, context) {
+  const moduleName = 'consul';
+  return {
+    id: 'consulMetrics',
+    name: i18n.translate('kbn.server.tutorials.consulMetrics.nameTitle', {
+      defaultMessage: 'Consul metrics',
+    }),
+    category: TUTORIAL_CATEGORY.METRICS,
+    shortDescription: i18n.translate('kbn.server.tutorials.consulMetrics.shortDescription', {
+      defaultMessage: 'Fetch monitoring metrics from the Consul server.',
+    }),
+    longDescription: i18n.translate('kbn.server.tutorials.consulMetrics.longDescription', {
+      defaultMessage: 'The `consul` Metricbeat module fetches monitoring metrics from Consul. \
+[Learn more]({learnMoreLink}).',
+      values: {
+        learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-consul.html',
+      },
+    }),
+    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/consul.svg',
+    artifacts: {
+      dashboards: [
+        {
+          id: '496910f0-b952-11e9-a579-f5c0a5d81340',
+          linkLabel: i18n.translate('kbn.server.tutorials.consulMetrics.artifacts.dashboards.linkLabel', {
+            defaultMessage: 'Consul metrics dashboard',
+          }),
+          isOverview: true
+        }
+      ],
+      exportedFields: {
+        documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-consul.html'
+      }
+    },
+    completionTimeMinutes: 10,
+    previewImagePath: '/plugins/kibana/home/tutorial_resources/consul_metrics/screenshot.png',
+    onPrem: onPremInstructions(moduleName, null, null, null, context),
+    elasticCloud: cloudInstructions(moduleName),
+    onPremElasticCloud: onPremCloudInstructions(moduleName)
+  };
+}
diff --git a/src/legacy/core_plugins/kibana/server/tutorials/coredns_logs/index.js b/src/legacy/core_plugins/kibana/server/tutorials/coredns_logs/index.js
index 69f31c623e5efe..ca308ac969e493 100644
--- a/src/legacy/core_plugins/kibana/server/tutorials/coredns_logs/index.js
+++ b/src/legacy/core_plugins/kibana/server/tutorials/coredns_logs/index.js
@@ -46,7 +46,7 @@ export function corednsLogsSpecProvider(server, context) {
         learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-coredns.html',
       },
     }),
-    //TODO: euiIconType: 'logoCoredns',
+    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/coredns.svg',
     artifacts: {
       dashboards: [
         {
diff --git a/src/legacy/core_plugins/kibana/server/tutorials/register.js b/src/legacy/core_plugins/kibana/server/tutorials/register.js
index 0299d00856c641..a95baad4ccb657 100644
--- a/src/legacy/core_plugins/kibana/server/tutorials/register.js
+++ b/src/legacy/core_plugins/kibana/server/tutorials/register.js
@@ -77,6 +77,8 @@ import { ciscoLogsSpecProvider } from './cisco_logs';
 import { envoyproxyLogsSpecProvider } from './envoyproxy_logs';
 import { couchdbMetricsSpecProvider } from './couchdb_metrics';
 import { emsBoundariesSpecProvider } from './ems';
+import { consulMetricsSpecProvider } from './consul_metrics';
+import { cockroachdbMetricsSpecProvider } from './cockroachdb_metrics';
 
 export function registerTutorials(server) {
   server.registerTutorial(systemLogsSpecProvider);
@@ -139,4 +141,6 @@ export function registerTutorials(server) {
   server.registerTutorial(envoyproxyLogsSpecProvider);
   server.registerTutorial(couchdbMetricsSpecProvider);
   server.registerTutorial(emsBoundariesSpecProvider);
+  server.registerTutorial(consulMetricsSpecProvider);
+  server.registerTutorial(cockroachdbMetricsSpecProvider);
 }
diff --git a/src/legacy/core_plugins/kibana_react/public/index.scss b/src/legacy/core_plugins/kibana_react/public/index.scss
index 14922ca8ee8ebe..14b4687c459e11 100644
--- a/src/legacy/core_plugins/kibana_react/public/index.scss
+++ b/src/legacy/core_plugins/kibana_react/public/index.scss
@@ -1,5 +1,3 @@
 @import 'src/legacy/ui/public/styles/styling_constants';
 
-@import './top_nav_menu/index';
-
 @import './markdown/index';
diff --git a/src/legacy/core_plugins/kibana_react/public/index.ts b/src/legacy/core_plugins/kibana_react/public/index.ts
index 2497671ca98d26..7e68b6c3886ffc 100644
--- a/src/legacy/core_plugins/kibana_react/public/index.ts
+++ b/src/legacy/core_plugins/kibana_react/public/index.ts
@@ -23,6 +23,4 @@
 // of the ExpressionExectorService
 
 /** @public types */
-export { TopNavMenu, TopNavMenuData } from './top_nav_menu';
-
 export { Markdown, MarkdownSimple } from './markdown';
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/index.ts b/src/legacy/core_plugins/kibana_react/public/top_nav_menu/index.ts
deleted file mode 100644
index b45baaf0e47112..00000000000000
--- a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { TopNavMenu } from './top_nav_menu';
-export { TopNavMenuData } from './top_nav_menu_data';
diff --git a/src/legacy/core_plugins/navigation/index.ts b/src/legacy/core_plugins/navigation/index.ts
new file mode 100644
index 00000000000000..32d5f040760c66
--- /dev/null
+++ b/src/legacy/core_plugins/navigation/index.ts
@@ -0,0 +1,42 @@
+/*
+ * 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 NavigationPlugin(kibana: any) {
+  const config: Legacy.PluginSpecOptions = {
+    id: 'navigation',
+    require: [],
+    publicDir: resolve(__dirname, 'public'),
+    config: (Joi: any) => {
+      return Joi.object({
+        enabled: Joi.boolean().default(true),
+      }).default();
+    },
+    init: (server: Legacy.Server) => ({}),
+    uiExports: {
+      injectDefaultVars: () => ({}),
+      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
+    },
+  };
+
+  return new kibana.Plugin(config);
+}
diff --git a/src/legacy/core_plugins/navigation/package.json b/src/legacy/core_plugins/navigation/package.json
new file mode 100644
index 00000000000000..8fddb8e6aeced3
--- /dev/null
+++ b/src/legacy/core_plugins/navigation/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "navigation",
+  "version": "kibana"
+}
diff --git a/src/legacy/core_plugins/navigation/public/index.scss b/src/legacy/core_plugins/navigation/public/index.scss
new file mode 100644
index 00000000000000..4c969b1a37e8c9
--- /dev/null
+++ b/src/legacy/core_plugins/navigation/public/index.scss
@@ -0,0 +1,3 @@
+@import 'src/legacy/ui/public/styles/styling_constants';
+
+@import './top_nav_menu/index';
diff --git a/src/legacy/core_plugins/navigation/public/index.ts b/src/legacy/core_plugins/navigation/public/index.ts
new file mode 100644
index 00000000000000..439405cc90b57a
--- /dev/null
+++ b/src/legacy/core_plugins/navigation/public/index.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// TODO these are imports from the old plugin world.
+// Once the new platform is ready, they can get removed
+// and handled by the platform itself in the setup method
+// of the ExpressionExectorService
+
+/** @public types */
+export { TopNavMenu, TopNavMenuData } from './top_nav_menu';
+export { NavigationSetup, NavigationStart } from './plugin';
+
+import { NavigationPlugin as Plugin } from './plugin';
+export function plugin() {
+  return new Plugin();
+}
diff --git a/src/legacy/core_plugins/navigation/public/legacy.ts b/src/legacy/core_plugins/navigation/public/legacy.ts
new file mode 100644
index 00000000000000..1783514e6fbdcd
--- /dev/null
+++ b/src/legacy/core_plugins/navigation/public/legacy.ts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { npSetup, npStart } from 'ui/new_platform';
+import { start as dataShim } from '../../data/public/legacy';
+import { plugin } from '.';
+
+const navPlugin = plugin();
+
+export const setup = navPlugin.setup(npSetup.core);
+
+export const start = navPlugin.start(npStart.core, {
+  data: dataShim,
+});
diff --git a/src/legacy/core_plugins/navigation/public/plugin.ts b/src/legacy/core_plugins/navigation/public/plugin.ts
new file mode 100644
index 00000000000000..65a0902dec9861
--- /dev/null
+++ b/src/legacy/core_plugins/navigation/public/plugin.ts
@@ -0,0 +1,74 @@
+/*
+ * 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';
+import { TopNavMenuExtensionsRegistry, TopNavMenuExtensionsRegistrySetup } from './top_nav_menu';
+import { createTopNav } from './top_nav_menu/create_top_nav_menu';
+import { TopNavMenuProps } from './top_nav_menu/top_nav_menu';
+import { DataStart } from '../../data/public';
+
+/**
+ * Interface for this plugin's returned `setup` contract.
+ *
+ * @public
+ */
+export interface NavigationSetup {
+  registerMenuItem: TopNavMenuExtensionsRegistrySetup['register'];
+}
+
+/**
+ * Interface for this plugin's returned `start` contract.
+ *
+ * @public
+ */
+export interface NavigationStart {
+  ui: {
+    TopNavMenu: React.ComponentType<TopNavMenuProps>;
+  };
+}
+
+export interface NavigationPluginStartDependencies {
+  data: DataStart;
+}
+
+export class NavigationPlugin implements Plugin<NavigationSetup, NavigationStart> {
+  private readonly topNavMenuExtensionsRegistry: TopNavMenuExtensionsRegistry = new TopNavMenuExtensionsRegistry();
+
+  public setup(core: CoreSetup): NavigationSetup {
+    return {
+      registerMenuItem: this.topNavMenuExtensionsRegistry.register.bind(
+        this.topNavMenuExtensionsRegistry
+      ),
+    };
+  }
+
+  public start(core: CoreStart, { data }: NavigationPluginStartDependencies): NavigationStart {
+    const extensions = this.topNavMenuExtensionsRegistry.getAll();
+
+    return {
+      ui: {
+        TopNavMenu: createTopNav(data, extensions),
+      },
+    };
+  }
+
+  public stop() {
+    this.topNavMenuExtensionsRegistry.clear();
+  }
+}
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/_index.scss b/src/legacy/core_plugins/navigation/public/top_nav_menu/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana_react/public/top_nav_menu/_index.scss
rename to src/legacy/core_plugins/navigation/public/top_nav_menu/_index.scss
diff --git a/src/legacy/core_plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx b/src/legacy/core_plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
new file mode 100644
index 00000000000000..fa0e5fcac74072
--- /dev/null
+++ b/src/legacy/core_plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { TopNavMenuProps, TopNavMenu } from './top_nav_menu';
+import { TopNavMenuData } from './top_nav_menu_data';
+import { DataStart } from '../../../../core_plugins/data/public';
+
+export function createTopNav(data: DataStart, extraConfig: TopNavMenuData[]) {
+  return (props: TopNavMenuProps) => {
+    const config = (props.config || []).concat(extraConfig);
+
+    return <TopNavMenu {...props} data={data} config={config} />;
+  };
+}
diff --git a/src/legacy/core_plugins/navigation/public/top_nav_menu/index.ts b/src/legacy/core_plugins/navigation/public/top_nav_menu/index.ts
new file mode 100644
index 00000000000000..dd139bbd6410fd
--- /dev/null
+++ b/src/legacy/core_plugins/navigation/public/top_nav_menu/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 { TopNavMenu } from './top_nav_menu';
+export { TopNavMenuData } from './top_nav_menu_data';
+export * from './top_nav_menu_extensions_registry';
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
similarity index 80%
rename from src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx
rename to src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
index 21c5cef4ae9254..9077de89103277 100644
--- a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx
+++ b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
@@ -22,26 +22,20 @@ import { TopNavMenu } from './top_nav_menu';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
-import { timefilterServiceMock } from '../../../../core_plugins/data/public/timefilter/timefilter_service.mock';
-const timefilterSetupMock = timefilterServiceMock.createSetupContract();
-
 jest.mock('ui/new_platform');
 
-jest.mock('../../../../../../src/legacy/core_plugins/data/public/legacy', () => ({
-  start: {
-    ui: {
-      SearchBar: () => {},
-    },
+const mockTimeHistory = {
+  add: () => {},
+  get: () => {
+    return [];
   },
-  setup: {},
-}));
+};
 
-jest.mock('../../../../core_plugins/data/public', () => {
-  return {
-    SearchBar: () => <div className="searchBar"></div>,
-    SearchBarProps: {},
-  };
-});
+const dataShim = {
+  ui: {
+    SearchBar: () => <div className="searchBar" />,
+  },
+};
 
 describe('TopNavMenu', () => {
   const TOP_NAV_ITEM_SELECTOR = 'TopNavMenuItem';
@@ -84,7 +78,12 @@ describe('TopNavMenu', () => {
 
   it('Should render search bar', () => {
     const component = shallowWithIntl(
-      <TopNavMenu appName={'test'} showSearchBar={true} timeHistory={timefilterSetupMock.history} />
+      <TopNavMenu
+        appName={'test'}
+        showSearchBar={true}
+        timeHistory={mockTimeHistory}
+        data={dataShim as any}
+      />
     );
 
     expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(0);
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
similarity index 89%
rename from src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx
rename to src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
index aec91c2aa6bc64..14599e76470c0a 100644
--- a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx
+++ b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
@@ -24,13 +24,13 @@ import { I18nProvider } from '@kbn/i18n/react';
 
 import { TopNavMenuData } from './top_nav_menu_data';
 import { TopNavMenuItem } from './top_nav_menu_item';
-import { SearchBarProps } from '../../../../core_plugins/data/public';
-import { start as data } from '../../../data/public/legacy';
+import { SearchBarProps, DataStart } from '../../../../core_plugins/data/public';
 
-type Props = Partial<SearchBarProps> & {
+export type TopNavMenuProps = Partial<SearchBarProps> & {
   appName: string;
   config?: TopNavMenuData[];
   showSearchBar?: boolean;
+  data?: DataStart;
 };
 
 /*
@@ -42,8 +42,7 @@ type Props = Partial<SearchBarProps> & {
  *
  **/
 
-export function TopNavMenu(props: Props) {
-  const { SearchBar } = data.ui;
+export function TopNavMenu(props: TopNavMenuProps) {
   const { config, showSearchBar, ...searchBarProps } = props;
   function renderItems() {
     if (!config) return;
@@ -58,7 +57,8 @@ export function TopNavMenu(props: Props) {
 
   function renderSearchBar() {
     // Validate presense of all required fields
-    if (!showSearchBar) return;
+    if (!showSearchBar || !props.data) return;
+    const { SearchBar } = props.data.ui;
     return <SearchBar {...searchBarProps} />;
   }
 
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu_data.tsx b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu_data.tsx
rename to src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
diff --git a/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu_extensions_registry.ts b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu_extensions_registry.ts
new file mode 100644
index 00000000000000..c3eab3cce18e6b
--- /dev/null
+++ b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu_extensions_registry.ts
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { TopNavMenuData } from './top_nav_menu_data';
+
+export class TopNavMenuExtensionsRegistry {
+  private menuItems: TopNavMenuData[];
+
+  constructor() {
+    this.menuItems = [];
+  }
+
+  /** @public **/
+  // Items registered into this registry will be appended to any TopNavMenu rendered in any application.
+  public register(menuItem: TopNavMenuData) {
+    this.menuItems.push(menuItem);
+  }
+
+  /** @internal **/
+  public getAll() {
+    return this.menuItems;
+  }
+
+  /** @internal **/
+  public clear() {
+    this.menuItems.length = 0;
+  }
+}
+
+export type TopNavMenuExtensionsRegistrySetup = Pick<TopNavMenuExtensionsRegistry, 'register'>;
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu_item.test.tsx b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu_item.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu_item.test.tsx
rename to src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu_item.test.tsx
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu_item.tsx b/src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu_item.tsx
rename to src/legacy/core_plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
diff --git a/src/legacy/core_plugins/state_session_storage_redirect/public/index.js b/src/legacy/core_plugins/state_session_storage_redirect/public/index.js
index eeed13edbe9f55..f64237000ae416 100644
--- a/src/legacy/core_plugins/state_session_storage_redirect/public/index.js
+++ b/src/legacy/core_plugins/state_session_storage_redirect/public/index.js
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import 'ui/autoload/styles';
 import chrome from 'ui/chrome';
 import { hashUrl } from 'ui/state_management/state_hashing';
 import uiRoutes from 'ui/routes';
diff --git a/src/legacy/core_plugins/status_page/public/status_page.js b/src/legacy/core_plugins/status_page/public/status_page.js
index b545a261c8739b..4467c31fca22c4 100644
--- a/src/legacy/core_plugins/status_page/public/status_page.js
+++ b/src/legacy/core_plugins/status_page/public/status_page.js
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import 'ui/autoload/styles';
 import 'ui/i18n';
 import chrome from 'ui/chrome';
 import { npStart } from 'ui/new_platform';
diff --git a/src/legacy/core_plugins/telemetry/index.ts b/src/legacy/core_plugins/telemetry/index.ts
index 3271373449eb3a..4b6566415f3e18 100644
--- a/src/legacy/core_plugins/telemetry/index.ts
+++ b/src/legacy/core_plugins/telemetry/index.ts
@@ -48,6 +48,9 @@ const telemetry = (kibana: any) => {
         // `config` is used internally and not intended to be set
         config: Joi.string().default(Joi.ref('$defaultConfigPath')),
         banner: Joi.boolean().default(true),
+        lastVersionChecked: Joi.string()
+          .allow('')
+          .default(''),
         url: Joi.when('$dev', {
           is: true,
           then: Joi.string().default(
@@ -77,7 +80,8 @@ const telemetry = (kibana: any) => {
         },
       },
       async replaceInjectedVars(originalInjectedVars: any, request: any) {
-        const telemetryOptedIn = await getTelemetryOptIn(request);
+        const currentKibanaVersion = getCurrentKibanaVersion(request.server);
+        const telemetryOptedIn = await getTelemetryOptIn({ request, currentKibanaVersion });
 
         return {
           ...originalInjectedVars,
@@ -97,7 +101,13 @@ const telemetry = (kibana: any) => {
       mappings,
     },
     init(server: Server) {
-      const initializerContext = {} as PluginInitializerContext;
+      const initializerContext = {
+        env: {
+          packageInfo: {
+            version: getCurrentKibanaVersion(server),
+          },
+        },
+      } as PluginInitializerContext;
 
       const coreSetup = ({
         http: { server },
@@ -116,3 +126,7 @@ const telemetry = (kibana: any) => {
 
 // eslint-disable-next-line import/no-default-export
 export default telemetry;
+
+function getCurrentKibanaVersion(server: Server): string {
+  return server.config().get('pkg.version');
+}
diff --git a/src/legacy/core_plugins/telemetry/mappings.json b/src/legacy/core_plugins/telemetry/mappings.json
index d83f7f59676306..1245ef88f58929 100644
--- a/src/legacy/core_plugins/telemetry/mappings.json
+++ b/src/legacy/core_plugins/telemetry/mappings.json
@@ -3,6 +3,9 @@
     "properties": {
       "enabled": {
         "type": "boolean"
+      },
+      "lastVersionChecked": {
+        "type": "keyword"
       }
     }
   }
diff --git a/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.test.ts b/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.test.ts
new file mode 100644
index 00000000000000..67ad3aaae427d9
--- /dev/null
+++ b/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.test.ts
@@ -0,0 +1,214 @@
+/*
+ * 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 { getTelemetryOptIn } from './get_telemetry_opt_in';
+
+describe('get_telemetry_opt_in', () => {
+  it('returns false when request path is not /app*', async () => {
+    const params = getCallGetTelemetryOptInParams({
+      requestPath: '/foo/bar',
+    });
+
+    const result = await callGetTelemetryOptIn(params);
+
+    expect(result).toBe(false);
+  });
+
+  it('returns null when saved object not found', async () => {
+    const params = getCallGetTelemetryOptInParams({
+      savedObjectNotFound: true,
+    });
+
+    const result = await callGetTelemetryOptIn(params);
+
+    expect(result).toBe(null);
+  });
+
+  it('returns false when saved object forbidden', async () => {
+    const params = getCallGetTelemetryOptInParams({
+      savedObjectForbidden: true,
+    });
+
+    const result = await callGetTelemetryOptIn(params);
+
+    expect(result).toBe(false);
+  });
+
+  it('throws an error on unexpected saved object error', async () => {
+    const params = getCallGetTelemetryOptInParams({
+      savedObjectOtherError: true,
+    });
+
+    let threw = false;
+    try {
+      await callGetTelemetryOptIn(params);
+    } catch (err) {
+      threw = true;
+      expect(err.message).toBe(SavedObjectOtherErrorMessage);
+    }
+
+    expect(threw).toBe(true);
+  });
+
+  it('returns null if enabled is null or undefined', async () => {
+    for (const enabled of [null, undefined]) {
+      const params = getCallGetTelemetryOptInParams({
+        enabled,
+      });
+
+      const result = await callGetTelemetryOptIn(params);
+
+      expect(result).toBe(null);
+    }
+  });
+
+  it('returns true when enabled is true', async () => {
+    const params = getCallGetTelemetryOptInParams({
+      enabled: true,
+    });
+
+    const result = await callGetTelemetryOptIn(params);
+
+    expect(result).toBe(true);
+  });
+
+  // build a table of tests with version checks, with results for enabled false
+  type VersionCheckTable = Array<Partial<CallGetTelemetryOptInParams>>;
+
+  const EnabledFalseVersionChecks: VersionCheckTable = [
+    { lastVersionChecked: '8.0.0', currentKibanaVersion: '8.0.0', result: false },
+    { lastVersionChecked: '8.0.0', currentKibanaVersion: '8.0.1', result: false },
+    { lastVersionChecked: '8.0.1', currentKibanaVersion: '8.0.0', result: false },
+    { lastVersionChecked: '8.0.0', currentKibanaVersion: '8.1.0', result: null },
+    { lastVersionChecked: '8.0.0', currentKibanaVersion: '9.0.0', result: null },
+    { lastVersionChecked: '8.0.0', currentKibanaVersion: '7.0.0', result: false },
+    { lastVersionChecked: '8.1.0', currentKibanaVersion: '8.0.0', result: false },
+    { lastVersionChecked: '8.0.0-X', currentKibanaVersion: '8.0.0', result: false },
+    { lastVersionChecked: '8.0.0', currentKibanaVersion: '8.0.0-X', result: false },
+    { lastVersionChecked: null, currentKibanaVersion: '8.0.0', result: null },
+    { lastVersionChecked: undefined, currentKibanaVersion: '8.0.0', result: null },
+    { lastVersionChecked: 5, currentKibanaVersion: '8.0.0', result: null },
+    { lastVersionChecked: '8.0.0', currentKibanaVersion: 'beta', result: null },
+    { lastVersionChecked: 'beta', currentKibanaVersion: '8.0.0', result: null },
+    { lastVersionChecked: 'beta', currentKibanaVersion: 'beta', result: false },
+    { lastVersionChecked: 'BETA', currentKibanaVersion: 'beta', result: null },
+  ].map(el => ({ ...el, enabled: false }));
+
+  // build a table of tests with version checks, with results for enabled true/null/undefined
+  const EnabledTrueVersionChecks: VersionCheckTable = EnabledFalseVersionChecks.map(el => ({
+    ...el,
+    enabled: true,
+    result: true,
+  }));
+
+  const EnabledNullVersionChecks: VersionCheckTable = EnabledFalseVersionChecks.map(el => ({
+    ...el,
+    enabled: null,
+    result: null,
+  }));
+
+  const EnabledUndefinedVersionChecks: VersionCheckTable = EnabledFalseVersionChecks.map(el => ({
+    ...el,
+    enabled: undefined,
+    result: null,
+  }));
+
+  const AllVersionChecks = [
+    ...EnabledFalseVersionChecks,
+    ...EnabledTrueVersionChecks,
+    ...EnabledNullVersionChecks,
+    ...EnabledUndefinedVersionChecks,
+  ];
+
+  test.each(AllVersionChecks)(
+    'returns expected result for version check with %j',
+    async (params: Partial<CallGetTelemetryOptInParams>) => {
+      const result = await callGetTelemetryOptIn({ ...DefaultParams, ...params });
+      expect(result).toBe(params.result);
+    }
+  );
+});
+
+interface CallGetTelemetryOptInParams {
+  requestPath: string;
+  savedObjectNotFound: boolean;
+  savedObjectForbidden: boolean;
+  savedObjectOtherError: boolean;
+  enabled: boolean | null | undefined;
+  lastVersionChecked?: any; // should be a string, but test with non-strings
+  currentKibanaVersion: string;
+  result?: boolean | null;
+}
+
+const DefaultParams = {
+  requestPath: '/app/something',
+  savedObjectNotFound: false,
+  savedObjectForbidden: false,
+  savedObjectOtherError: false,
+  enabled: true,
+  lastVersionChecked: '8.0.0',
+  currentKibanaVersion: '8.0.0',
+};
+
+function getCallGetTelemetryOptInParams(
+  overrides: Partial<CallGetTelemetryOptInParams>
+): CallGetTelemetryOptInParams {
+  return { ...DefaultParams, ...overrides };
+}
+
+async function callGetTelemetryOptIn(params: CallGetTelemetryOptInParams): Promise<boolean | null> {
+  const { currentKibanaVersion } = params;
+  const request = getMockRequest(params);
+  return await getTelemetryOptIn({ request, currentKibanaVersion });
+}
+
+function getMockRequest(params: CallGetTelemetryOptInParams): any {
+  return {
+    path: params.requestPath,
+    getSavedObjectsClient() {
+      return getMockSavedObjectsClient(params);
+    },
+  };
+}
+
+const SavedObjectNotFoundMessage = 'savedObjectNotFound';
+const SavedObjectForbiddenMessage = 'savedObjectForbidden';
+const SavedObjectOtherErrorMessage = 'savedObjectOtherError';
+
+function getMockSavedObjectsClient(params: CallGetTelemetryOptInParams) {
+  return {
+    async get(type: string, id: string) {
+      if (params.savedObjectNotFound) throw new Error(SavedObjectNotFoundMessage);
+      if (params.savedObjectForbidden) throw new Error(SavedObjectForbiddenMessage);
+      if (params.savedObjectOtherError) throw new Error(SavedObjectOtherErrorMessage);
+
+      const enabled = params.enabled;
+      const lastVersionChecked = params.lastVersionChecked;
+      return { attributes: { enabled, lastVersionChecked } };
+    },
+    errors: {
+      isNotFoundError(error: any) {
+        return error.message === SavedObjectNotFoundMessage;
+      },
+      isForbiddenError(error: any) {
+        return error.message === SavedObjectForbiddenMessage;
+      },
+    },
+  };
+}
diff --git a/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.ts b/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.ts
index 9b365d6dd7ae51..c8bd4a4b6dfbd4 100644
--- a/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.ts
+++ b/src/legacy/core_plugins/telemetry/server/get_telemetry_opt_in.ts
@@ -17,7 +17,21 @@
  * under the License.
  */
 
-export async function getTelemetryOptIn(request: any) {
+import semver from 'semver';
+
+import { SavedObjectAttributes } from './routes/opt_in';
+
+interface GetTelemetryOptIn {
+  request: any;
+  currentKibanaVersion: string;
+}
+
+// Returns whether telemetry has been opt'ed into or not.
+// Returns null not set, meaning Kibana should prompt in the UI.
+export async function getTelemetryOptIn({
+  request,
+  currentKibanaVersion,
+}: GetTelemetryOptIn): Promise<boolean | null> {
   const isRequestingApplication = request.path.startsWith('/app');
 
   // Prevent interstitial screens (such as the space selector) from prompting for telemetry
@@ -27,9 +41,9 @@ export async function getTelemetryOptIn(request: any) {
 
   const savedObjectsClient = request.getSavedObjectsClient();
 
+  let savedObject;
   try {
-    const { attributes } = await savedObjectsClient.get('telemetry', 'telemetry');
-    return attributes.enabled;
+    savedObject = await savedObjectsClient.get('telemetry', 'telemetry');
   } catch (error) {
     if (savedObjectsClient.errors.isNotFoundError(error)) {
       return null;
@@ -43,4 +57,50 @@ export async function getTelemetryOptIn(request: any) {
 
     throw error;
   }
+
+  const { attributes }: { attributes: SavedObjectAttributes } = savedObject;
+
+  // if enabled is already null, return null
+  if (attributes.enabled == null) return null;
+
+  const enabled = !!attributes.enabled;
+
+  // if enabled is true, return it
+  if (enabled === true) return enabled;
+
+  // Additional check if they've already opted out (enabled: false):
+  // - if the Kibana version has changed by at least a minor version,
+  //   return null to re-prompt.
+
+  const lastKibanaVersion = attributes.lastVersionChecked;
+
+  // if the last kibana version isn't set, or is somehow not a string, return null
+  if (typeof lastKibanaVersion !== 'string') return null;
+
+  // if version hasn't changed, just return enabled value
+  if (lastKibanaVersion === currentKibanaVersion) return enabled;
+
+  const lastSemver = parseSemver(lastKibanaVersion);
+  const currentSemver = parseSemver(currentKibanaVersion);
+
+  // if either version is invalid, return null
+  if (lastSemver == null || currentSemver == null) return null;
+
+  // actual major/minor version comparison, for cases when to return null
+  if (currentSemver.major > lastSemver.major) return null;
+  if (currentSemver.major === lastSemver.major) {
+    if (currentSemver.minor > lastSemver.minor) return null;
+  }
+
+  // current version X.Y is not greater than last version X.Y, return enabled
+  return enabled;
+}
+
+function parseSemver(version: string): semver.SemVer | null {
+  // semver functions both return nulls AND throw exceptions: "it depends!"
+  try {
+    return semver.parse(version);
+  } catch (err) {
+    return null;
+  }
 }
diff --git a/src/legacy/core_plugins/telemetry/server/index.ts b/src/legacy/core_plugins/telemetry/server/index.ts
index b8ae5fc231fba6..aa13fab9a5f819 100644
--- a/src/legacy/core_plugins/telemetry/server/index.ts
+++ b/src/legacy/core_plugins/telemetry/server/index.ts
@@ -25,5 +25,5 @@ export { getTelemetryOptIn } from './get_telemetry_opt_in';
 export { telemetryCollectionManager } from './collection_manager';
 
 export const telemetryPlugin = (initializerContext: PluginInitializerContext) =>
-  new TelemetryPlugin();
+  new TelemetryPlugin(initializerContext);
 export { constants };
diff --git a/src/legacy/core_plugins/telemetry/server/plugin.ts b/src/legacy/core_plugins/telemetry/server/plugin.ts
index 70de51b2abe995..a5f0f1234799a4 100644
--- a/src/legacy/core_plugins/telemetry/server/plugin.ts
+++ b/src/legacy/core_plugins/telemetry/server/plugin.ts
@@ -17,14 +17,21 @@
  * under the License.
  */
 
-import { CoreSetup } from 'src/core/server';
+import { CoreSetup, PluginInitializerContext } from 'src/core/server';
 import { registerRoutes } from './routes';
 import { telemetryCollectionManager } from './collection_manager';
 import { getStats } from './telemetry_collection';
 
 export class TelemetryPlugin {
+  private readonly currentKibanaVersion: string;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.currentKibanaVersion = initializerContext.env.packageInfo.version;
+  }
+
   public setup(core: CoreSetup) {
+    const currentKibanaVersion = this.currentKibanaVersion;
     telemetryCollectionManager.setStatsGetter(getStats, 'local');
-    registerRoutes(core);
+    registerRoutes({ core, currentKibanaVersion });
   }
 }
diff --git a/src/legacy/core_plugins/telemetry/server/routes/index.ts b/src/legacy/core_plugins/telemetry/server/routes/index.ts
index 12ba541d699f9f..2eb6bf95b4f45e 100644
--- a/src/legacy/core_plugins/telemetry/server/routes/index.ts
+++ b/src/legacy/core_plugins/telemetry/server/routes/index.ts
@@ -21,7 +21,12 @@ import { CoreSetup } from 'src/core/server';
 import { registerOptInRoutes } from './opt_in';
 import { registerTelemetryDataRoutes } from './telemetry_stats';
 
-export function registerRoutes(core: CoreSetup) {
-  registerOptInRoutes(core);
+interface RegisterRoutesParams {
+  core: CoreSetup;
+  currentKibanaVersion: string;
+}
+
+export function registerRoutes({ core, currentKibanaVersion }: RegisterRoutesParams) {
+  registerOptInRoutes({ core, currentKibanaVersion });
   registerTelemetryDataRoutes(core);
 }
diff --git a/src/legacy/core_plugins/telemetry/server/routes/opt_in.ts b/src/legacy/core_plugins/telemetry/server/routes/opt_in.ts
index aabc0259f08fc2..3a7194890b5700 100644
--- a/src/legacy/core_plugins/telemetry/server/routes/opt_in.ts
+++ b/src/legacy/core_plugins/telemetry/server/routes/opt_in.ts
@@ -21,7 +21,17 @@ import Joi from 'joi';
 import { boomify } from 'boom';
 import { CoreSetup } from 'src/core/server';
 
-export function registerOptInRoutes(core: CoreSetup) {
+interface RegisterOptInRoutesParams {
+  core: CoreSetup;
+  currentKibanaVersion: string;
+}
+
+export interface SavedObjectAttributes {
+  enabled?: boolean;
+  lastVersionChecked: string;
+}
+
+export function registerOptInRoutes({ core, currentKibanaVersion }: RegisterOptInRoutesParams) {
   const { server } = core.http as any;
 
   server.route({
@@ -36,17 +46,16 @@ export function registerOptInRoutes(core: CoreSetup) {
     },
     handler: async (req: any, h: any) => {
       const savedObjectsClient = req.getSavedObjectsClient();
+      const savedObject: SavedObjectAttributes = {
+        enabled: req.payload.enabled,
+        lastVersionChecked: currentKibanaVersion,
+      };
+      const options = {
+        id: 'telemetry',
+        overwrite: true,
+      };
       try {
-        await savedObjectsClient.create(
-          'telemetry',
-          {
-            enabled: req.payload.enabled,
-          },
-          {
-            id: 'telemetry',
-            overwrite: true,
-          }
-        );
+        await savedObjectsClient.create('telemetry', savedObject, options);
       } catch (err) {
         return boomify(err);
       }
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
index 5b8bb075775108..ca798b6bf2470e 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
@@ -21,9 +21,8 @@ import { get } from 'lodash';
 import { GeohashLayer } from './geohash_layer';
 import { BaseMapsVisualizationProvider } from './base_maps_visualization';
 import { TileMapTooltipFormatterProvider } from './editors/_tooltip_formatter';
+import { npStart } from 'ui/new_platform';
 import { getFormat } from '../../../ui/public/visualize/loader/pipeline_helpers/utilities';
-import { start as data } from '../../../core_plugins/data/public/legacy';
-const filterManager = data.filter.filterManager;
 
 export const createTileMapVisualization = ({ serviceSettings, $injector }) => {
   const BaseMapsVisualization = new BaseMapsVisualizationProvider(serviceSettings);
@@ -189,6 +188,7 @@ export const createTileMapVisualization = ({ serviceSettings, $injector }) => {
       filter[filterName] = { ignore_unmapped: true };
       filter[filterName][field] = filterData;
 
+      const { filterManager } = npStart.plugins.data.query;
       filterManager.addFilters([filter]);
 
       this.vis.updateState();
diff --git a/src/legacy/core_plugins/timelion/public/legacy.ts b/src/legacy/core_plugins/timelion/public/legacy.ts
index 77cd94279c879a..d989a68d40eeb4 100644
--- a/src/legacy/core_plugins/timelion/public/legacy.ts
+++ b/src/legacy/core_plugins/timelion/public/legacy.ts
@@ -21,13 +21,12 @@ import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
 import { plugin } from '.';
 import { setup as visualizations } from '../../visualizations/public/np_ready/public/legacy';
-import { setup as data } from '../../data/public/legacy';
 import { TimelionPluginSetupDependencies } from './plugin';
 import { LegacyDependenciesPlugin } from './shim';
 
 const setupPlugins: Readonly<TimelionPluginSetupDependencies> = {
   visualizations,
-  data,
+  data: npSetup.plugins.data,
   expressions: npSetup.plugins.expressions,
 
   // Temporary solution
diff --git a/src/legacy/core_plugins/timelion/public/plugin.ts b/src/legacy/core_plugins/timelion/public/plugin.ts
index 6447e3bbc5f516..6291948f750775 100644
--- a/src/legacy/core_plugins/timelion/public/plugin.ts
+++ b/src/legacy/core_plugins/timelion/public/plugin.ts
@@ -25,12 +25,11 @@ import {
   HttpSetup,
 } from 'kibana/public';
 import { Plugin as ExpressionsPlugin } from 'src/plugins/expressions/public';
+import { DataPublicPluginSetup, TimefilterContract } from 'src/plugins/data/public';
 import { VisualizationsSetup } from '../../visualizations/public/np_ready/public';
 import { getTimelionVisualizationConfig } from './timelion_vis_fn';
 import { getTimelionVisualization } from './vis';
 import { getTimeChart } from './panels/timechart/timechart';
-import { DataSetup } from '../../data/public';
-import { TimefilterSetup } from '../../data/public/timefilter';
 import { Panel } from './panels/panel';
 import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
 
@@ -39,14 +38,14 @@ export interface TimelionVisualizationDependencies extends LegacyDependenciesPlu
   uiSettings: UiSettingsClientContract;
   http: HttpSetup;
   timelionPanels: Map<string, Panel>;
-  timefilter: TimefilterSetup;
+  timefilter: TimefilterContract;
 }
 
 /** @internal */
 export interface TimelionPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPlugin['setup']>;
   visualizations: VisualizationsSetup;
-  data: DataSetup;
+  data: DataPublicPluginSetup;
 
   // Temporary solution
   __LEGACY: LegacyDependenciesPlugin;
@@ -69,8 +68,8 @@ export class TimelionPlugin implements Plugin<Promise<void>, void> {
     const dependencies: TimelionVisualizationDependencies = {
       uiSettings: core.uiSettings,
       http: core.http,
-      timefilter: data.timefilter,
       timelionPanels,
+      timefilter: data.query.timefilter.timefilter,
       ...(await __LEGACY.setup(core, timelionPanels)),
     };
 
diff --git a/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts b/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts
index eb4fb3f397149f..6239e4027c392a 100644
--- a/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts
+++ b/src/legacy/core_plugins/timelion/public/vis/timelion_request_handler.ts
@@ -18,12 +18,12 @@
  */
 
 // @ts-ignore
-import { buildEsQuery, getEsQueryConfig, Filter } from '@kbn/es-query';
+import { buildEsQuery, getEsQueryConfig } from '@kbn/es-query';
 // @ts-ignore
 import { timezoneProvider } from 'ui/vis/lib/timezone';
 import { KIBANA_CONTEXT_NAME } from 'src/plugins/expressions/public';
 import { Query } from 'src/legacy/core_plugins/data/public';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange, esFilters } from 'src/plugins/data/public';
 import { VisParams } from 'ui/vis';
 import { i18n } from '@kbn/i18n';
 import { TimelionVisualizationDependencies } from '../plugin';
@@ -60,7 +60,7 @@ export function getTimelionRequestHandler(dependencies: TimelionVisualizationDep
     visParams,
   }: {
     timeRange: TimeRange;
-    filters: Filter[];
+    filters: esFilters.Filter[];
     query: Query;
     visParams: VisParams;
     forceFetch?: boolean;
@@ -78,7 +78,7 @@ export function getTimelionRequestHandler(dependencies: TimelionVisualizationDep
     const esQueryConfigs = getEsQueryConfig(uiSettings);
 
     // parse the time range client side to make sure it behaves like other charts
-    const timeRangeBounds = timefilter.timefilter.calculateBounds(timeRange);
+    const timeRangeBounds = timefilter.calculateBounds(timeRange);
 
     try {
       return await http.post('../api/timelion/run', {
diff --git a/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts b/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts
index 63adccb3e02b04..7310ee5b5f1720 100644
--- a/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts
+++ b/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts
@@ -47,14 +47,20 @@ interface AnalyicsReporterConfig {
 }
 
 export function createAnalyticsReporter(config: AnalyicsReporterConfig) {
-  const { localStorage, basePath, $http, debug } = config;
+  const { localStorage, basePath, debug } = config;
 
   return createReporter({
     debug,
     storage: localStorage,
     async http(report) {
       const url = `${basePath}/api/telemetry/report`;
-      await $http.post(url, { report });
+      await fetch(url, {
+        method: 'POST',
+        headers: {
+          'kbn-xsrf': 'true',
+        },
+        body: JSON.stringify({ report }),
+      });
     },
   });
 }
diff --git a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts
index 89f74ef4b53e99..3b2e503a01e38a 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts
@@ -171,7 +171,7 @@ export const createMetricVisFn = (): ExpressionFunction<
       throw new Error('colorRange must be provided when using percentage');
     }
 
-    const fontSize = Number.parseInt(args.font.spec.fontSize, 10);
+    const fontSize = Number.parseInt(args.font.spec.fontSize || '', 10);
 
     return {
       type: 'render',
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 3497a35f5c99d3..842d3aa6c4ad75 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
@@ -32,10 +32,10 @@ import { fetchFields } from '../lib/fetch_fields';
 import { extractIndexPatterns } from '../../common/extract_index_patterns';
 
 import { npStart } from 'ui/new_platform';
-import { Storage } from 'ui/storage';
+
 import { CoreStartContextProvider } from '../contexts/query_input_bar_context';
 import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public';
-const localStorage = new Storage(window.localStorage);
+import { Storage } from '../../../../../plugins/kibana_utils/public';
 import { timefilter } from 'ui/timefilter';
 
 const VIS_STATE_DEBOUNCE_DELAY = 200;
@@ -46,6 +46,7 @@ export class VisEditor extends Component {
     super(props);
     const { vis } = props;
     this.appState = vis.API.getAppState();
+    this.localStorage = new Storage(window.localStorage);
     this.state = {
       model: props.visParams,
       dirty: false,
@@ -63,7 +64,7 @@ export class VisEditor extends Component {
       appName: APP_NAME,
       uiSettings: npStart.core.uiSettings,
       savedObjectsClient: npStart.core.savedObjects.client,
-      store: localStorage,
+      store: this.localStorage,
     };
   }
 
@@ -169,7 +170,7 @@ export class VisEditor extends Component {
         <KibanaContextProvider
           services={{
             appName: APP_NAME,
-            store: localStorage,
+            storage: this.localStorage,
             data: npStart.plugins.data,
             ...npStart.core,
           }}
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 122ede2d2a6582..f873cf9c178f8b 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
@@ -18,9 +18,8 @@
  */
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { get, isEqual } from 'lodash';
+import { get } from 'lodash';
 import { keyCodes, EuiFlexGroup, EuiFlexItem, EuiButton, EuiText, EuiSwitch } from '@elastic/eui';
-import { getVisualizeLoader } from 'ui/visualize/loader/visualize_loader';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
 import {
   getInterval,
@@ -30,6 +29,7 @@ import {
   AUTO_INTERVAL,
 } from './lib/get_interval';
 import { PANEL_TYPES } from '../../common/panel_types';
+import { start as embeddables } from '../../../embeddable_api/public/np_ready/public/legacy';
 
 const MIN_CHART_HEIGHT = 300;
 
@@ -65,23 +65,21 @@ class VisEditorVisualizationUI extends Component {
   };
 
   async _loadVisualization() {
-    const loader = await getVisualizeLoader();
-
     if (!this._visEl.current) {
       // In case the visualize loader isn't done before the component is unmounted.
       return;
     }
 
-    const { uiState, timeRange, appState, savedObj, onDataChange } = this.props;
+    const { timeRange, appState, savedObj, onDataChange } = this.props;
 
-    this._handler = loader.embedVisualizationWithSavedObject(this._visEl.current, savedObj, {
-      listenOnChange: false,
-      uiState,
-      timeRange,
-      appState,
+    this._handler = await embeddables.getEmbeddableFactory('visualization').createFromObject(savedObj, {
+      vis: {},
+      timeRange: timeRange,
+      filters: appState.filters || [],
     });
+    this._handler.render(this._visEl.current);
 
-    this._subscription = this._handler.data$.subscribe(data => {
+    this._subscription = this._handler.handler.data$.subscribe(data => {
       this.setPanelInterval(data.visData);
       onDataChange(data);
     });
@@ -152,10 +150,12 @@ class VisEditorVisualizationUI extends Component {
     this._loadVisualization();
   }
 
-  componentDidUpdate(prevProps) {
-    if (this._handler && !isEqual(this.props.timeRange, prevProps.timeRange)) {
-      this._handler.update({
+  componentDidUpdate() {
+    if (this._handler) {
+      this._handler.updateInput({
         timeRange: this.props.timeRange,
+        filters: this.props.filters || [],
+        query: this.props.query,
       });
     }
   }
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.test.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.test.js
deleted file mode 100644
index e60626f8fbf0a8..00000000000000
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.test.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-jest.mock('ui/visualize/loader/visualize_loader', () => ({}));
-
-jest.mock('ui/new_platform');
-
-import React from 'react';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { VisEditorVisualization } from './vis_editor_visualization';
-
-describe('getVisualizeLoader', () => {
-  let updateStub;
-
-  beforeEach(() => {
-    updateStub = jest.fn();
-    const handlerMock = {
-      update: updateStub,
-      data$: {
-        subscribe: () => {},
-      },
-    };
-    const loaderMock = {
-      embedVisualizationWithSavedObject: () => handlerMock,
-    };
-    require('ui/visualize/loader/visualize_loader').getVisualizeLoader = async () => loaderMock;
-  });
-
-  it('should not call _handler.update until getVisualizeLoader returns _handler', async () => {
-    const wrapper = mountWithIntl(<VisEditorVisualization />);
-
-    // Set prop to force DOM change and componentDidUpdate to be triggered
-    wrapper.setProps({
-      timeRange: {
-        from: '2019-03-20T20:35:37.637Z',
-        to: '2019-03-23T18:40:16.486Z',
-      },
-    });
-
-    expect(updateStub).not.toHaveBeenCalled();
-
-    // Ensure all promises resolve
-    await new Promise(resolve => process.nextTick(resolve));
-
-    // Set prop to force DOM change and componentDidUpdate to be triggered
-    wrapper.setProps({
-      timeRange: {
-        from: 'now/d',
-        to: 'now/d',
-      },
-    });
-
-    expect(updateStub).toHaveBeenCalled();
-  });
-});
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/contexts/query_input_bar_context.ts b/src/legacy/core_plugins/vis_type_timeseries/public/contexts/query_input_bar_context.ts
index 19519571f1ab02..925b483905d01c 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/contexts/query_input_bar_context.ts
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/contexts/query_input_bar_context.ts
@@ -18,14 +18,14 @@
  */
 
 import React from 'react';
-import { Storage } from 'ui/storage';
 import { UiSettingsClientContract, SavedObjectsClientContract } from 'src/core/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 
 export interface ICoreStartContext {
   appName: string;
   uiSettings: UiSettingsClientContract;
   savedObjectsClient: SavedObjectsClientContract;
-  store: Storage;
+  storage: IStorageWrapper;
 }
 
 export const CoreStartContext = React.createContext<ICoreStartContext | null>(null);
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js
index 0766e6a48765f9..54e90ab7dd9b7f 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexPatternsService } from '../../../../server/index_patterns/service';
+import { IndexPatternsFetcher } from '../../../../../plugins/data/server/';
 export const getIndexPatternService = {
   assign: 'indexPatternsService',
   method(req) {
@@ -25,6 +25,6 @@ export const getIndexPatternService = {
     const callDataCluster = (...args) => {
       return dataCluster.callWithRequest(req, ...args);
     };
-    return new IndexPatternsService(callDataCluster);
+    return new IndexPatternsFetcher(callDataCluster);
   },
 };
diff --git a/src/legacy/core_plugins/vis_type_vega/public/vega_request_handler.ts b/src/legacy/core_plugins/vis_type_vega/public/vega_request_handler.ts
index 22a71bd999d54e..b4c32f37eb90c1 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/vega_request_handler.ts
+++ b/src/legacy/core_plugins/vis_type_vega/public/vega_request_handler.ts
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Filter } from '@kbn/es-query';
+
 import { timefilter } from 'ui/timefilter';
 import { TimeRange } from 'src/plugins/data/public';
 import { Query } from 'src/legacy/core_plugins/data/public';
-
-// @ts-ignore
 import { buildEsQuery, getEsQueryConfig } from '@kbn/es-query';
+
+import { esFilters } from '../../../../plugins/data/public';
+
 // @ts-ignore
 import { VegaParser } from './data_model/vega_parser';
 // @ts-ignore
@@ -35,7 +36,7 @@ import { VisParams } from './vega_fn';
 
 interface VegaRequestHandlerParams {
   query: Query;
-  filters: Filter;
+  filters: esFilters.Filter;
   timeRange: TimeRange;
   visParams: VisParams;
 }
diff --git a/src/legacy/core_plugins/vis_type_vega/public/vega_view/vega_base_view.js b/src/legacy/core_plugins/vis_type_vega/public/vega_view/vega_base_view.js
index ec898080c581e8..5abb99e9bf716a 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/vega_view/vega_base_view.js
+++ b/src/legacy/core_plugins/vis_type_vega/public/vega_view/vega_base_view.js
@@ -27,7 +27,7 @@ import { Utils } from '../data_model/utils';
 import { VISUALIZATION_COLORS } from '@elastic/eui';
 import { i18n }  from '@kbn/i18n';
 import { TooltipHandler } from './vega_tooltip';
-import { buildQueryFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../plugins/data/public';
 
 import { getEnableExternalUrls } from '../helpers/vega_config_provider';
 
@@ -263,7 +263,7 @@ export class VegaBaseView {
    */
   async addFilterHandler(query, index) {
     const indexId = await this._findIndex(index);
-    const filter = buildQueryFilter(query, indexId);
+    const filter = esFilters.buildQueryFilter(query, indexId);
     this._queryfilter.addFilters(filter);
   }
 
@@ -274,7 +274,7 @@ export class VegaBaseView {
   async removeFilterHandler(query, index) {
     const $injector = await chrome.dangerouslyGetActiveInjector();
     const indexId = await this._findIndex(index);
-    const filter = buildQueryFilter(query, indexId);
+    const filter = esFilters.buildQueryFilter(query, indexId);
 
     // This is a workaround for the https://github.com/elastic/kibana/issues/18863
     // Once fixed, replace with a direct call (no await is needed because its not async)
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 1dc73d6f9ff20c..7aa60bb0cc4696 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
@@ -23,6 +23,7 @@ import { VegaView } from './vega_view/vega_view';
 import { VegaMapView } from './vega_view/vega_map_view';
 import { timefilter } from 'ui/timefilter';
 import { start as data } from '../../../core_plugins/data/public/legacy';
+import { npStart } from 'ui/new_platform';
 
 import { findIndexPatternByTitle } from '../../data/public/index_patterns';
 
@@ -99,11 +100,12 @@ export const createVegaVisualization = ({ serviceSettings }) => class VegaVisual
         this._vegaView = null;
       }
 
+      const { filterManager } = npStart.plugins.data.query;
       const vegaViewParams = {
         parentEl: this._el,
         vegaParser,
         serviceSettings,
-        queryfilter: data.filter.filterManager,
+        queryfilter: filterManager,
         timefilter: timefilter,
         findIndex: this.findIndex.bind(this),
       };
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 5dc0e452eea56c..5d7ab12a677cfd 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
@@ -42,6 +42,7 @@ const createSetupContract = (): VisualizationsSetup => ({
   types: {
     registerVisualization: jest.fn(),
     registerAlias: jest.fn(),
+    hideTypes: jest.fn(),
   },
 });
 
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/types/types_service.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/types/types_service.ts
index 1556c3716de1ae..e0d26e34050489 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/types/types_service.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/types/types_service.ts
@@ -48,16 +48,30 @@ export interface VisType {
  */
 export class TypesService {
   private types: Record<string, VisType> = {};
+  private unregisteredHiddenTypes: string[] = [];
   public setup() {
     return {
       registerVisualization: (registerFn: () => VisType) => {
         const visDefinition = registerFn();
+        if (this.unregisteredHiddenTypes.includes(visDefinition.name)) {
+          visDefinition.hidden = true;
+        }
+
         if (this.types[visDefinition.name]) {
           throw new Error('type already exists!');
         }
         this.types[visDefinition.name] = visDefinition;
       },
       registerAlias: visTypeAliasRegistry.add,
+      hideTypes: (typeNames: string[]) => {
+        typeNames.forEach((name: string) => {
+          if (this.types[name]) {
+            this.types[name].hidden = true;
+          } else {
+            this.unregisteredHiddenTypes.push(name);
+          }
+        });
+      },
     };
   }
 
diff --git a/src/legacy/server/http/integration_tests/default_route_provider.test.ts b/src/legacy/server/http/integration_tests/default_route_provider.test.ts
index d74be851a35355..4898cb2b67852e 100644
--- a/src/legacy/server/http/integration_tests/default_route_provider.test.ts
+++ b/src/legacy/server/http/integration_tests/default_route_provider.test.ts
@@ -44,7 +44,7 @@ describe('default route provider', () => {
           }
           throw Error(`unsupported ui setting: ${key}`);
         },
-        getDefaults: () => {
+        getRegistered: () => {
           return {
             defaultRoute: {
               value: '/app/kibana',
diff --git a/src/legacy/server/http/setup_default_route_provider.ts b/src/legacy/server/http/setup_default_route_provider.ts
index f627cf30a3cffd..0e7bcf1f56f6fc 100644
--- a/src/legacy/server/http/setup_default_route_provider.ts
+++ b/src/legacy/server/http/setup_default_route_provider.ts
@@ -40,7 +40,7 @@ export function setupDefaultRouteProvider(server: Legacy.Server) {
         `Ignoring configured default route of '${defaultRoute}', as it is malformed.`
       );
 
-      const fallbackRoute = uiSettings.getDefaults().defaultRoute.value;
+      const fallbackRoute = uiSettings.getRegistered().defaultRoute.value;
 
       const qualifiedFallbackRoute = `${request.getBasePath()}${fallbackRoute}`;
       return qualifiedFallbackRoute;
diff --git a/src/legacy/server/index_patterns/index.ts b/src/legacy/server/index_patterns/index.ts
index eea8a4a998e2dc..75d0038cf9023e 100644
--- a/src/legacy/server/index_patterns/index.ts
+++ b/src/legacy/server/index_patterns/index.ts
@@ -17,7 +17,9 @@
  * under the License.
  */
 
-// @ts-ignore no types
 export { indexPatternsMixin } from './mixin';
-export { IndexPatternsService, FieldDescriptor } from './service';
+export {
+  IndexPatternsFetcher,
+  FieldDescriptor,
+} from '../../../plugins/data/server/index_patterns/fetcher';
 export { IndexPatternsServiceFactory } from './mixin';
diff --git a/src/legacy/server/index_patterns/mixin.ts b/src/legacy/server/index_patterns/mixin.ts
index a7180d6a2d70ec..6b04c3842007bd 100644
--- a/src/legacy/server/index_patterns/mixin.ts
+++ b/src/legacy/server/index_patterns/mixin.ts
@@ -17,11 +17,10 @@
  * under the License.
  */
 
-import { IndexPatternsService } from './service';
+import { IndexPatternsFetcher } from '../../../plugins/data/server';
 import KbnServer from '../kbn_server';
 import { APICaller, CallAPIOptions } from '../../../core/server';
 import { Legacy } from '../../../../kibana';
-import { registerRoutes } from './routes';
 
 export function indexPatternsMixin(kbnServer: KbnServer, server: Legacy.Server) {
   /**
@@ -31,7 +30,7 @@ export function indexPatternsMixin(kbnServer: KbnServer, server: Legacy.Server)
    *  @type {IndexPatternsService}
    */
   server.decorate('server', 'indexPatternsServiceFactory', ({ callCluster }) => {
-    return new IndexPatternsService(callCluster);
+    return new IndexPatternsFetcher(callCluster);
   });
 
   /**
@@ -50,10 +49,8 @@ export function indexPatternsMixin(kbnServer: KbnServer, server: Legacy.Server)
     ) => callWithRequest(request, endpoint, params, options);
     return server.indexPatternsServiceFactory({ callCluster });
   });
-
-  registerRoutes(kbnServer.newPlatform.setup.core);
 }
 
 export type IndexPatternsServiceFactory = (args: {
   callCluster: (endpoint: string, clientParams: any, options: any) => Promise<any>;
-}) => IndexPatternsService;
+}) => IndexPatternsFetcher;
diff --git a/src/legacy/server/index_patterns/routes.ts b/src/legacy/server/index_patterns/routes.ts
deleted file mode 100644
index fb78b94e0f77f4..00000000000000
--- a/src/legacy/server/index_patterns/routes.ts
+++ /dev/null
@@ -1,138 +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 { first } from 'rxjs/operators';
-import { schema } from '@kbn/config-schema';
-import {
-  CoreSetup,
-  KibanaRequest,
-  RequestHandlerContext,
-  APICaller,
-  CallAPIOptions,
-} from '../../../core/server';
-import { IndexPatternsService } from './service';
-
-export function registerRoutes(core: CoreSetup) {
-  const getIndexPatternsService = async (request: KibanaRequest): Promise<IndexPatternsService> => {
-    const client = await core.elasticsearch.dataClient$.pipe(first()).toPromise();
-    const callCluster: APICaller = (
-      endpoint: string,
-      params?: Record<string, any>,
-      options?: CallAPIOptions
-    ) => client.asScoped(request).callAsCurrentUser(endpoint, params, options);
-    return new Promise(resolve => resolve(new IndexPatternsService(callCluster)));
-  };
-
-  const parseMetaFields = (metaFields: string | string[]) => {
-    let parsedFields: string[] = [];
-    if (typeof metaFields === 'string') {
-      parsedFields = JSON.parse(metaFields);
-    } else {
-      parsedFields = metaFields;
-    }
-    return parsedFields;
-  };
-
-  const router = core.http.createRouter();
-  router.get(
-    {
-      path: '/api/index_patterns/_fields_for_wildcard',
-      validate: {
-        query: schema.object({
-          pattern: schema.string(),
-          meta_fields: schema.oneOf([schema.string(), schema.arrayOf(schema.string())], {
-            defaultValue: [],
-          }),
-        }),
-      },
-    },
-    async (context: RequestHandlerContext, request: any, response: any) => {
-      const indexPatterns = await getIndexPatternsService(request);
-      const { pattern, meta_fields: metaFields } = request.query;
-
-      let parsedFields: string[] = [];
-      try {
-        parsedFields = parseMetaFields(metaFields);
-      } catch (error) {
-        return response.badRequest();
-      }
-
-      try {
-        const fields = await indexPatterns.getFieldsForWildcard({
-          pattern,
-          metaFields: parsedFields,
-        });
-
-        return response.ok({
-          body: { fields },
-          headers: {
-            'content-type': 'application/json',
-          },
-        });
-      } catch (error) {
-        return response.notFound();
-      }
-    }
-  );
-
-  router.get(
-    {
-      path: '/api/index_patterns/_fields_for_time_pattern',
-      validate: {
-        query: schema.object({
-          pattern: schema.string(),
-          interval: schema.maybe(schema.string()),
-          look_back: schema.number({ min: 1 }),
-          meta_fields: schema.oneOf([schema.string(), schema.arrayOf(schema.string())], {
-            defaultValue: [],
-          }),
-        }),
-      },
-    },
-    async (context: RequestHandlerContext, request: any, response: any) => {
-      const indexPatterns = await getIndexPatternsService(request);
-      const { pattern, interval, look_back: lookBack, meta_fields: metaFields } = request.query;
-
-      let parsedFields: string[] = [];
-      try {
-        parsedFields = parseMetaFields(metaFields);
-      } catch (error) {
-        return response.badRequest();
-      }
-
-      try {
-        const fields = await indexPatterns.getFieldsForTimePattern({
-          pattern,
-          interval: interval ? interval : '',
-          lookBack,
-          metaFields: parsedFields,
-        });
-
-        return response.ok({
-          body: { fields },
-          headers: {
-            'content-type': 'application/json',
-          },
-        });
-      } catch (error) {
-        return response.notFound();
-      }
-    }
-  );
-}
diff --git a/src/legacy/server/index_patterns/service/index.ts b/src/legacy/server/index_patterns/service/index.ts
deleted file mode 100644
index 496c4ba7b5b6f1..00000000000000
--- a/src/legacy/server/index_patterns/service/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from './index_patterns_service';
diff --git a/src/legacy/server/index_patterns/service/index_patterns_service.ts b/src/legacy/server/index_patterns/service/index_patterns_service.ts
deleted file mode 100644
index 6c32d99ad83f97..00000000000000
--- a/src/legacy/server/index_patterns/service/index_patterns_service.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 { APICaller } from 'src/core/server';
-
-import { getFieldCapabilities, resolveTimePattern, createNoMatchingIndicesError } from './lib';
-
-export interface FieldDescriptor {
-  aggregatable: boolean;
-  name: string;
-  readFromDocValues: boolean;
-  searchable: boolean;
-  type: string;
-  esTypes: string[];
-  parent?: string;
-  subType?: string;
-}
-
-export class IndexPatternsService {
-  private _callDataCluster: APICaller;
-
-  constructor(callDataCluster: APICaller) {
-    this._callDataCluster = callDataCluster;
-  }
-
-  /**
-   *  Get a list of field objects for an index pattern that may contain wildcards
-   *
-   *  @param {Object} [options]
-   *  @property {String} options.pattern The index pattern
-   *  @property {Number} options.metaFields The list of underscore prefixed fields that should
-   *                                        be left in the field list (all others are removed).
-   *  @return {Promise<Array<Fields>>}
-   */
-  async getFieldsForWildcard(options: {
-    pattern: string | string[];
-    metaFields?: string[];
-  }): Promise<FieldDescriptor[]> {
-    const { pattern, metaFields } = options;
-    return await getFieldCapabilities(this._callDataCluster, pattern, metaFields);
-  }
-
-  /**
-   *  Get a list of field objects for a time pattern
-   *
-   *  @param {Object} [options={}]
-   *  @property {String} options.pattern The moment compatible time pattern
-   *  @property {Number} options.lookBack The number of indices we will pull mappings for
-   *  @property {Number} options.metaFields The list of underscore prefixed fields that should
-   *                                        be left in the field list (all others are removed).
-   *  @return {Promise<Array<Fields>>}
-   */
-  async getFieldsForTimePattern(options: {
-    pattern: string;
-    metaFields: string[];
-    lookBack: number;
-    interval: string;
-  }) {
-    const { pattern, lookBack, metaFields } = options;
-    const { matches } = await resolveTimePattern(this._callDataCluster, pattern);
-    const indices = matches.slice(0, lookBack);
-    if (indices.length === 0) {
-      throw createNoMatchingIndicesError(pattern);
-    }
-    return await getFieldCapabilities(this._callDataCluster, indices, metaFields);
-  }
-}
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/index.ts b/src/legacy/server/index_patterns/service/lib/field_capabilities/index.ts
deleted file mode 100644
index 8ac42255577841..00000000000000
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { getFieldCapabilities } from './field_capabilities';
-export { FieldCapsResponse } from './field_caps_response';
diff --git a/src/legacy/server/index_patterns/service/lib/index.ts b/src/legacy/server/index_patterns/service/lib/index.ts
deleted file mode 100644
index cd239b3753aa31..00000000000000
--- a/src/legacy/server/index_patterns/service/lib/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { getFieldCapabilities } from './field_capabilities';
-// @ts-ignore
-export { resolveTimePattern } from './resolve_time_pattern';
-// @ts-ignore
-export { createNoMatchingIndicesError } from './errors';
diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
index e7f2f4c85435ff..9cc4e30d4252dd 100644
--- a/src/legacy/server/kbn_server.d.ts
+++ b/src/legacy/server/kbn_server.d.ts
@@ -150,5 +150,5 @@ export default class KbnServer {
 export { Server, Request, ResponseToolkit } from 'hapi';
 
 // Re-export commonly accessed api types.
-export { IndexPatternsService } from './index_patterns';
+export { IndexPatternsFetcher as IndexPatternsService } from './index_patterns';
 export { SavedObjectsLegacyService, SavedObjectsClient } from 'src/core/server';
diff --git a/src/legacy/server/sample_data/data_sets/ecommerce/saved_objects.js b/src/legacy/server/sample_data/data_sets/ecommerce/saved_objects.js
index 87a1f1c9ece478..da44cc618eedd3 100644
--- a/src/legacy/server/sample_data/data_sets/ecommerce/saved_objects.js
+++ b/src/legacy/server/sample_data/data_sets/ecommerce/saved_objects.js
@@ -269,7 +269,7 @@ export const getSavedObjects = () => [
     "attributes": {
       "title": "kibana_sample_data_ecommerce",
       "timeFieldName": "order_date",
-      "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\":\"category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"category\",\"subType\":\"multi\"},{\"name\":\"currency\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_birth_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_first_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_first_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"customer_first_name\",\"subType\":\"multi\"},{\"name\":\"customer_full_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_full_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"customer_full_name\",\"subType\":\"multi\"},{\"name\":\"customer_gender\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_last_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_last_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"customer_last_name\",\"subType\":\"multi\"},{\"name\":\"customer_phone\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"day_of_week\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"day_of_week_i\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"manufacturer\",\"subType\":\"multi\"},{\"name\":\"order_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"order_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products._id\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products._id.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"products._id\",\"subType\":\"multi\"},{\"name\":\"products.base_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.base_unit_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"products.category\",\"subType\":\"multi\"},{\"name\":\"products.created_on\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.discount_percentage\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"products.manufacturer\",\"subType\":\"multi\"},{\"name\":\"products.min_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.product_id\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.product_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.product_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"products.product_name\",\"subType\":\"multi\"},{\"name\":\"products.quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.tax_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.taxful_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.taxless_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.unit_discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"taxful_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"taxless_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total_quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total_unique_products\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+      "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\":\"category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"category\"}}},{\"name\":\"currency\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_birth_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_first_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_first_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"customer_first_name\"}}},{\"name\":\"customer_full_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_full_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"customer_full_name\"}}},{\"name\":\"customer_gender\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"customer_last_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_last_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"customer_last_name\"}}},{\"name\":\"customer_phone\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"day_of_week\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"day_of_week_i\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"manufacturer\"}}},{\"name\":\"order_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"order_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products._id\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products._id.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"products._id\"}}},{\"name\":\"products.base_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.base_unit_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"products.category\"}}},{\"name\":\"products.created_on\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.discount_percentage\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"products.manufacturer\"}}},{\"name\":\"products.min_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.product_id\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.product_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"products.product_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"products.product_name\"}}},{\"name\":\"products.quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.tax_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.taxful_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.taxless_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"products.unit_discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"taxful_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"taxless_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total_quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total_unique_products\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
       "fieldFormatMap": "{\"taxful_total_price\":{\"id\":\"number\",\"params\":{\"pattern\":\"$0,0.[00]\"}}}"
     }
   },
diff --git a/src/legacy/server/sample_data/data_sets/logs/saved_objects.js b/src/legacy/server/sample_data/data_sets/logs/saved_objects.js
index 234436349b02f2..522f43d107b24e 100644
--- a/src/legacy/server/sample_data/data_sets/logs/saved_objects.js
+++ b/src/legacy/server/sample_data/data_sets/logs/saved_objects.js
@@ -241,7 +241,7 @@ export const getSavedObjects = () => [
     "attributes": {
       "title": "kibana_sample_data_logs",
       "timeFieldName": "timestamp",
-      "fields": "[{\"name\":\"@timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"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\":\"agent\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"agent\",\"subType\":\"multi\"},{\"name\":\"bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.dataset\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"extension\",\"subType\":\"multi\"},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"host\",\"subType\":\"multi\"},{\"name\":\"index\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"index\",\"subType\":\"multi\"},{\"name\":\"ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"machine.os\",\"subType\":\"multi\"},{\"name\":\"machine.ram\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"esTypes\":[\"double\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"message\",\"subType\":\"multi\"},{\"name\":\"phpmemory\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"request\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"request\",\"subType\":\"multi\"},{\"name\":\"response\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"response\",\"subType\":\"multi\"},{\"name\":\"tags\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"tags.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"tags\",\"subType\":\"multi\"},{\"name\":\"timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"url\",\"subType\":\"multi\"},{\"name\":\"utc_time\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"hour_of_day\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"doc['timestamp'].value.getHour()\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]",
+      "fields": "[{\"name\":\"@timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"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\":\"agent\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"agent\"}}},{\"name\":\"bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.dataset\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"extension\"}}},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"host\"}}},{\"name\":\"index\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"index\"}}},{\"name\":\"ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"machine.os\"}}},{\"name\":\"machine.ram\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"esTypes\":[\"double\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"message.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"message\"}}},{\"name\":\"phpmemory\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"request\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"request\"}}},{\"name\":\"response\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"response\"}}},{\"name\":\"tags\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"tags.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"tags\"}}},{\"name\":\"timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"url\"}}},{\"name\":\"utc_time\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"hour_of_day\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"doc['timestamp'].value.getHour()\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]",
       "fieldFormatMap": "{\"hour_of_day\":{}}"
     }
   },
diff --git a/src/legacy/server/saved_objects/routes/bulk_create.test.ts b/src/legacy/server/saved_objects/routes/bulk_create.test.ts
index 1e041bb28f75f5..b49554995aab6b 100644
--- a/src/legacy/server/saved_objects/routes/bulk_create.test.ts
+++ b/src/legacy/server/saved_objects/routes/bulk_create.test.ts
@@ -22,11 +22,11 @@ import { createMockServer } from './_mock_server';
 import { createBulkCreateRoute } from './bulk_create';
 // Disable lint errors for imports from src/core/* until SavedObjects migration is complete
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsClientMock } from '../../../../core/server/saved_objects/service/saved_objects_client.mock';
+import { savedObjectsClientMock } from '../../../../core/server/saved_objects/service/saved_objects_client.mock';
 
 describe('POST /api/saved_objects/_bulk_create', () => {
   let server: Hapi.Server;
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     savedObjectsClient.bulkCreate.mockImplementation(() => Promise.resolve('' as any));
diff --git a/src/legacy/server/saved_objects/routes/bulk_get.test.ts b/src/legacy/server/saved_objects/routes/bulk_get.test.ts
index 546164be65c9f0..e154649e2cf049 100644
--- a/src/legacy/server/saved_objects/routes/bulk_get.test.ts
+++ b/src/legacy/server/saved_objects/routes/bulk_get.test.ts
@@ -20,11 +20,11 @@
 import Hapi from 'hapi';
 import { createMockServer } from './_mock_server';
 import { createBulkGetRoute } from './bulk_get';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 describe('POST /api/saved_objects/_bulk_get', () => {
   let server: Hapi.Server;
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     savedObjectsClient.bulkGet.mockImplementation(() =>
diff --git a/src/legacy/server/saved_objects/routes/bulk_update.test.ts b/src/legacy/server/saved_objects/routes/bulk_update.test.ts
index ee74ddfc535d2c..dc21ab08035ce3 100644
--- a/src/legacy/server/saved_objects/routes/bulk_update.test.ts
+++ b/src/legacy/server/saved_objects/routes/bulk_update.test.ts
@@ -20,11 +20,11 @@
 import Hapi from 'hapi';
 import { createMockServer } from './_mock_server';
 import { createBulkUpdateRoute } from './bulk_update';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 describe('PUT /api/saved_objects/_bulk_update', () => {
   let server: Hapi.Server;
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     server = createMockServer();
diff --git a/src/legacy/server/saved_objects/routes/create.test.ts b/src/legacy/server/saved_objects/routes/create.test.ts
index 85096228c31751..4f096a9ee5c931 100644
--- a/src/legacy/server/saved_objects/routes/create.test.ts
+++ b/src/legacy/server/saved_objects/routes/create.test.ts
@@ -20,7 +20,7 @@
 import Hapi from 'hapi';
 import { createMockServer } from './_mock_server';
 import { createCreateRoute } from './create';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 describe('POST /api/saved_objects/{type}', () => {
   let server: Hapi.Server;
@@ -32,7 +32,7 @@ describe('POST /api/saved_objects/{type}', () => {
     references: [],
     attributes: {},
   };
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     savedObjectsClient.create.mockImplementation(() => Promise.resolve(clientResponse));
diff --git a/src/legacy/server/saved_objects/routes/delete.test.ts b/src/legacy/server/saved_objects/routes/delete.test.ts
index 9e2adcf9d3b91f..f3e5e837714716 100644
--- a/src/legacy/server/saved_objects/routes/delete.test.ts
+++ b/src/legacy/server/saved_objects/routes/delete.test.ts
@@ -20,11 +20,11 @@
 import Hapi from 'hapi';
 import { createMockServer } from './_mock_server';
 import { createDeleteRoute } from './delete';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 describe('DELETE /api/saved_objects/{type}/{id}', () => {
   let server: Hapi.Server;
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     savedObjectsClient.delete.mockImplementation(() => Promise.resolve('{}'));
diff --git a/src/legacy/server/saved_objects/routes/export.test.ts b/src/legacy/server/saved_objects/routes/export.test.ts
index 2670535ab995ea..93ca3a419e6dff 100644
--- a/src/legacy/server/saved_objects/routes/export.test.ts
+++ b/src/legacy/server/saved_objects/routes/export.test.ts
@@ -28,14 +28,14 @@ import * as exportMock from '../../../../core/server/saved_objects/export';
 import { createMockServer } from './_mock_server';
 import { createExportRoute } from './export';
 import { createListStream } from '../../../utils/streams';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 const getSortedObjectsForExport = exportMock.getSortedObjectsForExport as jest.Mock;
 
 describe('POST /api/saved_objects/_export', () => {
   let server: Hapi.Server;
   const savedObjectsClient = {
-    ...SavedObjectsClientMock.create(),
+    ...savedObjectsClientMock.create(),
     errors: {} as any,
   };
 
diff --git a/src/legacy/server/saved_objects/routes/find.test.ts b/src/legacy/server/saved_objects/routes/find.test.ts
index 89cd0dd28d0356..4bf5f57fec1999 100644
--- a/src/legacy/server/saved_objects/routes/find.test.ts
+++ b/src/legacy/server/saved_objects/routes/find.test.ts
@@ -20,11 +20,11 @@
 import Hapi from 'hapi';
 import { createMockServer } from './_mock_server';
 import { createFindRoute } from './find';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 describe('GET /api/saved_objects/_find', () => {
   let server: Hapi.Server;
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   const clientResponse = {
     total: 0,
diff --git a/src/legacy/server/saved_objects/routes/get.test.ts b/src/legacy/server/saved_objects/routes/get.test.ts
index 2f7eaea1bc7709..7ede2a8b4d7b4c 100644
--- a/src/legacy/server/saved_objects/routes/get.test.ts
+++ b/src/legacy/server/saved_objects/routes/get.test.ts
@@ -20,11 +20,11 @@
 import Hapi from 'hapi';
 import { createMockServer } from './_mock_server';
 import { createGetRoute } from './get';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 describe('GET /api/saved_objects/{type}/{id}', () => {
   let server: Hapi.Server;
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     savedObjectsClient.get.mockImplementation(() =>
diff --git a/src/legacy/server/saved_objects/routes/import.test.ts b/src/legacy/server/saved_objects/routes/import.test.ts
index 1a0684a35ec790..2b8d9d75235077 100644
--- a/src/legacy/server/saved_objects/routes/import.test.ts
+++ b/src/legacy/server/saved_objects/routes/import.test.ts
@@ -20,11 +20,11 @@
 import Hapi from 'hapi';
 import { createMockServer } from './_mock_server';
 import { createImportRoute } from './import';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 describe('POST /api/saved_objects/_import', () => {
   let server: Hapi.Server;
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
   const emptyResponse = {
     saved_objects: [],
     total: 0,
diff --git a/src/legacy/server/saved_objects/routes/resolve_import_errors.test.ts b/src/legacy/server/saved_objects/routes/resolve_import_errors.test.ts
index 7988165207e63a..44fa46bccfce58 100644
--- a/src/legacy/server/saved_objects/routes/resolve_import_errors.test.ts
+++ b/src/legacy/server/saved_objects/routes/resolve_import_errors.test.ts
@@ -20,11 +20,11 @@
 import Hapi from 'hapi';
 import { createMockServer } from './_mock_server';
 import { createResolveImportErrorsRoute } from './resolve_import_errors';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 describe('POST /api/saved_objects/_resolve_import_errors', () => {
   let server: Hapi.Server;
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     server = createMockServer();
diff --git a/src/legacy/server/saved_objects/routes/update.test.ts b/src/legacy/server/saved_objects/routes/update.test.ts
index 69a6fe3030009a..aaeaff489d30ab 100644
--- a/src/legacy/server/saved_objects/routes/update.test.ts
+++ b/src/legacy/server/saved_objects/routes/update.test.ts
@@ -20,11 +20,11 @@
 import Hapi from 'hapi';
 import { createMockServer } from './_mock_server';
 import { createUpdateRoute } from './update';
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 
 describe('PUT /api/saved_objects/{type}/{id?}', () => {
   let server: Hapi.Server;
-  const savedObjectsClient = SavedObjectsClientMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
 
   beforeEach(() => {
     const clientResponse = {
diff --git a/src/legacy/server/usage/README.md b/src/legacy/server/usage/README.md
index ad1bb822b70cda..5c4bcc05bbc383 100644
--- a/src/legacy/server/usage/README.md
+++ b/src/legacy/server/usage/README.md
@@ -90,5 +90,3 @@ There are a few ways you can test that your usage collector is working properly.
    Yes. When you talk to the Platform team about new fields being added, point out specifically which properties will have dynamic inner fields.
 5. **If I accumulate an event counter in server memory, which my fetch method returns, won't it reset when the Kibana server restarts?**  
    Yes, but that is not a major concern. A visualization on such info might be a date histogram that gets events-per-second or something, which would be impacted by server restarts, so we'll have to offset the beginning of the time range when we detect that the latest metric is smaller than the earliest metric. That would be a pretty custom visualization, but perhaps future Kibana enhancements will be able to support that.
-6. **Who can I talk to with more questions?**  
-   The Kibana Platform team is the owner of the telemetry service. You can bring questions to them. You can also talk to Tim Sullivan, who created the Kibana telemetry service, or Chris Earle, who set up the telemetry cluster and AWS Lambas for the upstream prod and staging endpoints that recieve the data sent from end-user browsers.
diff --git a/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js b/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js
index 20ff1d5bcfe0a0..a58ec992495fd3 100644
--- a/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js
+++ b/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js
@@ -69,7 +69,7 @@ describe('UiExports', function () {
     sandbox
       .stub(getUiSettingsServiceForRequestNS, 'getUiSettingsServiceForRequest')
       .returns({
-        getDefaults: noop,
+        getRegistered: noop,
         getUserProvided: noop
       });
   });
diff --git a/src/legacy/ui/field_formats/mixin/field_formats_mixin.ts b/src/legacy/ui/field_formats/mixin/field_formats_mixin.ts
index 27b3967d6f46e2..66466b96abe837 100644
--- a/src/legacy/ui/field_formats/mixin/field_formats_mixin.ts
+++ b/src/legacy/ui/field_formats/mixin/field_formats_mixin.ts
@@ -28,9 +28,9 @@ export function fieldFormatsMixin(kbnServer: any, server: Legacy.Server) {
   // for use outside of the request context, for special cases
   server.decorate('server', 'fieldFormatServiceFactory', async function(uiSettings) {
     const uiConfigs = await uiSettings.getAll();
-    const uiSettingDefaults = uiSettings.getDefaults();
-    Object.keys(uiSettingDefaults).forEach(key => {
-      if (has(uiConfigs, key) && uiSettingDefaults[key].type === 'json') {
+    const registeredUiSettings = uiSettings.getRegistered();
+    Object.keys(registeredUiSettings).forEach(key => {
+      if (has(uiConfigs, key) && registeredUiSettings[key].type === 'json') {
         uiConfigs[key] = JSON.parse(uiConfigs[key]);
       }
     });
diff --git a/src/legacy/ui/public/agg_types/__tests__/agg_param_writer.js b/src/legacy/ui/public/agg_types/__tests__/agg_param_writer.js
deleted file mode 100644
index c85899ca5704e1..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/agg_param_writer.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import { VisProvider } from '../../vis';
-import { aggTypes } from '..';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { AggGroupNames } from '../../vis/editors/default/agg_groups';
-
-// eslint-disable-next-line import/no-default-export
-export default function AggParamWriterHelper(Private) {
-  const Vis = Private(VisProvider);
-  const stubbedLogstashIndexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-
-  /**
-   * Helper object for writing aggParams. Specify an aggType and it will find a vis & schema, and
-   * wire up the supporting objects required to feed in parameters, and get #write() output.
-   *
-   * Use cases:
-   *  - Verify that the interval parameter of the histogram visualization casts its input to a number
-   *    ```js
-   *    it('casts to a number', function () {
-   *      let writer = new AggParamWriter({ aggType: 'histogram' });
-   *      let output = writer.write({ interval : '100/10' });
-   *      expect(output.params.interval).to.be.a('number');
-   *      expect(output.params.interval).to.be(100);
-   *    });
-   *    ```
-   *
-   * @class AggParamWriter
-   * @param {object} opts - describe the properties of this paramWriter
-   * @param {string} opts.aggType - the name of the aggType we want to test. ('histogram', 'filter', etc.)
-   */
-  class AggParamWriter {
-
-    constructor(opts) {
-      this.aggType = opts.aggType;
-      if (_.isString(this.aggType)) {
-        this.aggType = aggTypes.buckets.find(agg => agg.name === this.aggType) || aggTypes.metrics.find(agg => agg.name === this.aggType);
-      }
-
-      // not configurable right now, but totally required
-      this.indexPattern = stubbedLogstashIndexPattern;
-
-      // the schema that the aggType satisfies
-      this.visAggSchema = null;
-
-      this.vis = new Vis(this.indexPattern, {
-        type: 'histogram',
-        aggs: [{
-          id: 1,
-          type: this.aggType.name,
-          params: {}
-        }]
-      });
-    }
-
-    write(paramValues, modifyAggConfig = null) {
-      paramValues = _.clone(paramValues);
-
-      if (this.aggType.paramByName('field') && !paramValues.field) {
-        // pick a field rather than force a field to be specified everywhere
-        if (this.aggType.type === AggGroupNames.Metrics) {
-          paramValues.field = _.sample(this.indexPattern.fields.getByType('number'));
-        } else {
-          const type = this.aggType.paramByName('field').filterFieldTypes || 'string';
-          let field;
-          do {
-            field = _.sample(this.indexPattern.fields.getByType(type));
-          } while (!field.aggregatable);
-          paramValues.field = field.name;
-        }
-      }
-
-      const aggConfig = this.vis.aggs.aggs[0];
-      aggConfig.setParams(paramValues);
-
-      if (modifyAggConfig) {
-        modifyAggConfig(aggConfig);
-      }
-
-      return aggConfig.write(this.vis.aggs);
-    }
-  }
-
-  return AggParamWriter;
-}
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_date_range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_date_range.js
deleted file mode 100644
index 94603dfa69a660..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/_date_range.js
+++ /dev/null
@@ -1,80 +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 { set } from 'lodash';
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import ngMock from 'ng_mock';
-import { aggTypes } from '../..';
-import AggParamWriterProvider from '../agg_param_writer';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import chrome from '../../../chrome';
-
-const config = chrome.getUiSettingsClient();
-
-describe('date_range params', function () {
-  let paramWriter;
-  let timeField;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    const AggParamWriter = Private(AggParamWriterProvider);
-    const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-
-    timeField = indexPattern.timeFieldName;
-    paramWriter = new AggParamWriter({ aggType: 'date_range' });
-  }));
-
-  describe('getKey', () => {
-    const dateRange = aggTypes.buckets.find(agg => agg.name === 'date_range');
-    it('should return object', () => {
-      const bucket = { from: 'from-date', to: 'to-date', key: 'from-dateto-date' };
-      expect(dateRange.getKey(bucket)).to.equal({ from: 'from-date', to: 'to-date' });
-    });
-  });
-
-  describe('time_zone', () => {
-    beforeEach(() => {
-      sinon.stub(config, 'get');
-      sinon.stub(config, 'isDefault');
-    });
-
-    it('should use the specified time_zone', () => {
-      const output = paramWriter.write({ time_zone: 'Europe/Kiev' });
-      expect(output.params).to.have.property('time_zone', 'Europe/Kiev');
-    });
-
-    it('should use the Kibana time_zone if no parameter specified', () => {
-      config.isDefault.withArgs('dateFormat:tz').returns(false);
-      config.get.withArgs('dateFormat:tz').returns('Europe/Riga');
-      const output = paramWriter.write({});
-      expect(output.params).to.have.property('time_zone', 'Europe/Riga');
-    });
-
-    it('should use the fixed time_zone from the index pattern typeMeta', () => {
-      set(paramWriter.indexPattern, ['typeMeta', 'aggs', 'date_range', timeField, 'time_zone'], 'Europe/Rome');
-      const output = paramWriter.write({ field: timeField });
-      expect(output.params).to.have.property('time_zone', 'Europe/Rome');
-    });
-
-    afterEach(() => {
-      config.get.restore();
-      config.isDefault.restore();
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js
deleted file mode 100644
index 7172d1f40936ef..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/_geo_hash.js
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import { geoHashBucketAgg } from '../../buckets/geo_hash';
-import * as AggConfigModule from '../../agg_config';
-import * as BucketAggTypeModule from '../../buckets/_bucket_agg_type';
-
-describe('Geohash Agg', () => {
-
-  const initialZoom = 10;
-  const initialMapBounds = {
-    top_left: { lat: 1.0, lon: -1.0 },
-    bottom_right: { lat: -1.0, lon: 1.0 }
-  };
-
-  const BucketAggTypeMock = (aggOptions) => {
-    return aggOptions;
-  };
-  const AggConfigMock = (parent, aggOptions) => {
-    return aggOptions;
-  };
-  const createAggregationMock = (aggOptions) => {
-    return new AggConfigMock(null, aggOptions);
-  };
-
-  const aggMock = {
-    getField: () => {
-      return {
-        name: 'location'
-      };
-    },
-    params: {
-      isFilteredByCollar: true,
-      useGeocentroid: true,
-      mapZoom: initialZoom
-    },
-    aggConfigs: {},
-    type: 'geohash_grid',
-  };
-  aggMock.aggConfigs.createAggConfig = createAggregationMock;
-
-
-  before(function () {
-    sinon.stub(AggConfigModule, 'AggConfig').callsFake(AggConfigMock);
-    sinon.stub(BucketAggTypeModule, 'BucketAggType').callsFake(BucketAggTypeMock);
-  });
-
-  after(function () {
-    AggConfigModule.AggConfig.restore();
-    BucketAggTypeModule.BucketAggType.restore();
-  });
-
-  function initAggParams() {
-    aggMock.params.isFilteredByCollar = true;
-    aggMock.params.useGeocentroid = true;
-    aggMock.params.mapBounds = initialMapBounds;
-  }
-
-  function zoomMap(zoomChange) {
-    aggMock.params.mapZoom += zoomChange;
-  }
-
-  function moveMap(newBounds) {
-    aggMock.params.mapBounds = newBounds;
-  }
-
-  function resetMap() {
-    aggMock.params.mapZoom = initialZoom;
-    aggMock.params.mapBounds = initialMapBounds;
-    aggMock.params.mapCollar = {
-      top_left: { lat: 1.5, lon: -1.5 },
-      bottom_right: { lat: -1.5, lon: 1.5 },
-      zoom: initialZoom
-    };
-  }
-
-  describe('precision parameter', () => {
-
-    const PRECISION_PARAM_INDEX = 2;
-    let precisionParam;
-    beforeEach(() => {
-      precisionParam = geoHashBucketAgg.params[PRECISION_PARAM_INDEX];
-    });
-
-    it('should select precision parameter', () => {
-      expect(precisionParam.name).to.equal('precision');
-    });
-
-    describe('precision parameter write', () => {
-
-      const zoomToGeoHashPrecision = {
-        0: 1,
-        1: 2,
-        2: 2,
-        3: 2,
-        4: 3,
-        5: 3,
-        6: 4,
-        7: 4,
-        8: 4,
-        9: 5,
-        10: 5,
-        11: 6,
-        12: 6,
-        13: 6,
-        14: 7,
-        15: 7,
-        16: 7,
-        17: 7,
-        18: 7,
-        19: 7,
-        20: 7,
-        21: 7
-      };
-
-      Object.keys(zoomToGeoHashPrecision).forEach((zoomLevel) => {
-        it(`zoom level ${zoomLevel} should correspond to correct geohash-precision`, () => {
-          const output = { params: {} };
-          precisionParam.write({
-            params: {
-              autoPrecision: true,
-              mapZoom: zoomLevel
-            }
-          }, output);
-          expect(output.params.precision).to.equal(zoomToGeoHashPrecision[zoomLevel]);
-        });
-      });
-    });
-
-  });
-
-  describe('getRequestAggs', () => {
-
-    describe('initial aggregation creation', () => {
-      let requestAggs;
-      beforeEach(() => {
-        initAggParams();
-        requestAggs = geoHashBucketAgg.getRequestAggs(aggMock);
-      });
-
-      it('should create filter, geohash_grid, and geo_centroid aggregations', () => {
-        expect(requestAggs.length).to.equal(3);
-        expect(requestAggs[0].type).to.equal('filter');
-        expect(requestAggs[1].type).to.equal('geohash_grid');
-        expect(requestAggs[2].type).to.equal('geo_centroid');
-      });
-
-      it('should set mapCollar in vis session state', () => {
-        expect(aggMock).to.have.property('lastMapCollar');
-        expect(aggMock.lastMapCollar).to.have.property('top_left');
-        expect(aggMock.lastMapCollar).to.have.property('bottom_right');
-        expect(aggMock.lastMapCollar).to.have.property('zoom');
-      });
-
-      // there was a bug because of an "&& mapZoom" check which excluded 0 as a valid mapZoom, but it is.
-      it('should create filter, geohash_grid, and geo_centroid aggregations when zoom level 0', () => {
-        aggMock.params.mapZoom = 0;
-        requestAggs = geoHashBucketAgg.getRequestAggs(aggMock);
-        expect(requestAggs.length).to.equal(3);
-        expect(requestAggs[0].type).to.equal('filter');
-        expect(requestAggs[1].type).to.equal('geohash_grid');
-        expect(requestAggs[2].type).to.equal('geo_centroid');
-      });
-    });
-
-    describe('aggregation options', () => {
-
-      beforeEach(() => {
-        initAggParams();
-      });
-
-      it('should only create geohash_grid and geo_centroid aggregations when isFilteredByCollar is false', () => {
-        aggMock.params.isFilteredByCollar = false;
-        const requestAggs = geoHashBucketAgg.getRequestAggs(aggMock);
-        expect(requestAggs.length).to.equal(2);
-        expect(requestAggs[0].type).to.equal('geohash_grid');
-        expect(requestAggs[1].type).to.equal('geo_centroid');
-      });
-
-      it('should only create filter and geohash_grid aggregations when useGeocentroid is false', () => {
-        aggMock.params.useGeocentroid = false;
-        const requestAggs = geoHashBucketAgg.getRequestAggs(aggMock);
-        expect(requestAggs.length).to.equal(2);
-        expect(requestAggs[0].type).to.equal('filter');
-        expect(requestAggs[1].type).to.equal('geohash_grid');
-
-      });
-    });
-
-    describe('aggregation creation after map interaction', () => {
-
-      let origRequestAggs;
-      let origMapCollar;
-      beforeEach(() => {
-        resetMap();
-        initAggParams();
-        origRequestAggs = geoHashBucketAgg.getRequestAggs(aggMock);
-        origMapCollar = JSON.stringify(aggMock.lastMapCollar, null, '');
-      });
-
-      it('should not change geo_bounding_box filter aggregation and vis session state when map movement is within map collar', () => {
-        moveMap({
-          top_left: { lat: 1.1, lon: -1.1 },
-          bottom_right: { lat: -0.9, lon: 0.9 }
-        });
-
-        const newRequestAggs = geoHashBucketAgg.getRequestAggs(aggMock);
-        expect(JSON.stringify(origRequestAggs[0].params, null, '')).to.equal(JSON.stringify(newRequestAggs[0].params, null, ''));
-
-        const newMapCollar = JSON.stringify(aggMock.lastMapCollar, null, '');
-        expect(origMapCollar).to.equal(newMapCollar);
-      });
-
-      it('should change geo_bounding_box filter aggregation and vis session state when map movement is outside map collar', () => {
-        moveMap({
-          top_left: { lat: 10.0, lon: -10.0 },
-          bottom_right: { lat: 9.0, lon: -9.0 }
-        });
-
-        const newRequestAggs = geoHashBucketAgg.getRequestAggs(aggMock);
-        expect(JSON.stringify(origRequestAggs[0].params, null, '')).not.to.equal(JSON.stringify(newRequestAggs[0].params, null, ''));
-
-        const newMapCollar = JSON.stringify(aggMock.lastMapCollar, null, '');
-        expect(origMapCollar).not.to.equal(newMapCollar);
-      });
-
-      it('should change geo_bounding_box filter aggregation and vis session state when map zoom level changes', () => {
-        zoomMap(-1);
-
-        geoHashBucketAgg.getRequestAggs(aggMock);
-
-        const newMapCollar = JSON.stringify(aggMock.lastMapCollar, null, '');
-        expect(origMapCollar).not.to.equal(newMapCollar);
-      });
-
-    });
-
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_histogram.js
deleted file mode 100644
index 26ad80e28ae9bf..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/_histogram.js
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import ngMock from 'ng_mock';
-import { aggTypes } from '../..';
-import chrome from '../../../chrome';
-import AggParamWriterProvider from '../agg_param_writer';
-
-const config = chrome.getUiSettingsClient();
-const histogram = aggTypes.buckets.find(agg => agg.name === 'histogram');
-describe('Histogram Agg', function () {
-
-  describe('ordered', function () {
-
-    it('is ordered', function () {
-      expect(histogram.ordered).to.be.ok();
-    });
-
-    it('is not ordered by date', function () {
-      expect(histogram.ordered).to.not.have.property('date');
-    });
-  });
-
-
-  describe('params', function () {
-    let paramWriter;
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      const AggParamWriter = Private(AggParamWriterProvider);
-      paramWriter = new AggParamWriter({ aggType: 'histogram' });
-    }));
-
-    describe('intervalBase', () => {
-      it('should not be written to the DSL', () => {
-        const output = paramWriter.write({ intervalBase: 100 });
-        expect(output.params).not.to.have.property('intervalBase');
-      });
-    });
-
-    describe('interval', function () {
-      // reads aggConfig.params.interval, writes to dsl.interval
-
-      it('accepts a whole number', function () {
-        const output = paramWriter.write({ interval: 100 });
-        expect(output.params).to.have.property('interval', 100);
-      });
-
-      it('accepts a decimal number', function () {
-        const output = paramWriter.write({ interval: 0.1 });
-        expect(output.params).to.have.property('interval', 0.1);
-      });
-
-      it('accepts a decimal number string', function () {
-        const output = paramWriter.write({ interval: '0.1' });
-        expect(output.params).to.have.property('interval', 0.1);
-      });
-
-      it('accepts a whole number string', function () {
-        const output = paramWriter.write({ interval: '10' });
-        expect(output.params).to.have.property('interval', 10);
-      });
-
-      it('fails on non-numeric values', function () {
-        // template validation prevents this from users, not devs
-        const output = paramWriter.write({ interval: [] });
-        expect(isNaN(output.params.interval)).to.be.ok();
-      });
-
-      describe('interval scaling', () => {
-
-        beforeEach(() => {
-          sinon.stub(config, 'get');
-        });
-
-        it('will respect the histogram:maxBars setting', () => {
-          config.get.withArgs('histogram:maxBars').returns(5);
-          const output = paramWriter.write({ interval: 5 },
-            aggConfig => aggConfig.setAutoBounds({ min: 0, max: 10000 }));
-          expect(output.params).to.have.property('interval', 2000);
-        });
-
-        it('will return specified interval, if bars are below histogram:maxBars config', () => {
-          config.get.withArgs('histogram:maxBars').returns(10000);
-          const output = paramWriter.write({ interval: 5 },
-            aggConfig => aggConfig.setAutoBounds({ min: 0, max: 10000 }));
-          expect(output.params).to.have.property('interval', 5);
-        });
-
-        it('will set to intervalBase if interval is below base', () => {
-          const output = paramWriter.write({ interval: 3, intervalBase: 8 });
-          expect(output.params).to.have.property('interval', 8);
-        });
-
-        it('will round to nearest intervalBase multiple if interval is above base', () => {
-          const roundUp = paramWriter.write({ interval: 46, intervalBase: 10 });
-          expect(roundUp.params).to.have.property('interval', 50);
-          const roundDown = paramWriter.write({ interval: 43, intervalBase: 10 });
-          expect(roundDown.params).to.have.property('interval', 40);
-        });
-
-        it('will not change interval if it is a multiple of base', () => {
-          const output = paramWriter.write({ interval: 35, intervalBase: 5 });
-          expect(output.params).to.have.property('interval', 35);
-        });
-
-        it('will round to intervalBase after scaling histogram:maxBars', () => {
-          config.get.withArgs('histogram:maxBars').returns(100);
-          const output = paramWriter.write({ interval: 5, intervalBase: 6 },
-            aggConfig => aggConfig.setAutoBounds({ min: 0, max: 1000 }));
-          // 100 buckets in 0 to 1000 would result in an interval of 10, so we should
-          // round to the next multiple of 6 -> 12
-          expect(output.params).to.have.property('interval', 12);
-        });
-
-        afterEach(() => {
-          config.get.restore();
-        });
-      });
-    });
-
-    describe('min_doc_count', function () {
-      it('casts true values to 0', function () {
-        let output = paramWriter.write({ min_doc_count: true });
-        expect(output.params).to.have.property('min_doc_count', 0);
-
-        output = paramWriter.write({ min_doc_count: 'yes' });
-        expect(output.params).to.have.property('min_doc_count', 0);
-
-        output = paramWriter.write({ min_doc_count: 1 });
-        expect(output.params).to.have.property('min_doc_count', 0);
-
-        output = paramWriter.write({ min_doc_count: {} });
-        expect(output.params).to.have.property('min_doc_count', 0);
-      });
-
-      it('writes 1 for falsy values', function () {
-        let output = paramWriter.write({ min_doc_count: '' });
-        expect(output.params).to.have.property('min_doc_count', 1);
-
-        output = paramWriter.write({ min_doc_count: null });
-        expect(output.params).to.have.property('min_doc_count', 1);
-
-        output = paramWriter.write({ min_doc_count: undefined });
-        expect(output.params).to.have.property('min_doc_count', 1);
-      });
-    });
-
-    describe('extended_bounds', function () {
-      it('does not write when only eb.min is set', function () {
-        const output = paramWriter.write({
-          has_extended_bounds: true,
-          extended_bounds: { min: 0 }
-        });
-        expect(output.params).not.to.have.property('extended_bounds');
-      });
-
-      it('does not write when only eb.max is set', function () {
-        const output = paramWriter.write({
-          has_extended_bounds: true,
-          extended_bounds: { max: 0 }
-        });
-        expect(output.params).not.to.have.property('extended_bounds');
-      });
-
-      it('writes when both eb.min and eb.max are set', function () {
-        const output = paramWriter.write({
-          has_extended_bounds: true,
-          extended_bounds: { min: 99, max: 100 }
-        });
-        expect(output.params.extended_bounds).to.have.property('min', 99);
-        expect(output.params.extended_bounds).to.have.property('max', 100);
-      });
-
-      it('does not write when nothing is set', function () {
-        const output = paramWriter.write({
-          has_extended_bounds: true,
-          extended_bounds: {}
-        });
-        expect(output.params).to.not.have.property('extended_bounds');
-      });
-
-      it('does not write when has_extended_bounds is false', function () {
-        const output = paramWriter.write({
-          has_extended_bounds: false,
-          extended_bounds: { min: 99, max: 100 }
-        });
-        expect(output.params).to.not.have.property('extended_bounds');
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/_range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/_range.js
deleted file mode 100644
index e47802aa6f4bfb..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/_range.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { values } from 'lodash';
-import ngMock from 'ng_mock';
-import expect from '@kbn/expect';
-import resp from 'fixtures/agg_resp/range';
-import { VisProvider } from '../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-
-describe('Range Agg', function () {
-  const buckets = values(resp.aggregations[1].buckets);
-
-  let Vis;
-  let indexPattern;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    Vis = Private(VisProvider);
-    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-    indexPattern.stubSetFieldFormat('bytes', 'bytes', {
-      pattern: '0,0.[000] b'
-    });
-  }));
-
-  describe('formating', function () {
-    it('formats bucket keys properly', function () {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'range',
-            schema: 'segment',
-            params: {
-              field: 'bytes',
-              ranges: [
-                { from: 0, to: 1000 },
-                { from: 1000, to: 2000 }
-              ]
-            }
-          }
-        ]
-      });
-
-      const agg = vis.aggs.byName('range')[0];
-      const format = function (val) {
-        return agg.fieldFormatter()(agg.getKey(val));
-      };
-      expect(format(buckets[0])).to.be('≥ -∞ and < 1 KB');
-      expect(format(buckets[1])).to.be('≥ 1 KB and < 2.5 KB');
-      expect(format(buckets[2])).to.be('≥ 2.5 KB and < +∞');
-
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
deleted file mode 100644
index 11e410c43b5921..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import moment from 'moment';
-import aggResp from 'fixtures/agg_resp/date_histogram';
-import ngMock from 'ng_mock';
-import expect from '@kbn/expect';
-import { VisProvider } from '../../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { createFilterDateHistogram } from '../../../buckets/create_filter/date_histogram';
-import { intervalOptions } from '../../../buckets/_interval_options';
-
-describe('AggConfig Filters', function () {
-  describe('date_histogram', function () {
-    let vis;
-    let agg;
-    let field;
-    let filter;
-    let bucketKey;
-    let bucketStart;
-
-    let init;
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      const Vis = Private(VisProvider);
-      const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-
-      init = function (interval, duration) {
-        interval = interval || 'auto';
-        if (interval === 'custom') interval = agg.params.customInterval;
-        duration = duration || moment.duration(15, 'minutes');
-        field = _.sample(_.reject(indexPattern.fields.getByType('date'), 'scripted'));
-        vis = new Vis(indexPattern, {
-          type: 'histogram',
-          aggs: [
-            {
-              type: 'date_histogram',
-              schema: 'segment',
-              params: { field: field.name, interval: interval, customInterval: '5d' }
-            }
-          ]
-        });
-
-        agg = vis.aggs.aggs[0];
-        bucketKey = _.sample(aggResp.aggregations['1'].buckets).key;
-        bucketStart = moment(bucketKey);
-
-        const timePad = moment.duration(duration / 2);
-        agg.buckets.setBounds({
-          min: bucketStart.clone().subtract(timePad),
-          max: bucketStart.clone().add(timePad),
-        });
-        agg.buckets.setInterval(interval);
-
-        filter = createFilterDateHistogram(agg, bucketKey);
-      };
-    }));
-
-    it('creates a valid range filter', function () {
-      init();
-
-      expect(filter).to.have.property('range');
-      expect(filter.range).to.have.property(field.name);
-
-      const fieldParams = filter.range[field.name];
-      expect(fieldParams).to.have.property('gte');
-      expect(fieldParams.gte).to.be.a('string');
-
-      expect(fieldParams).to.have.property('lt');
-      expect(fieldParams.lt).to.be.a('string');
-
-      expect(fieldParams).to.have.property('format');
-      expect(fieldParams.format).to.be('strict_date_optional_time');
-
-      expect(fieldParams.gte).to.be.lessThan(fieldParams.lt);
-
-      expect(filter).to.have.property('meta');
-      expect(filter.meta).to.have.property('index', vis.indexPattern.id);
-    });
-
-
-    it('extends the filter edge to 1ms before the next bucket for all interval options', function () {
-      intervalOptions.forEach(function (option) {
-        let duration;
-        if (option.val !== 'custom' && moment(1, option.val).isValid()) {
-          duration = moment.duration(10, option.val);
-
-          if (+duration < 10) {
-            throw new Error('unable to create interval for ' + option.val);
-          }
-        }
-
-        init(option.val, duration);
-
-        const interval = agg.buckets.getInterval();
-        const params = filter.range[field.name];
-
-        expect(params.gte).to.be(bucketStart.toISOString());
-        expect(params.lt).to.be(bucketStart.clone().add(interval).toISOString());
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
deleted file mode 100644
index 3ba03f232428ff..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import moment from 'moment';
-import { VisProvider } from '../../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { createFilterDateRange } from '../../../buckets/create_filter/date_range';
-
-describe('AggConfig Filters', function () {
-  describe('Date range', function () {
-    let indexPattern;
-    let Vis;
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(VisProvider);
-      indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-    }));
-
-    it('should return a range filter for date_range agg', function () {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'date_range',
-            params: {
-              field: '@timestamp',
-              ranges: [
-                { from: '2014-01-01', to: '2014-12-31' }
-              ]
-            }
-          }
-        ]
-      });
-
-      const aggConfig = vis.aggs.byName('date_range')[0];
-      const from = new Date('1 Feb 2015');
-      const to = new Date('7 Feb 2015');
-      const filter = createFilterDateRange(aggConfig, { from: from.valueOf(), to: to.valueOf() });
-      expect(filter).to.have.property('range');
-      expect(filter).to.have.property('meta');
-      expect(filter.meta).to.have.property('index', indexPattern.id);
-      expect(filter.range).to.have.property('@timestamp');
-      expect(filter.range['@timestamp']).to.have.property('gte', moment(from).toISOString());
-      expect(filter.range['@timestamp']).to.have.property('lt', moment(to).toISOString());
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/filters.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
deleted file mode 100644
index 409c9a40b19c47..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { VisProvider } from '../../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { createFilterFilters } from '../../../buckets/create_filter/filters';
-
-describe('AggConfig Filters', function () {
-  describe('filters', function () {
-    let indexPattern;
-    let Vis;
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(VisProvider);
-      indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-    }));
-
-    it('should return a filters filter', function () {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'filters',
-            schema: 'segment',
-            params: {
-              filters: [
-                { input: { query: 'type:apache', language: 'lucene' } },
-                { input: { query: 'type:nginx', language: 'lucene' } }
-              ]
-            }
-          }
-        ]
-      });
-
-      const aggConfig = vis.aggs.byName('filters')[0];
-      const filter = createFilterFilters(aggConfig, 'type:nginx');
-      expect(filter.query.bool.must[0].query_string.query).to.be('type:nginx');
-      expect(filter.meta).to.have.property('index', indexPattern.id);
-      expect(filter.meta).to.have.property('alias', 'type:nginx');
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
deleted file mode 100644
index 6d4534bba4dd1f..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { VisProvider } from '../../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { createFilterHistogram } from '../../../buckets/create_filter/histogram';
-
-describe('AggConfig Filters', function () {
-  describe('histogram', function () {
-    let indexPattern;
-    let Vis;
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(VisProvider);
-      indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-    }));
-
-    it('should return an range filter for histogram', function () {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'histogram',
-            schema: 'segment',
-            params: { field: 'bytes', interval: 1024 }
-          }
-        ]
-      });
-
-      const aggConfig = vis.aggs.byName('histogram')[0];
-      const filter = createFilterHistogram(aggConfig, 2048);
-      expect(filter).to.have.property('meta');
-      expect(filter.meta).to.have.property('index', indexPattern.id);
-      expect(filter).to.have.property('range');
-      expect(filter.range).to.have.property('bytes');
-      expect(filter.range.bytes).to.have.property('gte', 2048);
-      expect(filter.range.bytes).to.have.property('lt', 3072);
-      expect(filter.meta).to.have.property('formattedValue', '2,048');
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
deleted file mode 100644
index e29ebd689db200..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
+++ /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 expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { VisProvider } from '../../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { createFilterIpRange } from '../../../buckets/create_filter/ip_range';
-describe('AggConfig Filters', function () {
-
-  describe('IP range', function () {
-    let indexPattern;
-    let Vis;
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(VisProvider);
-      indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-    }));
-
-    it('should return a range filter for ip_range agg', function () {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'ip_range',
-            schema: 'segment',
-            params: {
-              field: 'ip',
-              ipRangeType: 'fromTo',
-              ranges: {
-                fromTo: [
-                  { from: '0.0.0.0', to: '1.1.1.1' }
-                ]
-              }
-            }
-          }
-        ]
-      });
-
-      const aggConfig = vis.aggs.byName('ip_range')[0];
-      const filter = createFilterIpRange(aggConfig, { type: 'fromTo', from: '0.0.0.0', to: '1.1.1.1' });
-      expect(filter).to.have.property('range');
-      expect(filter).to.have.property('meta');
-      expect(filter.meta).to.have.property('index', indexPattern.id);
-      expect(filter.range).to.have.property('ip');
-      expect(filter.range.ip).to.have.property('gte', '0.0.0.0');
-      expect(filter.range.ip).to.have.property('lte', '1.1.1.1');
-    });
-
-    it('should return a range filter for ip_range agg using a CIDR mask', function () {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'ip_range',
-            schema: 'segment',
-            params: {
-              field: 'ip',
-              ipRangeType: 'mask',
-              ranges: {
-                mask: [
-                  { mask: '67.129.65.201/27' }
-                ]
-              }
-            }
-          }
-        ]
-      });
-
-      const aggConfig = vis.aggs.byName('ip_range')[0];
-      const filter = createFilterIpRange(aggConfig, { type: 'mask', mask: '67.129.65.201/27' });
-      expect(filter).to.have.property('range');
-      expect(filter).to.have.property('meta');
-      expect(filter.meta).to.have.property('index', indexPattern.id);
-      expect(filter.range).to.have.property('ip');
-      expect(filter.range.ip).to.have.property('gte', '67.129.65.192');
-      expect(filter.range.ip).to.have.property('lte', '67.129.65.223');
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/range.js
deleted file mode 100644
index 228fd6bce5cfbc..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/range.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { VisProvider } from '../../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { createFilterRange } from '../../../buckets/create_filter/range';
-
-describe('AggConfig Filters', function () {
-
-  describe('range', function () {
-    let indexPattern;
-    let Vis;
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(VisProvider);
-      indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-    }));
-
-    it('should return a range filter for range agg', function () {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          {
-            type: 'range',
-            schema: 'segment',
-            params: {
-              field: 'bytes',
-              ranges: [
-                { from: 1024, to: 2048 }
-              ]
-            }
-          }
-        ]
-      });
-
-      const aggConfig = vis.aggs.byName('range')[0];
-      const filter = createFilterRange(aggConfig, { gte: 1024, lt: 2048.0 });
-      expect(filter).to.have.property('range');
-      expect(filter).to.have.property('meta');
-      expect(filter.meta).to.have.property('index', indexPattern.id);
-      expect(filter.range).to.have.property('bytes');
-      expect(filter.range.bytes).to.have.property('gte', 1024.0);
-      expect(filter.range.bytes).to.have.property('lt', 2048.0);
-      expect(filter.meta).to.have.property('formattedValue', '≥ 1,024 and < 2,048');
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
deleted file mode 100644
index a2812ffb979651..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { VisProvider } from '../../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { createFilterTerms } from '../../../buckets/create_filter/terms';
-
-describe('AggConfig Filters', function () {
-
-  describe('terms', function () {
-    let indexPattern;
-    let Vis;
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      Vis = Private(VisProvider);
-      indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-    }));
-
-    it('should return a match_phrase filter for terms', function () {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
-      });
-      const aggConfig = vis.aggs.byName('terms')[0];
-      const filter = createFilterTerms(aggConfig, 'apache');
-      expect(filter).to.have.property('query');
-      expect(filter.query).to.have.property('match_phrase');
-      expect(filter.query.match_phrase).to.have.property('_type');
-      expect(filter.query.match_phrase._type).to.be('apache');
-      expect(filter).to.have.property('meta');
-      expect(filter.meta).to.have.property('index', indexPattern.id);
-
-    });
-
-    it('should set query to true or false for boolean filter', () => {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [ { type: 'terms', schema: 'segment', params: { field: 'ssl' } } ]
-      });
-      const aggConfig = vis.aggs.byName('terms')[0];
-      const filterFalse = createFilterTerms(aggConfig, 0);
-      expect(filterFalse).to.have.property('query');
-      expect(filterFalse.query).to.have.property('match_phrase');
-      expect(filterFalse.query.match_phrase).to.have.property('ssl');
-      expect(filterFalse.query.match_phrase.ssl).to.be(false);
-
-      const filterTrue = createFilterTerms(aggConfig, 1);
-      expect(filterTrue).to.have.property('query');
-      expect(filterTrue.query).to.have.property('match_phrase');
-      expect(filterTrue.query.match_phrase).to.have.property('ssl');
-      expect(filterTrue.query.match_phrase.ssl).to.be(true);
-    });
-
-    it('should generate correct __missing__ filter', () => {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
-      });
-      const aggConfig = vis.aggs.byName('terms')[0];
-      const filter = createFilterTerms(aggConfig, '__missing__');
-      expect(filter).to.have.property('exists');
-      expect(filter.exists).to.have.property('field', '_type');
-      expect(filter).to.have.property('meta');
-      expect(filter.meta).to.have.property('index', indexPattern.id);
-      expect(filter.meta).to.have.property('negate', true);
-    });
-
-    it('should generate correct __other__ filter', () => {
-      const vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
-      });
-      const aggConfig = vis.aggs.byName('terms')[0];
-      const filter = createFilterTerms(aggConfig, '__other__', { terms: ['apache'] })[0];
-      expect(filter).to.have.property('query');
-      expect(filter.query).to.have.property('bool');
-      expect(filter.query.bool).to.have.property('should');
-      expect(filter.query.bool.should[0]).to.have.property('match_phrase');
-      expect(filter.query.bool.should[0].match_phrase).to.have.property('_type', 'apache');
-      expect(filter).to.have.property('meta');
-      expect(filter.meta).to.have.property('index', indexPattern.id);
-      expect(filter.meta).to.have.property('negate', true);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
deleted file mode 100644
index 7b8f099a1f9b41..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import $ from 'jquery';
-import ngMock from 'ng_mock';
-import expect from '@kbn/expect';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { VisProvider } from '../../../../vis';
-import { intervalOptions } from '../../../buckets/_interval_options';
-
-describe.skip('editor', function () {
-
-  let indexPattern;
-  let vis;
-  let agg;
-  let render;
-  let $scope;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector, $compile) {
-    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-
-    const Vis = Private(VisProvider);
-
-    /**
-     * Render the AggParams editor for the date histogram aggregation
-     *
-     * @param  {object} params - the agg params to give to the date_histogram
-     *                           by default
-     * @return {object} - object pointing to the different inputs, keys
-     *                    are the aggParam name and the value is an object
-     *                    with $el, $scope, and a few helpers for getting
-     *                    data from them.
-     */
-    render = function (params) {
-      vis = new Vis(indexPattern, {
-        type: 'histogram',
-        aggs: [
-          { schema: 'metric', type: 'avg', params: { field: 'bytes' } },
-          { schema: 'segment', type: 'date_histogram', params: params || {} }
-        ]
-      });
-
-      const $el = $('<vis-editor-agg-params agg="agg" ' +
-        'index-pattern="agg.getIndexPattern()" ' +
-        'group-name="groupName">' +
-        '</vis-editor-agg-params>');
-      const $parentScope = $injector.get('$rootScope').$new();
-
-      agg = $parentScope.agg = vis.aggs.bySchemaName('segment')[0];
-      $parentScope.groupName = 'buckets';
-      $parentScope.vis = vis;
-
-      $compile($el)($parentScope);
-      $scope = $el.scope();
-      $scope.$digest();
-
-      const $inputs = $('vis-agg-param-editor', $el);
-      return _.transform($inputs.toArray(), function (inputs, e) {
-        const $el = $(e);
-        const $scope = $el.scope();
-
-        inputs[$scope.aggParam.name] = {
-          $el: $el,
-          $scope: $scope,
-          $input: function () {
-            return $el.find('[ng-model]').first();
-          },
-          modelValue: function () {
-            return this.$input().controller('ngModel').$modelValue;
-          }
-        };
-      }, {});
-    };
-
-  }));
-
-  describe('random field/interval', function () {
-    let params;
-    let field;
-    let interval;
-
-    beforeEach(ngMock.inject(function () {
-      field = _.sample(indexPattern.fields);
-      interval = _.sample(intervalOptions);
-      params = render({ field: field, interval: interval.val });
-    }));
-
-    it('renders the field editor', function () {
-      expect(agg.params.field).to.be(field);
-
-      expect(params).to.have.property('field');
-      expect(params.field).to.have.property('$el');
-      expect($scope.agg.params.field).to.be(field);
-    });
-
-    it('renders the interval editor', function () {
-      expect(agg.params.interval).to.be(interval.val);
-
-      expect(params).to.have.property('interval');
-      expect(params.interval).to.have.property('$el');
-      expect($scope.agg.params.interval).to.be(interval.val);
-    });
-  });
-
-
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
deleted file mode 100644
index 88646bd36ee803..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import moment from 'moment';
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import ngMock from 'ng_mock';
-import AggParamWriterProvider from '../../agg_param_writer';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import chrome from '../../../../chrome';
-import { aggTypes } from '../../..';
-import { AggConfig } from '../../../agg_config';
-import { timefilter } from 'ui/timefilter';
-
-const config = chrome.getUiSettingsClient();
-
-describe('date_histogram params', function () {
-
-  let paramWriter;
-  let writeInterval;
-  let write;
-
-  let getTimeBounds;
-  let timeField;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    const AggParamWriter = Private(AggParamWriterProvider);
-    const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-
-    timeField = indexPattern.timeFieldName;
-
-    paramWriter = new AggParamWriter({ aggType: 'date_histogram' });
-    writeInterval = function (interval, timeRange, params = {}) {
-      return paramWriter.write({ ...params, interval: interval, field: timeField, timeRange: timeRange });
-    };
-    write = (params) => {
-      return paramWriter.write({ interval: '10s', ...params });
-    };
-
-    const now = moment();
-    getTimeBounds = function (n, units) {
-      timefilter.enableAutoRefreshSelector();
-      timefilter.enableTimeRangeSelector();
-      return {
-        from: now.clone().subtract(n, units),
-        to: now.clone()
-      };
-    };
-  }));
-
-  describe('interval', function () {
-    it('accepts a valid calendar interval', function () {
-      const output = writeInterval('d');
-      expect(output.params).to.have.property('calendar_interval', '1d');
-    });
-
-    it('accepts a valid fixed interval', () => {
-      const output = writeInterval('100s');
-      expect(output.params).to.have.property('fixed_interval', '100s');
-    });
-
-    it('throws error when interval is invalid', function () {
-      expect(() => writeInterval('foo')).to.throw('TypeError: "foo" is not a valid interval.');
-    });
-
-    it('automatically picks an interval', function () {
-      const timeBounds = getTimeBounds(15, 'm');
-      const output = writeInterval('auto', timeBounds);
-      expect(output.params).to.have.property('fixed_interval', '30s');
-    });
-
-    it('does not scale down the interval', () => {
-      const timeBounds = getTimeBounds(1, 'm');
-      const output = writeInterval('h', timeBounds);
-      expect(output.params).to.have.property('calendar_interval', '1h');
-      expect(output).not.to.have.property('metricScaleText');
-      expect(output).not.to.have.property('metricScale');
-    });
-
-    describe('scaling behavior', () => {
-
-      it('should not scale without scaleMetricValues: true', function () {
-        const timeBounds = getTimeBounds(30, 'm');
-        const output = writeInterval('s', timeBounds);
-        expect(output.params).to.have.property('fixed_interval', '10s');
-        expect(output).not.to.have.property('metricScaleText');
-        expect(output).not.to.property('metricScale');
-      });
-
-      describe('only scales when all metrics are sum or count', function () {
-        const tests = [
-          [ false, 'avg', 'count', 'sum' ],
-          [ true, 'count', 'sum' ],
-          [ false, 'count', 'cardinality' ]
-        ];
-
-        tests.forEach(function (test) {
-          const should = test.shift();
-          const typeNames = test.slice();
-
-          it(typeNames.join(', ') + ' should ' + (should ? '' : 'not') + ' scale', function () {
-            const timeBounds = getTimeBounds(1, 'y');
-
-            const vis = paramWriter.vis;
-            vis.aggs.aggs.splice(0);
-
-            const histoConfig = new AggConfig(vis.aggs, {
-              type: aggTypes.buckets.find(agg => agg.name === 'date_histogram'),
-              schema: 'segment',
-              params: { interval: 's', field: timeField, timeRange: timeBounds, scaleMetricValues: true }
-            });
-
-            vis.aggs.aggs.push(histoConfig);
-
-            typeNames.forEach(function (type) {
-              vis.aggs.aggs.push(new AggConfig(vis.aggs, {
-                type: aggTypes.metrics.find(agg => agg.name === type),
-                schema: 'metric'
-              }));
-            });
-
-            const output = histoConfig.write(vis.aggs);
-            expect(_.has(output, 'metricScale')).to.be(should);
-          });
-        });
-      });
-    });
-  });
-
-  describe('time_zone', () => {
-    beforeEach(() => {
-      sinon.stub(config, 'get');
-      sinon.stub(config, 'isDefault');
-    });
-
-    it('should use the specified time_zone', () => {
-      const output = write({ time_zone: 'Europe/Kiev' });
-      expect(output.params).to.have.property('time_zone', 'Europe/Kiev');
-    });
-
-    it('should use the Kibana time_zone if no parameter specified', () => {
-      config.isDefault.withArgs('dateFormat:tz').returns(false);
-      config.get.withArgs('dateFormat:tz').returns('Europe/Riga');
-      const output = write({});
-      expect(output.params).to.have.property('time_zone', 'Europe/Riga');
-    });
-
-    it('should use the fixed time_zone from the index pattern typeMeta', () => {
-      _.set(paramWriter.indexPattern, ['typeMeta', 'aggs', 'date_histogram', timeField, 'time_zone'], 'Europe/Rome');
-      const output = write({ field: timeField });
-      expect(output.params).to.have.property('time_zone', 'Europe/Rome');
-    });
-
-    afterEach(() => {
-      config.get.restore();
-      config.isDefault.restore();
-    });
-  });
-
-  describe('extended_bounds', function () {
-    it('should write a long value if a moment passed in', function () {
-      const then = moment(0);
-      const now = moment(500);
-      const output = write({
-        extended_bounds: {
-          min: then,
-          max: now
-        }
-      });
-
-      expect(typeof output.params.extended_bounds.min).to.be('number');
-      expect(typeof output.params.extended_bounds.max).to.be('number');
-      expect(output.params.extended_bounds.min).to.be(then.valueOf());
-      expect(output.params.extended_bounds.max).to.be(now.valueOf());
-
-
-    });
-
-    it('should write a long if a long is passed', function () {
-      const then = 0;
-      const now = 500;
-      const output = write({
-        extended_bounds: {
-          min: then,
-          max: now
-        }
-      });
-
-      expect(typeof output.params.extended_bounds.min).to.be('number');
-      expect(typeof output.params.extended_bounds.max).to.be('number');
-      expect(output.params.extended_bounds.min).to.be(then.valueOf());
-      expect(output.params.extended_bounds.max).to.be(now.valueOf());
-
-
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/significant_terms.js b/src/legacy/ui/public/agg_types/__tests__/buckets/significant_terms.js
deleted file mode 100644
index ae52fb476c120d..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/significant_terms.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { aggTypes } from '../..';
-
-describe('Significant Terms Agg', function () {
-
-  describe('order agg editor UI', function () {
-
-    describe('convert include/exclude from old format', function () {
-
-      let $rootScope;
-
-      function init({ aggParams = {} }) {
-        ngMock.module('kibana');
-        ngMock.inject(function (_$rootScope_) {
-          const significantTerms = aggTypes.buckets.find(agg => agg.name === 'significant_terms');
-
-          $rootScope = _$rootScope_;
-          $rootScope.agg = {
-            id: 'test',
-            params: aggParams,
-            type: significantTerms,
-            getParam: key => aggParams[key],
-          };
-        });
-      }
-
-      function testSerializeAndWrite(aggConfig) {
-        const includeArg = $rootScope.agg.type.paramByName('include');
-        const excludeArg = $rootScope.agg.type.paramByName('exclude');
-
-        expect(includeArg.serialize(aggConfig.params.include, aggConfig)).to.equal('404');
-        expect(excludeArg.serialize(aggConfig.params.exclude, aggConfig)).to.equal('400');
-
-        const output = { params: {} };
-
-        includeArg.write(aggConfig, output);
-        excludeArg.write(aggConfig, output);
-
-        expect(output.params.include).to.equal('404');
-        expect(output.params.exclude).to.equal('400');
-      }
-
-      it('it doesnt do anything with string type', function () {
-        init({
-          aggParams: {
-            include: '404',
-            exclude: '400',
-            field: {
-              type: 'string'
-            },
-          }
-        });
-
-        testSerializeAndWrite($rootScope.agg);
-      });
-
-      it('converts object to string type', function () {
-        init({
-          aggParams: {
-            include: {
-              pattern: '404'
-            }, exclude: {
-              pattern: '400'
-            },
-            field: {
-              type: 'string'
-            },
-          }
-        });
-
-        testSerializeAndWrite($rootScope.agg);
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/buckets/terms.js b/src/legacy/ui/public/agg_types/__tests__/buckets/terms.js
deleted file mode 100644
index 600323d32d38ce..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/buckets/terms.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { aggTypes } from '../..';
-
-describe('Terms Agg', function () {
-  describe('order agg editor UI', function () {
-
-    let $rootScope;
-
-    function init({ metricAggs = [], aggParams = {} }) {
-      ngMock.module('kibana');
-      ngMock.inject(function ($controller, _$rootScope_) {
-        const terms = aggTypes.buckets.find(agg => agg.name === 'terms');
-        const orderAggController = terms.paramByName('orderAgg').controller;
-
-        $rootScope = _$rootScope_;
-        $rootScope.agg = {
-          id: 'test',
-          params: aggParams,
-          type: terms,
-          vis: {
-            aggs: []
-          },
-          getParam: key => aggParams[key],
-        };
-        $rootScope.metricAggs = metricAggs;
-        $controller(orderAggController, { $scope: $rootScope });
-        $rootScope.$digest();
-      });
-    }
-
-    // should be rewritten after EUIficate order_agg.html
-    it.skip('selects _key if the selected metric becomes incompatible', function () {
-      init({
-        metricAggs: [
-          {
-            id: 'agg1',
-            type: {
-              name: 'count'
-            }
-          }
-        ]
-      });
-
-      expect($rootScope.agg.params.orderBy).to.be('agg1');
-      $rootScope.metricAggs = [
-        {
-          id: 'agg1',
-          type: {
-            name: 'top_hits'
-          }
-        }
-      ];
-      $rootScope.$digest();
-      expect($rootScope.agg.params.orderBy).to.be('_key');
-    });
-
-    // should be rewritten after EUIficate order_agg.html
-    it.skip('selects _key if the selected metric is removed', function () {
-      init({
-        metricAggs: [
-          {
-            id: 'agg1',
-            type: {
-              name: 'count'
-            }
-          }
-        ]
-      });
-      expect($rootScope.agg.params.orderBy).to.be('agg1');
-      $rootScope.metricAggs = [];
-      $rootScope.$digest();
-      expect($rootScope.agg.params.orderBy).to.be('_key');
-    });
-
-    describe.skip('custom field formatter', () => {
-      beforeEach(() => {
-        init({
-          metricAggs: [
-            {
-              id: 'agg1',
-              type: {
-                name: 'count'
-              }
-            }
-          ],
-          aggParams: {
-            otherBucketLabel: 'Other',
-            missingBucketLabel: 'Missing'
-          }
-        });
-        $rootScope.$digest();
-      });
-
-      it ('converts __other__ key', () => {
-        const formatter = $rootScope.agg.type.getFormat($rootScope.agg).getConverterFor('text');
-        expect(formatter('__other__')).to.be('Other');
-      });
-
-      it ('converts __missing__ key', () => {
-        const formatter = $rootScope.agg.type.getFormat($rootScope.agg).getConverterFor('text');
-        expect(formatter('__missing__')).to.be('Missing');
-      });
-    });
-
-    it('adds "custom metric" option');
-    it('lists all metric agg responses');
-    it('lists individual values of a multi-value metric');
-    it('displays a metric editor if "custom metric" is selected');
-    it('saves the "custom metric" to state and refreshes from it');
-    it('invalidates the form if the metric agg form is not complete');
-
-    describe.skip('convert include/exclude from old format', function () {
-
-      it('it doesnt do anything with string type', function () {
-        init({
-          aggParams: {
-            include: '404',
-            exclude: '400',
-            field: {
-              type: 'string'
-            },
-          }
-        });
-
-        const aggConfig = $rootScope.agg;
-        const includeArg = $rootScope.agg.type.params.byName.include;
-        const excludeArg = $rootScope.agg.type.params.byName.exclude;
-
-        expect(includeArg.serialize(aggConfig.params.include, aggConfig)).to.equal('404');
-        expect(excludeArg.serialize(aggConfig.params.exclude, aggConfig)).to.equal('400');
-
-        const output = { params: {} };
-
-        includeArg.write(aggConfig, output);
-        excludeArg.write(aggConfig, output);
-
-        expect(output.params.include).to.equal('404');
-        expect(output.params.exclude).to.equal('400');
-      });
-
-      it('converts object to string type', function () {
-        init({
-          aggParams: {
-            include: {
-              pattern: '404'
-            }, exclude: {
-              pattern: '400'
-            },
-            field: {
-              type: 'string'
-            },
-          }
-        });
-
-        const aggConfig = $rootScope.agg;
-        const includeArg = $rootScope.agg.type.params.byName.include;
-        const excludeArg = $rootScope.agg.type.params.byName.exclude;
-
-        expect(includeArg.serialize(aggConfig.params.include, aggConfig)).to.equal('404');
-        expect(excludeArg.serialize(aggConfig.params.exclude, aggConfig)).to.equal('400');
-
-        const output = { params: {} };
-
-        includeArg.write(aggConfig, output);
-        excludeArg.write(aggConfig, output);
-
-        expect(output.params.include).to.equal('404');
-        expect(output.params.exclude).to.equal('400');
-      });
-
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/metrics/lib/make_nested_label.js b/src/legacy/ui/public/agg_types/__tests__/metrics/lib/make_nested_label.js
deleted file mode 100644
index f4ba5505578742..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/metrics/lib/make_nested_label.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import { makeNestedLabel } from '../../../metrics/lib/make_nested_label';
-
-describe('metric agg make_nested_label', function () {
-
-  function generateAggConfig(metricLabel) {
-    return {
-      params: {
-        customMetric: {
-          makeLabel: () => { return metricLabel; }
-        }
-      },
-      getParam(key) {
-        return this.params[key];
-      }
-    };
-  }
-
-  it('should return a metric label with prefix', function () {
-    const aggConfig = generateAggConfig('Count');
-    const label = makeNestedLabel(aggConfig, 'derivative');
-    expect(label).to.eql('Derivative of Count');
-  });
-
-  it('should return a numbered prefix', function () {
-    const aggConfig = generateAggConfig('Derivative of Count');
-    const label = makeNestedLabel(aggConfig, 'derivative');
-    expect(label).to.eql('2. derivative of Count');
-  });
-
-  it('should return a prefix with correct order', function () {
-    const aggConfig = generateAggConfig('3. derivative of Count');
-    const label = makeNestedLabel(aggConfig, 'derivative');
-    expect(label).to.eql('4. derivative of Count');
-  });
-
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/metrics/median.js b/src/legacy/ui/public/agg_types/__tests__/metrics/median.js
deleted file mode 100644
index df65afa5e42228..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/metrics/median.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { VisProvider } from '../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-
-describe('AggTypeMetricMedianProvider class', function () {
-  let indexPattern;
-  let aggDsl;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    const Vis = Private(VisProvider);
-    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-
-    const vis = new Vis(indexPattern, {
-      'title': 'New Visualization',
-      'type': 'metric',
-      'params': {
-        'fontSize': 60
-      },
-      'aggs': [
-        {
-          'id': '1',
-          'type': 'median',
-          'schema': 'metric',
-          'params': {
-            'field': 'bytes',
-            'percents': [
-              50
-            ]
-          }
-        }
-      ],
-      'listeners': {}
-    });
-
-    // Grab the aggConfig off the vis (we don't actually use the vis for
-    // anything else)
-    const aggConfig = vis.aggs.aggs[0];
-    aggDsl = aggConfig.toDsl();
-  }));
-
-  it('requests the percentiles aggregation in the Elasticsearch query DSL', function () {
-    expect(Object.keys(aggDsl)[0]).to.be('percentiles');
-  });
-
-  it ('asks Elasticsearch for the 50th percentile', function () {
-    expect(aggDsl.percentiles.percents).to.eql([50]);
-  });
-
-  it ('asks Elasticsearch for array-based values in the aggregation response', function () {
-    expect(aggDsl.percentiles.keyed).to.be(false);
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/metrics/parent_pipeline.js b/src/legacy/ui/public/agg_types/__tests__/metrics/parent_pipeline.js
deleted file mode 100644
index e4ca6075c624bb..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/metrics/parent_pipeline.js
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import ngMock from 'ng_mock';
-import { derivativeMetricAgg } from '../../metrics/derivative';
-import { cumulativeSumMetricAgg } from '../../metrics/cumulative_sum';
-import { movingAvgMetricAgg } from '../../metrics/moving_avg';
-import { serialDiffMetricAgg } from '../../metrics/serial_diff';
-import { VisProvider } from '../../../vis';
-import StubbedIndexPattern from 'fixtures/stubbed_logstash_index_pattern';
-
-const metrics = [
-  { name: 'derivative', title: 'Derivative', agg: derivativeMetricAgg },
-  { name: 'cumulative_sum', title: 'Cumulative Sum', agg: cumulativeSumMetricAgg },
-  { name: 'moving_avg', title: 'Moving Avg', agg: movingAvgMetricAgg, dslName: 'moving_fn' },
-  { name: 'serial_diff', title: 'Serial Diff', agg: serialDiffMetricAgg },
-];
-
-describe('parent pipeline aggs', function () {
-  metrics.forEach(metric => {
-    describe(`${metric.title} metric`, function () {
-
-      let aggDsl;
-      let metricAgg;
-      let aggConfig;
-
-      function init(settings) {
-        ngMock.module('kibana');
-        ngMock.inject(function (Private) {
-          const Vis = Private(VisProvider);
-          const indexPattern = Private(StubbedIndexPattern);
-          indexPattern.stubSetFieldFormat('bytes', 'bytes');
-          metricAgg = metric.agg;
-
-          const params = settings || {
-            metricAgg: '1',
-            customMetric: null
-          };
-
-          const vis = new Vis(indexPattern, {
-            title: 'New Visualization',
-            type: 'metric',
-            params: {
-              fontSize: 60
-            },
-            aggs: [
-              {
-                id: '1',
-                type: 'count',
-                schema: 'metric'
-              },
-              {
-                id: '2',
-                type: metric.name,
-                schema: 'metric',
-                params
-              },
-              {
-                id: '3',
-                type: 'max',
-                params: { field: '@timestamp' },
-                schema: 'metric'
-              }
-            ],
-            listeners: {}
-          });
-
-          // Grab the aggConfig off the vis (we don't actually use the vis for anything else)
-          aggConfig = vis.aggs.aggs[1];
-          aggDsl = aggConfig.toDsl(vis.aggs);
-        });
-      }
-
-      it(`should return a label prefixed with ${metric.title} of`, function () {
-        init();
-        expect(metricAgg.makeLabel(aggConfig)).to.eql(`${metric.title} of Count`);
-      });
-
-      it(`should return a label ${metric.title} of max bytes`, function () {
-        init({
-          metricAgg: 'custom',
-          customMetric: {
-            id: '1-orderAgg',
-            type: 'max',
-            params: { field: 'bytes' },
-            schema: 'orderAgg'
-          }
-        });
-        expect(metricAgg.makeLabel(aggConfig)).to.eql(`${metric.title} of Max bytes`);
-      });
-
-      it(`should return a label prefixed with number of ${metric.title.toLowerCase()}`, function () {
-        init({
-          metricAgg: 'custom',
-          customMetric: {
-            id: '2-orderAgg',
-            type: metric.name,
-            params: {
-              buckets_path: 'custom',
-              customMetric: {
-                id: '2-orderAgg-orderAgg',
-                type: 'count',
-                schema: 'orderAgg'
-              }
-            },
-            schema: 'orderAgg'
-          }
-        });
-        expect(metricAgg.makeLabel(aggConfig)).to.eql(`2. ${metric.title.toLowerCase()} of Count`);
-      });
-
-      it('should set parent aggs', function () {
-        init({
-          metricAgg: 'custom',
-          customMetric: {
-            id: '2-metric',
-            type: 'max',
-            params: { field: 'bytes' },
-            schema: 'orderAgg'
-          }
-        });
-        expect(aggDsl[metric.dslName || metric.name].buckets_path).to.be('2-metric');
-        expect(aggDsl.parentAggs['2-metric'].max.field).to.be('bytes');
-      });
-
-      it('should set nested parent aggs', function () {
-        init({
-          metricAgg: 'custom',
-          customMetric: {
-            id: '2-metric',
-            type: metric.name,
-            params: {
-              buckets_path: 'custom',
-              customMetric: {
-                id: '2-metric-metric',
-                type: 'max',
-                params: { field: 'bytes' },
-                schema: 'orderAgg'
-              }
-            },
-            schema: 'orderAgg'
-          }
-        });
-        expect(aggDsl[metric.dslName || metric.name].buckets_path).to.be('2-metric');
-        expect(aggDsl.parentAggs['2-metric'][metric.dslName || metric.name].buckets_path).to.be('2-metric-metric');
-      });
-
-      it('should have correct formatter', function () {
-        init({
-          metricAgg: '3'
-        });
-        expect(metricAgg.getFormat(aggConfig).type.id).to.be('date');
-      });
-
-      it('should have correct customMetric nested formatter', function () {
-        init({
-          metricAgg: 'custom',
-          customMetric: {
-            id: '2-metric',
-            type: metric.name,
-            params: {
-              buckets_path: 'custom',
-              customMetric: {
-                id: '2-metric-metric',
-                type: 'max',
-                params: { field: 'bytes' },
-                schema: 'orderAgg'
-              }
-            },
-            schema: 'orderAgg'
-          }
-        });
-        expect(metricAgg.getFormat(aggConfig).type.id).to.be('bytes');
-      });
-
-      it('should call modifyAggConfigOnSearchRequestStart for its customMetric\'s parameters', () => {
-        init({
-          metricAgg: 'custom',
-          customMetric: {
-            id: '2-metric',
-            type: 'max',
-            params: { field: 'bytes' },
-            schema: 'orderAgg'
-          }
-        });
-
-        const searchSource = {};
-        const customMetricSpy = sinon.spy();
-        const customMetric = aggConfig.params.customMetric;
-
-        // Attach a modifyAggConfigOnSearchRequestStart with a spy to the first parameter
-        customMetric.type.params[0].modifyAggConfigOnSearchRequestStart = customMetricSpy;
-
-        aggConfig.type.params.forEach(param => {
-          param.modifyAggConfigOnSearchRequestStart(aggConfig, searchSource);
-        });
-        expect(customMetricSpy.calledWith(customMetric, searchSource)).to.be(true);
-      });
-    });
-  });
-
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/metrics/percentile_ranks.js b/src/legacy/ui/public/agg_types/__tests__/metrics/percentile_ranks.js
deleted file mode 100644
index 1f767f88862625..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/metrics/percentile_ranks.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { percentileRanksMetricAgg } from '../../metrics/percentile_ranks';
-import { VisProvider } from '../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-
-describe('AggTypesMetricsPercentileRanksProvider class', function () {
-
-  let Vis;
-  let indexPattern;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    Vis = Private(VisProvider);
-    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-  }));
-
-  it('uses the custom label if it is set', function () {
-    const vis = new Vis(indexPattern, {});
-
-    // Grab the aggConfig off the vis (we don't actually use the vis for
-    // anything else)
-    const aggConfig = vis.aggs.aggs[0];
-    aggConfig.params.customLabel = 'my custom field label';
-    aggConfig.params.values = [ 5000, 10000 ];
-    aggConfig.params.field = {
-      displayName: 'bytes'
-    };
-
-    const responseAggs = percentileRanksMetricAgg.getResponseAggs(aggConfig);
-    const percentileRankLabelFor5kBytes = responseAggs[0].makeLabel();
-    const percentileRankLabelFor10kBytes = responseAggs[1].makeLabel();
-
-    expect(percentileRankLabelFor5kBytes).to.be('Percentile rank 5,000 of "my custom field label"');
-    expect(percentileRankLabelFor10kBytes).to.be('Percentile rank 10,000 of "my custom field label"');
-  });
-
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/metrics/percentiles.js b/src/legacy/ui/public/agg_types/__tests__/metrics/percentiles.js
deleted file mode 100644
index afbf8b95d6e73e..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/metrics/percentiles.js
+++ /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 expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { percentilesMetricAgg } from '../../metrics/percentiles';
-import { VisProvider } from '../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-
-describe('AggTypesMetricsPercentilesProvider class', function () {
-
-  let Vis;
-  let indexPattern;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    Vis = Private(VisProvider);
-    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-  }));
-
-  it('uses the custom label if it is set', function () {
-    const vis = new Vis(indexPattern, {});
-
-    // Grab the aggConfig off the vis (we don't actually use the vis for
-    // anything else)
-    const aggConfig = vis.aggs.aggs[0];
-    aggConfig.params.customLabel = 'prince';
-    aggConfig.params.percents = [ 95 ];
-    aggConfig.params.field = {
-      displayName: 'bytes'
-    };
-
-    const responseAggs = percentilesMetricAgg.getResponseAggs(aggConfig);
-    const ninetyFifthPercentileLabel = responseAggs[0].makeLabel();
-
-    expect(ninetyFifthPercentileLabel).to.be('95th percentile of prince');
-  });
-
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/metrics/sibling_pipeline.js b/src/legacy/ui/public/agg_types/__tests__/metrics/sibling_pipeline.js
deleted file mode 100644
index aba5db9cedadf6..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/metrics/sibling_pipeline.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import ngMock from 'ng_mock';
-import { bucketSumMetricAgg } from '../../metrics/bucket_sum';
-import { bucketAvgMetricAgg } from '../../metrics/bucket_avg';
-import { bucketMinMetricAgg } from '../../metrics/bucket_min';
-import { bucketMaxMetricAgg } from '../../metrics/bucket_max';
-import { VisProvider } from '../../../vis';
-import StubbedIndexPattern from 'fixtures/stubbed_logstash_index_pattern';
-
-const metrics = [
-  { name: 'sum_bucket', title: 'Overall Sum', provider: bucketSumMetricAgg },
-  { name: 'avg_bucket', title: 'Overall Average', provider: bucketAvgMetricAgg },
-  { name: 'min_bucket', title: 'Overall Min', provider: bucketMinMetricAgg },
-  { name: 'max_bucket', title: 'Overall Max', provider: bucketMaxMetricAgg },
-];
-
-describe('sibling pipeline aggs', function () {
-  metrics.forEach(metric => {
-    describe(`${metric.title} metric`, function () {
-
-      let aggDsl;
-      let metricAgg;
-      let aggConfig;
-
-      function init(settings) {
-        ngMock.module('kibana');
-        ngMock.inject(function (Private) {
-          const Vis = Private(VisProvider);
-          const indexPattern = Private(StubbedIndexPattern);
-          indexPattern.stubSetFieldFormat('bytes', 'bytes');
-          metricAgg = metric.provider;
-
-          const params = settings || {
-            customMetric: {
-              id: '5',
-              type: 'count',
-              schema: 'metric'
-            },
-            customBucket: {
-              id: '6',
-              type: 'date_histogram',
-              schema: 'bucket',
-              params: { field: '@timestamp', interval: '10s' }
-            }
-          };
-
-          const vis = new Vis(indexPattern, {
-            title: 'New Visualization',
-            type: 'metric',
-            params: {
-              fontSize: 60
-            },
-            aggs: [
-              {
-                id: '1',
-                type: 'count',
-                schema: 'metric'
-              },
-              {
-                id: '2',
-                type: metric.name,
-                schema: 'metric',
-                params
-              }
-            ],
-            listeners: {}
-          });
-
-          // Grab the aggConfig off the vis (we don't actually use the vis for anything else)
-          aggConfig = vis.aggs.aggs[1];
-          aggDsl = aggConfig.toDsl(vis.aggs);
-        });
-      }
-
-      it(`should return a label prefixed with ${metric.title} of`, function () {
-        init();
-        expect(metricAgg.makeLabel(aggConfig)).to.eql(`${metric.title} of Count`);
-      });
-
-      it('should set parent aggs', function () {
-        init();
-        expect(aggDsl[metric.name].buckets_path).to.be('2-bucket>_count');
-        expect(aggDsl.parentAggs['2-bucket'].date_histogram).to.not.be.undefined;
-      });
-
-      it('should set nested parent aggs', function () {
-        init({
-          customMetric: {
-            id: '5',
-            type: 'avg',
-            schema: 'metric',
-            params: { field: 'bytes' },
-          },
-          customBucket: {
-            id: '6',
-            type: 'date_histogram',
-            schema: 'bucket',
-            params: { field: '@timestamp', interval: '10s', },
-          }
-        });
-        expect(aggDsl[metric.name].buckets_path).to.be('2-bucket>2-metric');
-        expect(aggDsl.parentAggs['2-bucket'].date_histogram).to.not.be.undefined;
-        expect(aggDsl.parentAggs['2-bucket'].aggs['2-metric'].avg.field).to.equal('bytes');
-      });
-
-      it('should have correct formatter', function () {
-        init({
-          customMetric: {
-            id: '5',
-            type: 'avg',
-            schema: 'metric',
-            params: { field: 'bytes' },
-          },
-          customBucket: {
-            id: '6',
-            type: 'date_histogram',
-            schema: 'bucket',
-            params: { field: '@timestamp', interval: '10s' },
-          }
-        });
-        expect(metricAgg.getFormat(aggConfig).type.id).to.be('bytes');
-      });
-
-      it('should call modifyAggConfigOnSearchRequestStart for nested aggs\' parameters', () => {
-        init();
-
-        const searchSource = {};
-        const customMetricSpy = sinon.spy();
-        const customBucketSpy = sinon.spy();
-        const { customMetric, customBucket } = aggConfig.params;
-
-        // Attach a modifyAggConfigOnSearchRequestStart with a spy to the first parameter
-        customMetric.type.params[0].modifyAggConfigOnSearchRequestStart = customMetricSpy;
-        customBucket.type.params[0].modifyAggConfigOnSearchRequestStart = customBucketSpy;
-
-        aggConfig.type.params.forEach(param => {
-          param.modifyAggConfigOnSearchRequestStart(aggConfig, searchSource);
-        });
-        expect(customMetricSpy.calledWith(customMetric, searchSource)).to.be(true);
-        expect(customBucketSpy.calledWith(customBucket, searchSource)).to.be(true);
-      });
-
-    });
-  });
-
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/metrics/std_deviation.js b/src/legacy/ui/public/agg_types/__tests__/metrics/std_deviation.js
deleted file mode 100644
index b31794f6d9ffe2..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/metrics/std_deviation.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { stdDeviationMetricAgg } from '../../metrics/std_deviation';
-import { VisProvider } from '../../../vis';
-import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-
-describe('AggTypeMetricStandardDeviationProvider class', function () {
-
-  let Vis;
-  let indexPattern;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    Vis = Private(VisProvider);
-    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-  }));
-
-  it('uses the custom label if it is set', function () {
-    const vis = new Vis(indexPattern, {});
-
-    // Grab the aggConfig off the vis (we don't actually use the vis for
-    // anything else)
-    const aggConfig = vis.aggs.aggs[0];
-    aggConfig.params.customLabel = 'custom label';
-    aggConfig.params.field = {
-      displayName: 'memory'
-    };
-
-    const responseAggs = stdDeviationMetricAgg.getResponseAggs(aggConfig);
-    const lowerStdDevLabel = responseAggs[0].makeLabel();
-    const upperStdDevLabel = responseAggs[1].makeLabel();
-
-    expect(lowerStdDevLabel).to.be('Lower custom label');
-    expect(upperStdDevLabel).to.be('Upper custom label');
-  });
-
-  it('uses the default labels if custom label is not set', function () {
-    const vis = new Vis(indexPattern, {});
-
-    // Grab the aggConfig off the vis (we don't actually use the vis for
-    // anything else)
-    const aggConfig = vis.aggs.aggs[0];
-    aggConfig.params.field = {
-      displayName: 'memory'
-    };
-
-    const responseAggs = stdDeviationMetricAgg.getResponseAggs(aggConfig);
-    const lowerStdDevLabel = responseAggs[0].makeLabel();
-    const upperStdDevLabel = responseAggs[1].makeLabel();
-
-    expect(lowerStdDevLabel).to.be('Lower Standard Deviation of memory');
-    expect(upperStdDevLabel).to.be('Upper Standard Deviation of memory');
-  });
-
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/metrics/top_hit.js b/src/legacy/ui/public/agg_types/__tests__/metrics/top_hit.js
deleted file mode 100644
index 927d73793f4692..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/metrics/top_hit.js
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { topHitMetricAgg } from '../../metrics/top_hit';
-import { VisProvider } from '../../../vis';
-import StubbedIndexPattern from 'fixtures/stubbed_logstash_index_pattern';
-
-describe('Top hit metric', function () {
-  let aggDsl;
-  let aggConfig;
-
-  function init({ field, sortOrder = 'desc', aggregate = 'concat', size = 1 }) {
-    ngMock.module('kibana');
-    ngMock.inject(function (Private) {
-      const Vis = Private(VisProvider);
-      const indexPattern = Private(StubbedIndexPattern);
-
-      const params = {};
-      if (field) {
-        params.field = field;
-      }
-      params.sortOrder = {
-        value: sortOrder
-      };
-      params.aggregate = {
-        value: aggregate
-      };
-      params.size = size;
-      const vis = new Vis(indexPattern, {
-        title: 'New Visualization',
-        type: 'metric',
-        params: {
-          fontSize: 60
-        },
-        aggs: [
-          {
-            id: '1',
-            type: 'top_hits',
-            schema: 'metric',
-            params
-          }
-        ],
-        listeners: {}
-      });
-
-      // Grab the aggConfig off the vis (we don't actually use the vis for anything else)
-      aggConfig = vis.aggs.aggs[0];
-      aggDsl = aggConfig.toDsl();
-    });
-  }
-
-  it('should return a label prefixed with Last if sorting in descending order', function () {
-    init({ field: 'bytes' });
-    expect(topHitMetricAgg.makeLabel(aggConfig)).to.eql('Last bytes');
-  });
-
-  it('should return a label prefixed with First if sorting in ascending order', function () {
-    init({
-      field: 'bytes',
-      sortOrder: 'asc'
-    });
-    expect(topHitMetricAgg.makeLabel(aggConfig)).to.eql('First bytes');
-  });
-
-  it('should request the _source field', function () {
-    init({ field: '_source' });
-    expect(aggDsl.top_hits._source).to.be(true);
-    expect(aggDsl.top_hits.docvalue_fields).to.be(undefined);
-  });
-
-  it('requests both source and docvalues_fields for non-text aggregatable fields', function () {
-    init({ field: 'bytes' });
-    expect(aggDsl.top_hits._source).to.be('bytes');
-    expect(aggDsl.top_hits.docvalue_fields).to.eql([ { field: 'bytes', format: 'use_field_mapping' } ]);
-  });
-
-  it('requests both source and docvalues_fields for date aggregatable fields', function () {
-    init({ field: '@timestamp' });
-    expect(aggDsl.top_hits._source).to.be('@timestamp');
-    expect(aggDsl.top_hits.docvalue_fields).to.eql([ { field: '@timestamp', format: 'date_time' } ]);
-  });
-
-  it('requests just source for aggregatable text fields', function () {
-    init({ field: 'machine.os' });
-    expect(aggDsl.top_hits._source).to.be('machine.os');
-    expect(aggDsl.top_hits.docvalue_fields).to.be(undefined);
-  });
-
-  it('requests just source for not-aggregatable text fields', function () {
-    init({ field: 'non-sortable' });
-    expect(aggDsl.top_hits._source).to.be('non-sortable');
-    expect(aggDsl.top_hits.docvalue_fields).to.be(undefined);
-  });
-
-  it('requests just source for not-aggregatable, non-text fields', function () {
-    init({ field: 'hashed' });
-    expect(aggDsl.top_hits._source).to.be('hashed');
-    expect(aggDsl.top_hits.docvalue_fields).to.be(undefined);
-  });
-
-  describe('try to get the value from the top hit', function () {
-    it('should return null if there is no hit', function () {
-      const bucket = {
-        '1': {
-          hits: {
-            hits: []
-          }
-        }
-      };
-
-      init({ field: '@tags' });
-      expect(topHitMetricAgg.getValue(aggConfig, bucket)).to.be(null);
-    });
-
-    it('should return undefined if the field does not appear in the source', function () {
-      const bucket = {
-        '1': {
-          hits: {
-            hits: [
-              {
-                _source: {
-                  bytes: 123
-                }
-              }
-            ]
-          }
-        }
-      };
-
-      init({ field: '@tags' });
-      expect(topHitMetricAgg.getValue(aggConfig, bucket)).to.be(undefined);
-    });
-
-    it('should return the field value from the top hit', function () {
-      const bucket = {
-        '1': {
-          hits: {
-            hits: [
-              {
-                _source: {
-                  '@tags': 'aaa'
-                }
-              }
-            ]
-          }
-        }
-      };
-
-      init({ field: '@tags' });
-      expect(topHitMetricAgg.getValue(aggConfig, bucket)).to.be('aaa');
-    });
-
-    it('should return the object if the field value is an object', function () {
-      const bucket = {
-        '1': {
-          hits: {
-            hits: [
-              {
-                _source: {
-                  '@tags': {
-                    label: 'aaa'
-                  }
-                }
-              }
-            ]
-          }
-        }
-      };
-
-      init({ field: '@tags' });
-      expect(topHitMetricAgg.getValue(aggConfig, bucket)).to.eql({ label: 'aaa' });
-    });
-
-    it('should return an array if the field has more than one values', function () {
-      const bucket = {
-        '1': {
-          hits: {
-            hits: [
-              {
-                _source: {
-                  '@tags': [ 'aaa', 'bbb' ]
-                }
-              }
-            ]
-          }
-        }
-      };
-
-      init({ field: '@tags' });
-      expect(topHitMetricAgg.getValue(aggConfig, bucket)).to.eql([ 'aaa', 'bbb' ]);
-    });
-
-    it('should get the value from the doc_values field if the source does not have that field', function () {
-      const bucket = {
-        '1': {
-          hits: {
-            hits: [
-              {
-                _source: {
-                  'machine.os': 'linux'
-                },
-                fields: {
-                  'machine.os.raw': [ 'linux' ]
-                }
-              }
-            ]
-          }
-        }
-      };
-
-      init({ field: 'machine.os.raw' });
-      expect(topHitMetricAgg.getValue(aggConfig, bucket)).to.be('linux');
-    });
-
-    it('should return undefined if the field is not in the source nor in the doc_values field', function () {
-      const bucket = {
-        '1': {
-          hits: {
-            hits: [
-              {
-                _source: {
-                  bytes: 12345
-                },
-                fields: {
-                  bytes: 12345
-                }
-              }
-            ]
-          }
-        }
-      };
-
-      init({ field: 'machine.os.raw' });
-      expect(topHitMetricAgg.getValue(aggConfig, bucket)).to.be(undefined);
-    });
-
-    describe('Multivalued field and first/last X docs', function () {
-      it('should return a label prefixed with Last X docs if sorting in descending order', function () {
-        init({
-          field: 'bytes',
-          size: 2
-        });
-        expect(topHitMetricAgg.makeLabel(aggConfig)).to.eql('Last 2 bytes');
-      });
-
-      it('should return a label prefixed with First X docs if sorting in ascending order', function () {
-        init({
-          field: 'bytes',
-          size: 2,
-          sortOrder: 'asc'
-        });
-        expect(topHitMetricAgg.makeLabel(aggConfig)).to.eql('First 2 bytes');
-      });
-
-      [
-        {
-          description: 'concat values with a comma',
-          type: 'concat',
-          data: [ 1, 2, 3 ],
-          result: [ 1, 2, 3 ]
-        },
-        {
-          description: 'sum up the values',
-          type: 'sum',
-          data: [ 1, 2, 3 ],
-          result: 6
-        },
-        {
-          description: 'take the minimum value',
-          type: 'min',
-          data: [ 1, 2, 3 ],
-          result: 1
-        },
-        {
-          description: 'take the maximum value',
-          type: 'max',
-          data: [ 1, 2, 3 ],
-          result: 3
-        },
-        {
-          description: 'take the average value',
-          type: 'average',
-          data: [ 1, 2, 3 ],
-          result: 2
-        },
-        {
-          description: 'support null/undefined',
-          type: 'min',
-          data: [ undefined, null ],
-          result: null
-        },
-        {
-          description: 'support null/undefined',
-          type: 'max',
-          data: [ undefined, null ],
-          result: null
-        },
-        {
-          description: 'support null/undefined',
-          type: 'sum',
-          data: [ undefined, null ],
-          result: null
-        },
-        {
-          description: 'support null/undefined',
-          type: 'average',
-          data: [ undefined, null ],
-          result: null
-        }
-      ]
-        .forEach(agg => {
-          it(`should return the result of the ${agg.type} aggregation over the last doc - ${agg.description}`, function () {
-            const bucket = {
-              '1': {
-                hits: {
-                  hits: [
-                    {
-                      _source: {
-                        bytes: agg.data
-                      }
-                    }
-                  ]
-                }
-              }
-            };
-
-            init({ field: 'bytes', aggregate: agg.type });
-            expect(topHitMetricAgg.getValue(aggConfig, bucket)).to.eql(agg.result);
-          });
-
-          it(`should return the result of the ${agg.type} aggregation over the last X docs - ${agg.description}`, function () {
-            const bucket = {
-              '1': {
-                hits: {
-                  hits: [
-                    {
-                      _source: {
-                        bytes: _.dropRight(agg.data, 1)
-                      }
-                    },
-                    {
-                      _source: {
-                        bytes: _.last(agg.data)
-                      }
-                    }
-                  ]
-                }
-              }
-            };
-
-            init({ field: 'bytes', aggregate: agg.type });
-            expect(topHitMetricAgg.getValue(aggConfig, bucket)).to.eql(agg.result);
-          });
-        });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/agg_types/__tests__/utils/_stub_agg_params.js b/src/legacy/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
deleted file mode 100644
index f30572bcc0ed54..00000000000000
--- a/src/legacy/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import sinon from 'sinon';
-import { BaseParamType } from '../../param_types/base';
-import { FieldParamType } from '../../param_types/field';
-import { OptionedParamType } from '../../param_types/optioned';
-import { createLegacyClass } from '../../../utils/legacy_class';
-
-function ParamClassStub(parent, body) {
-  const stub = sinon.spy(body || function () {
-    stub.Super && stub.Super.call(this);
-  });
-  if (parent) createLegacyClass(stub).inherits(parent);
-  return stub;
-}
-
-/**
- * stub all of the param classes, but ensure that they still inherit properly.
- * This method should be passed directly to ngMock.inject();
- *
- * ```js
- * let stubParamClasses = require('./utils/_stub_agg_params');
- * describe('something', function () {
- *   beforeEach(ngMock.inject(stubParamClasses));
- * })
- * ```
- *
- * @param  {PrivateLoader} Private - The private module loader, inject by passing this function to ngMock.inject()
- * @return {undefined}
- */
-// eslint-disable-next-line import/no-default-export
-export default function stubParamClasses(Private) {
-  const BaseAggParam = Private.stub(
-    BaseParamType,
-    new ParamClassStub(null, function (config) {
-      _.assign(this, config);
-    })
-  );
-
-  Private.stub(
-    FieldParamType,
-    new ParamClassStub(BaseAggParam)
-  );
-
-  Private.stub(
-    OptionedParamType,
-    new ParamClassStub(BaseAggParam)
-  );
-}
diff --git a/src/legacy/ui/public/agg_types/agg_config.ts b/src/legacy/ui/public/agg_types/agg_config.ts
index a5b1aa7cf9c0b4..eedfc1cc05a84f 100644
--- a/src/legacy/ui/public/agg_types/agg_config.ts
+++ b/src/legacy/ui/public/agg_types/agg_config.ts
@@ -332,7 +332,7 @@ export class AggConfig {
     return this.type.getValue(this, bucket);
   }
 
-  getKey(bucket: any, key: string) {
+  getKey(bucket: any, key?: string) {
     if (this.type.getKey) {
       return this.type.getKey(bucket, key, this);
     } else {
diff --git a/src/legacy/ui/public/agg_types/buckets/_terms_other_bucket_helper.js b/src/legacy/ui/public/agg_types/buckets/_terms_other_bucket_helper.js
index 5dfa2e3d6ae3f6..70bca2e40ae3fa 100644
--- a/src/legacy/ui/public/agg_types/buckets/_terms_other_bucket_helper.js
+++ b/src/legacy/ui/public/agg_types/buckets/_terms_other_bucket_helper.js
@@ -18,8 +18,9 @@
  */
 
 import _ from 'lodash';
-import { buildExistsFilter, buildPhrasesFilter, buildQueryFromFilters } from '@kbn/es-query';
+import { buildQueryFromFilters } from '@kbn/es-query';
 import { AggGroupNames } from '../../vis/editors/default/agg_groups';
+import { esFilters } from '../../../../../plugins/data/public';
 
 /**
  * walks the aggregation DSL and returns DSL starting at aggregation with id of startFromAggId
@@ -180,7 +181,7 @@ export const buildOtherBucketAgg = (aggConfigs, aggWithOtherBucket, response) =>
       agg.buckets.some(bucket => bucket.key === '__missing__')
     ) {
       filters.push(
-        buildExistsFilter(
+        esFilters.buildExistsFilter(
           aggWithOtherBucket.params.field,
           aggWithOtherBucket.params.field.indexPattern
         )
@@ -232,7 +233,7 @@ export const mergeOtherBucketAggResponse = (
     );
     const requestFilterTerms = getOtherAggTerms(requestAgg, key, otherAgg);
 
-    const phraseFilter = buildPhrasesFilter(
+    const phraseFilter = esFilters.buildPhrasesFilter(
       otherAgg.params.field,
       requestFilterTerms,
       otherAgg.params.field.indexPattern
@@ -243,7 +244,7 @@ export const mergeOtherBucketAggResponse = (
 
     if (aggResultBuckets.some(bucket => bucket.key === '__missing__')) {
       bucket.filters.push(
-        buildExistsFilter(otherAgg.params.field, otherAgg.params.field.indexPattern)
+        esFilters.buildExistsFilter(otherAgg.params.field, otherAgg.params.field.indexPattern)
       );
     }
     aggResultBuckets.push(bucket);
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.test.ts
new file mode 100644
index 00000000000000..9426df7d34c29e
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.test.ts
@@ -0,0 +1,122 @@
+/*
+ * 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 { createFilterDateHistogram } from './date_histogram';
+import { intervalOptions } from '../_interval_options';
+import { AggConfigs } from '../../agg_configs';
+import { IBucketDateHistogramAggConfig } from '../date_histogram';
+import { BUCKET_TYPES } from '../bucket_agg_types';
+import { esFilters } from '../../../../../../plugins/data/public';
+
+jest.mock('ui/new_platform');
+
+describe('AggConfig Filters', () => {
+  describe('date_histogram', () => {
+    let agg: IBucketDateHistogramAggConfig;
+    let filter: esFilters.RangeFilter;
+    let bucketStart: any;
+    let field: any;
+
+    const init = (interval: string = 'auto', duration: any = moment.duration(15, 'minutes')) => {
+      field = {
+        name: 'date',
+      };
+
+      const indexPattern = {
+        id: '1234',
+        title: 'logstash-*',
+        fields: {
+          getByName: () => field,
+          filter: () => [field],
+        },
+      } as any;
+      const aggConfigs = new AggConfigs(
+        indexPattern,
+        [
+          {
+            type: BUCKET_TYPES.DATE_HISTOGRAM,
+            schema: 'segment',
+            params: { field: field.name, interval, customInterval: '5d' },
+          },
+        ],
+        null
+      );
+      const bucketKey = 1422579600000;
+
+      agg = aggConfigs.aggs[0] as IBucketDateHistogramAggConfig;
+      bucketStart = moment(bucketKey);
+
+      const timePad = moment.duration(duration / 2);
+
+      agg.buckets.setBounds({
+        min: bucketStart.clone().subtract(timePad),
+        max: bucketStart.clone().add(timePad),
+      });
+      agg.buckets.setInterval(interval);
+      filter = createFilterDateHistogram(agg, bucketKey);
+    };
+
+    it('creates a valid range filter', () => {
+      init();
+
+      expect(filter).toHaveProperty('range');
+      expect(filter.range).toHaveProperty(field.name);
+
+      const fieldParams = filter.range[field.name];
+      expect(fieldParams).toHaveProperty('gte');
+      expect(typeof fieldParams.gte).toBe('string');
+
+      expect(fieldParams).toHaveProperty('lt');
+      expect(typeof fieldParams.lt).toBe('string');
+
+      expect(fieldParams).toHaveProperty('format');
+      expect(fieldParams.format).toBe('strict_date_optional_time');
+
+      expect(filter).toHaveProperty('meta');
+      expect(filter.meta).toHaveProperty('index', '1234');
+    });
+
+    it('extends the filter edge to 1ms before the next bucket for all interval options', () => {
+      intervalOptions.forEach(option => {
+        let duration;
+        if (option.val !== 'custom' && moment(1, option.val).isValid()) {
+          // @ts-ignore
+          duration = moment.duration(10, option.val);
+
+          if (+duration < 10) {
+            throw new Error('unable to create interval for ' + option.val);
+          }
+        }
+        init(option.val, duration);
+
+        const interval = agg.buckets.getInterval();
+        const params = filter.range[field.name];
+
+        expect(params.gte).toBe(bucketStart.toISOString());
+        expect(params.lt).toBe(
+          bucketStart
+            .clone()
+            .add(interval)
+            .toISOString()
+        );
+      });
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.ts
index 6bda085335309d..f91a92eab1c33f 100644
--- a/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.ts
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/date_histogram.ts
@@ -18,14 +18,17 @@
  */
 
 import moment from 'moment';
-import { buildRangeFilter } from '@kbn/es-query';
 import { IBucketDateHistogramAggConfig } from '../date_histogram';
+import { esFilters } from '../../../../../../plugins/data/public';
 
-export const createFilterDateHistogram = (agg: IBucketDateHistogramAggConfig, key: string) => {
+export const createFilterDateHistogram = (
+  agg: IBucketDateHistogramAggConfig,
+  key: string | number
+) => {
   const start = moment(key);
   const interval = agg.buckets.getInterval();
 
-  return buildRangeFilter(
+  return esFilters.buildRangeFilter(
     agg.params.field,
     {
       gte: start.toISOString(),
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.test.ts
new file mode 100644
index 00000000000000..35b6c38bad799f
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.test.ts
@@ -0,0 +1,77 @@
+/*
+ * 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 { createFilterDateRange } from './date_range';
+import { DateFormat } from '../../../../../../plugins/data/common';
+import { AggConfigs } from '../../agg_configs';
+import { BUCKET_TYPES } from '../bucket_agg_types';
+
+jest.mock('ui/new_platform');
+
+describe('AggConfig Filters', () => {
+  describe('Date range', () => {
+    const getAggConfigs = () => {
+      const field = {
+        name: '@timestamp',
+        format: new DateFormat({}, () => {}),
+      };
+
+      const indexPattern = {
+        id: '1234',
+        title: 'logstash-*',
+        fields: {
+          getByName: () => field,
+          filter: () => [field],
+        },
+      } as any;
+
+      return new AggConfigs(
+        indexPattern,
+        [
+          {
+            type: BUCKET_TYPES.DATE_RANGE,
+            params: {
+              field: '@timestamp',
+              ranges: [{ from: '2014-01-01', to: '2014-12-31' }],
+            },
+          },
+        ],
+        null
+      );
+    };
+
+    it('should return a range filter for date_range agg', () => {
+      const aggConfigs = getAggConfigs();
+      const from = new Date('1 Feb 2015');
+      const to = new Date('7 Feb 2015');
+      const filter = createFilterDateRange(aggConfigs.aggs[0], {
+        from: from.valueOf(),
+        to: to.valueOf(),
+      });
+
+      expect(filter).toHaveProperty('range');
+      expect(filter).toHaveProperty('meta');
+      expect(filter.meta).toHaveProperty('index', '1234');
+      expect(filter.range).toHaveProperty('@timestamp');
+      expect(filter.range['@timestamp']).toHaveProperty('gte', moment(from).toISOString());
+      expect(filter.range['@timestamp']).toHaveProperty('lt', moment(to).toISOString());
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.ts
index cd4b0ffc215b07..01689d954a0723 100644
--- a/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.ts
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/date_range.ts
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-import { buildRangeFilter, RangeFilterParams } from '@kbn/es-query';
 import moment from 'moment';
 import { IBucketAggConfig } from '../_bucket_agg_type';
 import { DateRangeKey } from '../date_range';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export const createFilterDateRange = (agg: IBucketAggConfig, { from, to }: DateRangeKey) => {
-  const filter: RangeFilterParams = {};
+  const filter: esFilters.RangeFilterParams = {};
   if (from) filter.gte = moment(from).toISOString();
   if (to) filter.lt = moment(to).toISOString();
   if (to && from) filter.format = 'strict_date_optional_time';
 
-  return buildRangeFilter(agg.params.field, filter, agg.getIndexPattern());
+  return esFilters.buildRangeFilter(agg.params.field, filter, agg.getIndexPattern());
 };
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/filters.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/filters.test.ts
new file mode 100644
index 00000000000000..125532fe070ba8
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/filters.test.ts
@@ -0,0 +1,66 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { createFilterFilters } from './filters';
+import { AggConfigs } from '../../agg_configs';
+
+jest.mock('ui/new_platform');
+
+describe('AggConfig Filters', () => {
+  describe('filters', () => {
+    const getAggConfigs = () => {
+      const field = {
+        name: 'bytes',
+      };
+
+      const indexPattern = {
+        id: '1234',
+        title: 'logstash-*',
+        fields: {
+          getByName: () => field,
+          filter: () => [field],
+        },
+      } as any;
+
+      return new AggConfigs(
+        indexPattern,
+        [
+          {
+            type: 'filters',
+            schema: 'segment',
+            params: {
+              filters: [
+                { input: { query: 'type:apache', language: 'lucene' } },
+                { input: { query: 'type:nginx', language: 'lucene' } },
+              ],
+            },
+          },
+        ],
+        null
+      );
+    };
+    it('should return a filters filter', () => {
+      const aggConfigs = getAggConfigs();
+      const filter = createFilterFilters(aggConfigs.aggs[0], 'type:nginx');
+
+      expect(filter!.query.bool.must[0].query_string.query).toBe('type:nginx');
+      expect(filter!.meta).toHaveProperty('index', '1234');
+      expect(filter!.meta).toHaveProperty('alias', 'type:nginx');
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/filters.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/filters.ts
index bf30b333056bcf..6b614514580b6d 100644
--- a/src/legacy/ui/public/agg_types/buckets/create_filter/filters.ts
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/filters.ts
@@ -18,8 +18,8 @@
  */
 
 import { get } from 'lodash';
-import { buildQueryFilter } from '@kbn/es-query';
 import { IBucketAggConfig } from '../_bucket_agg_type';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export const createFilterFilters = (aggConfig: IBucketAggConfig, key: string) => {
   // have the aggConfig write agg dsl params
@@ -28,6 +28,6 @@ export const createFilterFilters = (aggConfig: IBucketAggConfig, key: string) =>
   const indexPattern = aggConfig.getIndexPattern();
 
   if (filter && indexPattern && indexPattern.id) {
-    return buildQueryFilter(filter.query, indexPattern.id, key);
+    return esFilters.buildQueryFilter(filter.query, indexPattern.id, key);
   }
 };
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.test.ts
new file mode 100644
index 00000000000000..0095df75b8914e
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.test.ts
@@ -0,0 +1,73 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { createFilterHistogram } from './histogram';
+import { AggConfigs } from '../../agg_configs';
+import { BUCKET_TYPES } from '../bucket_agg_types';
+import { BytesFormat } from '../../../../../../plugins/data/common';
+
+jest.mock('ui/new_platform');
+
+describe('AggConfig Filters', () => {
+  describe('histogram', () => {
+    const getAggConfigs = () => {
+      const field = {
+        name: 'bytes',
+        format: new BytesFormat({}, () => {}),
+      };
+
+      const indexPattern = {
+        id: '1234',
+        title: 'logstash-*',
+        fields: {
+          getByName: () => field,
+          filter: () => [field],
+        },
+      } as any;
+
+      return new AggConfigs(
+        indexPattern,
+        [
+          {
+            id: BUCKET_TYPES.HISTOGRAM,
+            type: BUCKET_TYPES.HISTOGRAM,
+            schema: 'buckets',
+            params: {
+              field: 'bytes',
+              interval: 1024,
+            },
+          },
+        ],
+        null
+      );
+    };
+
+    it('should return an range filter for histogram', () => {
+      const aggConfigs = getAggConfigs();
+      const filter = createFilterHistogram(aggConfigs.aggs[0], '2048');
+
+      expect(filter).toHaveProperty('meta');
+      expect(filter.meta).toHaveProperty('index', '1234');
+      expect(filter).toHaveProperty('range');
+      expect(filter.range).toHaveProperty('bytes');
+      expect(filter.range.bytes).toHaveProperty('gte', 2048);
+      expect(filter.range.bytes).toHaveProperty('lt', 3072);
+      expect(filter.meta).toHaveProperty('formattedValue', '2,048');
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.ts
index 37d5c6bc8adc1f..fc587fa9ecdb6b 100644
--- a/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.ts
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/histogram.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import { buildRangeFilter, RangeFilterParams } from '@kbn/es-query';
 import { IBucketAggConfig } from '../_bucket_agg_type';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export const createFilterHistogram = (aggConfig: IBucketAggConfig, key: string) => {
   const value = parseInt(key, 10);
-  const params: RangeFilterParams = { gte: value, lt: value + aggConfig.params.interval };
+  const params: esFilters.RangeFilterParams = { gte: value, lt: value + aggConfig.params.interval };
 
-  return buildRangeFilter(
+  return esFilters.buildRangeFilter(
     aggConfig.params.field,
     params,
     aggConfig.getIndexPattern(),
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.test.ts
new file mode 100644
index 00000000000000..2e030d820b3963
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.test.ts
@@ -0,0 +1,104 @@
+/*
+ * 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 { createFilterIpRange } from './ip_range';
+import { AggConfigs } from '../../agg_configs';
+import { IpFormat } from '../../../../../../plugins/data/common';
+import { BUCKET_TYPES } from '../bucket_agg_types';
+
+jest.mock('ui/new_platform');
+
+describe('AggConfig Filters', () => {
+  describe('IP range', () => {
+    const getAggConfigs = (aggs: Array<Record<string, any>>) => {
+      const field = {
+        name: 'ip',
+        format: IpFormat,
+      };
+
+      const indexPattern = {
+        id: '1234',
+        title: 'logstash-*',
+        fields: {
+          getByName: () => field,
+          filter: () => [field],
+        },
+      } as any;
+
+      return new AggConfigs(indexPattern, aggs, null);
+    };
+
+    it('should return a range filter for ip_range agg', () => {
+      const aggConfigs = getAggConfigs([
+        {
+          type: BUCKET_TYPES.IP_RANGE,
+          schema: 'segment',
+          params: {
+            field: 'ip',
+            ipRangeType: 'range',
+            ranges: {
+              fromTo: [{ from: '0.0.0.0', to: '1.1.1.1' }],
+            },
+          },
+        },
+      ]);
+
+      const filter = createFilterIpRange(aggConfigs.aggs[0], {
+        type: 'range',
+        from: '0.0.0.0',
+        to: '1.1.1.1',
+      });
+
+      expect(filter).toHaveProperty('range');
+      expect(filter).toHaveProperty('meta');
+      expect(filter.meta).toHaveProperty('index', '1234');
+      expect(filter.range).toHaveProperty('ip');
+      expect(filter.range.ip).toHaveProperty('gte', '0.0.0.0');
+      expect(filter.range.ip).toHaveProperty('lte', '1.1.1.1');
+    });
+
+    it('should return a range filter for ip_range agg using a CIDR mask', () => {
+      const aggConfigs = getAggConfigs([
+        {
+          type: BUCKET_TYPES.IP_RANGE,
+          schema: 'segment',
+          params: {
+            field: 'ip',
+            ipRangeType: 'mask',
+            ranges: {
+              mask: [{ mask: '67.129.65.201/27' }],
+            },
+          },
+        },
+      ]);
+
+      const filter = createFilterIpRange(aggConfigs.aggs[0], {
+        type: 'mask',
+        mask: '67.129.65.201/27',
+      });
+
+      expect(filter).toHaveProperty('range');
+      expect(filter).toHaveProperty('meta');
+      expect(filter.meta).toHaveProperty('index', '1234');
+      expect(filter.range).toHaveProperty('ip');
+      expect(filter.range.ip).toHaveProperty('gte', '67.129.65.192');
+      expect(filter.range.ip).toHaveProperty('lte', '67.129.65.223');
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.ts
index 83769578725f29..803f6d97ae42d3 100644
--- a/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.ts
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/ip_range.ts
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-import { buildRangeFilter, RangeFilterParams } from '@kbn/es-query';
 import { CidrMask } from '../../../utils/cidr_mask';
 import { IBucketAggConfig } from '../_bucket_agg_type';
 import { IpRangeKey } from '../ip_range';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export const createFilterIpRange = (aggConfig: IBucketAggConfig, key: IpRangeKey) => {
-  let range: RangeFilterParams;
+  let range: esFilters.RangeFilterParams;
 
   if (key.type === 'mask') {
     range = new CidrMask(key.mask).getRange();
@@ -34,7 +34,7 @@ export const createFilterIpRange = (aggConfig: IBucketAggConfig, key: IpRangeKey
     };
   }
 
-  return buildRangeFilter(
+  return esFilters.buildRangeFilter(
     aggConfig.params.field,
     { gte: range.from, lte: range.to },
     aggConfig.getIndexPattern()
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/range.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/range.test.ts
new file mode 100644
index 00000000000000..04476ba62ccd5f
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/range.test.ts
@@ -0,0 +1,74 @@
+/*
+ * 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 { createFilterRange } from './range';
+import { BytesFormat } from '../../../../../../plugins/data/common';
+import { AggConfigs } from '../../agg_configs';
+import { BUCKET_TYPES } from '../bucket_agg_types';
+
+jest.mock('ui/new_platform');
+
+describe('AggConfig Filters', () => {
+  describe('range', () => {
+    const getAggConfigs = () => {
+      const field = {
+        name: 'bytes',
+        format: new BytesFormat({}, () => {}),
+      };
+
+      const indexPattern = {
+        id: '1234',
+        title: 'logstash-*',
+        fields: {
+          getByName: () => field,
+          filter: () => [field],
+        },
+      } as any;
+
+      return new AggConfigs(
+        indexPattern,
+        [
+          {
+            id: BUCKET_TYPES.RANGE,
+            type: BUCKET_TYPES.RANGE,
+            schema: 'buckets',
+            params: {
+              field: 'bytes',
+              ranges: [{ from: 1024, to: 2048 }],
+            },
+          },
+        ],
+        null
+      );
+    };
+
+    it('should return a range filter for range agg', () => {
+      const aggConfigs = getAggConfigs();
+      const filter = createFilterRange(aggConfigs.aggs[0], { gte: 1024, lt: 2048.0 });
+
+      expect(filter).toHaveProperty('range');
+      expect(filter).toHaveProperty('meta');
+      expect(filter.meta).toHaveProperty('index', '1234');
+      expect(filter.range).toHaveProperty('bytes');
+      expect(filter.range.bytes).toHaveProperty('gte', 1024.0);
+      expect(filter.range.bytes).toHaveProperty('lt', 2048.0);
+      expect(filter.meta).toHaveProperty('formattedValue', '≥ 1,024 and < 2,048');
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/range.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/range.ts
index cf2c83884651a1..929827c6e3fec6 100644
--- a/src/legacy/ui/public/agg_types/buckets/create_filter/range.ts
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/range.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { buildRangeFilter } from '@kbn/es-query';
 import { IBucketAggConfig } from '../_bucket_agg_type';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export const createFilterRange = (aggConfig: IBucketAggConfig, params: any) => {
-  return buildRangeFilter(
+  return esFilters.buildRangeFilter(
     aggConfig.params.field,
     params,
     aggConfig.getIndexPattern(),
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/terms.test.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/terms.test.ts
new file mode 100644
index 00000000000000..42f8349d5a2a3d
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/terms.test.ts
@@ -0,0 +1,118 @@
+/*
+ * 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 { createFilterTerms } from './terms';
+import { AggConfigs } from '../../agg_configs';
+import { BUCKET_TYPES } from '../bucket_agg_types';
+import { esFilters } from '../../../../../../plugins/data/public';
+
+jest.mock('ui/new_platform');
+
+describe('AggConfig Filters', () => {
+  describe('terms', () => {
+    const getAggConfigs = (aggs: Array<Record<string, any>>) => {
+      const indexPattern = {
+        id: '1234',
+        title: 'logstash-*',
+        fields: {
+          getByName: () => field,
+          filter: () => [field],
+        },
+      } as any;
+
+      const field = {
+        name: 'field',
+        indexPattern,
+      };
+
+      return new AggConfigs(indexPattern, aggs, null);
+    };
+
+    it('should return a match_phrase filter for terms', () => {
+      const aggConfigs = getAggConfigs([
+        { type: BUCKET_TYPES.TERMS, schema: 'segment', params: { field: 'field' } },
+      ]);
+
+      const filter = createFilterTerms(aggConfigs.aggs[0], 'apache', {}) as esFilters.Filter;
+
+      expect(filter).toHaveProperty('query');
+      expect(filter.query).toHaveProperty('match_phrase');
+      expect(filter.query.match_phrase).toHaveProperty('field');
+      expect(filter.query.match_phrase.field).toBe('apache');
+      expect(filter).toHaveProperty('meta');
+      expect(filter.meta).toHaveProperty('index', '1234');
+    });
+
+    it('should set query to true or false for boolean filter', () => {
+      const aggConfigs = getAggConfigs([
+        { type: BUCKET_TYPES.TERMS, schema: 'segment', params: { field: 'field' } },
+      ]);
+
+      const filterFalse = createFilterTerms(aggConfigs.aggs[0], '', {}) as esFilters.Filter;
+
+      expect(filterFalse).toHaveProperty('query');
+      expect(filterFalse.query).toHaveProperty('match_phrase');
+      expect(filterFalse.query.match_phrase).toHaveProperty('field');
+      expect(filterFalse.query.match_phrase.field).toBeFalsy();
+
+      const filterTrue = createFilterTerms(aggConfigs.aggs[0], '1', {}) as esFilters.Filter;
+
+      expect(filterTrue).toHaveProperty('query');
+      expect(filterTrue.query).toHaveProperty('match_phrase');
+      expect(filterTrue.query.match_phrase).toHaveProperty('field');
+      expect(filterTrue.query.match_phrase.field).toBeTruthy();
+    });
+    //
+    it('should generate correct __missing__ filter', () => {
+      const aggConfigs = getAggConfigs([
+        { type: BUCKET_TYPES.TERMS, schema: 'segment', params: { field: 'field' } },
+      ]);
+      const filter = createFilterTerms(
+        aggConfigs.aggs[0],
+        '__missing__',
+        {}
+      ) as esFilters.ExistsFilter;
+
+      expect(filter).toHaveProperty('exists');
+      expect(filter.exists).toHaveProperty('field', 'field');
+      expect(filter).toHaveProperty('meta');
+      expect(filter.meta).toHaveProperty('index', '1234');
+      expect(filter.meta).toHaveProperty('negate', true);
+    });
+    //
+    it('should generate correct __other__ filter', () => {
+      const aggConfigs = getAggConfigs([
+        { type: BUCKET_TYPES.TERMS, schema: 'segment', params: { field: 'field' } },
+      ]);
+
+      const [filter] = createFilterTerms(aggConfigs.aggs[0], '__other__', {
+        terms: ['apache'],
+      }) as esFilters.Filter[];
+
+      expect(filter).toHaveProperty('query');
+      expect(filter.query).toHaveProperty('bool');
+      expect(filter.query.bool).toHaveProperty('should');
+      expect(filter.query.bool.should[0]).toHaveProperty('match_phrase');
+      expect(filter.query.bool.should[0].match_phrase).toHaveProperty('field', 'apache');
+      expect(filter).toHaveProperty('meta');
+      expect(filter.meta).toHaveProperty('index', '1234');
+      expect(filter.meta).toHaveProperty('negate', true);
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/create_filter/terms.ts b/src/legacy/ui/public/agg_types/buckets/create_filter/terms.ts
index e5d4406c752c7c..5bd770e672786d 100644
--- a/src/legacy/ui/public/agg_types/buckets/create_filter/terms.ts
+++ b/src/legacy/ui/public/agg_types/buckets/create_filter/terms.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Filter, buildPhraseFilter, buildPhrasesFilter, buildExistsFilter } from '@kbn/es-query';
 import { IBucketAggConfig } from '../_bucket_agg_type';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 export const createFilterTerms = (aggConfig: IBucketAggConfig, key: string, params: any) => {
   const field = aggConfig.params.field;
@@ -27,20 +27,20 @@ export const createFilterTerms = (aggConfig: IBucketAggConfig, key: string, para
   if (key === '__other__') {
     const terms = params.terms;
 
-    const phraseFilter = buildPhrasesFilter(field, terms, indexPattern);
+    const phraseFilter = esFilters.buildPhrasesFilter(field, terms, indexPattern);
     phraseFilter.meta.negate = true;
 
-    const filters: Filter[] = [phraseFilter];
+    const filters: esFilters.Filter[] = [phraseFilter];
 
     if (terms.some((term: string) => term === '__missing__')) {
-      filters.push(buildExistsFilter(field, indexPattern));
+      filters.push(esFilters.buildExistsFilter(field, indexPattern));
     }
 
     return filters;
   } else if (key === '__missing__') {
-    const existsFilter = buildExistsFilter(field, indexPattern);
+    const existsFilter = esFilters.buildExistsFilter(field, indexPattern);
     existsFilter.meta.negate = true;
     return existsFilter;
   }
-  return buildPhraseFilter(field, key, indexPattern);
+  return esFilters.buildPhraseFilter(field, key, indexPattern);
 };
diff --git a/src/legacy/ui/public/agg_types/buckets/date_histogram.ts b/src/legacy/ui/public/agg_types/buckets/date_histogram.ts
index 4c2e67f758a7e2..e86d561a1c79bd 100644
--- a/src/legacy/ui/public/agg_types/buckets/date_histogram.ts
+++ b/src/legacy/ui/public/agg_types/buckets/date_histogram.ts
@@ -32,7 +32,6 @@ import { ScaleMetricsParamEditor } from '../../vis/editors/default/controls/scal
 import { dateHistogramInterval } from '../../../../core_plugins/data/public';
 import { writeParams } from '../agg_params';
 import { AggConfigs } from '../agg_configs';
-import { AggConfig } from '../agg_config';
 import { isMetricAggType } from '../metrics/metric_agg_type';
 
 import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common';
@@ -189,7 +188,7 @@ export const dateHistogramBucketAgg = new BucketAggType<IBucketDateHistogramAggC
         const scaleMetrics = scaleMetricValues && interval.scaled && interval.scale < 1;
         if (scaleMetrics && aggs) {
           const metrics = aggs.aggs.filter(a => isMetricAggType(a.type));
-          const all = _.every(metrics, (a: AggConfig) => {
+          const all = _.every(metrics, (a: IBucketAggConfig) => {
             const { type } = a;
 
             if (isMetricAggType(type)) {
diff --git a/src/legacy/ui/public/agg_types/buckets/date_range.test.ts b/src/legacy/ui/public/agg_types/buckets/date_range.test.ts
new file mode 100644
index 00000000000000..7d9fe002636a21
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/date_range.test.ts
@@ -0,0 +1,112 @@
+/*
+ * 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 { AggConfigs } from '../agg_configs';
+import { BUCKET_TYPES } from './bucket_agg_types';
+import { npStart } from 'ui/new_platform';
+
+jest.mock('ui/new_platform');
+
+describe('date_range params', () => {
+  const getAggConfigs = (params: Record<string, any> = {}, hasIncludeTypeMeta: boolean = true) => {
+    const field = {
+      name: 'bytes',
+    };
+
+    const indexPattern = {
+      id: '1234',
+      title: 'logstash-*',
+      fields: {
+        getByName: () => field,
+        filter: () => [field],
+      },
+      typeMeta: hasIncludeTypeMeta
+        ? {
+            aggs: {
+              date_range: {
+                bytes: {
+                  time_zone: 'defaultTimeZone',
+                },
+              },
+            },
+          }
+        : undefined,
+    } as any;
+
+    return new AggConfigs(
+      indexPattern,
+      [
+        {
+          id: BUCKET_TYPES.DATE_RANGE,
+          type: BUCKET_TYPES.DATE_RANGE,
+          schema: 'buckets',
+          params,
+        },
+      ],
+      null
+    );
+  };
+
+  describe('getKey', () => {
+    it('should return object', () => {
+      const aggConfigs = getAggConfigs();
+      const dateRange = aggConfigs.aggs[0];
+      const bucket = { from: 'from-date', to: 'to-date', key: 'from-dateto-date' };
+
+      expect(dateRange.getKey(bucket)).toEqual({ from: 'from-date', to: 'to-date' });
+    });
+  });
+
+  describe('time_zone', () => {
+    it('should use the specified time_zone', () => {
+      const aggConfigs = getAggConfigs({
+        time_zone: 'Europe/Minsk',
+        field: 'bytes',
+      });
+      const dateRange = aggConfigs.aggs[0];
+      const params = dateRange.toDsl()[BUCKET_TYPES.DATE_RANGE];
+
+      expect(params.time_zone).toBe('Europe/Minsk');
+    });
+
+    it('should use the fixed time_zone from the index pattern typeMeta', () => {
+      const aggConfigs = getAggConfigs({
+        field: 'bytes',
+      });
+      const dateRange = aggConfigs.aggs[0];
+      const params = dateRange.toDsl()[BUCKET_TYPES.DATE_RANGE];
+
+      expect(params.time_zone).toBe('defaultTimeZone');
+    });
+
+    it('should use the Kibana time_zone if no parameter specified', () => {
+      npStart.core.uiSettings.get = jest.fn(() => 'kibanaTimeZone');
+
+      const aggConfigs = getAggConfigs(
+        {
+          field: 'bytes',
+        },
+        false
+      );
+      const dateRange = aggConfigs.aggs[0];
+      const params = dateRange.toDsl()[BUCKET_TYPES.DATE_RANGE];
+
+      expect(params.time_zone).toBe('kibanaTimeZone');
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/date_range.ts b/src/legacy/ui/public/agg_types/buckets/date_range.ts
index dd7f0cb972ae22..4de6002e2e3746 100644
--- a/src/legacy/ui/public/agg_types/buckets/date_range.ts
+++ b/src/legacy/ui/public/agg_types/buckets/date_range.ts
@@ -21,9 +21,8 @@ import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
 import { npStart } from 'ui/new_platform';
 import { BUCKET_TYPES } from './bucket_agg_types';
-import { BucketAggType } from './_bucket_agg_type';
+import { BucketAggType, IBucketAggConfig } from './_bucket_agg_type';
 import { createFilterDateRange } from './create_filter/date_range';
-import { AggConfig } from '../agg_config';
 import { FieldFormat } from '../../../../../plugins/data/common/field_formats';
 import { DateRangesParamEditor } from '../../vis/editors/default/controls/date_ranges';
 
@@ -64,7 +63,7 @@ export const dateRangeBucketAgg = new BucketAggType({
       name: 'field',
       type: 'field',
       filterFieldTypes: KBN_FIELD_TYPES.DATE,
-      default(agg: AggConfig) {
+      default(agg: IBucketAggConfig) {
         return agg.getIndexPattern().timeFieldName;
       },
     },
@@ -83,7 +82,7 @@ export const dateRangeBucketAgg = new BucketAggType({
       default: undefined,
       // Implimentation method is the same as that of date_histogram
       serialize: () => undefined,
-      write: (agg: AggConfig, output: Record<string, any>) => {
+      write: (agg: IBucketAggConfig, output: Record<string, any>) => {
         const field = agg.getParam('field');
         let tz = agg.getParam('time_zone');
 
diff --git a/src/legacy/ui/public/agg_types/buckets/filters.ts b/src/legacy/ui/public/agg_types/buckets/filters.ts
index f0450f220f610f..44a97abb7a1d77 100644
--- a/src/legacy/ui/public/agg_types/buckets/filters.ts
+++ b/src/legacy/ui/public/agg_types/buckets/filters.ts
@@ -21,7 +21,6 @@ import _ from 'lodash';
 import angular from 'angular';
 
 import { i18n } from '@kbn/i18n';
-import { Storage } from 'ui/storage';
 
 import chrome from 'ui/chrome';
 import { buildEsQuery } from '@kbn/es-query';
@@ -29,6 +28,7 @@ import { FiltersParamEditor, FilterValue } from '../../vis/editors/default/contr
 import { createFilterFilters } from './create_filter/filters';
 import { BucketAggType, IBucketAggConfig } from './_bucket_agg_type';
 import { setup as data } from '../../../../core_plugins/data/public/legacy';
+import { Storage } from '../../../../../plugins/kibana_utils/public';
 
 const { getQueryLog } = data.query.helpers;
 const config = chrome.getUiSettingsClient();
diff --git a/src/legacy/ui/public/agg_types/buckets/geo_hash.test.ts b/src/legacy/ui/public/agg_types/buckets/geo_hash.test.ts
new file mode 100644
index 00000000000000..5c599f16e09c2e
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/geo_hash.test.ts
@@ -0,0 +1,216 @@
+/*
+ * 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 { geoHashBucketAgg, IBucketGeoHashGridAggConfig } from './geo_hash';
+import { AggConfigs } from '../agg_configs';
+import { BUCKET_TYPES } from './bucket_agg_types';
+
+jest.mock('ui/new_platform');
+
+describe('Geohash Agg', () => {
+  const getAggConfigs = (params?: Record<string, any>) => {
+    const indexPattern = {
+      id: '1234',
+      title: 'logstash-*',
+      fields: {
+        getByName: () => field,
+        filter: () => [field],
+      },
+    } as any;
+
+    const field = {
+      name: 'location',
+      indexPattern,
+    };
+
+    return new AggConfigs(
+      indexPattern,
+      [
+        {
+          id: BUCKET_TYPES.GEOHASH_GRID,
+          type: BUCKET_TYPES.GEOHASH_GRID,
+          schema: 'segment',
+          params: {
+            field: {
+              name: 'location',
+            },
+            isFilteredByCollar: true,
+            useGeocentroid: true,
+            mapZoom: 10,
+            mapBounds: {
+              top_left: { lat: 1.0, lon: -1.0 },
+              bottom_right: { lat: -1.0, lon: 1.0 },
+            },
+            ...params,
+          },
+        },
+      ],
+      null
+    );
+  };
+
+  describe('precision parameter', () => {
+    const PRECISION_PARAM_INDEX = 2;
+
+    let precisionParam: any;
+
+    beforeEach(() => {
+      precisionParam = geoHashBucketAgg.params[PRECISION_PARAM_INDEX];
+    });
+
+    it('should select precision parameter', () => {
+      expect(precisionParam.name).toEqual('precision');
+    });
+
+    describe('precision parameter write', () => {
+      const zoomToGeoHashPrecision: Record<string, any> = {
+        0: 1,
+        1: 2,
+        2: 2,
+        3: 2,
+        4: 3,
+        5: 3,
+        6: 4,
+        7: 4,
+        8: 4,
+        9: 5,
+        10: 5,
+        11: 6,
+        12: 6,
+        13: 6,
+        14: 7,
+        15: 7,
+        16: 8,
+        17: 8,
+        18: 8,
+        19: 9,
+        20: 9,
+        21: 10,
+      };
+
+      Object.keys(zoomToGeoHashPrecision).forEach((zoomLevel: string) => {
+        it(`zoom level ${zoomLevel} should correspond to correct geohash-precision`, () => {
+          const aggConfigs = getAggConfigs({
+            autoPrecision: true,
+            mapZoom: zoomLevel,
+          });
+
+          const { [BUCKET_TYPES.GEOHASH_GRID]: params } = aggConfigs.aggs[0].toDsl();
+
+          expect(params.precision).toEqual(zoomToGeoHashPrecision[zoomLevel]);
+        });
+      });
+    });
+  });
+
+  describe('getRequestAggs', () => {
+    describe('initial aggregation creation', () => {
+      let aggConfigs: AggConfigs;
+      let geoHashGridAgg: IBucketGeoHashGridAggConfig;
+
+      beforeEach(() => {
+        aggConfigs = getAggConfigs();
+        geoHashGridAgg = aggConfigs.aggs[0] as IBucketGeoHashGridAggConfig;
+      });
+
+      it('should create filter, geohash_grid, and geo_centroid aggregations', () => {
+        const requestAggs = geoHashBucketAgg.getRequestAggs(
+          geoHashGridAgg
+        ) as IBucketGeoHashGridAggConfig[];
+
+        expect(requestAggs.length).toEqual(3);
+        expect(requestAggs[0].type.name).toEqual('filter');
+        expect(requestAggs[1].type.name).toEqual('geohash_grid');
+        expect(requestAggs[2].type.name).toEqual('geo_centroid');
+      });
+
+      it('should set mapCollar in vis session state', () => {
+        const [, geoHashAgg] = geoHashBucketAgg.getRequestAggs(
+          geoHashGridAgg
+        ) as IBucketGeoHashGridAggConfig[];
+
+        expect(geoHashAgg).toHaveProperty('lastMapCollar');
+        expect(geoHashAgg.lastMapCollar).toHaveProperty('top_left');
+        expect(geoHashAgg.lastMapCollar).toHaveProperty('bottom_right');
+        expect(geoHashAgg.lastMapCollar).toHaveProperty('zoom');
+      });
+    });
+  });
+
+  describe('aggregation options', () => {
+    it('should only create geohash_grid and geo_centroid aggregations when isFilteredByCollar is false', () => {
+      const aggConfigs = getAggConfigs({ isFilteredByCollar: false });
+      const requestAggs = geoHashBucketAgg.getRequestAggs(aggConfigs
+        .aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[];
+
+      expect(requestAggs.length).toEqual(2);
+      expect(requestAggs[0].type.name).toEqual('geohash_grid');
+      expect(requestAggs[1].type.name).toEqual('geo_centroid');
+    });
+
+    it('should only create filter and geohash_grid aggregations when useGeocentroid is false', () => {
+      const aggConfigs = getAggConfigs({ useGeocentroid: false });
+      const requestAggs = geoHashBucketAgg.getRequestAggs(aggConfigs
+        .aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[];
+
+      expect(requestAggs.length).toEqual(2);
+      expect(requestAggs[0].type.name).toEqual('filter');
+      expect(requestAggs[1].type.name).toEqual('geohash_grid');
+    });
+  });
+
+  describe('aggregation creation after map interaction', () => {
+    let originalRequestAggs: IBucketGeoHashGridAggConfig[];
+
+    beforeEach(() => {
+      originalRequestAggs = geoHashBucketAgg.getRequestAggs(getAggConfigs()
+        .aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[];
+    });
+
+    it('should change geo_bounding_box filter aggregation and vis session state when map movement is outside map collar', () => {
+      const [, geoBoxingBox] = geoHashBucketAgg.getRequestAggs(getAggConfigs({
+        mapBounds: {
+          top_left: { lat: 10.0, lon: -10.0 },
+          bottom_right: { lat: 9.0, lon: -9.0 },
+        },
+      }).aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[];
+
+      expect(originalRequestAggs[1].params).not.toEqual(geoBoxingBox.params);
+    });
+
+    it('should not change geo_bounding_box filter aggregation and vis session state when map movement is within map collar', () => {
+      const [, geoBoxingBox] = geoHashBucketAgg.getRequestAggs(getAggConfigs({
+        mapBounds: {
+          top_left: { lat: 1, lon: -1 },
+          bottom_right: { lat: -1, lon: 1 },
+        },
+      }).aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[];
+
+      expect(originalRequestAggs[1].params).toEqual(geoBoxingBox.params);
+    });
+
+    it('should change geo_bounding_box filter aggregation and vis session state when map zoom level changes', () => {
+      const [, geoBoxingBox] = geoHashBucketAgg.getRequestAggs(getAggConfigs({
+        mapZoom: -1,
+      }).aggs[0] as IBucketGeoHashGridAggConfig) as IBucketGeoHashGridAggConfig[];
+
+      expect(originalRequestAggs[1].lastMapCollar).not.toEqual(geoBoxingBox.lastMapCollar);
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/geo_hash.ts b/src/legacy/ui/public/agg_types/buckets/geo_hash.ts
index 555aa94b636b84..1716891231b838 100644
--- a/src/legacy/ui/public/agg_types/buckets/geo_hash.ts
+++ b/src/legacy/ui/public/agg_types/buckets/geo_hash.ts
@@ -26,7 +26,6 @@ import { IsFilteredByCollarParamEditor } from '../../vis/editors/default/control
 import { PrecisionParamEditor } from '../../vis/editors/default/controls/precision';
 import { geohashColumns } from '../../utils/decode_geo_hash';
 import { AggGroupNames } from '../../vis/editors/default/agg_groups';
-import { AggConfig } from '../agg_config';
 import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common';
 
 // @ts-ignore
@@ -143,7 +142,7 @@ export const geoHashBucketAgg = new BucketAggType<IBucketGeoHashGridAggConfig>({
     },
   ],
   getRequestAggs(agg) {
-    const aggs: AggConfig[] = [];
+    const aggs: IBucketAggConfig[] = [];
     const params = agg.params;
 
     if (params.isFilteredByCollar && agg.getField()) {
diff --git a/src/legacy/ui/public/agg_types/buckets/histogram.test.ts b/src/legacy/ui/public/agg_types/buckets/histogram.test.ts
new file mode 100644
index 00000000000000..338af2e41cb88f
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/histogram.test.ts
@@ -0,0 +1,292 @@
+/*
+ * 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 { npStart } from 'ui/new_platform';
+import { AggConfigs } from '../index';
+import { BUCKET_TYPES } from './bucket_agg_types';
+import { IBucketHistogramAggConfig, histogramBucketAgg, AutoBounds } from './histogram';
+import { BucketAggType } from './_bucket_agg_type';
+
+jest.mock('ui/new_platform');
+
+describe('Histogram Agg', () => {
+  const getAggConfigs = (params: Record<string, any> = {}) => {
+    const indexPattern = {
+      id: '1234',
+      title: 'logstash-*',
+      fields: {
+        getByName: () => field,
+        filter: () => [field],
+      },
+    } as any;
+
+    const field = {
+      name: 'field',
+      indexPattern,
+    };
+
+    return new AggConfigs(
+      indexPattern,
+      [
+        {
+          field: {
+            name: 'field',
+          },
+          id: 'test',
+          type: BUCKET_TYPES.HISTOGRAM,
+          schema: 'segment',
+          params,
+        },
+      ],
+      null
+    );
+  };
+
+  const getParams = (options: Record<string, any>) => {
+    const aggConfigs = getAggConfigs({
+      ...options,
+      field: {
+        name: 'field',
+      },
+    });
+    return aggConfigs.aggs[0].toDsl()[BUCKET_TYPES.HISTOGRAM];
+  };
+
+  describe('ordered', () => {
+    let histogramType: BucketAggType<IBucketHistogramAggConfig>;
+
+    beforeEach(() => {
+      histogramType = histogramBucketAgg;
+    });
+
+    it('is ordered', () => {
+      expect(histogramType.ordered).toBeDefined();
+    });
+
+    it('is not ordered by date', () => {
+      expect(histogramType.ordered).not.toHaveProperty('date');
+    });
+  });
+
+  describe('params', () => {
+    describe('intervalBase', () => {
+      it('should not be written to the DSL', () => {
+        const aggConfigs = getAggConfigs({
+          intervalBase: 100,
+          field: {
+            name: 'field',
+          },
+        });
+        const { [BUCKET_TYPES.HISTOGRAM]: params } = aggConfigs.aggs[0].toDsl();
+
+        expect(params).not.toHaveProperty('intervalBase');
+      });
+    });
+
+    describe('interval', () => {
+      it('accepts a whole number', () => {
+        const params = getParams({
+          interval: 100,
+        });
+
+        expect(params).toHaveProperty('interval', 100);
+      });
+
+      it('accepts a decimal number', function() {
+        const params = getParams({
+          interval: 0.1,
+        });
+
+        expect(params).toHaveProperty('interval', 0.1);
+      });
+
+      it('accepts a decimal number string', function() {
+        const params = getParams({
+          interval: '0.1',
+        });
+
+        expect(params).toHaveProperty('interval', 0.1);
+      });
+
+      it('accepts a whole number string', function() {
+        const params = getParams({
+          interval: '10',
+        });
+
+        expect(params).toHaveProperty('interval', 10);
+      });
+
+      it('fails on non-numeric values', function() {
+        const params = getParams({
+          interval: [],
+        });
+
+        expect(params.interval).toBeNaN();
+      });
+
+      describe('interval scaling', () => {
+        const getInterval = (
+          maxBars: number,
+          params?: Record<string, any>,
+          autoBounds?: AutoBounds
+        ) => {
+          const aggConfigs = getAggConfigs({
+            ...params,
+            field: {
+              name: 'field',
+            },
+          });
+          const aggConfig = aggConfigs.aggs[0] as IBucketHistogramAggConfig;
+
+          if (autoBounds) {
+            aggConfig.setAutoBounds(autoBounds);
+          }
+
+          // mock histogram:maxBars value;
+          npStart.core.uiSettings.get = jest.fn(() => maxBars);
+
+          return aggConfig.write(aggConfigs).params;
+        };
+
+        it('will respect the histogram:maxBars setting', () => {
+          const params = getInterval(
+            5,
+            { interval: 5 },
+            {
+              min: 0,
+              max: 10000,
+            }
+          );
+
+          expect(params).toHaveProperty('interval', 2000);
+        });
+
+        it('will return specified interval, if bars are below histogram:maxBars config', () => {
+          const params = getInterval(100, { interval: 5 });
+
+          expect(params).toHaveProperty('interval', 5);
+        });
+
+        it('will set to intervalBase if interval is below base', () => {
+          const params = getInterval(1000, { interval: 3, intervalBase: 8 });
+
+          expect(params).toHaveProperty('interval', 8);
+        });
+
+        it('will round to nearest intervalBase multiple if interval is above base', () => {
+          const roundUp = getInterval(1000, { interval: 46, intervalBase: 10 });
+          expect(roundUp).toHaveProperty('interval', 50);
+
+          const roundDown = getInterval(1000, { interval: 43, intervalBase: 10 });
+          expect(roundDown).toHaveProperty('interval', 40);
+        });
+
+        it('will not change interval if it is a multiple of base', () => {
+          const output = getInterval(1000, { interval: 35, intervalBase: 5 });
+
+          expect(output).toHaveProperty('interval', 35);
+        });
+
+        it('will round to intervalBase after scaling histogram:maxBars', () => {
+          const output = getInterval(100, { interval: 5, intervalBase: 6 }, { min: 0, max: 1000 });
+
+          // 100 buckets in 0 to 1000 would result in an interval of 10, so we should
+          // round to the next multiple of 6 -> 12
+          expect(output).toHaveProperty('interval', 12);
+        });
+      });
+
+      describe('min_doc_count', () => {
+        let output: Record<string, any>;
+
+        it('casts true values to 0', () => {
+          output = getParams({ min_doc_count: true });
+          expect(output).toHaveProperty('min_doc_count', 0);
+
+          output = getParams({ min_doc_count: 'yes' });
+          expect(output).toHaveProperty('min_doc_count', 0);
+
+          output = getParams({ min_doc_count: 1 });
+          expect(output).toHaveProperty('min_doc_count', 0);
+
+          output = getParams({ min_doc_count: {} });
+          expect(output).toHaveProperty('min_doc_count', 0);
+        });
+
+        it('writes 1 for falsy values', () => {
+          output = getParams({ min_doc_count: '' });
+          expect(output).toHaveProperty('min_doc_count', 1);
+
+          output = getParams({ min_doc_count: null });
+          expect(output).toHaveProperty('min_doc_count', 1);
+
+          output = getParams({ min_doc_count: undefined });
+          expect(output).toHaveProperty('min_doc_count', 1);
+        });
+      });
+
+      describe('extended_bounds', function() {
+        it('does not write when only eb.min is set', function() {
+          const output = getParams({
+            has_extended_bounds: true,
+            extended_bounds: { min: 0 },
+          });
+          expect(output).not.toHaveProperty('extended_bounds');
+        });
+
+        it('does not write when only eb.max is set', function() {
+          const output = getParams({
+            has_extended_bounds: true,
+            extended_bounds: { max: 0 },
+          });
+
+          expect(output).not.toHaveProperty('extended_bounds');
+        });
+
+        it('writes when both eb.min and eb.max are set', function() {
+          const output = getParams({
+            has_extended_bounds: true,
+            extended_bounds: { min: 99, max: 100 },
+          });
+
+          expect(output.extended_bounds).toHaveProperty('min', 99);
+          expect(output.extended_bounds).toHaveProperty('max', 100);
+        });
+
+        it('does not write when nothing is set', function() {
+          const output = getParams({
+            has_extended_bounds: true,
+            extended_bounds: {},
+          });
+
+          expect(output).not.toHaveProperty('extended_bounds');
+        });
+
+        it('does not write when has_extended_bounds is false', function() {
+          const output = getParams({
+            has_extended_bounds: false,
+            extended_bounds: { min: 99, max: 100 },
+          });
+
+          expect(output).not.toHaveProperty('extended_bounds');
+        });
+      });
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/histogram.ts b/src/legacy/ui/public/agg_types/buckets/histogram.ts
index 23edefc67d506c..fba2f47010c34e 100644
--- a/src/legacy/ui/public/agg_types/buckets/histogram.ts
+++ b/src/legacy/ui/public/agg_types/buckets/histogram.ts
@@ -21,18 +21,17 @@ import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { toastNotifications } from 'ui/notify';
 
-import chrome from '../../chrome';
+import { npStart } from 'ui/new_platform';
 import { BucketAggType, IBucketAggConfig, BucketAggParam } from './_bucket_agg_type';
 import { createFilterHistogram } from './create_filter/histogram';
 import { NumberIntervalParamEditor } from '../../vis/editors/default/controls/number_interval';
 import { MinDocCountParamEditor } from '../../vis/editors/default/controls/min_doc_count';
 import { HasExtendedBoundsParamEditor } from '../../vis/editors/default/controls/has_extended_bounds';
 import { ExtendedBoundsParamEditor } from '../../vis/editors/default/controls/extended_bounds';
-import { AggConfig } from '../agg_config';
 import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common';
 import { BUCKET_TYPES } from './bucket_agg_types';
 
-interface AutoBounds {
+export interface AutoBounds {
   min: number;
   max: number;
 }
@@ -42,7 +41,8 @@ export interface IBucketHistogramAggConfig extends IBucketAggConfig {
   getAutoBounds: () => AutoBounds;
 }
 
-const config = chrome.getUiSettingsClient();
+const getUIConfig = () => npStart.core.uiSettings;
+
 export const histogramBucketAgg = new BucketAggType<IBucketHistogramAggConfig>({
   name: BUCKET_TYPES.HISTOGRAM,
   title: i18n.translate('common.ui.aggTypes.buckets.histogramTitle', {
@@ -135,25 +135,30 @@ export const histogramBucketAgg = new BucketAggType<IBucketHistogramAggConfig>({
         if (interval <= 0) {
           interval = 1;
         }
+        const autoBounds = aggConfig.getAutoBounds();
 
         // ensure interval does not create too many buckets and crash browser
-        if (aggConfig.getAutoBounds()) {
-          const range = aggConfig.getAutoBounds().max - aggConfig.getAutoBounds().min;
+        if (autoBounds) {
+          const range = autoBounds.max - autoBounds.min;
           const bars = range / interval;
+
+          const config = getUIConfig();
           if (bars > config.get('histogram:maxBars')) {
             const minInterval = range / config.get('histogram:maxBars');
+
             // Round interval by order of magnitude to provide clean intervals
             // Always round interval up so there will always be less buckets than histogram:maxBars
             const orderOfMagnitude = Math.pow(10, Math.floor(Math.log10(minInterval)));
             let roundInterval = orderOfMagnitude;
+
             while (roundInterval < minInterval) {
               roundInterval += orderOfMagnitude;
             }
             interval = roundInterval;
           }
         }
-
         const base = aggConfig.params.intervalBase;
+
         if (base) {
           if (interval < base) {
             // In case the specified interval is below the base, just increase it to it's base
@@ -171,7 +176,7 @@ export const histogramBucketAgg = new BucketAggType<IBucketHistogramAggConfig>({
       name: 'min_doc_count',
       default: false,
       editorComponent: MinDocCountParamEditor,
-      write(aggConfig: AggConfig, output: Record<string, any>) {
+      write(aggConfig: IBucketAggConfig, output: Record<string, any>) {
         if (aggConfig.params.min_doc_count) {
           output.params.min_doc_count = 0;
         } else {
@@ -192,14 +197,14 @@ export const histogramBucketAgg = new BucketAggType<IBucketHistogramAggConfig>({
         max: '',
       },
       editorComponent: ExtendedBoundsParamEditor,
-      write(aggConfig: AggConfig, output: Record<string, any>) {
+      write(aggConfig: IBucketAggConfig, output: Record<string, any>) {
         const { min, max } = aggConfig.params.extended_bounds;
 
         if (aggConfig.params.has_extended_bounds && (min || min === 0) && (max || max === 0)) {
           output.params.extended_bounds = { min, max };
         }
       },
-      shouldShow: (aggConfig: AggConfig) => aggConfig.params.has_extended_bounds,
+      shouldShow: (aggConfig: IBucketAggConfig) => aggConfig.params.has_extended_bounds,
     },
   ],
 });
diff --git a/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.ts b/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.ts
index 2bf0930d376845..e4527ff87f48cc 100644
--- a/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.ts
+++ b/src/legacy/ui/public/agg_types/buckets/migrate_include_exclude_format.ts
@@ -18,7 +18,6 @@
  */
 
 import { isString, isObject } from 'lodash';
-import { AggConfig } from 'ui/agg_types';
 import { IBucketAggConfig, BucketAggType, BucketAggParam } from './_bucket_agg_type';
 
 export const isType = (type: string) => {
@@ -32,12 +31,16 @@ export const isType = (type: string) => {
 export const isStringType = isType('string');
 
 export const migrateIncludeExcludeFormat = {
-  serialize(this: BucketAggParam, value: any, agg: AggConfig) {
+  serialize(this: BucketAggParam, value: any, agg: IBucketAggConfig) {
     if (this.shouldShow && !this.shouldShow(agg)) return;
     if (!value || isString(value)) return value;
     else return value.pattern;
   },
-  write(this: BucketAggType<IBucketAggConfig>, aggConfig: AggConfig, output: Record<string, any>) {
+  write(
+    this: BucketAggType<IBucketAggConfig>,
+    aggConfig: IBucketAggConfig,
+    output: Record<string, any>
+  ) {
     const value = aggConfig.getParam(this.name);
 
     if (isObject(value)) {
diff --git a/src/legacy/ui/public/agg_types/buckets/range.test.ts b/src/legacy/ui/public/agg_types/buckets/range.test.ts
new file mode 100644
index 00000000000000..f7cae60cce773b
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/range.test.ts
@@ -0,0 +1,95 @@
+/*
+ * 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 { AggConfigs } from '../agg_configs';
+import { BUCKET_TYPES } from './bucket_agg_types';
+import { NumberFormat } from '../../../../../plugins/data/common/';
+
+jest.mock('ui/new_platform');
+
+const buckets = [
+  {
+    to: 1024,
+    to_as_string: '1024.0',
+    doc_count: 20904,
+  },
+  {
+    from: 1024,
+    from_as_string: '1024.0',
+    to: 2560,
+    to_as_string: '2560.0',
+    doc_count: 23358,
+  },
+  {
+    from: 2560,
+    from_as_string: '2560.0',
+    doc_count: 174250,
+  },
+];
+
+describe('Range Agg', () => {
+  const getAggConfigs = () => {
+    const field = {
+      name: 'bytes',
+      format: new NumberFormat(
+        {
+          pattern: '0,0.[000] b',
+        },
+        () => {}
+      ),
+    };
+
+    const indexPattern = {
+      id: '1234',
+      title: 'logstash-*',
+      fields: {
+        getByName: () => field,
+        filter: () => [field],
+      },
+    } as any;
+
+    return new AggConfigs(
+      indexPattern,
+      [
+        {
+          type: BUCKET_TYPES.RANGE,
+          schema: 'segment',
+          params: {
+            field: 'bytes',
+            ranges: [{ from: 0, to: 1000 }, { from: 1000, to: 2000 }],
+          },
+        },
+      ],
+      null
+    );
+  };
+
+  describe('formating', () => {
+    it('formats bucket keys properly', () => {
+      const aggConfigs = getAggConfigs();
+      const agg = aggConfigs.aggs[0];
+
+      const format = (val: any) => agg.fieldFormatter()(agg.getKey(val));
+
+      expect(format(buckets[0])).toBe('≥ -∞ and < 1 KB');
+      expect(format(buckets[1])).toBe('≥ 1 KB and < 2.5 KB');
+      expect(format(buckets[2])).toBe('≥ 2.5 KB and < +∞');
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/significant_terms.test.ts b/src/legacy/ui/public/agg_types/buckets/significant_terms.test.ts
new file mode 100644
index 00000000000000..454f1bf70a790b
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/significant_terms.test.ts
@@ -0,0 +1,110 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { AggConfigs } from '../index';
+import { BUCKET_TYPES } from './bucket_agg_types';
+import { significantTermsBucketAgg } from './significant_terms';
+
+jest.mock('ui/new_platform');
+
+describe('Significant Terms Agg', () => {
+  describe('order agg editor UI', () => {
+    describe('convert include/exclude from old format', () => {
+      const getAggConfigs = (params: Record<string, any> = {}) => {
+        const indexPattern = {
+          id: '1234',
+          title: 'logstash-*',
+          fields: {
+            getByName: () => field,
+            filter: () => [field],
+          },
+        } as any;
+
+        const field = {
+          name: 'field',
+          indexPattern,
+        };
+
+        return new AggConfigs(
+          indexPattern,
+          [
+            {
+              id: 'test',
+              type: BUCKET_TYPES.SIGNIFICANT_TERMS,
+              schema: 'segment',
+              params,
+            },
+          ],
+          null
+        );
+      };
+
+      const testSerializeAndWrite = (aggs: AggConfigs) => {
+        const agg = aggs.aggs[0];
+        const { [BUCKET_TYPES.SIGNIFICANT_TERMS]: params } = agg.toDsl();
+
+        expect(params.field).toBe('field');
+        expect(params.include).toBe('404');
+        expect(params.exclude).toBe('400');
+      };
+
+      it('should generate correct label', () => {
+        const aggConfigs = getAggConfigs({
+          size: 'SIZE',
+          field: {
+            name: 'FIELD',
+          },
+        });
+        const label = significantTermsBucketAgg.makeLabel(aggConfigs.aggs[0]);
+
+        expect(label).toBe('Top SIZE unusual terms in FIELD');
+      });
+
+      it('should doesnt do anything with string type', () => {
+        const aggConfigs = getAggConfigs({
+          include: '404',
+          exclude: '400',
+          field: {
+            name: 'field',
+            type: 'string',
+          },
+        });
+
+        testSerializeAndWrite(aggConfigs);
+      });
+
+      it('should converts object to string type', () => {
+        const aggConfigs = getAggConfigs({
+          include: {
+            pattern: '404',
+          },
+          exclude: {
+            pattern: '400',
+          },
+          field: {
+            name: 'field',
+            type: 'string',
+          },
+        });
+
+        testSerializeAndWrite(aggConfigs);
+      });
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/buckets/terms.test.ts b/src/legacy/ui/public/agg_types/buckets/terms.test.ts
new file mode 100644
index 00000000000000..24ac332ae4d55c
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/buckets/terms.test.ts
@@ -0,0 +1,78 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { AggConfigs } from '../index';
+import { BUCKET_TYPES } from './bucket_agg_types';
+
+jest.mock('ui/new_platform');
+
+describe('Terms Agg', () => {
+  describe('order agg editor UI', () => {
+    const getAggConfigs = (params: Record<string, any> = {}) => {
+      const indexPattern = {
+        id: '1234',
+        title: 'logstash-*',
+        fields: {
+          getByName: () => field,
+          filter: () => [field],
+        },
+      } as any;
+
+      const field = {
+        name: 'field',
+        indexPattern,
+      };
+
+      return new AggConfigs(
+        indexPattern,
+        [
+          {
+            id: 'test',
+            params,
+            type: BUCKET_TYPES.TERMS,
+          },
+        ],
+        null
+      );
+    };
+
+    it('converts object to string type', function() {
+      const aggConfigs = getAggConfigs({
+        include: {
+          pattern: '404',
+        },
+        exclude: {
+          pattern: '400',
+        },
+        field: {
+          name: 'field',
+        },
+        orderAgg: {
+          type: 'count',
+        },
+      });
+
+      const { [BUCKET_TYPES.TERMS]: params } = aggConfigs.aggs[0].toDsl();
+
+      expect(params.field).toBe('field');
+      expect(params.include).toBe('404');
+      expect(params.exclude).toBe('400');
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/filter/prop_filter.test.ts b/src/legacy/ui/public/agg_types/filter/prop_filter.test.ts
index 0d32c9dc769da2..431e1161e0dbdf 100644
--- a/src/legacy/ui/public/agg_types/filter/prop_filter.test.ts
+++ b/src/legacy/ui/public/agg_types/filter/prop_filter.test.ts
@@ -27,7 +27,7 @@ describe('prop filter', () => {
     nameFilter = propFilter('name');
   });
 
-  function getObjects(...names: string[]) {
+  const getObjects = (...names: string[]) => {
     const count = new Map();
     const objects = [];
 
@@ -41,8 +41,9 @@ describe('prop filter', () => {
       });
       count.set(name, count.get(name) + 1);
     }
+
     return objects;
-  }
+  };
 
   it('returns list when no filters are provided', () => {
     const objects = getObjects('table', 'table', 'pie');
diff --git a/src/legacy/ui/public/agg_types/metrics/get_response_agg_config_class.ts b/src/legacy/ui/public/agg_types/metrics/lib/get_response_agg_config_class.ts
similarity index 75%
rename from src/legacy/ui/public/agg_types/metrics/get_response_agg_config_class.ts
rename to src/legacy/ui/public/agg_types/metrics/lib/get_response_agg_config_class.ts
index 34658431a96abe..054543de3dd067 100644
--- a/src/legacy/ui/public/agg_types/metrics/get_response_agg_config_class.ts
+++ b/src/legacy/ui/public/agg_types/metrics/lib/get_response_agg_config_class.ts
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import { assign } from 'lodash';
-import { IMetricAggConfig } from './metric_agg_type';
+import { IMetricAggConfig } from '../metric_agg_type';
 
 /**
  * Get the ResponseAggConfig class for an aggConfig,
@@ -41,10 +40,7 @@ export interface IResponseAggConfig extends IMetricAggConfig {
   parentId: IMetricAggConfig['id'];
 }
 
-export const create = (
-  parentAgg: IMetricAggConfig,
-  props: Partial<IMetricAggConfig>
-): IMetricAggConfig => {
+export const create = (parentAgg: IMetricAggConfig, props: Partial<IMetricAggConfig>) => {
   /**
    * AggConfig "wrapper" for multi-value metric aggs which
    * need to modify AggConfig behavior for each value produced.
@@ -52,23 +48,21 @@ export const create = (
    * @param {string|number} key - the key or index that identifies
    *                            this part of the multi-value
    */
-  class ResponseAggConfig {
-    id: IMetricAggConfig['id'];
-    key: string | number;
-    parentId: IMetricAggConfig['id'];
-
-    constructor(key: string) {
-      this.key = key;
-      this.parentId = parentAgg.id;
+  function ResponseAggConfig(this: IResponseAggConfig, key: string) {
+    const parentId = parentAgg.id;
+    let id;
 
-      const subId = String(key);
+    const subId = String(key);
 
-      if (subId.indexOf('.') > -1) {
-        this.id = this.parentId + "['" + subId.replace(/'/g, "\\'") + "']";
-      } else {
-        this.id = this.parentId + '.' + subId;
-      }
+    if (subId.indexOf('.') > -1) {
+      id = parentId + "['" + subId.replace(/'/g, "\\'") + "']";
+    } else {
+      id = parentId + '.' + subId;
     }
+
+    this.id = id;
+    this.key = key;
+    this.parentId = parentId;
   }
 
   ResponseAggConfig.prototype = Object.create(parentAgg);
@@ -76,5 +70,5 @@ export const create = (
 
   assign(ResponseAggConfig.prototype, props);
 
-  return (ResponseAggConfig as unknown) as IMetricAggConfig;
+  return ResponseAggConfig;
 };
diff --git a/src/legacy/ui/public/agg_types/metrics/lib/make_nested_label.test.ts b/src/legacy/ui/public/agg_types/metrics/lib/make_nested_label.test.ts
new file mode 100644
index 00000000000000..479ff40b7c0aec
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/metrics/lib/make_nested_label.test.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 { makeNestedLabel } from './make_nested_label';
+import { IMetricAggConfig } from '../metric_agg_type';
+
+describe('metric agg make_nested_label', () => {
+  const generateAggConfig = (metricLabel: string): IMetricAggConfig => {
+    return ({
+      params: {
+        customMetric: {
+          makeLabel: () => {
+            return metricLabel;
+          },
+        },
+      },
+      getParam(this: IMetricAggConfig, key: string) {
+        return this.params[key];
+      },
+    } as unknown) as IMetricAggConfig;
+  };
+
+  it('should return a metric label with prefix', () => {
+    const aggConfig = generateAggConfig('Count');
+    const label = makeNestedLabel(aggConfig, 'derivative');
+
+    expect(label).toEqual('Derivative of Count');
+  });
+
+  it('should return a numbered prefix', () => {
+    const aggConfig = generateAggConfig('Derivative of Count');
+    const label = makeNestedLabel(aggConfig, 'derivative');
+
+    expect(label).toEqual('2. derivative of Count');
+  });
+
+  it('should return a prefix with correct order', () => {
+    const aggConfig = generateAggConfig('3. derivative of Count');
+    const label = makeNestedLabel(aggConfig, 'derivative');
+
+    expect(label).toEqual('4. derivative of Count');
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/metrics/median.test.ts b/src/legacy/ui/public/agg_types/metrics/median.test.ts
new file mode 100644
index 00000000000000..819c24f135cdc1
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/metrics/median.test.ts
@@ -0,0 +1,69 @@
+/*
+ * 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 { AggConfigs } from '../agg_configs';
+import { METRIC_TYPES } from './metric_agg_types';
+
+jest.mock('ui/new_platform');
+
+describe('AggTypeMetricMedianProvider class', () => {
+  let aggConfigs: AggConfigs;
+
+  beforeEach(() => {
+    const field = {
+      name: 'bytes',
+    };
+    const indexPattern = {
+      id: '1234',
+      title: 'logstash-*',
+      fields: {
+        getByName: () => field,
+        filter: () => [field],
+      },
+    } as any;
+
+    aggConfigs = new AggConfigs(
+      indexPattern,
+      [
+        {
+          id: METRIC_TYPES.MEDIAN,
+          type: METRIC_TYPES.MEDIAN,
+          schema: 'metric',
+          params: {
+            field: 'bytes',
+            percents: [70],
+          },
+        },
+      ],
+      null
+    );
+  });
+
+  it('requests the percentiles aggregation in the Elasticsearch query DSL', () => {
+    const dsl: Record<string, any> = aggConfigs.toDsl();
+
+    expect(dsl.median.percentiles.percents).toEqual([70]);
+  });
+
+  it('asks Elasticsearch for array-based values in the aggregation response', () => {
+    const dsl: Record<string, any> = aggConfigs.toDsl();
+
+    expect(dsl.median.percentiles.keyed).toBeFalsy();
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/metrics/parent_pipeline.test.ts b/src/legacy/ui/public/agg_types/metrics/parent_pipeline.test.ts
new file mode 100644
index 00000000000000..7c7a2a68cd7c55
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/metrics/parent_pipeline.test.ts
@@ -0,0 +1,248 @@
+/*
+ * 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 sinon from 'sinon';
+import { derivativeMetricAgg } from './derivative';
+import { cumulativeSumMetricAgg } from './cumulative_sum';
+import { movingAvgMetricAgg } from './moving_avg';
+import { serialDiffMetricAgg } from './serial_diff';
+import { AggConfigs } from '../agg_configs';
+import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
+
+jest.mock('../../vis/editors/default/schemas', () => {
+  class MockedSchemas {
+    all = [{}];
+  }
+  return {
+    Schemas: jest.fn().mockImplementation(() => new MockedSchemas()),
+  };
+});
+
+jest.mock('../../vis/editors/default/controls/sub_metric', () => {
+  return {
+    SubMetricParamEditor() {},
+  };
+});
+
+jest.mock('../../vis/editors/default/controls/sub_agg', () => {
+  return {
+    SubAggParamEditor() {},
+  };
+});
+
+jest.mock('ui/new_platform');
+
+describe('parent pipeline aggs', function() {
+  const metrics = [
+    { name: 'derivative', title: 'Derivative', provider: derivativeMetricAgg },
+    { name: 'cumulative_sum', title: 'Cumulative Sum', provider: cumulativeSumMetricAgg },
+    { name: 'moving_avg', title: 'Moving Avg', provider: movingAvgMetricAgg, dslName: 'moving_fn' },
+    { name: 'serial_diff', title: 'Serial Diff', provider: serialDiffMetricAgg },
+  ];
+
+  metrics.forEach(metric => {
+    describe(`${metric.title} metric`, () => {
+      let aggDsl: Record<string, any>;
+      let metricAgg: MetricAggType;
+      let aggConfig: IMetricAggConfig;
+
+      const init = (
+        params: any = {
+          metricAgg: '1',
+          customMetric: null,
+        }
+      ) => {
+        const field = {
+          name: 'field',
+          format: {
+            type: {
+              id: 'bytes',
+            },
+          },
+        };
+        const indexPattern = {
+          id: '1234',
+          title: 'logstash-*',
+          fields: {
+            getByName: () => field,
+            filter: () => [field],
+          },
+        } as any;
+
+        const aggConfigs = new AggConfigs(
+          indexPattern,
+          [
+            {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+            },
+            {
+              id: '2',
+              type: metric.name,
+              schema: 'metric',
+              params,
+            },
+            {
+              id: '3',
+              type: 'max',
+              params: { field: 'field' },
+              schema: 'metric',
+            },
+          ],
+          null
+        );
+
+        // Grab the aggConfig off the vis (we don't actually use the vis for anything else)
+        metricAgg = metric.provider;
+        aggConfig = aggConfigs.aggs[1];
+        aggDsl = aggConfig.toDsl(aggConfigs);
+      };
+
+      it(`should return a label prefixed with ${metric.title} of`, () => {
+        init();
+
+        expect(metricAgg.makeLabel(aggConfig)).toEqual(`${metric.title} of Count`);
+      });
+
+      it(`should return a label ${metric.title} of max bytes`, () => {
+        init({
+          metricAgg: 'custom',
+          customMetric: {
+            id: '1-orderAgg',
+            type: 'max',
+            params: { field: 'field' },
+            schema: 'orderAgg',
+          },
+        });
+        expect(metricAgg.makeLabel(aggConfig)).toEqual(`${metric.title} of Max field`);
+      });
+
+      it(`should return a label prefixed with number of ${metric.title.toLowerCase()}`, () => {
+        init({
+          metricAgg: 'custom',
+          customMetric: {
+            id: '2-orderAgg',
+            type: metric.name,
+            params: {
+              buckets_path: 'custom',
+              customMetric: {
+                id: '2-orderAgg-orderAgg',
+                type: 'count',
+                schema: 'orderAgg',
+              },
+            },
+            schema: 'orderAgg',
+          },
+        });
+        expect(metricAgg.makeLabel(aggConfig)).toEqual(`2. ${metric.title.toLowerCase()} of Count`);
+      });
+
+      it('should set parent aggs', () => {
+        init({
+          metricAgg: 'custom',
+          customMetric: {
+            id: '2-metric',
+            type: 'max',
+            params: { field: 'field' },
+            schema: 'orderAgg',
+          },
+        });
+        expect(aggDsl[metric.dslName || metric.name].buckets_path).toBe('2-metric');
+        expect(aggDsl.parentAggs['2-metric'].max.field).toBe('field');
+      });
+
+      it('should set nested parent aggs', () => {
+        init({
+          metricAgg: 'custom',
+          customMetric: {
+            id: '2-metric',
+            type: metric.name,
+            params: {
+              buckets_path: 'custom',
+              customMetric: {
+                id: '2-metric-metric',
+                type: 'max',
+                params: { field: 'field' },
+                schema: 'orderAgg',
+              },
+            },
+            schema: 'orderAgg',
+          },
+        });
+        expect(aggDsl[metric.dslName || metric.name].buckets_path).toBe('2-metric');
+        expect(aggDsl.parentAggs['2-metric'][metric.dslName || metric.name].buckets_path).toBe(
+          '2-metric-metric'
+        );
+      });
+
+      it('should have correct formatter', () => {
+        init({
+          metricAgg: '3',
+        });
+        expect(metricAgg.getFormat(aggConfig).type.id).toBe('bytes');
+      });
+
+      it('should have correct customMetric nested formatter', () => {
+        init({
+          metricAgg: 'custom',
+          customMetric: {
+            id: '2-metric',
+            type: metric.name,
+            params: {
+              buckets_path: 'custom',
+              customMetric: {
+                id: '2-metric-metric',
+                type: 'max',
+                params: { field: 'field' },
+                schema: 'orderAgg',
+              },
+            },
+            schema: 'orderAgg',
+          },
+        });
+        expect(metricAgg.getFormat(aggConfig).type.id).toBe('bytes');
+      });
+
+      it("should call modifyAggConfigOnSearchRequestStart for its customMetric's parameters", () => {
+        init({
+          metricAgg: 'custom',
+          customMetric: {
+            id: '2-metric',
+            type: 'max',
+            params: { field: 'field' },
+            schema: 'orderAgg',
+          },
+        });
+
+        const searchSource: any = {};
+        const customMetricSpy = sinon.spy();
+        const customMetric = aggConfig.params.customMetric;
+
+        // Attach a modifyAggConfigOnSearchRequestStart with a spy to the first parameter
+        customMetric.type.params[0].modifyAggConfigOnSearchRequestStart = customMetricSpy;
+
+        aggConfig.type.params.forEach(param => {
+          param.modifyAggConfigOnSearchRequestStart(aggConfig, searchSource);
+        });
+        expect(customMetricSpy.calledWith(customMetric, searchSource)).toBe(true);
+      });
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/metrics/percentile_ranks.test.ts b/src/legacy/ui/public/agg_types/metrics/percentile_ranks.test.ts
new file mode 100644
index 00000000000000..f3882ca57161f1
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/metrics/percentile_ranks.test.ts
@@ -0,0 +1,75 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IPercentileRanksAggConfig, percentileRanksMetricAgg } from './percentile_ranks';
+import { AggConfigs } from '../agg_configs';
+import { METRIC_TYPES } from './metric_agg_types';
+
+jest.mock('ui/new_platform');
+
+describe('AggTypesMetricsPercentileRanksProvider class', function() {
+  let aggConfigs: AggConfigs;
+
+  beforeEach(() => {
+    const field = {
+      name: 'bytes',
+    };
+    const indexPattern = {
+      id: '1234',
+      title: 'logstash-*',
+      fields: {
+        getByName: () => field,
+        filter: () => [field],
+      },
+    } as any;
+
+    aggConfigs = new AggConfigs(
+      indexPattern,
+      [
+        {
+          id: METRIC_TYPES.PERCENTILE_RANKS,
+          type: METRIC_TYPES.PERCENTILE_RANKS,
+          schema: 'metric',
+          params: {
+            field: {
+              displayName: 'bytes',
+              format: {
+                convert: jest.fn(x => x),
+              },
+            },
+            customLabel: 'my custom field label',
+            values: [5000, 10000],
+          },
+        },
+      ],
+      null
+    );
+  });
+
+  it('uses the custom label if it is set', function() {
+    const responseAggs: any = percentileRanksMetricAgg.getResponseAggs(aggConfigs
+      .aggs[0] as IPercentileRanksAggConfig);
+
+    const percentileRankLabelFor5kBytes = responseAggs[0].makeLabel();
+    const percentileRankLabelFor10kBytes = responseAggs[1].makeLabel();
+
+    expect(percentileRankLabelFor5kBytes).toBe('Percentile rank 5000 of "my custom field label"');
+    expect(percentileRankLabelFor10kBytes).toBe('Percentile rank 10000 of "my custom field label"');
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/metrics/percentile_ranks.ts b/src/legacy/ui/public/agg_types/metrics/percentile_ranks.ts
index 6c069f8b70d62a..8b923092772dbf 100644
--- a/src/legacy/ui/public/agg_types/metrics/percentile_ranks.ts
+++ b/src/legacy/ui/public/agg_types/metrics/percentile_ranks.ts
@@ -20,7 +20,7 @@
 import { i18n } from '@kbn/i18n';
 import { PercentileRanksEditor } from '../../vis/editors/default/controls/percentile_ranks';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
-import { getResponseAggConfigClass, IResponseAggConfig } from './get_response_agg_config_class';
+import { getResponseAggConfigClass, IResponseAggConfig } from './lib/get_response_agg_config_class';
 
 import { getPercentileValue } from './percentiles_get_value';
 import { METRIC_TYPES } from './metric_agg_types';
@@ -30,7 +30,7 @@ import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common';
 
 // required by the values editor
 
-type IPercentileRanksAggConfig = IResponseAggConfig;
+export type IPercentileRanksAggConfig = IResponseAggConfig;
 
 const valueProps = {
   makeLabel(this: IPercentileRanksAggConfig) {
diff --git a/src/legacy/ui/public/agg_types/metrics/percentiles.test.ts b/src/legacy/ui/public/agg_types/metrics/percentiles.test.ts
new file mode 100644
index 00000000000000..1503f43b22dc30
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/metrics/percentiles.test.ts
@@ -0,0 +1,73 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IPercentileAggConfig, percentilesMetricAgg } from './percentiles';
+import { AggConfigs } from '../agg_configs';
+import { METRIC_TYPES } from './metric_agg_types';
+
+jest.mock('ui/new_platform');
+
+describe('AggTypesMetricsPercentilesProvider class', () => {
+  let aggConfigs: AggConfigs;
+
+  beforeEach(() => {
+    const field = {
+      name: 'bytes',
+    };
+    const indexPattern = {
+      id: '1234',
+      title: 'logstash-*',
+      fields: {
+        getByName: () => field,
+        filter: () => [field],
+      },
+    } as any;
+
+    aggConfigs = new AggConfigs(
+      indexPattern,
+      [
+        {
+          id: METRIC_TYPES.PERCENTILES,
+          type: METRIC_TYPES.PERCENTILES,
+          schema: 'metric',
+          params: {
+            field: {
+              displayName: 'bytes',
+              format: {
+                convert: jest.fn(x => `${x}th`),
+              },
+            },
+            customLabel: 'prince',
+            percents: [95],
+          },
+        },
+      ],
+      null
+    );
+  });
+
+  it('uses the custom label if it is set', () => {
+    const responseAggs: any = percentilesMetricAgg.getResponseAggs(aggConfigs
+      .aggs[0] as IPercentileAggConfig);
+
+    const ninetyFifthPercentileLabel = responseAggs[0].makeLabel();
+
+    expect(ninetyFifthPercentileLabel).toBe('95th percentile of prince');
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/metrics/percentiles.ts b/src/legacy/ui/public/agg_types/metrics/percentiles.ts
index 21cb3939d38f7f..0ac04554684729 100644
--- a/src/legacy/ui/public/agg_types/metrics/percentiles.ts
+++ b/src/legacy/ui/public/agg_types/metrics/percentiles.ts
@@ -23,14 +23,14 @@ import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
 import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common';
 
-import { getResponseAggConfigClass, IResponseAggConfig } from './get_response_agg_config_class';
+import { getResponseAggConfigClass, IResponseAggConfig } from './lib/get_response_agg_config_class';
 import { getPercentileValue } from './percentiles_get_value';
 import { PercentilesEditor } from '../../vis/editors/default/controls/percentiles';
 
 // @ts-ignore
 import { ordinalSuffix } from '../../utils/ordinal_suffix';
 
-type IPercentileAggConfig = IResponseAggConfig;
+export type IPercentileAggConfig = IResponseAggConfig;
 
 const valueProps = {
   makeLabel(this: IPercentileAggConfig) {
diff --git a/src/legacy/ui/public/agg_types/metrics/percentiles_get_value.ts b/src/legacy/ui/public/agg_types/metrics/percentiles_get_value.ts
index 56e1f0456d62e7..c357d7bb0a903f 100644
--- a/src/legacy/ui/public/agg_types/metrics/percentiles_get_value.ts
+++ b/src/legacy/ui/public/agg_types/metrics/percentiles_get_value.ts
@@ -18,7 +18,7 @@
  */
 
 import { find } from 'lodash';
-import { IResponseAggConfig } from './get_response_agg_config_class';
+import { IResponseAggConfig } from './lib/get_response_agg_config_class';
 
 export const getPercentileValue = <TAggConfig extends IResponseAggConfig>(
   agg: TAggConfig,
diff --git a/src/legacy/ui/public/agg_types/metrics/sibling_pipeline.test.ts b/src/legacy/ui/public/agg_types/metrics/sibling_pipeline.test.ts
new file mode 100644
index 00000000000000..e038936de07d20
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/metrics/sibling_pipeline.test.ts
@@ -0,0 +1,188 @@
+/*
+ * 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 { spy } from 'sinon';
+import { bucketSumMetricAgg } from './bucket_sum';
+import { bucketAvgMetricAgg } from './bucket_avg';
+import { bucketMinMetricAgg } from './bucket_min';
+import { bucketMaxMetricAgg } from './bucket_max';
+
+import { AggConfigs } from '../agg_configs';
+import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
+
+jest.mock('../../vis/editors/default/schemas', () => {
+  class MockedSchemas {
+    all = [{}];
+  }
+  return {
+    Schemas: jest.fn().mockImplementation(() => new MockedSchemas()),
+  };
+});
+
+jest.mock('../../vis/editors/default/controls/sub_metric', () => {
+  return {
+    SubMetricParamEditor() {},
+  };
+});
+
+jest.mock('ui/new_platform');
+
+describe('sibling pipeline aggs', () => {
+  const metrics = [
+    { name: 'sum_bucket', title: 'Overall Sum', provider: bucketSumMetricAgg },
+    { name: 'avg_bucket', title: 'Overall Average', provider: bucketAvgMetricAgg },
+    { name: 'min_bucket', title: 'Overall Min', provider: bucketMinMetricAgg },
+    { name: 'max_bucket', title: 'Overall Max', provider: bucketMaxMetricAgg },
+  ];
+
+  metrics.forEach(metric => {
+    describe(`${metric.title} metric`, () => {
+      let aggDsl: Record<string, any>;
+      let metricAgg: MetricAggType;
+      let aggConfig: IMetricAggConfig;
+
+      const init = (settings?: any) => {
+        const field = {
+          name: 'field',
+          format: {
+            type: {
+              id: 'bytes',
+            },
+          },
+        };
+        const indexPattern = {
+          id: '1234',
+          title: 'logstash-*',
+          fields: {
+            getByName: () => field,
+            filter: () => [field],
+          },
+        } as any;
+
+        const aggConfigs = new AggConfigs(
+          indexPattern,
+          [
+            {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+            },
+            {
+              id: '2',
+              type: metric.name,
+              schema: 'metric',
+              params: settings || {
+                customMetric: {
+                  id: '5',
+                  type: 'count',
+                  schema: 'metric',
+                },
+                customBucket: {
+                  id: '6',
+                  type: 'date_histogram',
+                  schema: 'bucket',
+                  params: { field: 'field', interval: '10s' },
+                },
+              },
+            },
+          ],
+          null
+        );
+
+        // Grab the aggConfig off the vis (we don't actually use the vis for anything else)
+        metricAgg = metric.provider;
+        aggConfig = aggConfigs.aggs[1];
+        aggDsl = aggConfig.toDsl(aggConfigs);
+      };
+
+      it(`should return a label prefixed with ${metric.title} of`, () => {
+        init();
+
+        expect(metricAgg.makeLabel(aggConfig)).toEqual(`${metric.title} of Count`);
+      });
+
+      it('should set parent aggs', function() {
+        init();
+
+        expect(aggDsl[metric.name].buckets_path).toBe('2-bucket>_count');
+        expect(aggDsl.parentAggs['2-bucket'].date_histogram).not.toBeUndefined();
+      });
+
+      it('should set nested parent aggs', () => {
+        init({
+          customMetric: {
+            id: '5',
+            type: 'avg',
+            schema: 'metric',
+            params: { field: 'field' },
+          },
+          customBucket: {
+            id: '6',
+            type: 'date_histogram',
+            schema: 'bucket',
+            params: { field: 'field', interval: '10s' },
+          },
+        });
+
+        expect(aggDsl[metric.name].buckets_path).toBe('2-bucket>2-metric');
+        expect(aggDsl.parentAggs['2-bucket'].date_histogram).not.toBeUndefined();
+        expect(aggDsl.parentAggs['2-bucket'].aggs['2-metric'].avg.field).toEqual('field');
+      });
+
+      it('should have correct formatter', () => {
+        init({
+          customMetric: {
+            id: '5',
+            type: 'avg',
+            schema: 'metric',
+            params: { field: 'field' },
+          },
+          customBucket: {
+            id: '6',
+            type: 'date_histogram',
+            schema: 'bucket',
+            params: { field: 'field', interval: '10s' },
+          },
+        });
+
+        expect(metricAgg.getFormat(aggConfig).type.id).toBe('bytes');
+      });
+
+      it("should call modifyAggConfigOnSearchRequestStart for nested aggs' parameters", () => {
+        init();
+
+        const searchSource: any = {};
+        const customMetricSpy = spy();
+        const customBucketSpy = spy();
+        const { customMetric, customBucket } = aggConfig.params;
+
+        // Attach a modifyAggConfigOnSearchRequestStart with a spy to the first parameter
+        customMetric.type.params[0].modifyAggConfigOnSearchRequestStart = customMetricSpy;
+        customBucket.type.params[0].modifyAggConfigOnSearchRequestStart = customBucketSpy;
+
+        aggConfig.type.params.forEach(param => {
+          param.modifyAggConfigOnSearchRequestStart(aggConfig, searchSource);
+        });
+
+        expect(customMetricSpy.calledWith(customMetric, searchSource)).toBe(true);
+        expect(customBucketSpy.calledWith(customBucket, searchSource)).toBe(true);
+      });
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/metrics/std_deviation.test.ts b/src/legacy/ui/public/agg_types/metrics/std_deviation.test.ts
new file mode 100644
index 00000000000000..ae09b5cd789774
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/metrics/std_deviation.test.ts
@@ -0,0 +1,83 @@
+/*
+ * 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 { IStdDevAggConfig, stdDeviationMetricAgg } from './std_deviation';
+import { AggConfigs } from '../agg_configs';
+import { METRIC_TYPES } from './metric_agg_types';
+
+jest.mock('ui/new_platform');
+
+describe('AggTypeMetricStandardDeviationProvider class', () => {
+  const getAggConfigs = (customLabel?: string) => {
+    const field = {
+      name: 'memory',
+    };
+    const indexPattern = {
+      id: '1234',
+      title: 'logstash-*',
+      fields: {
+        getByName: () => field,
+        filter: () => [field],
+      },
+    } as any;
+
+    return new AggConfigs(
+      indexPattern,
+      [
+        {
+          id: METRIC_TYPES.STD_DEV,
+          type: METRIC_TYPES.STD_DEV,
+          schema: 'metric',
+          params: {
+            field: {
+              displayName: 'memory',
+            },
+            customLabel,
+          },
+        },
+      ],
+      null
+    );
+  };
+
+  it('uses the custom label if it is set', () => {
+    const aggConfigs = getAggConfigs('custom label');
+    const responseAggs: any = stdDeviationMetricAgg.getResponseAggs(aggConfigs
+      .aggs[0] as IStdDevAggConfig);
+
+    const lowerStdDevLabel = responseAggs[0].makeLabel();
+    const upperStdDevLabel = responseAggs[1].makeLabel();
+
+    expect(lowerStdDevLabel).toBe('Lower custom label');
+    expect(upperStdDevLabel).toBe('Upper custom label');
+  });
+
+  it('uses the default labels if custom label is not set', () => {
+    const aggConfigs = getAggConfigs();
+
+    const responseAggs: any = stdDeviationMetricAgg.getResponseAggs(aggConfigs
+      .aggs[0] as IStdDevAggConfig);
+
+    const lowerStdDevLabel = responseAggs[0].makeLabel();
+    const upperStdDevLabel = responseAggs[1].makeLabel();
+
+    expect(lowerStdDevLabel).toBe('Lower Standard Deviation of memory');
+    expect(upperStdDevLabel).toBe('Upper Standard Deviation of memory');
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/metrics/std_deviation.ts b/src/legacy/ui/public/agg_types/metrics/std_deviation.ts
index 89051f119c588d..ebd5fceb9c7511 100644
--- a/src/legacy/ui/public/agg_types/metrics/std_deviation.ts
+++ b/src/legacy/ui/public/agg_types/metrics/std_deviation.ts
@@ -21,7 +21,7 @@ import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
-import { getResponseAggConfigClass, IResponseAggConfig } from './get_response_agg_config_class';
+import { getResponseAggConfigClass, IResponseAggConfig } from './lib/get_response_agg_config_class';
 import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common';
 
 interface ValProp {
@@ -29,7 +29,7 @@ interface ValProp {
   title: string;
 }
 
-interface IStdDevAggConfig extends IResponseAggConfig {
+export interface IStdDevAggConfig extends IResponseAggConfig {
   keyedDetails: (customLabel: string, fieldDisplayName?: string) => { [key: string]: ValProp };
   valProp: () => ValProp;
 }
diff --git a/src/legacy/ui/public/agg_types/metrics/top_hit.test.ts b/src/legacy/ui/public/agg_types/metrics/top_hit.test.ts
new file mode 100644
index 00000000000000..e9d1ebb93d3ba6
--- /dev/null
+++ b/src/legacy/ui/public/agg_types/metrics/top_hit.test.ts
@@ -0,0 +1,366 @@
+/*
+ * 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 { dropRight, last } from 'lodash';
+import { topHitMetricAgg } from './top_hit';
+import { AggConfigs } from '../agg_configs';
+import { IMetricAggConfig } from './metric_agg_type';
+import { KBN_FIELD_TYPES } from '../../../../../plugins/data/common';
+
+jest.mock('ui/new_platform');
+
+describe('Top hit metric', () => {
+  let aggDsl: Record<string, any>;
+  let aggConfig: IMetricAggConfig;
+
+  const init = ({
+    fieldName = 'field',
+    sortOrder = 'desc',
+    aggregate = 'concat',
+    readFromDocValues = false,
+    fieldType = KBN_FIELD_TYPES.NUMBER,
+    size = 1,
+  }: any) => {
+    const field = {
+      name: fieldName,
+      displayName: fieldName,
+      type: fieldType,
+      readFromDocValues,
+      format: {
+        type: {
+          id: 'bytes',
+        },
+      },
+    };
+
+    const params = {
+      size,
+      field: fieldName,
+      sortField: field,
+      sortOrder: {
+        value: sortOrder,
+      },
+      aggregate: {
+        value: aggregate,
+      },
+    };
+
+    const indexPattern = {
+      id: '1234',
+      title: 'logstash-*',
+      fields: {
+        getByName: () => field,
+        filter: () => [field],
+      },
+      flattenHit: jest.fn(x => x!._source),
+    } as any;
+
+    const aggConfigs = new AggConfigs(
+      indexPattern,
+      [
+        {
+          id: '1',
+          type: 'top_hits',
+          schema: 'metric',
+          params,
+        },
+      ],
+      null
+    );
+
+    // Grab the aggConfig off the vis (we don't actually use the vis for anything else)
+    aggConfig = aggConfigs.aggs[0];
+    aggDsl = aggConfig.toDsl(aggConfigs);
+  };
+
+  it('should return a label prefixed with Last if sorting in descending order', () => {
+    init({ fieldName: 'bytes' });
+    expect(topHitMetricAgg.makeLabel(aggConfig)).toEqual('Last bytes');
+  });
+
+  it('should return a label prefixed with First if sorting in ascending order', () => {
+    init({
+      fieldName: 'bytes',
+      sortOrder: 'asc',
+    });
+    expect(topHitMetricAgg.makeLabel(aggConfig)).toEqual('First bytes');
+  });
+
+  it('should request the _source field', () => {
+    init({ field: '_source' });
+    expect(aggDsl.top_hits._source).toBeTruthy();
+    expect(aggDsl.top_hits.docvalue_fields).toBeUndefined();
+  });
+
+  it('requests both source and docvalues_fields for non-text aggregatable fields', () => {
+    init({ fieldName: 'bytes', readFromDocValues: true });
+    expect(aggDsl.top_hits._source).toBe('bytes');
+    expect(aggDsl.top_hits.docvalue_fields).toEqual([
+      { field: 'bytes', format: 'use_field_mapping' },
+    ]);
+  });
+
+  it('requests both source and docvalues_fields for date aggregatable fields', () => {
+    init({ fieldName: '@timestamp', readFromDocValues: true, fieldType: KBN_FIELD_TYPES.DATE });
+
+    expect(aggDsl.top_hits._source).toBe('@timestamp');
+    expect(aggDsl.top_hits.docvalue_fields).toEqual([{ field: '@timestamp', format: 'date_time' }]);
+  });
+
+  it('requests just source for aggregatable text fields', () => {
+    init({ fieldName: 'machine.os' });
+    expect(aggDsl.top_hits._source).toBe('machine.os');
+    expect(aggDsl.top_hits.docvalue_fields).toBeUndefined();
+  });
+
+  describe('try to get the value from the top hit', () => {
+    it('should return null if there is no hit', () => {
+      const bucket = {
+        '1': {
+          hits: {
+            hits: [],
+          },
+        },
+      };
+
+      init({ fieldName: '@tags' });
+      expect(topHitMetricAgg.getValue(aggConfig, bucket)).toBe(null);
+    });
+    //
+    it('should return undefined if the field does not appear in the source', () => {
+      const bucket = {
+        '1': {
+          hits: {
+            hits: [
+              {
+                _source: {
+                  bytes: 123,
+                },
+              },
+            ],
+          },
+        },
+      };
+
+      init({ fieldName: '@tags' });
+      expect(topHitMetricAgg.getValue(aggConfig, bucket)).toBe(undefined);
+    });
+
+    it('should return the field value from the top hit', () => {
+      const bucket = {
+        '1': {
+          hits: {
+            hits: [
+              {
+                _source: {
+                  '@tags': 'aaa',
+                },
+              },
+            ],
+          },
+        },
+      };
+
+      init({ fieldName: '@tags' });
+      expect(topHitMetricAgg.getValue(aggConfig, bucket)).toBe('aaa');
+    });
+
+    it('should return the object if the field value is an object', () => {
+      const bucket = {
+        '1': {
+          hits: {
+            hits: [
+              {
+                _source: {
+                  '@tags': {
+                    label: 'aaa',
+                  },
+                },
+              },
+            ],
+          },
+        },
+      };
+
+      init({ fieldName: '@tags' });
+
+      expect(topHitMetricAgg.getValue(aggConfig, bucket)).toEqual({ label: 'aaa' });
+    });
+
+    it('should return an array if the field has more than one values', () => {
+      const bucket = {
+        '1': {
+          hits: {
+            hits: [
+              {
+                _source: {
+                  '@tags': ['aaa', 'bbb'],
+                },
+              },
+            ],
+          },
+        },
+      };
+
+      init({ fieldName: '@tags' });
+      expect(topHitMetricAgg.getValue(aggConfig, bucket)).toEqual(['aaa', 'bbb']);
+    });
+
+    it('should return undefined if the field is not in the source nor in the doc_values field', () => {
+      const bucket = {
+        '1': {
+          hits: {
+            hits: [
+              {
+                _source: {
+                  bytes: 12345,
+                },
+                fields: {
+                  bytes: 12345,
+                },
+              },
+            ],
+          },
+        },
+      };
+
+      init({ fieldName: 'machine.os.raw', readFromDocValues: true });
+      expect(topHitMetricAgg.getValue(aggConfig, bucket)).toBe(undefined);
+    });
+
+    describe('Multivalued field and first/last X docs', () => {
+      it('should return a label prefixed with Last X docs if sorting in descending order', () => {
+        init({
+          fieldName: 'bytes',
+          size: 2,
+        });
+        expect(topHitMetricAgg.makeLabel(aggConfig)).toEqual('Last 2 bytes');
+      });
+
+      it('should return a label prefixed with First X docs if sorting in ascending order', () => {
+        init({
+          fieldName: 'bytes',
+          size: 2,
+          sortOrder: 'asc',
+        });
+        expect(topHitMetricAgg.makeLabel(aggConfig)).toEqual('First 2 bytes');
+      });
+
+      [
+        {
+          description: 'concat values with a comma',
+          type: 'concat',
+          data: [1, 2, 3],
+          result: [1, 2, 3],
+        },
+        {
+          description: 'sum up the values',
+          type: 'sum',
+          data: [1, 2, 3],
+          result: 6,
+        },
+        {
+          description: 'take the minimum value',
+          type: 'min',
+          data: [1, 2, 3],
+          result: 1,
+        },
+        {
+          description: 'take the maximum value',
+          type: 'max',
+          data: [1, 2, 3],
+          result: 3,
+        },
+        {
+          description: 'take the average value',
+          type: 'average',
+          data: [1, 2, 3],
+          result: 2,
+        },
+        {
+          description: 'support null/undefined',
+          type: 'min',
+          data: [undefined, null],
+          result: null,
+        },
+        {
+          description: 'support null/undefined',
+          type: 'max',
+          data: [undefined, null],
+          result: null,
+        },
+        {
+          description: 'support null/undefined',
+          type: 'sum',
+          data: [undefined, null],
+          result: null,
+        },
+        {
+          description: 'support null/undefined',
+          type: 'average',
+          data: [undefined, null],
+          result: null,
+        },
+      ].forEach(agg => {
+        it(`should return the result of the ${agg.type} aggregation over the last doc - ${agg.description}`, () => {
+          const bucket = {
+            '1': {
+              hits: {
+                hits: [
+                  {
+                    _source: {
+                      bytes: agg.data,
+                    },
+                  },
+                ],
+              },
+            },
+          };
+
+          init({ fieldName: 'bytes', aggregate: agg.type });
+          expect(topHitMetricAgg.getValue(aggConfig, bucket)).toEqual(agg.result);
+        });
+
+        it(`should return the result of the ${agg.type} aggregation over the last X docs - ${agg.description}`, () => {
+          const bucket = {
+            '1': {
+              hits: {
+                hits: [
+                  {
+                    _source: {
+                      bytes: dropRight(agg.data, 1),
+                    },
+                  },
+                  {
+                    _source: {
+                      bytes: last(agg.data),
+                    },
+                  },
+                ],
+              },
+            },
+          };
+
+          init({ fieldName: 'bytes', aggregate: agg.type });
+          expect(topHitMetricAgg.getValue(aggConfig, bucket)).toEqual(agg.result);
+        });
+      });
+    });
+  });
+});
diff --git a/src/legacy/ui/public/agg_types/param_types/json.test.ts b/src/legacy/ui/public/agg_types/param_types/json.test.ts
index fb31385505a765..827299814c62aa 100644
--- a/src/legacy/ui/public/agg_types/param_types/json.test.ts
+++ b/src/legacy/ui/public/agg_types/param_types/json.test.ts
@@ -19,7 +19,7 @@
 
 import { BaseParamType } from './base';
 import { JsonParamType } from './json';
-import { AggConfig } from 'ui/agg_types';
+import { AggConfig } from '../agg_config';
 
 jest.mock('ui/new_platform');
 
@@ -28,13 +28,12 @@ describe('JSON', function() {
   let aggConfig: AggConfig;
   let output: Record<string, any>;
 
-  function initAggParam(config: Record<string, any> = {}) {
-    return new JsonParamType({
+  const initAggParam = (config: Record<string, any> = {}) =>
+    new JsonParamType({
       ...config,
       type: 'json',
       name: paramName,
     });
-  }
 
   beforeEach(function() {
     aggConfig = { params: {} } as AggConfig;
diff --git a/src/legacy/ui/public/agg_types/param_types/string.test.ts b/src/legacy/ui/public/agg_types/param_types/string.test.ts
index 3d496ecf898e43..fd5ccebde993eb 100644
--- a/src/legacy/ui/public/agg_types/param_types/string.test.ts
+++ b/src/legacy/ui/public/agg_types/param_types/string.test.ts
@@ -19,7 +19,7 @@
 
 import { BaseParamType } from './base';
 import { StringParamType } from './string';
-import { AggConfig } from 'ui/agg_types';
+import { AggConfig } from '../agg_config';
 
 jest.mock('ui/new_platform');
 
@@ -28,13 +28,12 @@ describe('String', function() {
   let aggConfig: AggConfig;
   let output: Record<string, any>;
 
-  function initAggParam(config: Record<string, any> = {}) {
-    return new StringParamType({
+  const initAggParam = (config: Record<string, any> = {}) =>
+    new StringParamType({
       ...config,
       type: 'string',
       name: paramName,
     });
-  }
 
   beforeEach(() => {
     aggConfig = { params: {} } as AggConfig;
diff --git a/src/legacy/ui/public/agg_types/utils.ts b/src/legacy/ui/public/agg_types/utils.ts
index c6452cf46e0c0c..6721262d265f46 100644
--- a/src/legacy/ui/public/agg_types/utils.ts
+++ b/src/legacy/ui/public/agg_types/utils.ts
@@ -49,7 +49,7 @@ function isValidJson(value: string): boolean {
   }
 }
 
-function isValidInterval(value: string, baseInterval: string) {
+function isValidInterval(value: string, baseInterval?: string) {
   if (baseInterval) {
     return _parseWithBase(value, baseInterval);
   } else {
diff --git a/src/legacy/ui/public/autoload/modules.js b/src/legacy/ui/public/autoload/modules.js
index d662d479fc86bd..e1d897236297eb 100644
--- a/src/legacy/ui/public/autoload/modules.js
+++ b/src/legacy/ui/public/autoload/modules.js
@@ -27,7 +27,6 @@ import '../promises';
 import '../modals';
 import '../state_management/app_state';
 import '../state_management/global_state';
-import '../storage';
 import '../style_compile';
 import '../url';
 import '../directives/watch_multi';
diff --git a/src/legacy/ui/public/autoload/settings.js b/src/legacy/ui/public/autoload/settings.js
index c496839dda5d2d..50ae67c052b938 100644
--- a/src/legacy/ui/public/autoload/settings.js
+++ b/src/legacy/ui/public/autoload/settings.js
@@ -17,34 +17,4 @@
  * under the License.
  */
 
-/**
- * Autoload this file if we want some of the top level settings applied to a plugin.
- * Currently this file makes sure the following settings are applied globally:
- * - dateFormat:tz (meaning the Kibana time zone will be used in your plugin)
- * - dateFormat:dow (meaning the Kibana configured start of the week will be used in your plugin)
- */
-
-import moment from 'moment-timezone';
-import chrome from '../chrome';
-
-function setDefaultTimezone(tz) {
-  moment.tz.setDefault(tz);
-}
-
-function setStartDayOfWeek(day) {
-  const dow = moment.weekdays().indexOf(day);
-  moment.updateLocale(moment.locale(), { week: { dow } });
-}
-
-const uiSettings = chrome.getUiSettingsClient();
-
-setDefaultTimezone(uiSettings.get('dateFormat:tz'));
-setStartDayOfWeek(uiSettings.get('dateFormat:dow'));
-
-uiSettings.getUpdate$().subscribe(({ key, newValue }) => {
-  if (key === 'dateFormat:tz') {
-    setDefaultTimezone(newValue);
-  } else if (key === 'dateFormat:dow') {
-    setStartDayOfWeek(newValue);
-  }
-});
+/** Left intentionally empty to avoid breaking plugins that import this file during the NP migration */
diff --git a/src/legacy/ui/public/autoload/styles.js b/src/legacy/ui/public/autoload/styles.js
index 540f65edbf4d68..c623acca07b015 100644
--- a/src/legacy/ui/public/autoload/styles.js
+++ b/src/legacy/ui/public/autoload/styles.js
@@ -17,9 +17,4 @@
  * under the License.
  */
 
-// All Kibana styles inside of the /styles dir
-const context = require.context('../styles', false, /[\/\\](?!mixins|variables|_|\.|bootstrap_(light|dark))[^\/\\]+\.less/);
-context.keys().forEach(key => context(key));
-
-// manually require non-less files
-import '../styles/disable_animations';
+import 'ui/styles/font_awesome.less';
diff --git a/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx b/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx
index dccea2f61d5679..ff46b6ec34a86a 100644
--- a/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx
+++ b/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx
@@ -77,6 +77,7 @@ describe('injectUICapabilities', () => {
       uiCapabilities: UICapabilities;
     }
 
+    // eslint-disable-next-line react/prefer-stateless-function
     class MyClassComponent extends React.Component<ClassProps, {}> {
       public render() {
         return <span>{this.props.uiCapabilities.uiCapability2.nestedProp}</span>;
diff --git a/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx b/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx
index 21f96cf918afd7..76f1dd8016313e 100644
--- a/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx
+++ b/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx
@@ -77,6 +77,7 @@ describe('injectUICapabilities', () => {
       uiCapabilities: UICapabilities;
     }
 
+    // eslint-disable-next-line react/prefer-stateless-function
     class MyClassComponent extends React.Component<ClassProps, {}> {
       public render() {
         return <span>{this.props.uiCapabilities.uiCapability2.nestedProp}</span>;
diff --git a/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx b/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx
index fb6a1dc55c29ff..38711471074390 100644
--- a/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx
+++ b/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx
@@ -17,22 +17,14 @@
  * under the License.
  */
 
-import React, { ReactNode } from 'react';
+import React from 'react';
 import { UICapabilitiesContext } from './ui_capabilities_context';
 import { capabilities } from '..';
 
-interface Props {
-  children: ReactNode;
-}
+export const UICapabilitiesProvider: React.SFC = props => (
+  <UICapabilitiesContext.Provider value={capabilities.get()}>
+    {props.children}
+  </UICapabilitiesContext.Provider>
+);
 
-export class UICapabilitiesProvider extends React.Component<Props, {}> {
-  public static displayName: string = 'UICapabilitiesProvider';
-
-  public render() {
-    return (
-      <UICapabilitiesContext.Provider value={capabilities.get()}>
-        {this.props.children}
-      </UICapabilitiesContext.Provider>
-    );
-  }
-}
+UICapabilitiesProvider.displayName = 'UICapabilitiesProvider';
diff --git a/src/legacy/ui/public/chrome/api/base_path.test.mocks.ts b/src/legacy/ui/public/chrome/api/base_path.test.mocks.ts
index c362b1709fba69..f2c5fd5734b10f 100644
--- a/src/legacy/ui/public/chrome/api/base_path.test.mocks.ts
+++ b/src/legacy/ui/public/chrome/api/base_path.test.mocks.ts
@@ -19,7 +19,7 @@
 
 import { httpServiceMock } from '../../../../../core/public/mocks';
 
-export const newPlatformHttp = httpServiceMock.createSetupContract();
+const newPlatformHttp = httpServiceMock.createSetupContract({ basePath: 'npBasePath' });
 jest.doMock('ui/new_platform', () => ({
   npSetup: {
     core: { http: newPlatformHttp },
diff --git a/src/legacy/ui/public/chrome/api/base_path.test.ts b/src/legacy/ui/public/chrome/api/base_path.test.ts
index 812635ba364838..d3cfc6a3168a83 100644
--- a/src/legacy/ui/public/chrome/api/base_path.test.ts
+++ b/src/legacy/ui/public/chrome/api/base_path.test.ts
@@ -16,8 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { newPlatformHttp } from './base_path.test.mocks';
+import './base_path.test.mocks';
 import { initChromeBasePathApi } from './base_path';
 
 function initChrome() {
@@ -26,10 +25,6 @@ function initChrome() {
   return chrome;
 }
 
-newPlatformHttp.basePath.get.mockImplementation(() => 'gotBasePath');
-newPlatformHttp.basePath.prepend.mockImplementation(() => 'addedToPath');
-newPlatformHttp.basePath.remove.mockImplementation(() => 'removedFromPath');
-
 beforeEach(() => {
   jest.clearAllMocks();
 });
@@ -37,29 +32,20 @@ beforeEach(() => {
 describe('#getBasePath()', () => {
   it('proxies to newPlatformHttp.basePath.get()', () => {
     const chrome = initChrome();
-    expect(newPlatformHttp.basePath.prepend).not.toHaveBeenCalled();
-    expect(chrome.getBasePath()).toBe('gotBasePath');
-    expect(newPlatformHttp.basePath.get).toHaveBeenCalledTimes(1);
-    expect(newPlatformHttp.basePath.get).toHaveBeenCalledWith();
+    expect(chrome.getBasePath()).toBe('npBasePath');
   });
 });
 
 describe('#addBasePath()', () => {
   it('proxies to newPlatformHttp.basePath.prepend(path)', () => {
     const chrome = initChrome();
-    expect(newPlatformHttp.basePath.prepend).not.toHaveBeenCalled();
-    expect(chrome.addBasePath('foo/bar')).toBe('addedToPath');
-    expect(newPlatformHttp.basePath.prepend).toHaveBeenCalledTimes(1);
-    expect(newPlatformHttp.basePath.prepend).toHaveBeenCalledWith('foo/bar');
+    expect(chrome.addBasePath('/foo/bar')).toBe('npBasePath/foo/bar');
   });
 });
 
 describe('#removeBasePath', () => {
   it('proxies to newPlatformBasePath.basePath.remove(path)', () => {
     const chrome = initChrome();
-    expect(newPlatformHttp.basePath.remove).not.toHaveBeenCalled();
-    expect(chrome.removeBasePath('foo/bar')).toBe('removedFromPath');
-    expect(newPlatformHttp.basePath.remove).toHaveBeenCalledTimes(1);
-    expect(newPlatformHttp.basePath.remove).toHaveBeenCalledWith('foo/bar');
+    expect(chrome.removeBasePath('npBasePath/foo/bar')).toBe('/foo/bar');
   });
 });
diff --git a/src/legacy/ui/public/chrome/chrome.js b/src/legacy/ui/public/chrome/chrome.js
index a5a0521013a6e1..d644965e092258 100644
--- a/src/legacy/ui/public/chrome/chrome.js
+++ b/src/legacy/ui/public/chrome/chrome.js
@@ -26,7 +26,7 @@ import '../config';
 import '../notify';
 import '../private';
 import '../promises';
-import '../storage';
+import '../directives/storage';
 import '../directives/watch_multi';
 import './services';
 import '../react_components';
diff --git a/src/legacy/ui/public/chrome/directives/kbn_chrome.html b/src/legacy/ui/public/chrome/directives/kbn_chrome.html
index 541082e68de58d..7738093fe9dea7 100644
--- a/src/legacy/ui/public/chrome/directives/kbn_chrome.html
+++ b/src/legacy/ui/public/chrome/directives/kbn_chrome.html
@@ -1,4 +1,4 @@
-<div class="app-wrapper-panel">
+<div class="app-wrapper-panel" data-test-subj="appA11yRoot">
   <div id="globalBannerList"></div>
 
   <div
diff --git a/src/legacy/ui/public/courier/search_source/search_source.js b/src/legacy/ui/public/courier/search_source/search_source.js
index ed8d15d61c1dbd..729de41ed77db5 100644
--- a/src/legacy/ui/public/courier/search_source/search_source.js
+++ b/src/legacy/ui/public/courier/search_source/search_source.js
@@ -71,13 +71,13 @@
 
 import _ from 'lodash';
 import angular from 'angular';
-import { buildEsQuery, getEsQueryConfig } from '@kbn/es-query';
+import { getEsQueryConfig, buildEsQuery } from '@kbn/es-query';
 
 import { normalizeSortRequest } from './_normalize_sort_request';
 
 import { fetchSoon } from '../fetch';
 import { fieldWildcardFilter } from '../../field_wildcard';
-import { getHighlightRequest } from '../../../../../plugins/data/common/field_formats';
+import { getHighlightRequest } from '../../../../../plugins/data/public';
 import { npSetup } from 'ui/new_platform';
 import chrome from '../../chrome';
 import { RequestFailure } from '../fetch/errors';
diff --git a/src/legacy/ui/public/directives/storage/index.js b/src/legacy/ui/public/directives/storage/index.js
new file mode 100644
index 00000000000000..8c18012672c1be
--- /dev/null
+++ b/src/legacy/ui/public/directives/storage/index.js
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+import { uiModules } from '../../modules';
+import { Storage } from '../../../../../plugins/kibana_utils/public';
+
+const createService = function (type) {
+  return function ($window) {
+    return new Storage($window[type]);
+  };
+};
+
+uiModules.get('kibana/storage')
+  .service('localStorage', createService('localStorage'))
+  .service('sessionStorage', createService('sessionStorage'));
diff --git a/src/legacy/ui/public/doc_title/__tests__/doc_title.js b/src/legacy/ui/public/doc_title/__tests__/doc_title.js
index b4c3700e36f687..fa8b83f755957f 100644
--- a/src/legacy/ui/public/doc_title/__tests__/doc_title.js
+++ b/src/legacy/ui/public/doc_title/__tests__/doc_title.js
@@ -20,7 +20,8 @@
 import sinon from 'sinon';
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import { setBaseTitle, docTitle } from '../doc_title';
+import { docTitle } from '../doc_title';
+import { npStart } from '../../new_platform';
 
 describe('docTitle Service', function () {
   let initialDocTitle;
@@ -30,20 +31,24 @@ describe('docTitle Service', function () {
   beforeEach(function () {
     initialDocTitle = document.title;
     document.title = MAIN_TITLE;
-    setBaseTitle(MAIN_TITLE);
+    npStart.core.chrome.docTitle.__legacy.setBaseTitle(MAIN_TITLE);
   });
   afterEach(function () {
     document.title = initialDocTitle;
-    setBaseTitle(initialDocTitle);
+    npStart.core.chrome.docTitle.__legacy.setBaseTitle(initialDocTitle);
   });
 
-  beforeEach(ngMock.module('kibana', function ($provide) {
-    $provide.decorator('$rootScope', decorateWithSpy('$on'));
-  }));
+  beforeEach(
+    ngMock.module('kibana', function ($provide) {
+      $provide.decorator('$rootScope', decorateWithSpy('$on'));
+    })
+  );
 
-  beforeEach(ngMock.inject(function ($injector) {
-    $rootScope = $injector.get('$rootScope');
-  }));
+  beforeEach(
+    ngMock.inject(function ($injector) {
+      $rootScope = $injector.get('$rootScope');
+    })
+  );
 
   describe('setup', function () {
     it('resets the title when a route change begins', function () {
@@ -60,13 +65,11 @@ describe('docTitle Service', function () {
   });
 
   describe('#reset', function () {
-    it('clears the internal state, next update() will write the default', function () {
+    it('clears the internal state', function () {
       docTitle.change('some title');
-      docTitle.update();
       expect(document.title).to.be('some title - ' + MAIN_TITLE);
 
       docTitle.reset();
-      docTitle.update();
       expect(document.title).to.be(MAIN_TITLE);
     });
   });
@@ -77,12 +80,6 @@ describe('docTitle Service', function () {
       docTitle.change('some secondary title');
       expect(document.title).to.be('some secondary title - ' + MAIN_TITLE);
     });
-
-    it('will write just the first param if the second param is true', function () {
-      expect(document.title).to.be(MAIN_TITLE);
-      docTitle.change('entire name', true);
-      expect(document.title).to.be('entire name');
-    });
   });
 
   function decorateWithSpy(prop) {
@@ -91,5 +88,4 @@ describe('docTitle Service', function () {
       return $delegate;
     };
   }
-
 });
diff --git a/src/legacy/ui/public/doc_title/doc_title.js b/src/legacy/ui/public/doc_title/doc_title.js
index 3692fd71f06cc2..0edc55a0ac366e 100644
--- a/src/legacy/ui/public/doc_title/doc_title.js
+++ b/src/legacy/ui/public/doc_title/doc_title.js
@@ -17,53 +17,28 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import { isArray } from 'lodash';
 import { uiModules } from '../modules';
+import { npStart } from '../new_platform';
 
-let baseTitle = document.title;
+const npDocTitle = () => npStart.core.chrome.docTitle;
 
-// for karma test
-export function setBaseTitle(str) {
-  baseTitle = str;
-}
-
-let lastChange;
-
-function render() {
-  lastChange = lastChange || [];
-
-  const parts = [lastChange[0]];
-
-  if (!lastChange[1]) parts.push(baseTitle);
-
-  return _(parts).flattenDeep().compact().join(' - ');
-}
-
-function change(title, complete) {
-  lastChange = [title, complete];
-  update();
+function change(title) {
+  npDocTitle().change(isArray(title) ? title : [title]);
 }
 
 function reset() {
-  lastChange = null;
-}
-
-function update() {
-  document.title = render();
+  npDocTitle().reset();
 }
 
 export const docTitle = {
-  render,
   change,
   reset,
-  update,
 };
 
 uiModules.get('kibana')
   .run(function ($rootScope) {
   // always bind to the route events
     $rootScope.$on('$routeChangeStart', docTitle.reset);
-    $rootScope.$on('$routeChangeError', docTitle.update);
-    $rootScope.$on('$routeChangeSuccess', docTitle.update);
   });
 
diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/__snapshots__/url.test.js.snap b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/__snapshots__/url.test.js.snap
index b81e5b242d0248..796de886dc5bcd 100644
--- a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/__snapshots__/url.test.js.snap
+++ b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/__snapshots__/url.test.js.snap
@@ -125,6 +125,7 @@ exports[`UrlFormatEditor should render label template help 1`] = `
     />
   </EuiFormRow>
   <InjectIntl(FormatEditorSamplesComponent)
+    sampleType="html"
     samples={Array []}
   />
 </Fragment>
@@ -255,6 +256,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
     />
   </EuiFormRow>
   <InjectIntl(FormatEditorSamplesComponent)
+    sampleType="html"
     samples={Array []}
   />
 </Fragment>
@@ -385,6 +387,7 @@ exports[`UrlFormatEditor should render url template help 1`] = `
     />
   </EuiFormRow>
   <InjectIntl(FormatEditorSamplesComponent)
+    sampleType="html"
     samples={Array []}
   />
 </Fragment>
@@ -564,6 +567,7 @@ exports[`UrlFormatEditor should render width and height fields if image 1`] = `
     />
   </EuiFormRow>
   <InjectIntl(FormatEditorSamplesComponent)
+    sampleType="html"
     samples={
       Array [
         Object {
diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/url.js b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/url.js
index 69eeb20e14666b..72466c4e327e8b 100644
--- a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/url.js
+++ b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/url.js
@@ -153,7 +153,7 @@ export class UrlFormatEditor extends DefaultFormatEditor {
 
   render() {
     const { format, formatParams } = this.props;
-    const { error, samples } = this.state;
+    const { error, samples, sampleConverterType } = this.state;
 
     return (
       <Fragment>
@@ -239,6 +239,7 @@ export class UrlFormatEditor extends DefaultFormatEditor {
 
         <FormatEditorSamples
           samples={samples}
+          sampleType={sampleConverterType}
         />
       </Fragment>
     );
diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/samples/samples.js b/src/legacy/ui/public/field_editor/components/field_format_editor/samples/samples.js
index 78e9a2a8f77a81..75bee9b1658fd1 100644
--- a/src/legacy/ui/public/field_editor/components/field_format_editor/samples/samples.js
+++ b/src/legacy/ui/public/field_editor/components/field_format_editor/samples/samples.js
@@ -25,6 +25,9 @@ import { EuiBasicTable, EuiFormRow } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
 
 export class FormatEditorSamplesComponent extends PureComponent {
+  static defaultProps = {
+    sampleType: 'text'
+  };
   static propTypes = {
     samples: PropTypes.arrayOf(
       PropTypes.shape({
@@ -32,10 +35,11 @@ export class FormatEditorSamplesComponent extends PureComponent {
         output: PropTypes.any.isRequired,
       })
     ).isRequired,
+    sampleType: PropTypes.oneOf(['html', 'text']),
   };
 
   render() {
-    const { samples, intl } = this.props;
+    const { samples, intl, sampleType } = this.props;
 
     const columns = [
       {
@@ -55,15 +59,16 @@ export class FormatEditorSamplesComponent extends PureComponent {
           defaultMessage: 'Output',
         }),
         render: output => {
-          return (
-            <div
+          return sampleType === 'html' ?
+            (
+              <div
               /*
                * Justification for dangerouslySetInnerHTML:
                * Sample output may contain HTML tags, like URL image/audio format.
                */
-              dangerouslySetInnerHTML={{ __html: output }} //eslint-disable-line react/no-danger
-            />
-          );
+                dangerouslySetInnerHTML={{ __html: output }} //eslint-disable-line react/no-danger
+              />
+            ) : (<div>{output}</div>);
         },
       },
     ];
diff --git a/src/legacy/ui/public/filter_manager/__tests__/filter_generator.js b/src/legacy/ui/public/filter_manager/__tests__/filter_generator.js
index a6bf2e7aa6c4c4..5b6455bf20847e 100644
--- a/src/legacy/ui/public/filter_manager/__tests__/filter_generator.js
+++ b/src/legacy/ui/public/filter_manager/__tests__/filter_generator.js
@@ -24,8 +24,8 @@ import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import { getFilterGenerator } from '..';
 import { FilterBarQueryFilterProvider } from '../../filter_manager/query_filter';
-import { uniqFilters } from '../../../../core_plugins/data/public/filter/filter_manager/lib/uniq_filters';
-import { getPhraseScript } from '@kbn/es-query';
+import { uniqFilters, esFilters } from '../../../../../plugins/data/public';
+
 let queryFilter;
 let filterGen;
 let appState;
@@ -137,14 +137,14 @@ describe('Filter Manager', function () {
     filterGen.add(scriptedField, 1, '+', 'myIndex');
     checkAddFilters(1, [{
       meta: { index: 'myIndex', negate: false, field: 'scriptedField' },
-      script: getPhraseScript(scriptedField, 1)
+      script: esFilters.getPhraseScript(scriptedField, 1)
     }], 4);
     expect(appState.filters).to.have.length(3);
 
     filterGen.add(scriptedField, 1, '-', 'myIndex');
     checkAddFilters(1, [{
       meta: { index: 'myIndex', negate: true, disabled: false, field: 'scriptedField' },
-      script: getPhraseScript(scriptedField, 1)
+      script: esFilters.getPhraseScript(scriptedField, 1)
     }], 5);
     expect(appState.filters).to.have.length(3);
   });
diff --git a/src/legacy/ui/public/filter_manager/filter_generator.js b/src/legacy/ui/public/filter_manager/filter_generator.js
index f119a95833668b..e11e0ff6653a7e 100644
--- a/src/legacy/ui/public/filter_manager/filter_generator.js
+++ b/src/legacy/ui/public/filter_manager/filter_generator.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { getPhraseFilterField, getPhraseFilterValue, getPhraseScript, isPhraseFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../plugins/data/public';
 
 // Adds a filter to a passed state
 export function getFilterGenerator(queryFilter) {
@@ -42,8 +42,8 @@ export function getFilterGenerator(queryFilter) {
           return filter.exists.field === value;
         }
 
-        if (isPhraseFilter(filter)) {
-          return getPhraseFilterField(filter) === fieldName && getPhraseFilterValue(filter) === value;
+        if (esFilters.isPhraseFilter(filter)) {
+          return esFilters.getPhraseFilterField(filter) === fieldName && esFilters.getPhraseFilterValue(filter) === value;
         }
 
         if (filter.script) {
@@ -73,7 +73,7 @@ export function getFilterGenerator(queryFilter) {
           if (field.scripted) {
             filter = {
               meta: { negate, index, field: fieldName },
-              script: getPhraseScript(field, value)
+              script: esFilters.getPhraseScript(field, value)
             };
           } else {
             filter = { meta: { negate, index }, query: { match_phrase: {} } };
diff --git a/src/legacy/ui/public/filter_manager/query_filter.js b/src/legacy/ui/public/filter_manager/query_filter.js
index 6afe52502df5db..97b3810b7f1c73 100644
--- a/src/legacy/ui/public/filter_manager/query_filter.js
+++ b/src/legacy/ui/public/filter_manager/query_filter.js
@@ -18,12 +18,10 @@
  */
 
 import { FilterStateManager } from 'plugins/data';
+import { npStart } from 'ui/new_platform';
 
 export function FilterBarQueryFilterProvider(getAppState, globalState) {
-  // TODO: this is imported here to avoid circular imports.
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const { start } = require('../../../core_plugins/data/public/legacy');
-  const filterManager = start.filter.filterManager;
+  const { filterManager } = npStart.plugins.data.query;
   const filterStateManager = new FilterStateManager(globalState, getAppState, filterManager);
 
   const queryFilter = {};
diff --git a/src/legacy/ui/public/kbn_top_nav/kbn_top_nav.js b/src/legacy/ui/public/kbn_top_nav/kbn_top_nav.js
index 79365eb5cf1cc5..9c4cee6b05db04 100644
--- a/src/legacy/ui/public/kbn_top_nav/kbn_top_nav.js
+++ b/src/legacy/ui/public/kbn_top_nav/kbn_top_nav.js
@@ -20,11 +20,11 @@
 import 'ngreact';
 import { wrapInI18nContext } from 'ui/i18n';
 import { uiModules } from 'ui/modules';
-import { TopNavMenu } from '../../../core_plugins/kibana_react/public';
+import { start as navigation } from '../../../core_plugins/navigation/public/legacy';
 
 const module = uiModules.get('kibana');
 
-module.directive('kbnTopNav', () => {
+export function createTopNavDirective() {
   return {
     restrict: 'E',
     template: '',
@@ -71,9 +71,12 @@ module.directive('kbnTopNav', () => {
       return linkFn;
     }
   };
-});
+}
 
-module.directive('kbnTopNavHelper', (reactDirective) => {
+module.directive('kbnTopNav', createTopNavDirective);
+
+export function createTopNavHelper(reactDirective) {
+  const { TopNavMenu } = navigation.ui;
   return reactDirective(
     wrapInI18nContext(TopNavMenu),
     [
@@ -113,4 +116,6 @@ module.directive('kbnTopNavHelper', (reactDirective) => {
       'showAutoRefreshOnly',
     ],
   );
-});
+}
+
+module.directive('kbnTopNavHelper', createTopNavHelper);
diff --git a/src/legacy/ui/public/legacy_compat/angular_config.tsx b/src/legacy/ui/public/legacy_compat/angular_config.tsx
index 8eac31e24530c7..58b8422cb2f8a9 100644
--- a/src/legacy/ui/public/legacy_compat/angular_config.tsx
+++ b/src/legacy/ui/public/legacy_compat/angular_config.tsx
@@ -18,6 +18,7 @@
  */
 
 import {
+  auto,
   ICompileProvider,
   IHttpProvider,
   IHttpService,
@@ -48,6 +49,12 @@ import { isSystemApiRequest } from '../system_api';
 
 const URL_LIMIT_WARN_WITHIN = 1000;
 
+function isDummyWrapperRoute($route: any) {
+  return (
+    $route.current && $route.current.$$route && $route.current.$$route.outerAngularWrapperRoute
+  );
+}
+
 export const configureAppAngularModule = (angularModule: IModule) => {
   const newPlatform = npStart.core;
   const legacyMetadata = newPlatform.injectedMetadata.getLegacyMetadata();
@@ -187,6 +194,9 @@ const $setupBreadcrumbsAutoClear = (newPlatform: CoreStart) => (
   });
 
   $rootScope.$on('$routeChangeSuccess', () => {
+    if (isDummyWrapperRoute($route)) {
+      return;
+    }
     const current = $route.current || {};
 
     if (breadcrumbSetSinceRouteChange || (current.$$route && current.$$route.redirectTo)) {
@@ -226,6 +236,9 @@ const $setupBadgeAutoClear = (newPlatform: CoreStart) => (
   });
 
   $rootScope.$on('$routeChangeSuccess', () => {
+    if (isDummyWrapperRoute($route)) {
+      return;
+    }
     const current = $route.current || {};
 
     if (badgeSetSinceRouteChange || (current.$$route && current.$$route.redirectTo)) {
@@ -270,10 +283,16 @@ const $setupHelpExtensionAutoClear = (newPlatform: CoreStart) => (
   const $route = $injector.has('$route') ? $injector.get('$route') : {};
 
   $rootScope.$on('$routeChangeStart', () => {
+    if (isDummyWrapperRoute($route)) {
+      return;
+    }
     helpExtensionSetSinceRouteChange = false;
   });
 
   $rootScope.$on('$routeChangeSuccess', () => {
+    if (isDummyWrapperRoute($route)) {
+      return;
+    }
     const current = $route.current || {};
 
     if (helpExtensionSetSinceRouteChange || (current.$$route && current.$$route.redirectTo)) {
@@ -287,13 +306,16 @@ const $setupHelpExtensionAutoClear = (newPlatform: CoreStart) => (
 const $setupUrlOverflowHandling = (newPlatform: CoreStart) => (
   $location: ILocationService,
   $rootScope: IRootScopeService,
-  Private: any,
-  config: any
+  $injector: auto.IInjectorService
 ) => {
+  const $route = $injector.has('$route') ? $injector.get('$route') : {};
   const urlOverflow = new UrlOverflowService();
   const check = () => {
+    if (isDummyWrapperRoute($route)) {
+      return;
+    }
     // disable long url checks when storing state in session storage
-    if (config.get('state:storeInSessionStorage')) {
+    if (newPlatform.uiSettings.get('state:storeInSessionStorage')) {
       return;
     }
 
diff --git a/src/legacy/ui/public/modals/confirm_modal.js b/src/legacy/ui/public/modals/confirm_modal.js
index 6d5abfca64aaf5..9c3f46da4e9275 100644
--- a/src/legacy/ui/public/modals/confirm_modal.js
+++ b/src/legacy/ui/public/modals/confirm_modal.js
@@ -36,16 +36,7 @@ export const ConfirmationButtonTypes = {
   CANCEL: CANCEL_BUTTON
 };
 
-/**
- * @typedef {Object} ConfirmModalOptions
- * @property {String} confirmButtonText
- * @property {String=} cancelButtonText
- * @property {function} onConfirm
- * @property {function=} onCancel
- * @property {String=} title - If given, shows a title on the confirm modal.
- */
-
-module.factory('confirmModal', function ($rootScope, $compile) {
+export function confirmModalFactory($rootScope, $compile) {
   let modalPopover;
   const confirmQueue = [];
 
@@ -114,4 +105,15 @@ module.factory('confirmModal', function ($rootScope, $compile) {
       }
     }
   };
-});
+}
+
+/**
+ * @typedef {Object} ConfirmModalOptions
+ * @property {String} confirmButtonText
+ * @property {String=} cancelButtonText
+ * @property {function} onConfirm
+ * @property {function=} onCancel
+ * @property {String=} title - If given, shows a title on the confirm modal.
+ */
+
+module.factory('confirmModal', confirmModalFactory);
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
index ae5c0a83bd781f..bb055d6ce1e334 100644
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -19,6 +19,12 @@
 
 import sinon from 'sinon';
 
+const mockObservable = () => {
+  return {
+    subscribe: () => {}
+  };
+};
+
 export const npSetup = {
   core: {
     chrome: {}
@@ -36,9 +42,25 @@ export const npSetup = {
           register: () => undefined,
           get: () => null,
         },
+        getExecutor: () => ({
+          interpreter: {
+            interpretAst: () => {},
+          },
+        }),
       },
     },
     data: {
+      autocomplete: {
+        addProvider: sinon.fake(),
+        getProvider: sinon.fake(),
+      },
+      query: {
+        filterManager: sinon.fake(),
+        timefilter: {
+          timefilter: sinon.fake(),
+          history: sinon.fake(),
+        }
+      },
     },
     inspector: {
       registerView: () => undefined,
@@ -56,6 +78,10 @@ export const npSetup = {
   },
 };
 
+let refreshInterval = undefined;
+let isTimeRangeSelectorEnabled = true;
+let isAutoRefreshSelectorEnabled = true;
+
 export const npStart = {
   core: {
     chrome: {}
@@ -72,7 +98,63 @@ export const npStart = {
       registerType: sinon.fake(),
     },
     data: {
+      autocomplete: {
+        getProvider: sinon.fake(),
+      },
       getSuggestions: sinon.fake(),
+      query: {
+        filterManager: {
+          getFetches$: sinon.fake(),
+          getFilters: sinon.fake(),
+          getAppFilters: sinon.fake(),
+          getGlobalFilters: sinon.fake(),
+          removeFilter: sinon.fake(),
+          addFilters: sinon.fake(),
+          setFilters: sinon.fake(),
+          removeAll: sinon.fake(),
+          getUpdates$: mockObservable,
+
+        },
+        timefilter: {
+          timefilter: {
+            getFetch$: mockObservable,
+            getAutoRefreshFetch$: mockObservable,
+            getEnabledUpdated$: mockObservable,
+            getTimeUpdate$: mockObservable,
+            getRefreshIntervalUpdate$: mockObservable,
+            isTimeRangeSelectorEnabled: () => {
+              return isTimeRangeSelectorEnabled;
+            },
+            isAutoRefreshSelectorEnabled: () => {
+              return isAutoRefreshSelectorEnabled;
+            },
+            disableAutoRefreshSelector: () => {
+              isAutoRefreshSelectorEnabled = false;
+            },
+            enableAutoRefreshSelector: () => {
+              isAutoRefreshSelectorEnabled = true;
+            },
+            getRefreshInterval: () => {
+              return refreshInterval;
+            },
+            setRefreshInterval: (interval) => {
+              refreshInterval = interval;
+            },
+            enableTimeRangeSelector: () => {
+              isTimeRangeSelectorEnabled = true;
+            },
+            disableTimeRangeSelector: () => {
+              isTimeRangeSelectorEnabled = false;
+            },
+            getTime: sinon.fake(),
+            setTime: sinon.fake(),
+            getBounds: sinon.fake(),
+            calculateBounds: sinon.fake(),
+            createFilter: sinon.fake(),
+          },
+          history: sinon.fake(),
+        },
+      },
     },
     inspector: {
       isAvailable: () => false,
@@ -96,6 +178,10 @@ export const npStart = {
 
 export function __setup__(coreSetup) {
   npSetup.core = coreSetup;
+
+  // no-op application register calls (this is overwritten to
+  // bootstrap an LP plugin outside of tests)
+  npSetup.core.application.register = () => {};
 }
 
 export function __start__(coreStart) {
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
index b86f9cde0125c2..0c7b28e7da3df2 100644
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -28,11 +28,16 @@ import {
   Start as InspectorStart,
 } from '../../../../plugins/inspector/public';
 import { EuiUtilsStart } from '../../../../plugins/eui_utils/public';
+import {
+  FeatureCatalogueSetup,
+  FeatureCatalogueStart,
+} from '../../../../plugins/feature_catalogue/public';
 
 export interface PluginsSetup {
   data: ReturnType<DataPlugin['setup']>;
   embeddable: EmbeddableSetup;
   expressions: ReturnType<ExpressionsPlugin['setup']>;
+  feature_catalogue: FeatureCatalogueSetup;
   inspector: InspectorSetup;
   uiActions: IUiActionsSetup;
 }
@@ -42,6 +47,7 @@ export interface PluginsStart {
   embeddable: EmbeddableStart;
   eui_utils: EuiUtilsStart;
   expressions: ReturnType<ExpressionsPlugin['start']>;
+  feature_catalogue: FeatureCatalogueStart;
   inspector: InspectorStart;
   uiActions: IUiActionsStart;
 }
diff --git a/src/legacy/ui/public/private/private.js b/src/legacy/ui/public/private/private.js
index ef5c59c21dd7ac..6257c12ecf6961 100644
--- a/src/legacy/ui/public/private/private.js
+++ b/src/legacy/ui/public/private/private.js
@@ -108,98 +108,100 @@ function name(fn) {
   return fn.name || fn.toString().split('\n').shift();
 }
 
-uiModules.get('kibana/private')
-  .provider('Private', function () {
-    const provider = this;
-
-    // one cache/swaps per Provider
-    const cache = {};
-    const swaps = {};
+export function PrivateProvider() {
+  const provider = this;
 
-    // return the uniq id for this function
-    function identify(fn) {
-      if (typeof fn !== 'function') {
-        throw new TypeError('Expected private module "' + fn + '" to be a function');
-      }
+  // one cache/swaps per Provider
+  const cache = {};
+  const swaps = {};
 
-      if (fn.$$id) return fn.$$id;
-      else return (fn.$$id = nextId());
+  // return the uniq id for this function
+  function identify(fn) {
+    if (typeof fn !== 'function') {
+      throw new TypeError('Expected private module "' + fn + '" to be a function');
     }
 
-    provider.stub = function (fn, instance) {
-      cache[identify(fn)] = instance;
-      return instance;
-    };
+    if (fn.$$id) return fn.$$id;
+    else return (fn.$$id = nextId());
+  }
 
-    provider.swap = function (fn, prov) {
-      const id = identify(fn);
-      swaps[id] = prov;
-    };
+  provider.stub = function (fn, instance) {
+    cache[identify(fn)] = instance;
+    return instance;
+  };
 
-    provider.$get = ['$injector', function PrivateFactory($injector) {
+  provider.swap = function (fn, prov) {
+    const id = identify(fn);
+    swaps[id] = prov;
+  };
 
-      // prevent circular deps by tracking where we came from
-      const privPath = [];
-      const pathToString = function () {
-        return privPath.map(name).join(' -> ');
-      };
+  provider.$get = ['$injector', function PrivateFactory($injector) {
 
-      // call a private provider and return the instance it creates
-      function instantiate(prov, locals) {
-        if (~privPath.indexOf(prov)) {
-          throw new Error(
-            'Circular reference to "' + name(prov) + '"' +
-          ' found while resolving private deps: ' + pathToString()
-          );
-        }
+    // prevent circular deps by tracking where we came from
+    const privPath = [];
+    const pathToString = function () {
+      return privPath.map(name).join(' -> ');
+    };
 
-        privPath.push(prov);
+    // call a private provider and return the instance it creates
+    function instantiate(prov, locals) {
+      if (~privPath.indexOf(prov)) {
+        throw new Error(
+          'Circular reference to "' + name(prov) + '"' +
+        ' found while resolving private deps: ' + pathToString()
+        );
+      }
 
-        const context = {};
-        let instance = $injector.invoke(prov, context, locals);
-        if (!_.isObject(instance)) instance = context;
+      privPath.push(prov);
 
-        privPath.pop();
-        return instance;
-      }
+      const context = {};
+      let instance = $injector.invoke(prov, context, locals);
+      if (!_.isObject(instance)) instance = context;
 
-      // retrieve an instance from cache or create and store on
-      function get(id, prov, $delegateId, $delegateProv) {
-        if (cache[id]) return cache[id];
+      privPath.pop();
+      return instance;
+    }
 
-        let instance;
+    // retrieve an instance from cache or create and store on
+    function get(id, prov, $delegateId, $delegateProv) {
+      if (cache[id]) return cache[id];
 
-        if ($delegateId != null && $delegateProv != null) {
-          instance = instantiate(prov, {
-            $decorate: _.partial(get, $delegateId, $delegateProv)
-          });
-        } else {
-          instance = instantiate(prov);
-        }
+      let instance;
 
-        return (cache[id] = instance);
+      if ($delegateId != null && $delegateProv != null) {
+        instance = instantiate(prov, {
+          $decorate: _.partial(get, $delegateId, $delegateProv)
+        });
+      } else {
+        instance = instantiate(prov);
       }
 
-      // main api, get the appropriate instance for a provider
-      function Private(prov) {
-        let id = identify(prov);
-        let $delegateId;
-        let $delegateProv;
+      return (cache[id] = instance);
+    }
 
-        if (swaps[id]) {
-          $delegateId = id;
-          $delegateProv = prov;
+    // main api, get the appropriate instance for a provider
+    function Private(prov) {
+      let id = identify(prov);
+      let $delegateId;
+      let $delegateProv;
 
-          prov = swaps[$delegateId];
-          id = identify(prov);
-        }
+      if (swaps[id]) {
+        $delegateId = id;
+        $delegateProv = prov;
 
-        return get(id, prov, $delegateId, $delegateProv);
+        prov = swaps[$delegateId];
+        id = identify(prov);
       }
 
-      Private.stub = provider.stub;
-      Private.swap = provider.swap;
+      return get(id, prov, $delegateId, $delegateProv);
+    }
+
+    Private.stub = provider.stub;
+    Private.swap = provider.swap;
+
+    return Private;
+  }];
+}
 
-      return Private;
-    }];
-  });
+uiModules.get('kibana/private')
+  .provider('Private', PrivateProvider);
diff --git a/src/legacy/ui/public/promises/promises.js b/src/legacy/ui/public/promises/promises.js
index 99c9a11be74314..af8a5081e0c550 100644
--- a/src/legacy/ui/public/promises/promises.js
+++ b/src/legacy/ui/public/promises/promises.js
@@ -22,9 +22,7 @@ import { uiModules } from '../modules';
 
 const module = uiModules.get('kibana');
 
-// Provides a tiny subset of the excellent API from
-// bluebird, reimplemented using the $q service
-module.service('Promise', function ($q, $timeout) {
+export function PromiseServiceCreator($q, $timeout) {
   function Promise(fn) {
     if (typeof this === 'undefined') throw new Error('Promise constructor must be called with "new"');
 
@@ -122,4 +120,8 @@ module.service('Promise', function ($q, $timeout) {
   };
 
   return Promise;
-});
+}
+
+// Provides a tiny subset of the excellent API from
+// bluebird, reimplemented using the $q service
+module.service('Promise', PromiseServiceCreator);
diff --git a/src/legacy/ui/public/registry/feature_catalogue.js b/src/legacy/ui/public/registry/feature_catalogue.js
index 0eb8a4a3345217..8905a15106953f 100644
--- a/src/legacy/ui/public/registry/feature_catalogue.js
+++ b/src/legacy/ui/public/registry/feature_catalogue.js
@@ -19,6 +19,7 @@
 
 import { uiRegistry } from './_registry';
 import { capabilities } from '../capabilities';
+export { FeatureCatalogueCategory } from '../../../../plugins/feature_catalogue/public';
 
 export const FeatureCatalogueRegistryProvider = uiRegistry({
   name: 'featureCatalogue',
@@ -30,9 +31,3 @@ export const FeatureCatalogueRegistryProvider = uiRegistry({
     return !isDisabledViaCapabilities && Object.keys(featureCatalogItem).length > 0;
   }
 });
-
-export const FeatureCatalogueCategory = {
-  ADMIN: 'admin',
-  DATA: 'data',
-  OTHER: 'other'
-};
diff --git a/src/legacy/ui/public/registry/navbar_extensions.js b/src/legacy/ui/public/registry/navbar_extensions.js
deleted file mode 100644
index 6c7911c6f0f521..00000000000000
--- a/src/legacy/ui/public/registry/navbar_extensions.js
+++ /dev/null
@@ -1,28 +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 { uiRegistry } from './_registry';
-
-export const NavBarExtensionsRegistryProvider = uiRegistry({
-  name: 'navbarExtensions',
-  index: ['name'],
-  group: ['appName'],
-  order: ['order']
-});
-
diff --git a/src/legacy/ui/public/routes/route_manager.d.ts b/src/legacy/ui/public/routes/route_manager.d.ts
index 3471d7e954862f..56203354f3c203 100644
--- a/src/legacy/ui/public/routes/route_manager.d.ts
+++ b/src/legacy/ui/public/routes/route_manager.d.ts
@@ -26,7 +26,10 @@ import { ChromeBreadcrumb } from '../../../../core/public';
 interface RouteConfiguration {
   controller?: string | ((...args: any[]) => void);
   redirectTo?: string;
+  resolveRedirectTo?: (...args: any[]) => void;
   reloadOnSearch?: boolean;
+  reloadOnUrl?: boolean;
+  outerAngularWrapperRoute?: boolean;
   resolve?: object;
   template?: string;
   k7Breadcrumbs?: (...args: any[]) => ChromeBreadcrumb[];
diff --git a/src/legacy/ui/public/saved_objects/show_saved_object_save_modal.tsx b/src/legacy/ui/public/saved_objects/show_saved_object_save_modal.tsx
index 6aea3c72e0c34a..3c691c692948a7 100644
--- a/src/legacy/ui/public/saved_objects/show_saved_object_save_modal.tsx
+++ b/src/legacy/ui/public/saved_objects/show_saved_object_save_modal.tsx
@@ -34,7 +34,7 @@ function isSuccess(result: SaveResult): result is { id?: string } {
   return 'id' in result;
 }
 
-interface MinimalSaveModalProps {
+export interface MinimalSaveModalProps {
   onSave: (...args: any[]) => Promise<SaveResult>;
   onClose: () => void;
 }
diff --git a/src/legacy/ui/public/state_management/config_provider.js b/src/legacy/ui/public/state_management/config_provider.js
index 090210cc8723e8..ec770e7fef6caf 100644
--- a/src/legacy/ui/public/state_management/config_provider.js
+++ b/src/legacy/ui/public/state_management/config_provider.js
@@ -25,21 +25,23 @@
 
 import { uiModules } from '../modules';
 
-uiModules.get('kibana/state_management')
-  .provider('stateManagementConfig', class StateManagementConfigProvider {
-    _enabled = true
+export class StateManagementConfigProvider {
+  _enabled = true
+
+  $get(/* inject stuff */) {
+    return {
+      enabled: this._enabled,
+    };
+  }
 
-    $get(/* inject stuff */) {
-      return {
-        enabled: this._enabled,
-      };
-    }
+  disable() {
+    this._enabled = false;
+  }
 
-    disable() {
-      this._enabled = false;
-    }
+  enable() {
+    this._enabled = true;
+  }
+}
 
-    enable() {
-      this._enabled = true;
-    }
-  });
+uiModules.get('kibana/state_management')
+  .provider('stateManagementConfig', StateManagementConfigProvider);
diff --git a/src/legacy/ui/public/storage/directive.js b/src/legacy/ui/public/storage/directive.js
deleted file mode 100644
index a5bb2ee3b6b0bd..00000000000000
--- a/src/legacy/ui/public/storage/directive.js
+++ /dev/null
@@ -1,32 +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 { uiModules } from '../modules';
-import { Storage } from './storage';
-
-const createService = function (type) {
-  return function ($window) {
-    return new Storage($window[type]);
-  };
-};
-
-uiModules.get('kibana/storage')
-  .service('localStorage', createService('localStorage'))
-  .service('sessionStorage', createService('sessionStorage'));
diff --git a/src/legacy/ui/public/storage/index.ts b/src/legacy/ui/public/storage/index.ts
deleted file mode 100644
index 17bbb61b2b8d5a..00000000000000
--- a/src/legacy/ui/public/storage/index.ts
+++ /dev/null
@@ -1,22 +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 './directive';
-
-export { Storage } from './storage';
diff --git a/src/legacy/ui/public/storage/storage.ts b/src/legacy/ui/public/storage/storage.ts
deleted file mode 100644
index 703886c1e034c4..00000000000000
--- a/src/legacy/ui/public/storage/storage.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import angular from 'angular';
-
-// This is really silly, but I wasn't prepared to rename the kibana Storage class everywhere it is used
-// and this is the only way I could figure out how to use the type definition for a built in object
-// in a file that creates a type with the same name as that built in object.
-import { WebStorage } from './web_storage';
-
-export class Storage {
-  public store: WebStorage;
-
-  constructor(store: WebStorage) {
-    this.store = store;
-  }
-
-  public get = (key: string) => {
-    if (!this.store) {
-      return null;
-    }
-
-    const storageItem = this.store.getItem(key);
-    if (storageItem === null) {
-      return null;
-    }
-
-    try {
-      return JSON.parse(storageItem);
-    } catch (error) {
-      return null;
-    }
-  };
-
-  public set = (key: string, value: any) => {
-    try {
-      return this.store.setItem(key, angular.toJson(value));
-    } catch (e) {
-      return false;
-    }
-  };
-
-  public remove = (key: string) => {
-    return this.store.removeItem(key);
-  };
-
-  public clear = () => {
-    return this.store.clear();
-  };
-}
diff --git a/src/legacy/ui/public/storage/web_storage.ts b/src/legacy/ui/public/storage/web_storage.ts
deleted file mode 100644
index d5f775431143d9..00000000000000
--- a/src/legacy/ui/public/storage/web_storage.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export type WebStorage = Storage;
diff --git a/src/legacy/ui/public/styles/_legacy/_base.scss b/src/legacy/ui/public/styles/_legacy/_base.scss
index aad90a99ac3576..0fcfb515c7c90b 100644
--- a/src/legacy/ui/public/styles/_legacy/_base.scss
+++ b/src/legacy/ui/public/styles/_legacy/_base.scss
@@ -4,13 +4,14 @@
 input.ng-invalid,
 textarea.ng-invalid,
 select.ng-invalid {
-  &.ng-dirty, &.ng-touched {
+  &.ng-dirty,
+  &.ng-touched {
     border-color: $euiColorDanger !important;
   }
 }
 
-input[type="radio"],
-input[type="checkbox"],
+input[type='radio'],
+input[type='checkbox'],
 .radio,
 .radio-inline,
 .checkbox,
@@ -18,7 +19,7 @@ input[type="checkbox"],
   &[disabled],
   fieldset[disabled] & {
     cursor: default;
-    opacity: .8;
+    opacity: 0.8;
   }
 }
 
@@ -27,7 +28,7 @@ input[type="checkbox"],
   align-items: center;
   padding-left: 0 !important;
 
-  input[type="checkbox"] {
+  input[type='checkbox'] {
     float: none;
     margin: 0 $euiSizeXS;
     position: static;
@@ -95,7 +96,6 @@ input[type="checkbox"],
   }
 }
 
-
 // Too overused in many places to be moved elsewhere
 
 .page-row {
@@ -114,7 +114,7 @@ input[type="checkbox"],
 // state. This is useful when you've already hand crafted your own
 // focus states in Kibana.
 :focus {
-  &:not([class^="eui"]):not(.kbn-resetFocusState) {
+  &:not([class^='eui']):not(.kbn-resetFocusState) {
     @include euiFocusRing;
   }
 }
@@ -122,7 +122,8 @@ input[type="checkbox"],
 // A neccessary hack so that the above focus policy doesn't polute some EUI
 // entrenched inputs.
 .euiComboBox {
-  input:focus {
+  // :not() specificity needed to override the above
+  input:not([class^='eui']):focus {
     animation: none !important;
   }
 }
diff --git a/src/legacy/ui/public/styles/disable_animations/disable_animations.js b/src/legacy/ui/public/styles/disable_animations/disable_animations.js
deleted file mode 100644
index c70aaa2165691f..00000000000000
--- a/src/legacy/ui/public/styles/disable_animations/disable_animations.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import chrome from 'ui/chrome';
-import disableAnimationsCss from '!!raw-loader!./disable_animations.css';
-
-const uiSettings = chrome.getUiSettingsClient();
-
-// rather than silently ignore when the style element is missing in the tests
-// like ui/theme does, we automatically create a style tag because ordering doesn't
-// really matter for these styles, they should really take top priority because
-// they all use `!important`, and we don't want to silently ignore the possibility
-// of accidentally removing the style element from the chrome template.
-const styleElement = document.createElement('style');
-styleElement.setAttribute('id', 'disableAnimationsCss');
-document.head.appendChild(styleElement);
-
-function updateStyleSheet() {
-  styleElement.textContent = uiSettings.get('accessibility:disableAnimations')
-    ? disableAnimationsCss
-    : '';
-}
-
-updateStyleSheet();
-uiSettings.getUpdate$().subscribe(({ key }) => {
-  if (key === 'accessibility:disableAnimations') {
-    updateStyleSheet();
-  }
-});
-
diff --git a/src/legacy/ui/public/styles/disable_animations/index.js b/src/legacy/ui/public/styles/disable_animations/index.js
deleted file mode 100644
index 2c459667d59969..00000000000000
--- a/src/legacy/ui/public/styles/disable_animations/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import './disable_animations';
diff --git a/src/legacy/ui/public/timefilter/index.ts b/src/legacy/ui/public/timefilter/index.ts
index c102d979c951a0..82e2531ec62a68 100644
--- a/src/legacy/ui/public/timefilter/index.ts
+++ b/src/legacy/ui/public/timefilter/index.ts
@@ -18,20 +18,20 @@
  */
 
 import uiRoutes from 'ui/routes';
-import { TimefilterContract, TimeHistoryContract } from '../../../core_plugins/data/public';
+import { npStart } from 'ui/new_platform';
+import { TimefilterContract, TimeHistoryContract } from '../../../../plugins/data/public';
 import { registerTimefilterWithGlobalState } from './setup_router';
-import { start as data } from '../../../core_plugins/data/public/legacy';
 
 export {
   getTime,
   InputTimeRange,
   TimeHistoryContract,
   TimefilterContract,
-} from '../../../core_plugins/data/public';
+} from '../../../../plugins/data/public';
 export type Timefilter = TimefilterContract;
 export type TimeHistory = TimeHistoryContract;
-export const timeHistory = data.timefilter.history;
-export const timefilter = data.timefilter.timefilter;
+export const timeHistory = npStart.plugins.data.query.timefilter.history;
+export const timefilter = npStart.plugins.data.query.timefilter.timefilter;
 
 uiRoutes.addSetupWork((globalState, $rootScope) => {
   return registerTimefilterWithGlobalState(timefilter, globalState, $rootScope);
diff --git a/src/legacy/ui/public/timefilter/setup_router.ts b/src/legacy/ui/public/timefilter/setup_router.ts
index ffc8a1fca6c641..0a73378f99cd7d 100644
--- a/src/legacy/ui/public/timefilter/setup_router.ts
+++ b/src/legacy/ui/public/timefilter/setup_router.ts
@@ -22,8 +22,7 @@ import { IScope } from 'angular';
 import moment from 'moment';
 import { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 import chrome from 'ui/chrome';
-import { RefreshInterval, TimeRange } from 'src/plugins/data/public';
-import { TimefilterContract } from '../../../core_plugins/data/public/timefilter';
+import { RefreshInterval, TimeRange, TimefilterContract } from 'src/plugins/data/public';
 
 // TODO
 // remove everything underneath once globalState is no longer an angular service
diff --git a/src/legacy/ui/public/vis/default_feedback_message.js b/src/legacy/ui/public/vis/default_feedback_message.js
index f840ba961b9c3f..8b8491d397aad5 100644
--- a/src/legacy/ui/public/vis/default_feedback_message.js
+++ b/src/legacy/ui/public/vis/default_feedback_message.js
@@ -19,9 +19,10 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const defaultFeedbackMessage = i18n.translate('common.ui.vis.defaultFeedbackMessage',
-  {
-    defaultMessage: 'Have feedback? Please create an issue in {link}.',
-    values: { link: '<a href="https://github.com/elastic/kibana/issues/new" rel="noopener noreferrer" target="_blank">GitHub</a>' }
-  }
-);
+export const defaultFeedbackMessage = i18n.translate('common.ui.vis.defaultFeedbackMessage', {
+  defaultMessage: 'Have feedback? Please create an issue in {link}.',
+  values: {
+    link:
+      '<a href="https://github.com/elastic/kibana/issues/new/choose" rel="noopener noreferrer" target="_blank">GitHub</a>',
+  },
+});
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg.test.tsx b/src/legacy/ui/public/vis/editors/default/components/agg.test.tsx
index 5dfb14156deeea..7806b1c0f78fbc 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg.test.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg.test.tsx
@@ -156,7 +156,7 @@ describe('DefaultEditorAgg component', () => {
 
   it('should add schema component', () => {
     defaultProps.agg.schema = {
-      editorComponent: () => <div className="schemaComponent"></div>,
+      editorComponent: () => <div className="schemaComponent" />,
     } as any;
     const comp = mount(<DefaultEditorAgg {...defaultProps} />);
 
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx
index 6d3b5fc4e63557..528914f4fd006b 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_group.tsx
@@ -26,7 +26,9 @@ import {
   EuiDraggable,
   EuiSpacer,
   EuiPanel,
+  EuiFormErrorText,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 import { AggConfig } from '../../../../agg_types/agg_config';
 import { aggGroupNamesMap, AggGroupNames } from '../agg_groups';
@@ -80,7 +82,15 @@ function DefaultEditorAggGroup({
 
   const [aggsState, setAggsState] = useReducer(aggGroupReducer, group, initAggsState);
 
-  const isGroupValid = Object.values(aggsState).every(item => item.valid);
+  const bucketsError =
+    lastParentPipelineAggTitle && groupName === AggGroupNames.Buckets && !group.length
+      ? i18n.translate('common.ui.aggTypes.buckets.mustHaveBucketErrorMessage', {
+          defaultMessage: 'Add a bucket with "Date Histogram" or "Histogram" aggregation.',
+          description: 'Date Histogram and Histogram should not be translated',
+        })
+      : undefined;
+
+  const isGroupValid = !bucketsError && Object.values(aggsState).every(item => item.valid);
   const isAllAggsTouched = isInvalidAggsTouched(aggsState);
   const isMetricAggregationDisabled = useMemo(
     () => groupName === AggGroupNames.Metrics && getEnabledMetricAggsCount(group) === 1,
@@ -144,6 +154,12 @@ function DefaultEditorAggGroup({
           <h3>{groupNameLabel}</h3>
         </EuiTitle>
         <EuiSpacer size="s" />
+        {bucketsError && (
+          <>
+            <EuiFormErrorText>{bucketsError}</EuiFormErrorText>
+            <EuiSpacer size="s" />
+          </>
+        )}
         <EuiDroppable droppableId={`agg_group_dnd_${groupName}`}>
           <>
             {group.map((agg: AggConfig, index: number) => (
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_params.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_params.tsx
index 6513c9211f18b9..4f4c0bda6520ab 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_params.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_params.tsx
@@ -21,9 +21,10 @@ import React, { useReducer, useEffect, useMemo } from 'react';
 import { EuiForm, EuiAccordion, EuiSpacer, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { aggTypes, AggType, AggParam } from 'ui/agg_types';
+import { VisState } from 'ui/vis';
+import { aggTypes, AggType, AggParam, AggConfig } from 'ui/agg_types/';
 import { IndexPattern } from 'ui/index_patterns';
-import { AggConfig, VisState } from '../../..';
+
 import { DefaultEditorAggSelect } from './agg_select';
 import { DefaultEditorAggParam } from './agg_param';
 import {
diff --git a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/__snapshots__/number_list.test.tsx.snap b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/__snapshots__/number_list.test.tsx.snap
new file mode 100644
index 00000000000000..ab192e6fd3cbb8
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/__snapshots__/number_list.test.tsx.snap
@@ -0,0 +1,77 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NumberList should be rendered with default set of props 1`] = `
+<Fragment>
+  <NumberRow
+    autoFocus={false}
+    disableDelete={false}
+    isInvalid={false}
+    labelledbyId="numberList"
+    model={
+      Object {
+        "id": "122",
+        "isInvalid": false,
+        "value": 1,
+      }
+    }
+    onBlur={[MockFunction]}
+    onChange={[Function]}
+    onDelete={[Function]}
+    range={
+      Range {
+        "max": 10,
+        "maxInclusive": true,
+        "min": 1,
+        "minInclusive": true,
+      }
+    }
+  />
+  <EuiSpacer
+    size="s"
+  />
+  <NumberRow
+    autoFocus={true}
+    disableDelete={false}
+    isInvalid={false}
+    labelledbyId="numberList"
+    model={
+      Object {
+        "id": "123",
+        "isInvalid": false,
+        "value": 2,
+      }
+    }
+    onBlur={[MockFunction]}
+    onChange={[Function]}
+    onDelete={[Function]}
+    range={
+      Range {
+        "max": 10,
+        "maxInclusive": true,
+        "min": 1,
+        "minInclusive": true,
+      }
+    }
+  />
+  <EuiSpacer
+    size="s"
+  />
+  <EuiFlexItem>
+    <EuiButtonEmpty
+      iconType="plusInCircleFilled"
+      onClick={[Function]}
+      size="xs"
+    >
+      <FormattedMessage
+        defaultMessage="Add {unitName}"
+        id="common.ui.aggTypes.numberList.addUnitButtonLabel"
+        values={
+          Object {
+            "unitName": "value",
+          }
+        }
+      />
+    </EuiButtonEmpty>
+  </EuiFlexItem>
+</Fragment>
+`;
diff --git a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/__snapshots__/number_row.test.tsx.snap b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/__snapshots__/number_row.test.tsx.snap
new file mode 100644
index 00000000000000..3882425594cf37
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/__snapshots__/number_row.test.tsx.snap
@@ -0,0 +1,38 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NumberRow should be rendered with default set of props 1`] = `
+<EuiFlexGroup
+  alignItems="center"
+  gutterSize="s"
+  responsive={false}
+>
+  <EuiFlexItem>
+    <EuiFieldNumber
+      aria-labelledby="numberList"
+      autoFocus={false}
+      compressed={true}
+      fullWidth={true}
+      isInvalid={false}
+      isLoading={false}
+      max={10}
+      min={1}
+      onBlur={[MockFunction]}
+      onChange={[Function]}
+      placeholder="Enter a value"
+      value={1}
+    />
+  </EuiFlexItem>
+  <EuiFlexItem
+    grow={false}
+  >
+    <EuiButtonIcon
+      aria-label="Remove the rank value of 1"
+      color="danger"
+      disabled={false}
+      iconType="trash"
+      onClick={[Function]}
+      title="Remove the rank value of 1"
+    />
+  </EuiFlexItem>
+</EuiFlexGroup>
+`;
diff --git a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_list.test.tsx b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_list.test.tsx
new file mode 100644
index 00000000000000..3faf164c365d9d
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_list.test.tsx
@@ -0,0 +1,147 @@
+/*
+ * 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 { shallow } from 'enzyme';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+
+import { NumberList, NumberListProps } from './number_list';
+import { NumberRow } from './number_row';
+
+jest.mock('./number_row', () => ({
+  NumberRow: () => 'NumberRow',
+}));
+
+jest.mock('@elastic/eui', () => ({
+  htmlIdGenerator: jest.fn(() => {
+    let counter = 1;
+    return () => `12${counter++}`;
+  }),
+  EuiSpacer: require.requireActual('@elastic/eui').EuiSpacer,
+  EuiFlexItem: require.requireActual('@elastic/eui').EuiFlexItem,
+  EuiButtonEmpty: require.requireActual('@elastic/eui').EuiButtonEmpty,
+  EuiFormErrorText: require.requireActual('@elastic/eui').EuiFormErrorText,
+}));
+
+describe('NumberList', () => {
+  let defaultProps: NumberListProps;
+
+  beforeEach(() => {
+    defaultProps = {
+      labelledbyId: 'numberList',
+      numberArray: [1, 2],
+      range: '[1, 10]',
+      showValidation: false,
+      unitName: 'value',
+      onChange: jest.fn(),
+      setTouched: jest.fn(),
+      setValidity: jest.fn(),
+    };
+  });
+
+  test('should be rendered with default set of props', () => {
+    const comp = shallow(<NumberList {...defaultProps} />);
+
+    expect(comp).toMatchSnapshot();
+  });
+
+  test('should show an order error', () => {
+    defaultProps.numberArray = [3, 1];
+    defaultProps.showValidation = true;
+    const comp = mountWithIntl(<NumberList {...defaultProps} />);
+
+    expect(comp.find('EuiFormErrorText').length).toBe(1);
+  });
+
+  test('should set validity as true', () => {
+    mountWithIntl(<NumberList {...defaultProps} />);
+
+    expect(defaultProps.setValidity).lastCalledWith(true);
+  });
+
+  test('should set validity as false when the order is invalid', () => {
+    defaultProps.numberArray = [3, 2];
+    const comp = mountWithIntl(<NumberList {...defaultProps} />);
+
+    expect(defaultProps.setValidity).lastCalledWith(false);
+
+    comp.setProps({ numberArray: [1, 2] });
+    expect(defaultProps.setValidity).lastCalledWith(true);
+  });
+
+  test('should set validity as false when there is an empty field', () => {
+    defaultProps.numberArray = [1, 2];
+    const comp = mountWithIntl(<NumberList {...defaultProps} />);
+
+    comp.setProps({ numberArray: [1, undefined] });
+    expect(defaultProps.setValidity).lastCalledWith(false);
+  });
+
+  test('should set 0 when number array is empty', () => {
+    defaultProps.numberArray = [];
+    mountWithIntl(<NumberList {...defaultProps} />);
+
+    expect(defaultProps.onChange).lastCalledWith([0]);
+  });
+
+  test('should add a number', () => {
+    const comp = shallow(<NumberList {...defaultProps} />);
+    comp.find('EuiButtonEmpty').simulate('click');
+
+    expect(defaultProps.onChange).lastCalledWith([1, 2, 3]);
+  });
+
+  test('should remove a number', () => {
+    const comp = shallow(<NumberList {...defaultProps} />);
+    const row = comp.find(NumberRow).first();
+    row.prop('onDelete')(row.prop('model').id);
+
+    expect(defaultProps.onChange).lastCalledWith([2]);
+  });
+
+  test('should disable remove button if there is one number', () => {
+    defaultProps.numberArray = [1];
+    const comp = shallow(<NumberList {...defaultProps} />);
+
+    expect(
+      comp
+        .find(NumberRow)
+        .first()
+        .prop('disableDelete')
+    ).toEqual(true);
+  });
+
+  test('should change value', () => {
+    const comp = shallow(<NumberList {...defaultProps} />);
+    const row = comp.find(NumberRow).first();
+    row.prop('onChange')({ id: row.prop('model').id, value: '3' });
+
+    expect(defaultProps.onChange).lastCalledWith([3, 2]);
+  });
+
+  test('should call setTouched', () => {
+    const comp = shallow(<NumberList {...defaultProps} />);
+    comp
+      .find(NumberRow)
+      .first()
+      .prop('onBlur')();
+
+    expect(defaultProps.setTouched).toBeCalled();
+  });
+});
diff --git a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_list.tsx b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_list.tsx
index 54040814028f71..4aae217c1bc8d6 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_list.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_list.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import React, { Fragment, useState, useEffect } from 'react';
+import React, { Fragment, useState, useEffect, useMemo, useCallback } from 'react';
 
 import { EuiSpacer, EuiButtonEmpty, EuiFlexItem, EuiFormErrorText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -34,16 +34,15 @@ import {
   getUpdatedModels,
   hasInvalidValues,
 } from './utils';
+import { useValidation } from '../../agg_utils';
 
-interface NumberListProps {
+export interface NumberListProps {
   labelledbyId: string;
   numberArray: Array<number | undefined>;
   range?: string;
   showValidation: boolean;
   unitName: string;
   validateAscendingOrder?: boolean;
-  onBlur?(): void;
-  onFocus?(): void;
   onChange(list: Array<number | undefined>): void;
   setTouched(): void;
   setValidity(isValid: boolean): void;
@@ -56,81 +55,84 @@ function NumberList({
   showValidation,
   unitName,
   validateAscendingOrder = true,
-  onBlur,
-  onFocus,
   onChange,
   setTouched,
   setValidity,
 }: NumberListProps) {
-  const numberRange = getRange(range);
+  const numberRange = useMemo(() => getRange(range), [range]);
   const [models, setModels] = useState(getInitModelList(numberArray));
   const [ascendingError, setAscendingError] = useState(EMPTY_STRING);
 
-  // responsible for discarding changes
+  // set up validity for each model
   useEffect(() => {
-    const updatedModels = getUpdatedModels(numberArray, models, numberRange);
+    let id: number | undefined;
     if (validateAscendingOrder) {
-      const isOrderValid = validateOrder(updatedModels);
+      const { isValidOrder, modelIndex } = validateOrder(numberArray);
+      id = isValidOrder ? undefined : modelIndex;
       setAscendingError(
-        isOrderValid
-          ? i18n.translate('common.ui.aggTypes.numberList.invalidAscOrderErrorMessage', {
+        isValidOrder
+          ? EMPTY_STRING
+          : i18n.translate('common.ui.aggTypes.numberList.invalidAscOrderErrorMessage', {
               defaultMessage: 'The values should be in ascending order.',
             })
-          : EMPTY_STRING
       );
     }
-    setModels(updatedModels);
-  }, [numberArray]);
+    setModels(state => getUpdatedModels(numberArray, state, numberRange, id));
+  }, [numberArray, numberRange, validateAscendingOrder]);
 
+  // responsible for setting up an initial value ([0]) when there is no default value
   useEffect(() => {
-    setValidity(!hasInvalidValues(models));
-  }, [models]);
-
-  // resposible for setting up an initial value ([0]) when there is no default value
-  useEffect(() => {
-    onChange(models.map(({ value }) => (value === EMPTY_STRING ? undefined : value)));
+    if (!numberArray.length) {
+      onChange([models[0].value as number]);
+    }
   }, []);
 
-  const onChangeValue = ({ id, value }: { id: string; value: string }) => {
-    const parsedValue = parse(value);
-    const { isValid, errors } = validateValue(parsedValue, numberRange);
-    setValidity(isValid);
+  const isValid = !hasInvalidValues(models);
+  useValidation(setValidity, isValid);
 
-    const currentModel = models.find(model => model.id === id);
-    if (currentModel) {
-      currentModel.value = parsedValue;
-      currentModel.isInvalid = !isValid;
-      currentModel.errors = errors;
-    }
+  const onUpdate = useCallback(
+    (modelList: NumberRowModel[]) => {
+      setModels(modelList);
+      onChange(modelList.map(({ value }) => (value === EMPTY_STRING ? undefined : value)));
+    },
+    [onChange]
+  );
 
-    onUpdate(models);
-  };
+  const onChangeValue = useCallback(
+    ({ id, value }: { id: string; value: string }) => {
+      const parsedValue = parse(value);
+
+      onUpdate(
+        models.map(model => {
+          if (model.id === id) {
+            const { isInvalid, error } = validateValue(parsedValue, numberRange);
+            return {
+              id,
+              value: parsedValue,
+              isInvalid,
+              error,
+            };
+          }
+          return model;
+        })
+      );
+    },
+    [numberRange, models, onUpdate]
+  );
 
   // Add an item to the end of the list
-  const onAdd = () => {
+  const onAdd = useCallback(() => {
     const newArray = [...models, getNextModel(models, numberRange)];
     onUpdate(newArray);
-  };
-
-  const onDelete = (id: string) => {
-    const newArray = models.filter(model => model.id !== id);
-    onUpdate(newArray);
-  };
-
-  const onBlurFn = (model: NumberRowModel) => {
-    if (model.value === EMPTY_STRING) {
-      model.isInvalid = true;
-    }
-    setTouched();
-    if (onBlur) {
-      onBlur();
-    }
-  };
-
-  const onUpdate = (modelList: NumberRowModel[]) => {
-    setModels(modelList);
-    onChange(modelList.map(({ value }) => (value === EMPTY_STRING ? undefined : value)));
-  };
+  }, [models, numberRange, onUpdate]);
+
+  const onDelete = useCallback(
+    (id: string) => {
+      const newArray = models.filter(model => model.id !== id);
+      onUpdate(newArray);
+    },
+    [models, onUpdate]
+  );
 
   return (
     <>
@@ -143,13 +145,12 @@ function NumberList({
             labelledbyId={labelledbyId}
             range={numberRange}
             onDelete={onDelete}
-            onFocus={onFocus}
             onChange={onChangeValue}
-            onBlur={() => onBlurFn(model)}
+            onBlur={setTouched}
             autoFocus={models.length !== 1 && arrayIndex === models.length - 1}
           />
-          {showValidation && model.isInvalid && model.errors && model.errors.length > 0 && (
-            <EuiFormErrorText>{model.errors.join('\n')}</EuiFormErrorText>
+          {showValidation && model.isInvalid && model.error && (
+            <EuiFormErrorText>{model.error}</EuiFormErrorText>
           )}
           {models.length - 1 !== arrayIndex && <EuiSpacer size="s" />}
         </Fragment>
diff --git a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_row.test.tsx b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_row.test.tsx
new file mode 100644
index 00000000000000..2173d92819e3d3
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_row.test.tsx
@@ -0,0 +1,69 @@
+/*
+ * 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 { shallow } from 'enzyme';
+
+import { NumberRow, NumberRowProps } from './number_row';
+
+describe('NumberRow', () => {
+  let defaultProps: NumberRowProps;
+
+  beforeEach(() => {
+    defaultProps = {
+      autoFocus: false,
+      disableDelete: false,
+      isInvalid: false,
+      labelledbyId: 'numberList',
+      model: { value: 1, id: '1', isInvalid: false },
+      range: {
+        min: 1,
+        max: 10,
+        minInclusive: true,
+        maxInclusive: true,
+        within: jest.fn(() => true),
+      },
+      onChange: jest.fn(),
+      onBlur: jest.fn(),
+      onDelete: jest.fn(),
+    };
+  });
+
+  test('should be rendered with default set of props', () => {
+    const comp = shallow(<NumberRow {...defaultProps} />);
+
+    expect(comp).toMatchSnapshot();
+  });
+
+  test('should call onDelete', () => {
+    const comp = shallow(<NumberRow {...defaultProps} />);
+    comp.find('EuiButtonIcon').simulate('click');
+
+    expect(defaultProps.onDelete).lastCalledWith(defaultProps.model.id);
+  });
+
+  test('should call onChange', () => {
+    const comp = shallow(<NumberRow {...defaultProps} />);
+    comp.find('EuiFieldNumber').prop('onChange')!({ target: { value: '5' } } as React.ChangeEvent<
+      HTMLInputElement
+    >);
+
+    expect(defaultProps.onChange).lastCalledWith({ id: defaultProps.model.id, value: '5' });
+  });
+});
diff --git a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_row.tsx b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_row.tsx
index cef574e806e019..23e671180e9802 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_row.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/number_row.tsx
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-import React from 'react';
+import React, { useCallback } from 'react';
 
 import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Range } from '../../../../../../utils/range';
 
-interface NumberRowProps {
+export interface NumberRowProps {
   autoFocus: boolean;
   disableDelete: boolean;
   isInvalid: boolean;
@@ -31,7 +31,6 @@ interface NumberRowProps {
   model: NumberRowModel;
   range: Range;
   onBlur(): void;
-  onFocus?(): void;
   onChange({ id, value }: { id: string; value: string }): void;
   onDelete(index: string): void;
 }
@@ -40,7 +39,7 @@ export interface NumberRowModel {
   id: string;
   isInvalid: boolean;
   value: number | '';
-  errors?: string[];
+  error?: string;
 }
 
 function NumberRow({
@@ -52,7 +51,6 @@ function NumberRow({
   range,
   onBlur,
   onDelete,
-  onFocus,
   onChange,
 }: NumberRowProps) {
   const deleteBtnAriaLabel = i18n.translate(
@@ -63,11 +61,16 @@ function NumberRow({
     }
   );
 
-  const onValueChanged = (event: React.ChangeEvent<HTMLInputElement>) =>
-    onChange({
-      value: event.target.value,
-      id: model.id,
-    });
+  const onValueChanged = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) =>
+      onChange({
+        value: event.target.value,
+        id: model.id,
+      }),
+    [onChange, model.id]
+  );
+
+  const onDeleteFn = useCallback(() => onDelete(model.id), [onDelete, model.id]);
 
   return (
     <EuiFlexGroup responsive={false} alignItems="center" gutterSize="s">
@@ -81,7 +84,6 @@ function NumberRow({
             defaultMessage: 'Enter a value',
           })}
           onChange={onValueChanged}
-          onFocus={onFocus}
           value={model.value}
           fullWidth={true}
           min={range.min}
@@ -95,7 +97,7 @@ function NumberRow({
           title={deleteBtnAriaLabel}
           color="danger"
           iconType="trash"
-          onClick={() => onDelete(model.id)}
+          onClick={onDeleteFn}
           disabled={disableDelete}
         />
       </EuiFlexItem>
diff --git a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/utils.test.ts b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/utils.test.ts
new file mode 100644
index 00000000000000..3928c0a62eeaa7
--- /dev/null
+++ b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/utils.test.ts
@@ -0,0 +1,218 @@
+/*
+ * 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 {
+  getInitModelList,
+  getUpdatedModels,
+  validateOrder,
+  hasInvalidValues,
+  parse,
+  validateValue,
+  getNextModel,
+  getRange,
+} from './utils';
+import { Range } from '../../../../../../utils/range';
+import { NumberRowModel } from './number_row';
+
+describe('NumberList utils', () => {
+  let modelList: NumberRowModel[];
+  let range: Range;
+
+  beforeEach(() => {
+    modelList = [{ value: 1, id: '1', isInvalid: false }, { value: 2, id: '2', isInvalid: false }];
+    range = {
+      min: 1,
+      max: 10,
+      minInclusive: true,
+      maxInclusive: true,
+      within: jest.fn(() => true),
+    };
+  });
+
+  describe('getInitModelList', () => {
+    test('should return list with default model when number list is empty', () => {
+      const models = getInitModelList([]);
+
+      expect(models).toEqual([{ value: 0, id: expect.any(String), isInvalid: false }]);
+    });
+
+    test('should return model list', () => {
+      const models = getInitModelList([1, undefined]);
+
+      expect(models).toEqual([
+        { value: 1, id: expect.any(String), isInvalid: false },
+        { value: '', id: expect.any(String), isInvalid: false },
+      ]);
+    });
+  });
+
+  describe('getUpdatedModels', () => {
+    test('should return model list when number list is empty', () => {
+      const updatedModelList = getUpdatedModels([], modelList, range);
+
+      expect(updatedModelList).toEqual([{ value: 0, id: expect.any(String), isInvalid: false }]);
+    });
+
+    test('should not update model list when number list is the same', () => {
+      const updatedModelList = getUpdatedModels([1, 2], modelList, range);
+
+      expect(updatedModelList).toEqual(modelList);
+    });
+
+    test('should update model list when number list was changed', () => {
+      const updatedModelList = getUpdatedModels([1, 3], modelList, range);
+      modelList[1].value = 3;
+      expect(updatedModelList).toEqual(modelList);
+    });
+
+    test('should update model list when number list increased', () => {
+      const updatedModelList = getUpdatedModels([1, 2, 3], modelList, range);
+      expect(updatedModelList).toEqual([
+        ...modelList,
+        { value: 3, id: expect.any(String), isInvalid: false },
+      ]);
+    });
+
+    test('should update model list when number list decreased', () => {
+      const updatedModelList = getUpdatedModels([2], modelList, range);
+      expect(updatedModelList).toEqual([{ value: 2, id: '1', isInvalid: false }]);
+    });
+
+    test('should update model list when number list has undefined value', () => {
+      const updatedModelList = getUpdatedModels([1, undefined], modelList, range);
+      modelList[1].value = '';
+      modelList[1].isInvalid = true;
+      expect(updatedModelList).toEqual(modelList);
+    });
+
+    test('should update model list when number order is invalid', () => {
+      const updatedModelList = getUpdatedModels([1, 3, 2], modelList, range, 2);
+      expect(updatedModelList).toEqual([
+        modelList[0],
+        { ...modelList[1], value: 3 },
+        { value: 2, id: expect.any(String), isInvalid: true },
+      ]);
+    });
+  });
+
+  describe('validateOrder', () => {
+    test('should return true when order is valid', () => {
+      expect(validateOrder([1, 2])).toEqual({
+        isValidOrder: true,
+      });
+    });
+
+    test('should return true when a number is undefined', () => {
+      expect(validateOrder([1, undefined])).toEqual({
+        isValidOrder: true,
+      });
+    });
+
+    test('should return false when order is invalid', () => {
+      expect(validateOrder([2, 1])).toEqual({
+        isValidOrder: false,
+        modelIndex: 1,
+      });
+    });
+  });
+
+  describe('hasInvalidValues', () => {
+    test('should return false when there are no invalid models', () => {
+      expect(hasInvalidValues(modelList)).toBeFalsy();
+    });
+
+    test('should return true when there is an invalid model', () => {
+      modelList[1].isInvalid = true;
+      expect(hasInvalidValues(modelList)).toBeTruthy();
+    });
+  });
+
+  describe('parse', () => {
+    test('should return a number', () => {
+      expect(parse('3')).toBe(3);
+    });
+
+    test('should return an empty string when value is invalid', () => {
+      expect(parse('')).toBe('');
+      expect(parse('test')).toBe('');
+      expect(parse('NaN')).toBe('');
+    });
+  });
+
+  describe('validateValue', () => {
+    test('should return valid', () => {
+      expect(validateValue(3, range)).toEqual({ isInvalid: false });
+    });
+
+    test('should return invalid', () => {
+      range.within = jest.fn(() => false);
+      expect(validateValue(11, range)).toEqual({ isInvalid: true, error: expect.any(String) });
+    });
+  });
+
+  describe('getNextModel', () => {
+    test('should return 3 as next value', () => {
+      expect(getNextModel(modelList, range)).toEqual({
+        value: 3,
+        id: expect.any(String),
+        isInvalid: false,
+      });
+    });
+
+    test('should return 1 as next value', () => {
+      expect(getNextModel([{ value: '', id: '2', isInvalid: false }], range)).toEqual({
+        value: 1,
+        id: expect.any(String),
+        isInvalid: false,
+      });
+    });
+
+    test('should return 9 as next value', () => {
+      expect(getNextModel([{ value: 11, id: '2', isInvalid: false }], range)).toEqual({
+        value: 9,
+        id: expect.any(String),
+        isInvalid: false,
+      });
+    });
+  });
+
+  describe('getRange', () => {
+    test('should return default range', () => {
+      expect(getRange()).toEqual({
+        min: 0,
+        max: Infinity,
+        maxInclusive: false,
+        minInclusive: true,
+      });
+    });
+
+    test('should return parsed range', () => {
+      expect(getRange('(-Infinity, 100]')).toEqual({
+        min: -Infinity,
+        max: 100,
+        maxInclusive: true,
+        minInclusive: false,
+      });
+    });
+
+    test('should throw an error', () => {
+      expect(() => getRange('test')).toThrowError();
+    });
+  });
+});
diff --git a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/utils.ts b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/utils.ts
index f90f545aeffbaa..563e8f0a6a9b7f 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/components/number_list/utils.ts
+++ b/src/legacy/ui/public/vis/editors/default/controls/components/number_list/utils.ts
@@ -27,6 +27,7 @@ import { NumberRowModel } from './number_row';
 const EMPTY_STRING = '';
 const defaultRange = parseRange('[0,Infinity)');
 const generateId = htmlIdGenerator();
+const defaultModel = { value: 0, id: generateId(), isInvalid: false };
 
 function parse(value: string) {
   const parsedValue = parseFloat(value);
@@ -42,44 +43,37 @@ function getRange(range?: string): Range {
 }
 
 function validateValue(value: number | '', numberRange: Range) {
-  const result = {
-    isValid: true,
-    errors: [] as string[],
+  const result: { isInvalid: boolean; error?: string } = {
+    isInvalid: false,
   };
 
   if (value === EMPTY_STRING) {
-    result.isValid = false;
+    result.isInvalid = true;
   } else if (!numberRange.within(value)) {
-    result.isValid = false;
-    result.errors.push(
-      i18n.translate('common.ui.aggTypes.numberList.invalidRangeErrorMessage', {
-        defaultMessage: 'The value should be in the range of {min} to {max}.',
-        values: { min: numberRange.min, max: numberRange.max },
-      })
-    );
+    result.isInvalid = true;
+    result.error = i18n.translate('common.ui.aggTypes.numberList.invalidRangeErrorMessage', {
+      defaultMessage: 'The value should be in the range of {min} to {max}.',
+      values: { min: numberRange.min, max: numberRange.max },
+    });
   }
 
   return result;
 }
 
-function validateOrder(list: NumberRowModel[]) {
-  let isInvalidOrder = false;
-  list.forEach((model, index, array) => {
-    const previousModel = array[index - 1];
-    if (previousModel && model.value !== EMPTY_STRING) {
-      const isInvalidOrderOfItem = model.value <= previousModel.value;
-
-      if (!model.isInvalid && isInvalidOrderOfItem) {
-        model.isInvalid = true;
-      }
+function validateOrder(list: Array<number | undefined>) {
+  const result: { isValidOrder: boolean; modelIndex?: number } = {
+    isValidOrder: true,
+  };
 
-      if (isInvalidOrderOfItem) {
-        isInvalidOrder = true;
-      }
+  list.forEach((inputValue, index, array) => {
+    const previousModel = array[index - 1];
+    if (previousModel !== undefined && inputValue !== undefined && inputValue <= previousModel) {
+      result.isValidOrder = false;
+      result.modelIndex = index;
     }
   });
 
-  return isInvalidOrder;
+  return result;
 }
 
 function getNextModel(list: NumberRowModel[], range: Range): NumberRowModel {
@@ -104,26 +98,27 @@ function getInitModelList(list: Array<number | undefined>): NumberRowModel[] {
         id: generateId(),
         isInvalid: false,
       }))
-    : [{ value: 0, id: generateId(), isInvalid: false }];
+    : [defaultModel];
 }
 
 function getUpdatedModels(
   numberList: Array<number | undefined>,
   modelList: NumberRowModel[],
-  numberRange: Range
+  numberRange: Range,
+  invalidOrderModelIndex?: number
 ): NumberRowModel[] {
   if (!numberList.length) {
-    return modelList;
+    return [defaultModel];
   }
   return numberList.map((number, index) => {
     const model = modelList[index] || { id: generateId() };
     const newValue: NumberRowModel['value'] = number === undefined ? EMPTY_STRING : number;
-    const { isValid, errors } = validateValue(newValue, numberRange);
+    const { isInvalid, error } = validateValue(newValue, numberRange);
     return {
       ...model,
       value: newValue,
-      isInvalid: !isValid,
-      errors,
+      isInvalid: invalidOrderModelIndex === index ? true : isInvalid,
+      error,
     };
   });
 }
diff --git a/src/legacy/ui/public/vis/editors/default/controls/filter.tsx b/src/legacy/ui/public/vis/editors/default/controls/filter.tsx
index 2c0a2b6be37f8e..4ebe7b0d835d7c 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/filter.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/filter.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { Query, QueryBarInput } from 'plugins/data';
 import { AggConfig } from '../../..';
 import { npStart } from '../../../../new_platform';
-import { Storage } from '../../../../storage';
+import { Storage } from '../../../../../../../plugins/kibana_utils/public';
 import { KibanaContextProvider } from '../../../../../../../plugins/kibana_react/public';
 const localStorage = new Storage(window.localStorage);
 
@@ -94,7 +94,7 @@ function FilterRow({
         <KibanaContextProvider
           services={{
             appName: 'filtersAgg',
-            store: localStorage,
+            storage: localStorage,
             data: npStart.plugins.data,
             ...npStart.core,
           }}
diff --git a/src/legacy/ui/public/vis/editors/default/controls/percentile_ranks.tsx b/src/legacy/ui/public/vis/editors/default/controls/percentile_ranks.tsx
index 8b63bb23475b21..420bf8a87c3d54 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/percentile_ranks.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/percentile_ranks.tsx
@@ -37,7 +37,7 @@ function PercentileRanksEditor({
   });
   const [isValid, setIsValid] = useState(true);
 
-  const setModelValidy = (isListValid: boolean) => {
+  const setModelValidity = (isListValid: boolean) => {
     setIsValid(isListValid);
     setValidity(isListValid);
   };
@@ -62,7 +62,7 @@ function PercentileRanksEditor({
         showValidation={showValidation}
         onChange={setValue}
         setTouched={setTouched}
-        setValidity={setModelValidy}
+        setValidity={setModelValidity}
       />
     </EuiFormRow>
   );
diff --git a/src/legacy/ui/public/vis/editors/default/controls/percentiles.tsx b/src/legacy/ui/public/vis/editors/default/controls/percentiles.tsx
index 158ae3442ff0c0..b8ad212edead9a 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/percentiles.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/percentiles.tsx
@@ -37,7 +37,7 @@ function PercentilesEditor({
   });
   const [isValid, setIsValid] = useState(true);
 
-  const setModelValidy = (isListValid: boolean) => {
+  const setModelValidity = (isListValid: boolean) => {
     setIsValid(isListValid);
     setValidity(isListValid);
   };
@@ -62,7 +62,7 @@ function PercentilesEditor({
         showValidation={showValidation}
         onChange={setValue}
         setTouched={setTouched}
-        setValidity={setModelValidy}
+        setValidity={setModelValidity}
       />
     </EuiFormRow>
   );
diff --git a/src/legacy/ui/public/vis/editors/default/controls/sub_metric.tsx b/src/legacy/ui/public/vis/editors/default/controls/sub_metric.tsx
index 836049eb95cabf..df1640273135e4 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/sub_metric.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/sub_metric.tsx
@@ -21,7 +21,7 @@ import React, { useEffect, useState } from 'react';
 import { EuiFormLabel, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { AggParamType } from '../../../../agg_types/param_types/agg';
-import { AggConfig } from '../../..';
+import { AggConfig } from '../../../../agg_types/agg_config';
 import { AggParamEditorProps, DefaultEditorAggParams, AggGroupNames } from '..';
 
 function SubMetricParamEditor({
diff --git a/src/legacy/ui/public/vis/editors/default/default.js b/src/legacy/ui/public/vis/editors/default/default.js
index af0ebc65680c39..43d2962df0a1e0 100644
--- a/src/legacy/ui/public/vis/editors/default/default.js
+++ b/src/legacy/ui/public/vis/editors/default/default.js
@@ -34,10 +34,11 @@ import { parentPipelineAggHelper } from 'ui/agg_types/metrics/lib/parent_pipelin
 import { DefaultEditorSize } from '../../editor_size';
 
 import { VisEditorTypesRegistryProvider } from '../../../registry/vis_editor_types';
-import { getVisualizeLoader } from '../../../visualize/loader/visualize_loader';
 import { AggGroupNames } from './agg_groups';
 
-const defaultEditor = function ($rootScope, $compile) {
+import { start as embeddables } from '../../../../../core_plugins/embeddable_api/public/np_ready/public/legacy';
+
+const defaultEditor = function ($rootScope, $compile, getAppState) {
   return class DefaultEditor {
     static key = 'default';
 
@@ -57,7 +58,7 @@ const defaultEditor = function ($rootScope, $compile) {
       }
     }
 
-    render({ uiState, timeRange, filters, appState }) {
+    render({ uiState, timeRange, filters, query }) {
       let $scope;
 
       const updateScope = () => {
@@ -66,7 +67,7 @@ const defaultEditor = function ($rootScope, $compile) {
         //$scope.$apply();
       };
 
-      return new Promise(resolve => {
+      return new Promise(async (resolve) => {
         if (!this.$scope) {
           this.$scope = $scope = $rootScope.$new();
 
@@ -157,23 +158,21 @@ const defaultEditor = function ($rootScope, $compile) {
 
         if (!this._handler) {
           const visualizationEl = this.el.find('.visEditor__canvas')[0];
-          getVisualizeLoader().then(loader => {
-            if (!visualizationEl) {
-              return;
-            }
-            this._loader = loader;
-            this._handler = this._loader.embedVisualizationWithSavedObject(visualizationEl, this.savedObj, {
-              uiState: uiState,
-              listenOnChange: false,
-              timeRange: timeRange,
-              filters: filters,
-              appState: appState,
-            });
+
+          this._handler = await embeddables.getEmbeddableFactory('visualization').createFromObject(this.savedObj, {
+            uiState: uiState,
+            appState: getAppState(),
+            timeRange: timeRange,
+            filters: filters || [],
+            query: query,
           });
+          this._handler.render(visualizationEl);
+
         } else {
-          this._handler.update({
+          this._handler.updateInput({
             timeRange: timeRange,
-            filters: filters,
+            filters: filters || [],
+            query: query,
           });
         }
 
diff --git a/src/legacy/ui/public/vis/vis_filters/brush_event.js b/src/legacy/ui/public/vis/vis_filters/brush_event.js
index 90cbaf7c048ee2..17ab302a20cb16 100644
--- a/src/legacy/ui/public/vis/vis_filters/brush_event.js
+++ b/src/legacy/ui/public/vis/vis_filters/brush_event.js
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import moment from 'moment';
-import { buildRangeFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../plugins/data/public';
 
 export function onBrushEvent(event) {
   const isNumber = event.data.ordered;
@@ -56,7 +56,7 @@ export function onBrushEvent(event) {
     };
   }
 
-  const newFilter = buildRangeFilter(
+  const newFilter = esFilters.buildRangeFilter(
     field,
     range,
     indexPattern,
diff --git a/src/legacy/ui/public/vis/vis_filters/vis_filters.js b/src/legacy/ui/public/vis/vis_filters/vis_filters.js
index f19e2440a21e9b..e879d040125f11 100644
--- a/src/legacy/ui/public/vis/vis_filters/vis_filters.js
+++ b/src/legacy/ui/public/vis/vis_filters/vis_filters.js
@@ -20,8 +20,8 @@
 import _ from 'lodash';
 import { pushFilterBarFilters } from '../push_filters';
 import { onBrushEvent } from './brush_event';
-import { uniqFilters } from '../../../../core_plugins/data/public';
-import { toggleFilterNegated } from '@kbn/es-query';
+import { uniqFilters, esFilters } from '../../../../../plugins/data/public';
+
 /**
  * For terms aggregations on `__other__` buckets, this assembles a list of applicable filter
  * terms based on a specific cell in the tabified data.
@@ -94,7 +94,7 @@ const createFiltersFromEvent = (event) => {
     if (filter) {
       filter.forEach(f => {
         if (event.negate) {
-          f = toggleFilterNegated(f);
+          f = esFilters.toggleFilterNegated(f);
         }
         filters.push(f);
       });
diff --git a/src/legacy/ui/public/vislib/_index.scss b/src/legacy/ui/public/vislib/_index.scss
index 4e4ba8175444d6..0344fbb5359ece 100644
--- a/src/legacy/ui/public/vislib/_index.scss
+++ b/src/legacy/ui/public/vislib/_index.scss
@@ -3,3 +3,4 @@
 @import './lib/index';
 
 @import './visualizations/point_series/index';
+@import './visualizations/gauges/index';
diff --git a/src/legacy/ui/public/vislib/visualizations/gauges/_index.scss b/src/legacy/ui/public/vislib/visualizations/gauges/_index.scss
new file mode 100644
index 00000000000000..1c6b5e669a94b1
--- /dev/null
+++ b/src/legacy/ui/public/vislib/visualizations/gauges/_index.scss
@@ -0,0 +1 @@
+@import './meter';
diff --git a/src/legacy/ui/public/vislib/visualizations/gauges/_meter.scss b/src/legacy/ui/public/vislib/visualizations/gauges/_meter.scss
new file mode 100644
index 00000000000000..971eaa0eab2f6a
--- /dev/null
+++ b/src/legacy/ui/public/vislib/visualizations/gauges/_meter.scss
@@ -0,0 +1,3 @@
+.visGauge__meter--outline {
+  stroke: $euiBorderColor;
+}
diff --git a/src/legacy/ui/public/vislib/visualizations/gauges/meter.js b/src/legacy/ui/public/vislib/visualizations/gauges/meter.js
index b6a308271497a8..7533ae01bc4acd 100644
--- a/src/legacy/ui/public/vislib/visualizations/gauges/meter.js
+++ b/src/legacy/ui/public/vislib/visualizations/gauges/meter.js
@@ -38,6 +38,7 @@ const defaultConfig = {
   percentageMode: true,
   innerSpace: 5,
   extents: [0, 10000],
+  outline: false,
   scale: {
     show: true,
     color: '#666',
@@ -248,11 +249,13 @@ export class MeterGauge {
     gauges
       .append('path')
       .attr('d', bgArc)
+      .attr('class', this.gaugeConfig.outline ? 'visGauge__meter--outline' : undefined)
       .style('fill', this.gaugeConfig.style.bgFill);
 
     const series = gauges
       .append('path')
       .attr('d', arc)
+      .attr('class', this.gaugeConfig.outline ? 'visGauge__meter--outline' : undefined)
       .style('fill', (d) => this.getColorBucket(Math.max(min, d.y)));
 
     const smallContainer = svg.node().getBBox().height < 70;
diff --git a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts
index bc2152911d1ecd..fb16e095b34187 100644
--- a/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts
+++ b/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts
@@ -22,13 +22,13 @@ import { debounce, forEach, get, isEqual } from 'lodash';
 import * as Rx from 'rxjs';
 import { share } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { Filter } from '@kbn/es-query';
 import { toastNotifications } from 'ui/notify';
 // @ts-ignore untyped dependency
 import { AggConfigs } from 'ui/agg_types/agg_configs';
 import { SearchSource } from 'ui/courier';
 import { QueryFilter } from 'ui/filter_manager/query_filter';
-import { TimeRange } from 'src/plugins/data/public';
+
+import { TimeRange, onlyDisabledFiltersChanged } from '../../../../../plugins/data/public';
 import { registries } from '../../../../core_plugins/interpreter/public/registries';
 import { Inspector } from '../../inspector';
 import { Adapters } from '../../inspector/types';
@@ -42,7 +42,8 @@ import { Vis } from '../../vis';
 import { VisFiltersProvider } from '../../vis/vis_filters';
 import { PipelineDataLoader } from './pipeline_data_loader';
 import { visualizationLoader } from './visualization_loader';
-import { onlyDisabledFiltersChanged, Query } from '../../../../core_plugins/data/public';
+import { Query } from '../../../../core_plugins/data/public';
+import { esFilters } from '../../../../../plugins/data/public';
 
 import { DataAdapter, RequestAdapter } from '../../inspector/adapters';
 
@@ -66,7 +67,7 @@ export interface RequestHandlerParams {
   aggs: AggConfigs;
   timeRange?: TimeRange;
   query?: Query;
-  filters?: Filter[];
+  filters?: esFilters.Filter[];
   forceFetch: boolean;
   queryFilter: QueryFilter;
   uiState?: PersistedState;
@@ -537,16 +538,16 @@ export class EmbeddedVisualizeHandler {
 
   private rendererProvider = (response: VisResponseData | null) => {
     const renderer = registries.renderers.get(get(response || {}, 'as', 'visualization'));
-    const args = [
-      this.element,
-      get(response, 'value', { visType: this.vis.type.name }),
-      this.handlers,
-    ];
 
     if (!renderer) {
       return null;
     }
 
-    return () => renderer.render(...args);
+    return () =>
+      renderer.render(
+        this.element,
+        get(response, 'value', { visType: this.vis.type.name }),
+        this.handlers
+      );
   };
 }
diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts
index 17ec224f4c7ded..21b13abea440e1 100644
--- a/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts
+++ b/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts
@@ -24,7 +24,7 @@ import { SearchSource } from 'ui/courier';
 import { AggConfig, Vis, VisParams, VisState } from 'ui/vis';
 import { isDateHistogramBucketAggConfig } from 'ui/agg_types/buckets/date_histogram';
 import moment from 'moment';
-import { SerializedFieldFormat } from 'src/plugins/expressions/common/expressions/types/common';
+import { SerializedFieldFormat } from 'src/plugins/expressions/public';
 import { createFormat } from './utilities';
 
 interface SchemaConfigParams {
diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
index c12bd222663aed..c5ebc75973d0c4 100644
--- a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
+++ b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
@@ -20,7 +20,7 @@
 import { i18n } from '@kbn/i18n';
 import { identity } from 'lodash';
 import { AggConfig, Vis } from 'ui/vis';
-import { SerializedFieldFormat } from 'src/plugins/expressions/common/expressions/types/common';
+import { SerializedFieldFormat } from 'src/plugins/expressions/public';
 
 import { FieldFormat } from '../../../../../../plugins/data/common/field_formats';
 
diff --git a/src/legacy/ui/public/visualize/loader/types.ts b/src/legacy/ui/public/visualize/loader/types.ts
index 87183d839e6373..525ec35834ecde 100644
--- a/src/legacy/ui/public/visualize/loader/types.ts
+++ b/src/legacy/ui/public/visualize/loader/types.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { TimeRange } from 'src/plugins/data/public';
 import { Query } from 'src/legacy/core_plugins/data/public';
 import { SavedObject } from 'ui/saved_objects/saved_object';
@@ -26,6 +25,7 @@ import { SearchSource } from '../../courier';
 import { PersistedState } from '../../persisted_state';
 import { AppState } from '../../state_management/app_state';
 import { Vis } from '../../vis';
+import { esFilters } from '../../../../../plugins/data/public';
 
 export interface VisSavedObject extends SavedObject {
   vis: Vis;
@@ -68,7 +68,7 @@ export interface VisualizeLoaderParams {
   /**
    * Specifies the filters that should be applied to that visualization.
    */
-  filters?: Filter[];
+  filters?: esFilters.Filter[];
   /**
    * The query that should apply to that visualization.
    */
diff --git a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts
index ec612f7dd03735..9f3aa190917d73 100644
--- a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts
+++ b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts
@@ -22,13 +22,13 @@ import { get } from 'lodash';
 import { toastNotifications } from 'ui/notify';
 
 import { AggConfig } from 'ui/vis';
-import { Filter } from '@kbn/es-query';
 import { Query } from 'src/legacy/core_plugins/data/public';
 import { timefilter } from 'ui/timefilter';
 import { Vis } from '../../../vis';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 interface QueryGeohashBoundsParams {
-  filters?: Filter[];
+  filters?: esFilters.Filter[];
   query?: Query;
 }
 
@@ -76,7 +76,7 @@ export async function queryGeohashBounds(vis: Vis, params: QueryGeohashBoundsPar
         const useTimeFilter = !!indexPattern.timeFieldName;
         if (useTimeFilter) {
           const filter = timefilter.createFilter(indexPattern);
-          if (filter) activeFilters.push((filter as any) as Filter);
+          if (filter) activeFilters.push((filter as any) as esFilters.Filter);
         }
         return activeFilters;
       });
diff --git a/src/legacy/ui/ui_render/ui_render_mixin.js b/src/legacy/ui/ui_render/ui_render_mixin.js
index 883358e0d3c9aa..0d05ea259d1a13 100644
--- a/src/legacy/ui/ui_render/ui_render_mixin.js
+++ b/src/legacy/ui/ui_render/ui_render_mixin.js
@@ -185,7 +185,7 @@ export function uiRenderMixin(kbnServer, server, config) {
   async function getUiSettings({ request, includeUserProvidedConfig }) {
     const uiSettings = request.getUiSettingsService();
     return props({
-      defaults: uiSettings.getDefaults(),
+      defaults: uiSettings.getRegistered(),
       user: includeUserProvidedConfig && uiSettings.getUserProvided()
     });
   }
diff --git a/src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts b/src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts
index 9f553b37935d75..dd3f12903abcac 100644
--- a/src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts
+++ b/src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts
@@ -20,7 +20,7 @@
 import sinon from 'sinon';
 import expect from '@kbn/expect';
 
-import { SavedObjectsClientMock } from '../../../../core/server/mocks';
+import { savedObjectsClientMock } from '../../../../core/server/mocks';
 import * as uiSettingsServiceFactoryNS from '../ui_settings_service_factory';
 import * as getUiSettingsServiceForRequestNS from '../ui_settings_service_for_request';
 // @ts-ignore
@@ -73,7 +73,7 @@ describe('uiSettingsMixin()', () => {
       newPlatform: {
         __internals: {
           uiSettings: {
-            setDefaults: sinon.stub(),
+            register: sinon.stub(),
           },
         },
       },
@@ -93,9 +93,9 @@ describe('uiSettingsMixin()', () => {
 
   it('passes uiSettingsDefaults to the new platform', () => {
     const { kbnServer } = setup();
-    sinon.assert.calledOnce(kbnServer.newPlatform.__internals.uiSettings.setDefaults);
+    sinon.assert.calledOnce(kbnServer.newPlatform.__internals.uiSettings.register);
     sinon.assert.calledWithExactly(
-      kbnServer.newPlatform.__internals.uiSettings.setDefaults,
+      kbnServer.newPlatform.__internals.uiSettings.register,
       uiSettingDefaults
     );
   });
@@ -129,7 +129,7 @@ describe('uiSettingsMixin()', () => {
 
       sinon.assert.notCalled(uiSettingsServiceFactoryStub);
 
-      const savedObjectsClient = SavedObjectsClientMock.create();
+      const savedObjectsClient = savedObjectsClientMock.create();
       decorations.server.uiSettingsServiceFactory({
         savedObjectsClient,
       });
diff --git a/src/legacy/ui/ui_settings/routes/delete.ts b/src/legacy/ui/ui_settings/routes/delete.ts
deleted file mode 100644
index 7825204e6b99b1..00000000000000
--- a/src/legacy/ui/ui_settings/routes/delete.ts
+++ /dev/null
@@ -1,37 +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 { Legacy } from 'kibana';
-
-async function handleRequest(request: Legacy.Request) {
-  const { key } = request.params;
-  const uiSettings = request.getUiSettingsService();
-
-  await uiSettings.remove(key);
-  return {
-    settings: await uiSettings.getUserProvided(),
-  };
-}
-
-export const deleteRoute = {
-  path: '/api/kibana/settings/{key}',
-  method: 'DELETE',
-  handler: async (request: Legacy.Request) => {
-    return await handleRequest(request);
-  },
-};
diff --git a/src/legacy/ui/ui_settings/routes/get.ts b/src/legacy/ui/ui_settings/routes/get.ts
deleted file mode 100644
index 3e165a12522bbe..00000000000000
--- a/src/legacy/ui/ui_settings/routes/get.ts
+++ /dev/null
@@ -1,34 +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 { Legacy } from 'kibana';
-
-async function handleRequest(request: Legacy.Request) {
-  const uiSettings = request.getUiSettingsService();
-  return {
-    settings: await uiSettings.getUserProvided(),
-  };
-}
-
-export const getRoute = {
-  path: '/api/kibana/settings',
-  method: 'GET',
-  handler(request: Legacy.Request) {
-    return handleRequest(request);
-  },
-};
diff --git a/src/legacy/ui/ui_settings/routes/index.ts b/src/legacy/ui/ui_settings/routes/index.ts
deleted file mode 100644
index f3c9d4f0d8d14f..00000000000000
--- a/src/legacy/ui/ui_settings/routes/index.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.
- */
-
-export { deleteRoute } from './delete';
-export { getRoute } from './get';
-export { setManyRoute } from './set_many';
-export { setRoute } from './set';
diff --git a/src/legacy/ui/ui_settings/routes/set.ts b/src/legacy/ui/ui_settings/routes/set.ts
deleted file mode 100644
index 1f1ab17a0daf77..00000000000000
--- a/src/legacy/ui/ui_settings/routes/set.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 { Legacy } from 'kibana';
-import Joi from 'joi';
-
-async function handleRequest(request: Legacy.Request) {
-  const { key } = request.params;
-  const { value } = request.payload as any;
-  const uiSettings = request.getUiSettingsService();
-
-  await uiSettings.set(key, value);
-
-  return {
-    settings: await uiSettings.getUserProvided(),
-  };
-}
-
-export const setRoute = {
-  path: '/api/kibana/settings/{key}',
-  method: 'POST',
-  config: {
-    validate: {
-      params: Joi.object()
-        .keys({
-          key: Joi.string().required(),
-        })
-        .default(),
-
-      payload: Joi.object()
-        .keys({
-          value: Joi.any().required(),
-        })
-        .required(),
-    },
-    handler(request: Legacy.Request) {
-      return handleRequest(request);
-    },
-  },
-};
diff --git a/src/legacy/ui/ui_settings/routes/set_many.ts b/src/legacy/ui/ui_settings/routes/set_many.ts
deleted file mode 100644
index 18b1046417feca..00000000000000
--- a/src/legacy/ui/ui_settings/routes/set_many.ts
+++ /dev/null
@@ -1,50 +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 { Legacy } from 'kibana';
-import Joi from 'joi';
-
-async function handleRequest(request: Legacy.Request) {
-  const { changes } = request.payload as any;
-  const uiSettings = request.getUiSettingsService();
-
-  await uiSettings.setMany(changes);
-
-  return {
-    settings: await uiSettings.getUserProvided(),
-  };
-}
-
-export const setManyRoute = {
-  path: '/api/kibana/settings',
-  method: 'POST',
-  config: {
-    validate: {
-      payload: Joi.object()
-        .keys({
-          changes: Joi.object()
-            .unknown(true)
-            .required(),
-        })
-        .required(),
-    },
-    handler(request: Legacy.Request) {
-      return handleRequest(request);
-    },
-  },
-};
diff --git a/src/legacy/ui/ui_settings/ui_settings_mixin.js b/src/legacy/ui/ui_settings/ui_settings_mixin.js
index 8c7ef25c6f8d70..64251d290776c8 100644
--- a/src/legacy/ui/ui_settings/ui_settings_mixin.js
+++ b/src/legacy/ui/ui_settings/ui_settings_mixin.js
@@ -19,12 +19,6 @@
 
 import { uiSettingsServiceFactory } from './ui_settings_service_factory';
 import { getUiSettingsServiceForRequest } from './ui_settings_service_for_request';
-import {
-  deleteRoute,
-  getRoute,
-  setManyRoute,
-  setRoute,
-} from './routes';
 
 export function uiSettingsMixin(kbnServer, server) {
   const { uiSettingDefaults = {} } = kbnServer.uiExports;
@@ -43,7 +37,7 @@ export function uiSettingsMixin(kbnServer, server) {
     return acc;
   }, {});
 
-  kbnServer.newPlatform.__internals.uiSettings.setDefaults(mergedUiSettingDefaults);
+  kbnServer.newPlatform.__internals.uiSettings.register(mergedUiSettingDefaults);
 
   server.decorate('server', 'uiSettingsServiceFactory', (options = {}) => {
     return uiSettingsServiceFactory(server, options);
@@ -58,9 +52,4 @@ export function uiSettingsMixin(kbnServer, server) {
       server.uiSettings has been removed, see https://github.com/elastic/kibana/pull/12243.
     `);
   });
-
-  server.route(deleteRoute);
-  server.route(getRoute);
-  server.route(setManyRoute);
-  server.route(setRoute);
 }
diff --git a/src/optimize/dynamic_dll_plugin/dll_compiler.js b/src/optimize/dynamic_dll_plugin/dll_compiler.js
index 5b9dd2d04a550a..3f3bb3e4e196c7 100644
--- a/src/optimize/dynamic_dll_plugin/dll_compiler.js
+++ b/src/optimize/dynamic_dll_plugin/dll_compiler.js
@@ -25,13 +25,12 @@ import fs from 'fs';
 import webpack from 'webpack';
 import { promisify } from 'util';
 import path from 'path';
-import rimraf from 'rimraf';
+import del from 'del';
 
 const readFileAsync = promisify(fs.readFile);
 const mkdirAsync = promisify(fs.mkdir);
 const existsAsync = promisify(fs.exists);
 const writeFileAsync = promisify(fs.writeFile);
-const rimrafAsync = promisify(rimraf);
 
 export class DllCompiler {
   static getRawDllConfig(uiBundles = {}, babelLoaderCacheDir = '', threadLoaderPoolConfig = {}) {
@@ -267,7 +266,7 @@ export class DllCompiler {
           // Delete the built dll, as it contains invalid modules, and reject listing
           // all the not allowed modules
           try {
-            await rimrafAsync(this.rawDllConfig.outputPath);
+            await del(this.rawDllConfig.outputPath);
           } catch (e) {
             return reject(e);
           }
diff --git a/src/plugins/dashboard_embeddable_container/kibana.json b/src/plugins/dashboard_embeddable_container/kibana.json
new file mode 100644
index 00000000000000..aab23316f606c0
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/kibana.json
@@ -0,0 +1,11 @@
+{
+  "id": "dashboard_embeddable_container",
+  "version": "kibana",
+  "requiredPlugins": [
+    "embeddable",
+    "inspector",
+    "uiActions"
+  ],
+  "server": false,
+  "ui": true
+}
diff --git a/src/plugins/dashboard_embeddable_container/public/_index.scss b/src/plugins/dashboard_embeddable_container/public/_index.scss
new file mode 100644
index 00000000000000..ccb8299072fb76
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/_index.scss
@@ -0,0 +1,5 @@
+@import '../../embeddable/public/variables';
+
+@import './embeddable/grid/index';
+@import './embeddable/panel/index';
+@import './embeddable/viewport/index';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.test.tsx b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx
similarity index 97%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.test.tsx
rename to src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx
index 0fa34817bee862..f8c05170e8f672 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.test.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_api';
+import { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_plugin';
 import { ExpandPanelAction } from './expand_panel_action';
 import { DashboardContainer } from '../embeddable';
 import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
@@ -27,7 +27,7 @@ import {
   ContactCardEmbeddable,
   ContactCardEmbeddableInput,
   ContactCardEmbeddableOutput,
-} from '../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
+} from '../embeddable_plugin_test_samples';
 import { DashboardOptions } from '../embeddable/dashboard_container_factory';
 
 const embeddableFactories = new Map<string, EmbeddableFactory>();
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.tsx b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.tsx
similarity index 93%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.tsx
rename to src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.tsx
index f05d0b0efc2ee1..68f68f8a53bccd 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/expand_panel_action.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.tsx
@@ -18,12 +18,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable } from '../../../../../../embeddable_api/public/np_ready/public';
+import { IEmbeddable } from '../embeddable_plugin';
+import { IAction, IncompatibleActionError } from '../ui_actions_plugin';
 import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';
-import {
-  IAction,
-  IncompatibleActionError,
-} from '../../../../../../../../../src/plugins/ui_actions/public';
 
 export const EXPAND_PANEL_ACTION = 'togglePanel';
 
diff --git a/src/plugins/dashboard_embeddable_container/public/actions/index.ts b/src/plugins/dashboard_embeddable_container/public/actions/index.ts
new file mode 100644
index 00000000000000..6c0db82fbbc5bb
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/actions/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { ExpandPanelAction, EXPAND_PANEL_ACTION } from './expand_panel_action';
+export { ReplacePanelAction, REPLACE_PANEL_ACTION } from './replace_panel_action';
diff --git a/src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx b/src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx
new file mode 100644
index 00000000000000..cb354375e7a683
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { CoreStart } from '../../../../core/public';
+import { ReplacePanelFlyout } from './replace_panel_flyout';
+import {
+  IEmbeddable,
+  EmbeddableInput,
+  EmbeddableOutput,
+  Start as EmbeddableStart,
+  IContainer,
+} from '../embeddable_plugin';
+
+export async function openReplacePanelFlyout(options: {
+  embeddable: IContainer;
+  core: CoreStart;
+  savedObjectFinder: React.ComponentType<any>;
+  notifications: CoreStart['notifications'];
+  panelToRemove: IEmbeddable<EmbeddableInput, EmbeddableOutput>;
+  getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories'];
+}) {
+  const {
+    embeddable,
+    core,
+    panelToRemove,
+    savedObjectFinder,
+    notifications,
+    getEmbeddableFactories,
+  } = options;
+  const flyoutSession = core.overlays.openFlyout(
+    <ReplacePanelFlyout
+      container={embeddable}
+      onClose={() => {
+        if (flyoutSession) {
+          flyoutSession.close();
+        }
+      }}
+      panelToRemove={panelToRemove}
+      savedObjectsFinder={savedObjectFinder}
+      notifications={notifications}
+      getEmbeddableFactories={getEmbeddableFactories}
+    />,
+    {
+      'data-test-subj': 'replacePanelFlyout',
+    }
+  );
+}
diff --git a/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx
new file mode 100644
index 00000000000000..de29e1dec85a86
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx
@@ -0,0 +1,155 @@
+/*
+ * 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 { isErrorEmbeddable, EmbeddableFactory } from '../embeddable_plugin';
+import { ReplacePanelAction } from './replace_panel_action';
+import { DashboardContainer } from '../embeddable';
+import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
+import {
+  CONTACT_CARD_EMBEDDABLE,
+  ContactCardEmbeddableFactory,
+  ContactCardEmbeddable,
+  ContactCardEmbeddableInput,
+  ContactCardEmbeddableOutput,
+} from '../embeddable_plugin_test_samples';
+import { DashboardOptions } from '../embeddable/dashboard_container_factory';
+
+const embeddableFactories = new Map<string, EmbeddableFactory>();
+embeddableFactories.set(
+  CONTACT_CARD_EMBEDDABLE,
+  new ContactCardEmbeddableFactory({} as any, (() => null) as any, {} as any)
+);
+const getEmbeddableFactories = () => embeddableFactories.values();
+
+let container: DashboardContainer;
+let embeddable: ContactCardEmbeddable;
+
+beforeEach(async () => {
+  const options: DashboardOptions = {
+    ExitFullScreenButton: () => null,
+    SavedObjectFinder: () => null,
+    application: {} as any,
+    embeddable: {
+      getEmbeddableFactory: (id: string) => embeddableFactories.get(id)!,
+    } as any,
+    inspector: {} as any,
+    notifications: {} as any,
+    overlays: {} as any,
+    savedObjectMetaData: {} as any,
+    uiActions: {} as any,
+  };
+  const input = getSampleDashboardInput({
+    panels: {
+      '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
+        explicitInput: { firstName: 'Sam', id: '123' },
+        type: CONTACT_CARD_EMBEDDABLE,
+      }),
+    },
+  });
+  container = new DashboardContainer(input, options);
+
+  const contactCardEmbeddable = await container.addNewEmbeddable<
+    ContactCardEmbeddableInput,
+    ContactCardEmbeddableOutput,
+    ContactCardEmbeddable
+  >(CONTACT_CARD_EMBEDDABLE, {
+    firstName: 'Kibana',
+  });
+
+  if (isErrorEmbeddable(contactCardEmbeddable)) {
+    throw new Error('Failed to create embeddable');
+  } else {
+    embeddable = contactCardEmbeddable;
+  }
+});
+
+test('Executes the replace panel action', async () => {
+  let core: any;
+  let SavedObjectFinder: any;
+  let notifications: any;
+  const action = new ReplacePanelAction(
+    core,
+    SavedObjectFinder,
+    notifications,
+    getEmbeddableFactories
+  );
+  action.execute({ embeddable });
+});
+
+test('Is not compatible when embeddable is not in a dashboard container', async () => {
+  let core: any;
+  let SavedObjectFinder: any;
+  let notifications: any;
+  const action = new ReplacePanelAction(
+    core,
+    SavedObjectFinder,
+    notifications,
+    getEmbeddableFactories
+  );
+  expect(
+    await action.isCompatible({
+      embeddable: new ContactCardEmbeddable(
+        { firstName: 'sue', id: '123' },
+        { execAction: (() => null) as any }
+      ),
+    })
+  ).toBe(false);
+});
+
+test('Execute throws an error when called with an embeddable not in a parent', async () => {
+  let core: any;
+  let SavedObjectFinder: any;
+  let notifications: any;
+  const action = new ReplacePanelAction(
+    core,
+    SavedObjectFinder,
+    notifications,
+    getEmbeddableFactories
+  );
+  async function check() {
+    await action.execute({ embeddable: container });
+  }
+  await expect(check()).rejects.toThrow(Error);
+});
+
+test('Returns title', async () => {
+  let core: any;
+  let SavedObjectFinder: any;
+  let notifications: any;
+  const action = new ReplacePanelAction(
+    core,
+    SavedObjectFinder,
+    notifications,
+    getEmbeddableFactories
+  );
+  expect(action.getDisplayName({ embeddable })).toBeDefined();
+});
+
+test('Returns an icon', async () => {
+  let core: any;
+  let SavedObjectFinder: any;
+  let notifications: any;
+  const action = new ReplacePanelAction(
+    core,
+    SavedObjectFinder,
+    notifications,
+    getEmbeddableFactories
+  );
+  expect(action.getIconType({ embeddable })).toBeDefined();
+});
diff --git a/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx
new file mode 100644
index 00000000000000..f6d2fcbcd57fd4
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { CoreStart } from '../../../../core/public';
+import { IEmbeddable, ViewMode, Start as EmbeddableStart } from '../embeddable_plugin';
+import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';
+import { IAction, IncompatibleActionError } from '../ui_actions_plugin';
+import { openReplacePanelFlyout } from './open_replace_panel_flyout';
+
+export const REPLACE_PANEL_ACTION = 'replacePanel';
+
+function isDashboard(embeddable: IEmbeddable): embeddable is DashboardContainer {
+  return embeddable.type === DASHBOARD_CONTAINER_TYPE;
+}
+
+interface ActionContext {
+  embeddable: IEmbeddable;
+}
+
+export class ReplacePanelAction implements IAction<ActionContext> {
+  public readonly type = REPLACE_PANEL_ACTION;
+  public readonly id = REPLACE_PANEL_ACTION;
+  public order = 11;
+
+  constructor(
+    private core: CoreStart,
+    private savedobjectfinder: React.ComponentType<any>,
+    private notifications: CoreStart['notifications'],
+    private getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories']
+  ) {}
+
+  public getDisplayName({ embeddable }: ActionContext) {
+    if (!embeddable.parent || !isDashboard(embeddable.parent)) {
+      throw new IncompatibleActionError();
+    }
+    return i18n.translate('dashboardEmbeddableContainer.panel.removePanel.replacePanel', {
+      defaultMessage: 'Replace panel',
+    });
+  }
+
+  public getIconType({ embeddable }: ActionContext) {
+    if (!embeddable.parent || !isDashboard(embeddable.parent)) {
+      throw new IncompatibleActionError();
+    }
+    return 'kqlOperand';
+  }
+
+  public async isCompatible({ embeddable }: ActionContext) {
+    if (embeddable.getInput().viewMode) {
+      if (embeddable.getInput().viewMode === ViewMode.VIEW) {
+        return false;
+      }
+    }
+
+    return Boolean(embeddable.parent && isDashboard(embeddable.parent));
+  }
+
+  public async execute({ embeddable }: ActionContext) {
+    if (!embeddable.parent || !isDashboard(embeddable.parent)) {
+      throw new IncompatibleActionError();
+    }
+
+    const view = embeddable;
+    const dash = embeddable.parent;
+    openReplacePanelFlyout({
+      embeddable: dash,
+      core: this.core,
+      savedObjectFinder: this.savedobjectfinder,
+      notifications: this.notifications,
+      panelToRemove: view,
+      getEmbeddableFactories: this.getEmbeddableFactories,
+    });
+  }
+}
diff --git a/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx
new file mode 100644
index 00000000000000..02e5f45fae3bd6
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx
@@ -0,0 +1,143 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import {
+  EuiFlyout,
+  EuiFlyoutBody,
+  EuiFlyoutHeader,
+  EuiTitle,
+  EuiGlobalToastListToast as Toast,
+} from '@elastic/eui';
+import { DashboardPanelState } from '../embeddable';
+import { NotificationsStart } from '../../../../core/public';
+import {
+  IContainer,
+  IEmbeddable,
+  EmbeddableInput,
+  EmbeddableOutput,
+  Start as EmbeddableStart,
+} from '../embeddable_plugin';
+
+interface Props {
+  container: IContainer;
+  savedObjectsFinder: React.ComponentType<any>;
+  onClose: () => void;
+  notifications: NotificationsStart;
+  panelToRemove: IEmbeddable<EmbeddableInput, EmbeddableOutput>;
+  getEmbeddableFactories: EmbeddableStart['getEmbeddableFactories'];
+}
+
+export class ReplacePanelFlyout extends React.Component<Props> {
+  private lastToast: Toast = {
+    id: 'panelReplaceToast',
+  };
+
+  constructor(props: Props) {
+    super(props);
+  }
+
+  public showToast = (name: string) => {
+    // To avoid the clutter of having toast messages cover flyout
+    // close previous toast message before creating a new one
+    if (this.lastToast) {
+      this.props.notifications.toasts.remove(this.lastToast);
+    }
+
+    this.lastToast = this.props.notifications.toasts.addSuccess({
+      title: i18n.translate(
+        'dashboardEmbeddableContainer.addPanel.savedObjectAddedToContainerSuccessMessageTitle',
+        {
+          defaultMessage: '{savedObjectName} was added',
+          values: {
+            savedObjectName: name,
+          },
+        }
+      ),
+      'data-test-subj': 'addObjectToContainerSuccess',
+    });
+  };
+
+  public onReplacePanel = async (id: string, type: string, name: string) => {
+    const originalPanels = this.props.container.getInput().panels;
+    const filteredPanels = { ...originalPanels };
+
+    const nnw = (filteredPanels[this.props.panelToRemove.id] as DashboardPanelState).gridData.w;
+    const nnh = (filteredPanels[this.props.panelToRemove.id] as DashboardPanelState).gridData.h;
+    const nnx = (filteredPanels[this.props.panelToRemove.id] as DashboardPanelState).gridData.x;
+    const nny = (filteredPanels[this.props.panelToRemove.id] as DashboardPanelState).gridData.y;
+
+    // add the new view
+    const newObj = await this.props.container.addSavedObjectEmbeddable(type, id);
+
+    const finalPanels = this.props.container.getInput().panels;
+    (finalPanels[newObj.id] as DashboardPanelState).gridData.w = nnw;
+    (finalPanels[newObj.id] as DashboardPanelState).gridData.h = nnh;
+    (finalPanels[newObj.id] as DashboardPanelState).gridData.x = nnx;
+    (finalPanels[newObj.id] as DashboardPanelState).gridData.y = nny;
+
+    // delete the old view
+    delete finalPanels[this.props.panelToRemove.id];
+
+    // apply changes
+    this.props.container.updateInput(finalPanels);
+    this.props.container.reload();
+
+    this.showToast(name);
+    this.props.onClose();
+  };
+
+  public render() {
+    const SavedObjectFinder = this.props.savedObjectsFinder;
+    const savedObjectsFinder = (
+      <SavedObjectFinder
+        noItemsMessage={i18n.translate(
+          'dashboardEmbeddableContainer.addPanel.noMatchingObjectsMessage',
+          {
+            defaultMessage: 'No matching objects found.',
+          }
+        )}
+        savedObjectMetaData={[...this.props.getEmbeddableFactories()]
+          .filter(
+            embeddableFactory =>
+              Boolean(embeddableFactory.savedObjectMetaData) && !embeddableFactory.isContainerType
+          )
+          .map(({ savedObjectMetaData }) => savedObjectMetaData as any)}
+        showFilter={true}
+        onChoose={this.onReplacePanel}
+      />
+    );
+
+    const panelToReplace = 'Replace panel ' + this.props.panelToRemove.getTitle() + ' with:';
+
+    return (
+      <EuiFlyout ownFocus onClose={this.props.onClose} data-test-subj="dashboardReplacePanel">
+        <EuiFlyoutHeader hasBorder>
+          <EuiTitle size="m">
+            <h2>
+              <span>{panelToReplace}</span>
+            </h2>
+          </EuiTitle>
+        </EuiFlyoutHeader>
+        <EuiFlyoutBody>{savedObjectsFinder}</EuiFlyoutBody>
+      </EuiFlyout>
+    );
+  }
+}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants.ts
similarity index 94%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants.ts
index 941ddd3c5efecf..34cd8d42a11880 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants.ts
@@ -21,3 +21,4 @@ export const DASHBOARD_GRID_COLUMN_COUNT = 48;
 export const DASHBOARD_GRID_HEIGHT = 20;
 export const DEFAULT_PANEL_WIDTH = DASHBOARD_GRID_COLUMN_COUNT / 2;
 export const DEFAULT_PANEL_HEIGHT = 15;
+export const DASHBOARD_CONTAINER_TYPE = 'dashboard';
diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx
new file mode 100644
index 00000000000000..770c46c62e42f6
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx
@@ -0,0 +1,141 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// @ts-ignore
+import { findTestSubject } from '@elastic/eui/lib/test';
+import { nextTick } from 'test_utils/enzyme_helpers';
+import { isErrorEmbeddable, ViewMode, EmbeddableFactory } from '../embeddable_plugin';
+import { DashboardContainer, DashboardContainerOptions } from './dashboard_container';
+import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers';
+import {
+  CONTACT_CARD_EMBEDDABLE,
+  ContactCardEmbeddableFactory,
+  ContactCardEmbeddableInput,
+  ContactCardEmbeddable,
+  ContactCardEmbeddableOutput,
+} from '../embeddable_plugin_test_samples';
+
+const options: DashboardContainerOptions = {
+  application: {} as any,
+  embeddable: {
+    getTriggerCompatibleActions: (() => []) as any,
+    getEmbeddableFactories: (() => []) as any,
+    getEmbeddableFactory: undefined as any,
+  } as any,
+  notifications: {} as any,
+  overlays: {} as any,
+  inspector: {} as any,
+  SavedObjectFinder: () => null,
+  ExitFullScreenButton: () => null,
+  uiActions: {} as any,
+};
+
+beforeEach(() => {
+  const embeddableFactories = new Map<string, EmbeddableFactory>();
+  embeddableFactories.set(
+    CONTACT_CARD_EMBEDDABLE,
+    new ContactCardEmbeddableFactory({} as any, (() => null) as any, {} as any)
+  );
+  options.embeddable.getEmbeddableFactory = (id: string) => embeddableFactories.get(id) as any;
+});
+
+test('DashboardContainer initializes embeddables', async done => {
+  const initialInput = getSampleDashboardInput({
+    panels: {
+      '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
+        explicitInput: { firstName: 'Sam', id: '123' },
+        type: CONTACT_CARD_EMBEDDABLE,
+      }),
+    },
+  });
+  const container = new DashboardContainer(initialInput, options);
+
+  const subscription = container.getOutput$().subscribe(output => {
+    if (container.getOutput().embeddableLoaded['123']) {
+      const embeddable = container.getChild<ContactCardEmbeddable>('123');
+      expect(embeddable).toBeDefined();
+      expect(embeddable.id).toBe('123');
+      done();
+    }
+  });
+
+  if (container.getOutput().embeddableLoaded['123']) {
+    const embeddable = container.getChild<ContactCardEmbeddable>('123');
+    expect(embeddable).toBeDefined();
+    expect(embeddable.id).toBe('123');
+    subscription.unsubscribe();
+    done();
+  }
+});
+
+test('DashboardContainer.addNewEmbeddable', async () => {
+  const container = new DashboardContainer(getSampleDashboardInput(), options);
+  const embeddable = await container.addNewEmbeddable<ContactCardEmbeddableInput>(
+    CONTACT_CARD_EMBEDDABLE,
+    {
+      firstName: 'Kibana',
+    }
+  );
+  expect(embeddable).toBeDefined();
+
+  if (!isErrorEmbeddable(embeddable)) {
+    expect(embeddable.getInput().firstName).toBe('Kibana');
+  } else {
+    expect(false).toBe(true);
+  }
+
+  const embeddableInContainer = container.getChild<ContactCardEmbeddable>(embeddable.id);
+  expect(embeddableInContainer).toBeDefined();
+  expect(embeddableInContainer.id).toBe(embeddable.id);
+});
+
+test('Container view mode change propagates to existing children', async () => {
+  const initialInput = getSampleDashboardInput({
+    panels: {
+      '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
+        explicitInput: { firstName: 'Sam', id: '123' },
+        type: CONTACT_CARD_EMBEDDABLE,
+      }),
+    },
+  });
+  const container = new DashboardContainer(initialInput, options);
+  await nextTick();
+
+  const embeddable = await container.getChild('123');
+  expect(embeddable.getInput().viewMode).toBe(ViewMode.VIEW);
+  container.updateInput({ viewMode: ViewMode.EDIT });
+  expect(embeddable.getInput().viewMode).toBe(ViewMode.EDIT);
+});
+
+test('Container view mode change propagates to new children', async () => {
+  const container = new DashboardContainer(getSampleDashboardInput(), options);
+  const embeddable = await container.addNewEmbeddable<
+    ContactCardEmbeddableInput,
+    ContactCardEmbeddableOutput,
+    ContactCardEmbeddable
+  >(CONTACT_CARD_EMBEDDABLE, {
+    firstName: 'Bob',
+  });
+
+  expect(embeddable.getInput().viewMode).toBe(ViewMode.VIEW);
+
+  container.updateInput({ viewMode: ViewMode.EDIT });
+
+  expect(embeddable.getInput().viewMode).toBe(ViewMode.EDIT);
+});
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx
similarity index 83%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx
index 919995f544960d..8b258f35584388 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx
@@ -20,9 +20,9 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
-import { Filter } from '@kbn/es-query';
-import { RefreshInterval, TimeRange } from 'src/plugins/data/public';
-import { IUiActionsStart } from '../../../../../../../../plugins/ui_actions/public';
+import { RefreshInterval, TimeRange, Query } from '../../../data/public';
+import { CoreStart } from '../../../../core/public';
+import { IUiActionsStart } from '../ui_actions_plugin';
 import {
   Container,
   ContainerInput,
@@ -30,24 +30,23 @@ import {
   ViewMode,
   EmbeddableFactory,
   IEmbeddable,
-} from '../../../../../../embeddable_api/public/np_ready/public';
-import { DASHBOARD_CONTAINER_TYPE } from './dashboard_container_factory';
+  Start as EmbeddableStartContract,
+} from '../embeddable_plugin';
+import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants';
 import { createPanelState } from './panel';
 import { DashboardPanelState } from './types';
 import { DashboardViewport } from './viewport/dashboard_viewport';
-import { Query } from '../../../../../../data/public';
-import { CoreStart } from '../../../../../../../../core/public';
-import { Start as InspectorStartContract } from '../../../../../../../../plugins/inspector/public';
-import { Start as EmbeddableStartContract } from '../../../../../../embeddable_api/public/np_ready/public';
+import { Start as InspectorStartContract } from '../../../inspector/public';
+import { esFilters } from '../../../../plugins/data/public';
 import {
+  KibanaContextProvider,
   KibanaReactContext,
   KibanaReactContextValue,
-  KibanaContextProvider,
-} from '../../../../../../../../plugins/kibana_react/public';
+} from '../../../kibana_react/public';
 
 export interface DashboardContainerInput extends ContainerInput {
   viewMode: ViewMode;
-  filters: Filter[];
+  filters: esFilters.Filter[];
   query: Query;
   timeRange: TimeRange;
   refreshConfig?: RefreshInterval;
@@ -66,7 +65,7 @@ interface IndexSignature {
 }
 
 export interface InheritedChildInput extends IndexSignature {
-  filters: Filter[];
+  filters: esFilters.Filter[];
   query: Query;
   timeRange: TimeRange;
   refreshConfig?: RefreshInterval;
diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx
new file mode 100644
index 00000000000000..c8a2837fd77d0b
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { SavedObjectAttributes } from '../../../../core/public';
+import { SavedObjectMetaData } from '../types';
+import {
+  ContainerOutput,
+  EmbeddableFactory,
+  ErrorEmbeddable,
+  Container,
+} from '../embeddable_plugin';
+import {
+  DashboardContainer,
+  DashboardContainerInput,
+  DashboardContainerOptions,
+} from './dashboard_container';
+import { DashboardCapabilities } from '../types';
+import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants';
+
+export interface DashboardOptions extends DashboardContainerOptions {
+  savedObjectMetaData?: SavedObjectMetaData<SavedObjectAttributes>;
+}
+
+export class DashboardContainerFactory extends EmbeddableFactory<
+  DashboardContainerInput,
+  ContainerOutput
+> {
+  public readonly isContainerType = true;
+  public readonly type = DASHBOARD_CONTAINER_TYPE;
+
+  private readonly allowEditing: boolean;
+
+  constructor(private readonly options: DashboardOptions) {
+    super({ savedObjectMetaData: options.savedObjectMetaData });
+
+    const capabilities = (options.application.capabilities
+      .dashboard as unknown) as DashboardCapabilities;
+
+    if (!capabilities || typeof capabilities !== 'object') {
+      throw new TypeError('Dashboard capabilities not found.');
+    }
+
+    this.allowEditing = !!capabilities.createNew && !!capabilities.showWriteControls;
+  }
+
+  public isEditable() {
+    return this.allowEditing;
+  }
+
+  public getDisplayName() {
+    return i18n.translate('dashboardEmbeddableContainer.factory.displayName', {
+      defaultMessage: 'dashboard',
+    });
+  }
+
+  public getDefaultInput(): Partial<DashboardContainerInput> {
+    return {
+      panels: {},
+      isFullScreenMode: false,
+      useMargins: true,
+    };
+  }
+
+  public async create(
+    initialInput: DashboardContainerInput,
+    parent?: Container
+  ): Promise<DashboardContainer | ErrorEmbeddable> {
+    return new DashboardContainer(initialInput, this.options, parent);
+  }
+}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_dashboard_grid.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_dashboard_grid.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_index.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/_index.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/_index.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.test.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.test.tsx
similarity index 96%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.test.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.test.tsx
index 386aae9ddcf78e..e4338dc89153d3 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.test.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.test.tsx
@@ -23,15 +23,15 @@ import sizeMe from 'react-sizeme';
 import React from 'react';
 import { nextTick, mountWithIntl } from 'test_utils/enzyme_helpers';
 import { skip } from 'rxjs/operators';
-import { EmbeddableFactory, GetEmbeddableFactory } from '../../embeddable_api';
+import { EmbeddableFactory, GetEmbeddableFactory } from '../../embeddable_plugin';
 import { DashboardGrid, DashboardGridProps } from './dashboard_grid';
 import { DashboardContainer, DashboardContainerOptions } from '../dashboard_container';
 import { getSampleDashboardInput } from '../../test_helpers';
 import {
   CONTACT_CARD_EMBEDDABLE,
   ContactCardEmbeddableFactory,
-} from '../../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-import { KibanaContextProvider } from '../../../../../../../../../plugins/kibana_react/public';
+} from '../../embeddable_plugin_test_samples';
+import { KibanaContextProvider } from '../../../../kibana_react/public';
 
 let dashboardContainer: DashboardContainer | undefined;
 
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.tsx
similarity index 95%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.tsx
index 291bef15641f36..40db43427339d9 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/dashboard_grid.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/dashboard_grid.tsx
@@ -20,19 +20,21 @@
 import 'react-grid-layout/css/styles.css';
 import 'react-resizable/css/styles.css';
 
+// @ts-ignore
+import sizeMe from 'react-sizeme';
+
 import { injectI18n } from '@kbn/i18n/react';
 import classNames from 'classnames';
 import _ from 'lodash';
 import React from 'react';
 import { Subscription } from 'rxjs';
 import ReactGridLayout, { Layout } from 'react-grid-layout';
-// @ts-ignore
-import sizeMe from 'react-sizeme';
-import { ViewMode, EmbeddableChildPanel } from '../../embeddable_api';
+import { ViewMode, EmbeddableChildPanel } from '../../embeddable_plugin';
 import { DASHBOARD_GRID_COLUMN_COUNT, DASHBOARD_GRID_HEIGHT } from '../dashboard_constants';
-import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container';
 import { DashboardPanelState, GridData } from '../types';
-import { withKibana } from '../../../../../../../../../plugins/kibana_react/public';
+import { withKibana } from '../../../../kibana_react/public';
+import { DashboardContainerInput } from '../dashboard_container';
+import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container';
 
 let lastValidGridSize = 0;
 
@@ -174,16 +176,18 @@ class DashboardGridUi extends React.Component<DashboardGridProps, State> {
       isLayoutInvalid,
     });
 
-    this.subscription = this.props.container.getInput$().subscribe(input => {
-      if (this.mounted) {
-        this.setState({
-          panels: input.panels,
-          viewMode: input.viewMode,
-          useMargins: input.useMargins,
-          expandedPanelId: input.expandedPanelId,
-        });
-      }
-    });
+    this.subscription = this.props.container
+      .getInput$()
+      .subscribe((input: DashboardContainerInput) => {
+        if (this.mounted) {
+          this.setState({
+            panels: input.panels,
+            viewMode: input.viewMode,
+            useMargins: input.useMargins,
+            expandedPanelId: input.expandedPanelId,
+          });
+        }
+      });
   }
 
   public componentWillUnmount() {
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/index.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/index.ts
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/grid/index.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/grid/index.ts
diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable/index.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/index.ts
new file mode 100644
index 00000000000000..58bfd5eedefcb1
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/index.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { DashboardContainerFactory } from './dashboard_container_factory';
+export { DashboardContainer, DashboardContainerInput } from './dashboard_container';
+export { createPanelState } from './panel';
+
+export { DashboardPanelState, GridData } from './types';
+
+export {
+  DASHBOARD_GRID_COLUMN_COUNT,
+  DEFAULT_PANEL_HEIGHT,
+  DEFAULT_PANEL_WIDTH,
+  DASHBOARD_CONTAINER_TYPE,
+} from './dashboard_constants';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_dashboard_panel.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/_dashboard_panel.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_dashboard_panel.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/_dashboard_panel.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_index.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/_index.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/_index.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.test.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.test.ts
similarity index 93%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.test.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.test.ts
index e66a25831577c6..8889f4dc275447 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.test.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.test.ts
@@ -20,9 +20,8 @@
 import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants';
 import { DashboardPanelState } from '../types';
 import { createPanelState } from './create_panel_state';
-import { EmbeddableInput } from '../../embeddable_api';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { CONTACT_CARD_EMBEDDABLE } from '../../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
+import { EmbeddableInput } from '../../embeddable_plugin';
+import { CONTACT_CARD_EMBEDDABLE } from '../../embeddable_plugin_test_samples';
 
 interface TestInput extends EmbeddableInput {
   test: string;
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.ts
similarity index 98%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.ts
index 4f3de4a9b2bfb8..7139cddf02b336 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/create_panel_state.ts
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/create_panel_state.ts
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { PanelState, EmbeddableInput } from '../../embeddable_api';
+import { PanelState, EmbeddableInput } from '../../embeddable_plugin';
 import {
   DASHBOARD_GRID_COLUMN_COUNT,
   DEFAULT_PANEL_HEIGHT,
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/index.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/panel/index.ts
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/panel/index.ts
rename to src/plugins/dashboard_embeddable_container/public/embeddable/panel/index.ts
diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable/types.ts b/src/plugins/dashboard_embeddable_container/public/embeddable/types.ts
new file mode 100644
index 00000000000000..480d03552ca68e
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/types.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { PanelState, EmbeddableInput } from '../embeddable_plugin';
+export type PanelId = string;
+export type SavedObjectId = string;
+
+export interface GridData {
+  w: number;
+  h: number;
+  x: number;
+  y: number;
+  i: string;
+}
+
+export interface DashboardPanelState<TEmbeddableInput extends EmbeddableInput = EmbeddableInput>
+  extends PanelState<TEmbeddableInput> {
+  readonly gridData: GridData;
+}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_dashboard_viewport.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_dashboard_viewport.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_dashboard_viewport.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_index.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/_index.scss
rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/_index.scss
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.test.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.test.tsx
similarity index 95%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.test.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.test.tsx
index 01bde21f91d3b7..7b83407bf8063c 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.test.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.test.tsx
@@ -24,15 +24,15 @@ import { skip } from 'rxjs/operators';
 import { mount } from 'enzyme';
 import { I18nProvider } from '@kbn/i18n/react';
 import { nextTick } from 'test_utils/enzyme_helpers';
-import { EmbeddableFactory } from '../../embeddable_api';
+import { EmbeddableFactory } from '../../embeddable_plugin';
 import { DashboardViewport, DashboardViewportProps } from './dashboard_viewport';
 import { DashboardContainer, DashboardContainerOptions } from '../dashboard_container';
 import { getSampleDashboardInput } from '../../test_helpers';
 import {
   CONTACT_CARD_EMBEDDABLE,
   ContactCardEmbeddableFactory,
-} from '../../../../../../../embeddable_api/public/np_ready/public/lib/test_samples';
-import { KibanaContextProvider } from '../../../../../../../../../plugins/kibana_react/public';
+} from '../../embeddable_plugin_test_samples';
+import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public';
 
 let dashboardContainer: DashboardContainer | undefined;
 
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.tsx
similarity index 95%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.tsx
rename to src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.tsx
index 59accb225238be..13407e5e33725a 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/viewport/dashboard_viewport.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/viewport/dashboard_viewport.tsx
@@ -19,10 +19,10 @@
 
 import React from 'react';
 import { Subscription } from 'rxjs';
-import { PanelState } from '../../embeddable_api';
+import { PanelState } from '../../embeddable_plugin';
 import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container';
 import { DashboardGrid } from '../grid';
-import { context } from '../../../../../../../../../plugins/kibana_react/public';
+import { context } from '../../../../kibana_react/public';
 
 export interface DashboardViewportProps {
   container: DashboardContainer;
diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable_plugin.ts b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin.ts
new file mode 100644
index 00000000000000..30c0ec49751416
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from '../../../plugins/embeddable/public';
diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable_plugin_test_samples.ts b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin_test_samples.ts
new file mode 100644
index 00000000000000..0e49a94278dfc9
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable_plugin_test_samples.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// eslint-disable-next-line
+export * from '../../../plugins/embeddable/public/lib/test_samples';
diff --git a/src/plugins/dashboard_embeddable_container/public/index.ts b/src/plugins/dashboard_embeddable_container/public/index.ts
new file mode 100644
index 00000000000000..73597525105dba
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/index.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from '../../../core/public';
+import { DashboardEmbeddableContainerPublicPlugin } from './plugin';
+
+export * from './types';
+export * from './actions';
+export * from './embeddable';
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new DashboardEmbeddableContainerPublicPlugin(initializerContext);
+}
+
+export { DashboardEmbeddableContainerPublicPlugin as Plugin };
diff --git a/src/plugins/dashboard_embeddable_container/public/plugin.tsx b/src/plugins/dashboard_embeddable_container/public/plugin.tsx
new file mode 100644
index 00000000000000..eadf70a36416a6
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/plugin.tsx
@@ -0,0 +1,110 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* eslint-disable max-classes-per-file */
+
+import * as React from 'react';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { IUiActionsSetup, IUiActionsStart } from '../../../plugins/ui_actions/public';
+import { CONTEXT_MENU_TRIGGER, Plugin as EmbeddablePlugin } from './embeddable_plugin';
+import { ExpandPanelAction, ReplacePanelAction } from '.';
+import { DashboardContainerFactory } from './embeddable/dashboard_container_factory';
+import { Start as InspectorStartContract } from '../../../plugins/inspector/public';
+import {
+  SavedObjectFinder as SavedObjectFinderUi,
+  SavedObjectFinderProps,
+  ExitFullScreenButton as ExitFullScreenButtonUi,
+  ExitFullScreenButtonProps,
+} from '../../../plugins/kibana_react/public';
+
+interface SetupDependencies {
+  embeddable: ReturnType<EmbeddablePlugin['setup']>;
+  uiActions: IUiActionsSetup;
+}
+
+interface StartDependencies {
+  embeddable: ReturnType<EmbeddablePlugin['start']>;
+  inspector: InspectorStartContract;
+  uiActions: IUiActionsStart;
+}
+
+export type Setup = void;
+export type Start = void;
+
+export class DashboardEmbeddableContainerPublicPlugin
+  implements Plugin<Setup, Start, SetupDependencies, StartDependencies> {
+  constructor(initializerContext: PluginInitializerContext) {}
+
+  public setup(core: CoreSetup, { embeddable, uiActions }: SetupDependencies): Setup {
+    const expandPanelAction = new ExpandPanelAction();
+    uiActions.registerAction(expandPanelAction);
+    uiActions.attachAction(CONTEXT_MENU_TRIGGER, expandPanelAction.id);
+  }
+
+  public start(core: CoreStart, plugins: StartDependencies): Start {
+    const { application, notifications, overlays } = core;
+    const { embeddable, inspector, uiActions } = plugins;
+
+    const SavedObjectFinder: React.FC<
+      Exclude<SavedObjectFinderProps, 'savedObjects' | 'uiSettings'>
+    > = props => (
+      <SavedObjectFinderUi
+        {...props}
+        savedObjects={core.savedObjects}
+        uiSettings={core.uiSettings}
+      />
+    );
+
+    const useHideChrome = () => {
+      React.useEffect(() => {
+        core.chrome.setIsVisible(false);
+        return () => core.chrome.setIsVisible(true);
+      }, []);
+    };
+
+    const ExitFullScreenButton: React.FC<ExitFullScreenButtonProps> = props => {
+      useHideChrome();
+      return <ExitFullScreenButtonUi {...props} />;
+    };
+
+    const changeViewAction = new ReplacePanelAction(
+      core,
+      SavedObjectFinder,
+      notifications,
+      plugins.embeddable.getEmbeddableFactories
+    );
+    uiActions.registerAction(changeViewAction);
+    uiActions.attachAction(CONTEXT_MENU_TRIGGER, changeViewAction.id);
+
+    const factory = new DashboardContainerFactory({
+      application,
+      notifications,
+      overlays,
+      embeddable,
+      inspector,
+      SavedObjectFinder,
+      ExitFullScreenButton,
+      uiActions,
+    });
+
+    embeddable.registerEmbeddableFactory(factory.type, factory);
+  }
+
+  public stop() {}
+}
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/get_sample_dashboard_input.ts b/src/plugins/dashboard_embeddable_container/public/test_helpers/get_sample_dashboard_input.ts
similarity index 96%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/get_sample_dashboard_input.ts
rename to src/plugins/dashboard_embeddable_container/public/test_helpers/get_sample_dashboard_input.ts
index 98eb0636f9aad7..09478d8e8af354 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/get_sample_dashboard_input.ts
+++ b/src/plugins/dashboard_embeddable_container/public/test_helpers/get_sample_dashboard_input.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ViewMode, EmbeddableInput } from '../embeddable_api';
+import { ViewMode, EmbeddableInput } from '../embeddable_plugin';
 import { DashboardContainerInput, DashboardPanelState } from '../embeddable';
 
 export function getSampleDashboardInput(
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/index.ts b/src/plugins/dashboard_embeddable_container/public/test_helpers/index.ts
similarity index 100%
rename from src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/test_helpers/index.ts
rename to src/plugins/dashboard_embeddable_container/public/test_helpers/index.ts
diff --git a/src/plugins/dashboard_embeddable_container/public/tests/dashboard_container.test.tsx b/src/plugins/dashboard_embeddable_container/public/tests/dashboard_container.test.tsx
new file mode 100644
index 00000000000000..6a3b69af60d6b3
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/tests/dashboard_container.test.tsx
@@ -0,0 +1,127 @@
+/*
+ * 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.
+ */
+
+// @ts-ignore
+import { findTestSubject } from '@elastic/eui/lib/test';
+import React from 'react';
+import { mount } from 'enzyme';
+import { nextTick } from 'test_utils/enzyme_helpers';
+import { I18nProvider } from '@kbn/i18n/react';
+import { ViewMode, CONTEXT_MENU_TRIGGER, EmbeddablePanel } from '../embeddable_plugin';
+import { DashboardContainer, DashboardContainerOptions } from '../embeddable/dashboard_container';
+import { getSampleDashboardInput } from '../test_helpers';
+import {
+  CONTACT_CARD_EMBEDDABLE,
+  ContactCardEmbeddableFactory,
+  ContactCardEmbeddableInput,
+  ContactCardEmbeddable,
+  ContactCardEmbeddableOutput,
+  createEditModeAction,
+} from '../embeddable_plugin_test_samples';
+// eslint-disable-next-line
+import { embeddablePluginMock } from '../../../embeddable/public/mocks';
+// eslint-disable-next-line
+import { inspectorPluginMock } from '../../../inspector/public/mocks';
+import { KibanaContextProvider } from '../../../kibana_react/public';
+// eslint-disable-next-line
+import { uiActionsPluginMock } from '../../../ui_actions/public/mocks';
+
+test('DashboardContainer in edit mode shows edit mode actions', async () => {
+  const inspector = inspectorPluginMock.createStartContract();
+  const { setup, doStart } = embeddablePluginMock.createInstance();
+  const uiActionsSetup = uiActionsPluginMock.createSetupContract();
+
+  const editModeAction = createEditModeAction();
+  uiActionsSetup.registerAction(editModeAction);
+  uiActionsSetup.attachAction(CONTEXT_MENU_TRIGGER, editModeAction.id);
+  setup.registerEmbeddableFactory(
+    CONTACT_CARD_EMBEDDABLE,
+    new ContactCardEmbeddableFactory({} as any, (() => null) as any, {} as any)
+  );
+
+  const start = doStart();
+
+  const initialInput = getSampleDashboardInput({ viewMode: ViewMode.VIEW });
+  const options: DashboardContainerOptions = {
+    application: {} as any,
+    embeddable: start,
+    notifications: {} as any,
+    overlays: {} as any,
+    inspector: {} as any,
+    SavedObjectFinder: () => null,
+    ExitFullScreenButton: () => null,
+    uiActions: {} as any,
+  };
+  const container = new DashboardContainer(initialInput, options);
+
+  const embeddable = await container.addNewEmbeddable<
+    ContactCardEmbeddableInput,
+    ContactCardEmbeddableOutput,
+    ContactCardEmbeddable
+  >(CONTACT_CARD_EMBEDDABLE, {
+    firstName: 'Bob',
+  });
+
+  const component = mount(
+    <I18nProvider>
+      <KibanaContextProvider services={options}>
+        <EmbeddablePanel
+          embeddable={embeddable}
+          getActions={() => Promise.resolve([])}
+          getAllEmbeddableFactories={(() => []) as any}
+          getEmbeddableFactory={(() => null) as any}
+          notifications={{} as any}
+          overlays={{} as any}
+          inspector={inspector}
+          SavedObjectFinder={() => null}
+        />
+      </KibanaContextProvider>
+    </I18nProvider>
+  );
+
+  const button = findTestSubject(component, 'embeddablePanelToggleMenuIcon');
+
+  expect(button.length).toBe(1);
+  findTestSubject(component, 'embeddablePanelToggleMenuIcon').simulate('click');
+
+  expect(findTestSubject(component, `embeddablePanelContextMenuOpen`).length).toBe(1);
+
+  const editAction = findTestSubject(component, `embeddablePanelAction-${editModeAction.id}`);
+
+  expect(editAction.length).toBe(0);
+
+  container.updateInput({ viewMode: ViewMode.EDIT });
+  await nextTick();
+  component.update();
+  findTestSubject(component, 'embeddablePanelToggleMenuIcon').simulate('click');
+  await nextTick();
+  component.update();
+  expect(findTestSubject(component, 'embeddablePanelContextMenuOpen').length).toBe(0);
+  findTestSubject(component, 'embeddablePanelToggleMenuIcon').simulate('click');
+  await nextTick();
+  component.update();
+  expect(findTestSubject(component, 'embeddablePanelContextMenuOpen').length).toBe(1);
+
+  await nextTick();
+  component.update();
+
+  // TODO: Address this.
+  // const action = findTestSubject(component, `embeddablePanelAction-${editModeAction.id}`);
+  // expect(action.length).toBe(1);
+});
diff --git a/src/plugins/dashboard_embeddable_container/public/types.ts b/src/plugins/dashboard_embeddable_container/public/types.ts
new file mode 100644
index 00000000000000..9c2d6c0ab388de
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/types.ts
@@ -0,0 +1,76 @@
+/*
+ * 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 { IconType } from '@elastic/eui';
+import { SavedObject as SavedObjectType, SavedObjectAttributes } from '../../../core/public';
+
+export interface DashboardCapabilities {
+  showWriteControls: boolean;
+  createNew: boolean;
+}
+
+// TODO: Replace Saved object interfaces by the ones Core will provide when it is ready.
+export type SavedObjectAttribute =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | SavedObjectAttributes
+  | SavedObjectAttributes[];
+
+export interface SimpleSavedObject<T extends SavedObjectAttributes> {
+  attributes: T;
+  _version?: SavedObjectType<T>['version'];
+  id: SavedObjectType<T>['id'];
+  type: SavedObjectType<T>['type'];
+  migrationVersion: SavedObjectType<T>['migrationVersion'];
+  error: SavedObjectType<T>['error'];
+  references: SavedObjectType<T>['references'];
+  get(key: string): any;
+  set(key: string, value: any): T;
+  has(key: string): boolean;
+  save(): Promise<SimpleSavedObject<T>>;
+  delete(): void;
+}
+
+export interface SavedObjectMetaData<T extends SavedObjectAttributes> {
+  type: string;
+  name: string;
+  getIconForSavedObject(savedObject: SimpleSavedObject<T>): IconType;
+  getTooltipForSavedObject?(savedObject: SimpleSavedObject<T>): string;
+  showSavedObject?(savedObject: SimpleSavedObject<T>): boolean;
+}
+
+interface FieldSubType {
+  multi?: { parent: string };
+  nested?: { path: string };
+}
+
+export interface Field {
+  name: string;
+  type: string;
+  // esTypes might be undefined on old index patterns that have not been refreshed since we added
+  // this prop. It is also undefined on scripted fields.
+  esTypes?: string[];
+  aggregatable: boolean;
+  filterable: boolean;
+  searchable: boolean;
+  subType?: FieldSubType;
+}
diff --git a/src/plugins/dashboard_embeddable_container/public/ui_actions_plugin.ts b/src/plugins/dashboard_embeddable_container/public/ui_actions_plugin.ts
new file mode 100644
index 00000000000000..c8778025e77132
--- /dev/null
+++ b/src/plugins/dashboard_embeddable_container/public/ui_actions_plugin.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from '../../../plugins/ui_actions/public';
diff --git a/src/plugins/data/common/es_query/__tests__/fields_mock.ts b/src/plugins/data/common/es_query/__tests__/fields_mock.ts
new file mode 100644
index 00000000000000..83fdf588af00c8
--- /dev/null
+++ b/src/plugins/data/common/es_query/__tests__/fields_mock.ts
@@ -0,0 +1,320 @@
+/*
+ * 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 fields = [
+  {
+    name: 'bytes',
+    type: 'number',
+    esTypes: ['long'],
+    count: 10,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'ssl',
+    type: 'boolean',
+    esTypes: ['boolean'],
+    count: 20,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: '@timestamp',
+    type: 'date',
+    esTypes: ['date'],
+    count: 30,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'time',
+    type: 'date',
+    esTypes: ['date'],
+    count: 30,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: '@tags',
+    type: 'string',
+    esTypes: ['keyword'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'utc_time',
+    type: 'date',
+    esTypes: ['date'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'phpmemory',
+    type: 'number',
+    esTypes: ['integer'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'ip',
+    type: 'ip',
+    esTypes: ['ip'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'request_body',
+    type: 'attachment',
+    esTypes: ['attachment'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'point',
+    type: 'geo_point',
+    esTypes: ['geo_point'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'area',
+    type: 'geo_shape',
+    esTypes: ['geo_shape'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'hashed',
+    type: 'murmur3',
+    esTypes: ['murmur3'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: false,
+    readFromDocValues: false,
+  },
+  {
+    name: 'geo.coordinates',
+    type: 'geo_point',
+    esTypes: ['geo_point'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'extension',
+    type: 'string',
+    esTypes: ['keyword'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'machine.os',
+    type: 'string',
+    esTypes: ['text'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: false,
+  },
+  {
+    name: 'machine.os.raw',
+    type: 'string',
+    esTypes: ['keyword'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+    subType: { multi: { parent: 'machine.os' } },
+  },
+  {
+    name: 'geo.src',
+    type: 'string',
+    esTypes: ['keyword'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: '_id',
+    type: 'string',
+    esTypes: ['_id'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: false,
+  },
+  {
+    name: '_type',
+    type: 'string',
+    esTypes: ['_type'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: false,
+  },
+  {
+    name: '_source',
+    type: '_source',
+    esTypes: ['_source'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: false,
+  },
+  {
+    name: 'non-filterable',
+    type: 'string',
+    esTypes: ['text'],
+    count: 0,
+    scripted: false,
+    searchable: false,
+    aggregatable: true,
+    readFromDocValues: false,
+  },
+  {
+    name: 'non-sortable',
+    type: 'string',
+    esTypes: ['text'],
+    count: 0,
+    scripted: false,
+    searchable: false,
+    aggregatable: false,
+    readFromDocValues: false,
+  },
+  {
+    name: 'custom_user_field',
+    type: 'conflict',
+    esTypes: ['long', 'text'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true,
+  },
+  {
+    name: 'script string',
+    type: 'string',
+    count: 0,
+    scripted: true,
+    script: "'i am a string'",
+    lang: 'expression',
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: false,
+  },
+  {
+    name: 'script number',
+    type: 'number',
+    count: 0,
+    scripted: true,
+    script: '1234',
+    lang: 'expression',
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: false,
+  },
+  {
+    name: 'script date',
+    type: 'date',
+    count: 0,
+    scripted: true,
+    script: '1234',
+    lang: 'painless',
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: false,
+  },
+  {
+    name: 'script murmur3',
+    type: 'murmur3',
+    count: 0,
+    scripted: true,
+    script: '1234',
+    lang: 'expression',
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: false,
+  },
+  {
+    name: 'nestedField.child',
+    type: 'string',
+    esTypes: ['text'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: false,
+    readFromDocValues: false,
+    subType: { nested: { path: 'nestedField' } },
+  },
+  {
+    name: 'nestedField.nestedChild.doublyNestedChild',
+    type: 'string',
+    esTypes: ['text'],
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: false,
+    readFromDocValues: false,
+    subType: { nested: { path: 'nestedField.nestedChild' } },
+  },
+];
+
+export const getField = (name: string) => fields.find(field => field.name === name);
diff --git a/packages/kbn-es-query/src/filters/lib/custom_filter.ts b/src/plugins/data/common/es_query/filters/custom_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/custom_filter.ts
rename to src/plugins/data/common/es_query/filters/custom_filter.ts
diff --git a/packages/kbn-es-query/src/filters/lib/exists_filter.ts b/src/plugins/data/common/es_query/filters/exists_filter.ts
similarity index 81%
rename from packages/kbn-es-query/src/filters/lib/exists_filter.ts
rename to src/plugins/data/common/es_query/filters/exists_filter.ts
index 5843c25c43cffd..9125048e5f6cd0 100644
--- a/packages/kbn-es-query/src/filters/lib/exists_filter.ts
+++ b/src/plugins/data/common/es_query/filters/exists_filter.ts
@@ -18,6 +18,7 @@
  */
 
 import { Filter, FilterMeta } from './meta_filter';
+import { IndexPattern, Field } from './types';
 
 export type ExistsFilterMeta = FilterMeta;
 
@@ -31,3 +32,14 @@ export type ExistsFilter = Filter & {
 };
 
 export const isExistsFilter = (filter: any): filter is ExistsFilter => filter && filter.exists;
+
+export const buildExistsFilter = (field: Field, indexPattern: IndexPattern) => {
+  return {
+    meta: {
+      index: indexPattern.id,
+    },
+    exists: {
+      field: field.name,
+    },
+  } as ExistsFilter;
+};
diff --git a/packages/kbn-es-query/src/filters/lib/geo_bounding_box_filter.ts b/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/geo_bounding_box_filter.ts
rename to src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts
diff --git a/packages/kbn-es-query/src/filters/lib/geo_polygon_filter.ts b/src/plugins/data/common/es_query/filters/geo_polygon_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/geo_polygon_filter.ts
rename to src/plugins/data/common/es_query/filters/geo_polygon_filter.ts
diff --git a/src/plugins/data/common/es_query/filters/index.ts b/src/plugins/data/common/es_query/filters/index.ts
new file mode 100644
index 00000000000000..e28ce9ba74975c
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/index.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './custom_filter';
+export * from './exists_filter';
+export * from './geo_bounding_box_filter';
+export * from './geo_polygon_filter';
+export * from './match_all_filter';
+export * from './meta_filter';
+export * from './missing_filter';
+export * from './phrase_filter';
+export * from './phrases_filter';
+export * from './query_string_filter';
+export * from './range_filter';
+
+export * from './types';
diff --git a/packages/kbn-es-query/src/filters/lib/match_all_filter.ts b/src/plugins/data/common/es_query/filters/match_all_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/match_all_filter.ts
rename to src/plugins/data/common/es_query/filters/match_all_filter.ts
diff --git a/packages/kbn-es-query/src/filters/lib/meta_filter.ts b/src/plugins/data/common/es_query/filters/meta_filter.ts
similarity index 75%
rename from packages/kbn-es-query/src/filters/lib/meta_filter.ts
rename to src/plugins/data/common/es_query/filters/meta_filter.ts
index 8f6aef782cea24..9adfdc4eedcb33 100644
--- a/packages/kbn-es-query/src/filters/lib/meta_filter.ts
+++ b/src/plugins/data/common/es_query/filters/meta_filter.ts
@@ -55,7 +55,7 @@ export interface LatLon {
   lon: number;
 }
 
-export function buildEmptyFilter(isPinned: boolean, index?: string): Filter {
+export const buildEmptyFilter = (isPinned: boolean, index?: string): Filter => {
   const meta: FilterMeta = {
     disabled: false,
     negate: false,
@@ -65,43 +65,43 @@ export function buildEmptyFilter(isPinned: boolean, index?: string): Filter {
   const $state: FilterState = {
     store: isPinned ? FilterStateStore.GLOBAL_STATE : FilterStateStore.APP_STATE,
   };
+
   return { meta, $state };
-}
+};
 
-export function isFilterPinned(filter: Filter) {
+export const isFilterPinned = (filter: Filter) => {
   return filter.$state && filter.$state.store === FilterStateStore.GLOBAL_STATE;
-}
+};
 
-export function toggleFilterDisabled(filter: Filter) {
+export const toggleFilterDisabled = (filter: Filter) => {
   const disabled = !filter.meta.disabled;
   const meta = { ...filter.meta, disabled };
+
   return { ...filter, meta };
-}
+};
 
-export function toggleFilterNegated(filter: Filter) {
+export const toggleFilterNegated = (filter: Filter) => {
   const negate = !filter.meta.negate;
   const meta = { ...filter.meta, negate };
+
   return { ...filter, meta };
-}
+};
 
-export function toggleFilterPinned(filter: Filter) {
+export const toggleFilterPinned = (filter: Filter) => {
   const store = isFilterPinned(filter) ? FilterStateStore.APP_STATE : FilterStateStore.GLOBAL_STATE;
   const $state = { ...filter.$state, store };
+
   return { ...filter, $state };
-}
+};
 
-export function enableFilter(filter: Filter) {
-  return !filter.meta.disabled ? filter : toggleFilterDisabled(filter);
-}
+export const enableFilter = (filter: Filter) =>
+  !filter.meta.disabled ? filter : toggleFilterDisabled(filter);
 
-export function disableFilter(filter: Filter) {
-  return filter.meta.disabled ? filter : toggleFilterDisabled(filter);
-}
+export const disableFilter = (filter: Filter) =>
+  filter.meta.disabled ? filter : toggleFilterDisabled(filter);
 
-export function pinFilter(filter: Filter) {
-  return isFilterPinned(filter) ? filter : toggleFilterPinned(filter);
-}
+export const pinFilter = (filter: Filter) =>
+  isFilterPinned(filter) ? filter : toggleFilterPinned(filter);
 
-export function unpinFilter(filter: Filter) {
-  return !isFilterPinned(filter) ? filter : toggleFilterPinned(filter);
-}
+export const unpinFilter = (filter: Filter) =>
+  !isFilterPinned(filter) ? filter : toggleFilterPinned(filter);
diff --git a/packages/kbn-es-query/src/filters/lib/missing_filter.ts b/src/plugins/data/common/es_query/filters/missing_filter.ts
similarity index 100%
rename from packages/kbn-es-query/src/filters/lib/missing_filter.ts
rename to src/plugins/data/common/es_query/filters/missing_filter.ts
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.test.ts b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
new file mode 100644
index 00000000000000..ec13e28c583d18
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
@@ -0,0 +1,97 @@
+/*
+ * 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 { buildInlineScriptForPhraseFilter, buildPhraseFilter } from './phrase_filter';
+import { IndexPattern } from './types';
+import { getField } from '../__tests__/fields_mock';
+
+describe('Phrase filter builder', () => {
+  let indexPattern: IndexPattern;
+
+  beforeEach(() => {
+    indexPattern = {
+      id: 'id',
+    };
+  });
+
+  it('should be a function', () => {
+    expect(typeof buildPhraseFilter).toBe('function');
+  });
+
+  it('should return a match query filter when passed a standard field', () => {
+    const field = getField('bytes');
+
+    expect(buildPhraseFilter(field, 5, indexPattern)).toEqual({
+      meta: {
+        index: 'id',
+      },
+      query: {
+        match_phrase: {
+          bytes: 5,
+        },
+      },
+    });
+  });
+
+  it('should return a script filter when passed a scripted field', () => {
+    const field = getField('script number');
+
+    expect(buildPhraseFilter(field, 5, indexPattern)).toEqual({
+      meta: {
+        index: 'id',
+        field: 'script number',
+      },
+      script: {
+        script: {
+          lang: 'expression',
+          params: {
+            value: 5,
+          },
+          source: '(1234) == value',
+        },
+      },
+    });
+  });
+});
+
+describe('buildInlineScriptForPhraseFilter', () => {
+  it('should wrap painless scripts in a lambda', () => {
+    const field = {
+      lang: 'painless',
+      script: 'return foo;',
+    };
+
+    const expected =
+      `boolean compare(Supplier s, def v) {return s.get() == v;}` +
+      `compare(() -> { return foo; }, params.value);`;
+
+    expect(buildInlineScriptForPhraseFilter(field)).toBe(expected);
+  });
+
+  it('should create a simple comparison for other langs', () => {
+    const field = {
+      lang: 'expression',
+      script: 'doc[bytes].value',
+    };
+
+    const expected = `(doc[bytes].value) == value`;
+
+    expect(buildInlineScriptForPhraseFilter(field)).toBe(expected);
+  });
+});
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.ts b/src/plugins/data/common/es_query/filters/phrase_filter.ts
new file mode 100644
index 00000000000000..15c5c9d4ad2e6d
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.ts
@@ -0,0 +1,144 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { get, isPlainObject } from 'lodash';
+import { Filter, FilterMeta } from './meta_filter';
+import { IndexPattern, Field } from './types';
+
+export type PhraseFilterMeta = FilterMeta & {
+  params?: {
+    query: string; // The unformatted value
+  };
+  script?: {
+    script: {
+      source?: any;
+      lang?: string;
+      params: any;
+    };
+  };
+  field?: any;
+  index?: any;
+};
+
+export type PhraseFilter = Filter & {
+  meta: PhraseFilterMeta;
+};
+
+type PhraseFilterValue = string | number | boolean;
+
+export const isPhraseFilter = (filter: any): filter is PhraseFilter => {
+  const isMatchPhraseQuery = filter && filter.query && filter.query.match_phrase;
+
+  const isDeprecatedMatchPhraseQuery =
+    filter &&
+    filter.query &&
+    filter.query.match &&
+    Object.values(filter.query.match).find((params: any) => params.type === 'phrase');
+
+  return !!(isMatchPhraseQuery || isDeprecatedMatchPhraseQuery);
+};
+
+export const isScriptedPhraseFilter = (filter: any): filter is PhraseFilter =>
+  Boolean(get(filter, 'script.script.params.value'));
+
+export const getPhraseFilterField = (filter: PhraseFilter) => {
+  const queryConfig = filter.query.match_phrase || filter.query.match;
+  return Object.keys(queryConfig)[0];
+};
+
+export const getPhraseFilterValue = (filter: PhraseFilter): PhraseFilterValue => {
+  const queryConfig = filter.query.match_phrase || filter.query.match;
+  const queryValue = Object.values(queryConfig)[0] as any;
+  return isPlainObject(queryValue) ? queryValue.query : queryValue;
+};
+
+export const buildPhraseFilter = (
+  field: Field,
+  value: any,
+  indexPattern: IndexPattern
+): PhraseFilter => {
+  const convertedValue = getConvertedValueForField(field, value);
+
+  if (field.scripted) {
+    return {
+      meta: { index: indexPattern.id, field: field.name } as PhraseFilterMeta,
+      script: getPhraseScript(field, value),
+    } as PhraseFilter;
+  } else {
+    return {
+      meta: { index: indexPattern.id },
+      query: {
+        match_phrase: {
+          [field.name]: convertedValue,
+        },
+      },
+    } as PhraseFilter;
+  }
+};
+
+export const getPhraseScript = (field: Field, value: string) => {
+  const convertedValue = getConvertedValueForField(field, value);
+  const script = buildInlineScriptForPhraseFilter(field);
+
+  return {
+    script: {
+      source: script,
+      lang: field.lang,
+      params: {
+        value: convertedValue,
+      },
+    },
+  };
+};
+
+// See https://github.com/elastic/elasticsearch/issues/20941 and https://github.com/elastic/kibana/issues/8677
+// and https://github.com/elastic/elasticsearch/pull/22201
+// for the reason behind this change. Aggs now return boolean buckets with a key of 1 or 0.
+export const getConvertedValueForField = (field: Field, value: any) => {
+  if (typeof value !== 'boolean' && field.type === 'boolean') {
+    if ([1, 'true'].includes(value)) {
+      return true;
+    } else if ([0, 'false'].includes(value)) {
+      return false;
+    } else {
+      throw new Error(`${value} is not a valid boolean value for boolean field ${field.name}`);
+    }
+  }
+  return value;
+};
+
+/**
+ * Takes a scripted field and returns an inline script appropriate for use in a script query.
+ * Handles lucene expression and Painless scripts. Other langs aren't guaranteed to generate valid
+ * scripts.
+ *
+ * @param {object} scriptedField A Field object representing a scripted field
+ * @returns {string} The inline script string
+ */
+export const buildInlineScriptForPhraseFilter = (scriptedField: any) => {
+  // We must wrap painless scripts in a lambda in case they're more than a simple expression
+  if (scriptedField.lang === 'painless') {
+    return (
+      `boolean compare(Supplier s, def v) {return s.get() == v;}` +
+      `compare(() -> { ${scriptedField.script} }, params.value);`
+    );
+  } else {
+    return `(${scriptedField.script}) == value`;
+  }
+};
diff --git a/src/plugins/data/common/es_query/filters/phrases_filter.ts b/src/plugins/data/common/es_query/filters/phrases_filter.ts
new file mode 100644
index 00000000000000..e4606695c0f6a5
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/phrases_filter.ts
@@ -0,0 +1,70 @@
+/*
+ * 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 { Filter, FilterMeta } from './meta_filter';
+import { Field, IndexPattern } from './types';
+import { getPhraseScript } from './phrase_filter';
+
+export type PhrasesFilterMeta = FilterMeta & {
+  params: string[]; // The unformatted values
+  field?: string;
+};
+
+export type PhrasesFilter = Filter & {
+  meta: PhrasesFilterMeta;
+};
+
+export const isPhrasesFilter = (filter: any): filter is PhrasesFilter =>
+  filter && filter.meta.type === 'phrases';
+
+// Creates a filter where the given field matches one or more of the given values
+// params should be an array of values
+export const buildPhrasesFilter = (field: Field, params: any, indexPattern: IndexPattern) => {
+  const index = indexPattern.id;
+  const type = 'phrases';
+  const key = field.name;
+
+  const format = (f: Field, value: any) =>
+    f && f.format && f.format.convert ? f.format.convert(value) : value;
+
+  const value = params.map((v: any) => format(field, v)).join(', ');
+
+  let should;
+  if (field.scripted) {
+    should = params.map((v: any) => ({
+      script: getPhraseScript(field, v),
+    }));
+  } else {
+    should = params.map((v: any) => ({
+      match_phrase: {
+        [field.name]: v,
+      },
+    }));
+  }
+
+  return {
+    meta: { index, type, key, value, params },
+    query: {
+      bool: {
+        should,
+        minimum_should_match: 1,
+      },
+    },
+  } as PhrasesFilter;
+};
diff --git a/src/plugins/data/common/es_query/filters/query_string_filter.test.ts b/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
new file mode 100644
index 00000000000000..839e4f6359257e
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
@@ -0,0 +1,47 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { buildQueryFilter } from './query_string_filter';
+import { IndexPattern } from './types';
+
+describe('Phrase filter builder', () => {
+  let indexPattern: IndexPattern;
+
+  beforeEach(() => {
+    indexPattern = {
+      id: 'id',
+    };
+  });
+
+  it('should be a function', () => {
+    expect(typeof buildQueryFilter).toBe('function');
+  });
+
+  it('should return a query filter when passed a standard field', () => {
+    expect(buildQueryFilter({ foo: 'bar' }, indexPattern.id, '')).toEqual({
+      meta: {
+        alias: '',
+        index: 'id',
+      },
+      query: {
+        foo: 'bar',
+      },
+    });
+  });
+});
diff --git a/packages/kbn-es-query/src/filters/lib/query_string_filter.ts b/src/plugins/data/common/es_query/filters/query_string_filter.ts
similarity index 78%
rename from packages/kbn-es-query/src/filters/lib/query_string_filter.ts
rename to src/plugins/data/common/es_query/filters/query_string_filter.ts
index 3b3b97fafba9bc..901dc724aa4e49 100644
--- a/packages/kbn-es-query/src/filters/lib/query_string_filter.ts
+++ b/src/plugins/data/common/es_query/filters/query_string_filter.ts
@@ -18,6 +18,7 @@
  */
 
 import { Filter, FilterMeta } from './meta_filter';
+import { IndexPattern } from './types';
 
 export type QueryStringFilterMeta = FilterMeta;
 
@@ -32,3 +33,17 @@ export type QueryStringFilter = Filter & {
 
 export const isQueryStringFilter = (filter: any): filter is QueryStringFilter =>
   filter && filter.query && filter.query.query_string;
+
+// Creates a filter corresponding to a raw Elasticsearch query DSL object
+export const buildQueryFilter = (
+  query: QueryStringFilter['query'],
+  index: IndexPattern,
+  alias: string
+) =>
+  ({
+    query,
+    meta: {
+      index,
+      alias,
+    },
+  } as QueryStringFilter);
diff --git a/src/plugins/data/common/es_query/filters/range_filter.test.ts b/src/plugins/data/common/es_query/filters/range_filter.test.ts
new file mode 100644
index 00000000000000..9008dc2a672944
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/range_filter.test.ts
@@ -0,0 +1,174 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { each } from 'lodash';
+import { buildRangeFilter, RangeFilter } from './range_filter';
+import { IndexPattern, Field } from './types';
+import { getField } from '../__tests__/fields_mock';
+
+describe('Range filter builder', () => {
+  let indexPattern: IndexPattern;
+
+  beforeEach(() => {
+    indexPattern = {
+      id: 'id',
+    };
+  });
+
+  it('should be a function', () => {
+    expect(typeof buildRangeFilter).toBe('function');
+  });
+
+  it('should return a range filter when passed a standard field', () => {
+    const field = getField('bytes');
+
+    expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).toEqual({
+      meta: {
+        index: 'id',
+        params: {},
+      },
+      range: {
+        bytes: {
+          gte: 1,
+          lte: 3,
+        },
+      },
+    });
+  });
+
+  it('should return a script filter when passed a scripted field', () => {
+    const field = getField('script number');
+
+    expect(buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern)).toEqual({
+      meta: {
+        field: 'script number',
+        index: 'id',
+        params: {},
+      },
+      script: {
+        script: {
+          lang: 'expression',
+          source: '(' + field!.script + ')>=gte && (' + field!.script + ')<=lte',
+          params: {
+            value: '>=1 <=3',
+            gte: 1,
+            lte: 3,
+          },
+        },
+      },
+    });
+  });
+
+  it('should wrap painless scripts in comparator lambdas', () => {
+    const field = getField('script date');
+    const expected =
+      `boolean gte(Supplier s, def v) {return !s.get().toInstant().isBefore(Instant.parse(v))} ` +
+      `boolean lte(Supplier s, def v) {return !s.get().toInstant().isAfter(Instant.parse(v))}` +
+      `gte(() -> { ${field!.script} }, params.gte) && ` +
+      `lte(() -> { ${field!.script} }, params.lte)`;
+
+    const rangeFilter = buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern);
+
+    expect(rangeFilter.script!.script.source).toBe(expected);
+  });
+
+  it('should throw an error when gte and gt, or lte and lt are both passed', () => {
+    const field = getField('script number');
+
+    expect(() => {
+      buildRangeFilter(field, { gte: 1, gt: 3 }, indexPattern);
+    }).toThrowError();
+
+    expect(() => {
+      buildRangeFilter(field, { lte: 1, lt: 3 }, indexPattern);
+    }).toThrowError();
+  });
+
+  it('to use the right operator for each of gte, gt, lt and lte', () => {
+    const field = getField('script number');
+
+    each({ gte: '>=', gt: '>', lte: '<=', lt: '<' }, (operator: string, key: any) => {
+      const params = {
+        [key]: 5,
+      };
+
+      const filter = buildRangeFilter(field, params, indexPattern);
+      const script = filter.script!.script;
+
+      expect(script.source).toBe('(' + field!.script + ')' + operator + key);
+      expect(script.params[key]).toBe(5);
+      expect(script.params.value).toBe(operator + 5);
+    });
+  });
+
+  describe('when given params where one side is infinite', () => {
+    let field: Field;
+    let filter: RangeFilter;
+
+    beforeEach(() => {
+      field = getField('script number');
+      filter = buildRangeFilter(field, { gte: 0, lt: Infinity }, indexPattern);
+    });
+
+    describe('returned filter', () => {
+      it('is a script filter', () => {
+        expect(filter).toHaveProperty('script');
+      });
+
+      it('contain a param for the finite side', () => {
+        expect(filter.script!.script.params).toHaveProperty('gte', 0);
+      });
+
+      it('does not contain a param for the infinite side', () => {
+        expect(filter.script!.script.params).not.toHaveProperty('lt');
+      });
+
+      it('does not contain a script condition for the infinite side', () => {
+        const script = field!.script;
+
+        expect(filter.script!.script.source).toEqual(`(${script})>=gte`);
+      });
+    });
+  });
+
+  describe('when given params where both sides are infinite', () => {
+    let field: Field;
+    let filter: RangeFilter;
+
+    beforeEach(() => {
+      field = getField('script number');
+      filter = buildRangeFilter(field, { gte: -Infinity, lt: Infinity }, indexPattern);
+    });
+
+    describe('returned filter', () => {
+      it('is a match_all filter', () => {
+        expect(filter).not.toHaveProperty('script');
+        expect(filter).toHaveProperty('match_all');
+      });
+
+      it('does not contain params', () => {
+        expect(filter).not.toHaveProperty('params');
+      });
+
+      it('meta field is set to field name', () => {
+        expect(filter.meta.field).toEqual('script number');
+      });
+    });
+  });
+});
diff --git a/src/plugins/data/common/es_query/filters/range_filter.ts b/src/plugins/data/common/es_query/filters/range_filter.ts
new file mode 100644
index 00000000000000..d7931f191e52b1
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/range_filter.ts
@@ -0,0 +1,173 @@
+/*
+ * 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 { map, reduce, mapValues, get, keys, pick } from 'lodash';
+import { Filter, FilterMeta } from './meta_filter';
+import { Field, IndexPattern } from './types';
+
+const OPERANDS_IN_RANGE = 2;
+
+const operators = {
+  gt: '>',
+  gte: '>=',
+  lte: '<=',
+  lt: '<',
+};
+const comparators = {
+  gt: 'boolean gt(Supplier s, def v) {return s.get() > v}',
+  gte: 'boolean gte(Supplier s, def v) {return s.get() >= v}',
+  lte: 'boolean lte(Supplier s, def v) {return s.get() <= v}',
+  lt: 'boolean lt(Supplier s, def v) {return s.get() < v}',
+};
+
+const dateComparators = {
+  gt: 'boolean gt(Supplier s, def v) {return s.get().toInstant().isAfter(Instant.parse(v))}',
+  gte: 'boolean gte(Supplier s, def v) {return !s.get().toInstant().isBefore(Instant.parse(v))}',
+  lte: 'boolean lte(Supplier s, def v) {return !s.get().toInstant().isAfter(Instant.parse(v))}',
+  lt: 'boolean lt(Supplier s, def v) {return s.get().toInstant().isBefore(Instant.parse(v))}',
+};
+
+export interface RangeFilterParams {
+  from?: number | string;
+  to?: number | string;
+  gt?: number | string;
+  lt?: number | string;
+  gte?: number | string;
+  lte?: number | string;
+  format?: string;
+}
+
+const hasRangeKeys = (params: RangeFilterParams) =>
+  Boolean(
+    keys(params).find((key: string) => ['gte', 'gt', 'lte', 'lt', 'from', 'to'].includes(key))
+  );
+
+export type RangeFilterMeta = FilterMeta & {
+  params: RangeFilterParams;
+  field?: any;
+  formattedValue?: string;
+};
+
+export type RangeFilter = Filter & {
+  meta: RangeFilterMeta;
+  script?: {
+    script: {
+      params: any;
+      lang: string;
+      source: any;
+    };
+  };
+  match_all?: any;
+  range: { [key: string]: RangeFilterParams };
+};
+
+export const isRangeFilter = (filter: any): filter is RangeFilter => filter && filter.range;
+
+export const isScriptedRangeFilter = (filter: any): filter is RangeFilter => {
+  const params: RangeFilterParams = get(filter, 'script.script.params', {});
+
+  return hasRangeKeys(params);
+};
+
+const formatValue = (field: Field, params: any[]) =>
+  map(params, (val: any, key: string) => get(operators, key) + format(field, val)).join(' ');
+
+const format = (field: Field, value: any) =>
+  field && field.format && field.format.convert ? field.format.convert(value) : value;
+
+// Creates a filter where the value for the given field is in the given range
+// params should be an object containing `lt`, `lte`, `gt`, and/or `gte`
+export const buildRangeFilter = (
+  field: Field,
+  params: RangeFilterParams,
+  indexPattern: IndexPattern,
+  formattedValue?: string
+): RangeFilter => {
+  const filter: any = { meta: { index: indexPattern.id, params: {} } };
+
+  if (formattedValue) {
+    filter.meta.formattedValue = formattedValue;
+  }
+
+  params = mapValues(params, value => (field.type === 'number' ? parseFloat(value) : value));
+
+  if ('gte' in params && 'gt' in params) throw new Error('gte and gt are mutually exclusive');
+  if ('lte' in params && 'lt' in params) throw new Error('lte and lt are mutually exclusive');
+
+  const totalInfinite = ['gt', 'lt'].reduce((acc: number, op: any) => {
+    const key = op in params ? op : `${op}e`;
+    const isInfinite = Math.abs(get(params, key)) === Infinity;
+
+    if (isInfinite) {
+      acc++;
+
+      // @ts-ignore
+      delete params[key];
+    }
+
+    return acc;
+  }, 0);
+
+  if (totalInfinite === OPERANDS_IN_RANGE) {
+    filter.match_all = {};
+    filter.meta.field = field.name;
+  } else if (field.scripted) {
+    filter.script = getRangeScript(field, params);
+    filter.script.script.params.value = formatValue(field, filter.script.script.params);
+
+    filter.meta.field = field.name;
+  } else {
+    filter.range = {};
+    filter.range[field.name] = params;
+  }
+
+  return filter as RangeFilter;
+};
+
+export const getRangeScript = (field: IndexPattern, params: RangeFilterParams) => {
+  const knownParams = pick(params, (val, key: any) => key in operators);
+  let script = map(
+    knownParams,
+    (val: any, key: string) => '(' + field.script + ')' + get(operators, key) + key
+  ).join(' && ');
+
+  // We must wrap painless scripts in a lambda in case they're more than a simple expression
+  if (field.lang === 'painless') {
+    const comp = field.type === 'date' ? dateComparators : comparators;
+    const currentComparators = reduce(
+      knownParams,
+      (acc, val, key) => acc.concat(get(comp, key)),
+      []
+    ).join(' ');
+
+    const comparisons = map(
+      knownParams,
+      (val, key) => `${key}(() -> { ${field.script} }, params.${key})`
+    ).join(' && ');
+
+    script = `${currentComparators}${comparisons}`;
+  }
+
+  return {
+    script: {
+      source: script,
+      params: knownParams,
+      lang: field.lang,
+    },
+  };
+};
diff --git a/src/plugins/data/common/es_query/filters/types.ts b/src/plugins/data/common/es_query/filters/types.ts
new file mode 100644
index 00000000000000..28147350619995
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/types.ts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ExistsFilter } from './exists_filter';
+import { GeoBoundingBoxFilter } from './geo_bounding_box_filter';
+import { GeoPolygonFilter } from './geo_polygon_filter';
+import { PhrasesFilter } from './phrases_filter';
+import { PhraseFilter } from './phrase_filter';
+import { RangeFilter } from './range_filter';
+import { MatchAllFilter } from './match_all_filter';
+import { MissingFilter } from './missing_filter';
+
+// Any filter associated with a field (used in the filter bar/editor)
+export type FieldFilter =
+  | ExistsFilter
+  | GeoBoundingBoxFilter
+  | GeoPolygonFilter
+  | PhraseFilter
+  | PhrasesFilter
+  | RangeFilter
+  | MatchAllFilter
+  | MissingFilter;
+
+export enum FILTERS {
+  CUSTOM = 'custom',
+  PHRASES = 'phrases',
+  PHRASE = 'phrase',
+  EXISTS = 'exists',
+  MATCH_ALL = 'match_all',
+  MISSING = 'missing',
+  QUERY_STRING = 'query_string',
+  RANGE = 'range',
+  GEO_BOUNDING_BOX = 'geo_bounding_box',
+  GEO_POLYGON = 'geo_polygon',
+}
+
+// We can't import the real types from the data plugin, so need to either duplicate
+// them here or figure out another solution, perhaps housing them in this package
+// will be replaces after Fieds / IndexPattern will be moved into new platform
+export type Field = any;
+export type IndexPattern = any;
diff --git a/src/plugins/data/common/es_query/index.ts b/src/plugins/data/common/es_query/index.ts
new file mode 100644
index 00000000000000..88e14a43cfaae2
--- /dev/null
+++ b/src/plugins/data/common/es_query/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import * as esFilters from './filters';
+
+export { esFilters };
diff --git a/src/plugins/data/common/field_formats/converters/url.ts b/src/plugins/data/common/field_formats/converters/url.ts
index 984cced336d2b5..6c00f11a408dc6 100644
--- a/src/plugins/data/common/field_formats/converters/url.ts
+++ b/src/plugins/data/common/field_formats/converters/url.ts
@@ -198,5 +198,3 @@ export class UrlFormat extends FieldFormat {
     }
   };
 }
-
-// console.log(UrlFormat);
diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts
index dca7897bd2766c..42b5a03fcc926a 100644
--- a/src/plugins/data/common/index.ts
+++ b/src/plugins/data/common/index.ts
@@ -20,5 +20,6 @@
 export * from './query';
 export * from './field_formats';
 export * from './kbn_field_types';
+export * from './es_query';
 
 export * from './types';
diff --git a/src/plugins/data/public/autocomplete_provider/types.ts b/src/plugins/data/public/autocomplete_provider/types.ts
index 4b1c5dfbd3528e..1f2d8f914dde3e 100644
--- a/src/plugins/data/public/autocomplete_provider/types.ts
+++ b/src/plugins/data/public/autocomplete_provider/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { StaticIndexPattern } from 'ui/index_patterns';
+import { StaticIndexPattern, Field } from 'ui/index_patterns';
 import { AutocompleteProviderRegister } from '.';
 
 export type AutocompletePublicPluginSetup = Pick<
@@ -50,11 +50,22 @@ export type AutocompleteSuggestionType =
   | 'conjunction'
   | 'recentSearch';
 
+// A union type allows us to do easy type guards in the code. For example, if I want to ensure I'm
+// working with a FieldAutocompleteSuggestion, I can just do `if ('field' in suggestion)` and the
+// TypeScript compiler will narrow the type to the parts of the union that have a field prop.
 /** @public **/
-export interface AutocompleteSuggestion {
+export type AutocompleteSuggestion = BasicAutocompleteSuggestion | FieldAutocompleteSuggestion;
+
+interface BasicAutocompleteSuggestion {
   description?: string;
   end: number;
   start: number;
   text: string;
   type: AutocompleteSuggestionType;
+  cursorIndex?: number;
 }
+
+export type FieldAutocompleteSuggestion = BasicAutocompleteSuggestion & {
+  type: 'field';
+  field: Field;
+};
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 7e1b3801b62a45..32153df69f3678 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -34,3 +34,4 @@ export * from './types';
 
 export { IRequestTypesMap, IResponseTypesMap } from './search';
 export * from './search';
+export * from './query';
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index 5e60ca93378d9a..4aae63c24d7fc7 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -18,6 +18,7 @@
  */
 import { Plugin } from '.';
 import { searchSetupMock } from './search/mocks';
+import { queryServiceMock } from './query/mocks';
 
 export type Setup = jest.Mocked<ReturnType<Plugin['setup']>>;
 export type Start = jest.Mocked<ReturnType<Plugin['start']>>;
@@ -29,19 +30,23 @@ const autocompleteMock: any = {
 };
 
 const createSetupContract = (): Setup => {
-  const setupContract: Setup = {
-    autocomplete: autocompleteMock as Setup['autocomplete'],
+  const querySetupMock = queryServiceMock.createSetupContract();
+  const setupContract = {
+    autocomplete: autocompleteMock,
     search: searchSetupMock,
+    query: querySetupMock,
   };
 
   return setupContract;
 };
 
 const createStartContract = (): Start => {
-  const startContract: Start = {
-    autocomplete: autocompleteMock as Start['autocomplete'],
+  const queryStartMock = queryServiceMock.createStartContract();
+  const startContract = {
+    autocomplete: autocompleteMock,
     getSuggestions: jest.fn(),
     search: { search: jest.fn() },
+    query: queryStartMock,
   };
   return startContract;
 };
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index 935a3c57545036..79db34c022b39f 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -18,23 +18,32 @@
  */
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
-import { AutocompleteProviderRegister } from './autocomplete_provider';
+import { Storage } from '../../kibana_utils/public';
 import { DataPublicPluginSetup, DataPublicPluginStart } from './types';
-import { SearchService } from './search/search_service';
+import { AutocompleteProviderRegister } from './autocomplete_provider';
 import { getSuggestionsProvider } from './suggestions_provider';
+import { SearchService } from './search/search_service';
+import { QueryService } from './query';
 
 export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPublicPluginStart> {
   private readonly autocomplete = new AutocompleteProviderRegister();
   private readonly searchService: SearchService;
+  private readonly queryService: QueryService;
 
   constructor(initializerContext: PluginInitializerContext) {
     this.searchService = new SearchService(initializerContext);
+    this.queryService = new QueryService();
   }
 
   public setup(core: CoreSetup): DataPublicPluginSetup {
+    const storage = new Storage(window.localStorage);
     return {
       autocomplete: this.autocomplete,
       search: this.searchService.setup(core),
+      query: this.queryService.setup({
+        uiSettings: core.uiSettings,
+        storage,
+      }),
     };
   }
 
@@ -43,6 +52,7 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
       autocomplete: this.autocomplete,
       getSuggestions: getSuggestionsProvider(core.uiSettings, core.http),
       search: this.searchService.start(core),
+      query: this.queryService.start(),
     };
   }
 
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
new file mode 100644
index 00000000000000..33f9c4ccd795db
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
@@ -0,0 +1,678 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+import sinon from 'sinon';
+
+import { Subscription } from 'rxjs';
+import { FilterManager } from './filter_manager';
+import { getFilter } from './test_helpers/get_stub_filter';
+import { getFiltersArray } from './test_helpers/get_filters_array';
+import { esFilters } from '../../../common/es_query';
+
+import { coreMock } from '../../../../../core/public/mocks';
+const setupMock = coreMock.createSetup();
+
+setupMock.uiSettings.get.mockImplementation((key: string) => {
+  return true;
+});
+
+describe('filter_manager', () => {
+  let updateSubscription: Subscription | undefined;
+  let fetchSubscription: Subscription | undefined;
+  let updateListener: sinon.SinonSpy<any[], any>;
+
+  let filterManager: FilterManager;
+  let readyFilters: esFilters.Filter[];
+
+  beforeEach(() => {
+    updateListener = sinon.stub();
+    filterManager = new FilterManager(setupMock.uiSettings);
+    readyFilters = getFiltersArray();
+  });
+
+  afterEach(async () => {
+    if (updateSubscription) {
+      updateSubscription.unsubscribe();
+    }
+    if (fetchSubscription) {
+      fetchSubscription.unsubscribe();
+    }
+
+    filterManager.removeAll();
+  });
+
+  describe('observing', () => {
+    test('should return observable', () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      fetchSubscription = filterManager.getUpdates$().subscribe(() => {});
+      expect(updateSubscription).toBeInstanceOf(Subscription);
+      expect(fetchSubscription).toBeInstanceOf(Subscription);
+    });
+  });
+
+  describe('get \\ set filters', () => {
+    test('should be empty', () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+      expect(filterManager.getFilters()).toHaveLength(0);
+
+      const partitionedFiltres = filterManager.getPartitionedFilters();
+      expect(partitionedFiltres.appFilters).toHaveLength(0);
+      expect(partitionedFiltres.globalFilters).toHaveLength(0);
+      expect(updateListener.called).toBeFalsy();
+    });
+
+    test('app state should be set', async () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      filterManager.setFilters([f1]);
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+      expect(filterManager.getFilters()).toHaveLength(1);
+
+      const partitionedFiltres = filterManager.getPartitionedFilters();
+      expect(partitionedFiltres.appFilters).toHaveLength(1);
+      expect(partitionedFiltres.globalFilters).toHaveLength(0);
+      expect(updateListener.called).toBeTruthy();
+    });
+
+    test('global state should be set', async () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      filterManager.setFilters([f1]);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+      expect(filterManager.getFilters()).toHaveLength(1);
+
+      const partitionedFiltres = filterManager.getPartitionedFilters();
+      expect(partitionedFiltres.appFilters).toHaveLength(0);
+      expect(partitionedFiltres.globalFilters).toHaveLength(1);
+      expect(updateListener.called).toBeTruthy();
+    });
+
+    test('both states should be set', async () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+      filterManager.setFilters([f1, f2]);
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+      expect(filterManager.getFilters()).toHaveLength(2);
+
+      const partitionedFiltres = filterManager.getPartitionedFilters();
+      expect(partitionedFiltres.appFilters).toHaveLength(1);
+      expect(partitionedFiltres.globalFilters).toHaveLength(1);
+
+      // listener should be called just once
+      expect(updateListener.called).toBeTruthy();
+      expect(updateListener.callCount).toBe(1);
+    });
+
+    test('set state should override previous state', async () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+
+      filterManager.setFilters([f1]);
+      filterManager.setFilters([f2]);
+
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+      expect(filterManager.getFilters()).toHaveLength(1);
+
+      const partitionedFiltres = filterManager.getPartitionedFilters();
+      expect(partitionedFiltres.appFilters).toHaveLength(1);
+      expect(partitionedFiltres.globalFilters).toHaveLength(0);
+
+      // listener should be called just once
+      expect(updateListener.called).toBeTruthy();
+      expect(updateListener.callCount).toBe(2);
+    });
+
+    test('changing a disabled filter should fire only update event', async function() {
+      const updateStub = jest.fn();
+      const fetchStub = jest.fn();
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, true, false, 'age', 34);
+
+      filterManager.setFilters([f1]);
+
+      filterManager.getUpdates$().subscribe({
+        next: updateStub,
+      });
+
+      filterManager.getFetches$().subscribe({
+        next: fetchStub,
+      });
+
+      const f2 = _.cloneDeep(f1);
+      f2.meta.negate = true;
+      filterManager.setFilters([f2]);
+
+      // this time, events should be emitted
+      expect(fetchStub).toBeCalledTimes(0);
+      expect(updateStub).toBeCalledTimes(1);
+    });
+  });
+
+  describe('add filters', () => {
+    test('app state should accept a single filter', async function() {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      filterManager.addFilters(f1);
+      const appFilters = filterManager.getAppFilters();
+      expect(appFilters).toHaveLength(1);
+      expect(appFilters[0]).toEqual(f1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+      expect(updateListener.callCount).toBe(1);
+    });
+
+    test('app state should accept array and preserve order', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'female');
+
+      filterManager.addFilters([f1]);
+      filterManager.addFilters([f2]);
+      const appFilters = filterManager.getAppFilters();
+      expect(appFilters).toHaveLength(2);
+      expect(appFilters).toEqual([f1, f2]);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+    });
+
+    test('global state should accept a single filer', async () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      filterManager.addFilters(f1);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+      const globalFilters = filterManager.getGlobalFilters();
+      expect(globalFilters).toHaveLength(1);
+      expect(globalFilters[0]).toEqual(f1);
+      expect(updateListener.callCount).toBe(1);
+    });
+
+    test('global state should be accept array and preserve order', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(
+        esFilters.FilterStateStore.GLOBAL_STATE,
+        false,
+        false,
+        'gender',
+        'female'
+      );
+
+      filterManager.addFilters([f1, f2]);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+      const globalFilters = filterManager.getGlobalFilters();
+      expect(globalFilters).toHaveLength(2);
+      expect(globalFilters).toEqual([f1, f2]);
+    });
+
+    test('mixed filters: global filters should stay in the beginning', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'female');
+      filterManager.addFilters([f1, f2]);
+      const filters = filterManager.getFilters();
+      expect(filters).toHaveLength(2);
+      expect(filters).toEqual([f1, f2]);
+    });
+
+    test('mixed filters: global filters should move to the beginning', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      const f2 = getFilter(
+        esFilters.FilterStateStore.GLOBAL_STATE,
+        false,
+        false,
+        'gender',
+        'female'
+      );
+      filterManager.addFilters([f1, f2]);
+      const filters = filterManager.getFilters();
+      expect(filters).toHaveLength(2);
+      expect(filters).toEqual([f2, f1]);
+    });
+
+    test('add multiple filters at once', async () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(
+        esFilters.FilterStateStore.GLOBAL_STATE,
+        false,
+        false,
+        'gender',
+        'female'
+      );
+      filterManager.addFilters([f1, f2]);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+      expect(filterManager.getGlobalFilters()).toHaveLength(2);
+      expect(updateListener.callCount).toBe(1);
+    });
+
+    test('add same filter to global and app', async () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      filterManager.addFilters([f1, f2]);
+
+      // FILTER SHOULD BE ADDED ONLY ONCE, TO GLOBAL
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+      expect(updateListener.callCount).toBe(1);
+    });
+
+    test('add same filter with different values to global and app', async () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      filterManager.addFilters([f1, f2]);
+
+      // FILTER SHOULD BE ADDED TWICE
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+      expect(updateListener.callCount).toBe(1);
+    });
+
+    test('add filter with no state, and force pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+
+      filterManager.addFilters([f1], true);
+
+      // FILTER SHOULD BE GLOBAL
+      const f1Output = filterManager.getFilters()[0];
+      expect(f1Output.$state).toBeDefined();
+      if (f1Output.$state) {
+        expect(f1Output.$state.store).toBe(esFilters.FilterStateStore.GLOBAL_STATE);
+      }
+    });
+
+    test('add filter with no state, and dont force pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+
+      filterManager.addFilters([f1], false);
+
+      // FILTER SHOULD BE APP
+      const f1Output = filterManager.getFilters()[0];
+      expect(f1Output.$state).toBeDefined();
+      if (f1Output.$state) {
+        expect(f1Output.$state.store).toBe(esFilters.FilterStateStore.APP_STATE);
+      }
+    });
+
+    test('should return app and global filters', async function() {
+      const filters = getFiltersArray();
+      filterManager.addFilters(filters[0], false);
+      filterManager.addFilters(filters[1], true);
+
+      // global filters should be listed first
+      let res = filterManager.getFilters();
+      expect(res).toHaveLength(2);
+      expect(res[0].$state && res[0].$state.store).toEqual(esFilters.FilterStateStore.GLOBAL_STATE);
+      expect(res[0].meta.disabled).toEqual(filters[1].meta.disabled);
+      expect(res[0].query).toEqual(filters[1].query);
+
+      expect(res[1].$state && res[1].$state.store).toEqual(esFilters.FilterStateStore.APP_STATE);
+      expect(res[1].meta.disabled).toEqual(filters[0].meta.disabled);
+      expect(res[1].query).toEqual(filters[0].query);
+
+      // should return updated version of filters
+      filterManager.addFilters(filters[2], false);
+
+      res = filterManager.getFilters();
+      expect(res).toHaveLength(3);
+    });
+
+    test('should skip appStateStub filters that match globalStateStub filters', async function() {
+      filterManager.addFilters(readyFilters, true);
+      const appFilter = _.cloneDeep(readyFilters[1]);
+      filterManager.addFilters(appFilter, false);
+
+      // global filters should be listed first
+      const res = filterManager.getFilters();
+      expect(res).toHaveLength(3);
+      _.each(res, function(filter) {
+        expect(filter.$state && filter.$state.store).toBe(esFilters.FilterStateStore.GLOBAL_STATE);
+      });
+    });
+
+    test('should allow overwriting a positive filter by a negated one', async function() {
+      // Add negate: false version of the filter
+      const filter = _.cloneDeep(readyFilters[0]);
+      filter.meta.negate = false;
+
+      filterManager.addFilters(filter);
+      expect(filterManager.getFilters()).toHaveLength(1);
+      expect(filterManager.getFilters()[0]).toEqual(filter);
+
+      // Add negate: true version of the same filter
+      const negatedFilter = _.cloneDeep(readyFilters[0]);
+      negatedFilter.meta.negate = true;
+
+      filterManager.addFilters(negatedFilter);
+      // The negated filter should overwrite the positive one
+      expect(filterManager.getFilters()).toHaveLength(1);
+      expect(filterManager.getFilters()[0]).toEqual(negatedFilter);
+    });
+
+    test('should allow overwriting a negated filter by a positive one', async function() {
+      // Add negate: true version of the same filter
+      const negatedFilter = _.cloneDeep(readyFilters[0]);
+      negatedFilter.meta.negate = true;
+
+      filterManager.addFilters(negatedFilter);
+
+      // The negated filter should overwrite the positive one
+      expect(filterManager.getFilters()).toHaveLength(1);
+      expect(filterManager.getFilters()[0]).toEqual(negatedFilter);
+
+      // Add negate: false version of the filter
+      const filter = _.cloneDeep(readyFilters[0]);
+      filter.meta.negate = false;
+
+      filterManager.addFilters(filter);
+      expect(filterManager.getFilters()).toHaveLength(1);
+      expect(filterManager.getFilters()[0]).toEqual(filter);
+    });
+
+    test('should fire the update and fetch events', async function() {
+      const updateStub = jest.fn();
+      const fetchStub = jest.fn();
+
+      filterManager.getUpdates$().subscribe({
+        next: updateStub,
+      });
+
+      filterManager.getFetches$().subscribe({
+        next: fetchStub,
+      });
+
+      filterManager.addFilters(readyFilters);
+
+      // this time, events should be emitted
+      expect(fetchStub).toBeCalledTimes(1);
+      expect(updateStub).toBeCalledTimes(1);
+    });
+  });
+
+  describe('filter reconciliation', function() {
+    test('should de-dupe app filters being added', async function() {
+      const newFilter = _.cloneDeep(readyFilters[1]);
+      filterManager.addFilters(readyFilters, false);
+      expect(filterManager.getFilters()).toHaveLength(3);
+
+      filterManager.addFilters(newFilter, false);
+      expect(filterManager.getFilters()).toHaveLength(3);
+    });
+
+    test('should de-dupe global filters being added', async function() {
+      const newFilter = _.cloneDeep(readyFilters[1]);
+      filterManager.addFilters(readyFilters, true);
+      expect(filterManager.getFilters()).toHaveLength(3);
+
+      filterManager.addFilters(newFilter, true);
+      expect(filterManager.getFilters()).toHaveLength(3);
+    });
+
+    test('should de-dupe global filters being set', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = _.cloneDeep(f1);
+      filterManager.setFilters([f1, f2]);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+      expect(filterManager.getFilters()).toHaveLength(1);
+    });
+
+    test('should de-dupe app filters being set', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'age', 34);
+      const f2 = _.cloneDeep(f1);
+      filterManager.setFilters([f1, f2]);
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+      expect(filterManager.getFilters()).toHaveLength(1);
+    });
+
+    test('should mutate global filters on appStateStub filter changes', async function() {
+      const idx = 1;
+      filterManager.addFilters(readyFilters, true);
+
+      const appFilter = _.cloneDeep(readyFilters[idx]);
+      appFilter.meta.negate = true;
+      appFilter.$state = {
+        store: esFilters.FilterStateStore.APP_STATE,
+      };
+      filterManager.addFilters(appFilter);
+      const res = filterManager.getFilters();
+      expect(res).toHaveLength(3);
+      _.each(res, function(filter, i) {
+        expect(filter.$state && filter.$state.store).toBe('globalState');
+        // make sure global filter actually mutated
+        expect(filter.meta.negate).toBe(i === idx);
+      });
+    });
+
+    test('should merge conflicting app filters', async function() {
+      filterManager.addFilters(readyFilters, true);
+      const appFilter = _.cloneDeep(readyFilters[1]);
+      appFilter.meta.negate = true;
+      appFilter.$state = {
+        store: esFilters.FilterStateStore.APP_STATE,
+      };
+      filterManager.addFilters(appFilter, false);
+
+      // global filters should be listed first
+      const res = filterManager.getFilters();
+      expect(res).toHaveLength(3);
+      expect(
+        res.filter(function(filter) {
+          return filter.$state && filter.$state.store === esFilters.FilterStateStore.GLOBAL_STATE;
+        }).length
+      ).toBe(3);
+    });
+
+    test('should enable disabled filters - global state', async function() {
+      // test adding to globalStateStub
+      const disabledFilters = _.map(readyFilters, function(filter) {
+        const f = _.cloneDeep(filter);
+        f.meta.disabled = true;
+        return f;
+      });
+      filterManager.addFilters(disabledFilters, true);
+      filterManager.addFilters(readyFilters, true);
+
+      const res = filterManager.getFilters();
+      expect(res).toHaveLength(3);
+      expect(
+        res.filter(function(filter) {
+          return filter.meta.disabled === false;
+        }).length
+      ).toBe(3);
+    });
+
+    test('should enable disabled filters - app state', async function() {
+      // test adding to appStateStub
+      const disabledFilters = _.map(readyFilters, function(filter) {
+        const f = _.cloneDeep(filter);
+        f.meta.disabled = true;
+        return f;
+      });
+      filterManager.addFilters(disabledFilters, true);
+      filterManager.addFilters(readyFilters, false);
+
+      const res = filterManager.getFilters();
+      expect(res).toHaveLength(3);
+      expect(
+        res.filter(function(filter) {
+          return filter.meta.disabled === false;
+        }).length
+      ).toBe(3);
+    });
+  });
+
+  describe('remove filters', () => {
+    test('remove on empty should do nothing and not fire events', async () => {
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      filterManager.removeAll();
+      expect(updateListener.called).toBeFalsy();
+      expect(filterManager.getFilters()).toHaveLength(0);
+    });
+
+    test('remove on full should clean and fire events', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+      filterManager.setFilters([f1, f2]);
+
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      filterManager.removeAll();
+      expect(updateListener.called).toBeTruthy();
+      expect(filterManager.getFilters()).toHaveLength(0);
+    });
+
+    test('remove non existing filter should do nothing and not fire events', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+      const f3 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'country', 'US');
+      filterManager.setFilters([f1, f2]);
+      expect(filterManager.getFilters()).toHaveLength(2);
+
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      await filterManager.removeFilter(f3);
+      expect(updateListener.called).toBeFalsy();
+      expect(filterManager.getFilters()).toHaveLength(2);
+    });
+
+    test('remove existing filter should remove and fire events', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
+      const f2 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'gender', 'FEMALE');
+      const f3 = getFilter(esFilters.FilterStateStore.APP_STATE, false, false, 'country', 'US');
+      filterManager.setFilters([f1, f2, f3]);
+      expect(filterManager.getFilters()).toHaveLength(3);
+
+      updateSubscription = filterManager.getUpdates$().subscribe(updateListener);
+      await filterManager.removeFilter(f3);
+      expect(updateListener.called).toBeTruthy();
+      expect(filterManager.getFilters()).toHaveLength(2);
+    });
+
+    test('should remove the filter from appStateStub', async function() {
+      filterManager.addFilters(readyFilters, false);
+      expect(filterManager.getAppFilters()).toHaveLength(3);
+      filterManager.removeFilter(readyFilters[0]);
+      expect(filterManager.getAppFilters()).toHaveLength(2);
+    });
+
+    test('should remove the filter from globalStateStub', async function() {
+      filterManager.addFilters(readyFilters, true);
+      expect(filterManager.getGlobalFilters()).toHaveLength(3);
+      filterManager.removeFilter(readyFilters[0]);
+      expect(filterManager.getGlobalFilters()).toHaveLength(2);
+    });
+
+    test('should fire the update and fetch events', async function() {
+      const updateStub = jest.fn();
+      const fetchStub = jest.fn();
+
+      filterManager.addFilters(readyFilters, false);
+
+      filterManager.getUpdates$().subscribe({
+        next: updateStub,
+      });
+
+      filterManager.getFetches$().subscribe({
+        next: fetchStub,
+      });
+
+      filterManager.removeFilter(readyFilters[0]);
+
+      // this time, events should be emitted
+      expect(fetchStub).toBeCalledTimes(1);
+      expect(updateStub).toBeCalledTimes(1);
+    });
+
+    test('should remove matching filters', async function() {
+      filterManager.addFilters([readyFilters[0], readyFilters[1]], true);
+      filterManager.addFilters([readyFilters[2]], false);
+
+      filterManager.removeFilter(readyFilters[0]);
+
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+    });
+
+    test('should remove matching filters by comparison', async function() {
+      filterManager.addFilters([readyFilters[0], readyFilters[1]], true);
+      filterManager.addFilters([readyFilters[2]], false);
+
+      filterManager.removeFilter(_.cloneDeep(readyFilters[0]));
+
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+
+      filterManager.removeFilter(_.cloneDeep(readyFilters[2]));
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+    });
+
+    test('should do nothing with a non-matching filter', async function() {
+      filterManager.addFilters([readyFilters[0], readyFilters[1]], true);
+      filterManager.addFilters([readyFilters[2]], false);
+
+      const missedFilter = _.cloneDeep(readyFilters[0]);
+      missedFilter.meta.negate = !readyFilters[0].meta.negate;
+
+      filterManager.removeFilter(missedFilter);
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(2);
+    });
+
+    test('should remove all the filters from both states', async function() {
+      filterManager.addFilters([readyFilters[0], readyFilters[1]], true);
+      filterManager.addFilters([readyFilters[2]], false);
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+      expect(filterManager.getGlobalFilters()).toHaveLength(2);
+
+      filterManager.removeAll();
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+    });
+  });
+
+  describe('invert', () => {
+    test('should fire the update and fetch events', async function() {
+      filterManager.addFilters(readyFilters);
+      expect(filterManager.getFilters()).toHaveLength(3);
+
+      const updateStub = jest.fn();
+      const fetchStub = jest.fn();
+      filterManager.getUpdates$().subscribe({
+        next: updateStub,
+      });
+
+      filterManager.getFetches$().subscribe({
+        next: fetchStub,
+      });
+
+      readyFilters[1].meta.negate = !readyFilters[1].meta.negate;
+      filterManager.addFilters(readyFilters[1]);
+      expect(filterManager.getFilters()).toHaveLength(3);
+      expect(fetchStub).toBeCalledTimes(1);
+      expect(updateStub).toBeCalledTimes(1);
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts
similarity index 78%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts
rename to src/plugins/data/public/query/filter_manager/filter_manager.ts
index b3d6bd6873f502..06e2b77dca238f 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/filter_manager.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-import { Filter, isFilterPinned, FilterStateStore } from '@kbn/es-query';
-
 import _ from 'lodash';
 import { Subject } from 'rxjs';
 
@@ -28,10 +26,11 @@ import { compareFilters } from './lib/compare_filters';
 import { mapAndFlattenFilters } from './lib/map_and_flatten_filters';
 import { uniqFilters } from './lib/uniq_filters';
 import { onlyDisabledFiltersChanged } from './lib/only_disabled';
-import { PartitionedFilters } from './partitioned_filters';
+import { PartitionedFilters } from './types';
+import { esFilters } from '../../../common/es_query';
 
 export class FilterManager {
-  private filters: Filter[] = [];
+  private filters: esFilters.Filter[] = [];
   private updated$: Subject<void> = new Subject();
   private fetch$: Subject<void> = new Subject();
   private uiSettings: UiSettingsClientContract;
@@ -40,7 +39,7 @@ export class FilterManager {
     this.uiSettings = uiSettings;
   }
 
-  private mergeIncomingFilters(partitionedFilters: PartitionedFilters): Filter[] {
+  private mergeIncomingFilters(partitionedFilters: PartitionedFilters): esFilters.Filter[] {
     const globalFilters = partitionedFilters.globalFilters;
     const appFilters = partitionedFilters.appFilters;
 
@@ -61,25 +60,33 @@ export class FilterManager {
     return FilterManager.mergeFilters(appFilters, globalFilters);
   }
 
-  private static mergeFilters(appFilters: Filter[], globalFilters: Filter[]): Filter[] {
+  private static mergeFilters(
+    appFilters: esFilters.Filter[],
+    globalFilters: esFilters.Filter[]
+  ): esFilters.Filter[] {
     return uniqFilters(appFilters.reverse().concat(globalFilters.reverse())).reverse();
   }
 
-  private static partitionFilters(filters: Filter[]): PartitionedFilters {
-    const [globalFilters, appFilters] = _.partition(filters, isFilterPinned);
+  private static partitionFilters(filters: esFilters.Filter[]): PartitionedFilters {
+    const [globalFilters, appFilters] = _.partition(filters, esFilters.isFilterPinned);
     return {
       globalFilters,
       appFilters,
     };
   }
 
-  private handleStateUpdate(newFilters: Filter[]) {
+  private handleStateUpdate(newFilters: esFilters.Filter[]) {
     // global filters should always be first
-    newFilters.sort(({ $state: a }: Filter, { $state: b }: Filter): number => {
-      return a!.store === FilterStateStore.GLOBAL_STATE &&
-        b!.store !== FilterStateStore.GLOBAL_STATE
-        ? -1
-        : 1;
+
+    newFilters.sort(({ $state: a }: esFilters.Filter, { $state: b }: esFilters.Filter): number => {
+      if (a!.store === b!.store) {
+        return 0;
+      } else {
+        return a!.store === esFilters.FilterStateStore.GLOBAL_STATE &&
+          b!.store !== esFilters.FilterStateStore.GLOBAL_STATE
+          ? -1
+          : 1;
+      }
     });
 
     const filtersUpdated = !_.isEqual(this.filters, newFilters);
@@ -124,7 +131,7 @@ export class FilterManager {
 
   /* Setters */
 
-  public addFilters(filters: Filter[] | Filter, pinFilterStatus?: boolean) {
+  public addFilters(filters: esFilters.Filter[] | esFilters.Filter, pinFilterStatus?: boolean) {
     if (!Array.isArray(filters)) {
       filters = [filters];
     }
@@ -139,7 +146,10 @@ export class FilterManager {
 
     // Set the store of all filters. For now.
     // In the future, all filters should come in with filter state store already set.
-    const store = pinFilterStatus ? FilterStateStore.GLOBAL_STATE : FilterStateStore.APP_STATE;
+    const store = pinFilterStatus
+      ? esFilters.FilterStateStore.GLOBAL_STATE
+      : esFilters.FilterStateStore.APP_STATE;
+
     FilterManager.setFiltersStore(filters, store);
 
     const mappedFilters = mapAndFlattenFilters(filters);
@@ -154,14 +164,14 @@ export class FilterManager {
     this.handleStateUpdate(newFilters);
   }
 
-  public setFilters(newFilters: Filter[]) {
+  public setFilters(newFilters: esFilters.Filter[]) {
     const mappedFilters = mapAndFlattenFilters(newFilters);
     const newPartitionedFilters = FilterManager.partitionFilters(mappedFilters);
     const mergedFilters = this.mergeIncomingFilters(newPartitionedFilters);
     this.handleStateUpdate(mergedFilters);
   }
 
-  public removeFilter(filter: Filter) {
+  public removeFilter(filter: esFilters.Filter) {
     const filterIndex = _.findIndex(this.filters, item => {
       return _.isEqual(item.meta, filter.meta) && _.isEqual(item.query, filter.query);
     });
@@ -177,8 +187,8 @@ export class FilterManager {
     this.setFilters([]);
   }
 
-  public static setFiltersStore(filters: Filter[], store: FilterStateStore) {
-    _.map(filters, (filter: Filter) => {
+  public static setFiltersStore(filters: esFilters.Filter[], store: esFilters.FilterStateStore) {
+    _.map(filters, (filter: esFilters.Filter) => {
       // Override status only for filters that didn't have state in the first place.
       if (filter.$state === undefined) {
         filter.$state = { store };
diff --git a/src/plugins/data/public/query/filter_manager/index.ts b/src/plugins/data/public/query/filter_manager/index.ts
new file mode 100644
index 00000000000000..7955cdd825ee6c
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { FilterManager } from './filter_manager';
+
+export { uniqFilters } from './lib/uniq_filters';
+export { mapAndFlattenFilters } from './lib/map_and_flatten_filters';
+export { onlyDisabledFiltersChanged } from './lib/only_disabled';
diff --git a/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts
new file mode 100644
index 00000000000000..6bde6b528d07bd
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { compareFilters } from './compare_filters';
+import { esFilters } from '../../../../common/es_query';
+
+describe('filter manager utilities', () => {
+  describe('compare filters', () => {
+    test('should compare filters', () => {
+      const f1 = esFilters.buildQueryFilter(
+        { _type: { match: { query: 'apache', type: 'phrase' } } },
+        'index',
+        ''
+      );
+      const f2 = esFilters.buildEmptyFilter(true);
+
+      expect(compareFilters(f1, f2)).toBeFalsy();
+    });
+
+    test('should compare duplicates', () => {
+      const f1 = esFilters.buildQueryFilter(
+        { _type: { match: { query: 'apache', type: 'phrase' } } },
+        'index',
+        ''
+      );
+      const f2 = esFilters.buildQueryFilter(
+        { _type: { match: { query: 'apache', type: 'phrase' } } },
+        'index',
+        ''
+      );
+
+      expect(compareFilters(f1, f2)).toBeTruthy();
+    });
+
+    test('should compare duplicates, ignoring meta attributes', () => {
+      const f1 = esFilters.buildQueryFilter(
+        { _type: { match: { query: 'apache', type: 'phrase' } } },
+        'index1',
+        ''
+      );
+      const f2 = esFilters.buildQueryFilter(
+        { _type: { match: { query: 'apache', type: 'phrase' } } },
+        'index2',
+        ''
+      );
+
+      expect(compareFilters(f1, f2)).toBeTruthy();
+    });
+
+    test('should compare duplicates, ignoring $state attributes', () => {
+      const f1 = {
+        $state: { store: esFilters.FilterStateStore.APP_STATE },
+        ...esFilters.buildQueryFilter(
+          { _type: { match: { query: 'apache', type: 'phrase' } } },
+          'index',
+          ''
+        ),
+      };
+      const f2 = {
+        $state: { store: esFilters.FilterStateStore.GLOBAL_STATE },
+        ...esFilters.buildQueryFilter(
+          { _type: { match: { query: 'apache', type: 'phrase' } } },
+          'index',
+          ''
+        ),
+      };
+
+      expect(compareFilters(f1, f2)).toBeTruthy();
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.ts b/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts
similarity index 84%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.ts
rename to src/plugins/data/public/query/filter_manager/lib/compare_filters.ts
index 44bc333ae2b4fb..2a7cbe6e3303b5 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/compare_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Filter, FilterMeta } from '@kbn/es-query';
 import { defaults, isEqual, omit } from 'lodash';
+import { esFilters } from '../../../../common/es_query';
 
 /**
  * Compare two filters to see if they match
@@ -29,10 +29,14 @@ import { defaults, isEqual, omit } from 'lodash';
  *
  * @returns {bool} Filters are the same
  */
-export const compareFilters = (first: Filter, second: Filter, comparatorOptions: any = {}) => {
+export const compareFilters = (
+  first: esFilters.Filter,
+  second: esFilters.Filter,
+  comparatorOptions: any = {}
+) => {
   let comparators: any = {};
-  const mapFilter = (filter: Filter) => {
-    const cleaned: FilterMeta = omit(filter, excludedAttributes);
+  const mapFilter = (filter: esFilters.Filter) => {
+    const cleaned: esFilters.FilterMeta = omit(filter, excludedAttributes);
 
     if (comparators.negate) cleaned.negate = filter.meta && Boolean(filter.meta.negate);
     if (comparators.disabled) cleaned.disabled = filter.meta && Boolean(filter.meta.disabled);
diff --git a/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts
new file mode 100644
index 00000000000000..9b493add0886c6
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.test.ts
@@ -0,0 +1,103 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { dedupFilters } from './dedup_filters';
+import { esFilters } from '../../../../common/es_query';
+
+describe('filter manager utilities', () => {
+  describe('dedupFilters(existing, filters)', () => {
+    test('should return only filters which are not in the existing', () => {
+      const existing: esFilters.Filter[] = [
+        esFilters.buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index', ''),
+        esFilters.buildQueryFilter(
+          { match: { _term: { query: 'apache', type: 'phrase' } } },
+          'index',
+          ''
+        ),
+      ];
+      const filters: esFilters.Filter[] = [
+        esFilters.buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index', ''),
+        esFilters.buildQueryFilter(
+          { match: { _term: { query: 'apache', type: 'phrase' } } },
+          'index',
+          ''
+        ),
+      ];
+      const results = dedupFilters(existing, filters);
+
+      expect(results).toContain(filters[0]);
+      expect(results).not.toContain(filters[1]);
+    });
+
+    test('should ignore the disabled attribute when comparing ', () => {
+      const existing: esFilters.Filter[] = [
+        esFilters.buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index', ''),
+        {
+          ...esFilters.buildQueryFilter(
+            { match: { _term: { query: 'apache', type: 'phrase' } } },
+            'index1',
+            ''
+          ),
+          meta: { disabled: true, negate: false, alias: null },
+        },
+      ];
+      const filters: esFilters.Filter[] = [
+        esFilters.buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index', ''),
+        esFilters.buildQueryFilter(
+          { match: { _term: { query: 'apache', type: 'phrase' } } },
+          'index1',
+          ''
+        ),
+      ];
+      const results = dedupFilters(existing, filters);
+
+      expect(results).toContain(filters[0]);
+      expect(results).not.toContain(filters[1]);
+    });
+
+    test('should ignore $state attribute', () => {
+      const existing: esFilters.Filter[] = [
+        esFilters.buildRangeFilter({ name: 'bytes' }, { from: 0, to: 1024 }, 'index', ''),
+        {
+          ...esFilters.buildQueryFilter(
+            { match: { _term: { query: 'apache', type: 'phrase' } } },
+            'index',
+            ''
+          ),
+          $state: { store: esFilters.FilterStateStore.APP_STATE },
+        },
+      ];
+      const filters: esFilters.Filter[] = [
+        esFilters.buildRangeFilter({ name: 'bytes' }, { from: 1024, to: 2048 }, 'index', ''),
+        {
+          ...esFilters.buildQueryFilter(
+            { match: { _term: { query: 'apache', type: 'phrase' } } },
+            'index',
+            ''
+          ),
+          $state: { store: esFilters.FilterStateStore.GLOBAL_STATE },
+        },
+      ];
+      const results = dedupFilters(existing, filters);
+
+      expect(results).toContain(filters[0]);
+      expect(results).not.toContain(filters[1]);
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.ts b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts
similarity index 86%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.ts
rename to src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts
index 9565cbd80b7791..6d6f49cb5e8338 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/dedup_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { filter, find } from 'lodash';
 import { compareFilters } from './compare_filters';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 /**
  * Combine 2 filter collections, removing duplicates
@@ -31,8 +31,8 @@ import { compareFilters } from './compare_filters';
  * @returns {object} An array of filters that were not in existing
  */
 export const dedupFilters = (
-  existingFilters: Filter[],
-  filters: Filter[],
+  existingFilters: esFilters.Filter[],
+  filters: esFilters.Filter[],
   comparatorOptions: any = {}
 ) => {
   if (!Array.isArray(filters)) {
@@ -41,8 +41,8 @@ export const dedupFilters = (
 
   return filter(
     filters,
-    (f: Filter) =>
-      !find(existingFilters, (existingFilter: Filter) =>
+    (f: esFilters.Filter) =>
+      !find(existingFilters, (existingFilter: esFilters.Filter) =>
         compareFilters(existingFilter, f, comparatorOptions)
       )
   );
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.test.ts b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts
similarity index 89%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts
index c0c509634aba2c..dfe3a093c66146 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts
@@ -18,8 +18,8 @@
  */
 
 import sinon from 'sinon';
-import { Filter, buildEmptyFilter } from '@kbn/es-query';
 import { generateMappingChain } from './generate_mapping_chain';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 describe('filter manager utilities', () => {
   let mapping: any;
@@ -32,7 +32,7 @@ describe('filter manager utilities', () => {
 
   describe('generateMappingChain()', () => {
     test('should create a chaining function which calls the next function if the error is thrown', async () => {
-      const filter: Filter = buildEmptyFilter(true);
+      const filter = esFilters.buildEmptyFilter(true);
 
       mapping.throws(filter);
       next.returns('good');
@@ -45,7 +45,7 @@ describe('filter manager utilities', () => {
     });
 
     test('should create a chaining function which DOES NOT call the next function if the result is returned', async () => {
-      const filter: Filter = buildEmptyFilter(true);
+      const filter = esFilters.buildEmptyFilter(true);
 
       mapping.returns('good');
       next.returns('bad');
@@ -57,7 +57,7 @@ describe('filter manager utilities', () => {
     });
 
     test('should resolve result for the mapping function', async () => {
-      const filter: Filter = buildEmptyFilter(true);
+      const filter = esFilters.buildEmptyFilter(true);
 
       mapping.returns({ key: 'test', value: 'example' });
 
@@ -70,7 +70,7 @@ describe('filter manager utilities', () => {
 
     test('should call the mapping function with the argument to the chain', async () => {
       // @ts-ignore
-      const filter: Filter = { test: 'example' };
+      const filter: esFilters.Filter = { test: 'example' };
 
       mapping.returns({ key: 'test', value: 'example' });
 
@@ -84,7 +84,7 @@ describe('filter manager utilities', () => {
     });
 
     test('should resolve result for the next function', async () => {
-      const filter: Filter = buildEmptyFilter(true);
+      const filter = esFilters.buildEmptyFilter(true);
 
       mapping.throws(filter);
       next.returns({ key: 'test', value: 'example' });
@@ -98,7 +98,7 @@ describe('filter manager utilities', () => {
     });
 
     test('should throw an error if no functions match', async done => {
-      const filter: Filter = buildEmptyFilter(true);
+      const filter = esFilters.buildEmptyFilter(true);
 
       mapping.throws(filter);
 
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.ts b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts
similarity index 91%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.ts
rename to src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts
index 760270edd7170a..b6764389e0db9f 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/generate_mapping_chain.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 const noop = () => {
   throw new Error('No mappings have been found for filter.');
 };
 
 export const generateMappingChain = (fn: Function, next: Function = noop) => {
-  return (filter: Filter) => {
+  return (filter: esFilters.Filter) => {
     try {
       return fn(filter);
     } catch (result) {
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts
similarity index 93%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts
index fce2aa0373ebe8..9a0d0d93698f69 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { mapAndFlattenFilters } from './map_and_flatten_filters';
+import { esFilters } from '../../../../../data/public';
 
 describe('filter manager utilities', () => {
   describe('mapAndFlattenFilters()', () => {
     let filters: unknown;
 
-    function getDisplayName(filter: Filter) {
+    function getDisplayName(filter: esFilters.Filter) {
       return typeof filter.meta.value === 'function' ? filter.meta.value() : filter.meta.value;
     }
 
@@ -45,7 +45,7 @@ describe('filter manager utilities', () => {
     });
 
     test('should map and flatten the filters', () => {
-      const results = mapAndFlattenFilters(filters as Filter[]);
+      const results = mapAndFlattenFilters(filters as esFilters.Filter[]);
 
       expect(results).toHaveLength(5);
       expect(results[0]).toHaveProperty('meta');
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.ts b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts
similarity index 80%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.ts
rename to src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts
index b350c3957b142d..5326d59f3e32b6 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_and_flatten_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts
@@ -18,9 +18,9 @@
  */
 
 import { compact, flatten } from 'lodash';
-import { Filter } from '@kbn/es-query';
 import { mapFilter } from './map_filter';
+import { esFilters } from '../../../../../data/public';
 
-export const mapAndFlattenFilters = (filters: Filter[]) => {
-  return compact(flatten(filters)).map((item: Filter) => mapFilter(item));
+export const mapAndFlattenFilters = (filters: esFilters.Filter[]) => {
+  return compact(flatten(filters)).map((item: esFilters.Filter) => mapFilter(item));
 };
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.test.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts
similarity index 89%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts
index c1d4ebfd3f7fc8..0d115125451eea 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { mapFilter } from './map_filter';
+import { esFilters } from '../../../../../data/public';
 
 describe('filter manager utilities', () => {
-  function getDisplayName(filter: Filter) {
+  function getDisplayName(filter: esFilters.Filter) {
     return typeof filter.meta.value === 'function' ? filter.meta.value() : filter.meta.value;
   }
 
@@ -31,7 +31,7 @@ describe('filter manager utilities', () => {
         meta: { index: 'logstash-*' },
         query: { match: { _type: { query: 'apache', type: 'phrase' } } },
       };
-      const after = mapFilter(before as Filter);
+      const after = mapFilter(before as esFilters.Filter);
 
       expect(after).toHaveProperty('meta');
       expect(after.meta).toHaveProperty('key', '_type');
@@ -43,7 +43,7 @@ describe('filter manager utilities', () => {
 
     test('should map exists filters', async () => {
       const before: any = { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } };
-      const after = mapFilter(before as Filter);
+      const after = mapFilter(before as esFilters.Filter);
 
       expect(after).toHaveProperty('meta');
       expect(after.meta).toHaveProperty('key', '@timestamp');
@@ -55,7 +55,7 @@ describe('filter manager utilities', () => {
 
     test('should map missing filters', async () => {
       const before: any = { meta: { index: 'logstash-*' }, missing: { field: '@timestamp' } };
-      const after = mapFilter(before as Filter);
+      const after = mapFilter(before as esFilters.Filter);
 
       expect(after).toHaveProperty('meta');
       expect(after.meta).toHaveProperty('key', '@timestamp');
@@ -67,7 +67,7 @@ describe('filter manager utilities', () => {
 
     test('should map json filter', async () => {
       const before: any = { meta: { index: 'logstash-*' }, query: { match_all: {} } };
-      const after = mapFilter(before as Filter);
+      const after = mapFilter(before as esFilters.Filter);
 
       expect(after).toHaveProperty('meta');
       expect(after.meta).toHaveProperty('key', 'query');
@@ -81,7 +81,7 @@ describe('filter manager utilities', () => {
       const before: any = { meta: { index: 'logstash-*' } };
 
       try {
-        mapFilter(before as Filter);
+        mapFilter(before as esFilters.Filter);
       } catch (e) {
         expect(e).toBeInstanceOf(Error);
         expect(e.message).toBe('No mappings have been found for filter.');
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts
similarity index 81%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.ts
rename to src/plugins/data/public/query/filter_manager/lib/map_filter.ts
index c0d251e647fd10..2dc855caabfd36 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_filter.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts
@@ -17,22 +17,22 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { reduceRight } from 'lodash';
 
-import { mapMatchAll } from './map_match_all';
-import { mapPhrase } from './map_phrase';
-import { mapPhrases } from './map_phrases';
-import { mapRange } from './map_range';
-import { mapExists } from './map_exists';
-import { mapMissing } from './map_missing';
-import { mapQueryString } from './map_query_string';
-import { mapGeoBoundingBox } from './map_geo_bounding_box';
-import { mapGeoPolygon } from './map_geo_polygon';
-import { mapDefault } from './map_default';
+import { mapMatchAll } from './mappers/map_match_all';
+import { mapPhrase } from './mappers/map_phrase';
+import { mapPhrases } from './mappers/map_phrases';
+import { mapRange } from './mappers/map_range';
+import { mapExists } from './mappers/map_exists';
+import { mapMissing } from './mappers/map_missing';
+import { mapQueryString } from './mappers/map_query_string';
+import { mapGeoBoundingBox } from './mappers/map_geo_bounding_box';
+import { mapGeoPolygon } from './mappers/map_geo_polygon';
+import { mapDefault } from './mappers/map_default';
 import { generateMappingChain } from './generate_mapping_chain';
+import { esFilters } from '../../../../../data/public';
 
-export function mapFilter(filter: Filter) {
+export function mapFilter(filter: esFilters.Filter) {
   /** Mappers **/
 
   // Each mapper is a simple promise function that test if the mapper can
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts
similarity index 85%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts
index acb6e89711033d..f10766901e5b7b 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { CustomFilter, buildEmptyFilter, buildQueryFilter } from '@kbn/es-query';
+
 import { mapDefault } from './map_default';
+import { esFilters } from '../../../../../common/es_query';
 
 describe('filter manager utilities', () => {
   describe('mapDefault()', () => {
     test('should return the key and value for matching filters', async () => {
-      const filter: CustomFilter = buildQueryFilter({ match_all: {} }, 'index');
+      const filter = esFilters.buildQueryFilter({ match_all: {} }, 'index', '');
       const result = mapDefault(filter);
 
       expect(result).toHaveProperty('key', 'query');
@@ -30,7 +31,7 @@ describe('filter manager utilities', () => {
     });
 
     test('should return undefined if there is no valid key', async () => {
-      const filter = buildEmptyFilter(true) as CustomFilter;
+      const filter = esFilters.buildEmptyFilter(true);
 
       try {
         mapDefault(filter);
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts
similarity index 86%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts
index 70c191879c22e9..fd84c5c742589b 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_default.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts
@@ -17,15 +17,15 @@
  * under the License.
  */
 
-import { Filter, FILTERS } from '@kbn/es-query';
 import { find, keys, get } from 'lodash';
+import { esFilters } from '../../../../../common/es_query';
 
-export const mapDefault = (filter: Filter) => {
+export const mapDefault = (filter: esFilters.Filter) => {
   const metaProperty = /(^\$|meta)/;
   const key = find(keys(filter), item => !item.match(metaProperty));
 
   if (key) {
-    const type = FILTERS.CUSTOM;
+    const type = esFilters.FILTERS.CUSTOM;
     const value = JSON.stringify(get(filter, key, {}));
 
     return { type, key, value };
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts
similarity index 86%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts
index c352d3e2b9a734..ff0ed4f4e4d94a 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.test.ts
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ExistsFilter, buildEmptyFilter, buildExistsFilter } from '@kbn/es-query';
+
 import { mapExists } from './map_exists';
 import { mapQueryString } from './map_query_string';
+import { esFilters } from '../../../../../common/es_query';
 
 describe('filter manager utilities', () => {
   describe('mapExists()', () => {
     test('should return the key and value for matching filters', async () => {
-      const filter: ExistsFilter = buildExistsFilter({ name: '_type' }, 'index');
+      const filter = esFilters.buildExistsFilter({ name: '_type' }, 'index');
       const result = mapExists(filter);
 
       expect(result).toHaveProperty('key', '_type');
@@ -31,7 +32,7 @@ describe('filter manager utilities', () => {
     });
 
     test('should return undefined for none matching', async done => {
-      const filter = buildEmptyFilter(true) as ExistsFilter;
+      const filter = esFilters.buildEmptyFilter(true);
 
       try {
         mapQueryString(filter);
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts
similarity index 79%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts
index d539219a1ca24e..63665bdd88ccbe 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_exists.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import { Filter, isExistsFilter, FILTERS } from '@kbn/es-query';
 import { get } from 'lodash';
+import { esFilters } from '../../../../../common/es_query';
 
-export const mapExists = (filter: Filter) => {
-  if (isExistsFilter(filter)) {
+export const mapExists = (filter: esFilters.Filter) => {
+  if (esFilters.isExistsFilter(filter)) {
     return {
-      type: FILTERS.EXISTS,
-      value: FILTERS.EXISTS,
+      type: esFilters.FILTERS.EXISTS,
+      value: esFilters.FILTERS.EXISTS,
       key: get(filter, 'exists.field'),
     };
   }
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts
similarity index 94%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts
index c3c99e6f6c4a37..5fca4a652bad88 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapGeoBoundingBox } from './map_geo_bounding_box';
-import { Filter, GeoBoundingBoxFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
 
 describe('filter manager utilities', () => {
   describe('mapGeoBoundingBox()', () => {
@@ -34,7 +34,7 @@ describe('filter manager utilities', () => {
             bottom_right: { lat: 15, lon: 20 },
           },
         },
-      } as GeoBoundingBoxFilter;
+      } as esFilters.GeoBoundingBoxFilter;
 
       const result = mapGeoBoundingBox(filter);
 
@@ -63,7 +63,8 @@ describe('filter manager utilities', () => {
             bottom_right: { lat: 15, lon: 20 },
           },
         },
-      } as GeoBoundingBoxFilter;
+      } as esFilters.GeoBoundingBoxFilter;
+
       const result = mapGeoBoundingBox(filter);
 
       expect(result).toHaveProperty('key', 'point');
@@ -82,7 +83,7 @@ describe('filter manager utilities', () => {
       const filter = {
         meta: { index: 'logstash-*' },
         query: { query_string: { query: 'foo:bar' } },
-      } as Filter;
+      } as esFilters.Filter;
 
       try {
         mapGeoBoundingBox(filter);
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts
similarity index 80%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts
index 1f9b8cd842509b..091e9a3f34000a 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_bounding_box.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts
@@ -16,16 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  GeoBoundingBoxFilter,
-  Filter,
-  FILTERS,
-  isGeoBoundingBoxFilter,
-  FilterValueFormatter,
-} from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
 
 const getFormattedValueFn = (params: any) => {
-  return (formatter?: FilterValueFormatter) => {
+  return (formatter?: esFilters.FilterValueFormatter) => {
     const corners = formatter
       ? {
           topLeft: formatter.convert(params.top_left),
@@ -40,20 +34,20 @@ const getFormattedValueFn = (params: any) => {
   };
 };
 
-const getParams = (filter: GeoBoundingBoxFilter) => {
+const getParams = (filter: esFilters.GeoBoundingBoxFilter) => {
   const key = Object.keys(filter.geo_bounding_box).filter(k => k !== 'ignore_unmapped')[0];
   const params = filter.geo_bounding_box[key];
 
   return {
     key,
     params,
-    type: FILTERS.GEO_BOUNDING_BOX,
+    type: esFilters.FILTERS.GEO_BOUNDING_BOX,
     value: getFormattedValueFn(params),
   };
 };
 
-export const mapGeoBoundingBox = (filter: Filter) => {
-  if (!isGeoBoundingBoxFilter(filter)) {
+export const mapGeoBoundingBox = (filter: esFilters.Filter) => {
+  if (!esFilters.isGeoBoundingBoxFilter(filter)) {
     throw filter;
   }
 
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts
similarity index 77%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts
index ee4f9b295d682d..3afa3891a24bb8 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts
@@ -16,23 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import { mapGeoPolygon } from './map_geo_polygon';
-import { GeoPolygonFilter, Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
 
 describe('filter manager utilities', () => {
-  describe('mapGeoPolygon()', () => {
-    test('should return the key and value for matching filters with bounds', async () => {
-      const filter = {
-        meta: {
-          index: 'logstash-*',
-        },
-        geo_polygon: {
-          point: {
-            points: [{ lat: 5, lon: 10 }, { lat: 15, lon: 20 }],
-          },
+  let filter: esFilters.GeoPolygonFilter;
+
+  beforeEach(() => {
+    filter = {
+      meta: {
+        index: 'logstash-*',
+      },
+      geo_polygon: {
+        point: {
+          points: [{ lat: 5, lon: 10 }, { lat: 15, lon: 20 }],
         },
-      } as GeoPolygonFilter;
+      },
+    } as esFilters.GeoPolygonFilter;
+  });
 
+  describe('mapGeoPolygon()', () => {
+    test('should return the key and value for matching filters with bounds', async () => {
       const result = mapGeoPolygon(filter);
 
       expect(result).toHaveProperty('key', 'point');
@@ -48,17 +53,6 @@ describe('filter manager utilities', () => {
     });
 
     test('should return the key and value even when using ignore_unmapped', async () => {
-      const filter = {
-        meta: {
-          index: 'logstash-*',
-        },
-        geo_polygon: {
-          ignore_unmapped: true,
-          point: {
-            points: [{ lat: 5, lon: 10 }, { lat: 15, lon: 20 }],
-          },
-        },
-      } as GeoPolygonFilter;
       const result = mapGeoPolygon(filter);
 
       expect(result).toHaveProperty('key', 'point');
@@ -74,15 +68,15 @@ describe('filter manager utilities', () => {
     });
 
     test('should return undefined for none matching', async done => {
-      const filter = {
+      const wrongFilter = {
         meta: { index: 'logstash-*' },
         query: { query_string: { query: 'foo:bar' } },
-      } as Filter;
+      } as esFilters.Filter;
 
       try {
-        mapGeoPolygon(filter);
+        mapGeoPolygon(wrongFilter);
       } catch (e) {
-        expect(e).toBe(filter);
+        expect(e).toBe(wrongFilter);
 
         done();
       }
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts
similarity index 79%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts
index 03ce4130d0c972..a7881b4a145a19 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_geo_polygon.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts
@@ -16,38 +16,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  GeoPolygonFilter,
-  Filter,
-  FILTERS,
-  isGeoPolygonFilter,
-  FilterValueFormatter,
-} from '@kbn/es-query';
+
+import { esFilters } from '../../../../../common/es_query';
 
 const POINTS_SEPARATOR = ', ';
 
 const getFormattedValueFn = (points: string[]) => {
-  return (formatter?: FilterValueFormatter) => {
+  return (formatter?: esFilters.FilterValueFormatter) => {
     return points
       .map((point: string) => (formatter ? formatter.convert(point) : JSON.stringify(point)))
       .join(POINTS_SEPARATOR);
   };
 };
 
-function getParams(filter: GeoPolygonFilter) {
+function getParams(filter: esFilters.GeoPolygonFilter) {
   const key = Object.keys(filter.geo_polygon).filter(k => k !== 'ignore_unmapped')[0];
   const params = filter.geo_polygon[key];
 
   return {
     key,
     params,
-    type: FILTERS.GEO_POLYGON,
+    type: esFilters.FILTERS.GEO_POLYGON,
     value: getFormattedValueFn(params.points || []),
   };
 }
 
-export function mapGeoPolygon(filter: Filter) {
-  if (!isGeoPolygonFilter(filter)) {
+export function mapGeoPolygon(filter: esFilters.Filter) {
+  if (!esFilters.isGeoPolygonFilter(filter)) {
     throw filter;
   }
   return getParams(filter);
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts
similarity index 94%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts
index 2f0641598a2ce3..4fc6d0b4924141 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { MatchAllFilter } from '@kbn/es-query';
+
 import { mapMatchAll } from './map_match_all';
+import { esFilters } from '../../../../../common/es_query';
 
 describe('filter_manager/lib', () => {
   describe('mapMatchAll()', () => {
-    let filter: MatchAllFilter;
+    let filter: esFilters.MatchAllFilter;
 
     beforeEach(() => {
       filter = {
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts
similarity index 81%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts
index a1387e6dbe4574..4e93b1d41e9a82 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_match_all.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Filter, FILTERS, isMatchAllFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
 
-export const mapMatchAll = (filter: Filter) => {
-  if (isMatchAllFilter(filter)) {
+export const mapMatchAll = (filter: esFilters.Filter) => {
+  if (esFilters.isMatchAllFilter(filter)) {
     return {
-      type: FILTERS.MATCH_ALL,
+      type: esFilters.FILTERS.MATCH_ALL,
       key: filter.meta.field,
       value: filter.meta.formattedValue || 'all',
     };
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts
similarity index 86%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts
index ca23f25826906b..1847eb37ca42ff 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts
@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { MissingFilter, buildEmptyFilter, ExistsFilter } from '@kbn/es-query';
+
 import { mapMissing } from './map_missing';
+import { esFilters } from '../../../../../common/es_query';
 
 describe('filter manager utilities', () => {
   describe('mapMissing()', () => {
     test('should return the key and value for matching filters', async () => {
-      const filter: MissingFilter = {
+      const filter: esFilters.MissingFilter = {
         missing: { field: '_type' },
-        ...buildEmptyFilter(true),
+        ...esFilters.buildEmptyFilter(true),
       };
       const result = mapMissing(filter);
 
@@ -33,7 +34,7 @@ describe('filter manager utilities', () => {
     });
 
     test('should return undefined for none matching', async done => {
-      const filter = buildEmptyFilter(true) as ExistsFilter;
+      const filter = esFilters.buildEmptyFilter(true);
 
       try {
         mapMissing(filter);
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts
similarity index 78%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts
index 861a84ed616468..51dee89ad884b2 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_missing.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Filter, FILTERS, isMissingFilter } from '@kbn/es-query';
 
-export const mapMissing = (filter: Filter) => {
-  if (isMissingFilter(filter)) {
+import { esFilters } from '../../../../../common/es_query';
+
+export const mapMissing = (filter: esFilters.Filter) => {
+  if (esFilters.isMissingFilter(filter)) {
     return {
-      type: FILTERS.MISSING,
-      value: FILTERS.MISSING,
+      type: esFilters.FILTERS.MISSING,
+      value: esFilters.FILTERS.MISSING,
       key: filter.missing.field,
     };
   }
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts
similarity index 93%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts
index c95a2529add149..05372d37264b06 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrase.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { mapPhrase } from './map_phrase';
-import { PhraseFilter, Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
 
 describe('filter manager utilities', () => {
   describe('mapPhrase()', () => {
@@ -25,11 +25,13 @@ describe('filter manager utilities', () => {
       const filter = {
         meta: { index: 'logstash-*' },
         query: { match: { _type: { query: 'apache', type: 'phrase' } } },
-      } as PhraseFilter;
+      } as esFilters.PhraseFilter;
+
       const result = mapPhrase(filter);
 
       expect(result).toHaveProperty('value');
       expect(result).toHaveProperty('key', '_type');
+
       if (result.value) {
         const displayName = result.value();
         expect(displayName).toBe('apache');
@@ -40,7 +42,7 @@ describe('filter manager utilities', () => {
       const filter = {
         meta: { index: 'logstash-*' },
         query: { query_string: { query: 'foo:bar' } },
-      } as Filter;
+      } as esFilters.Filter;
 
       try {
         mapPhrase(filter);
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts
new file mode 100644
index 00000000000000..b6e9c2007db970
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { get } from 'lodash';
+import { esFilters } from '../../../../../common/es_query';
+
+const getScriptedPhraseValue = (filter: esFilters.PhraseFilter) =>
+  get(filter, ['script', 'script', 'params', 'value']);
+
+const getFormattedValueFn = (value: any) => {
+  return (formatter?: esFilters.FilterValueFormatter) => {
+    return formatter ? formatter.convert(value) : value;
+  };
+};
+
+const getParams = (filter: esFilters.PhraseFilter) => {
+  const scriptedPhraseValue = getScriptedPhraseValue(filter);
+  const isScriptedFilter = Boolean(scriptedPhraseValue);
+  const key = isScriptedFilter ? filter.meta.field || '' : esFilters.getPhraseFilterField(filter);
+  const query = scriptedPhraseValue || esFilters.getPhraseFilterValue(filter);
+  const params = { query };
+
+  return {
+    key,
+    params,
+    type: esFilters.FILTERS.PHRASE,
+    value: getFormattedValueFn(query),
+  };
+};
+
+export const isMapPhraseFilter = (filter: any): filter is esFilters.PhraseFilter =>
+  esFilters.isPhraseFilter(filter) || esFilters.isScriptedPhraseFilter(filter);
+
+export const mapPhrase = (filter: esFilters.Filter) => {
+  if (!isMapPhraseFilter(filter)) {
+    throw filter;
+  }
+
+  return getParams(filter);
+};
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrases.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
similarity index 85%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrases.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
index c17ff11d49fd4a..7240d87d02b5ab 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_phrases.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { Filter, isPhrasesFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
 
-export const mapPhrases = (filter: Filter) => {
-  if (!isPhrasesFilter(filter)) {
+export const mapPhrases = (filter: esFilters.Filter) => {
+  if (!esFilters.isPhrasesFilter(filter)) {
     throw filter;
   }
 
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts
similarity index 81%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts
index 4b1a5d39c405da..c60e7d3454fe0f 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts
@@ -17,27 +17,28 @@
  * under the License.
  */
 
-import { QueryStringFilter, buildQueryFilter, buildEmptyFilter } from '@kbn/es-query';
 import { mapQueryString } from './map_query_string';
+import { esFilters } from '../../../../../common/es_query';
 
 describe('filter manager utilities', () => {
   describe('mapQueryString()', () => {
     test('should return the key and value for matching filters', async () => {
-      const filter: QueryStringFilter = buildQueryFilter(
+      const filter = esFilters.buildQueryFilter(
         { query_string: { query: 'foo:bar' } },
-        'index'
+        'index',
+        ''
       );
-      const result = mapQueryString(filter);
+      const result = mapQueryString(filter as esFilters.Filter);
 
       expect(result).toHaveProperty('key', 'query');
       expect(result).toHaveProperty('value', 'foo:bar');
     });
 
     test('should return undefined for none matching', async done => {
-      const filter = buildEmptyFilter(true) as QueryStringFilter;
+      const filter = esFilters.buildEmptyFilter(true);
 
       try {
-        mapQueryString(filter);
+        mapQueryString(filter as esFilters.Filter);
       } catch (e) {
         expect(e).toBe(filter);
         done();
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts
similarity index 81%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.ts
rename to src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts
index 94da8074edd04d..20c3555639a3ed 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_query_string.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Filter, FILTERS, isQueryStringFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../common/es_query';
 
-export const mapQueryString = (filter: Filter) => {
-  if (isQueryStringFilter(filter)) {
+export const mapQueryString = (filter: esFilters.Filter) => {
+  if (esFilters.isQueryStringFilter(filter)) {
     return {
-      type: FILTERS.QUERY_STRING,
+      type: esFilters.FILTERS.QUERY_STRING,
       key: 'query',
       value: filter.query.query_string.query,
     };
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts
new file mode 100644
index 00000000000000..c0d5773d6f2c14
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts
@@ -0,0 +1,55 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mapRange } from './map_range';
+import { esFilters } from '../../../../../common/es_query';
+
+describe('filter manager utilities', () => {
+  describe('mapRange()', () => {
+    test('should return the key and value for matching filters with gt/lt', async () => {
+      const filter = {
+        meta: { index: 'logstash-*' } as esFilters.FilterMeta,
+        range: { bytes: { lt: 2048, gt: 1024 } },
+      } as esFilters.RangeFilter;
+      const result = mapRange(filter);
+
+      expect(result).toHaveProperty('key', 'bytes');
+      expect(result).toHaveProperty('value');
+      if (result.value) {
+        const displayName = result.value();
+        expect(displayName).toBe('1024 to 2048');
+      }
+    });
+
+    test('should return undefined for none matching', async done => {
+      const filter = {
+        meta: { index: 'logstash-*' },
+        query: { query_string: { query: 'foo:bar' } },
+      } as esFilters.Filter;
+
+      try {
+        mapRange(filter);
+      } catch (e) {
+        expect(e).toBe(filter);
+
+        done();
+      }
+    });
+  });
+});
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts
new file mode 100644
index 00000000000000..51fb970f5f03ea
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts
@@ -0,0 +1,65 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { get, has } from 'lodash';
+import { esFilters } from '../../../../../common/es_query';
+
+const getFormattedValueFn = (left: any, right: any) => {
+  return (formatter?: esFilters.FilterValueFormatter) => {
+    let displayValue = `${left} to ${right}`;
+    if (formatter) {
+      const convert = formatter.getConverterFor('text');
+      displayValue = `${convert(left)} to ${convert(right)}`;
+    }
+    return displayValue;
+  };
+};
+
+const getFirstRangeKey = (filter: esFilters.RangeFilter) =>
+  filter.range && Object.keys(filter.range)[0];
+const getRangeByKey = (filter: esFilters.RangeFilter, key: string) => get(filter, ['range', key]);
+
+function getParams(filter: esFilters.RangeFilter) {
+  const isScriptedRange = esFilters.isScriptedRangeFilter(filter);
+  const key: string = (isScriptedRange ? filter.meta.field : getFirstRangeKey(filter)) || '';
+  const params: any = isScriptedRange
+    ? get(filter, 'script.script.params')
+    : getRangeByKey(filter, key);
+
+  let left = has(params, 'gte') ? params.gte : params.gt;
+  if (left == null) left = -Infinity;
+
+  let right = has(params, 'lte') ? params.lte : params.lt;
+  if (right == null) right = Infinity;
+
+  const value = getFormattedValueFn(left, right);
+
+  return { type: esFilters.FILTERS.RANGE, key, value, params };
+}
+
+export const isMapRangeFilter = (filter: any): filter is esFilters.RangeFilter =>
+  esFilters.isRangeFilter(filter) || esFilters.isScriptedRangeFilter(filter);
+
+export const mapRange = (filter: esFilters.Filter) => {
+  if (!isMapRangeFilter(filter)) {
+    throw filter;
+  }
+
+  return getParams(filter);
+};
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.test.ts b/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts
similarity index 77%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.test.ts
rename to src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts
index 3fedcf97a625ac..b9731797c9ee36 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { onlyDisabledFiltersChanged } from './only_disabled';
+import { esFilters } from '../../../../../data/public';
 
 describe('filter manager utilities', () => {
   describe('onlyDisabledFiltersChanged()', () => {
@@ -27,20 +27,20 @@ describe('filter manager utilities', () => {
         { meta: { disabled: true } },
         { meta: { disabled: true } },
         { meta: { disabled: true } },
-      ] as Filter[];
-      const newFilters = [{ meta: { disabled: true } }] as Filter[];
+      ] as esFilters.Filter[];
+      const newFilters = [{ meta: { disabled: true } }] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(true);
     });
 
     test('should return false if there are no old filters', () => {
-      const newFilters = [{ meta: { disabled: false } }] as Filter[];
+      const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, undefined)).toBe(false);
     });
 
     test('should return false if there are no new filters', () => {
-      const filters = [{ meta: { disabled: false } }] as Filter[];
+      const filters = [{ meta: { disabled: false } }] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(undefined, filters)).toBe(false);
     });
@@ -50,8 +50,8 @@ describe('filter manager utilities', () => {
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: false } },
-      ] as Filter[];
-      const newFilters = [{ meta: { disabled: false } }] as Filter[];
+      ] as esFilters.Filter[];
+      const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
     });
@@ -61,8 +61,8 @@ describe('filter manager utilities', () => {
         { meta: { disabled: true } },
         { meta: { disabled: true } },
         { meta: { disabled: true } },
-      ] as Filter[];
-      const newFilters = [{ meta: { disabled: false } }] as Filter[];
+      ] as esFilters.Filter[];
+      const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
     });
@@ -72,8 +72,8 @@ describe('filter manager utilities', () => {
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: false } },
-      ] as Filter[];
-      const newFilters = [{ meta: { disabled: true } }] as Filter[];
+      ] as esFilters.Filter[];
+      const newFilters = [{ meta: { disabled: true } }] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
     });
@@ -83,8 +83,8 @@ describe('filter manager utilities', () => {
         { meta: { disabled: true } },
         { meta: { disabled: true } },
         { meta: { disabled: true } },
-      ] as Filter[];
-      const newFilters = [] as Filter[];
+      ] as esFilters.Filter[];
+      const newFilters = [] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(true);
     });
@@ -94,8 +94,8 @@ describe('filter manager utilities', () => {
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: false } },
-      ] as Filter[];
-      const newFilters = [] as Filter[];
+      ] as esFilters.Filter[];
+      const newFilters = [] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
     });
@@ -104,11 +104,11 @@ describe('filter manager utilities', () => {
       const filters = [
         { meta: { disabled: true, negate: false } },
         { meta: { disabled: true, negate: false } },
-      ] as Filter[];
+      ] as esFilters.Filter[];
       const newFilters = [
         { meta: { disabled: true, negate: true } },
         { meta: { disabled: true, negate: true } },
-      ] as Filter[];
+      ] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(true);
     });
@@ -118,8 +118,8 @@ describe('filter manager utilities', () => {
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: true } },
-      ] as Filter[];
-      const newFilters = [{ meta: { disabled: false } }] as Filter[];
+      ] as esFilters.Filter[];
+      const newFilters = [{ meta: { disabled: false } }] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
     });
@@ -129,15 +129,15 @@ describe('filter manager utilities', () => {
         { meta: { disabled: true } },
         { meta: { disabled: false } },
         { meta: { disabled: true } },
-      ] as Filter[];
-      const newFilters = [] as Filter[];
+      ] as esFilters.Filter[];
+      const newFilters = [] as esFilters.Filter[];
 
       expect(onlyDisabledFiltersChanged(newFilters, filters)).toBe(false);
     });
 
     test('should not throw with null filters', () => {
-      const filters = [null, { meta: { disabled: true } }] as Filter[];
-      const newFilters = [] as Filter[];
+      const filters = [null, { meta: { disabled: true } }] as esFilters.Filter[];
+      const newFilters = [] as esFilters.Filter[];
 
       expect(() => {
         onlyDisabledFiltersChanged(newFilters, filters);
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.ts b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts
similarity index 82%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.ts
rename to src/plugins/data/public/query/filter_manager/lib/only_disabled.ts
index 9c0b5f43acb3ef..0fb6894a297a1f 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/only_disabled.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts
@@ -17,17 +17,20 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { filter, isEqual } from 'lodash';
+import { esFilters } from '../../../../../../plugins/data/public';
 
-const isEnabled = (f: Filter) => f && f.meta && !f.meta.disabled;
+const isEnabled = (f: esFilters.Filter) => f && f.meta && !f.meta.disabled;
 
 /**
  * Checks to see if only disabled filters have been changed
  *
  * @returns {bool} Only disabled filters
  */
-export const onlyDisabledFiltersChanged = (newFilters?: Filter[], oldFilters?: Filter[]) => {
+export const onlyDisabledFiltersChanged = (
+  newFilters?: esFilters.Filter[],
+  oldFilters?: esFilters.Filter[]
+) => {
   // If it's the same - compare only enabled filters
   const newEnabledFilters = filter(newFilters || [], isEnabled);
   const oldEnabledFilters = filter(oldFilters || [], isEnabled);
diff --git a/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts
new file mode 100644
index 00000000000000..08eeabc1497e3c
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts
@@ -0,0 +1,85 @@
+/*
+ * 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 { uniqFilters } from './uniq_filters';
+import { esFilters } from '../../../../../data/public';
+
+describe('filter manager utilities', () => {
+  describe('niqFilter', () => {
+    test('should filter out dups', () => {
+      const before: esFilters.Filter[] = [
+        esFilters.buildQueryFilter(
+          { _type: { match: { query: 'apache', type: 'phrase' } } },
+          'index',
+          ''
+        ),
+        esFilters.buildQueryFilter(
+          { _type: { match: { query: 'apache', type: 'phrase' } } },
+          'index',
+          ''
+        ),
+      ];
+      const results = uniqFilters(before);
+
+      expect(results).toHaveLength(1);
+    });
+
+    test('should filter out duplicates, ignoring meta attributes', () => {
+      const before: esFilters.Filter[] = [
+        esFilters.buildQueryFilter(
+          { _type: { match: { query: 'apache', type: 'phrase' } } },
+          'index1',
+          ''
+        ),
+        esFilters.buildQueryFilter(
+          { _type: { match: { query: 'apache', type: 'phrase' } } },
+          'index2',
+          ''
+        ),
+      ];
+      const results = uniqFilters(before);
+
+      expect(results).toHaveLength(1);
+    });
+
+    test('should filter out duplicates, ignoring $state attributes', () => {
+      const before: esFilters.Filter[] = [
+        {
+          $state: { store: esFilters.FilterStateStore.APP_STATE },
+          ...esFilters.buildQueryFilter(
+            { _type: { match: { query: 'apache', type: 'phrase' } } },
+            'index',
+            ''
+          ),
+        },
+        {
+          $state: { store: esFilters.FilterStateStore.GLOBAL_STATE },
+          ...esFilters.buildQueryFilter(
+            { _type: { match: { query: 'apache', type: 'phrase' } } },
+            'index',
+            ''
+          ),
+        },
+      ];
+      const results = uniqFilters(before);
+
+      expect(results).toHaveLength(1);
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.ts b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts
similarity index 84%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.ts
rename to src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts
index 12e793253371e7..e96c52e6db3dec 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/uniq_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Filter } from '@kbn/es-query';
 import { each, union } from 'lodash';
 import { dedupFilters } from './dedup_filters';
+import { esFilters } from '../../../../../data/public';
 
 /**
  * Remove duplicate filters from an array of filters
@@ -28,10 +28,10 @@ import { dedupFilters } from './dedup_filters';
 
  * @returns {object} The original filters array with duplicates removed
  */
-export const uniqFilters = (filters: Filter[], comparatorOptions: any = {}) => {
-  let results: Filter[] = [];
+export const uniqFilters = (filters: esFilters.Filter[], comparatorOptions: any = {}) => {
+  let results: esFilters.Filter[] = [];
 
-  each(filters, (filter: Filter) => {
+  each(filters, (filter: esFilters.Filter) => {
     results = union(results, dedupFilters(results, [filter]), comparatorOptions);
   });
 
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_filters_array.ts b/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts
similarity index 91%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_filters_array.ts
rename to src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts
index 27f627b477c359..aa047647c57516 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/test_helpers/get_filters_array.ts
+++ b/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
 
-export function getFiltersArray(): Filter[] {
+export function getFiltersArray(): esFilters.Filter[] {
   return [
     {
       query: { match: { extension: { query: 'jpg', type: 'phrase' } } },
diff --git a/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts b/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts
new file mode 100644
index 00000000000000..adc72c961b08bb
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts
@@ -0,0 +1,45 @@
+/*
+ * 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 { esFilters } from '../../../../../../plugins/data/public';
+
+export function getFilter(
+  store: esFilters.FilterStateStore,
+  disabled: boolean,
+  negated: boolean,
+  queryKey: string,
+  queryValue: any
+): esFilters.Filter {
+  return {
+    $state: {
+      store,
+    },
+    meta: {
+      index: 'logstash-*',
+      disabled,
+      negate: negated,
+      alias: null,
+    },
+    query: {
+      match: {
+        [queryKey]: queryValue,
+      },
+    },
+  };
+}
diff --git a/src/plugins/data/public/query/filter_manager/types.ts b/src/plugins/data/public/query/filter_manager/types.ts
new file mode 100644
index 00000000000000..0b3dbca2d6e0a6
--- /dev/null
+++ b/src/plugins/data/public/query/filter_manager/types.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { esFilters } from '../../../../../plugins/data/public';
+
+export interface PartitionedFilters {
+  globalFilters: esFilters.Filter[];
+  appFilters: esFilters.Filter[];
+}
diff --git a/src/plugins/data/public/query/index.tsx b/src/plugins/data/public/query/index.tsx
new file mode 100644
index 00000000000000..9d7c2ffc56f70b
--- /dev/null
+++ b/src/plugins/data/public/query/index.tsx
@@ -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 * from './query_service';
+export * from './filter_manager';
+
+export * from './timefilter';
+
+export * from './persisted_log';
diff --git a/src/plugins/data/public/query/mocks.ts b/src/plugins/data/public/query/mocks.ts
new file mode 100644
index 00000000000000..f2832b6b67fa2a
--- /dev/null
+++ b/src/plugins/data/public/query/mocks.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 { QueryService, QuerySetup } from '.';
+import { timefilterServiceMock } from './timefilter/timefilter_service.mock';
+
+type QueryServiceClientContract = PublicMethodsOf<QueryService>;
+
+const createSetupContractMock = () => {
+  const setupContract: jest.Mocked<QuerySetup> = {
+    filterManager: jest.fn() as any,
+    timefilter: timefilterServiceMock.createSetupContract(),
+  };
+
+  return setupContract;
+};
+
+const createStartContractMock = () => {
+  const startContract = {
+    filterManager: jest.fn() as any,
+    timefilter: timefilterServiceMock.createStartContract(),
+  };
+
+  return startContract;
+};
+
+const createMock = () => {
+  const mocked: jest.Mocked<QueryServiceClientContract> = {
+    setup: jest.fn(),
+    start: jest.fn(),
+    stop: jest.fn(),
+  };
+
+  mocked.setup.mockReturnValue(createSetupContractMock());
+  mocked.start.mockReturnValue(createStartContractMock());
+  return mocked;
+};
+
+export const queryServiceMock = {
+  create: createMock,
+  createSetupContract: createSetupContractMock,
+  createStartContract: createStartContractMock,
+};
diff --git a/src/legacy/core_plugins/data/public/query/persisted_log/index.ts b/src/plugins/data/public/query/persisted_log/index.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/query/persisted_log/index.ts
rename to src/plugins/data/public/query/persisted_log/index.ts
diff --git a/src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.test.ts b/src/plugins/data/public/query/persisted_log/persisted_log.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.test.ts
rename to src/plugins/data/public/query/persisted_log/persisted_log.test.ts
diff --git a/src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.ts b/src/plugins/data/public/query/persisted_log/persisted_log.ts
similarity index 95%
rename from src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.ts
rename to src/plugins/data/public/query/persisted_log/persisted_log.ts
index e0e6a0d0c44e4c..553b0bf5ef7e03 100644
--- a/src/legacy/core_plugins/data/public/query/persisted_log/persisted_log.ts
+++ b/src/plugins/data/public/query/persisted_log/persisted_log.ts
@@ -20,7 +20,7 @@
 import _ from 'lodash';
 import * as Rx from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Storage } from '../../types';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 
 const defaultIsDuplicate = (oldItem: any, newItem: any) => {
   return _.isEqual(oldItem, newItem);
@@ -37,12 +37,12 @@ export class PersistedLog<T = any> {
   public maxLength?: number;
   public filterDuplicates?: boolean;
   public isDuplicate: (oldItem: T, newItem: T) => boolean;
-  public storage: Storage;
+  public storage: IStorageWrapper;
   public items: T[];
 
   private update$ = new Rx.BehaviorSubject(undefined);
 
-  constructor(name: string, options: PersistedLogOptions<T> = {}, storage: Storage) {
+  constructor(name: string, options: PersistedLogOptions<T> = {}, storage: IStorageWrapper) {
     this.name = name;
     this.maxLength =
       typeof options.maxLength === 'string'
diff --git a/src/plugins/data/public/query/query_service.ts b/src/plugins/data/public/query/query_service.ts
new file mode 100644
index 00000000000000..206f8ac284ec37
--- /dev/null
+++ b/src/plugins/data/public/query/query_service.ts
@@ -0,0 +1,68 @@
+/*
+ * 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 { UiSettingsClientContract } from 'src/core/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { FilterManager } from './filter_manager';
+import { TimefilterService, TimefilterSetup } from './timefilter';
+
+/**
+ * Query Service
+ * @internal
+ */
+
+export interface QueryServiceDependencies {
+  storage: IStorageWrapper;
+  uiSettings: UiSettingsClientContract;
+}
+
+export class QueryService {
+  filterManager!: FilterManager;
+  timefilter!: TimefilterSetup;
+
+  public setup({ uiSettings, storage }: QueryServiceDependencies) {
+    this.filterManager = new FilterManager(uiSettings);
+
+    const timefilterService = new TimefilterService();
+    this.timefilter = timefilterService.setup({
+      uiSettings,
+      storage,
+    });
+
+    return {
+      filterManager: this.filterManager,
+      timefilter: this.timefilter,
+    };
+  }
+
+  public start() {
+    return {
+      filterManager: this.filterManager,
+      timefilter: this.timefilter,
+    };
+  }
+
+  public stop() {
+    // nothing to do here yet
+  }
+}
+
+/** @public */
+export type QuerySetup = ReturnType<QueryService['setup']>;
+export type QueryStart = ReturnType<QueryService['start']>;
diff --git a/src/legacy/core_plugins/data/public/timefilter/get_time.test.ts b/src/plugins/data/public/query/timefilter/get_time.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/get_time.test.ts
rename to src/plugins/data/public/query/timefilter/get_time.test.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/get_time.ts b/src/plugins/data/public/query/timefilter/get_time.ts
similarity index 94%
rename from src/legacy/core_plugins/data/public/timefilter/get_time.ts
rename to src/plugins/data/public/query/timefilter/get_time.ts
index 18a43d789714d7..55ee6527fbb1a3 100644
--- a/src/legacy/core_plugins/data/public/timefilter/get_time.ts
+++ b/src/plugins/data/public/query/timefilter/get_time.ts
@@ -19,7 +19,9 @@
 
 import dateMath from '@elastic/datemath';
 import { TimeRange } from 'src/plugins/data/public';
-import { IndexPattern, Field } from '../index_patterns';
+
+// TODO: remove this
+import { IndexPattern, Field } from '../../../../../legacy/core_plugins/data/public/index_patterns';
 
 interface CalculateBoundsOptions {
   forceNow?: Date;
diff --git a/src/plugins/data/public/query/timefilter/index.ts b/src/plugins/data/public/query/timefilter/index.ts
new file mode 100644
index 00000000000000..a6260e782c12ff
--- /dev/null
+++ b/src/plugins/data/public/query/timefilter/index.ts
@@ -0,0 +1,27 @@
+/*
+ * 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 { TimefilterService, TimefilterSetup } from './timefilter_service';
+
+export * from './types';
+export { Timefilter, TimefilterContract } from './timefilter';
+export { TimeHistory, TimeHistoryContract } from './time_history';
+export { getTime } from './get_time';
+export { changeTimeFilter } from './lib/change_time_filter';
+export { extractTimeFilter } from './lib/extract_time_filter';
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.test.ts b/src/plugins/data/public/query/timefilter/lib/change_time_filter.test.ts
similarity index 87%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.test.ts
rename to src/plugins/data/public/query/timefilter/lib/change_time_filter.test.ts
index 2e397ff931bb63..df3e33060b01f2 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.test.ts
+++ b/src/plugins/data/public/query/timefilter/lib/change_time_filter.test.ts
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { RangeFilter } from '@kbn/es-query';
 import { changeTimeFilter } from './change_time_filter';
 import { TimeRange } from 'src/plugins/data/public';
-import { timefilterServiceMock } from '../../../timefilter/timefilter_service.mock';
+import { timefilterServiceMock } from '../timefilter_service.mock';
+import { esFilters } from '../../../../../../plugins/data/public';
 
 const timefilterMock = timefilterServiceMock.createSetupContract();
 const timefilter = timefilterMock.timefilter;
@@ -42,7 +42,7 @@ describe('changeTimeFilter()', () => {
 
   test('should change the timefilter to match the range gt/lt', () => {
     const filter: any = { range: { '@timestamp': { gt, lt } } };
-    changeTimeFilter(timefilter, filter as RangeFilter);
+    changeTimeFilter(timefilter, filter as esFilters.RangeFilter);
 
     const { to, from } = timefilter.getTime();
 
@@ -52,7 +52,7 @@ describe('changeTimeFilter()', () => {
 
   test('should change the timefilter to match the range gte/lte', () => {
     const filter: any = { range: { '@timestamp': { gte: gt, lte: lt } } };
-    changeTimeFilter(timefilter, filter as RangeFilter);
+    changeTimeFilter(timefilter, filter as esFilters.RangeFilter);
 
     const { to, from } = timefilter.getTime();
 
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.ts b/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
similarity index 83%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.ts
rename to src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
index 8cd1ce5ba6c846..7943aab3c151f6 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.ts
+++ b/src/plugins/data/public/query/timefilter/lib/change_time_filter.ts
@@ -19,10 +19,10 @@
 
 import moment from 'moment';
 import { keys } from 'lodash';
-import { RangeFilter } from '@kbn/es-query';
-import { TimefilterContract } from '../../../timefilter';
+import { TimefilterContract } from '../timefilter';
+import { esFilters } from '../../../../../../plugins/data/public';
 
-export function convertRangeFilterToTimeRange(filter: RangeFilter) {
+export function convertRangeFilterToTimeRange(filter: esFilters.RangeFilter) {
   const key = keys(filter.range)[0];
   const values = filter.range[key];
 
@@ -32,6 +32,6 @@ export function convertRangeFilterToTimeRange(filter: RangeFilter) {
   };
 }
 
-export function changeTimeFilter(timeFilter: TimefilterContract, filter: RangeFilter) {
+export function changeTimeFilter(timeFilter: TimefilterContract, filter: esFilters.RangeFilter) {
   timeFilter.setTime(convertRangeFilterToTimeRange(filter));
 }
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/diff_time_picker_vals.test.ts b/src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/diff_time_picker_vals.test.ts
rename to src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.test.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/diff_time_picker_vals.ts b/src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/diff_time_picker_vals.ts
rename to src/plugins/data/public/query/timefilter/lib/diff_time_picker_vals.ts
diff --git a/src/plugins/data/public/query/timefilter/lib/extract_time_filter.test.ts b/src/plugins/data/public/query/timefilter/lib/extract_time_filter.test.ts
new file mode 100644
index 00000000000000..981c50844c4f3e
--- /dev/null
+++ b/src/plugins/data/public/query/timefilter/lib/extract_time_filter.test.ts
@@ -0,0 +1,74 @@
+/*
+ * 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 { extractTimeFilter } from './extract_time_filter';
+import { esFilters } from '../../../../../../plugins/data/public';
+
+describe('filter manager utilities', () => {
+  describe('extractTimeFilter()', () => {
+    test('should detect timeFilter', async () => {
+      const filters: esFilters.Filter[] = [
+        esFilters.buildQueryFilter(
+          { _type: { match: { query: 'apache', type: 'phrase' } } },
+          'logstash-*',
+          ''
+        ),
+        esFilters.buildRangeFilter(
+          { name: 'time' },
+          { gt: 1388559600000, lt: 1388646000000 },
+          'logstash-*'
+        ),
+      ];
+      const result = await extractTimeFilter('time', filters);
+
+      expect(result.timeRangeFilter).toEqual(filters[1]);
+      expect(result.restOfFilters[0]).toEqual(filters[0]);
+    });
+
+    test("should not return timeFilter when name doesn't match", async () => {
+      const filters: esFilters.Filter[] = [
+        esFilters.buildQueryFilter(
+          { _type: { match: { query: 'apache', type: 'phrase' } } },
+          'logstash-*',
+          ''
+        ),
+        esFilters.buildRangeFilter({ name: '@timestamp' }, { from: 1, to: 2 }, 'logstash-*', ''),
+      ];
+      const result = await extractTimeFilter('time', filters);
+
+      expect(result.timeRangeFilter).toBeUndefined();
+      expect(result.restOfFilters).toEqual(filters);
+    });
+
+    test('should not return a non range filter, even when names match', async () => {
+      const filters: esFilters.Filter[] = [
+        esFilters.buildQueryFilter(
+          { _type: { match: { query: 'apache', type: 'phrase' } } },
+          'logstash-*',
+          ''
+        ),
+        esFilters.buildPhraseFilter({ name: 'time' }, 'banana', 'logstash-*'),
+      ];
+      const result = await extractTimeFilter('time', filters);
+
+      expect(result.timeRangeFilter).toBeUndefined();
+      expect(result.restOfFilters).toEqual(filters);
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.ts b/src/plugins/data/public/query/timefilter/lib/extract_time_filter.ts
similarity index 82%
rename from src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.ts
rename to src/plugins/data/public/query/timefilter/lib/extract_time_filter.ts
index 22bda5b21295ee..4281610cb63e4e 100644
--- a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/extract_time_filter.ts
+++ b/src/plugins/data/public/query/timefilter/lib/extract_time_filter.ts
@@ -18,13 +18,13 @@
  */
 
 import { keys, partition } from 'lodash';
-import { Filter, isRangeFilter, RangeFilter } from '@kbn/es-query';
+import { esFilters } from '../../../../../../plugins/data/public';
 
-export function extractTimeFilter(timeFieldName: string, filters: Filter[]) {
-  const [timeRangeFilter, restOfFilters] = partition(filters, (obj: Filter) => {
+export function extractTimeFilter(timeFieldName: string, filters: esFilters.Filter[]) {
+  const [timeRangeFilter, restOfFilters] = partition(filters, (obj: esFilters.Filter) => {
     let key;
 
-    if (isRangeFilter(obj)) {
+    if (esFilters.isRangeFilter(obj)) {
       key = keys(obj.range)[0];
     }
 
@@ -33,6 +33,6 @@ export function extractTimeFilter(timeFieldName: string, filters: Filter[]) {
 
   return {
     restOfFilters,
-    timeRangeFilter: timeRangeFilter[0] as RangeFilter | undefined,
+    timeRangeFilter: timeRangeFilter[0] as esFilters.RangeFilter | undefined,
   };
 }
diff --git a/src/legacy/core_plugins/data/public/timefilter/lib/parse_querystring.ts b/src/plugins/data/public/query/timefilter/lib/parse_querystring.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/lib/parse_querystring.ts
rename to src/plugins/data/public/query/timefilter/lib/parse_querystring.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/time_history.ts b/src/plugins/data/public/query/timefilter/time_history.ts
similarity index 90%
rename from src/legacy/core_plugins/data/public/timefilter/time_history.ts
rename to src/plugins/data/public/query/timefilter/time_history.ts
index 22778d1adea3c4..e14c9ac0bc7ca7 100644
--- a/src/legacy/core_plugins/data/public/timefilter/time_history.ts
+++ b/src/plugins/data/public/query/timefilter/time_history.ts
@@ -19,13 +19,13 @@
 
 import moment from 'moment';
 import { TimeRange } from 'src/plugins/data/public';
-import { PersistedLog } from '../query/persisted_log';
-import { Storage } from '../types';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { PersistedLog } from '../persisted_log';
 
 export class TimeHistory {
   private history: PersistedLog<TimeRange>;
 
-  constructor(store: Storage) {
+  constructor(storage: IStorageWrapper) {
     const historyOptions = {
       maxLength: 10,
       filterDuplicates: true,
@@ -33,7 +33,7 @@ export class TimeHistory {
         return oldItem.from === newItem.from && oldItem.to === newItem.to;
       },
     };
-    this.history = new PersistedLog('kibana.timepicker.timeHistory', historyOptions, store);
+    this.history = new PersistedLog('kibana.timepicker.timeHistory', historyOptions, storage);
   }
 
   add(time: TimeRange) {
diff --git a/src/legacy/core_plugins/data/public/timefilter/timefilter.test.ts b/src/plugins/data/public/query/timefilter/timefilter.test.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/timefilter.test.ts
rename to src/plugins/data/public/query/timefilter/timefilter.test.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/timefilter.ts b/src/plugins/data/public/query/timefilter/timefilter.ts
similarity index 97%
rename from src/legacy/core_plugins/data/public/timefilter/timefilter.ts
rename to src/plugins/data/public/query/timefilter/timefilter.ts
index 14e167b0fd56e5..137e5100aa20e9 100644
--- a/src/legacy/core_plugins/data/public/timefilter/timefilter.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter.ts
@@ -20,13 +20,15 @@
 import _ from 'lodash';
 import { Subject, BehaviorSubject } from 'rxjs';
 import moment from 'moment';
-import { RefreshInterval, TimeRange } from 'src/plugins/data/public';
-import { IndexPattern, TimeHistoryContract } from '../index';
+import { RefreshInterval, TimeRange, TimeHistoryContract } from 'src/plugins/data/public';
+import { IndexPattern } from 'src/legacy/core_plugins/data/public';
 import { areRefreshIntervalsDifferent, areTimeRangesDifferent } from './lib/diff_time_picker_vals';
 import { parseQueryString } from './lib/parse_querystring';
 import { calculateBounds, getTime } from './get_time';
 import { TimefilterConfig, InputTimeRange, TimeRangeBounds } from './types';
 
+// TODO: remove!
+
 export class Timefilter {
   // Fired when isTimeRangeSelectorEnabled \ isAutoRefreshSelectorEnabled are toggled
   private enabledUpdated$ = new BehaviorSubject(false);
diff --git a/src/legacy/core_plugins/data/public/timefilter/timefilter_service.mock.ts b/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/timefilter_service.mock.ts
rename to src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
diff --git a/src/legacy/core_plugins/data/public/timefilter/timefilter_service.ts b/src/plugins/data/public/query/timefilter/timefilter_service.ts
similarity index 87%
rename from src/legacy/core_plugins/data/public/timefilter/timefilter_service.ts
rename to src/plugins/data/public/query/timefilter/timefilter_service.ts
index cda9b93ef08aa6..831ccebedc9cc3 100644
--- a/src/legacy/core_plugins/data/public/timefilter/timefilter_service.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter_service.ts
@@ -18,8 +18,8 @@
  */
 
 import { UiSettingsClientContract } from 'src/core/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { TimeHistory, Timefilter, TimeHistoryContract, TimefilterContract } from './index';
-import { Storage } from '../types';
 
 /**
  * Filter Service
@@ -28,16 +28,16 @@ import { Storage } from '../types';
 
 export interface TimeFilterServiceDependencies {
   uiSettings: UiSettingsClientContract;
-  store: Storage;
+  storage: IStorageWrapper;
 }
 
 export class TimefilterService {
-  public setup({ uiSettings, store }: TimeFilterServiceDependencies): TimefilterSetup {
+  public setup({ uiSettings, storage }: TimeFilterServiceDependencies): TimefilterSetup {
     const timefilterConfig = {
       timeDefaults: uiSettings.get('timepicker:timeDefaults'),
       refreshIntervalDefaults: uiSettings.get('timepicker:refreshIntervalDefaults'),
     };
-    const history = new TimeHistory(store);
+    const history = new TimeHistory(storage);
     const timefilter = new Timefilter(timefilterConfig, history);
 
     return {
diff --git a/src/legacy/core_plugins/data/public/timefilter/types.ts b/src/plugins/data/public/query/timefilter/types.ts
similarity index 100%
rename from src/legacy/core_plugins/data/public/timefilter/types.ts
rename to src/plugins/data/public/query/timefilter/types.ts
diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts
index 5f94734fef0837..9939815c1efd19 100644
--- a/src/plugins/data/public/types.ts
+++ b/src/plugins/data/public/types.ts
@@ -22,15 +22,18 @@ export * from './autocomplete_provider/types';
 import { AutocompletePublicPluginSetup, AutocompletePublicPluginStart } from '.';
 import { ISearchSetup, ISearchStart } from './search';
 import { IGetSuggestions } from './suggestions_provider/types';
+import { QuerySetup, QueryStart } from './query';
 export interface DataPublicPluginSetup {
   autocomplete: AutocompletePublicPluginSetup;
   search: ISearchSetup;
+  query: QuerySetup;
 }
 
 export interface DataPublicPluginStart {
   autocomplete: AutocompletePublicPluginStart;
   getSuggestions: IGetSuggestions;
   search: ISearchStart;
+  query: QueryStart;
 }
 
 export { IGetSuggestions } from './suggestions_provider/types';
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index df933167cee255..f0b6117b928cd8 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -25,6 +25,11 @@ export function plugin(initializerContext: PluginInitializerContext) {
 }
 
 export { DataServerPlugin as Plugin };
+export {
+  IndexPatternsFetcher,
+  FieldDescriptor,
+  shouldReadFieldFromDocValues,
+} from './index_patterns';
 
 export * from './search';
 
diff --git a/src/plugins/data/server/index_patterns/fetcher/index.ts b/src/plugins/data/server/index_patterns/fetcher/index.ts
new file mode 100644
index 00000000000000..19306696885dbe
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/fetcher/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './index_patterns_fetcher';
+export { shouldReadFieldFromDocValues } from './lib';
diff --git a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
new file mode 100644
index 00000000000000..5f1493a49ab7de
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { APICaller } from 'src/core/server';
+
+import { getFieldCapabilities, resolveTimePattern, createNoMatchingIndicesError } from './lib';
+
+export interface FieldDescriptor {
+  aggregatable: boolean;
+  name: string;
+  readFromDocValues: boolean;
+  searchable: boolean;
+  type: string;
+  esTypes: string[];
+  subType?: FieldSubType;
+}
+
+interface FieldSubType {
+  multi?: { parent: string };
+  nested?: { path: string };
+}
+
+export class IndexPatternsFetcher {
+  private _callDataCluster: APICaller;
+
+  constructor(callDataCluster: APICaller) {
+    this._callDataCluster = callDataCluster;
+  }
+
+  /**
+   *  Get a list of field objects for an index pattern that may contain wildcards
+   *
+   *  @param {Object} [options]
+   *  @property {String} options.pattern The index pattern
+   *  @property {Number} options.metaFields The list of underscore prefixed fields that should
+   *                                        be left in the field list (all others are removed).
+   *  @return {Promise<Array<Fields>>}
+   */
+  async getFieldsForWildcard(options: {
+    pattern: string | string[];
+    metaFields?: string[];
+  }): Promise<FieldDescriptor[]> {
+    const { pattern, metaFields } = options;
+    return await getFieldCapabilities(this._callDataCluster, pattern, metaFields);
+  }
+
+  /**
+   *  Get a list of field objects for a time pattern
+   *
+   *  @param {Object} [options={}]
+   *  @property {String} options.pattern The moment compatible time pattern
+   *  @property {Number} options.lookBack The number of indices we will pull mappings for
+   *  @property {Number} options.metaFields The list of underscore prefixed fields that should
+   *                                        be left in the field list (all others are removed).
+   *  @return {Promise<Array<Fields>>}
+   */
+  async getFieldsForTimePattern(options: {
+    pattern: string;
+    metaFields: string[];
+    lookBack: number;
+    interval: string;
+  }) {
+    const { pattern, lookBack, metaFields } = options;
+    const { matches } = await resolveTimePattern(this._callDataCluster, pattern);
+    const indices = matches.slice(0, lookBack);
+    if (indices.length === 0) {
+      throw createNoMatchingIndicesError(pattern);
+    }
+    return await getFieldCapabilities(this._callDataCluster, indices, metaFields);
+  }
+}
diff --git a/src/legacy/server/index_patterns/service/lib/errors.ts b/src/plugins/data/server/index_patterns/fetcher/lib/errors.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/errors.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/errors.ts
diff --git a/src/legacy/server/index_patterns/service/lib/es_api.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.test.js
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/es_api.test.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/es_api.test.js
diff --git a/src/legacy/server/index_patterns/service/lib/es_api.ts b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
similarity index 99%
rename from src/legacy/server/index_patterns/service/lib/es_api.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
index 63c1824784dbdd..92b64fafddd665 100644
--- a/src/legacy/server/index_patterns/service/lib/es_api.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
@@ -18,7 +18,6 @@
  */
 
 import { APICaller } from 'src/core/server';
-// @ts-ignore
 import { convertEsError } from './errors';
 import { FieldCapsResponse } from './field_capabilities';
 
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/__fixtures__/es_field_caps_response.json b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json
similarity index 90%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/__fixtures__/es_field_caps_response.json
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json
index 97f8c187e1680a..0d70f49b5e6b54 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/__fixtures__/es_field_caps_response.json
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/__fixtures__/es_field_caps_response.json
@@ -221,6 +221,27 @@
         "searchable": true,
         "aggregatable": true
       }
+    },
+    "nested_object_parent": {
+      "nested": {
+        "type": "nested",
+        "searchable": false,
+        "aggregatable": false
+      }
+    },
+    "nested_object_parent.child": {
+      "text": {
+        "type": "text",
+        "searchable": true,
+        "aggregatable": false
+      }
+    },
+    "nested_object_parent.child.keyword": {
+      "keyword": {
+        "type": "keyword",
+        "searchable": true,
+        "aggregatable": true
+      }
     }
   }
 }
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.test.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.test.js
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
similarity index 97%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
index 05e8d591f13a9e..c275fb714088e9 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_capabilities.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
@@ -23,7 +23,7 @@ import { APICaller } from 'src/core/server';
 import { callFieldCapsApi } from '../es_api';
 import { FieldCapsResponse, readFieldCapsResponse } from './field_caps_response';
 import { mergeOverrides } from './overrides';
-import { FieldDescriptor } from '../../index_patterns_service';
+import { FieldDescriptor } from '../../index_patterns_fetcher';
 
 export function concatIfUniq<T>(arr: T[], value: T) {
   return arr.includes(value) ? arr : arr.concat(value);
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
similarity index 76%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
index dfdafeea3cd786..cf4af615b95779 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.test.js
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
@@ -24,7 +24,7 @@ import sinon from 'sinon';
 import * as shouldReadFieldFromDocValuesNS from './should_read_field_from_doc_values';
 import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';
 
-import { getKbnFieldType } from '../../../../../../plugins/data/common';
+import { getKbnFieldType } from '../../../../../../data/common';
 import { readFieldCapsResponse } from './field_caps_response';
 import esResponse from './__fixtures__/es_field_caps_response.json';
 
@@ -37,10 +37,10 @@ describe('index_patterns/field_capabilities/field_caps_response', () => {
     describe('conflicts', () => {
       it('returns a field for each in response, no filtering', () => {
         const fields = readFieldCapsResponse(esResponse);
-        expect(fields).toHaveLength(22);
+        expect(fields).toHaveLength(24);
       });
 
-      it('includes only name, type, esTypes, searchable, aggregatable, readFromDocValues, and maybe conflictDescriptions, parent, ' +
+      it('includes only name, type, esTypes, searchable, aggregatable, readFromDocValues, and maybe conflictDescriptions, ' +
         'and subType of each field', () => {
         const responseClone = cloneDeep(esResponse);
         // try to trick it into including an extra field
@@ -48,7 +48,7 @@ describe('index_patterns/field_capabilities/field_caps_response', () => {
         const fields = readFieldCapsResponse(responseClone);
 
         fields.forEach(field => {
-          const fieldWithoutOptionalKeys = omit(field, 'conflictDescriptions', 'parent', 'subType');
+          const fieldWithoutOptionalKeys = omit(field, 'conflictDescriptions', 'subType');
 
           expect(Object.keys(fieldWithoutOptionalKeys)).toEqual([
             'name',
@@ -65,8 +65,8 @@ describe('index_patterns/field_capabilities/field_caps_response', () => {
         sandbox.spy(shouldReadFieldFromDocValuesNS, 'shouldReadFieldFromDocValues');
         const fields = readFieldCapsResponse(esResponse);
         const conflictCount = fields.filter(f => f.type === 'conflict').length;
-        // +1 is for the object field which gets filtered out of the final return value from readFieldCapsResponse
-        sinon.assert.callCount(shouldReadFieldFromDocValues, fields.length - conflictCount + 1);
+        // +2 is for the object and nested fields which get filtered out of the final return value from readFieldCapsResponse
+        sinon.assert.callCount(shouldReadFieldFromDocValues, fields.length - conflictCount + 2);
       });
 
       it('converts es types to kibana types', () => {
@@ -132,20 +132,41 @@ describe('index_patterns/field_capabilities/field_caps_response', () => {
         expect(mixSearchableOther.searchable).toBe(true);
       });
 
-      it('returns multi fields with parent and subType keys describing the relationship', () => {
+      it('returns multi fields with a subType key describing the relationship', () => {
         const fields = readFieldCapsResponse(esResponse);
         const child = fields.find(f => f.name === 'multi_parent.child');
-        expect(child).toHaveProperty('parent', 'multi_parent');
-        expect(child).toHaveProperty('subType', 'multi');
+        expect(child).toHaveProperty('subType', { multi: { parent: 'multi_parent' } });
       });
 
-      it('should not confuse object children for multi field children', () => {
+      it('returns nested sub-fields with a subType key describing the relationship', () => {
+        const fields = readFieldCapsResponse(esResponse);
+        const child = fields.find(f => f.name === 'nested_object_parent.child');
+        expect(child).toHaveProperty('subType', { nested: { path: 'nested_object_parent' } });
+      });
+
+      it('handles fields that are both nested and multi', () => {
+        const fields = readFieldCapsResponse(esResponse);
+        const child = fields.find(f => f.name === 'nested_object_parent.child.keyword');
+        expect(child).toHaveProperty(
+          'subType',
+          {
+            nested: { path: 'nested_object_parent' },
+            multi: { parent: 'nested_object_parent.child' }
+          });
+      });
+
+      it('does not include the field actually mapped as nested itself', () => {
+        const fields = readFieldCapsResponse(esResponse);
+        const child = fields.find(f => f.name === 'nested_object_parent');
+        expect(child).toBeUndefined();
+      });
+
+      it('should not confuse object children for multi or nested field children', () => {
         // We detect multi fields by finding fields that have a dot in their name and then looking
-        // to see if their parents are *not* object or nested fields. In the future we may want to
-        // add parent and subType info for object and nested fields but for now we don't need it.
+        // to see if their parents are *not* object fields. In the future we may want to
+        // add subType info for object fields but for now we don't need it.
         const fields = readFieldCapsResponse(esResponse);
         const child = fields.find(f => f.name === 'object_parent.child');
-        expect(child).not.toHaveProperty('parent');
         expect(child).not.toHaveProperty('subType');
       });
     });
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
similarity index 79%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
index cb67d7c79cfacf..06eb30db0b24bb 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/field_caps_response.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -18,9 +18,9 @@
  */
 
 import { uniq } from 'lodash';
-import { FieldDescriptor } from '../..';
+import { castEsToKbnFieldTypeName } from '../../../../../common';
 import { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';
-import { castEsToKbnFieldTypeName } from '../../../../../../plugins/data/common';
+import { FieldDescriptor } from '../../../fetcher';
 
 interface FieldCapObject {
   type: string;
@@ -151,18 +151,38 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
     return field.name.includes('.');
   });
 
-  // Discern which sub fields are multi fields. If the parent field is not an object or nested field
-  // the child must be a multi field.
+  // Determine the type of each sub field.
   subFields.forEach(field => {
-    const parentFieldName = field.name
+    const parentFieldNames = field.name
       .split('.')
       .slice(0, -1)
-      .join('.');
-    const parentFieldCaps = kibanaFormattedCaps.find(caps => caps.name === parentFieldName);
+      .map((_, index, parentFieldNameParts) => {
+        return parentFieldNameParts.slice(0, index + 1).join('.');
+      });
+    const parentFieldCaps = parentFieldNames.map(parentFieldName => {
+      return kibanaFormattedCaps.find(caps => caps.name === parentFieldName);
+    });
+    const parentFieldCapsAscending = parentFieldCaps.reverse();
+
+    if (parentFieldCaps && parentFieldCaps.length > 0) {
+      let subType = {};
+      // If the parent field is not an object or nested field the child must be a multi field.
+      const firstParent = parentFieldCapsAscending[0];
+      if (firstParent && !['object', 'nested'].includes(firstParent.type)) {
+        subType = { ...subType, multi: { parent: firstParent.name } };
+      }
+
+      // We need to know if any parent field is nested
+      const nestedParentCaps = parentFieldCapsAscending.find(
+        parentCaps => parentCaps && parentCaps.type === 'nested'
+      );
+      if (nestedParentCaps) {
+        subType = { ...subType, nested: { path: nestedParentCaps.name } };
+      }
 
-    if (parentFieldCaps && !['object', 'nested'].includes(parentFieldCaps.type)) {
-      field.parent = parentFieldName;
-      field.subType = 'multi';
+      if (Object.keys(subType).length > 0) {
+        field.subType = subType;
+      }
     }
   });
 
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/index.ts
new file mode 100644
index 00000000000000..6a541aff564714
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/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 { getFieldCapabilities } from './field_capabilities';
+export { FieldCapsResponse } from './field_caps_response';
+export { shouldReadFieldFromDocValues } from './should_read_field_from_doc_values';
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/overrides.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts
similarity index 95%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/overrides.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts
index 6310bf02e4430d..518bfeccac01ab 100644
--- a/src/legacy/server/index_patterns/service/lib/field_capabilities/overrides.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/overrides.ts
@@ -18,7 +18,7 @@
  */
 
 import { merge } from 'lodash';
-import { FieldDescriptor } from '../../index_patterns_service';
+import { FieldDescriptor } from '../../index_patterns_fetcher';
 
 const OVERRIDES: Record<string, Partial<FieldDescriptor>> = {
   _source: { type: '_source' },
diff --git a/src/legacy/server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/should_read_field_from_doc_values.ts
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/index.ts b/src/plugins/data/server/index_patterns/fetcher/lib/index.ts
new file mode 100644
index 00000000000000..20e74d2b1a579d
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/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 { getFieldCapabilities, shouldReadFieldFromDocValues } from './field_capabilities';
+export { resolveTimePattern } from './resolve_time_pattern';
+export { createNoMatchingIndicesError } from './errors';
diff --git a/src/legacy/server/index_patterns/service/lib/resolve_time_pattern.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/resolve_time_pattern.test.js
rename to src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.test.js
diff --git a/src/legacy/server/index_patterns/service/lib/resolve_time_pattern.ts b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/resolve_time_pattern.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
diff --git a/src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.test.ts b/src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.test.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.test.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.test.ts
diff --git a/src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.ts b/src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.ts
similarity index 100%
rename from src/legacy/server/index_patterns/service/lib/time_pattern_to_wildcard.ts
rename to src/plugins/data/server/index_patterns/fetcher/lib/time_pattern_to_wildcard.ts
diff --git a/src/plugins/data/server/index_patterns/index.ts b/src/plugins/data/server/index_patterns/index.ts
new file mode 100644
index 00000000000000..6937fa22c4e5d1
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { IndexPatternsFetcher, FieldDescriptor, shouldReadFieldFromDocValues } from './fetcher';
+export { IndexPatternsService } from './index_patterns_service';
diff --git a/src/plugins/data/server/index_patterns/index_patterns_service.ts b/src/plugins/data/server/index_patterns/index_patterns_service.ts
new file mode 100644
index 00000000000000..30d199c0e522e4
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/index_patterns_service.ts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreSetup } from 'kibana/server';
+import { Plugin } from '../../../../core/server';
+import { registerRoutes } from './routes';
+
+export class IndexPatternsService implements Plugin<void> {
+  public setup({ http, elasticsearch }: CoreSetup) {
+    registerRoutes(http, elasticsearch);
+  }
+
+  public start() {}
+}
diff --git a/src/plugins/data/server/index_patterns/routes.ts b/src/plugins/data/server/index_patterns/routes.ts
new file mode 100644
index 00000000000000..7975e923e219bd
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/routes.ts
@@ -0,0 +1,138 @@
+/*
+ * 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 { first } from 'rxjs/operators';
+import { schema } from '@kbn/config-schema';
+import {
+  CoreSetup,
+  KibanaRequest,
+  RequestHandlerContext,
+  APICaller,
+  CallAPIOptions,
+} from '../../../../core/server';
+import { IndexPatternsFetcher } from './fetcher';
+
+export function registerRoutes(http: CoreSetup['http'], elasticsearch: CoreSetup['elasticsearch']) {
+  const getIndexPatternsService = async (request: KibanaRequest): Promise<IndexPatternsFetcher> => {
+    const client = await elasticsearch.dataClient$.pipe(first()).toPromise();
+    const callCluster: APICaller = (
+      endpoint: string,
+      params?: Record<string, any>,
+      options?: CallAPIOptions
+    ) => client.asScoped(request).callAsCurrentUser(endpoint, params, options);
+    return new Promise(resolve => resolve(new IndexPatternsFetcher(callCluster)));
+  };
+
+  const parseMetaFields = (metaFields: string | string[]) => {
+    let parsedFields: string[] = [];
+    if (typeof metaFields === 'string') {
+      parsedFields = JSON.parse(metaFields);
+    } else {
+      parsedFields = metaFields;
+    }
+    return parsedFields;
+  };
+
+  const router = http.createRouter();
+  router.get(
+    {
+      path: '/api/index_patterns/_fields_for_wildcard',
+      validate: {
+        query: schema.object({
+          pattern: schema.string(),
+          meta_fields: schema.oneOf([schema.string(), schema.arrayOf(schema.string())], {
+            defaultValue: [],
+          }),
+        }),
+      },
+    },
+    async (context: RequestHandlerContext, request: any, response: any) => {
+      const indexPatterns = await getIndexPatternsService(request);
+      const { pattern, meta_fields: metaFields } = request.query;
+
+      let parsedFields: string[] = [];
+      try {
+        parsedFields = parseMetaFields(metaFields);
+      } catch (error) {
+        return response.badRequest();
+      }
+
+      try {
+        const fields = await indexPatterns.getFieldsForWildcard({
+          pattern,
+          metaFields: parsedFields,
+        });
+
+        return response.ok({
+          body: { fields },
+          headers: {
+            'content-type': 'application/json',
+          },
+        });
+      } catch (error) {
+        return response.notFound();
+      }
+    }
+  );
+
+  router.get(
+    {
+      path: '/api/index_patterns/_fields_for_time_pattern',
+      validate: {
+        query: schema.object({
+          pattern: schema.string(),
+          interval: schema.maybe(schema.string()),
+          look_back: schema.number({ min: 1 }),
+          meta_fields: schema.oneOf([schema.string(), schema.arrayOf(schema.string())], {
+            defaultValue: [],
+          }),
+        }),
+      },
+    },
+    async (context: RequestHandlerContext, request: any, response: any) => {
+      const indexPatterns = await getIndexPatternsService(request);
+      const { pattern, interval, look_back: lookBack, meta_fields: metaFields } = request.query;
+
+      let parsedFields: string[] = [];
+      try {
+        parsedFields = parseMetaFields(metaFields);
+      } catch (error) {
+        return response.badRequest();
+      }
+
+      try {
+        const fields = await indexPatterns.getFieldsForTimePattern({
+          pattern,
+          interval: interval ? interval : '',
+          lookBack,
+          metaFields: parsedFields,
+        });
+
+        return response.ok({
+          body: { fields },
+          headers: {
+            'content-type': 'application/json',
+          },
+        });
+      } catch (error) {
+        return response.notFound();
+      }
+    }
+  );
+}
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index 9cf08b0702e9e0..e81250e653ebd3 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -18,19 +18,21 @@
  */
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/server';
+import { IndexPatternsService } from './index_patterns';
 import { ISearchSetup } from './search';
 import { SearchService } from './search/search_service';
 
 export interface DataPluginSetup {
   search: ISearchSetup;
 }
-
 export class DataServerPlugin implements Plugin<DataPluginSetup> {
   private readonly searchService: SearchService;
+  private readonly indexPatterns = new IndexPatternsService();
   constructor(initializerContext: PluginInitializerContext) {
     this.searchService = new SearchService(initializerContext);
   }
   public setup(core: CoreSetup) {
+    this.indexPatterns.setup(core);
     return {
       search: this.searchService.setup(core),
     };
diff --git a/src/plugins/embeddable/public/_index.scss b/src/plugins/embeddable/public/_index.scss
new file mode 100644
index 00000000000000..ed80b3f9983e52
--- /dev/null
+++ b/src/plugins/embeddable/public/_index.scss
@@ -0,0 +1,3 @@
+@import './variables';
+@import './lib/panel/index';
+@import './lib/panel/panel_header/index';
diff --git a/src/legacy/core_plugins/embeddable_api/public/_variables.scss b/src/plugins/embeddable/public/_variables.scss
similarity index 100%
rename from src/legacy/core_plugins/embeddable_api/public/_variables.scss
rename to src/plugins/embeddable/public/_variables.scss
diff --git a/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts b/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts
index 99cfb2ea13d07b..e2592b70397f33 100644
--- a/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts
+++ b/src/plugins/embeddable/public/lib/actions/apply_filter_action.ts
@@ -18,16 +18,16 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Filter } from '@kbn/es-query';
 import { IAction, createAction, IncompatibleActionError } from '../ui_actions';
 import { IEmbeddable, EmbeddableInput } from '../embeddables';
+import { esFilters } from '../../../../../plugins/data/public';
 
 export const APPLY_FILTER_ACTION = 'APPLY_FILTER_ACTION';
 
-type RootEmbeddable = IEmbeddable<EmbeddableInput & { filters: Filter[] }>;
+type RootEmbeddable = IEmbeddable<EmbeddableInput & { filters: esFilters.Filter[] }>;
 interface ActionContext {
   embeddable: IEmbeddable;
-  filters: Filter[];
+  filters: esFilters.Filter[];
 }
 
 async function isCompatible(context: ActionContext) {
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
index 802be5bf1282ec..47113ffc59561c 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
@@ -20,7 +20,6 @@
 import { ViewMode, EmbeddableOutput, isErrorEmbeddable } from '../../../../';
 import { AddPanelAction } from './add_panel_action';
 import { EmbeddableFactory } from '../../../../embeddables';
-import { Filter, FilterStateStore } from '@kbn/es-query';
 import {
   FILTERABLE_EMBEDDABLE,
   FilterableEmbeddable,
@@ -32,6 +31,7 @@ import { GetEmbeddableFactory } from '../../../../types';
 // eslint-disable-next-line
 import { coreMock } from '../../../../../../../../core/public/mocks';
 import { ContactCardEmbeddable } from '../../../../test_samples';
+import { esFilters } from '../../../../../../../../plugins/data/public';
 
 const embeddableFactories = new Map<string, EmbeddableFactory>();
 embeddableFactories.set(FILTERABLE_EMBEDDABLE, new FilterableEmbeddableFactory());
@@ -51,8 +51,8 @@ beforeEach(async () => {
     () => null
   );
 
-  const derivedFilter: Filter = {
-    $state: { store: FilterStateStore.APP_STATE },
+  const derivedFilter: esFilters.Filter = {
+    $state: { store: esFilters.FilterStateStore.APP_STATE },
     meta: { disabled: false, alias: 'name', negate: false },
     query: { match: {} },
   };
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
index dd55cd1eacdc21..fd8f286a9d8f6d 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
@@ -27,7 +27,8 @@ import {
 import { HelloWorldContainer } from '../../../../test_samples/embeddables/hello_world_container';
 import { ContactCardEmbeddable } from '../../../../test_samples/embeddables/contact_card/contact_card_embeddable';
 import { ContainerInput } from '../../../../containers';
-import { mount } from 'enzyme';
+import { mountWithIntl as mount } from 'test_utils/enzyme_helpers';
+import { ReactWrapper } from 'enzyme';
 
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
@@ -55,7 +56,7 @@ test('createNewEmbeddable() add embeddable to container', async () => {
   };
   const container = new HelloWorldContainer(input, { getEmbeddableFactory } as any);
   const onClose = jest.fn();
-  const component = mount<AddPanelFlyout>(
+  const component = mount(
     <AddPanelFlyout
       container={container}
       onClose={onClose}
@@ -64,7 +65,7 @@ test('createNewEmbeddable() add embeddable to container', async () => {
       notifications={core.notifications}
       SavedObjectFinder={() => null}
     />
-  );
+  ) as ReactWrapper<unknown, unknown, AddPanelFlyout>;
 
   expect(Object.values(container.getInput().panels).length).toBe(0);
   component.instance().createNewEmbeddable(CONTACT_CARD_EMBEDDABLE);
@@ -109,7 +110,7 @@ test('selecting embeddable in "Create new ..." list calls createNewEmbeddable()'
       notifications={core.notifications}
       SavedObjectFinder={() => null}
     />
-  );
+  ) as ReactWrapper<unknown, unknown, AddPanelFlyout>;
 
   const spy = jest.fn();
   component.instance().createNewEmbeddable = spy;
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
index 8efc9e5b996c53..4f2ae7ab19bcb3 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
@@ -22,21 +22,20 @@ import React from 'react';
 import { CoreSetup } from 'src/core/public';
 
 import {
-  EuiFlexGroup,
-  EuiFlexItem,
+  EuiButton,
+  EuiContextMenuItem,
+  EuiContextMenuPanel,
   EuiFlyout,
   EuiFlyoutBody,
   EuiFlyoutFooter,
   EuiFlyoutHeader,
-  // @ts-ignore
-  EuiSuperSelect,
+  EuiPopover,
   EuiTitle,
-  EuiText,
 } from '@elastic/eui';
 
 import { IContainer } from '../../../../containers';
 import { EmbeddableFactoryNotFoundError } from '../../../../errors';
-import { GetEmbeddableFactory, GetEmbeddableFactories } from '../../../../types';
+import { GetEmbeddableFactories, GetEmbeddableFactory } from '../../../../types';
 
 interface Props {
   onClose: () => void;
@@ -47,9 +46,21 @@ interface Props {
   SavedObjectFinder: React.ComponentType<any>;
 }
 
-export class AddPanelFlyout extends React.Component<Props> {
+interface State {
+  isCreateMenuOpen: boolean;
+}
+
+function capitalize([first, ...letters]: string) {
+  return `${first.toUpperCase()}${letters.join('')}`;
+}
+
+export class AddPanelFlyout extends React.Component<Props, State> {
   private lastToast: any;
 
+  public state = {
+    isCreateMenuOpen: false,
+  };
+
   constructor(props: Props) {
     super(props);
   }
@@ -96,41 +107,27 @@ export class AddPanelFlyout extends React.Component<Props> {
     this.showToast(name);
   };
 
-  private getSelectCreateNewOptions() {
-    const list = [
-      {
-        value: 'createNew',
-        inputDisplay: (
-          <EuiText>
-            <FormattedMessage
-              id="embeddableApi.addPanel.createNewDefaultOption"
-              defaultMessage="Create new ..."
-            />
-          </EuiText>
-        ),
-      },
-      ...[...this.props.getAllFactories()]
-        .filter(
-          factory => factory.isEditable() && !factory.isContainerType && factory.canCreateNew()
-        )
-        .map(factory => ({
-          inputDisplay: (
-            <EuiText>
-              <FormattedMessage
-                id="embeddableApi.addPanel.createNew"
-                defaultMessage="Create new {factoryName}"
-                values={{
-                  factoryName: factory.getDisplayName(),
-                }}
-              />
-            </EuiText>
-          ),
-          value: factory.type,
-          'data-test-subj': `createNew-${factory.type}`,
-        })),
-    ];
-
-    return list;
+  private toggleCreateMenu = () => {
+    this.setState(prevState => ({ isCreateMenuOpen: !prevState.isCreateMenuOpen }));
+  };
+
+  private closeCreateMenu = () => {
+    this.setState({ isCreateMenuOpen: false });
+  };
+
+  private getCreateMenuItems() {
+    return [...this.props.getAllFactories()]
+      .filter(factory => factory.isEditable() && !factory.isContainerType && factory.canCreateNew())
+      .map(factory => (
+        <EuiContextMenuItem
+          key={factory.type}
+          data-test-subj={`createNew-${factory.type}`}
+          onClick={() => this.createNewEmbeddable(factory.type)}
+          className="embPanel__addItem"
+        >
+          {capitalize(factory.getDisplayName())}
+        </EuiContextMenuItem>
+      ));
   }
 
   public render() {
@@ -150,6 +147,7 @@ export class AddPanelFlyout extends React.Component<Props> {
         })}
       />
     );
+
     return (
       <EuiFlyout ownFocus onClose={this.props.onClose} data-test-subj="dashboardAddPanel">
         <EuiFlyoutHeader hasBorder>
@@ -161,16 +159,28 @@ export class AddPanelFlyout extends React.Component<Props> {
         </EuiFlyoutHeader>
         <EuiFlyoutBody>{savedObjectsFinder}</EuiFlyoutBody>
         <EuiFlyoutFooter>
-          <EuiFlexGroup justifyContent="flexEnd">
-            <EuiFlexItem grow={true}>
-              <EuiSuperSelect
+          <EuiPopover
+            id="createNew"
+            button={
+              <EuiButton
                 data-test-subj="createNew"
-                options={this.getSelectCreateNewOptions()}
-                valueOfSelected="createNew"
-                onChange={(value: string) => this.createNewEmbeddable(value)}
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
+                iconType="arrowDown"
+                iconSide="right"
+                onClick={this.toggleCreateMenu}
+              >
+                <FormattedMessage
+                  id="embeddableApi.addPanel.createNewDefaultOption"
+                  defaultMessage="Create new"
+                />
+              </EuiButton>
+            }
+            isOpen={this.state.isCreateMenuOpen}
+            closePopover={this.closeCreateMenu}
+            panelPaddingSize="none"
+            anchorPosition="upLeft"
+          >
+            <EuiContextMenuPanel items={this.getCreateMenuItems()} />
+          </EuiPopover>
         </EuiFlyoutFooter>
       </EuiFlyout>
     );
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
index 550f9706a634b5..8d9beec940acc0 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
@@ -28,7 +28,6 @@ import {
 } from '../../../test_samples';
 // eslint-disable-next-line
 import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
-import { FilterStateStore } from '@kbn/es-query';
 import {
   EmbeddableFactory,
   EmbeddableOutput,
@@ -37,6 +36,7 @@ import {
 } from '../../../embeddables';
 import { GetEmbeddableFactory } from '../../../types';
 import { of } from '../../../../tests/helpers';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 const setup = async () => {
   const embeddableFactories = new Map<string, EmbeddableFactory>();
@@ -48,7 +48,7 @@ const setup = async () => {
       panels: {},
       filters: [
         {
-          $state: { store: FilterStateStore.APP_STATE },
+          $state: { store: esFilters.FilterStateStore.APP_STATE },
           meta: { disabled: false, alias: 'name', negate: false },
           query: { match: {} },
         },
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
index 22e3be89f1ae93..684a8c45a4e890 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/remove_panel_action.test.tsx
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { Filter, FilterStateStore } from '@kbn/es-query';
 import { EmbeddableOutput, isErrorEmbeddable } from '../../../';
 import { RemovePanelAction } from './remove_panel_action';
 import { EmbeddableFactory } from '../../../embeddables';
@@ -30,6 +29,7 @@ import { FilterableEmbeddableFactory } from '../../../test_samples/embeddables/f
 import { FilterableContainer } from '../../../test_samples/embeddables/filterable_container';
 import { GetEmbeddableFactory, ViewMode } from '../../../types';
 import { ContactCardEmbeddable } from '../../../test_samples/embeddables/contact_card/contact_card_embeddable';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 const embeddableFactories = new Map<string, EmbeddableFactory>();
 embeddableFactories.set(FILTERABLE_EMBEDDABLE, new FilterableEmbeddableFactory());
@@ -39,8 +39,8 @@ let container: FilterableContainer;
 let embeddable: FilterableEmbeddable;
 
 beforeEach(async () => {
-  const derivedFilter: Filter = {
-    $state: { store: FilterStateStore.APP_STATE },
+  const derivedFilter: esFilters.Filter = {
+    $state: { store: esFilters.FilterStateStore.APP_STATE },
     meta: { disabled: false, alias: 'name', negate: false },
     query: { match: {} },
   };
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx
index eaef8048a6fbff..de708b778c3c7c 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_container.tsx
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Filter } from '@kbn/es-query';
+
 import { Container, ContainerInput } from '../../containers';
 import { GetEmbeddableFactory } from '../../types';
+import { esFilters } from '../../../../../data/public';
 
 export const FILTERABLE_CONTAINER = 'FILTERABLE_CONTAINER';
 
 export interface FilterableContainerInput extends ContainerInput {
-  filters: Filter[];
+  filters: esFilters.Filter[];
 }
 
 /**
@@ -33,7 +34,7 @@ export interface FilterableContainerInput extends ContainerInput {
  */
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type InheritedChildrenInput = {
-  filters: Filter[];
+  filters: esFilters.Filter[];
   id?: string;
 };
 
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx
index f6885ca25b437a..56aa7688f37a69 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/filterable_embeddable.tsx
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { IContainer } from '../../containers';
 import { EmbeddableOutput, EmbeddableInput, Embeddable } from '../../embeddables';
+import { esFilters } from '../../../../../data/public';
 
 export const FILTERABLE_EMBEDDABLE = 'FILTERABLE_EMBEDDABLE';
 
 export interface FilterableEmbeddableInput extends EmbeddableInput {
-  filters: Filter[];
+  filters: esFilters.Filter[];
 }
 
 export class FilterableEmbeddable extends Embeddable<FilterableEmbeddableInput, EmbeddableOutput> {
diff --git a/src/plugins/embeddable/public/tests/apply_filter_action.test.ts b/src/plugins/embeddable/public/tests/apply_filter_action.test.ts
index 52500acc3dc59d..0721acb1a1fba9 100644
--- a/src/plugins/embeddable/public/tests/apply_filter_action.test.ts
+++ b/src/plugins/embeddable/public/tests/apply_filter_action.test.ts
@@ -32,7 +32,7 @@ import {
 } from '../lib/test_samples';
 // eslint-disable-next-line
 import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
-import { FilterStateStore } from '@kbn/es-query';
+import { esFilters } from '../../../../plugins/data/public';
 
 test('ApplyFilterAction applies the filter to the root of the container tree', async () => {
   const { doStart } = testPlugin();
@@ -76,7 +76,7 @@ test('ApplyFilterAction applies the filter to the root of the container tree', a
   }
 
   const filter: any = {
-    $state: { store: FilterStateStore.APP_STATE },
+    $state: { store: esFilters.FilterStateStore.APP_STATE },
     meta: {
       disabled: false,
       negate: false,
diff --git a/src/plugins/embeddable/public/tests/container.test.ts b/src/plugins/embeddable/public/tests/container.test.ts
index 3bdbcbad857d65..f97c26a41b901b 100644
--- a/src/plugins/embeddable/public/tests/container.test.ts
+++ b/src/plugins/embeddable/public/tests/container.test.ts
@@ -26,7 +26,6 @@ import {
   FILTERABLE_EMBEDDABLE,
 } from '../lib/test_samples/embeddables/filterable_embeddable';
 import { ERROR_EMBEDDABLE_TYPE } from '../lib/embeddables/error_embeddable';
-import { Filter, FilterStateStore } from '@kbn/es-query';
 import { FilterableEmbeddableFactory } from '../lib/test_samples/embeddables/filterable_embeddable_factory';
 import { CONTACT_CARD_EMBEDDABLE } from '../lib/test_samples/embeddables/contact_card/contact_card_embeddable_factory';
 import { SlowContactCardEmbeddableFactory } from '../lib/test_samples/embeddables/contact_card/slow_contact_card_embeddable_factory';
@@ -46,6 +45,7 @@ import {
 import { coreMock } from '../../../../core/public/mocks';
 import { testPlugin } from './test_plugin';
 import { of } from './helpers';
+import { esFilters } from '../../../../plugins/data/public';
 
 async function creatHelloWorldContainerAndEmbeddable(
   containerInput: ContainerInput = { id: 'hello', panels: {} },
@@ -437,8 +437,8 @@ test('Test nested reactions', async done => {
 
 test('Explicit embeddable input mapped to undefined will default to inherited', async () => {
   const { start } = await creatHelloWorldContainerAndEmbeddable();
-  const derivedFilter: Filter = {
-    $state: { store: FilterStateStore.APP_STATE },
+  const derivedFilter: esFilters.Filter = {
+    $state: { store: esFilters.FilterStateStore.APP_STATE },
     meta: { disabled: false, alias: 'name', negate: false },
     query: { match: {} },
   };
diff --git a/src/plugins/embeddable/public/tests/explicit_input.test.ts b/src/plugins/embeddable/public/tests/explicit_input.test.ts
index 6cde7bdc48ba17..47c4b0944cef22 100644
--- a/src/plugins/embeddable/public/tests/explicit_input.test.ts
+++ b/src/plugins/embeddable/public/tests/explicit_input.test.ts
@@ -18,7 +18,6 @@
  */
 
 import { skip } from 'rxjs/operators';
-import { Filter, FilterStateStore } from '@kbn/es-query';
 import { testPlugin } from './test_plugin';
 import {
   FILTERABLE_EMBEDDABLE,
@@ -34,6 +33,7 @@ import { isErrorEmbeddable } from '../lib';
 import { HelloWorldContainer } from '../lib/test_samples/embeddables/hello_world_container';
 // eslint-disable-next-line
 import { coreMock } from '../../../../core/public/mocks';
+import { esFilters } from '../../../../plugins/data/public';
 
 const { setup, doStart, coreStart, uiActions } = testPlugin(
   coreMock.createSetup(),
@@ -50,8 +50,8 @@ setup.registerEmbeddableFactory(CONTACT_CARD_EMBEDDABLE, factory);
 setup.registerEmbeddableFactory(HELLO_WORLD_EMBEDDABLE_TYPE, new HelloWorldEmbeddableFactory());
 
 test('Explicit embeddable input mapped to undefined will default to inherited', async () => {
-  const derivedFilter: Filter = {
-    $state: { store: FilterStateStore.APP_STATE },
+  const derivedFilter: esFilters.Filter = {
+    $state: { store: esFilters.FilterStateStore.APP_STATE },
     meta: { disabled: false, alias: 'name', negate: false },
     query: { match: {} },
   };
diff --git a/src/plugins/expressions/common/expressions/expression_types/index.ts b/src/plugins/expressions/common/expressions/expression_types/index.ts
deleted file mode 100644
index bb8a554487f017..00000000000000
--- a/src/plugins/expressions/common/expressions/expression_types/index.ts
+++ /dev/null
@@ -1,64 +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 { boolean } from './boolean';
-import { datatable } from './datatable';
-import { error } from './error';
-import { filter } from './filter';
-import { image } from './image';
-import { nullType } from './null';
-import { number } from './number';
-import { pointseries } from './pointseries';
-import { range } from './range';
-import { render } from './render';
-import { shape } from './shape';
-import { string } from './string';
-import { style } from './style';
-import { kibanaContext } from './kibana_context';
-import { kibanaDatatable } from './kibana_datatable';
-
-export const typeSpecs = [
-  boolean,
-  datatable,
-  error,
-  filter,
-  image,
-  number,
-  nullType,
-  pointseries,
-  range,
-  render,
-  shape,
-  string,
-  style,
-  kibanaContext,
-  kibanaDatatable,
-];
-
-// Types
-export * from './datatable';
-export * from './error';
-export * from './filter';
-export * from './image';
-export * from './kibana_context';
-export * from './kibana_datatable';
-export * from './pointseries';
-export * from './render';
-export * from './style';
-export * from './range';
diff --git a/src/plugins/expressions/common/expressions/expression_types/kibana_context.ts b/src/plugins/expressions/common/expressions/expression_types/kibana_context.ts
deleted file mode 100644
index 174517abc2c053..00000000000000
--- a/src/plugins/expressions/common/expressions/expression_types/kibana_context.ts
+++ /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 { Filter } from '@kbn/es-query';
-import { TimeRange, Query } from 'src/plugins/data/public';
-
-const name = 'kibana_context';
-export type KIBANA_CONTEXT_NAME = 'kibana_context';
-
-export interface KibanaContext {
-  type: typeof name;
-  query?: Query | Query[];
-  filters?: Filter[];
-  timeRange?: TimeRange;
-}
-
-export const kibanaContext = () => ({
-  name,
-  from: {
-    null: () => {
-      return {
-        type: name,
-      };
-    },
-  },
-  to: {
-    null: () => {
-      return {
-        type: 'null',
-      };
-    },
-  },
-});
diff --git a/src/plugins/expressions/common/expressions/expression_types/range.ts b/src/plugins/expressions/common/expressions/expression_types/range.ts
deleted file mode 100644
index c1a0e4d2075fa8..00000000000000
--- a/src/plugins/expressions/common/expressions/expression_types/range.ts
+++ /dev/null
@@ -1,51 +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 { ExpressionType, Render } from '../../../common/expressions/types';
-
-const name = 'range';
-
-export interface Range {
-  type: typeof name;
-  from: number;
-  to: number;
-}
-
-export const range = (): ExpressionType<typeof name, Range> => ({
-  name,
-  from: {
-    null: (): Range => {
-      return {
-        type: 'range',
-        from: 0,
-        to: 0,
-      };
-    },
-  },
-  to: {
-    render: (value: Range): Render<{ text: string }> => {
-      const text = `from ${value.from} to ${value.to}`;
-      return {
-        type: 'render',
-        as: 'text',
-        value: { text },
-      };
-    },
-  },
-});
diff --git a/src/plugins/expressions/common/expressions/expression_types/style.ts b/src/plugins/expressions/common/expressions/expression_types/style.ts
deleted file mode 100644
index f6ef0f1fe42e6a..00000000000000
--- a/src/plugins/expressions/common/expressions/expression_types/style.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 { ExpressionType } from '../types';
-
-const name = 'style';
-
-export interface Style {
-  type: typeof name;
-  spec: any;
-  css: string;
-}
-
-export const style = (): ExpressionType<typeof name, Style> => ({
-  name,
-  from: {
-    null: () => {
-      return {
-        type: 'style',
-        spec: {},
-        css: '',
-      };
-    },
-  },
-});
diff --git a/src/plugins/expressions/common/expressions/index.ts b/src/plugins/expressions/common/expressions/index.ts
deleted file mode 100644
index 8c8dd7eb26ca59..00000000000000
--- a/src/plugins/expressions/common/expressions/index.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.
- */
-
-export * from './types';
-export { Type } from './interpreter';
-export { interpreterProvider } from './interpreter_provider';
-export { serializeProvider, getType } from './serialize_provider';
diff --git a/src/plugins/expressions/common/expressions/interpreter.ts b/src/plugins/expressions/common/expressions/interpreter.ts
deleted file mode 100644
index 07146b6eb31810..00000000000000
--- a/src/plugins/expressions/common/expressions/interpreter.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { get } from 'lodash';
-
-function getType(node: any) {
-  if (node == null) return 'null';
-  if (typeof node === 'object') {
-    if (!node.type) throw new Error('Objects must have a type property');
-    return node.type;
-  }
-  return typeof node;
-}
-
-export function Type(this: any, config: any) {
-  // Required
-  this.name = config.name;
-
-  // Optional
-  this.help = config.help || ''; // A short help text
-
-  // Optional type validation, useful for checking function output
-  this.validate = config.validate || function validate() {};
-
-  // Optional
-  this.create = config.create;
-
-  // Optional serialization (used when passing context around client/server)
-  this.serialize = config.serialize;
-  this.deserialize = config.deserialize;
-
-  const getToFn = (type: any) => get(config, ['to', type]) || get(config, ['to', '*']);
-  const getFromFn = (type: any) => get(config, ['from', type]) || get(config, ['from', '*']);
-
-  this.castsTo = (type: any) => typeof getToFn(type) === 'function';
-  this.castsFrom = (type: any) => typeof getFromFn(type) === 'function';
-
-  this.to = (node: any, toTypeName: any, types: any) => {
-    const typeName = getType(node);
-    if (typeName !== this.name) {
-      throw new Error(`Can not cast object of type '${typeName}' using '${this.name}'`);
-    } else if (!this.castsTo(toTypeName)) {
-      throw new Error(`Can not cast '${typeName}' to '${toTypeName}'`);
-    }
-
-    return (getToFn(toTypeName) as any)(node, types);
-  };
-
-  this.from = (node: any, types: any) => {
-    const typeName = getType(node);
-    if (!this.castsFrom(typeName)) throw new Error(`Can not cast '${this.name}' from ${typeName}`);
-
-    return (getFromFn(typeName) as any)(node, types);
-  };
-}
diff --git a/src/plugins/expressions/common/expressions/serialize_provider.test.ts b/src/plugins/expressions/common/expressions/serialize_provider.test.ts
deleted file mode 100644
index 774fb34938dd2c..00000000000000
--- a/src/plugins/expressions/common/expressions/serialize_provider.test.ts
+++ /dev/null
@@ -1,48 +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 { getType } from './serialize_provider';
-
-describe('getType()', () => {
-  test('returns "null" string for null or undefined', () => {
-    expect(getType(null)).toBe('null');
-    expect(getType(undefined)).toBe('null');
-  });
-
-  test('returns basic type name', () => {
-    expect(getType(0)).toBe('number');
-    expect(getType(1)).toBe('number');
-    expect(getType(0.8)).toBe('number');
-    expect(getType(Infinity)).toBe('number');
-
-    expect(getType(true)).toBe('boolean');
-    expect(getType(false)).toBe('boolean');
-  });
-
-  test('returns .type property value of objects', () => {
-    expect(getType({ type: 'foo' })).toBe('foo');
-    expect(getType({ type: 'bar' })).toBe('bar');
-  });
-
-  test('throws if object has no .type property', () => {
-    expect(() => getType({})).toThrow();
-    expect(() => getType({ _type: 'foo' })).toThrow();
-    expect(() => getType({ tipe: 'foo' })).toThrow();
-  });
-});
diff --git a/src/plugins/expressions/common/expressions/types/index.ts b/src/plugins/expressions/common/expressions/types/index.ts
deleted file mode 100644
index baa0850cfd76cb..00000000000000
--- a/src/plugins/expressions/common/expressions/types/index.ts
+++ /dev/null
@@ -1,45 +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 { ArgumentType } from './arguments';
-export {
-  TypeToString,
-  KnownTypeToString,
-  TypeString,
-  UnmappedTypeStrings,
-  UnwrapPromise,
-} from './common';
-export { ExpressionFunction, AnyExpressionFunction, FunctionHandlers } from './functions';
-export { ExpressionType, AnyExpressionType } from './types';
-export * from '../expression_types';
-
-export type ExpressionArgAST = string | boolean | number | ExpressionAST;
-
-export interface ExpressionFunctionAST {
-  type: 'function';
-  function: string;
-  arguments: {
-    [key: string]: ExpressionArgAST[];
-  };
-}
-
-export interface ExpressionAST {
-  type: 'expression';
-  chain: ExpressionFunctionAST[];
-}
diff --git a/src/plugins/expressions/common/expressions/types/types.ts b/src/plugins/expressions/common/expressions/types/types.ts
deleted file mode 100644
index 59297e922d313d..00000000000000
--- a/src/plugins/expressions/common/expressions/types/types.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export type ExpressionValueUnboxed = any;
-
-export type ExpressionValueBoxed<Type extends string = string, Value extends object = object> = {
-  type: Type;
-} & Value;
-
-export type ExpressionValue = ExpressionValueUnboxed | ExpressionValueBoxed;
-
-export type ExpressionValueConverter<I extends ExpressionValue, O extends ExpressionValue> = (
-  input: I,
-  availableTypes: Record<string, any>
-) => O;
-
-/**
- * A generic type which represents a custom Expression Type Definition that's
- * registered to the Interpreter.
- */
-export interface ExpressionType<
-  Name extends string,
-  Value extends ExpressionValueUnboxed | ExpressionValueBoxed,
-  SerializedType = undefined
-> {
-  name: Name;
-  validate?: (type: any) => void | Error;
-  serialize?: (type: Value) => SerializedType;
-  deserialize?: (type: SerializedType) => Value;
-  // TODO: Update typings for the `availableTypes` parameter once interfaces for this
-  // have been added elsewhere in the interpreter.
-  from?: {
-    [type: string]: ExpressionValueConverter<any, Value>;
-  };
-  to?: {
-    [type: string]: ExpressionValueConverter<Value, any>;
-  };
-}
-
-export type AnyExpressionType = ExpressionType<string, ExpressionValueBoxed>;
diff --git a/src/plugins/expressions/common/index.ts b/src/plugins/expressions/common/index.ts
deleted file mode 100644
index af870208f4865c..00000000000000
--- a/src/plugins/expressions/common/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from './expressions';
diff --git a/src/plugins/expressions/kibana.json b/src/plugins/expressions/kibana.json
index ce2b1854cf4158..ec87b56f3745ed 100644
--- a/src/plugins/expressions/kibana.json
+++ b/src/plugins/expressions/kibana.json
@@ -2,5 +2,8 @@
   "id": "expressions",
   "version": "kibana",
   "server": false,
-  "ui": true
+  "ui": true,
+  "requiredPlugins": [
+    "inspector"
+  ]
 }
diff --git a/src/plugins/expressions/common/expressions/create_error.ts b/src/plugins/expressions/public/create_error.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/create_error.ts
rename to src/plugins/expressions/public/create_error.ts
diff --git a/src/plugins/expressions/public/create_handlers.ts b/src/plugins/expressions/public/create_handlers.ts
new file mode 100644
index 00000000000000..46e85411c58956
--- /dev/null
+++ b/src/plugins/expressions/public/create_handlers.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export function createHandlers() {
+  return {
+    environment: 'client',
+  };
+}
diff --git a/src/plugins/expressions/common/expressions/expression_types/boolean.ts b/src/plugins/expressions/public/expression_types/boolean.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/boolean.ts
rename to src/plugins/expressions/public/expression_types/boolean.ts
diff --git a/src/plugins/expressions/common/expressions/expression_types/datatable.ts b/src/plugins/expressions/public/expression_types/datatable.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/datatable.ts
rename to src/plugins/expressions/public/expression_types/datatable.ts
diff --git a/src/plugins/expressions/common/expressions/expression_types/error.ts b/src/plugins/expressions/public/expression_types/error.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/error.ts
rename to src/plugins/expressions/public/expression_types/error.ts
diff --git a/src/plugins/expressions/common/expressions/expression_types/filter.ts b/src/plugins/expressions/public/expression_types/filter.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/filter.ts
rename to src/plugins/expressions/public/expression_types/filter.ts
diff --git a/src/plugins/expressions/common/expressions/expression_types/image.ts b/src/plugins/expressions/public/expression_types/image.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/image.ts
rename to src/plugins/expressions/public/expression_types/image.ts
diff --git a/src/plugins/expressions/public/expression_types/index.ts b/src/plugins/expressions/public/expression_types/index.ts
new file mode 100644
index 00000000000000..a5d182fee75edd
--- /dev/null
+++ b/src/plugins/expressions/public/expression_types/index.ts
@@ -0,0 +1,68 @@
+/*
+ * 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 { boolean } from './boolean';
+import { datatable } from './datatable';
+import { error } from './error';
+import { filter } from './filter';
+import { image } from './image';
+import { kibanaContext } from './kibana_context';
+import { kibanaDatatable } from './kibana_datatable';
+import { nullType } from './null';
+import { number } from './number';
+import { pointseries } from './pointseries';
+import { range } from './range';
+import { render } from './render';
+import { shape } from './shape';
+import { string } from './string';
+import { style } from './style';
+
+export const typeSpecs = [
+  boolean,
+  datatable,
+  error,
+  filter,
+  image,
+  kibanaContext,
+  kibanaDatatable,
+  nullType,
+  number,
+  pointseries,
+  range,
+  render,
+  shape,
+  string,
+  style,
+];
+
+export * from './boolean';
+export * from './datatable';
+export * from './error';
+export * from './filter';
+export * from './image';
+export * from './kibana_context';
+export * from './kibana_datatable';
+export * from './null';
+export * from './number';
+export * from './pointseries';
+export * from './range';
+export * from './render';
+export * from './shape';
+export * from './string';
+export * from './style';
diff --git a/src/plugins/expressions/public/expression_types/kibana_context.ts b/src/plugins/expressions/public/expression_types/kibana_context.ts
new file mode 100644
index 00000000000000..bcf8e2853dec88
--- /dev/null
+++ b/src/plugins/expressions/public/expression_types/kibana_context.ts
@@ -0,0 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { TimeRange, Query, esFilters } from 'src/plugins/data/public';
+
+const name = 'kibana_context';
+export type KIBANA_CONTEXT_NAME = 'kibana_context';
+
+export interface KibanaContext {
+  type: typeof name;
+  query?: Query | Query[];
+  filters?: esFilters.Filter[];
+  timeRange?: TimeRange;
+}
+
+export const kibanaContext = () => ({
+  name,
+  from: {
+    null: () => {
+      return {
+        type: name,
+      };
+    },
+  },
+  to: {
+    null: () => {
+      return {
+        type: 'null',
+      };
+    },
+  },
+});
diff --git a/src/plugins/expressions/common/expressions/expression_types/kibana_datatable.ts b/src/plugins/expressions/public/expression_types/kibana_datatable.ts
similarity index 97%
rename from src/plugins/expressions/common/expressions/expression_types/kibana_datatable.ts
rename to src/plugins/expressions/public/expression_types/kibana_datatable.ts
index 7f77e226ff1d9d..c360a2be8c7f7b 100644
--- a/src/plugins/expressions/common/expressions/expression_types/kibana_datatable.ts
+++ b/src/plugins/expressions/public/expression_types/kibana_datatable.ts
@@ -19,7 +19,7 @@
 
 import { map } from 'lodash';
 import { SerializedFieldFormat } from '../types/common';
-import { Datatable, PointSeries } from '../types';
+import { Datatable, PointSeries } from '.';
 
 const name = 'kibana_datatable';
 
diff --git a/src/plugins/expressions/common/expressions/expression_types/null.ts b/src/plugins/expressions/public/expression_types/null.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/null.ts
rename to src/plugins/expressions/public/expression_types/null.ts
diff --git a/src/plugins/expressions/common/expressions/expression_types/number.ts b/src/plugins/expressions/public/expression_types/number.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/number.ts
rename to src/plugins/expressions/public/expression_types/number.ts
diff --git a/src/plugins/expressions/common/expressions/expression_types/pointseries.ts b/src/plugins/expressions/public/expression_types/pointseries.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/pointseries.ts
rename to src/plugins/expressions/public/expression_types/pointseries.ts
diff --git a/src/plugins/expressions/public/expression_types/range.ts b/src/plugins/expressions/public/expression_types/range.ts
new file mode 100644
index 00000000000000..082056c909988b
--- /dev/null
+++ b/src/plugins/expressions/public/expression_types/range.ts
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ExpressionType } from '../types';
+import { Render } from '.';
+
+const name = 'range';
+
+export interface Range {
+  type: typeof name;
+  from: number;
+  to: number;
+}
+
+export const range = (): ExpressionType<typeof name, Range> => ({
+  name,
+  from: {
+    null: (): Range => {
+      return {
+        type: 'range',
+        from: 0,
+        to: 0,
+      };
+    },
+  },
+  to: {
+    render: (value: Range): Render<{ text: string }> => {
+      const text = `from ${value.from} to ${value.to}`;
+      return {
+        type: 'render',
+        as: 'text',
+        value: { text },
+      };
+    },
+  },
+});
diff --git a/src/plugins/expressions/common/expressions/expression_types/render.ts b/src/plugins/expressions/public/expression_types/render.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/render.ts
rename to src/plugins/expressions/public/expression_types/render.ts
diff --git a/src/plugins/expressions/common/expressions/expression_types/shape.ts b/src/plugins/expressions/public/expression_types/shape.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/shape.ts
rename to src/plugins/expressions/public/expression_types/shape.ts
diff --git a/src/plugins/expressions/common/expressions/expression_types/string.ts b/src/plugins/expressions/public/expression_types/string.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/expression_types/string.ts
rename to src/plugins/expressions/public/expression_types/string.ts
diff --git a/src/plugins/expressions/public/expression_types/style.ts b/src/plugins/expressions/public/expression_types/style.ts
new file mode 100644
index 00000000000000..d93893d25c11cf
--- /dev/null
+++ b/src/plugins/expressions/public/expression_types/style.ts
@@ -0,0 +1,35 @@
+/*
+ * 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 { ExpressionType, ExpressionTypeStyle } from '../types';
+
+const name = 'style';
+
+export const style = (): ExpressionType<typeof name, ExpressionTypeStyle> => ({
+  name,
+  from: {
+    null: () => {
+      return {
+        type: 'style',
+        spec: {},
+        css: '',
+      };
+    },
+  },
+});
diff --git a/src/plugins/expressions/public/expressions/expressions_service.ts b/src/plugins/expressions/public/expressions/expressions_service.ts
deleted file mode 100644
index 4b6820143b794b..00000000000000
--- a/src/plugins/expressions/public/expressions/expressions_service.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { FunctionsRegistry, RenderFunctionsRegistry, TypesRegistry } from './interpreter';
-import { AnyExpressionType, AnyExpressionFunction } from '../../common/expressions/types';
-
-export interface ExpressionsSetupContract {
-  registerFunction: (fn: () => AnyExpressionFunction) => void;
-  registerRenderer: (renderer: any) => void;
-  registerType: (type: () => AnyExpressionType) => void;
-  __LEGACY: {
-    functions: FunctionsRegistry;
-    renderers: RenderFunctionsRegistry;
-    types: TypesRegistry;
-  };
-}
-
-export type ExpressionsStartContract = ExpressionsSetupContract;
-
-export class ExpressionsService {
-  private readonly functions = new FunctionsRegistry();
-  private readonly renderers = new RenderFunctionsRegistry();
-  private readonly types = new TypesRegistry();
-
-  private setupApi!: ExpressionsSetupContract;
-
-  public setup() {
-    const { functions, renderers, types } = this;
-
-    this.setupApi = {
-      registerFunction: fn => {
-        this.functions.register(fn);
-      },
-      registerRenderer: (renderer: any) => {
-        this.renderers.register(renderer);
-      },
-      registerType: type => {
-        this.types.register(type);
-      },
-      __LEGACY: {
-        functions,
-        renderers,
-        types,
-      },
-    };
-
-    return this.setupApi;
-  }
-
-  public start(): ExpressionsStartContract {
-    return this.setupApi as ExpressionsStartContract;
-  }
-}
diff --git a/src/plugins/expressions/public/expressions/interpreter.ts b/src/plugins/expressions/public/expressions/interpreter.ts
deleted file mode 100644
index f27ef57c7980ac..00000000000000
--- a/src/plugins/expressions/public/expressions/interpreter.ts
+++ /dev/null
@@ -1,173 +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.
- */
-
-/**
- * @todo
- * This whole file needs major refactoring. `Registry` class does not do anything
- * useful. "Wrappers" like `RenderFunction` basically just set default props on the objects.
- */
-
-/* eslint-disable max-classes-per-file */
-import { clone, mapValues, includes } from 'lodash';
-import { Type } from '../../common/expressions/interpreter';
-import { ExpressionType, AnyExpressionFunction } from '../../common/expressions/types';
-
-export class Registry<ItemSpec, Item> {
-  _prop: string;
-  _indexed: any;
-
-  constructor(prop: string = 'name') {
-    if (typeof prop !== 'string') throw new Error('Registry property name must be a string');
-    this._prop = prop;
-    this._indexed = new Object();
-  }
-
-  wrapper(obj: ItemSpec) {
-    return obj;
-  }
-
-  register(fn: () => ItemSpec) {
-    if (typeof fn !== 'function') throw new Error(`Register requires an function`);
-
-    const obj = fn() as any;
-
-    if (typeof obj !== 'object' || !obj[this._prop]) {
-      throw new Error(`Registered functions must return an object with a ${this._prop} property`);
-    }
-
-    this._indexed[obj[this._prop].toLowerCase()] = this.wrapper(obj);
-  }
-
-  toJS(): Record<string, any> {
-    return Object.keys(this._indexed).reduce(
-      (acc, key) => {
-        acc[key] = this.get(key);
-        return acc;
-      },
-      {} as any
-    );
-  }
-
-  toArray(): Item[] {
-    return Object.keys(this._indexed).map(key => this.get(key)!);
-  }
-
-  get(name: string): Item | null {
-    if (name === undefined) {
-      return null;
-    }
-    const lowerCaseName = name.toLowerCase();
-    return this._indexed[lowerCaseName] ? clone(this._indexed[lowerCaseName]) : null;
-  }
-
-  getProp(): string {
-    return this._prop;
-  }
-
-  reset() {
-    this._indexed = new Object();
-  }
-}
-
-function RenderFunction(this: any, config: any) {
-  // This must match the name of the function that is used to create the `type: render` object
-  this.name = config.name;
-
-  // Use this to set a more friendly name
-  this.displayName = config.displayName || this.name;
-
-  // A sentence or few about what this element does
-  this.help = config.help;
-
-  // used to validate the data before calling the render function
-  this.validate = config.validate || function validate() {};
-
-  // tell the renderer if the dom node should be reused, it's recreated each time by default
-  this.reuseDomNode = Boolean(config.reuseDomNode);
-
-  // the function called to render the data
-  this.render =
-    config.render ||
-    function render(domNode: any, data: any, done: any) {
-      done();
-    };
-}
-
-export function Arg(this: any, config: any) {
-  if (config.name === '_') throw Error('Arg names must not be _. Use it in aliases instead.');
-  this.name = config.name;
-  this.required = config.required || false;
-  this.help = config.help || '';
-  this.types = config.types || [];
-  this.default = config.default;
-  this.aliases = config.aliases || [];
-  this.multi = config.multi == null ? false : config.multi;
-  this.resolve = config.resolve == null ? true : config.resolve;
-  this.options = config.options || [];
-  this.accepts = (type: any) => {
-    if (!this.types.length) return true;
-    return includes(config.types, type);
-  };
-}
-
-export function Fn(this: any, config: any) {
-  // Required
-  this.name = config.name; // Name of function
-
-  // Return type of function.
-  // This SHOULD be supplied. We use it for UI and autocomplete hinting,
-  // We may also use it for optimizations in the future.
-  this.type = config.type;
-  this.aliases = config.aliases || [];
-
-  // Function to run function (context, args)
-  this.fn = (...args: any) => Promise.resolve(config.fn(...args));
-
-  // Optional
-  this.help = config.help || ''; // A short help text
-  this.args = mapValues(
-    config.args || {},
-    (arg: any, name: any) => new (Arg as any)({ name, ...arg })
-  );
-
-  this.context = config.context || {};
-
-  this.accepts = (type: any) => {
-    if (!this.context.types) return true; // If you don't tell us about context, we'll assume you don't care what you get
-    return includes(this.context.types, type); // Otherwise, check it
-  };
-}
-
-export class RenderFunctionsRegistry extends Registry<any, any> {
-  wrapper(obj: any) {
-    return new (RenderFunction as any)(obj);
-  }
-}
-
-export class FunctionsRegistry extends Registry<AnyExpressionFunction, any> {
-  wrapper(obj: any) {
-    return new (Fn as any)(obj);
-  }
-}
-
-export class TypesRegistry extends Registry<ExpressionType<any, any>, any> {
-  wrapper(obj: any) {
-    return new (Type as any)(obj);
-  }
-}
diff --git a/src/plugins/expressions/public/fonts.ts b/src/plugins/expressions/public/fonts.ts
new file mode 100644
index 00000000000000..cdf3d4c16f3b57
--- /dev/null
+++ b/src/plugins/expressions/public/fonts.ts
@@ -0,0 +1,151 @@
+/*
+ * 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.
+ */
+
+/**
+ * This type contains a unions of all supported font labels, or the the name of
+ * the font the user would see in a UI.
+ */
+export type FontLabel = typeof fonts[number]['label'];
+
+/**
+ * This type contains a union of all supported font values, equivalent to the CSS
+ * `font-value` property.
+ */
+export type FontValue = typeof fonts[number]['value'];
+
+/**
+ * An interface representing a font in Canvas, with a textual label and the CSS
+ * `font-value`.
+ */
+export interface Font {
+  label: FontLabel;
+  value: FontValue;
+}
+
+// This function allows one to create a strongly-typed font for inclusion in
+// the font collection.  As a result, the values and labels are known to the
+// type system, preventing one from specifying a non-existent font at build
+// time.
+function createFont<
+  RawFont extends { value: RawFontValue; label: RawFontLabel },
+  RawFontValue extends string,
+  RawFontLabel extends string
+>(font: RawFont) {
+  return font;
+}
+
+export const americanTypewriter = createFont({
+  label: 'American Typewriter',
+  value: "'American Typewriter', 'Courier New', Courier, Monaco, mono",
+});
+
+export const arial = createFont({ label: 'Arial', value: 'Arial, sans-serif' });
+
+export const baskerville = createFont({
+  label: 'Baskerville',
+  value: "Baskerville, Georgia, Garamond, 'Times New Roman', Times, serif",
+});
+
+export const bookAntiqua = createFont({
+  label: 'Book Antiqua',
+  value: "'Book Antiqua', Georgia, Garamond, 'Times New Roman', Times, serif",
+});
+
+export const brushScript = createFont({
+  label: 'Brush Script',
+  value: "'Brush Script MT', 'Comic Sans', sans-serif",
+});
+
+export const chalkboard = createFont({
+  label: 'Chalkboard',
+  value: "Chalkboard, 'Comic Sans', sans-serif",
+});
+
+export const didot = createFont({
+  label: 'Didot',
+  value: "Didot, Georgia, Garamond, 'Times New Roman', Times, serif",
+});
+
+export const futura = createFont({
+  label: 'Futura',
+  value: 'Futura, Impact, Helvetica, Arial, sans-serif',
+});
+
+export const gillSans = createFont({
+  label: 'Gill Sans',
+  value:
+    "'Gill Sans', 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, Arial, sans-serif",
+});
+
+export const helveticaNeue = createFont({
+  label: 'Helvetica Neue',
+  value: "'Helvetica Neue', Helvetica, Arial, sans-serif",
+});
+
+export const hoeflerText = createFont({
+  label: 'Hoefler Text',
+  value: "'Hoefler Text', Garamond, Georgia, 'Times New Roman', Times, serif",
+});
+
+export const lucidaGrande = createFont({
+  label: 'Lucida Grande',
+  value: "'Lucida Grande', 'Lucida Sans Unicode', Lucida, Verdana, Helvetica, Arial, sans-serif",
+});
+
+export const myriad = createFont({
+  label: 'Myriad',
+  value: 'Myriad, Helvetica, Arial, sans-serif',
+});
+
+export const openSans = createFont({
+  label: 'Open Sans',
+  value: "'Open Sans', Helvetica, Arial, sans-serif",
+});
+
+export const optima = createFont({
+  label: 'Optima',
+  value: "Optima, 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Helvetica, Arial, sans-serif",
+});
+
+export const palatino = createFont({
+  label: 'Palatino',
+  value: "Palatino, 'Book Antiqua', Georgia, Garamond, 'Times New Roman', Times, serif",
+});
+
+/**
+ * A collection of supported fonts.
+ */
+export const fonts = [
+  americanTypewriter,
+  arial,
+  baskerville,
+  bookAntiqua,
+  brushScript,
+  chalkboard,
+  didot,
+  futura,
+  gillSans,
+  helveticaNeue,
+  hoeflerText,
+  lucidaGrande,
+  myriad,
+  openSans,
+  optima,
+  palatino,
+];
diff --git a/src/plugins/expressions/public/functions/clog.ts b/src/plugins/expressions/public/functions/clog.ts
new file mode 100644
index 00000000000000..929075b882b964
--- /dev/null
+++ b/src/plugins/expressions/public/functions/clog.ts
@@ -0,0 +1,35 @@
+/*
+ * 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 { ExpressionFunction } from '../types';
+
+const name = 'clog';
+
+type Context = any;
+type ClogExpressionFunction = ExpressionFunction<typeof name, Context, {}, Context>;
+
+export const clog = (): ClogExpressionFunction => ({
+  name,
+  args: {},
+  help: 'Outputs the context to the console',
+  fn: context => {
+    console.log(context); // eslint-disable-line no-console
+    return context;
+  },
+});
diff --git a/src/plugins/expressions/public/functions/font.ts b/src/plugins/expressions/public/functions/font.ts
new file mode 100644
index 00000000000000..33e28924f3ee1f
--- /dev/null
+++ b/src/plugins/expressions/public/functions/font.ts
@@ -0,0 +1,186 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { openSans, FontLabel as FontFamily } from '../fonts';
+import { ExpressionFunction } from '../types';
+import { CSSStyle, FontStyle, FontWeight, Style, TextAlignment, TextDecoration } from '../types';
+
+const dashify = (str: string) => {
+  return str
+    .trim()
+    .replace(/([a-z])([A-Z])/g, '$1-$2')
+    .replace(/\W/g, m => (/[À-ž]/.test(m) ? m : '-'))
+    .replace(/^-+|-+$/g, '')
+    .toLowerCase();
+};
+
+const inlineStyle = (obj: Record<string, string | number>) => {
+  if (!obj) return '';
+  const styles = Object.keys(obj).map(key => {
+    const prop = dashify(key);
+    const line = prop.concat(':').concat(String(obj[key]));
+    return line;
+  });
+  return styles.join(';');
+};
+
+interface Arguments {
+  align?: TextAlignment;
+  color?: string;
+  family?: FontFamily;
+  italic?: boolean;
+  lHeight?: number | null;
+  size?: number;
+  underline?: boolean;
+  weight?: FontWeight;
+}
+
+export function font(): ExpressionFunction<'font', null, Arguments, Style> {
+  return {
+    name: 'font',
+    aliases: [],
+    type: 'style',
+    help: i18n.translate('expressions_np.functions.fontHelpText', {
+      defaultMessage: 'Create a font style.',
+    }),
+    context: {
+      types: ['null'],
+    },
+    args: {
+      align: {
+        default: 'left',
+        help: i18n.translate('expressions_np.functions.font.args.alignHelpText', {
+          defaultMessage: 'The horizontal text alignment.',
+        }),
+        options: Object.values(TextAlignment),
+        types: ['string'],
+      },
+      color: {
+        help: i18n.translate('expressions_np.functions.font.args.colorHelpText', {
+          defaultMessage: 'The text color.',
+        }),
+        types: ['string'],
+      },
+      family: {
+        default: `"${openSans.value}"`,
+        help: i18n.translate('expressions_np.functions.font.args.familyHelpText', {
+          defaultMessage: 'An acceptable {css} web font string',
+          values: {
+            css: 'CSS',
+          },
+        }),
+        types: ['string'],
+      },
+      italic: {
+        default: false,
+        help: i18n.translate('expressions_np.functions.font.args.italicHelpText', {
+          defaultMessage: 'Italicize the text?',
+        }),
+        options: [true, false],
+        types: ['boolean'],
+      },
+      lHeight: {
+        default: null,
+        aliases: ['lineHeight'],
+        help: i18n.translate('expressions_np.functions.font.args.lHeightHelpText', {
+          defaultMessage: 'The line height in pixels',
+        }),
+        types: ['number', 'null'],
+      },
+      size: {
+        default: 14,
+        help: i18n.translate('expressions_np.functions.font.args.sizeHelpText', {
+          defaultMessage: 'The font size in pixels',
+        }),
+        types: ['number'],
+      },
+      underline: {
+        default: false,
+        help: i18n.translate('expressions_np.functions.font.args.underlineHelpText', {
+          defaultMessage: 'Underline the text?',
+        }),
+        options: [true, false],
+        types: ['boolean'],
+      },
+      weight: {
+        default: 'normal',
+        help: i18n.translate('expressions_np.functions.font.args.weightHelpText', {
+          defaultMessage: 'The font weight. For example, {list}, or {end}.',
+          values: {
+            list: Object.values(FontWeight)
+              .slice(0, -1)
+              .map(weight => `\`"${weight}"\``)
+              .join(', '),
+            end: `\`"${Object.values(FontWeight).slice(-1)[0]}"\``,
+          },
+        }),
+        options: Object.values(FontWeight),
+        types: ['string'],
+      },
+    },
+    fn: (_context, args) => {
+      if (!Object.values(FontWeight).includes(args.weight!)) {
+        throw new Error(
+          i18n.translate('expressions_np.functions.font.invalidFontWeightErrorMessage', {
+            defaultMessage: "Invalid font weight: '{weight}'",
+            values: {
+              weight: args.weight,
+            },
+          })
+        );
+      }
+      if (!Object.values(TextAlignment).includes(args.align!)) {
+        throw new Error(
+          i18n.translate('expressions_np.functions.font.invalidTextAlignmentErrorMessage', {
+            defaultMessage: "Invalid text alignment: '{align}'",
+            values: {
+              align: args.align,
+            },
+          })
+        );
+      }
+
+      // the line height shouldn't ever be lower than the size, and apply as a
+      // pixel setting
+      const lineHeight = args.lHeight != null ? `${args.lHeight}px` : '1';
+
+      const spec: CSSStyle = {
+        fontFamily: args.family,
+        fontWeight: args.weight,
+        fontStyle: args.italic ? FontStyle.ITALIC : FontStyle.NORMAL,
+        textDecoration: args.underline ? TextDecoration.UNDERLINE : TextDecoration.NONE,
+        textAlign: args.align,
+        fontSize: `${args.size}px`, // apply font size as a pixel setting
+        lineHeight, // apply line height as a pixel setting
+      };
+
+      // conditionally apply styles based on input
+      if (args.color) {
+        spec.color = args.color;
+      }
+
+      return {
+        type: 'style',
+        spec,
+        css: inlineStyle(spec as Record<string, string | number>),
+      };
+    },
+  };
+}
diff --git a/src/plugins/expressions/public/functions/kibana.ts b/src/plugins/expressions/public/functions/kibana.ts
new file mode 100644
index 00000000000000..7ed9619675aead
--- /dev/null
+++ b/src/plugins/expressions/public/functions/kibana.ts
@@ -0,0 +1,64 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { ExpressionFunction } from '../types';
+import { KibanaContext } from '../expression_types';
+
+export type ExpressionFunctionKibana = ExpressionFunction<
+  'kibana',
+  KibanaContext | null,
+  object,
+  KibanaContext
+>;
+
+export const kibana = (): ExpressionFunctionKibana => ({
+  name: 'kibana',
+  type: 'kibana_context',
+
+  context: {
+    types: ['kibana_context', 'null'],
+  },
+
+  help: i18n.translate('expressions_np.functions.kibana.help', {
+    defaultMessage: 'Gets kibana global context',
+  }),
+  args: {},
+  fn(context, args, handlers) {
+    const initialContext = handlers.getInitialContext ? handlers.getInitialContext() : {};
+
+    if (context && context.query) {
+      initialContext.query = initialContext.query.concat(context.query);
+    }
+
+    if (context && context.filters) {
+      initialContext.filters = initialContext.filters.concat(context.filters);
+    }
+
+    const timeRange = initialContext.timeRange || (context ? context.timeRange : undefined);
+
+    return {
+      ...context,
+      type: 'kibana_context',
+      query: initialContext.query,
+      filters: initialContext.filters,
+      timeRange,
+    };
+  },
+});
diff --git a/src/plugins/expressions/public/functions/kibana_context.ts b/src/plugins/expressions/public/functions/kibana_context.ts
new file mode 100644
index 00000000000000..2a0cd09734b6d4
--- /dev/null
+++ b/src/plugins/expressions/public/functions/kibana_context.ts
@@ -0,0 +1,113 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { ExpressionFunction } from '../types';
+import { KibanaContext } from '../expression_types';
+import { savedObjects } from '../services';
+
+interface Arguments {
+  q?: string | null;
+  filters?: string | null;
+  timeRange?: string | null;
+  savedSearchId?: string | null;
+}
+
+export type ExpressionFunctionKibanaContext = ExpressionFunction<
+  'kibana_context',
+  KibanaContext | null,
+  Arguments,
+  Promise<KibanaContext>
+>;
+
+export const kibanaContext = (): ExpressionFunctionKibanaContext => ({
+  name: 'kibana_context',
+  type: 'kibana_context',
+  context: {
+    types: ['kibana_context', 'null'],
+  },
+  help: i18n.translate('expressions_np.functions.kibana_context.help', {
+    defaultMessage: 'Updates kibana global context',
+  }),
+  args: {
+    q: {
+      types: ['string', 'null'],
+      aliases: ['query', '_'],
+      default: null,
+      help: i18n.translate('expressions_np.functions.kibana_context.q.help', {
+        defaultMessage: 'Specify Kibana free form text query',
+      }),
+    },
+    filters: {
+      types: ['string', 'null'],
+      default: '"[]"',
+      help: i18n.translate('expressions_np.functions.kibana_context.filters.help', {
+        defaultMessage: 'Specify Kibana generic filters',
+      }),
+    },
+    timeRange: {
+      types: ['string', 'null'],
+      default: null,
+      help: i18n.translate('expressions_np.functions.kibana_context.timeRange.help', {
+        defaultMessage: 'Specify Kibana time range filter',
+      }),
+    },
+    savedSearchId: {
+      types: ['string', 'null'],
+      default: null,
+      help: i18n.translate('expressions_np.functions.kibana_context.savedSearchId.help', {
+        defaultMessage: 'Specify saved search ID to be used for queries and filters',
+      }),
+    },
+  },
+  async fn(context, args, handlers) {
+    const queryArg = args.q ? JSON.parse(args.q) : [];
+    let queries = Array.isArray(queryArg) ? queryArg : [queryArg];
+    let filters = args.filters ? JSON.parse(args.filters) : [];
+
+    if (args.savedSearchId) {
+      const obj = await savedObjects.get('search', args.savedSearchId);
+      const search = obj.attributes.kibanaSavedObjectMeta as { searchSourceJSON: string };
+      const data = JSON.parse(search.searchSourceJSON) as { query: string; filter: any[] };
+      queries = queries.concat(data.query);
+      filters = filters.concat(data.filter);
+    }
+
+    if (context && context.query) {
+      queries = queries.concat(context.query);
+    }
+
+    if (context && context.filters) {
+      filters = filters.concat(context.filters).filter((f: any) => !f.meta.disabled);
+    }
+
+    const timeRange = args.timeRange
+      ? JSON.parse(args.timeRange)
+      : context
+      ? context.timeRange
+      : undefined;
+
+    return {
+      type: 'kibana_context',
+      query: queries,
+      filters,
+      timeRange,
+    };
+  },
+});
diff --git a/src/legacy/core_plugins/interpreter/public/functions/__snapshots__/kibana.test.ts.snap b/src/plugins/expressions/public/functions/tests/__snapshots__/kibana.test.ts.snap
similarity index 100%
rename from src/legacy/core_plugins/interpreter/public/functions/__snapshots__/kibana.test.ts.snap
rename to src/plugins/expressions/public/functions/tests/__snapshots__/kibana.test.ts.snap
diff --git a/src/legacy/core_plugins/interpreter/public/functions/font.test.ts b/src/plugins/expressions/public/functions/tests/font.test.ts
similarity index 97%
rename from src/legacy/core_plugins/interpreter/public/functions/font.test.ts
rename to src/plugins/expressions/public/functions/tests/font.test.ts
index 7032e042a59ea4..a0397b920f9054 100644
--- a/src/legacy/core_plugins/interpreter/public/functions/font.test.ts
+++ b/src/plugins/expressions/public/functions/tests/font.test.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { openSans } from '../../common/lib/fonts';
-import { font } from './font';
-import { functionWrapper } from '../../test_helpers';
+import { openSans } from '../../fonts';
+import { font } from '../font';
+import { functionWrapper } from './utils';
 
 describe('font', () => {
   const fn = functionWrapper(font);
diff --git a/src/legacy/core_plugins/interpreter/public/functions/kibana.test.ts b/src/plugins/expressions/public/functions/tests/kibana.test.ts
similarity index 93%
rename from src/legacy/core_plugins/interpreter/public/functions/kibana.test.ts
rename to src/plugins/expressions/public/functions/tests/kibana.test.ts
index cd67825b534cd4..d9489d724cc70b 100644
--- a/src/legacy/core_plugins/interpreter/public/functions/kibana.test.ts
+++ b/src/plugins/expressions/public/functions/tests/kibana.test.ts
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import { functionWrapper } from '../../test_helpers';
-import { kibana } from './kibana';
-import { KibanaContext, FunctionHandlers } from '../../types';
+import { functionWrapper } from './utils';
+import { kibana } from '../kibana';
+import { FunctionHandlers } from '../../types';
+import { KibanaContext } from '../../expression_types';
 
 describe('interpreter/functions#kibana', () => {
   const fn = functionWrapper(kibana);
diff --git a/src/plugins/expressions/public/functions/tests/utils.ts b/src/plugins/expressions/public/functions/tests/utils.ts
new file mode 100644
index 00000000000000..5eb9c1a0d6390f
--- /dev/null
+++ b/src/plugins/expressions/public/functions/tests/utils.ts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mapValues } from 'lodash';
+import { AnyExpressionFunction, FunctionHandlers } from '../../types';
+
+// Takes a function spec and passes in default args,
+// overriding with any provided args.
+export const functionWrapper = <T extends AnyExpressionFunction>(fnSpec: () => T) => {
+  const spec = fnSpec();
+  const defaultArgs = mapValues(spec.args, argSpec => argSpec.default);
+  return (
+    context: object | null,
+    args: Record<string, any> = {},
+    handlers: FunctionHandlers = {}
+  ) => spec.fn(context, { ...defaultArgs, ...args }, handlers);
+};
diff --git a/src/plugins/expressions/public/index.ts b/src/plugins/expressions/public/index.ts
index 21f89db140e5a3..84ad2550fda0ad 100644
--- a/src/plugins/expressions/public/index.ts
+++ b/src/plugins/expressions/public/index.ts
@@ -26,4 +26,9 @@ export function plugin(initializerContext: PluginInitializerContext) {
 
 export { ExpressionsPublicPlugin as Plugin };
 
-export * from '../common';
+export * from './plugin';
+export * from './types';
+export { Type, getType } from './interpreter';
+export { interpreterProvider, ExpressionInterpret } from './interpreter_provider';
+export * from './serialize_provider';
+export * from './expression_types';
diff --git a/src/plugins/expressions/public/interpreter.test.ts b/src/plugins/expressions/public/interpreter.test.ts
new file mode 100644
index 00000000000000..42443a2c32b82a
--- /dev/null
+++ b/src/plugins/expressions/public/interpreter.test.ts
@@ -0,0 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getType } from './interpreter';
+
+describe('getType()', () => {
+  test('returns "null" string for null or undefined', () => {
+    expect(getType(null)).toBe('null');
+    expect(getType(undefined)).toBe('null');
+  });
+
+  test('returns basic type name', () => {
+    expect(getType(0)).toBe('number');
+    expect(getType(1)).toBe('number');
+    expect(getType(0.8)).toBe('number');
+    expect(getType(Infinity)).toBe('number');
+
+    expect(getType(true)).toBe('boolean');
+    expect(getType(false)).toBe('boolean');
+  });
+
+  test('returns .type property value of objects', () => {
+    expect(getType({ type: 'foo' })).toBe('foo');
+    expect(getType({ type: 'bar' })).toBe('bar');
+  });
+
+  test('throws if object has no .type property', () => {
+    expect(() => getType({})).toThrow();
+    expect(() => getType({ _type: 'foo' })).toThrow();
+    expect(() => getType({ tipe: 'foo' })).toThrow();
+  });
+});
diff --git a/src/plugins/expressions/public/interpreter.ts b/src/plugins/expressions/public/interpreter.ts
new file mode 100644
index 00000000000000..13bf245f233cbc
--- /dev/null
+++ b/src/plugins/expressions/public/interpreter.ts
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { get } from 'lodash';
+import { AnyExpressionType } from './types';
+import { ExpressionValue } from './types/types';
+
+export function getType(node: any) {
+  if (node == null) return 'null';
+  if (typeof node === 'object') {
+    if (!node.type) throw new Error('Objects must have a type property');
+    return node.type;
+  }
+  return typeof node;
+}
+
+export class Type {
+  name: string;
+
+  /**
+   * A short help text.
+   */
+  help: string;
+
+  /**
+   * Type validation, useful for checking function output.
+   */
+  validate: (type: any) => void | Error;
+
+  create: unknown;
+
+  /**
+   * Optional serialization (used when passing context around client/server).
+   */
+  serialize?: (value: ExpressionValue) => any;
+  deserialize?: (serialized: any) => ExpressionValue;
+
+  constructor(private readonly config: AnyExpressionType) {
+    const { name, help, deserialize, serialize, validate } = config;
+
+    this.name = name;
+    this.help = help || '';
+    this.validate = validate || (() => {});
+
+    // Optional
+    this.create = (config as any).create;
+
+    this.serialize = serialize;
+    this.deserialize = deserialize;
+  }
+
+  getToFn = (value: any) => get(this.config, ['to', value]) || get(this.config, ['to', '*']);
+  getFromFn = (value: any) => get(this.config, ['from', value]) || get(this.config, ['from', '*']);
+
+  castsTo = (value: any) => typeof this.getToFn(value) === 'function';
+  castsFrom = (value: any) => typeof this.getFromFn(value) === 'function';
+
+  to = (node: any, toTypeName: any, types: any) => {
+    const typeName = getType(node);
+    if (typeName !== this.name) {
+      throw new Error(`Can not cast object of type '${typeName}' using '${this.name}'`);
+    } else if (!this.castsTo(toTypeName)) {
+      throw new Error(`Can not cast '${typeName}' to '${toTypeName}'`);
+    }
+
+    return (this.getToFn(toTypeName) as any)(node, types);
+  };
+
+  from = (node: any, types: any) => {
+    const typeName = getType(node);
+    if (!this.castsFrom(typeName)) throw new Error(`Can not cast '${this.name}' from ${typeName}`);
+
+    return (this.getFromFn(typeName) as any)(node, types);
+  };
+}
diff --git a/src/plugins/expressions/common/expressions/interpreter_provider.ts b/src/plugins/expressions/public/interpreter_provider.ts
similarity index 88%
rename from src/plugins/expressions/common/expressions/interpreter_provider.ts
rename to src/plugins/expressions/public/interpreter_provider.ts
index 59ba1085a9d7da..cb84370ad69c52 100644
--- a/src/plugins/expressions/common/expressions/interpreter_provider.ts
+++ b/src/plugins/expressions/public/interpreter_provider.ts
@@ -21,11 +21,11 @@
 import { clone, each, keys, last, mapValues, reduce, zipObject } from 'lodash';
 
 // @ts-ignore
-import { fromExpression, getByAlias, castProvider } from '@kbn/interpreter/common';
+import { fromExpression, getByAlias } from '@kbn/interpreter/common';
 
 import { createError } from './create_error';
 import { ExpressionAST, ExpressionFunctionAST, AnyExpressionFunction, ArgumentType } from './types';
-import { getType } from '../../common';
+import { getType } from './interpreter';
 
 export { createError };
 
@@ -40,7 +40,30 @@ export type ExpressionInterpret = (ast: ExpressionAST, context?: any) => any;
 export function interpreterProvider(config: InterpreterConfig): ExpressionInterpret {
   const { functions, types } = config;
   const handlers = { ...config.handlers, types };
-  const cast = castProvider(types);
+
+  function cast(node: any, toTypeNames: any) {
+    // If you don't give us anything to cast to, you'll get your input back
+    if (!toTypeNames || toTypeNames.length === 0) return node;
+
+    // No need to cast if node is already one of the valid types
+    const fromTypeName = getType(node);
+    if (toTypeNames.includes(fromTypeName)) return node;
+
+    const fromTypeDef = types[fromTypeName];
+
+    for (let i = 0; i < toTypeNames.length; i++) {
+      // First check if the current type can cast to this type
+      if (fromTypeDef && fromTypeDef.castsTo(toTypeNames[i])) {
+        return fromTypeDef.to(node, toTypeNames[i], types);
+      }
+
+      // If that isn't possible, check if this type can cast from the current type
+      const toTypeDef = types[toTypeNames[i]];
+      if (toTypeDef && toTypeDef.castsFrom(fromTypeName)) return toTypeDef.from(node, types);
+    }
+
+    throw new Error(`Can not cast '${fromTypeName}' to any of '${toTypeNames.join(', ')}'`);
+  }
 
   async function invokeChain(chainArr: ExpressionFunctionAST[], context: any): Promise<any> {
     if (!chainArr.length) return context;
diff --git a/src/plugins/expressions/public/mocks.ts b/src/plugins/expressions/public/mocks.ts
index 56ff343e70ac4f..9b47aa2b0cd978 100644
--- a/src/plugins/expressions/public/mocks.ts
+++ b/src/plugins/expressions/public/mocks.ts
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Plugin } from '.';
+import { ExpressionsSetup, ExpressionsStart } from '.';
 
-export type Setup = jest.Mocked<ReturnType<Plugin['setup']>>;
-export type Start = jest.Mocked<ReturnType<Plugin['start']>>;
+export type Setup = jest.Mocked<ExpressionsSetup>;
+export type Start = jest.Mocked<ExpressionsStart>;
 
 const createSetupContract = (): Setup => {
   const setupContract: Setup = {
@@ -36,28 +36,18 @@ const createSetupContract = (): Setup => {
       types: {
         register: () => {},
       } as any,
+      getExecutor: () => ({
+        interpreter: {
+          interpretAst: () => {},
+        },
+      }),
     },
   };
   return setupContract;
 };
 
 const createStartContract = (): Start => {
-  const startContract: Start = {
-    registerFunction: jest.fn(),
-    registerRenderer: jest.fn(),
-    registerType: jest.fn(),
-    __LEGACY: {
-      functions: {
-        register: () => {},
-      } as any,
-      renderers: {
-        register: () => {},
-      } as any,
-      types: {
-        register: () => {},
-      } as any,
-    },
-  };
+  const startContract: Start = undefined;
   return startContract;
 };
 
diff --git a/src/plugins/expressions/public/plugin.ts b/src/plugins/expressions/public/plugin.ts
index b301981f58801d..e67b503f301aab 100644
--- a/src/plugins/expressions/public/plugin.ts
+++ b/src/plugins/expressions/public/plugin.ts
@@ -19,29 +19,133 @@
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
 import {
-  ExpressionsService,
-  ExpressionsSetupContract,
-  ExpressionsStartContract,
-} from './expressions/expressions_service';
+  AnyExpressionFunction,
+  AnyExpressionType,
+  ExpressionInterpretWithHandlers,
+  ExpressionExecutor,
+} from './types';
+import { FunctionsRegistry, RenderFunctionsRegistry, TypesRegistry } from './registries';
+import { Setup as InspectorSetup, Start as InspectorStart } from '../../inspector/public';
+import { setCoreStart } from './services';
+import { clog as clogFunction } from './functions/clog';
+import { font as fontFunction } from './functions/font';
+import { kibana as kibanaFunction } from './functions/kibana';
+import { kibanaContext as kibanaContextFunction } from './functions/kibana_context';
+import {
+  boolean as booleanType,
+  datatable as datatableType,
+  error as errorType,
+  filter as filterType,
+  image as imageType,
+  nullType,
+  number as numberType,
+  pointseries,
+  range as rangeType,
+  render as renderType,
+  shape as shapeType,
+  string as stringType,
+  style as styleType,
+  kibanaContext as kibanaContextType,
+  kibanaDatatable as kibanaDatatableType,
+} from './expression_types';
+import { interpreterProvider } from './interpreter_provider';
+import { createHandlers } from './create_handlers';
+
+export interface ExpressionsSetupDeps {
+  inspector: InspectorSetup;
+}
+
+export interface ExpressionsStartDeps {
+  inspector: InspectorStart;
+}
+
+export interface ExpressionsSetup {
+  registerFunction: (fn: AnyExpressionFunction | (() => AnyExpressionFunction)) => void;
+  registerRenderer: (renderer: any) => void;
+  registerType: (type: () => AnyExpressionType) => void;
+  __LEGACY: {
+    functions: FunctionsRegistry;
+    renderers: RenderFunctionsRegistry;
+    types: TypesRegistry;
+    getExecutor: () => ExpressionExecutor;
+  };
+}
+
+export type ExpressionsStart = void;
 
 export class ExpressionsPublicPlugin
-  implements Plugin<{}, {}, ExpressionsSetupContract, ExpressionsStartContract> {
-  private readonly expressions = new ExpressionsService();
+  implements
+    Plugin<ExpressionsSetup, ExpressionsStart, ExpressionsSetupDeps, ExpressionsStartDeps> {
+  private readonly functions = new FunctionsRegistry();
+  private readonly renderers = new RenderFunctionsRegistry();
+  private readonly types = new TypesRegistry();
 
   constructor(initializerContext: PluginInitializerContext) {}
 
-  public setup(core: CoreSetup): ExpressionsSetupContract {
-    const expressions = this.expressions.setup();
-    return {
-      ...expressions,
+  public setup(core: CoreSetup, { inspector }: ExpressionsSetupDeps): ExpressionsSetup {
+    const { functions, renderers, types } = this;
+
+    const registerFunction: ExpressionsSetup['registerFunction'] = fn => {
+      functions.register(fn);
+    };
+
+    registerFunction(clogFunction);
+    registerFunction(fontFunction);
+    registerFunction(kibanaFunction);
+    registerFunction(kibanaContextFunction);
+
+    types.register(booleanType);
+    types.register(datatableType);
+    types.register(errorType);
+    types.register(filterType);
+    types.register(imageType);
+    types.register(nullType);
+    types.register(numberType);
+    types.register(pointseries);
+    types.register(rangeType);
+    types.register(renderType);
+    types.register(shapeType);
+    types.register(stringType);
+    types.register(styleType);
+    types.register(kibanaContextType);
+    types.register(kibanaDatatableType);
+
+    // TODO: Refactor this function.
+    const getExecutor = () => {
+      const interpretAst: ExpressionInterpretWithHandlers = (ast, context, handlers) => {
+        const interpret = interpreterProvider({
+          types: types.toJS(),
+          handlers: { ...handlers, ...createHandlers() },
+          functions: functions.toJS(),
+        });
+        return interpret(ast, context);
+      };
+      const executor: ExpressionExecutor = { interpreter: { interpretAst } };
+      return executor;
     };
-  }
 
-  public start(core: CoreStart): ExpressionsStartContract {
-    const expressions = this.expressions.start();
-    return {
-      ...expressions,
+    const setup: ExpressionsSetup = {
+      registerFunction,
+      registerRenderer: (renderer: any) => {
+        renderers.register(renderer);
+      },
+      registerType: type => {
+        types.register(type);
+      },
+      __LEGACY: {
+        functions,
+        renderers,
+        types,
+        getExecutor,
+      },
     };
+
+    return setup;
+  }
+
+  public start(core: CoreStart, { inspector }: ExpressionsStartDeps): ExpressionsStart {
+    setCoreStart(core);
   }
+
   public stop() {}
 }
diff --git a/src/plugins/expressions/public/registries/function_registry.ts b/src/plugins/expressions/public/registries/function_registry.ts
new file mode 100644
index 00000000000000..c15b7ceb0d2178
--- /dev/null
+++ b/src/plugins/expressions/public/registries/function_registry.ts
@@ -0,0 +1,127 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* eslint-disable max-classes-per-file */
+
+import { AnyExpressionFunction, FunctionHandlers } from '../types/functions';
+import { ExpressionValue } from '../types/types';
+import { ArgumentType } from '../types';
+import { Registry } from './registry';
+
+export class FunctionParameter {
+  name: string;
+  required: boolean;
+  help: string;
+  types: string[];
+  default: any;
+  aliases: string[];
+  multi: boolean;
+  resolve: boolean;
+  options: any[];
+
+  constructor(name: string, arg: ArgumentType<any>) {
+    const { required, help, types, aliases, multi, resolve, options } = arg;
+
+    if (name === '_') {
+      throw Error('Arg names must not be _. Use it in aliases instead.');
+    }
+
+    this.name = name;
+    this.required = !!required;
+    this.help = help || '';
+    this.types = types || [];
+    this.default = arg.default;
+    this.aliases = aliases || [];
+    this.multi = !!multi;
+    this.resolve = resolve == null ? true : resolve;
+    this.options = options || [];
+  }
+
+  accepts(type: string) {
+    if (!this.types.length) return true;
+    return this.types.indexOf(type) > -1;
+  }
+}
+
+export class Function {
+  /**
+   * Name of function
+   */
+  name: string;
+
+  /**
+   * Aliases that can be used instead of `name`.
+   */
+  aliases: string[];
+
+  /**
+   * Return type of function. This SHOULD be supplied. We use it for UI
+   * and autocomplete hinting. We may also use it for optimizations in
+   * the future.
+   */
+  type: string;
+
+  /**
+   * Function to run function (context, args)
+   */
+  fn: (
+    input: ExpressionValue,
+    params: Record<string, any>,
+    handlers: FunctionHandlers
+  ) => ExpressionValue;
+
+  /**
+   * A short help text.
+   */
+  help: string;
+
+  args: Record<string, FunctionParameter> = {};
+
+  context: { types?: string[] };
+
+  constructor(functionDefinition: AnyExpressionFunction) {
+    const { name, type, aliases, fn, help, args, context } = functionDefinition;
+
+    this.name = name;
+    this.type = type;
+    this.aliases = aliases || [];
+    this.fn = (input, params, handlers) => Promise.resolve(fn(input, params, handlers));
+    this.help = help || '';
+    this.context = context || {};
+
+    for (const [key, arg] of Object.entries(args || {})) {
+      this.args[key] = new FunctionParameter(key, arg);
+    }
+  }
+
+  accepts = (type: string): boolean => {
+    // If you don't tell us about context, we'll assume you don't care what you get.
+    if (!this.context.types) return true;
+    return this.context.types.indexOf(type) > -1;
+  };
+}
+
+export class FunctionsRegistry extends Registry<Function> {
+  register(functionDefinition: AnyExpressionFunction | (() => AnyExpressionFunction)) {
+    const fn = new Function(
+      typeof functionDefinition === 'object' ? functionDefinition : functionDefinition()
+    );
+    this.set(fn.name, fn);
+  }
+}
diff --git a/src/plugins/expressions/public/registries/index.ts b/src/plugins/expressions/public/registries/index.ts
new file mode 100644
index 00000000000000..16c8d8fc4c93a5
--- /dev/null
+++ b/src/plugins/expressions/public/registries/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 * from './type_registry';
+export * from './function_registry';
+export * from './render_registry';
diff --git a/src/plugins/expressions/public/registries/registry.ts b/src/plugins/expressions/public/registries/registry.ts
new file mode 100644
index 00000000000000..fe149116fbf147
--- /dev/null
+++ b/src/plugins/expressions/public/registries/registry.ts
@@ -0,0 +1,42 @@
+/*
+ * 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 class Registry<T> {
+  private data: Record<string, T> = {};
+
+  set(id: string, item: T) {
+    this.data[id] = item;
+  }
+
+  get(id: string): T | null {
+    return this.data[id] || null;
+  }
+
+  toJS(): Record<string, T> {
+    return { ...this.data };
+  }
+
+  toArray(): T[] {
+    return Object.values(this.data);
+  }
+
+  reset() {
+    this.data = {};
+  }
+}
diff --git a/src/plugins/expressions/public/registries/render_registry.ts b/src/plugins/expressions/public/registries/render_registry.ts
new file mode 100644
index 00000000000000..6fd48f5f0c6af9
--- /dev/null
+++ b/src/plugins/expressions/public/registries/render_registry.ts
@@ -0,0 +1,83 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* eslint-disable max-classes-per-file */
+
+import { Registry } from './registry';
+
+export interface ExpressionRenderDefinition<Config = any> {
+  name: string;
+  displayName: string;
+  help?: string;
+  validate?: () => void | Error;
+  reuseDomNode: boolean;
+  render: (domNode: HTMLElement, config: Config, handlers: any) => Promise<void>;
+}
+
+class ExpressionRenderFunction {
+  /**
+   * This must match the name of the function that is used to create the `type: render` object.
+   */
+  name: string;
+
+  /**
+   * Use this to set a more friendly name.
+   */
+  displayName: string;
+
+  /**
+   * A sentence or few about what this element does.
+   */
+  help: string;
+
+  /**
+   * Used to validate the data before calling the render function.
+   */
+  validate: () => void | Error;
+
+  /**
+   * Tell the renderer if the dom node should be reused, it's recreated each time by default.
+   */
+  reuseDomNode: boolean;
+
+  /**
+   * The function called to render the data.
+   */
+  render: (domNode: HTMLElement, config: any, handlers: any) => Promise<void>;
+
+  constructor(config: ExpressionRenderDefinition) {
+    const { name, displayName, help, validate, reuseDomNode, render } = config;
+
+    this.name = name;
+    this.displayName = displayName || name;
+    this.help = help || '';
+    this.validate = validate || (() => {});
+    this.reuseDomNode = Boolean(reuseDomNode);
+    this.render = render;
+  }
+}
+
+export class RenderFunctionsRegistry extends Registry<ExpressionRenderFunction> {
+  register(definition: ExpressionRenderDefinition | (() => ExpressionRenderDefinition)) {
+    const renderFunction = new ExpressionRenderFunction(
+      typeof definition === 'object' ? definition : definition()
+    );
+    this.set(renderFunction.name, renderFunction);
+  }
+}
diff --git a/src/plugins/expressions/public/registries/type_registry.ts b/src/plugins/expressions/public/registries/type_registry.ts
new file mode 100644
index 00000000000000..bcc801213582eb
--- /dev/null
+++ b/src/plugins/expressions/public/registries/type_registry.ts
@@ -0,0 +1,29 @@
+/*
+ * 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 { Registry } from './registry';
+import { Type } from '../interpreter';
+import { AnyExpressionType } from '../types';
+
+export class TypesRegistry extends Registry<Type> {
+  register(typeDefinition: AnyExpressionType | (() => AnyExpressionType)) {
+    const type = new Type(typeof typeDefinition === 'object' ? typeDefinition : typeDefinition());
+    this.set(type.name, type);
+  }
+}
diff --git a/src/plugins/expressions/common/expressions/serialize_provider.ts b/src/plugins/expressions/public/serialize_provider.ts
similarity index 84%
rename from src/plugins/expressions/common/expressions/serialize_provider.ts
rename to src/plugins/expressions/public/serialize_provider.ts
index 1bd06a38a25602..449d47c183dbb9 100644
--- a/src/plugins/expressions/common/expressions/serialize_provider.ts
+++ b/src/plugins/expressions/public/serialize_provider.ts
@@ -18,15 +18,7 @@
  */
 
 import { get, identity } from 'lodash';
-
-export function getType(node: any) {
-  if (node == null) return 'null';
-  if (typeof node === 'object') {
-    if (!node.type) throw new Error('Objects must have a type property');
-    return node.type;
-  }
-  return typeof node;
-}
+import { getType } from './interpreter';
 
 export function serializeProvider(types: any) {
   return {
diff --git a/src/plugins/expressions/public/services.ts b/src/plugins/expressions/public/services.ts
new file mode 100644
index 00000000000000..a1a42aa85e670f
--- /dev/null
+++ b/src/plugins/expressions/public/services.ts
@@ -0,0 +1,35 @@
+/*
+ * 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 { createKibanaUtilsCore, createGetterSetter } from '../../kibana_utils/public';
+import { ExpressionInterpreter } from './types';
+import { Start as IInspector } from '../../inspector/public';
+import { ExpressionsSetup } from './plugin';
+
+export const { getCoreStart, setCoreStart, savedObjects } = createKibanaUtilsCore();
+
+export const [getInspector, setInspector] = createGetterSetter<IInspector>('Inspector');
+
+export const [getInterpreter, setInterpreter] = createGetterSetter<ExpressionInterpreter>(
+  'Interpreter'
+);
+
+export const [getRenderersRegistry, setRenderersRegistry] = createGetterSetter<
+  ExpressionsSetup['__LEGACY']['renderers']
+>('Renderers registry');
diff --git a/src/plugins/expressions/common/expressions/types/arguments.ts b/src/plugins/expressions/public/types/arguments.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/types/arguments.ts
rename to src/plugins/expressions/public/types/arguments.ts
diff --git a/src/plugins/expressions/common/expressions/types/common.ts b/src/plugins/expressions/public/types/common.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/types/common.ts
rename to src/plugins/expressions/public/types/common.ts
diff --git a/src/plugins/expressions/common/expressions/types/functions.ts b/src/plugins/expressions/public/types/functions.ts
similarity index 100%
rename from src/plugins/expressions/common/expressions/types/functions.ts
rename to src/plugins/expressions/public/types/functions.ts
diff --git a/src/plugins/expressions/public/types/index.ts b/src/plugins/expressions/public/types/index.ts
new file mode 100644
index 00000000000000..2d66216a9770ba
--- /dev/null
+++ b/src/plugins/expressions/public/types/index.ts
@@ -0,0 +1,142 @@
+/*
+ * 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 { ExpressionInterpret } from '../interpreter_provider';
+import { TimeRange } from '../../../data/public';
+import { Adapters } from '../../../inspector/public';
+import { Query } from '../../../data/public';
+import { ExpressionAST } from '../../../expressions/public';
+import { ExpressionArgAST } from '../../../../plugins/expressions/public';
+import { esFilters } from '../../../../plugins/data/public';
+
+export { ArgumentType } from './arguments';
+export {
+  TypeToString,
+  KnownTypeToString,
+  TypeString,
+  UnmappedTypeStrings,
+  UnwrapPromise,
+  SerializedFieldFormat,
+} from './common';
+
+export { ExpressionFunction, AnyExpressionFunction, FunctionHandlers } from './functions';
+export { ExpressionType, AnyExpressionType } from './types';
+
+export * from './style';
+
+export type ExpressionArgAST = string | boolean | number | ExpressionAST;
+
+export interface ExpressionFunctionAST {
+  type: 'function';
+  function: string;
+  arguments: {
+    [key: string]: ExpressionArgAST[];
+  };
+}
+
+export interface ExpressionAST {
+  type: 'expression';
+  chain: ExpressionFunctionAST[];
+}
+
+export type ExpressionInterpretWithHandlers = (
+  ast: Parameters<ExpressionInterpret>[0],
+  context: Parameters<ExpressionInterpret>[1],
+  handlers: IInterpreterHandlers
+) => ReturnType<ExpressionInterpret>;
+
+export interface ExpressionInterpreter {
+  interpretAst: ExpressionInterpretWithHandlers;
+}
+
+export interface ExpressionExecutor {
+  interpreter: ExpressionInterpreter;
+}
+
+export type RenderId = number;
+export type Data = any;
+export type event = any;
+export type Context = object;
+
+export interface SearchContext {
+  type: 'kibana_context';
+  filters?: esFilters.Filter[];
+  query?: Query;
+  timeRange?: TimeRange;
+}
+
+export type IGetInitialContext = () => SearchContext | Context;
+
+export interface IExpressionLoaderParams {
+  searchContext?: SearchContext;
+  context?: Context;
+  variables?: Record<string, any>;
+  disableCaching?: boolean;
+  customFunctions?: [];
+  customRenderers?: [];
+  extraHandlers?: Record<string, any>;
+}
+
+export interface IInterpreterHandlers {
+  getInitialContext: IGetInitialContext;
+  inspectorAdapters?: Adapters;
+  abortSignal?: AbortSignal;
+}
+
+export interface IInterpreterRenderHandlers {
+  /**
+   * Done increments the number of rendering successes
+   */
+  done: () => void;
+  onDestroy: (fn: () => void) => void;
+  reload: () => void;
+  update: (params: any) => void;
+  event: (event: event) => void;
+}
+
+export interface IInterpreterRenderFunction<T = unknown> {
+  name: string;
+  displayName: string;
+  help: string;
+  validate: () => void;
+  reuseDomNode: boolean;
+  render: (domNode: Element, data: T, handlers: IInterpreterRenderHandlers) => void | Promise<void>;
+}
+
+export interface IInterpreterErrorResult {
+  type: 'error';
+  error: { message: string; name: string; stack: string };
+}
+
+export interface IInterpreterSuccessResult {
+  type: string;
+  as?: string;
+  value?: unknown;
+  error?: unknown;
+}
+
+export type IInterpreterResult = IInterpreterSuccessResult & IInterpreterErrorResult;
+
+export interface IInterpreter {
+  interpretAst(
+    ast: ExpressionAST,
+    context: Context,
+    handlers: IInterpreterHandlers
+  ): Promise<IInterpreterResult>;
+}
diff --git a/src/plugins/expressions/public/types/style.ts b/src/plugins/expressions/public/types/style.ts
new file mode 100644
index 00000000000000..9f919223d558c4
--- /dev/null
+++ b/src/plugins/expressions/public/types/style.ts
@@ -0,0 +1,137 @@
+/*
+ * 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 { FontLabel } from '../fonts';
+
+/**
+ * Enum of supported CSS `background-repeat` properties.
+ */
+export enum BackgroundRepeat {
+  REPEAT = 'repeat',
+  REPEAT_NO = 'no-repeat',
+  REPEAT_X = 'repeat-x',
+  REPEAT_Y = 'repeat-y',
+  ROUND = 'round',
+  SPACE = 'space',
+}
+
+/**
+ * Enum of supported CSS `background-size` properties.
+ */
+export enum BackgroundSize {
+  AUTO = 'auto',
+  CONTAIN = 'contain',
+  COVER = 'cover',
+}
+
+/**
+ * Enum of supported CSS `font-style` properties.
+ */
+export enum FontStyle {
+  ITALIC = 'italic',
+  NORMAL = 'normal',
+}
+
+/**
+ * Enum of supported CSS `font-weight` properties.
+ */
+export enum FontWeight {
+  NORMAL = 'normal',
+  BOLD = 'bold',
+  BOLDER = 'bolder',
+  LIGHTER = 'lighter',
+  ONE = '100',
+  TWO = '200',
+  THREE = '300',
+  FOUR = '400',
+  FIVE = '500',
+  SIX = '600',
+  SEVEN = '700',
+  EIGHT = '800',
+  NINE = '900',
+}
+
+/**
+ * Enum of supported CSS `overflow` properties.
+ */
+export enum Overflow {
+  AUTO = 'auto',
+  HIDDEN = 'hidden',
+  SCROLL = 'scroll',
+  VISIBLE = 'visible',
+}
+
+/**
+ * Enum of supported CSS `text-align` properties.
+ */
+export enum TextAlignment {
+  CENTER = 'center',
+  JUSTIFY = 'justify',
+  LEFT = 'left',
+  RIGHT = 'right',
+}
+
+/**
+ * Enum of supported CSS `text-decoration` properties.
+ */
+export enum TextDecoration {
+  NONE = 'none',
+  UNDERLINE = 'underline',
+}
+
+/**
+ * Represents the various style properties that can be applied to an element.
+ */
+export interface CSSStyle {
+  color?: string;
+  fill?: string;
+  fontFamily?: FontLabel;
+  fontSize?: string;
+  fontStyle?: FontStyle;
+  fontWeight?: FontWeight;
+  lineHeight?: number | string;
+  textAlign?: TextAlignment;
+  textDecoration?: TextDecoration;
+}
+
+/**
+ * Represents an object containing style information for a Container.
+ */
+export interface ContainerStyle {
+  border: string | null;
+  borderRadius: string | null;
+  padding: string | null;
+  backgroundColor: string | null;
+  backgroundImage: string | null;
+  backgroundSize: BackgroundSize;
+  backgroundRepeat: BackgroundRepeat;
+  opacity: number | null;
+  overflow: Overflow;
+}
+
+/**
+ * An object that represents style information, typically CSS.
+ */
+export interface ExpressionTypeStyle {
+  type: 'style';
+  spec: CSSStyle;
+  css: string;
+}
+
+export type Style = ExpressionTypeStyle;
diff --git a/src/plugins/expressions/public/types/types.ts b/src/plugins/expressions/public/types/types.ts
new file mode 100644
index 00000000000000..e7b30d24fa6eb5
--- /dev/null
+++ b/src/plugins/expressions/public/types/types.ts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export type ExpressionValueUnboxed = any;
+
+export type ExpressionValueBoxed<Type extends string = string, Value extends object = object> = {
+  type: Type;
+} & Value;
+
+export type ExpressionValue = ExpressionValueUnboxed | ExpressionValueBoxed;
+
+export type ExpressionValueConverter<I extends ExpressionValue, O extends ExpressionValue> = (
+  input: I,
+  availableTypes: Record<string, any>
+) => O;
+
+/**
+ * A generic type which represents a custom Expression Type Definition that's
+ * registered to the Interpreter.
+ */
+export interface ExpressionType<
+  Name extends string,
+  Value extends ExpressionValueUnboxed | ExpressionValueBoxed,
+  SerializedType = undefined
+> {
+  name: Name;
+  validate?: (type: any) => void | Error;
+  serialize?: (type: Value) => SerializedType;
+  deserialize?: (type: SerializedType) => Value;
+  // TODO: Update typings for the `availableTypes` parameter once interfaces for this
+  // have been added elsewhere in the interpreter.
+  from?: {
+    [type: string]: ExpressionValueConverter<any, Value>;
+  };
+  to?: {
+    [type: string]: ExpressionValueConverter<Value, any>;
+  };
+  help?: string;
+}
+
+export type AnyExpressionType = ExpressionType<string, ExpressionValueBoxed>;
diff --git a/src/plugins/feature_catalogue/README.md b/src/plugins/feature_catalogue/README.md
new file mode 100644
index 00000000000000..68584e7ed2ce13
--- /dev/null
+++ b/src/plugins/feature_catalogue/README.md
@@ -0,0 +1,26 @@
+# Feature catalogue plugin
+
+Replaces the legacy `ui/registry/feature_catalogue` module for registering "features" that should be showed in the home
+page's feature catalogue. This should not be confused with the "feature" plugin for registering features used to derive
+UI capabilities for feature controls.
+
+## Example registration
+
+```ts
+// For legacy plugins
+import { npSetup } from 'ui/new_platform';
+npSetup.plugins.feature_catalogue.register(/* same details here */);
+
+// For new plugins: first add 'feature_catalogue` to the list of `optionalPlugins` 
+// in your kibana.json file. Then access the plugin directly in `setup`:
+
+class MyPlugin {
+  setup(core, plugins) {
+    if (plugins.feature_catalogue) {
+      plugins.feature_catalogue.register(/* same details here. */);
+    }
+  }
+}
+```
+
+Note that the old module supported providing a Angular DI function to receive Angular dependencies. This is no longer supported as we migrate away from Angular and will be removed in 8.0.
diff --git a/src/plugins/feature_catalogue/kibana.json b/src/plugins/feature_catalogue/kibana.json
new file mode 100644
index 00000000000000..3f39c9361f0476
--- /dev/null
+++ b/src/plugins/feature_catalogue/kibana.json
@@ -0,0 +1,6 @@
+{
+  "id": "feature_catalogue",
+  "version": "kibana",
+  "server": false,
+  "ui": true
+}
diff --git a/src/plugins/feature_catalogue/public/index.ts b/src/plugins/feature_catalogue/public/index.ts
new file mode 100644
index 00000000000000..dd241a317c4a6a
--- /dev/null
+++ b/src/plugins/feature_catalogue/public/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { FeatureCatalogueSetup, FeatureCatalogueStart } from './plugin';
+export { FeatureCatalogueEntry, FeatureCatalogueCategory } from './services';
+import { FeatureCataloguePlugin } from './plugin';
+
+export const plugin = () => new FeatureCataloguePlugin();
diff --git a/src/plugins/feature_catalogue/public/plugin.test.mocks.ts b/src/plugins/feature_catalogue/public/plugin.test.mocks.ts
new file mode 100644
index 00000000000000..c0da6a179204b6
--- /dev/null
+++ b/src/plugins/feature_catalogue/public/plugin.test.mocks.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { featureCatalogueRegistryMock } from './services/feature_catalogue_registry.mock';
+
+export const registryMock = featureCatalogueRegistryMock.create();
+jest.doMock('./services', () => ({
+  FeatureCatalogueRegistry: jest.fn(() => registryMock),
+}));
diff --git a/src/plugins/feature_catalogue/public/plugin.test.ts b/src/plugins/feature_catalogue/public/plugin.test.ts
new file mode 100644
index 00000000000000..8bbbb973b459ee
--- /dev/null
+++ b/src/plugins/feature_catalogue/public/plugin.test.ts
@@ -0,0 +1,49 @@
+/*
+ * 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 { registryMock } from './plugin.test.mocks';
+import { FeatureCataloguePlugin } from './plugin';
+
+describe('FeatureCataloguePlugin', () => {
+  beforeEach(() => {
+    registryMock.setup.mockClear();
+    registryMock.start.mockClear();
+  });
+
+  describe('setup', () => {
+    test('wires up and returns registry', async () => {
+      const setup = await new FeatureCataloguePlugin().setup();
+      expect(registryMock.setup).toHaveBeenCalledWith();
+      expect(setup.register).toBeDefined();
+    });
+  });
+
+  describe('start', () => {
+    test('wires up and returns registry', async () => {
+      const service = new FeatureCataloguePlugin();
+      await service.setup();
+      const core = { application: { capabilities: { catalogue: {} } } } as any;
+      const start = await service.start(core);
+      expect(registryMock.start).toHaveBeenCalledWith({
+        capabilities: core.application.capabilities,
+      });
+      expect(start.get).toBeDefined();
+    });
+  });
+});
diff --git a/src/plugins/feature_catalogue/public/plugin.ts b/src/plugins/feature_catalogue/public/plugin.ts
new file mode 100644
index 00000000000000..46a70baff488af
--- /dev/null
+++ b/src/plugins/feature_catalogue/public/plugin.ts
@@ -0,0 +1,50 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreStart, Plugin } from 'src/core/public';
+import {
+  FeatureCatalogueRegistry,
+  FeatureCatalogueRegistrySetup,
+  FeatureCatalogueRegistryStart,
+} from './services';
+
+export class FeatureCataloguePlugin
+  implements Plugin<FeatureCatalogueSetup, FeatureCatalogueStart> {
+  private readonly featuresCatalogueRegistry = new FeatureCatalogueRegistry();
+
+  public async setup() {
+    return {
+      ...this.featuresCatalogueRegistry.setup(),
+    };
+  }
+
+  public async start(core: CoreStart) {
+    return {
+      ...this.featuresCatalogueRegistry.start({
+        capabilities: core.application.capabilities,
+      }),
+    };
+  }
+}
+
+/** @public */
+export type FeatureCatalogueSetup = FeatureCatalogueRegistrySetup;
+
+/** @public */
+export type FeatureCatalogueStart = FeatureCatalogueRegistryStart;
diff --git a/src/plugins/feature_catalogue/public/services/feature_catalogue_registry.mock.ts b/src/plugins/feature_catalogue/public/services/feature_catalogue_registry.mock.ts
new file mode 100644
index 00000000000000..54bdd42c1cca97
--- /dev/null
+++ b/src/plugins/feature_catalogue/public/services/feature_catalogue_registry.mock.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 {
+  FeatureCatalogueRegistrySetup,
+  FeatureCatalogueRegistryStart,
+  FeatureCatalogueRegistry,
+} from './feature_catalogue_registry';
+
+const createSetupMock = (): jest.Mocked<FeatureCatalogueRegistrySetup> => {
+  const setup = {
+    register: jest.fn(),
+  };
+  return setup;
+};
+
+const createStartMock = (): jest.Mocked<FeatureCatalogueRegistryStart> => {
+  const start = {
+    get: jest.fn(),
+  };
+  return start;
+};
+
+const createMock = (): jest.Mocked<PublicMethodsOf<FeatureCatalogueRegistry>> => {
+  const service = {
+    setup: jest.fn(),
+    start: jest.fn(),
+  };
+  service.setup.mockImplementation(createSetupMock);
+  service.start.mockImplementation(createStartMock);
+  return service;
+};
+
+export const featureCatalogueRegistryMock = {
+  createSetup: createSetupMock,
+  createStart: createStartMock,
+  create: createMock,
+};
diff --git a/src/plugins/feature_catalogue/public/services/feature_catalogue_registry.test.ts b/src/plugins/feature_catalogue/public/services/feature_catalogue_registry.test.ts
new file mode 100644
index 00000000000000..b174a68aa53be2
--- /dev/null
+++ b/src/plugins/feature_catalogue/public/services/feature_catalogue_registry.test.ts
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import {
+  FeatureCatalogueRegistry,
+  FeatureCatalogueCategory,
+  FeatureCatalogueEntry,
+} from './feature_catalogue_registry';
+
+const DASHBOARD_FEATURE: FeatureCatalogueEntry = {
+  id: 'dashboard',
+  title: 'Dashboard',
+  description: 'Display and share a collection of visualizations and saved searches.',
+  icon: 'dashboardApp',
+  path: `/app/kibana#dashboard`,
+  showOnHomePage: true,
+  category: FeatureCatalogueCategory.DATA,
+};
+
+describe('FeatureCatalogueRegistry', () => {
+  describe('setup', () => {
+    test('throws when registering duplicate id', () => {
+      const setup = new FeatureCatalogueRegistry().setup();
+      setup.register(DASHBOARD_FEATURE);
+      expect(() => setup.register(DASHBOARD_FEATURE)).toThrowErrorMatchingInlineSnapshot(
+        `"Feature with id [dashboard] has already been registered. Use a unique id."`
+      );
+    });
+  });
+
+  describe('start', () => {
+    describe('capabilities filtering', () => {
+      test('retains items with no entry in capabilities', () => {
+        const service = new FeatureCatalogueRegistry();
+        service.setup().register(DASHBOARD_FEATURE);
+        const capabilities = { catalogue: {} } as any;
+        expect(service.start({ capabilities }).get()).toEqual([DASHBOARD_FEATURE]);
+      });
+
+      test('retains items with true in capabilities', () => {
+        const service = new FeatureCatalogueRegistry();
+        service.setup().register(DASHBOARD_FEATURE);
+        const capabilities = { catalogue: { dashboard: true } } as any;
+        expect(service.start({ capabilities }).get()).toEqual([DASHBOARD_FEATURE]);
+      });
+
+      test('removes items with false in capabilities', () => {
+        const service = new FeatureCatalogueRegistry();
+        service.setup().register(DASHBOARD_FEATURE);
+        const capabilities = { catalogue: { dashboard: false } } as any;
+        expect(service.start({ capabilities }).get()).toEqual([]);
+      });
+    });
+  });
+
+  describe('title sorting', () => {
+    test('sorts by title ascending', () => {
+      const service = new FeatureCatalogueRegistry();
+      const setup = service.setup();
+      setup.register({ id: '1', title: 'Orange' } as any);
+      setup.register({ id: '2', title: 'Apple' } as any);
+      setup.register({ id: '3', title: 'Banana' } as any);
+      const capabilities = { catalogue: {} } as any;
+      expect(service.start({ capabilities }).get()).toEqual([
+        { id: '2', title: 'Apple' },
+        { id: '3', title: 'Banana' },
+        { id: '1', title: 'Orange' },
+      ]);
+    });
+  });
+});
diff --git a/src/plugins/feature_catalogue/public/services/feature_catalogue_registry.ts b/src/plugins/feature_catalogue/public/services/feature_catalogue_registry.ts
new file mode 100644
index 00000000000000..6ab342f37dfd9f
--- /dev/null
+++ b/src/plugins/feature_catalogue/public/services/feature_catalogue_registry.ts
@@ -0,0 +1,86 @@
+/*
+ * 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 { Capabilities } from 'src/core/public';
+import { IconType } from '@elastic/eui';
+
+/** @public */
+export enum FeatureCatalogueCategory {
+  ADMIN = 'admin',
+  DATA = 'data',
+  OTHER = 'other',
+}
+
+/** @public */
+export interface FeatureCatalogueEntry {
+  /** Unique string identifier for this feature. */
+  readonly id: string;
+  /** Title of feature displayed to the user. */
+  readonly title: string;
+  /** {@link FeatureCatalogueCategory} to display this feature in. */
+  readonly category: FeatureCatalogueCategory;
+  /** One-line description of feature displayed to the user. */
+  readonly description: string;
+  /** EUI `IconType` for icon to be displayed to the user. EUI supports any known EUI icon, SVG URL, or ReactElement. */
+  readonly icon: IconType;
+  /** URL path to link to this future. Should not include the basePath. */
+  readonly path: string;
+  /** Whether or not this link should be shown on the front page of Kibana. */
+  readonly showOnHomePage: boolean;
+}
+
+export class FeatureCatalogueRegistry {
+  private readonly features = new Map<string, FeatureCatalogueEntry>();
+
+  public setup() {
+    return {
+      register: (feature: FeatureCatalogueEntry) => {
+        if (this.features.has(feature.id)) {
+          throw new Error(
+            `Feature with id [${feature.id}] has already been registered. Use a unique id.`
+          );
+        }
+
+        this.features.set(feature.id, feature);
+      },
+    };
+  }
+
+  public start({ capabilities }: { capabilities: Capabilities }) {
+    return {
+      get: (): readonly FeatureCatalogueEntry[] =>
+        [...this.features.values()]
+          .filter(entry => capabilities.catalogue[entry.id] !== false)
+          .sort(compareByKey('title')),
+    };
+  }
+}
+
+export type FeatureCatalogueRegistrySetup = ReturnType<FeatureCatalogueRegistry['setup']>;
+export type FeatureCatalogueRegistryStart = ReturnType<FeatureCatalogueRegistry['start']>;
+
+const compareByKey = <T>(key: keyof T) => (left: T, right: T) => {
+  if (left[key] < right[key]) {
+    return -1;
+  } else if (left[key] > right[key]) {
+    return 1;
+  } else {
+    return 0;
+  }
+};
diff --git a/src/plugins/feature_catalogue/public/services/index.ts b/src/plugins/feature_catalogue/public/services/index.ts
new file mode 100644
index 00000000000000..17433264f5a428
--- /dev/null
+++ b/src/plugins/feature_catalogue/public/services/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './feature_catalogue_registry';
diff --git a/src/plugins/kibana_react/public/context/context.test.tsx b/src/plugins/kibana_react/public/context/context.test.tsx
index d7dce3f69239dd..4008daf69f25d4 100644
--- a/src/plugins/kibana_react/public/context/context.test.tsx
+++ b/src/plugins/kibana_react/public/context/context.test.tsx
@@ -21,7 +21,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { context, createKibanaReactContext, useKibana, KibanaContextProvider } from './context';
 import { coreMock, overlayServiceMock } from '../../../../core/public/mocks';
-import { CoreStart } from './types';
+import { CoreStart } from '../../../../core/public';
 
 let container: HTMLDivElement | null;
 
diff --git a/src/plugins/kibana_react/public/context/context.tsx b/src/plugins/kibana_react/public/context/context.tsx
index 630348017106ab..cbae5c4638ca2d 100644
--- a/src/plugins/kibana_react/public/context/context.tsx
+++ b/src/plugins/kibana_react/public/context/context.tsx
@@ -42,11 +42,11 @@ export const useKibana = <Extra extends object = {}>(): KibanaReactContextValue<
 export const withKibana = <Props extends { kibana: KibanaReactContextValue<any> }>(
   type: React.ComponentType<Props>
 ): React.FC<Omit<Props, 'kibana'>> => {
-  const enhancedType: React.FC<Omit<Props, 'kibana'>> = (props: Omit<Props, 'kibana'>) => {
+  const EnhancedType: React.FC<Omit<Props, 'kibana'>> = (props: Omit<Props, 'kibana'>) => {
     const kibana = useKibana();
     return React.createElement(type, { ...props, kibana } as Props);
   };
-  return enhancedType;
+  return EnhancedType;
 };
 
 export const UseKibana: React.FC<{
@@ -69,7 +69,7 @@ export const createKibanaReactContext = <Services extends KibanaServices>(
     const oldValue = useKibana();
     const { value: newValue } = useMemo(
       () => createKibanaReactContext({ ...services, ...oldValue.services, ...newServices }),
-      Object.keys(services)
+      [services, oldValue, newServices]
     );
     return createElement(context.Provider as React.ComponentType<any>, {
       value: newValue,
diff --git a/src/plugins/kibana_react/public/context/index.ts b/src/plugins/kibana_react/public/context/index.ts
index 444ef343cd7d29..c7c0693a89f2b6 100644
--- a/src/plugins/kibana_react/public/context/index.ts
+++ b/src/plugins/kibana_react/public/context/index.ts
@@ -25,4 +25,4 @@ export {
   withKibana,
   UseKibana,
 } from './context';
-export { KibanaReactContext, KibanaReactContextValue } from './types';
+export { KibanaReactContext, KibanaReactContextValue, KibanaServices } from './types';
diff --git a/src/plugins/kibana_react/public/context/types.ts b/src/plugins/kibana_react/public/context/types.ts
index 1906bb808ea87b..35e6349bfca87c 100644
--- a/src/plugins/kibana_react/public/context/types.ts
+++ b/src/plugins/kibana_react/public/context/types.ts
@@ -22,8 +22,6 @@ import { CoreStart } from '../../../../core/public';
 import { KibanaReactOverlays } from '../overlays';
 import { KibanaReactNotifications } from '../notifications';
 
-export { CoreStart };
-
 export type KibanaServices = Partial<CoreStart>;
 
 export interface KibanaReactContextValue<Services extends KibanaServices> {
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
index 81d514ca4d466d..a880d3c6cf87c3 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/exit_full_screen_button.tsx
@@ -24,11 +24,11 @@ import { EuiScreenReaderOnly, keyCodes } from '@elastic/eui';
 // @ts-ignore
 import { KuiButton } from '@kbn/ui-framework/components';
 
-interface Props {
+export interface ExitFullScreenButtonProps {
   onExitFullScreenMode: () => void;
 }
 
-class ExitFullScreenButtonUi extends PureComponent<Props> {
+class ExitFullScreenButtonUi extends PureComponent<ExitFullScreenButtonProps> {
   public onKeyDown = (e: KeyboardEvent) => {
     if (e.keyCode === keyCodes.ESCAPE) {
       this.props.onExitFullScreenMode();
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx b/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx
index a965fd776e0c29..130ac1e980eee3 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/index.tsx
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { ExitFullScreenButton } from './exit_full_screen_button';
+export { ExitFullScreenButton, ExitFullScreenButtonProps } from './exit_full_screen_button';
diff --git a/src/plugins/kibana_react/public/overlays/types.ts b/src/plugins/kibana_react/public/overlays/types.ts
index 6a1fb25ca14835..0108d8eaba6cc9 100644
--- a/src/plugins/kibana_react/public/overlays/types.ts
+++ b/src/plugins/kibana_react/public/overlays/types.ts
@@ -18,7 +18,7 @@
  */
 
 import * as React from 'react';
-import { CoreStart } from '../context/types';
+import { CoreStart } from '../../../../core/public';
 
 export interface KibanaReactOverlays {
   openFlyout: (
diff --git a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
index fbea5d613f60ca..c65d4289587670 100644
--- a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
+++ b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
@@ -104,7 +104,7 @@ interface SavedObjectFinderInitialPageSize extends BaseSavedObjectFinder {
   initialPageSize?: 5 | 10 | 15 | 25;
   fixedPageSize?: undefined;
 }
-type SavedObjectFinderProps = {
+export type SavedObjectFinderProps = {
   savedObjects: CoreStart['savedObjects'];
   uiSettings: CoreStart['uiSettings'];
 } & (SavedObjectFinderFixedPage | SavedObjectFinderInitialPageSize);
diff --git a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx
index cc2a8c3fbe1fc6..0879b0cb3f36a1 100644
--- a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx
+++ b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsx
@@ -106,7 +106,7 @@ describe('useUiSetting', () => {
 });
 
 describe('useUiSetting$', () => {
-  const TestConsumer$: React.FC<{
+  const TestConsumerX: React.FC<{
     setting: string;
     newValue?: string;
   }> = ({ setting, newValue = '' }) => {
@@ -126,7 +126,7 @@ describe('useUiSetting$', () => {
 
     ReactDOM.render(
       <Provider>
-        <TestConsumer$ setting="foo" />
+        <TestConsumerX setting="foo" />
       </Provider>,
       container
     );
@@ -143,7 +143,7 @@ describe('useUiSetting$', () => {
 
     ReactDOM.render(
       <Provider>
-        <TestConsumer$ setting="non_existing" />
+        <TestConsumerX setting="non_existing" />
       </Provider>,
       container
     );
@@ -159,7 +159,7 @@ describe('useUiSetting$', () => {
 
     ReactDOM.render(
       <Provider>
-        <TestConsumer$ setting="theme:darkMode" />
+        <TestConsumerX setting="theme:darkMode" />
       </Provider>,
       container
     );
@@ -174,7 +174,7 @@ describe('useUiSetting$', () => {
 
     ReactDOM.render(
       <Provider>
-        <TestConsumer$ setting="a" newValue="c" />
+        <TestConsumerX setting="a" newValue="c" />
       </Provider>,
       container
     );
diff --git a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.ts b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.ts
index ddc8b2a6847289..295515bfa51af6 100644
--- a/src/plugins/kibana_react/public/ui_settings/use_ui_setting.ts
+++ b/src/plugins/kibana_react/public/ui_settings/use_ui_setting.ts
@@ -65,6 +65,7 @@ export const useUiSetting$ = <T>(key: string, defaultValue?: T): [T, Setter<T>]
   const observable$ = useMemo(() => services.uiSettings!.get$(key, defaultValue), [
     key,
     defaultValue,
+    services.uiSettings,
   ]);
   const value = useObservable<T>(observable$, services.uiSettings!.get(key, defaultValue));
   const set = useCallback((newValue: T) => services.uiSettings!.set(key, newValue), [key]);
diff --git a/src/plugins/kibana_utils/public/core/create_getter_setter.ts b/src/plugins/kibana_utils/public/core/create_getter_setter.ts
new file mode 100644
index 00000000000000..be2fd48ee6e7b4
--- /dev/null
+++ b/src/plugins/kibana_utils/public/core/create_getter_setter.ts
@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export type Get<T> = () => T;
+export type Set<T> = (value: T) => void;
+
+export const createGetterSetter = <T extends object>(name: string): [Get<T>, Set<T>] => {
+  let value: T;
+
+  const get: Get<T> = () => {
+    if (!value) throw new Error(`${name} was not set.`);
+    return value;
+  };
+
+  const set: Set<T> = newValue => {
+    value = newValue;
+  };
+
+  return [get, set];
+};
diff --git a/src/plugins/kibana_utils/public/core/create_kibana_utils_core.test.ts b/src/plugins/kibana_utils/public/core/create_kibana_utils_core.test.ts
new file mode 100644
index 00000000000000..c5b23bdf0055f2
--- /dev/null
+++ b/src/plugins/kibana_utils/public/core/create_kibana_utils_core.test.ts
@@ -0,0 +1,39 @@
+/*
+ * 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 { createKibanaUtilsCore } from './create_kibana_utils_core';
+import { CoreStart } from 'kibana/public';
+
+describe('createKibanaUtilsCore', () => {
+  it('should allows to work with multiple instances', () => {
+    const core1 = {} as CoreStart;
+    const core2 = {} as CoreStart;
+
+    const { setCoreStart: setCoreStart1, getCoreStart: getCoreStart1 } = createKibanaUtilsCore();
+    const { setCoreStart: setCoreStart2, getCoreStart: getCoreStart2 } = createKibanaUtilsCore();
+
+    setCoreStart1(core1);
+    setCoreStart2(core2);
+
+    expect(getCoreStart1()).toBe(core1);
+    expect(getCoreStart2()).toBe(core2);
+
+    expect(getCoreStart1() !== getCoreStart2()).toBeTruthy();
+  });
+});
diff --git a/src/plugins/kibana_utils/public/core/create_kibana_utils_core.ts b/src/plugins/kibana_utils/public/core/create_kibana_utils_core.ts
new file mode 100644
index 00000000000000..84ecffa1da6342
--- /dev/null
+++ b/src/plugins/kibana_utils/public/core/create_kibana_utils_core.ts
@@ -0,0 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createGetterSetter, Get, Set } from './create_getter_setter';
+import { CoreStart } from '../../../../core/public';
+import { KUSavedObjectClient, createSavedObjectsClient } from './saved_objects_client';
+
+interface Return {
+  getCoreStart: Get<CoreStart>;
+  setCoreStart: Set<CoreStart>;
+  savedObjects: KUSavedObjectClient;
+}
+
+export const createKibanaUtilsCore = (): Return => {
+  const [getCoreStart, setCoreStart] = createGetterSetter<CoreStart>('CoreStart');
+  const savedObjects = createSavedObjectsClient(getCoreStart);
+
+  return {
+    getCoreStart,
+    setCoreStart,
+    savedObjects,
+  };
+};
diff --git a/src/plugins/kibana_utils/public/core/index.ts b/src/plugins/kibana_utils/public/core/index.ts
new file mode 100644
index 00000000000000..7e8dff7191fe8e
--- /dev/null
+++ b/src/plugins/kibana_utils/public/core/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './create_getter_setter';
+export * from './create_kibana_utils_core';
diff --git a/src/plugins/kibana_utils/public/core/saved_objects_client.ts b/src/plugins/kibana_utils/public/core/saved_objects_client.ts
new file mode 100644
index 00000000000000..40407fea5d189f
--- /dev/null
+++ b/src/plugins/kibana_utils/public/core/saved_objects_client.ts
@@ -0,0 +1,35 @@
+/*
+ * 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 { CoreStart } from '../../../../core/public';
+import { Get } from './create_getter_setter';
+
+type CoreSavedObjectClient = CoreStart['savedObjects']['client'];
+
+export interface KUSavedObjectClient {
+  get: CoreSavedObjectClient['get'];
+}
+
+export const createSavedObjectsClient = (getCoreStart: Get<CoreStart>) => {
+  const savedObjectsClient: KUSavedObjectClient = {
+    get: (...args) => getCoreStart().savedObjects.client.get(...args),
+  };
+
+  return savedObjectsClient;
+};
diff --git a/src/plugins/kibana_utils/public/core/state.ts b/src/plugins/kibana_utils/public/core/state.ts
new file mode 100644
index 00000000000000..8ac6e4e0e58e6d
--- /dev/null
+++ b/src/plugins/kibana_utils/public/core/state.ts
@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createGetterSetter } from './create_getter_setter';
+import { CoreStart } from '../../../../core/public';
+
+export const [getCoreStart, setCoreStart] = createGetterSetter<CoreStart>('CoreStart');
diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts
index bac0ef629789a2..3aaa6d28a9f64b 100644
--- a/src/plugins/kibana_utils/public/index.ts
+++ b/src/plugins/kibana_utils/public/index.ts
@@ -17,8 +17,12 @@
  * under the License.
  */
 
+export * from './core';
+export * from './errors';
 export * from './store';
 export * from './parse';
 export * from './render_complete';
+export * from './store';
 export * from './errors';
 export * from './field_mapping';
+export * from './storage';
diff --git a/src/legacy/ui/public/storage/__tests__/storage.js b/src/plugins/kibana_utils/public/storage/__tests__/storage.js
similarity index 100%
rename from src/legacy/ui/public/storage/__tests__/storage.js
rename to src/plugins/kibana_utils/public/storage/__tests__/storage.js
diff --git a/src/plugins/kibana_utils/public/storage/index.ts b/src/plugins/kibana_utils/public/storage/index.ts
new file mode 100644
index 00000000000000..53956bf21cdf36
--- /dev/null
+++ b/src/plugins/kibana_utils/public/storage/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { Storage } from './storage';
+export { IStorage, IStorageWrapper } from './types';
diff --git a/src/plugins/kibana_utils/public/storage/storage.ts b/src/plugins/kibana_utils/public/storage/storage.ts
new file mode 100644
index 00000000000000..a7d3c5ac70074f
--- /dev/null
+++ b/src/plugins/kibana_utils/public/storage/storage.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 { IStorage, IStorageWrapper } from './types';
+
+export class Storage implements IStorageWrapper {
+  public store: IStorage;
+
+  constructor(store: IStorage) {
+    this.store = store;
+  }
+
+  public get = (key: string) => {
+    if (!this.store) {
+      return null;
+    }
+
+    const storageItem = this.store.getItem(key);
+    if (storageItem === null) {
+      return null;
+    }
+
+    try {
+      return JSON.parse(storageItem);
+    } catch (error) {
+      return null;
+    }
+  };
+
+  public set = (key: string, value: any) => {
+    try {
+      return this.store.setItem(key, JSON.stringify(value));
+    } catch (e) {
+      return false;
+    }
+  };
+
+  public remove = (key: string) => {
+    return this.store.removeItem(key);
+  };
+
+  public clear = () => {
+    return this.store.clear();
+  };
+}
diff --git a/src/plugins/kibana_utils/public/storage/types.ts b/src/plugins/kibana_utils/public/storage/types.ts
new file mode 100644
index 00000000000000..875bb44bcad17d
--- /dev/null
+++ b/src/plugins/kibana_utils/public/storage/types.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export interface IStorageWrapper {
+  get: (key: string) => any;
+  set: (key: string, value: any) => void;
+  remove: (key: string) => any;
+  clear: () => void;
+}
+
+export interface IStorage {
+  getItem: (key: string) => any;
+  setItem: (key: string, value: any) => void;
+  removeItem: (key: string) => any;
+  clear: () => void;
+}
diff --git a/src/plugins/kibana_utils/public/store/react.ts b/src/plugins/kibana_utils/public/store/react.ts
index d561f9bb3cf34b..00861b2b0b8fef 100644
--- a/src/plugins/kibana_utils/public/store/react.ts
+++ b/src/plugins/kibana_utils/public/store/react.ts
@@ -86,10 +86,12 @@ export const createContext = <
     comparator?: Comparator<Result>
   ): Result => {
     const { state$, get } = useStore();
+    /* eslint-disable react-hooks/exhaustive-deps */
     const [observable$, unsubscribe] = useMemo(
       () => observableSelector(get(), state$, selector, comparator),
       [state$]
     );
+    /* eslint-enable react-hooks/exhaustive-deps */
     useLayoutEffect(() => unsubscribe, [observable$, unsubscribe]);
     const value = useObservable(observable$, selector(get()));
     return value;
diff --git a/src/plugins/ui_actions/public/plugin.ts b/src/plugins/ui_actions/public/plugin.ts
index fda25659d1226d..374acaaab39998 100644
--- a/src/plugins/ui_actions/public/plugin.ts
+++ b/src/plugins/ui_actions/public/plugin.ts
@@ -52,5 +52,8 @@ export class UiActionsPlugin implements Plugin<IUiActionsSetup, IUiActionsStart>
     return this.api;
   }
 
-  public stop() {}
+  public stop() {
+    this.actions.clear();
+    this.triggers.clear();
+  }
 }
diff --git a/src/plugins/visualizations/kibana.json b/src/plugins/visualizations/kibana.json
new file mode 100644
index 00000000000000..cf79ce17293d61
--- /dev/null
+++ b/src/plugins/visualizations/kibana.json
@@ -0,0 +1,9 @@
+{
+  "id": "visualizations",
+  "version": "kibana",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": [
+    "expressions"
+  ]
+}
diff --git a/src/plugins/visualizations/public/expression_functions/range.ts b/src/plugins/visualizations/public/expression_functions/range.ts
new file mode 100644
index 00000000000000..27c3654e2182ae
--- /dev/null
+++ b/src/plugins/visualizations/public/expression_functions/range.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 { i18n } from '@kbn/i18n';
+import { ExpressionFunction, KibanaDatatable, Range } from '../../../expressions/public';
+
+const name = 'range';
+
+type Context = KibanaDatatable | null;
+
+interface Arguments {
+  from: number;
+  to: number;
+}
+
+export const range = (): ExpressionFunction<typeof name, Context, Arguments, Range> => ({
+  name,
+  help: i18n.translate('visualizations.function.range.help', {
+    defaultMessage: 'Generates range object',
+  }),
+  type: 'range',
+  args: {
+    from: {
+      types: ['number'],
+      help: i18n.translate('visualizations.function.range.from.help', {
+        defaultMessage: 'Start of range',
+      }),
+      required: true,
+    },
+    to: {
+      types: ['number'],
+      help: i18n.translate('visualizations.function.range.to.help', {
+        defaultMessage: 'End of range',
+      }),
+      required: true,
+    },
+  },
+  fn: (context, args) => {
+    return {
+      type: 'range',
+      from: args.from,
+      to: args.to,
+    };
+  },
+});
diff --git a/src/plugins/visualizations/public/expression_functions/vis_dimension.ts b/src/plugins/visualizations/public/expression_functions/vis_dimension.ts
new file mode 100644
index 00000000000000..4ad73ef5048741
--- /dev/null
+++ b/src/plugins/visualizations/public/expression_functions/vis_dimension.ts
@@ -0,0 +1,89 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { ExpressionFunction, KibanaDatatable } from '../../../expressions/public';
+
+const name = 'visdimension';
+
+type Context = KibanaDatatable | null;
+
+interface Arguments {
+  accessor: string | number;
+  format?: string;
+  formatParams?: string;
+}
+
+type Return = any;
+
+export const visDimension = (): ExpressionFunction<typeof name, Context, Arguments, Return> => ({
+  name: 'visdimension',
+  help: i18n.translate('visualizations.function.visDimension.help', {
+    defaultMessage: 'Generates visConfig dimension object',
+  }),
+  type: 'vis_dimension',
+  context: {
+    types: ['kibana_datatable'],
+  },
+  args: {
+    accessor: {
+      types: ['string', 'number'],
+      aliases: ['_'],
+      help: i18n.translate('visualizations.function.visDimension.accessor.help', {
+        defaultMessage: 'Column in your dataset to use (either column index or column name)',
+      }),
+    },
+    format: {
+      types: ['string'],
+      default: 'string',
+      help: i18n.translate('visualizations.function.visDimension.format.help', {
+        defaultMessage: 'Format',
+      }),
+    },
+    formatParams: {
+      types: ['string'],
+      default: '"{}"',
+      help: i18n.translate('visualizations.function.visDimension.formatParams.help', {
+        defaultMessage: 'Format params',
+      }),
+    },
+  },
+  fn: (context, args) => {
+    const accessor =
+      typeof args.accessor === 'number'
+        ? args.accessor
+        : context!.columns.find(c => c.id === args.accessor);
+    if (accessor === undefined) {
+      throw new Error(
+        i18n.translate('visualizations.function.visDimension.error.accessor', {
+          defaultMessage: 'Column name provided is invalid',
+        })
+      );
+    }
+
+    return {
+      type: 'vis_dimension',
+      accessor,
+      format: {
+        id: args.format,
+        params: JSON.parse(args.formatParams!),
+      },
+    };
+  },
+});
diff --git a/src/plugins/visualizations/public/index.ts b/src/plugins/visualizations/public/index.ts
index d8f7b5091eb8f6..2b4b10c8329a3a 100644
--- a/src/plugins/visualizations/public/index.ts
+++ b/src/plugins/visualizations/public/index.ts
@@ -17,4 +17,13 @@
  * under the License.
  */
 
+import { PluginInitializerContext } from '../../../core/public';
+import { VisualizationsPublicPlugin } from './plugin';
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new VisualizationsPublicPlugin(initializerContext);
+}
+
+export { VisualizationsPublicPlugin as Plugin };
+export * from './plugin';
 export * from './types';
diff --git a/src/plugins/visualizations/public/mocks.ts b/src/plugins/visualizations/public/mocks.ts
new file mode 100644
index 00000000000000..af7688d019f651
--- /dev/null
+++ b/src/plugins/visualizations/public/mocks.ts
@@ -0,0 +1,37 @@
+/*
+ * 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 { VisualizationsSetup, VisualizationsStart } from '.';
+
+export type Setup = jest.Mocked<VisualizationsSetup>;
+export type Start = jest.Mocked<VisualizationsStart>;
+
+const createSetupContract = (): Setup => {
+  const setupContract: Setup = undefined;
+  return setupContract;
+};
+
+const createStartContract = (): Start => {
+  const startContract: Start = undefined;
+  return startContract;
+};
+
+export const expressionsPluginMock = {
+  createSetupContract,
+  createStartContract,
+};
diff --git a/src/plugins/visualizations/public/plugin.ts b/src/plugins/visualizations/public/plugin.ts
new file mode 100644
index 00000000000000..cceb63122820d0
--- /dev/null
+++ b/src/plugins/visualizations/public/plugin.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 { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { ExpressionsSetup, ExpressionsStart } from '../../expressions/public';
+import { range as rangeExpressionFunction } from './expression_functions/range';
+import { visDimension as visDimensionExpressionFunction } from './expression_functions/vis_dimension';
+
+export interface VisualizationsSetupDeps {
+  expressions: ExpressionsSetup;
+}
+
+export interface VisualizationsStartDeps {
+  expressions: ExpressionsStart;
+}
+
+export type VisualizationsSetup = void;
+
+export type VisualizationsStart = void;
+
+export class VisualizationsPublicPlugin
+  implements
+    Plugin<
+      VisualizationsSetup,
+      VisualizationsStart,
+      VisualizationsSetupDeps,
+      VisualizationsStartDeps
+    > {
+  constructor(initializerContext: PluginInitializerContext) {}
+
+  public setup(core: CoreSetup, { expressions }: VisualizationsSetupDeps): VisualizationsSetup {
+    expressions.registerFunction(rangeExpressionFunction);
+    expressions.registerFunction(visDimensionExpressionFunction);
+
+    return undefined;
+  }
+
+  public start(core: CoreStart, { expressions }: VisualizationsStartDeps): VisualizationsStart {
+    return undefined;
+  }
+
+  public stop() {}
+}
diff --git a/src/test_utils/kbn_server.ts b/src/test_utils/kbn_server.ts
index 52e2b869d5639d..1494c01166e200 100644
--- a/src/test_utils/kbn_server.ts
+++ b/src/test_utils/kbn_server.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import { Client } from 'elasticsearch';
 import { ToolingLog } from '@kbn/dev-utils';
 import {
   createLegacyEsTestCluster,
@@ -36,6 +36,7 @@ import { CliArgs, Env } from '../core/server/config';
 import { LegacyObjectToConfigAdapter } from '../core/server/legacy';
 import { Root } from '../core/server/root';
 import KbnServer from '../legacy/server/kbn_server';
+import { CallCluster } from '../legacy/core_plugins/elasticsearch';
 
 type HttpMethod = 'delete' | 'get' | 'head' | 'post' | 'put';
 
@@ -147,6 +148,35 @@ export const request: Record<
   put: (root, path) => getSupertest(root, 'put', path),
 };
 
+export interface TestElasticsearchServer {
+  getStartTimeout: () => number;
+  start: (esArgs: string[], esEnvVars: Record<string, string>) => Promise<void>;
+  stop: () => Promise<void>;
+  cleanup: () => Promise<void>;
+  getClient: () => Client;
+  getCallCluster: () => CallCluster;
+  getUrl: () => string;
+}
+
+export interface TestElasticsearchUtils {
+  stop: () => Promise<void>;
+  es: TestElasticsearchServer;
+  hosts: string[];
+  username: string;
+  password: string;
+}
+
+export interface TestKibanaUtils {
+  root: Root;
+  kbnServer: KbnServer;
+  stop: () => Promise<void>;
+}
+
+export interface TestUtils {
+  startES: () => Promise<TestElasticsearchUtils>;
+  startKibana: () => Promise<TestKibanaUtils>;
+}
+
 /**
  * Creates an instance of the Root, including all of the core "legacy" plugins,
  * with default configuration tailored for unit tests, and starts es.
@@ -161,7 +191,7 @@ export function createTestServers({
   settings = {},
 }: {
   adjustTimeout: (timeout: number) => void;
-  settings: {
+  settings?: {
     es?: {
       license: 'oss' | 'basic' | 'gold' | 'trial';
       [key: string]: any;
@@ -182,7 +212,7 @@ export function createTestServers({
      */
     users?: Array<{ username: string; password: string; roles: string[] }>;
   };
-}) {
+}): TestUtils {
   if (!adjustTimeout) {
     throw new Error('adjustTimeout is required in order to avoid flaky tests');
   }
diff --git a/tasks/docker_docs.js b/tasks/docker_docs.js
index 1c35f44eb65385..814a5a7e12bb9b 100644
--- a/tasks/docker_docs.js
+++ b/tasks/docker_docs.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import rimraf from 'rimraf';
+import del from 'del';
 import { join } from 'path';
 import { execFileSync as exec } from 'child_process';
 
@@ -46,7 +46,7 @@ export default function (grunt) {
     ], { env })).trim();
 
     grunt.log.write('Clearing old docs ... ');
-    rimraf.sync(htmlDocsDir);
+    del.sync(htmlDocsDir);
     grunt.log.writeln('done');
 
     grunt.log.write('Copying new docs ... ');
diff --git a/tasks/function_test_groups.js b/tasks/function_test_groups.js
index 69b998c4f229bf..31656df2cb6447 100644
--- a/tasks/function_test_groups.js
+++ b/tasks/function_test_groups.js
@@ -58,12 +58,13 @@ grunt.registerTask(
     const done = this.async();
 
     try {
-      const stats = JSON.parse(await execa.stderr(process.execPath, [
+      const result = await execa(process.execPath, [
         'scripts/functional_test_runner',
         ...TEST_TAGS.map(tag => `--include-tag=${tag}`),
         '--config', 'test/functional/config.js',
         '--test-stats'
-      ]));
+      ]);
+      const stats = JSON.parse(result.stderr);
 
       if (stats.excludedTests.length > 0) {
         grunt.fail.fatal(`
diff --git a/test/accessibility/apps/discover.ts b/test/accessibility/apps/discover.ts
new file mode 100644
index 00000000000000..e3f73ad4bcaf86
--- /dev/null
+++ b/test/accessibility/apps/discover.ts
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+const FROM_TIME = '2015-09-19 06:31:44.000';
+const TO_TIME = '2015-09-23 18:31:44.000';
+
+export default function({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common', 'timePicker']);
+  const a11y = getService('a11y');
+  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
+
+  describe('Discover', () => {
+    before(async () => {
+      await esArchiver.load('discover');
+      await esArchiver.loadIfNeeded('logstash_functional');
+      await kibanaServer.uiSettings.update({
+        defaultIndex: 'logstash-*',
+      });
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.timePicker.setAbsoluteRange(FROM_TIME, TO_TIME);
+    });
+
+    it('main view', async () => {
+      await a11y.testAppSnapshot();
+    });
+  });
+}
diff --git a/test/accessibility/apps/home.ts b/test/accessibility/apps/home.ts
new file mode 100644
index 00000000000000..4df4d5f42c93d8
--- /dev/null
+++ b/test/accessibility/apps/home.ts
@@ -0,0 +1,35 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common']);
+  const a11y = getService('a11y');
+
+  describe('Kibana Home', () => {
+    before(async () => {
+      await PageObjects.common.navigateToApp('home');
+    });
+
+    it('Kibana Home view', async () => {
+      await a11y.testAppSnapshot();
+    });
+  });
+}
diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts
new file mode 100644
index 00000000000000..842f4ecbafa9ef
--- /dev/null
+++ b/test/accessibility/apps/management.ts
@@ -0,0 +1,55 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common', 'settings']);
+  const a11y = getService('a11y');
+
+  describe('Management', () => {
+    before(async () => {
+      await PageObjects.common.navigateToApp('settings');
+    });
+
+    it('main view', async () => {
+      await a11y.testAppSnapshot();
+    });
+
+    it('index pattern page', async () => {
+      await PageObjects.settings.clickKibanaIndexPatterns();
+      await a11y.testAppSnapshot();
+    });
+
+    it('Single indexpattern view', async () => {
+      await PageObjects.settings.clickIndexPatternLogstash();
+      await a11y.testAppSnapshot();
+    });
+
+    it('Saved objects view', async () => {
+      await PageObjects.settings.clickKibanaSavedObjects();
+      await a11y.testAppSnapshot();
+    });
+
+    it('Advanced settings', async () => {
+      await PageObjects.settings.clickKibanaSettings();
+      await a11y.testAppSnapshot();
+    });
+  });
+}
diff --git a/test/accessibility/config.ts b/test/accessibility/config.ts
new file mode 100644
index 00000000000000..d73a73820a1172
--- /dev/null
+++ b/test/accessibility/config.ts
@@ -0,0 +1,42 @@
+/*
+ * 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 { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { services } from './services';
+import { pageObjects } from './page_objects';
+
+export default async function({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
+
+  return {
+    ...functionalConfig.getAll(),
+
+    testFiles: [
+      require.resolve('./apps/discover'),
+      require.resolve('./apps/management'),
+      require.resolve('./apps/home'),
+    ],
+    pageObjects,
+    services,
+
+    junit: {
+      reportName: 'Accessibility Tests',
+    },
+  };
+}
diff --git a/test/accessibility/ftr_provider_context.d.ts b/test/accessibility/ftr_provider_context.d.ts
new file mode 100644
index 00000000000000..22df3b16150a43
--- /dev/null
+++ b/test/accessibility/ftr_provider_context.d.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+
+import { pageObjects } from './page_objects';
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
diff --git a/test/accessibility/page_objects.ts b/test/accessibility/page_objects.ts
new file mode 100644
index 00000000000000..151b6b34781b84
--- /dev/null
+++ b/test/accessibility/page_objects.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { pageObjects } from '../functional/page_objects';
diff --git a/test/accessibility/services/a11y/a11y.ts b/test/accessibility/services/a11y/a11y.ts
new file mode 100644
index 00000000000000..7adfe7ebfcc7d7
--- /dev/null
+++ b/test/accessibility/services/a11y/a11y.ts
@@ -0,0 +1,130 @@
+/*
+ * 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 chalk from 'chalk';
+import testSubjectToCss from '@kbn/test-subj-selector';
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { AxeReport, printResult } from './axe_report';
+// @ts-ignore JS that is run in browser as is
+import { analyzeWithAxe, analyzeWithAxeWithClient } from './analyze_with_axe';
+
+interface AxeContext {
+  include?: string[];
+  exclude?: string[][];
+}
+
+interface TestOptions {
+  excludeTestSubj?: string | string[];
+}
+
+export const normalizeResult = (report: any) => {
+  if (report.error) {
+    throw report.error;
+  }
+
+  return report.result as false | AxeReport;
+};
+
+export function A11yProvider({ getService }: FtrProviderContext) {
+  const browser = getService('browser');
+  const Wd = getService('__webdriver__');
+  const log = getService('log');
+
+  /**
+   * Accessibility testing service using the Axe (https://www.deque.com/axe/)
+   * toolset to validate a11y rules similar to ESLint. In order to test against
+   * the rules we must load up the UI and feed a full HTML snapshot into Axe.
+   */
+  return new (class Accessibility {
+    public async testAppSnapshot(options: TestOptions = {}) {
+      const context = this.getAxeContext(true, options.excludeTestSubj);
+      const report = await this.captureAxeReport(context);
+      await this.testAxeReport(report);
+    }
+
+    public async testGlobalSnapshot(options: TestOptions = {}) {
+      const context = this.getAxeContext(false, options.excludeTestSubj);
+      const report = await this.captureAxeReport(context);
+      await this.testAxeReport(report);
+    }
+
+    private getAxeContext(global: boolean, excludeTestSubj?: string | string[]): AxeContext {
+      return {
+        include: global ? undefined : [testSubjectToCss('appA11yRoot')],
+        exclude: ([] as string[])
+          .concat(excludeTestSubj || [])
+          .map(ts => [testSubjectToCss(ts)])
+          .concat([['.ace_scrollbar']]),
+      };
+    }
+
+    private testAxeReport(report: AxeReport) {
+      const errorMsgs = [];
+
+      for (const result of report.incomplete) {
+        // these items require human review and can't be definitively validated
+        log.warning(printResult(chalk.yellow('UNABLE TO VALIDATE'), result));
+      }
+
+      for (const result of report.violations) {
+        errorMsgs.push(printResult(chalk.red('VIOLATION'), result));
+      }
+
+      if (errorMsgs.length) {
+        throw new Error(`a11y report:\n${errorMsgs.join('\n')}`);
+      }
+    }
+
+    private async captureAxeReport(context: AxeContext): Promise<AxeReport> {
+      const axeOptions = {
+        reporter: 'v2',
+        runOnly: ['wcag2a', 'wcag2aa'],
+        rules: {
+          'color-contrast': {
+            enabled: false,
+          },
+        },
+      };
+
+      await (Wd.driver.manage() as any).setTimeouts({
+        ...(await (Wd.driver.manage() as any).getTimeouts()),
+        script: 600000,
+      });
+
+      const report = normalizeResult(
+        await browser.executeAsync(analyzeWithAxe, context, axeOptions)
+      );
+
+      if (report !== false) {
+        return report;
+      }
+
+      const withClientReport = normalizeResult(
+        await browser.executeAsync(analyzeWithAxeWithClient, context, axeOptions)
+      );
+
+      if (withClientReport === false) {
+        throw new Error('Attempted to analyze with axe but failed to load axe client');
+      }
+
+      return withClientReport;
+    }
+  })();
+}
diff --git a/test/accessibility/services/a11y/analyze_with_axe.js b/test/accessibility/services/a11y/analyze_with_axe.js
new file mode 100644
index 00000000000000..5cba55a29f8a4d
--- /dev/null
+++ b/test/accessibility/services/a11y/analyze_with_axe.js
@@ -0,0 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { readFileSync } from 'fs';
+
+export function analyzeWithAxe(context, options, callback) {
+  Promise.resolve()
+    .then(() => {
+      if (window.axe) {
+        return window.axe.run(context, options);
+      }
+
+      // return a false report to trigger analyzeWithAxeWithClient
+      return false;
+    })
+    .then(result => callback({ result }), error => callback({ error }));
+}
+
+export const analyzeWithAxeWithClient = `
+  ${readFileSync(require.resolve('axe-core/axe.js'), 'utf8')}
+
+  return (${analyzeWithAxe.toString()}).apply(null, arguments);
+`;
diff --git a/test/accessibility/services/a11y/axe_report.ts b/test/accessibility/services/a11y/axe_report.ts
new file mode 100644
index 00000000000000..ba1e8c739079da
--- /dev/null
+++ b/test/accessibility/services/a11y/axe_report.ts
@@ -0,0 +1,69 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+type AxeImpact = 'minor' | 'moderate' | 'serious' | 'critical';
+
+type AxeRelatedNodes = Array<{
+  data: any;
+  id: string;
+  impact: AxeImpact;
+  message: string;
+  relatedNodes: [];
+}>;
+
+export interface AxeResult {
+  /* Rule description */
+  description: string;
+  /* rule title/error message */
+  help: string;
+  /* documentation url */
+  helpUrl: string;
+  /* rule id */
+  id: string;
+  /* severity level */
+  impact?: AxeImpact;
+  /* tags used to group rules */
+  tags: string[];
+  /* nodes grouped in this result */
+  nodes: Array<{
+    all: AxeRelatedNodes;
+    any: AxeRelatedNodes;
+    none: AxeRelatedNodes;
+
+    html: string;
+    impact: AxeImpact;
+    target: string[];
+  }>;
+}
+
+export type AxeResultGroup = AxeResult[];
+
+export interface AxeReport {
+  inapplicable: AxeResultGroup;
+  passes: AxeResultGroup;
+  incomplete: AxeResultGroup;
+  violations: AxeResultGroup;
+}
+
+export const printResult = (title: string, result: AxeResult) => `
+${title}
+  [${result.id}]: ${result.description}
+    Help: ${result.helpUrl}
+    Elements:
+      - ${result.nodes.map(node => node.target).join('\n      - ')}`;
diff --git a/test/accessibility/services/a11y/index.ts b/test/accessibility/services/a11y/index.ts
new file mode 100644
index 00000000000000..7baa17c1eafa33
--- /dev/null
+++ b/test/accessibility/services/a11y/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { A11yProvider } from './a11y';
diff --git a/test/accessibility/services/index.ts b/test/accessibility/services/index.ts
new file mode 100644
index 00000000000000..98d1628732f5c8
--- /dev/null
+++ b/test/accessibility/services/index.ts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { services as kibanaFunctionalServices } from '../../functional/services';
+import { A11yProvider } from './a11y';
+
+export const services = {
+  ...kibanaFunctionalServices,
+  a11y: A11yProvider,
+};
diff --git a/test/api_integration/apis/core/index.js b/test/api_integration/apis/core/index.js
index e5da4e4730662f..d617b2ad073511 100644
--- a/test/api_integration/apis/core/index.js
+++ b/test/api_integration/apis/core/index.js
@@ -16,45 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
 
-  describe('core', () => {
-    describe('request context', () => {
-      it('provides access to elasticsearch', async () => (
-        await supertest
-          .get('/requestcontext/elasticsearch')
-          .expect(200, 'Elasticsearch: true')
-      ));
+  describe('core request context', () => {
+    it('provides access to elasticsearch', async () => (
+      await supertest
+        .get('/requestcontext/elasticsearch')
+        .expect(200, 'Elasticsearch: true')
+    ));
 
-      it('provides access to SavedObjects client', async () => (
-        await supertest
-          .get('/requestcontext/savedobjectsclient')
-          .expect(200, 'SavedObjects client: {"page":1,"per_page":20,"total":0,"saved_objects":[]}')
-      ));
-    });
-
-    describe('compression', () => {
-      it(`uses compression when there isn't a referer`, async () => {
-        await supertest
-          .get('/app/kibana')
-          .set('accept-encoding', 'gzip')
-          .then(response => {
-            expect(response.headers).to.have.property('content-encoding', 'gzip');
-          });
-      });
-
-      it(`doesn't use compression when there is a referer`, async () => {
-        await supertest
-          .get('/app/kibana')
-          .set('accept-encoding', 'gzip')
-          .set('referer', 'https://www.google.com')
-          .then(response => {
-            expect(response.headers).not.to.have.property('content-encoding');
-          });
-      });
-    });
+    it('provides access to SavedObjects client', async () => (
+      await supertest
+        .get('/requestcontext/savedobjectsclient')
+        .expect(200, 'SavedObjects client: {"page":1,"per_page":20,"total":0,"saved_objects":[]}')
+    ));
   });
 }
diff --git a/test/api_integration/apis/index.js b/test/api_integration/apis/index.js
index de36ee678b10ed..9f2672959390ce 100644
--- a/test/api_integration/apis/index.js
+++ b/test/api_integration/apis/index.js
@@ -34,6 +34,5 @@ export default function ({ loadTestFile }) {
     loadTestFile(require.resolve('./status'));
     loadTestFile(require.resolve('./stats'));
     loadTestFile(require.resolve('./ui_metric'));
-    loadTestFile(require.resolve('./core'));
   });
 }
diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js
index 7e04e3f7204d71..4e50b965211c29 100644
--- a/test/api_integration/apis/index_patterns/es_errors/errors.js
+++ b/test/api_integration/apis/index_patterns/es_errors/errors.js
@@ -26,7 +26,7 @@ import {
   createNoMatchingIndicesError,
   isNoMatchingIndicesError,
   convertEsError
-} from '../../../../../src/legacy/server/index_patterns/service/lib/errors';
+} from '../../../../../src/plugins/data/server/index_patterns/fetcher/lib/errors';
 
 import {
   getIndexNotFoundError,
diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js
index 37916d3bee3759..2bd574d669e20e 100644
--- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js
+++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js
@@ -20,7 +20,7 @@
 export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
   const supertest = getService('supertest');
-  const chance = getService('chance');
+  const randomness = getService('randomness');
 
   describe('params', () => {
     before(() => esArchiver.load('index_patterns/basic_index'));
@@ -63,8 +63,8 @@ export default function ({ getService }) {
       supertest
         .get('/api/index_patterns/_fields_for_wildcard')
         .query({
-          pattern: chance.word(),
-          [chance.word()]: chance.word(),
+          pattern: randomness.word(),
+          [randomness.word()]: randomness.word(),
         })
         .expect(400));
   });
diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
index d909b51e94ac04..bc70339bd1a665 100644
--- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
+++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
@@ -61,8 +61,7 @@ export default function ({ getService }) {
               aggregatable: true,
               name: 'baz.keyword',
               readFromDocValues: true,
-              parent: 'baz',
-              subType: 'multi',
+              subType: { multi: { parent: 'baz' } }
             },
             {
               type: 'number',
@@ -72,6 +71,21 @@ export default function ({ getService }) {
               name: 'foo',
               readFromDocValues: true,
             },
+            {
+              aggregatable: true,
+              esTypes: [
+                'keyword'
+              ],
+              name: 'nestedField.child',
+              readFromDocValues: true,
+              searchable: true,
+              subType: {
+                nested: {
+                  path: 'nestedField'
+                }
+              },
+              type: 'string',
+            },
           ],
         })
         .then(ensureFieldsAreSorted));
@@ -124,8 +138,7 @@ export default function ({ getService }) {
               aggregatable: true,
               name: 'baz.keyword',
               readFromDocValues: true,
-              parent: 'baz',
-              subType: 'multi',
+              subType: { multi: { parent: 'baz' } }
             },
             {
               aggregatable: false,
@@ -142,6 +155,21 @@ export default function ({ getService }) {
               name: 'foo',
               readFromDocValues: true,
             },
+            {
+              aggregatable: true,
+              esTypes: [
+                'keyword'
+              ],
+              name: 'nestedField.child',
+              readFromDocValues: true,
+              searchable: true,
+              subType: {
+                nested: {
+                  path: 'nestedField'
+                }
+              },
+              type: 'string',
+            },
           ],
         })
         .then(ensureFieldsAreSorted));
diff --git a/test/api_integration/apis/saved_objects/find.js b/test/api_integration/apis/saved_objects/find.js
index a1c84a766a1167..7b2b15d298ce02 100644
--- a/test/api_integration/apis/saved_objects/find.js
+++ b/test/api_integration/apis/saved_objects/find.js
@@ -141,9 +141,7 @@ export default function ({ getService }) {
                         id: '91200a00-9efd-11e7-acb3-3dab96693fab',
                       }
                     ],
-                    migrationVersion: {
-                      visualization: '7.3.1',
-                    },
+                    migrationVersion: resp.body.saved_objects[0].migrationVersion,
                     updated_at: '2017-09-21T18:51:23.794Z',
                     version: 'WzIsMV0=',
                   },
diff --git a/test/api_integration/apis/suggestions/suggestions.js b/test/api_integration/apis/suggestions/suggestions.js
index 80b6febb81d7b6..abacf13c7aa064 100644
--- a/test/api_integration/apis/suggestions/suggestions.js
+++ b/test/api_integration/apis/suggestions/suggestions.js
@@ -22,8 +22,14 @@ export default function ({ getService }) {
   const supertest = getService('supertest');
 
   describe('Suggestions API', function () {
-    before(() => esArchiver.load('index_patterns/basic_index'));
-    after(() => esArchiver.unload('index_patterns/basic_index'));
+    before(async () => {
+      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('index_patterns/basic_kibana');
+    });
+    after(async () => {
+      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload('index_patterns/basic_kibana');
+    });
 
     it('should return 200 with special characters', () => (
       supertest
@@ -34,5 +40,15 @@ export default function ({ getService }) {
         })
         .expect(200)
     ));
+
+    it('should support nested fields', () => (
+      supertest
+        .post('/api/kibana/suggestions/values/basic_index')
+        .send({
+          field: 'nestedField.child',
+          query: 'nes'
+        })
+        .expect(200, ['nestedValue'])
+    ));
   });
 }
diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz b/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz
index edae3bfdaa2ea9..ec085ec813240c 100644
Binary files a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz and b/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/data.json.gz differ
diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json b/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json
index 5d0d4260109533..338b31dc681ae3 100644
--- a/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json
+++ b/test/api_integration/fixtures/es_archiver/index_patterns/basic_index/mappings.json
@@ -24,8 +24,18 @@
         },
         "foo": {
           "type": "long"
+        },
+        "nestedField": {
+          "type": "nested",
+          "properties": {
+            "child": {
+              "type": "keyword"
+            }
+          }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
+
+
diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json
new file mode 100644
index 00000000000000..54276b59dcc231
--- /dev/null
+++ b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json
@@ -0,0 +1,15 @@
+{
+  "type": "doc",
+  "value": {
+    "index": ".kibana",
+    "id": "index-pattern:91200a00-9efd-11e7-acb3-3dab96693fab",
+    "source": {
+      "type": "index-pattern",
+      "updated_at": "2017-09-21T18:49:16.270Z",
+      "index-pattern": {
+        "title": "basic_index",
+        "fields": "[{\"name\":\"bar\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"baz\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"baz.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"foo\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"nestedField.child\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"nested\":{\"path\":\"nestedField\"}}}]"
+      }
+    }
+  }
+}
diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json
new file mode 100644
index 00000000000000..99264d7ebbff85
--- /dev/null
+++ b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json
@@ -0,0 +1,253 @@
+{
+  "type": "index",
+  "value": {
+    "index": ".kibana",
+    "settings": {
+      "index": {
+        "number_of_shards": "1",
+        "number_of_replicas": "1"
+      }
+    },
+    "mappings": {
+      "dynamic": "strict",
+      "properties": {
+        "config": {
+          "dynamic": "true",
+          "properties": {
+            "buildNum": {
+              "type": "keyword"
+            },
+            "defaultIndex": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 256
+                }
+              }
+            }
+          }
+        },
+        "dashboard": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "optionsJSON": {
+              "type": "text"
+            },
+            "panelsJSON": {
+              "type": "text"
+            },
+            "refreshInterval": {
+              "properties": {
+                "display": {
+                  "type": "keyword"
+                },
+                "pause": {
+                  "type": "boolean"
+                },
+                "section": {
+                  "type": "integer"
+                },
+                "value": {
+                  "type": "integer"
+                }
+              }
+            },
+            "timeFrom": {
+              "type": "keyword"
+            },
+            "timeRestore": {
+              "type": "boolean"
+            },
+            "timeTo": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "index-pattern": {
+          "properties": {
+            "fieldFormatMap": {
+              "type": "text"
+            },
+            "fields": {
+              "type": "text"
+            },
+            "intervalName": {
+              "type": "keyword"
+            },
+            "notExpandable": {
+              "type": "boolean"
+            },
+            "sourceFilters": {
+              "type": "text"
+            },
+            "timeFieldName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            }
+          }
+        },
+        "search": {
+          "properties": {
+            "columns": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "sort": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "uuid": {
+              "type": "keyword"
+            }
+          }
+        },
+        "timelion-sheet": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "timelion_chart_height": {
+              "type": "integer"
+            },
+            "timelion_columns": {
+              "type": "integer"
+            },
+            "timelion_interval": {
+              "type": "keyword"
+            },
+            "timelion_other_interval": {
+              "type": "keyword"
+            },
+            "timelion_rows": {
+              "type": "integer"
+            },
+            "timelion_sheet": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "namespace": {
+          "type": "keyword"
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "updated_at": {
+          "type": "date"
+        },
+        "url": {
+          "properties": {
+            "accessCount": {
+              "type": "long"
+            },
+            "accessDate": {
+              "type": "date"
+            },
+            "createDate": {
+              "type": "date"
+            },
+            "url": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 2048
+                }
+              }
+            }
+          }
+        },
+        "visualization": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchId": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "type": "text"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/test/api_integration/services/chance.js b/test/api_integration/services/chance.js
deleted file mode 100644
index 3c5d9dc704aae0..00000000000000
--- a/test/api_integration/services/chance.js
+++ /dev/null
@@ -1,29 +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 Chance from 'chance';
-
-export function ChanceProvider({ getService }) {
-  const log = getService('log');
-
-  const seed = Date.now();
-  log.debug('randomness seed: %j', seed);
-
-  return new Chance(seed);
-}
diff --git a/test/api_integration/services/index.ts b/test/api_integration/services/index.ts
index d0fcd94a6a2047..573450cae534a4 100644
--- a/test/api_integration/services/index.ts
+++ b/test/api_integration/services/index.ts
@@ -22,14 +22,11 @@ import { services as commonServices } from '../../common/services';
 // @ts-ignore not TS yet
 import { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest';
 
-// @ts-ignore not TS yet
-import { ChanceProvider } from './chance';
-
 export const services = {
   es: commonServices.es,
   esArchiver: commonServices.esArchiver,
   retry: commonServices.retry,
   supertest: KibanaSupertestProvider,
   esSupertest: ElasticsearchSupertestProvider,
-  chance: ChanceProvider,
+  randomness: commonServices.randomness,
 };
diff --git a/test/common/services/index.ts b/test/common/services/index.ts
index 47d93d811e3f6b..225aacc1c98958 100644
--- a/test/common/services/index.ts
+++ b/test/common/services/index.ts
@@ -21,10 +21,12 @@ import { LegacyEsProvider } from './legacy_es';
 import { EsArchiverProvider } from './es_archiver';
 import { KibanaServerProvider } from './kibana_server';
 import { RetryProvider } from './retry';
+import { RandomnessProvider } from './randomness';
 
 export const services = {
   es: LegacyEsProvider,
   esArchiver: EsArchiverProvider,
   kibanaServer: KibanaServerProvider,
   retry: RetryProvider,
+  randomness: RandomnessProvider,
 };
diff --git a/test/common/services/randomness.ts b/test/common/services/randomness.ts
new file mode 100644
index 00000000000000..2a49703e92c58a
--- /dev/null
+++ b/test/common/services/randomness.ts
@@ -0,0 +1,89 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Chance from 'chance';
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+interface CharOptions {
+  pool?: string;
+  alpha?: boolean;
+  numeric?: boolean;
+  symbols?: boolean;
+  casing?: 'lower' | 'upper';
+}
+
+interface StringOptions extends CharOptions {
+  length?: number;
+}
+
+interface NumberOptions {
+  min?: number;
+  max?: number;
+}
+
+export function RandomnessProvider({ getService }: FtrProviderContext) {
+  const log = getService('log');
+
+  const seed = Date.now();
+  log.debug('randomness seed: %j', seed);
+
+  const chance = new Chance(seed);
+
+  return new (class RandomnessService {
+    /**
+     * Generate a random natural number
+     *
+     *  range: 0 to 9007199254740991
+     *
+     */
+    naturalNumber(options?: NumberOptions) {
+      return chance.natural(options);
+    }
+
+    /**
+     * Generate a random integer
+     */
+    integer(options?: NumberOptions) {
+      return chance.integer(options);
+    }
+
+    /**
+     * Generate a random number, defaults to at least 4 and no more than 8 syllables
+     */
+    word(options: { syllables?: number } = {}) {
+      const { syllables = this.naturalNumber({ min: 4, max: 8 }) } = options;
+
+      return chance.word({
+        syllables,
+      });
+    }
+
+    /**
+     * Generate a random string, defaults to at least 8 and no more than 15 alpha-numeric characters
+     */
+    string(options: StringOptions = {}) {
+      return chance.string({
+        length: this.naturalNumber({ min: 8, max: 15 }),
+        ...(options.pool === 'undefined' ? { alpha: true, numeric: true, symbols: false } : {}),
+        ...options,
+      });
+    }
+  })();
+}
diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js
index 6dfef4c54c66b5..b9ad47e428e829 100644
--- a/test/functional/apps/dashboard/dashboard_state.js
+++ b/test/functional/apps/dashboard/dashboard_state.js
@@ -24,7 +24,7 @@ import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME } from '../../page_objects/dash
 // eslint-disable-next-line
 import {
   DEFAULT_PANEL_WIDTH
-} from '../../../../src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/embeddable/dashboard_constants';
+} from '../../../../src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants';
 
 export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['dashboard', 'visualize', 'header', 'discover']);
diff --git a/test/functional/apps/dashboard/panel_controls.js b/test/functional/apps/dashboard/panel_controls.js
index b67e1dd7b2eb1e..063ad1f79efae2 100644
--- a/test/functional/apps/dashboard/panel_controls.js
+++ b/test/functional/apps/dashboard/panel_controls.js
@@ -19,7 +19,7 @@
 
 import expect from '@kbn/expect';
 
-import { PIE_CHART_VIS_NAME } from '../../page_objects/dashboard_page';
+import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME, LINE_CHART_VIS_NAME } from '../../page_objects/dashboard_page';
 import {
   VisualizeConstants
 } from '../../../../src/legacy/core_plugins/kibana/public/visualize/visualize_constants';
@@ -28,6 +28,8 @@ export default function ({ getService, getPageObjects }) {
   const browser = getService('browser');
   const dashboardPanelActions = getService('dashboardPanelActions');
   const dashboardAddPanel = getService('dashboardAddPanel');
+  const dashboardReplacePanel = getService('dashboardReplacePanel');
+  const dashboardVisualizations = getService('dashboardVisualizations');
   const renderable = getService('renderable');
   const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'discover']);
   const dashboardName = 'Dashboard Panel Controls Test';
@@ -44,6 +46,62 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.dashboard.gotoDashboardLandingPage();
     });
 
+    describe('visualization object replace flyout', () => {
+      let intialDimensions;
+      before(async () => {
+        await PageObjects.dashboard.clickNewDashboard();
+        await PageObjects.dashboard.setTimepickerInHistoricalDataRange();
+        await dashboardAddPanel.addVisualization(PIE_CHART_VIS_NAME);
+        await dashboardAddPanel.addVisualization(LINE_CHART_VIS_NAME);
+        intialDimensions = await PageObjects.dashboard.getPanelDimensions();
+      });
+
+      after(async function () {
+        await PageObjects.dashboard.gotoDashboardLandingPage();
+      });
+
+      it('replaces old panel with selected panel', async () => {
+        await dashboardPanelActions.replacePanelByTitle(PIE_CHART_VIS_NAME);
+        await dashboardReplacePanel.replaceEmbeddable(AREA_CHART_VIS_NAME);
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        const panelTitles = await PageObjects.dashboard.getPanelTitles();
+        expect(panelTitles.length).to.be(2);
+        expect(panelTitles[0]).to.be(AREA_CHART_VIS_NAME);
+      });
+
+      it('replaces selected visualization with old dimensions', async () => {
+        const newDimensions = await PageObjects.dashboard.getPanelDimensions();
+        expect(intialDimensions[0]).to.eql(newDimensions[0]);
+      });
+
+      it('replaced panel persisted correctly when dashboard is hard refreshed', async () => {
+        const currentUrl = await browser.getCurrentUrl();
+        await browser.get(currentUrl, true);
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.dashboard.waitForRenderComplete();
+        const panelTitles = await PageObjects.dashboard.getPanelTitles();
+        expect(panelTitles.length).to.be(2);
+        expect(panelTitles[0]).to.be(AREA_CHART_VIS_NAME);
+      });
+
+      it('replaced panel with saved search', async () => {
+        const replacedSearch = 'replaced saved search';
+        await dashboardVisualizations.createSavedSearch({ name: replacedSearch, fields: ['bytes', 'agent'] });
+        await PageObjects.header.clickDashboard();
+        const inViewMode = await PageObjects.dashboard.getIsInViewMode();
+        if (inViewMode) {
+          await PageObjects.dashboard.switchToEditMode();
+        }
+        await dashboardPanelActions.replacePanelByTitle(AREA_CHART_VIS_NAME);
+        await dashboardReplacePanel.replaceEmbeddable(replacedSearch, 'search');
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.dashboard.waitForRenderComplete();
+        const panelTitles = await PageObjects.dashboard.getPanelTitles();
+        expect(panelTitles.length).to.be(2);
+        expect(panelTitles[0]).to.be(replacedSearch);
+      });
+    });
+
     describe('panel edit controls', function () {
       before(async () => {
         await PageObjects.dashboard.clickNewDashboard();
@@ -67,6 +125,7 @@ export default function ({ getService, getPageObjects }) {
         await dashboardPanelActions.openContextMenu();
 
         await dashboardPanelActions.expectExistsEditPanelAction();
+        await dashboardPanelActions.expectExistsReplacePanelAction();
         await dashboardPanelActions.expectExistsRemovePanelAction();
       });
 
@@ -80,6 +139,7 @@ export default function ({ getService, getPageObjects }) {
 
         await dashboardPanelActions.openContextMenu();
         await dashboardPanelActions.expectExistsEditPanelAction();
+        await dashboardPanelActions.expectExistsReplacePanelAction();
         await dashboardPanelActions.expectExistsRemovePanelAction();
 
         // Get rid of the timestamp in the url.
@@ -94,6 +154,7 @@ export default function ({ getService, getPageObjects }) {
           await dashboardPanelActions.clickExpandPanelToggle();
           await dashboardPanelActions.openContextMenu();
           await dashboardPanelActions.expectMissingEditPanelAction();
+          await dashboardPanelActions.expectMissingReplacePanelAction();
           await dashboardPanelActions.expectMissingRemovePanelAction();
         });
 
@@ -101,6 +162,7 @@ export default function ({ getService, getPageObjects }) {
           await PageObjects.dashboard.switchToEditMode();
           await dashboardPanelActions.openContextMenu();
           await dashboardPanelActions.expectExistsEditPanelAction();
+          await dashboardPanelActions.expectExistsReplacePanelAction();
           await dashboardPanelActions.expectMissingRemovePanelAction();
           await dashboardPanelActions.clickExpandPanelToggle();
         });
@@ -126,13 +188,18 @@ export default function ({ getService, getPageObjects }) {
       });
 
       describe('saved search object edit menu', () => {
+        const searchName = 'my search';
         before(async () => {
           await PageObjects.header.clickDiscover();
-          await PageObjects.discover.clickFieldListItemAdd('bytes');
-          await PageObjects.discover.saveSearch('my search');
+          await PageObjects.discover.clickNewSearchButton();
+          await dashboardVisualizations.createSavedSearch({ name: searchName, fields: ['bytes'] });
           await PageObjects.header.waitUntilLoadingHasFinished();
           await PageObjects.header.clickDashboard();
-          await dashboardAddPanel.addSavedSearch('my search');
+          const inViewMode = await PageObjects.dashboard.getIsInViewMode();
+          if (inViewMode) {
+            await PageObjects.dashboard.switchToEditMode();
+          }
+          await dashboardAddPanel.addSavedSearch(searchName);
 
           const panelCount = await PageObjects.dashboard.getPanelCount();
           expect(panelCount).to.be(1);
@@ -143,7 +210,7 @@ export default function ({ getService, getPageObjects }) {
           await dashboardPanelActions.clickEdit();
           await PageObjects.header.waitUntilLoadingHasFinished();
           const queryName = await PageObjects.discover.getCurrentQueryName();
-          expect(queryName).to.be('my search');
+          expect(queryName).to.be(searchName);
         });
 
         it('deletes the saved search when delete link is clicked', async () => {
diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js
index 9f37feef781cae..9d3f95e28942a8 100644
--- a/test/functional/apps/discover/_discover.js
+++ b/test/functional/apps/discover/_discover.js
@@ -26,6 +26,7 @@ export default function ({ getService, getPageObjects }) {
   const browser = getService('browser');
   const kibanaServer = getService('kibanaServer');
   const filterBar = getService('filterBar');
+  const queryBar = getService('queryBar');
   const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
   const defaultSettings = {
     defaultIndex: 'logstash-*',
@@ -106,9 +107,9 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.discover.brushHistogram();
 
         const newDurationHours = await PageObjects.timePicker.getTimeDurationInHours();
-        expect(Math.round(newDurationHours)).to.be(108);
+        expect(Math.round(newDurationHours)).to.be(25);
         const rowData = await PageObjects.discover.getDocTableField(1);
-        expect(rowData).to.have.string('Sep 22, 2015 @ 23:50:13.253');
+        expect(Date.parse(rowData)).to.be.within(Date.parse('Sep 20, 2015 @ 22:00:00.000'), Date.parse('Sep 20, 2015 @ 23:30:00.000'));
       });
 
       it('should show correct initial chart interval of Auto', async function () {
@@ -154,6 +155,26 @@ export default function ({ getService, getPageObjects }) {
       });
     });
 
+    describe('nested query', () => {
+
+      before(async () => {
+        log.debug('setAbsoluteRangeForAnotherQuery');
+        await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
+        await PageObjects.discover.waitUntilSearchingHasFinished();
+      });
+
+      it('should support querying on nested fields', async function () {
+        await queryBar.setQuery('nestedField:{ child: nestedValue }');
+        await queryBar.submitQuery();
+        await retry.try(async function () {
+          expect(await PageObjects.discover.getHitCount()).to.be(
+            '1'
+          );
+        });
+      });
+
+    });
+
     describe('filter editor', function () {
       it('should add a phrases filter', async function () {
         await filterBar.addFilter('extension.raw', 'is one of', 'jpg');
diff --git a/test/functional/apps/visualize/_shared_item.js b/test/functional/apps/visualize/_shared_item.js
index efd534f0350931..9fe38be15a7416 100644
--- a/test/functional/apps/visualize/_shared_item.js
+++ b/test/functional/apps/visualize/_shared_item.js
@@ -24,8 +24,7 @@ export default function ({ getService, getPageObjects }) {
   const retry = getService('retry');
   const PageObjects = getPageObjects(['common', 'visualize']);
 
-  // https://github.com/elastic/kibana/issues/37130
-  describe.skip('data-shared-item', function indexPatternCreation() {
+  describe('data-shared-item', function indexPatternCreation() {
     before(async function () {
       log.debug('navigateToApp visualize');
       await PageObjects.common.navigateToApp('visualize');
diff --git a/test/functional/fixtures/es_archiver/discover/data.json.gz b/test/functional/fixtures/es_archiver/discover/data.json.gz
index c607f211d37c24..047d890f6d4101 100644
Binary files a/test/functional/fixtures/es_archiver/discover/data.json.gz and b/test/functional/fixtures/es_archiver/discover/data.json.gz differ
diff --git a/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz b/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz
index 2cef0717385267..a212c34e2ead64 100644
Binary files a/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz and b/test/functional/fixtures/es_archiver/logstash_functional/data.json.gz differ
diff --git a/test/functional/fixtures/es_archiver/logstash_functional/mappings.json b/test/functional/fixtures/es_archiver/logstash_functional/mappings.json
index dcfafa2612c5bf..010abff9cf6a9f 100644
--- a/test/functional/fixtures/es_archiver/logstash_functional/mappings.json
+++ b/test/functional/fixtures/es_archiver/logstash_functional/mappings.json
@@ -153,6 +153,14 @@
             }
           }
         },
+        "nestedField": {
+          "type": "nested",
+          "properties": {
+            "child": {
+              "type": "keyword"
+            }
+          }
+        },
         "phpmemory": {
           "type": "long"
         },
@@ -518,6 +526,14 @@
             }
           }
         },
+        "nestedField": {
+          "type": "nested",
+          "properties": {
+            "child": {
+              "type": "keyword"
+            }
+          }
+        },
         "phpmemory": {
           "type": "long"
         },
@@ -883,6 +899,14 @@
             }
           }
         },
+        "nestedField": {
+          "type": "nested",
+          "properties": {
+            "child": {
+              "type": "keyword"
+            }
+          }
+        },
         "phpmemory": {
           "type": "long"
         },
@@ -1091,4 +1115,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/test/functional/page_objects/dashboard_page.js b/test/functional/page_objects/dashboard_page.js
index 4f078d4b7a4384..ca141114f976dc 100644
--- a/test/functional/page_objects/dashboard_page.js
+++ b/test/functional/page_objects/dashboard_page.js
@@ -22,6 +22,7 @@ import { DashboardConstants } from '../../../src/legacy/core_plugins/kibana/publ
 
 export const PIE_CHART_VIS_NAME = 'Visualization PieChart';
 export const AREA_CHART_VIS_NAME = 'Visualization漢字 AreaChart';
+export const LINE_CHART_VIS_NAME = 'Visualization漢字 LineChart';
 
 export function DashboardPageProvider({ getService, getPageObjects }) {
   const log = getService('log');
@@ -499,7 +500,7 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
         { name: 'Visualization☺ VerticalBarChart', description: 'VerticalBarChart' },
         { name: AREA_CHART_VIS_NAME, description: 'AreaChart' },
         { name: 'Visualization☺漢字 DataTable', description: 'DataTable' },
-        { name: 'Visualization漢字 LineChart', description: 'LineChart' },
+        { name: LINE_CHART_VIS_NAME, description: 'LineChart' },
         { name: 'Visualization TileMap', description: 'TileMap' },
         { name: 'Visualization MetricChart', description: 'MetricChart' }
       ];
diff --git a/test/functional/page_objects/discover_page.js b/test/functional/page_objects/discover_page.js
index 4654b85f9c7c45..8d12b2117a2149 100644
--- a/test/functional/page_objects/discover_page.js
+++ b/test/functional/page_objects/discover_page.js
@@ -283,19 +283,13 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
     }
 
     async openSidebarFieldFilter() {
-      const fieldFilterFormExists = await testSubjects.exists('discoverFieldFilter');
-      if (!fieldFilterFormExists) {
-        await testSubjects.click('toggleFieldFilterButton');
-        await testSubjects.existOrFail('discoverFieldFilter');
-      }
+      await testSubjects.click('toggleFieldFilterButton');
+      await testSubjects.existOrFail('filterSelectionPanel');
     }
 
     async closeSidebarFieldFilter() {
-      const fieldFilterFormExists = await testSubjects.exists('discoverFieldFilter');
-      if (fieldFilterFormExists) {
-        await testSubjects.click('toggleFieldFilterButton');
-        await testSubjects.missingOrFail('discoverFieldFilter', { allowHidden: true });
-      }
+      await testSubjects.click('toggleFieldFilterButton');
+      await testSubjects.missingOrFail('filterSelectionPanel', { allowHidden: true });
     }
 
   }
diff --git a/test/functional/services/browser.ts b/test/functional/services/browser.ts
index 4060e3dd7800f2..97e02958f3787f 100644
--- a/test/functional/services/browser.ts
+++ b/test/functional/services/browser.ts
@@ -461,10 +461,7 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
       );
     }
 
-    public async executeAsync<A extends any[], R>(
-      fn: string | ((...args: A) => R),
-      ...args: A
-    ): Promise<R> {
+    public async executeAsync<R>(fn: string | ((...args: any[]) => R), ...args: any[]): Promise<R> {
       return await driver.executeAsyncScript(
         fn,
         ...cloneDeep<any>(args, arg => {
diff --git a/test/functional/services/dashboard/index.js b/test/functional/services/dashboard/index.js
index b2de690157535f..bb9b861682907d 100644
--- a/test/functional/services/dashboard/index.js
+++ b/test/functional/services/dashboard/index.js
@@ -20,5 +20,6 @@
 export { DashboardVisualizationProvider } from './visualizations';
 export { DashboardExpectProvider } from './expectations';
 export { DashboardAddPanelProvider } from './add_panel';
+export { DashboardReplacePanelProvider } from './replace_panel';
 export { DashboardPanelActionsProvider } from './panel_actions';
 
diff --git a/test/functional/services/dashboard/panel_actions.js b/test/functional/services/dashboard/panel_actions.js
index b7327f4af6d174..6826ea1ff17150 100644
--- a/test/functional/services/dashboard/panel_actions.js
+++ b/test/functional/services/dashboard/panel_actions.js
@@ -19,6 +19,7 @@
 
 const REMOVE_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-deletePanel';
 const EDIT_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-editPanel';
+const REPLACE_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-replacePanel';
 const TOGGLE_EXPAND_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-togglePanel';
 const CUSTOMIZE_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-CUSTOMIZE_PANEL_ACTION_ID';
 const OPEN_CONTEXT_MENU_ICON_DATA_TEST_SUBJ = 'embeddablePanelToggleMenuIcon';
@@ -87,6 +88,16 @@ export function DashboardPanelActionsProvider({ getService, getPageObjects }) {
       await testSubjects.click(CUSTOMIZE_PANEL_DATA_TEST_SUBJ);
     }
 
+    async replacePanelByTitle(title) {
+      log.debug(`replacePanel(${title})`);
+      let panelOptions = null;
+      if (title) {
+        panelOptions = await this.getPanelHeading(title);
+      }
+      await this.openContextMenu(panelOptions);
+      await testSubjects.click(REPLACE_PANEL_DATA_TEST_SUBJ);
+    }
+
     async openInspectorByTitle(title) {
       const header = await this.getPanelHeading(title);
       await this.openInspector(header);
@@ -112,11 +123,21 @@ export function DashboardPanelActionsProvider({ getService, getPageObjects }) {
       await testSubjects.existOrFail(EDIT_PANEL_DATA_TEST_SUBJ);
     }
 
+    async expectExistsReplacePanelAction() {
+      log.debug('expectExistsEditPanelAction');
+      await testSubjects.existOrFail(REPLACE_PANEL_DATA_TEST_SUBJ);
+    }
+
     async expectMissingEditPanelAction() {
       log.debug('expectMissingEditPanelAction');
       await testSubjects.missingOrFail(EDIT_PANEL_DATA_TEST_SUBJ);
     }
 
+    async expectMissingReplacePanelAction() {
+      log.debug('expectMissingEditPanelAction');
+      await testSubjects.missingOrFail(REPLACE_PANEL_DATA_TEST_SUBJ);
+    }
+
     async expectExistsToggleExpandAction() {
       log.debug('expectExistsToggleExpandAction');
       await testSubjects.existOrFail(TOGGLE_EXPAND_PANEL_DATA_TEST_SUBJ);
diff --git a/test/functional/services/dashboard/replace_panel.js b/test/functional/services/dashboard/replace_panel.js
new file mode 100644
index 00000000000000..b3ea6f9cf21ed8
--- /dev/null
+++ b/test/functional/services/dashboard/replace_panel.js
@@ -0,0 +1,102 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+export function DashboardReplacePanelProvider({ getService }) {
+  const log = getService('log');
+  const testSubjects = getService('testSubjects');
+  const flyout = getService('flyout');
+
+  return new class DashboardReplacePanel {
+    async toggleFilterPopover() {
+      log.debug('DashboardReplacePanel.toggleFilter');
+      await testSubjects.click('savedObjectFinderFilterButton');
+    }
+
+    async toggleFilter(type) {
+      log.debug(`DashboardReplacePanel.replaceToFilter(${type})`);
+      await this.waitForListLoading();
+      await this.toggleFilterPopover();
+      await testSubjects.click(`savedObjectFinderFilter-${type}`);
+      await this.toggleFilterPopover();
+    }
+
+    async isReplacePanelOpen() {
+      log.debug('DashboardReplacePanel.isReplacePanelOpen');
+      return await testSubjects.exists('dashboardReplacePanel');
+    }
+
+    async ensureReplacePanelIsShowing() {
+      log.debug('DashboardReplacePanel.ensureReplacePanelIsShowing');
+      const isOpen = await this.isReplacePanelOpen();
+      if (!isOpen) {
+        throw new Error('Replace panel is not open, trying again.');
+      }
+    }
+
+    async waitForListLoading() {
+      await testSubjects.waitForDeleted('savedObjectFinderLoadingIndicator');
+    }
+
+    async closeReplacePanel() {
+      await flyout.ensureClosed('dashboardReplacePanel');
+    }
+
+    async replaceSavedSearch(searchName) {
+      return this.replaceEmbeddable(searchName, 'search');
+    }
+
+    async replaceSavedSearches(searches) {
+      for (const name of searches) {
+        await this.replaceSavedSearch(name);
+      }
+    }
+
+    async replaceVisualization(vizName) {
+      return this.replaceEmbeddable(vizName, 'visualization');
+    }
+
+    async replaceEmbeddable(embeddableName, embeddableType) {
+      log.debug(`DashboardReplacePanel.replaceEmbeddable, name: ${embeddableName}, type: ${embeddableType}`);
+      await this.ensureReplacePanelIsShowing();
+      if (embeddableType) {
+        await this.toggleFilter(embeddableType);
+      }
+      await this.filterEmbeddableNames(`"${embeddableName.replace('-', ' ')}"`);
+      await testSubjects.click(`savedObjectTitle${embeddableName.split(' ').join('-')}`);
+      await testSubjects.exists('addObjectToDashboardSuccess');
+      await this.closeReplacePanel();
+      return embeddableName;
+    }
+
+    async filterEmbeddableNames(name) {
+      // The search input field may be disabled while the table is loading so wait for it
+      await this.waitForListLoading();
+      await testSubjects.setValue('savedObjectFinderSearchInput', name);
+      await this.waitForListLoading();
+    }
+
+    async panelReplaceLinkExists(name) {
+      log.debug(`DashboardReplacePanel.panelReplaceLinkExists(${name})`);
+      await this.ensureReplacePanelIsShowing();
+      await this.filterEmbeddableNames(`"${name}"`);
+      return await testSubjects.exists(`savedObjectTitle${name.split(' ').join('-')}`);
+    }
+  };
+}
diff --git a/test/functional/services/index.ts b/test/functional/services/index.ts
index 2566c3c87334c4..6098e9931f299f 100644
--- a/test/functional/services/index.ts
+++ b/test/functional/services/index.ts
@@ -24,6 +24,7 @@ import { BrowserProvider } from './browser';
 import { ComboBoxProvider } from './combo_box';
 import {
   DashboardAddPanelProvider,
+  DashboardReplacePanelProvider,
   DashboardExpectProvider,
   DashboardPanelActionsProvider,
   DashboardVisualizationProvider,
@@ -66,6 +67,7 @@ export const services = {
   failureDebugging: FailureDebuggingProvider,
   visualizeListingTable: VisualizeListingTableProvider,
   dashboardAddPanel: DashboardAddPanelProvider,
+  dashboardReplacePanel: DashboardReplacePanelProvider,
   dashboardPanelActions: DashboardPanelActionsProvider,
   flyout: FlyoutProvider,
   comboBox: ComboBoxProvider,
diff --git a/test/functional/services/remote/remote.ts b/test/functional/services/remote/remote.ts
index 4dc608542c3c3f..b30a0e50886d12 100644
--- a/test/functional/services/remote/remote.ts
+++ b/test/functional/services/remote/remote.ts
@@ -128,6 +128,8 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
       .manage()
       .window()
       .setRect({ width, height });
+    await driver.executeScript('window.sessionStorage.clear();');
+    await driver.executeScript('window.localStorage.clear();');
   });
 
   lifecycle.on('cleanup', async () => {
diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
index 5ebec6bde6ebbd..201354fff48efa 100644
--- a/test/functional/services/remote/webdriver.ts
+++ b/test/functional/services/remote/webdriver.ts
@@ -75,13 +75,23 @@ async function attemptToCreateCommand(
       case 'chrome': {
         const chromeCapabilities = Capabilities.chrome();
         const chromeOptions = [
-          'disable-translate',
-          'new-window',
+          // Disables the sandbox for all process types that are normally sandboxed.
           'no-sandbox',
+          // Launches URL in new browser window.
+          'new-window',
+          // By default, file:// URIs cannot read other file:// URIs. This is an override for developers who need the old behavior for testing.
           'allow-file-access-from-files',
+          // Use fake device for Media Stream to replace actual camera and microphone.
           'use-fake-device-for-media-stream',
+          // Bypass the media stream infobar by selecting the default device for media streams (e.g. WebRTC). Works with --use-fake-device-for-media-stream.
           'use-fake-ui-for-media-stream',
         ];
+        if (process.platform === 'linux') {
+          // The /dev/shm partition is too small in certain VM environments, causing
+          // Chrome to fail or crash. Use this flag to work-around this issue
+          // (a temporary directory will always be used to create anonymous shared memory files).
+          chromeOptions.push('disable-dev-shm-usage');
+        }
         if (headlessBrowser === '1') {
           // Use --disable-gpu to avoid an error from a missing Mesa library, as per
           // See: https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index 68641c2fd6b1ff..766e6168002c29 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "14.5.0",
+    "@elastic/eui": "14.8.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
   }
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
index 5d464cf0405d04..7c1406f5b20c3a 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
@@ -76,7 +76,7 @@ const PageA = () => (
           </EuiTitle>
         </EuiPageContentHeaderSection>
       </EuiPageContentHeader>
-      <EuiPageContentBody>Page A's content goes here</EuiPageContentBody>
+      <EuiPageContentBody>Page A&apos;s content goes here</EuiPageContentBody>
     </EuiPageContent>
   </EuiPageBody>
 );
diff --git a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
index 67c9120b1f2d92..771e50b22f66ba 100644
--- a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
@@ -29,7 +29,7 @@ declare module 'kibana/server' {
 export class CorePluginBPlugin implements Plugin {
   public setup(core: CoreSetup, deps: {}) {
     const router = core.http.createRouter();
-    router.get({ path: '/core_plugin_b/', validate: false }, async (context, req, res) => {
+    router.get({ path: '/core_plugin_b', validate: false }, async (context, req, res) => {
       if (!context.pluginA) return res.internalError({ body: 'pluginA is disabled' });
       const response = await context.pluginA.ping();
       return res.ok({ body: `Pong via plugin A: ${response}` });
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index a03849129192f5..7c5b6f6be58af2 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "14.5.0",
+    "@elastic/eui": "14.8.0",
     "react": "^16.8.0"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
index 18b14516b9be41..ef472b4026957e 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "14.5.0",
+    "@elastic/eui": "14.8.0",
     "react": "^16.8.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
index b147da6a448ae5..277bb09ac745c5 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "14.5.0",
+    "@elastic/eui": "14.8.0",
     "react": "^16.8.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_top_nav/index.js b/test/plugin_functional/plugins/kbn_tp_top_nav/index.js
new file mode 100644
index 00000000000000..144050beb78689
--- /dev/null
+++ b/test/plugin_functional/plugins/kbn_tp_top_nav/index.js
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export default function (kibana) {
+  return new kibana.Plugin({
+    uiExports: {
+      app: {
+        title: 'Top Nav Menu test',
+        description: 'This is a sample plugin for the functional tests.',
+        main: 'plugins/kbn_tp_top_nav/app',
+      }
+    }
+  });
+}
diff --git a/test/plugin_functional/plugins/kbn_tp_top_nav/package.json b/test/plugin_functional/plugins/kbn_tp_top_nav/package.json
new file mode 100644
index 00000000000000..7102d24d3292de
--- /dev/null
+++ b/test/plugin_functional/plugins/kbn_tp_top_nav/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "kbn_tp_top_nav",
+  "version": "1.0.0",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "Apache-2.0"
+}
diff --git a/test/plugin_functional/plugins/kbn_tp_top_nav/public/app.js b/test/plugin_functional/plugins/kbn_tp_top_nav/public/app.js
new file mode 100644
index 00000000000000..e7f97e68c086d3
--- /dev/null
+++ b/test/plugin_functional/plugins/kbn_tp_top_nav/public/app.js
@@ -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 React from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
+
+import { uiModules } from 'ui/modules';
+import chrome from 'ui/chrome';
+
+// This is required so some default styles and required scripts/Angular modules are loaded,
+// or the timezone setting is correctly applied.
+import 'ui/autoload/all';
+
+import { AppWithTopNav } from './top_nav';
+
+const app = uiModules.get('apps/topnavDemoPlugin', ['kibana']);
+
+app.config($locationProvider => {
+  $locationProvider.html5Mode({
+    enabled: false,
+    requireBase: false,
+    rewriteLinks: false,
+  });
+});
+
+function RootController($scope, $element) {
+  const domNode = $element[0];
+
+  // render react to DOM
+  render(<AppWithTopNav />, domNode);
+
+  // unmount react on controller destroy
+  $scope.$on('$destroy', () => {
+    unmountComponentAtNode(domNode);
+  });
+}
+
+chrome.setRootController('topnavDemoPlugin', RootController);
diff --git a/test/plugin_functional/plugins/kbn_tp_top_nav/public/top_nav.tsx b/test/plugin_functional/plugins/kbn_tp_top_nav/public/top_nav.tsx
new file mode 100644
index 00000000000000..8678ab705df9c4
--- /dev/null
+++ b/test/plugin_functional/plugins/kbn_tp_top_nav/public/top_nav.tsx
@@ -0,0 +1,53 @@
+/*
+ * 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 {
+  setup as navSetup,
+  start as navStart,
+} from '../../../../../src/legacy/core_plugins/navigation/public/legacy';
+
+const customExtension = {
+  id: 'registered-prop',
+  label: 'Registered Button',
+  description: 'Registered Demo',
+  run() {},
+  testId: 'demoRegisteredNewButton',
+};
+
+navSetup.registerMenuItem(customExtension);
+
+export const AppWithTopNav = () => {
+  const { TopNavMenu } = navStart.ui;
+  const config = [
+    {
+      id: 'new',
+      label: 'New Button',
+      description: 'New Demo',
+      run() {},
+      testId: 'demoNewButton',
+    },
+  ];
+
+  return (
+    <TopNavMenu appName="demo-app" config={config}>
+      Hey
+    </TopNavMenu>
+  );
+};
diff --git a/test/plugin_functional/plugins/kbn_tp_top_nav/tsconfig.json b/test/plugin_functional/plugins/kbn_tp_top_nav/tsconfig.json
new file mode 100644
index 00000000000000..1ba21f11b7de2a
--- /dev/null
+++ b/test/plugin_functional/plugins/kbn_tp_top_nav/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true
+  },
+  "include": [
+    "index.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "server/**/*.ts",
+    "../../../../typings/**/*",
+  ],
+  "exclude": []
+}
diff --git a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
index 10f122823353ce..f248a7e4d1f2d4 100644
--- a/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_visualize_embedding/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "14.5.0",
+    "@elastic/eui": "14.8.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
   }
diff --git a/test/plugin_functional/plugins/search_explorer/public/demo_strategy.tsx b/test/plugin_functional/plugins/search_explorer/public/demo_strategy.tsx
index 665b3c9f0ae036..8a0dd31e3595f2 100644
--- a/test/plugin_functional/plugins/search_explorer/public/demo_strategy.tsx
+++ b/test/plugin_functional/plugins/search_explorer/public/demo_strategy.tsx
@@ -127,7 +127,7 @@ export class DemoStrategy extends React.Component<Props, State> {
             },
           ]}
           demo={this.renderDemo()}
-        ></GuideSection>
+        />
       </EuiPageContentBody>
     );
   }
diff --git a/test/plugin_functional/plugins/search_explorer/public/es_strategy.tsx b/test/plugin_functional/plugins/search_explorer/public/es_strategy.tsx
index 20de631bc56052..d35c67191a1f80 100644
--- a/test/plugin_functional/plugins/search_explorer/public/es_strategy.tsx
+++ b/test/plugin_functional/plugins/search_explorer/public/es_strategy.tsx
@@ -139,7 +139,7 @@ export class EsSearchTest extends React.Component<Props, State> {
             },
           ]}
           demo={this.renderDemo()}
-        ></GuideSection>
+        />
       </EuiPageContentBody>
     );
   }
diff --git a/test/plugin_functional/plugins/search_explorer/public/guide_section.tsx b/test/plugin_functional/plugins/search_explorer/public/guide_section.tsx
index fe67e4097b2a3e..1562e33b14c2f5 100644
--- a/test/plugin_functional/plugins/search_explorer/public/guide_section.tsx
+++ b/test/plugin_functional/plugins/search_explorer/public/guide_section.tsx
@@ -110,7 +110,7 @@ export class GuideSection extends React.Component<Props, State> {
 
     return code.map((codeBlock, i) => (
       <React.Fragment key={i}>
-        <EuiSpacer></EuiSpacer>
+        <EuiSpacer />
         <h3>{codeBlock.description}</h3>
         <EuiCodeBlock language="ts">{this.removeLicenseBlock(codeBlock.snippet)}</EuiCodeBlock>
         <EuiHorizontalRule />
diff --git a/test/plugin_functional/plugins/search_explorer/public/search_api.tsx b/test/plugin_functional/plugins/search_explorer/public/search_api.tsx
index 3e4768c8700643..8ec6225d1f172d 100644
--- a/test/plugin_functional/plugins/search_explorer/public/search_api.tsx
+++ b/test/plugin_functional/plugins/search_explorer/public/search_api.tsx
@@ -83,5 +83,5 @@ export const SearchApiPage = () => (
         ],
       },
     ]}
-  ></GuideSection>
+  />
 );
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/kibana.json b/test/plugin_functional/plugins/ui_settings_plugin/kibana.json
new file mode 100644
index 00000000000000..05d2dca0af9377
--- /dev/null
+++ b/test/plugin_functional/plugins/ui_settings_plugin/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "ui_settings_plugin",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "configPath": ["ui_settings_plugin"],
+  "server": true,
+  "ui": true
+}
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/package.json b/test/plugin_functional/plugins/ui_settings_plugin/package.json
new file mode 100644
index 00000000000000..6a0d5999412ff0
--- /dev/null
+++ b/test/plugin_functional/plugins/ui_settings_plugin/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "ui_settings_plugin",
+  "version": "1.0.0",
+  "main": "target/test/plugin_functional/plugins/ui_settings_plugin",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "Apache-2.0",
+  "scripts": {
+    "kbn": "node ../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && tsc"
+  },
+  "devDependencies": {
+    "typescript": "3.5.3"
+  }
+}
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/public/index.ts b/test/plugin_functional/plugins/ui_settings_plugin/public/index.ts
new file mode 100644
index 00000000000000..3c5997132d460d
--- /dev/null
+++ b/test/plugin_functional/plugins/ui_settings_plugin/public/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { UiSettingsPlugin } from './plugin';
+
+export const plugin = () => new UiSettingsPlugin();
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/public/plugin.tsx b/test/plugin_functional/plugins/ui_settings_plugin/public/plugin.tsx
new file mode 100644
index 00000000000000..883d203b4c37ac
--- /dev/null
+++ b/test/plugin_functional/plugins/ui_settings_plugin/public/plugin.tsx
@@ -0,0 +1,37 @@
+/*
+ * 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, Plugin } from 'kibana/public';
+
+declare global {
+  interface Window {
+    uiSettingsPlugin?: Record<string, any>;
+    uiSettingsPluginValue?: string;
+  }
+}
+
+export class UiSettingsPlugin implements Plugin {
+  public setup(core: CoreSetup) {
+    window.uiSettingsPlugin = core.uiSettings.getAll().ui_settings_plugin;
+    window.uiSettingsPluginValue = core.uiSettings.get('ui_settings_plugin');
+  }
+
+  public start() {}
+  public stop() {}
+}
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/server/index.ts b/test/plugin_functional/plugins/ui_settings_plugin/server/index.ts
new file mode 100644
index 00000000000000..7715cef31d72c3
--- /dev/null
+++ b/test/plugin_functional/plugins/ui_settings_plugin/server/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiSettingsPlugin } from './plugin';
+
+export const plugin = () => new UiSettingsPlugin();
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts b/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts
new file mode 100644
index 00000000000000..c32e8a75d95da5
--- /dev/null
+++ b/test/plugin_functional/plugins/ui_settings_plugin/server/plugin.ts
@@ -0,0 +1,44 @@
+/*
+ * 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 { Plugin, CoreSetup } from 'kibana/server';
+
+export class UiSettingsPlugin implements Plugin {
+  public setup(core: CoreSetup) {
+    core.uiSettings.register({
+      ui_settings_plugin: {
+        name: 'from_ui_settings_plugin',
+        description: 'just for testing',
+        value: '2',
+        category: ['any'],
+      },
+    });
+
+    const router = core.http.createRouter();
+    router.get({ path: '/api/ui-settings-plugin', validate: false }, async (context, req, res) => {
+      const uiSettingsValue = await context.core.uiSettings.client.get<number>(
+        'ui_settings_plugin'
+      );
+      return res.ok({ body: { uiSettingsValue } });
+    });
+  }
+
+  public start() {}
+  public stop() {}
+}
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json b/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json
new file mode 100644
index 00000000000000..1ba21f11b7de2a
--- /dev/null
+++ b/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true
+  },
+  "include": [
+    "index.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "server/**/*.ts",
+    "../../../../typings/**/*",
+  ],
+  "exclude": []
+}
diff --git a/test/plugin_functional/services/index.js b/test/plugin_functional/services/index.js
deleted file mode 100644
index bf02587772f4b5..00000000000000
--- a/test/plugin_functional/services/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { KibanaSupertestProvider } from './supertest';
-
-export const services = {
-  supertest: KibanaSupertestProvider,
-};
diff --git a/test/plugin_functional/services/index.ts b/test/plugin_functional/services/index.ts
new file mode 100644
index 00000000000000..dd2b25e14fe170
--- /dev/null
+++ b/test/plugin_functional/services/index.ts
@@ -0,0 +1,29 @@
+/*
+ * 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 { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+
+import { KibanaSupertestProvider } from './supertest';
+
+export const services = {
+  supertest: KibanaSupertestProvider,
+};
+
+export type PluginFunctionalProviderContext = FtrProviderContext &
+  GenericFtrProviderContext<typeof services, {}>;
diff --git a/test/plugin_functional/services/supertest.js b/test/plugin_functional/services/supertest.js
deleted file mode 100644
index 390f89acaa7758..00000000000000
--- a/test/plugin_functional/services/supertest.js
+++ /dev/null
@@ -1,29 +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 { format as formatUrl } from 'url';
-
-import supertestAsPromised from 'supertest-as-promised';
-
-export function KibanaSupertestProvider({ getService }) {
-  const config = getService('config');
-  const kibanaServerUrl = formatUrl(config.get('servers.kibana'));
-  return supertestAsPromised(kibanaServerUrl);
-}
diff --git a/test/plugin_functional/services/supertest.ts b/test/plugin_functional/services/supertest.ts
new file mode 100644
index 00000000000000..6b7dc26248c061
--- /dev/null
+++ b/test/plugin_functional/services/supertest.ts
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { format as formatUrl } from 'url';
+import { FtrProviderContext } from 'test/functional/ftr_provider_context';
+
+import supertestAsPromised from 'supertest-as-promised';
+
+export function KibanaSupertestProvider({ getService }: FtrProviderContext) {
+  const config = getService('config');
+  const kibanaServerUrl = formatUrl(config.get('servers.kibana'));
+  return supertestAsPromised(kibanaServerUrl);
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/applications.js b/test/plugin_functional/test_suites/core_plugins/applications.js
deleted file mode 100644
index 4c4c198d1af94a..00000000000000
--- a/test/plugin_functional/test_suites/core_plugins/applications.js
+++ /dev/null
@@ -1,104 +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 url from 'url';
-import expect from '@kbn/expect';
-
-export default function ({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['common']);
-
-  const browser = getService('browser');
-  const appsMenu = getService('appsMenu');
-  const testSubjects = getService('testSubjects');
-
-  const loadingScreenNotShown = async () =>
-    expect(await testSubjects.exists('kbnLoadingMessage')).to.be(false);
-
-  const loadingScreenShown = () =>
-    testSubjects.existOrFail('kbnLoadingMessage');
-
-  const getKibanaUrl = (pathname, search) => url.format({
-    protocol: 'http:',
-    hostname: process.env.TEST_KIBANA_HOST || 'localhost',
-    port: process.env.TEST_KIBANA_PORT || '5620',
-    pathname,
-    search,
-  });
-
-  describe('ui applications', function describeIndexTests() {
-    before(async () => {
-      await PageObjects.common.navigateToApp('foo');
-    });
-
-    it('starts on home page', async () => {
-      await testSubjects.existOrFail('fooAppHome');
-    });
-
-    it('navigates to its own pages', async () => {
-      // Go to page A
-      await testSubjects.click('fooNavPageA');
-      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/foo/page-a'));
-      await loadingScreenNotShown();
-      await testSubjects.existOrFail('fooAppPageA');
-
-      // Go to home page
-      await testSubjects.click('fooNavHome');
-      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/foo/'));
-      await loadingScreenNotShown();
-      await testSubjects.existOrFail('fooAppHome');
-    });
-
-    it('can use the back button to navigate within an app', async () => {
-      await browser.goBack();
-      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/foo/page-a'));
-      await loadingScreenNotShown();
-      await testSubjects.existOrFail('fooAppPageA');
-    });
-
-    it('navigates to other apps', async () => {
-      await testSubjects.click('fooNavBarPageB');
-      await loadingScreenNotShown();
-      await testSubjects.existOrFail('barAppPageB');
-      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/bar/page-b', 'query=here'));
-    });
-
-    it('preserves query parameters across apps', async () => {
-      const querySpan = await testSubjects.find('barAppPageBQuery');
-      expect(await querySpan.getVisibleText()).to.eql(`[["query","here"]]`);
-    });
-
-    it('can use the back button to navigate back to previous app', async () => {
-      await browser.goBack();
-      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/foo/page-a'));
-      await loadingScreenNotShown();
-      await testSubjects.existOrFail('fooAppPageA');
-    });
-
-    it('can navigate from NP apps to legacy apps', async () => {
-      await appsMenu.clickLink('Management');
-      await loadingScreenShown();
-      await testSubjects.existOrFail('managementNav');
-    });
-
-    it('can navigate from legacy apps to NP apps', async () => {
-      await appsMenu.clickLink('Foo');
-      await loadingScreenShown();
-      await testSubjects.existOrFail('fooAppHome');
-    });
-  });
-}
diff --git a/test/plugin_functional/test_suites/core_plugins/applications.ts b/test/plugin_functional/test_suites/core_plugins/applications.ts
new file mode 100644
index 00000000000000..eec2ec019a5150
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/applications.ts
@@ -0,0 +1,106 @@
+/*
+ * 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 url from 'url';
+import expect from '@kbn/expect';
+import { PluginFunctionalProviderContext } from '../../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService, getPageObjects }: PluginFunctionalProviderContext) {
+  const PageObjects = getPageObjects(['common']);
+
+  const browser = getService('browser');
+  const appsMenu = getService('appsMenu');
+  const testSubjects = getService('testSubjects');
+
+  const loadingScreenNotShown = async () =>
+    expect(await testSubjects.exists('kbnLoadingMessage')).to.be(false);
+
+  const loadingScreenShown = () => testSubjects.existOrFail('kbnLoadingMessage');
+
+  const getKibanaUrl = (pathname?: string, search?: string) =>
+    url.format({
+      protocol: 'http:',
+      hostname: process.env.TEST_KIBANA_HOST || 'localhost',
+      port: process.env.TEST_KIBANA_PORT || '5620',
+      pathname,
+      search,
+    });
+
+  describe('ui applications', function describeIndexTests() {
+    before(async () => {
+      await PageObjects.common.navigateToApp('foo');
+    });
+
+    it('starts on home page', async () => {
+      await testSubjects.existOrFail('fooAppHome');
+    });
+
+    it('navigates to its own pages', async () => {
+      // Go to page A
+      await testSubjects.click('fooNavPageA');
+      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/foo/page-a'));
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('fooAppPageA');
+
+      // Go to home page
+      await testSubjects.click('fooNavHome');
+      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/foo/'));
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('fooAppHome');
+    });
+
+    it('can use the back button to navigate within an app', async () => {
+      await browser.goBack();
+      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/foo/page-a'));
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('fooAppPageA');
+    });
+
+    it('navigates to other apps', async () => {
+      await testSubjects.click('fooNavBarPageB');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('barAppPageB');
+      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/bar/page-b', 'query=here'));
+    });
+
+    it('preserves query parameters across apps', async () => {
+      const querySpan = await testSubjects.find('barAppPageBQuery');
+      expect(await querySpan.getVisibleText()).to.eql(`[["query","here"]]`);
+    });
+
+    it('can use the back button to navigate back to previous app', async () => {
+      await browser.goBack();
+      expect(await browser.getCurrentUrl()).to.eql(getKibanaUrl('/app/foo/page-a'));
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('fooAppPageA');
+    });
+
+    it('can navigate from NP apps to legacy apps', async () => {
+      await appsMenu.clickLink('Management');
+      await loadingScreenShown();
+      await testSubjects.existOrFail('managementNav');
+    });
+
+    it('can navigate from legacy apps to NP apps', async () => {
+      await appsMenu.clickLink('Foo');
+      await loadingScreenShown();
+      await testSubjects.existOrFail('fooAppHome');
+    });
+  });
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/index.js b/test/plugin_functional/test_suites/core_plugins/index.js
deleted file mode 100644
index eeb81f67751edd..00000000000000
--- a/test/plugin_functional/test_suites/core_plugins/index.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export default function ({ loadTestFile }) {
-  describe('core plugins', () => {
-    loadTestFile(require.resolve('./applications'));
-    loadTestFile(require.resolve('./legacy_plugins'));
-    loadTestFile(require.resolve('./server_plugins'));
-    loadTestFile(require.resolve('./ui_plugins'));
-  });
-}
diff --git a/test/plugin_functional/test_suites/core_plugins/index.ts b/test/plugin_functional/test_suites/core_plugins/index.ts
new file mode 100644
index 00000000000000..bf33f37694c3a7
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/index.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { PluginFunctionalProviderContext } from '../../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ loadTestFile }: PluginFunctionalProviderContext) {
+  describe('core plugins', () => {
+    loadTestFile(require.resolve('./applications'));
+    loadTestFile(require.resolve('./legacy_plugins'));
+    loadTestFile(require.resolve('./server_plugins'));
+    loadTestFile(require.resolve('./ui_plugins'));
+    loadTestFile(require.resolve('./ui_settings'));
+    loadTestFile(require.resolve('./top_nav'));
+  });
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/legacy_plugins.js b/test/plugin_functional/test_suites/core_plugins/legacy_plugins.js
deleted file mode 100644
index c6edf803c9938a..00000000000000
--- a/test/plugin_functional/test_suites/core_plugins/legacy_plugins.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-
-export default function ({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['common']);
-  const testSubjects = getService('testSubjects');
-  const supertest = getService('supertest');
-
-  describe('legacy plugins', function describeIndexTests() {
-    describe('http', () => {
-      it('has access to New Platform HTTP service', async () => {
-        await supertest
-          .get('/api/np-http-in-legacy')
-          .expect(200)
-          .expect('Pong in legacy via new platform: true');
-      });
-
-      it('has access to New Platform HTTP context providers', async () => {
-        await supertest
-          .get('/api/np-context-in-legacy')
-          .expect(200)
-          .expect(JSON.stringify({ contexts: ['core', 'search', 'pluginA'] }));
-      });
-    });
-
-    describe('application service compatibility layer', function describeIndexTests() {
-      it('can render legacy apps', async () => {
-        await PageObjects.common.navigateToApp('core_plugin_legacy');
-        expect(await testSubjects.exists('coreLegacyCompatH1')).to.be(true);
-      });
-    });
-  });
-}
diff --git a/test/plugin_functional/test_suites/core_plugins/legacy_plugins.ts b/test/plugin_functional/test_suites/core_plugins/legacy_plugins.ts
new file mode 100644
index 00000000000000..d0c01f1e9caf37
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/legacy_plugins.ts
@@ -0,0 +1,53 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+import { PluginFunctionalProviderContext } from '../../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService, getPageObjects }: PluginFunctionalProviderContext) {
+  const PageObjects = getPageObjects(['common']);
+  const testSubjects = getService('testSubjects');
+  const supertest = getService('supertest');
+
+  describe('legacy plugins', () => {
+    describe('http', () => {
+      it('has access to New Platform HTTP service', async () => {
+        await supertest
+          .get('/api/np-http-in-legacy')
+          .expect(200)
+          .expect('Pong in legacy via new platform: true');
+      });
+
+      it('has access to New Platform HTTP context providers', async () => {
+        await supertest
+          .get('/api/np-context-in-legacy')
+          .expect(200)
+          .expect(JSON.stringify({ contexts: ['core', 'search', 'pluginA'] }));
+      });
+    });
+
+    describe('application service compatibility layer', () => {
+      it('can render legacy apps', async () => {
+        await PageObjects.common.navigateToApp('core_plugin_legacy');
+        expect(await testSubjects.exists('coreLegacyCompatH1')).to.be(true);
+      });
+    });
+  });
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/server_plugins.js b/test/plugin_functional/test_suites/core_plugins/server_plugins.js
deleted file mode 100644
index a17b19468d6a80..00000000000000
--- a/test/plugin_functional/test_suites/core_plugins/server_plugins.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-
-export default function ({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['common']);
-  const browser = getService('browser');
-
-  describe('server plugins', function describeIndexTests() {
-    it('extend request handler context', async () => {
-      const url = `${PageObjects.common.getHostPort()}/core_plugin_b/`;
-      await browser.get(url);
-
-      const pageSource = await browser.execute('return window.document.body.textContent;');
-      expect(pageSource).to.equal('Pong via plugin A: true');
-    });
-  });
-}
diff --git a/test/plugin_functional/test_suites/core_plugins/server_plugins.ts b/test/plugin_functional/test_suites/core_plugins/server_plugins.ts
new file mode 100644
index 00000000000000..3881af56429963
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/server_plugins.ts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { PluginFunctionalProviderContext } from '../../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService }: PluginFunctionalProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('server plugins', function describeIndexTests() {
+    it('extend request handler context', async () => {
+      await supertest
+        .get('/core_plugin_b')
+        .expect(200)
+        .expect('Pong via plugin A: true');
+    });
+  });
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/top_nav.js b/test/plugin_functional/test_suites/core_plugins/top_nav.js
new file mode 100644
index 00000000000000..5c46e3d7f76db1
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/top_nav.js
@@ -0,0 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import expect from '@kbn/expect';
+
+export default function ({ getService, getPageObjects }) {
+  const PageObjects = getPageObjects(['common']);
+
+  const browser = getService('browser');
+  const testSubjects = getService('testSubjects');
+
+  describe.skip('top nav', function describeIndexTests() {
+    before(async () => {
+      const url = `${PageObjects.common.getHostPort()}/app/kbn_tp_top_nav/`;
+      await browser.get(url);
+    });
+
+    it('Shows registered menu items', async () => {
+      const ownMenuItem = await testSubjects.find('demoNewButton');
+      expect(await ownMenuItem.getVisibleText()).to.be('New Button');
+      const demoRegisteredNewButton = await testSubjects.find('demoRegisteredNewButton');
+      expect(await demoRegisteredNewButton.getVisibleText()).to.be('Registered Button');
+    });
+  });
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/ui_plugins.js b/test/plugin_functional/test_suites/core_plugins/ui_plugins.js
deleted file mode 100644
index 15a4dcabddbd1a..00000000000000
--- a/test/plugin_functional/test_suites/core_plugins/ui_plugins.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-
-export default function ({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['common']);
-  const browser = getService('browser');
-
-  describe('ui plugins', function () {
-    describe('loading', function describeIndexTests() {
-      before(async () => {
-        await PageObjects.common.navigateToApp('settings');
-      });
-
-      it('should attach string to window.corePluginB', async () => {
-        const corePluginB = await browser.execute('return window.corePluginB');
-        expect(corePluginB).to.equal(`Plugin A said: Hello from Plugin A!`);
-      });
-    });
-    describe('have injectedMetadata service provided', function describeIndexTests() {
-      before(async () => {
-        await PageObjects.common.navigateToApp('bar');
-      });
-
-      it('should attach string to window.corePluginB', async () => {
-        const hasAccessToInjectedMetadata = await browser.execute('return window.hasAccessToInjectedMetadata');
-        expect(hasAccessToInjectedMetadata).to.equal(true);
-      });
-    });
-    describe('have env data provided', function describeIndexTests() {
-      before(async () => {
-        await PageObjects.common.navigateToApp('bar');
-      });
-
-      it('should attach pluginContext to window.corePluginB', async () => {
-        const envData = await browser.execute('return window.env');
-        expect(envData.mode.dev).to.be(true);
-        expect(envData.packageInfo.version).to.be.a('string');
-      });
-    });
-  });
-}
diff --git a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
new file mode 100644
index 00000000000000..a971921ad3ed83
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+import { PluginFunctionalProviderContext } from '../../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService, getPageObjects }: PluginFunctionalProviderContext) {
+  const PageObjects = getPageObjects(['common']);
+  const browser = getService('browser');
+
+  describe('ui plugins', function() {
+    describe('loading', function describeIndexTests() {
+      before(async () => {
+        await PageObjects.common.navigateToApp('settings');
+      });
+
+      it('should attach string to window.corePluginB', async () => {
+        const corePluginB = await browser.execute('return window.corePluginB');
+        expect(corePluginB).to.equal(`Plugin A said: Hello from Plugin A!`);
+      });
+    });
+    describe('have injectedMetadata service provided', function describeIndexTests() {
+      before(async () => {
+        await PageObjects.common.navigateToApp('bar');
+      });
+
+      it('should attach string to window.corePluginB', async () => {
+        const hasAccessToInjectedMetadata = await browser.execute(
+          'return window.hasAccessToInjectedMetadata'
+        );
+        expect(hasAccessToInjectedMetadata).to.equal(true);
+      });
+    });
+    describe('have env data provided', function describeIndexTests() {
+      before(async () => {
+        await PageObjects.common.navigateToApp('bar');
+      });
+
+      it('should attach pluginContext to window.corePluginB', async () => {
+        const envData: any = await browser.execute('return window.env');
+        expect(envData.mode.dev).to.be(true);
+        expect(envData.packageInfo.version).to.be.a('string');
+      });
+    });
+  });
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/ui_settings.ts b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
new file mode 100644
index 00000000000000..2b4227ee798e3f
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import expect from '@kbn/expect';
+import { PluginFunctionalProviderContext } from '../../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService, getPageObjects }: PluginFunctionalProviderContext) {
+  const PageObjects = getPageObjects(['common']);
+  const browser = getService('browser');
+  const supertest = getService('supertest');
+
+  describe('ui settings', function() {
+    before(async () => {
+      await PageObjects.common.navigateToApp('settings');
+    });
+
+    it('client plugins have access to registered settings', async () => {
+      const settings = await browser.execute('return window.uiSettingsPlugin');
+      expect(settings).to.eql({
+        category: ['any'],
+        description: 'just for testing',
+        name: 'from_ui_settings_plugin',
+        value: '2',
+      });
+      const settingsValue = await browser.execute('return window.uiSettingsPluginValue');
+      expect(settingsValue).to.be('2');
+    });
+
+    it('server plugins have access to registered settings', async () => {
+      await supertest
+        .get('/api/ui-settings-plugin')
+        .expect(200)
+        .expect({ uiSettingsValue: 2 });
+    });
+  });
+}
diff --git a/test/scripts/jenkins_accessibility.sh b/test/scripts/jenkins_accessibility.sh
new file mode 100755
index 00000000000000..0b3d8dc3f85c23
--- /dev/null
+++ b/test/scripts/jenkins_accessibility.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [[ -n "$IS_PIPELINE_JOB" ]] ; then
+  source src/dev/ci_setup/setup_env.sh
+fi
+
+export TEST_BROWSER_HEADLESS=1
+
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  yarn run grunt functionalTests:ensureAllTestsInCiGroup;
+  node scripts/build --debug --oss;
+else
+  installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)"
+  destDir=${installDir}-${CI_WORKER_NUMBER}
+  cp -R "$installDir" "$destDir"
+
+  export KIBANA_INSTALL_DIR="$destDir"
+fi
+
+checks-reporter-with-killswitch "Kibana accessibility tests" \
+  node scripts/functional_tests \
+    --debug --bail \
+    --kibana-install-dir "$installDir" \
+    --config test/accessibility/config.ts;
diff --git a/test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh b/test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh
new file mode 100755
index 00000000000000..4b16e3b32fefd1
--- /dev/null
+++ b/test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+cd test/plugin_functional/plugins/kbn_tp_sample_panel_action;
+if [[ ! -d "target" ]]; then
+  checks-reporter-with-killswitch "Build kbn_tp_sample_panel_action" yarn build;
+fi
+cd -;
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index 6deddd5a59152f..c6bddb69aa5709 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
-  source src/dev/ci_setup/setup_env.sh
-fi
-
-export TEST_BROWSER_HEADLESS=1
+source test/scripts/jenkins_test_setup.sh
 
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
   yarn run grunt functionalTests:ensureAllTestsInCiGroup;
@@ -22,10 +16,7 @@ fi
 checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}";
 
 if [ "$CI_GROUP" == "1" ]; then
-  # build kbn_tp_sample_panel_action
-  cd test/plugin_functional/plugins/kbn_tp_sample_panel_action;
-  checks-reporter-with-killswitch "Build kbn_tp_sample_panel_action" yarn build;
-  cd -;
+  source test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh
   yarn run grunt run:pluginFunctionalTestsRelease --from=source;
   yarn run grunt run:interpreterFunctionalTestsRelease;
 fi
diff --git a/test/scripts/jenkins_firefox_smoke.sh b/test/scripts/jenkins_firefox_smoke.sh
index 69cedc9657340b..9a31f5f43d2242 100755
--- a/test/scripts/jenkins_firefox_smoke.sh
+++ b/test/scripts/jenkins_firefox_smoke.sh
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
-  source src/dev/ci_setup/setup_env.sh
-fi
+source test/scripts/jenkins_test_setup.sh
 
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
   node scripts/build --debug --oss;
diff --git a/test/scripts/jenkins_test_setup.sh b/test/scripts/jenkins_test_setup.sh
new file mode 100644
index 00000000000000..e2dd0bc276bb64
--- /dev/null
+++ b/test/scripts/jenkins_test_setup.sh
@@ -0,0 +1,20 @@
+set -e
+
+function post_work() {
+  set +e
+  if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+    node "$KIBANA_DIR/scripts/report_failed_tests"
+  fi
+
+  if [[ -z "$REMOVE_KIBANA_INSTALL_DIR" && -z "$KIBANA_INSTALL_DIR" && -d "$KIBANA_INSTALL_DIR" ]]; then
+    rm -rf "$REMOVE_KIBANA_INSTALL_DIR"
+  fi
+}
+
+trap 'post_work' EXIT
+
+export TEST_BROWSER_HEADLESS=1
+
+if [[ -n "$IS_PIPELINE_JOB" ]] ; then
+  source src/dev/ci_setup/setup_env.sh
+fi
diff --git a/test/scripts/jenkins_visual_regression.sh b/test/scripts/jenkins_visual_regression.sh
index fdda24423d977a..9ca1c0f08d2c94 100755
--- a/test/scripts/jenkins_visual_regression.sh
+++ b/test/scripts/jenkins_visual_regression.sh
@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
-  source src/dev/ci_setup/setup_env.sh
-fi
-
+source test/scripts/jenkins_test_setup.sh
 source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh"
 
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
@@ -22,8 +17,6 @@ else
   export KIBANA_INSTALL_DIR="$destDir"
 fi
 
-export TEST_BROWSER_HEADLESS=1
-
 checks-reporter-with-killswitch "Kibana visual regression tests" \
   yarn run percy exec -t 500 \
   node scripts/functional_tests \
diff --git a/test/scripts/jenkins_xpack_accessibility.sh b/test/scripts/jenkins_xpack_accessibility.sh
new file mode 100755
index 00000000000000..af813c3c40f841
--- /dev/null
+++ b/test/scripts/jenkins_xpack_accessibility.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [[ -n "$IS_PIPELINE_JOB" ]] ; then
+  source src/dev/ci_setup/setup_env.sh
+fi
+
+if [[ -z "$IS_PIPELINE_JOB" ]] ; then
+  echo " -> building and extracting default Kibana distributable for use in functional tests"
+  node scripts/build --debug --no-oss
+
+  linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
+  installDir="$PARENT_DIR/install/kibana"
+
+  mkdir -p "$installDir"
+  tar -xzf "$linuxBuild" -C "$installDir" --strip=1
+
+  export KIBANA_INSTALL_DIR="$installDir"
+else
+  installDir="$PARENT_DIR/install/kibana"
+  destDir="${installDir}-${CI_WORKER_NUMBER}"
+  cp -R "$installDir" "$destDir"
+
+  export KIBANA_INSTALL_DIR="$destDir"
+fi
+
+export TEST_BROWSER_HEADLESS=1
+cd "$XPACK_DIR"
+
+checks-reporter-with-killswitch "X-Pack accessibility tests" \
+  node scripts/functional_tests \
+    --debug --bail \
+    --kibana-install-dir "$installDir" \
+    --config test/accessibility/config.ts;
diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
index 0b9666b33decab..fba05f8f252d76 100755
--- a/test/scripts/jenkins_xpack_ci_group.sh
+++ b/test/scripts/jenkins_xpack_ci_group.sh
@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
-  source src/dev/ci_setup/setup_env.sh
-fi
-
-export TEST_BROWSER_HEADLESS=1
+source test/scripts/jenkins_test_setup.sh
 
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
   echo " -> Ensuring all functional tests are in a ciGroup"
diff --git a/test/scripts/jenkins_xpack_firefox_smoke.sh b/test/scripts/jenkins_xpack_firefox_smoke.sh
index 18ed468de1317a..43220459bcb97d 100755
--- a/test/scripts/jenkins_xpack_firefox_smoke.sh
+++ b/test/scripts/jenkins_xpack_firefox_smoke.sh
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
-  source src/dev/ci_setup/setup_env.sh
-fi
+source test/scripts/jenkins_test_setup.sh
 
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
   node scripts/build --debug --no-oss;
@@ -21,8 +17,6 @@ else
   export KIBANA_INSTALL_DIR="$destDir"
 fi
 
-export TEST_BROWSER_HEADLESS=1
-
 cd "$XPACK_DIR"
 
 checks-reporter-with-killswitch "X-Pack firefox smoke test" \
diff --git a/test/scripts/jenkins_xpack_visual_regression.sh b/test/scripts/jenkins_xpack_visual_regression.sh
index 0f3275d45f13b2..5699f9e5ee7c14 100755
--- a/test/scripts/jenkins_xpack_visual_regression.sh
+++ b/test/scripts/jenkins_xpack_visual_regression.sh
@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
-
-if [[ -n "$IS_PIPELINE_JOB" ]] ; then
-  source src/dev/ci_setup/setup_env.sh
-fi
-
+source test/scripts/jenkins_test_setup.sh
 source "$KIBANA_DIR/src/dev/ci_setup/setup_percy.sh"
 
 if [[ -z "$IS_PIPELINE_JOB" ]] ; then
@@ -23,8 +18,6 @@ else
   export KIBANA_INSTALL_DIR="$destDir"
 fi
 
-export TEST_BROWSER_HEADLESS=1
-
 cd "$XPACK_DIR"
 
 checks-reporter-with-killswitch "X-Pack visual regression tests" \
diff --git a/test/visual_regression/tests/discover/chart_visualization.js b/test/visual_regression/tests/discover/chart_visualization.js
index 5467f2d3eaa145..4e1d9bf643cf6d 100644
--- a/test/visual_regression/tests/discover/chart_visualization.js
+++ b/test/visual_regression/tests/discover/chart_visualization.js
@@ -29,6 +29,7 @@ export default function ({ getService, getPageObjects }) {
   const visualTesting = getService('visualTesting');
   const defaultSettings = {
     defaultIndex: 'logstash-*',
+    'discover:sampleSize': 1
   };
 
   describe('discover', function describeIndexTests() {
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
new file mode 100644
index 00000000000000..e8d7cc03edad0a
--- /dev/null
+++ b/vars/kibanaPipeline.groovy
@@ -0,0 +1,251 @@
+def withWorkers(name, preWorkerClosure = {}, workerClosures = [:]) {
+  return {
+    jobRunner('tests-xl', true) {
+      try {
+        doSetup()
+        preWorkerClosure()
+
+        def nextWorker = 1
+        def worker = { workerClosure ->
+          def workerNumber = nextWorker
+          nextWorker++
+
+          return {
+            workerClosure(workerNumber)
+          }
+        }
+
+        def workers = [:]
+        workerClosures.each { workerName, workerClosure ->
+          workers[workerName] = worker(workerClosure)
+        }
+
+        parallel(workers)
+      } finally {
+        catchError {
+          uploadAllGcsArtifacts(name)
+        }
+
+        catchError {
+          runbld.junit()
+        }
+
+        catchError {
+          publishJunit()
+        }
+
+        catchError {
+          runErrorReporter()
+        }
+      }
+    }
+  }
+}
+
+def getPostBuildWorker(name, closure) {
+  return { workerNumber ->
+    def kibanaPort = "61${workerNumber}1"
+    def esPort = "61${workerNumber}2"
+    def esTransportPort = "61${workerNumber}3"
+
+    withEnv([
+      "CI_WORKER_NUMBER=${workerNumber}",
+      "TEST_KIBANA_HOST=localhost",
+      "TEST_KIBANA_PORT=${kibanaPort}",
+      "TEST_KIBANA_URL=http://elastic:changeme@localhost:${kibanaPort}",
+      "TEST_ES_URL=http://elastic:changeme@localhost:${esPort}",
+      "TEST_ES_TRANSPORT_PORT=${esTransportPort}",
+      "IS_PIPELINE_JOB=1",
+    ]) {
+      closure()
+    }
+  }
+}
+
+def getOssCiGroupWorker(ciGroup) {
+  return getPostBuildWorker("ciGroup" + ciGroup, {
+    withEnv([
+      "CI_GROUP=${ciGroup}",
+      "JOB=kibana-ciGroup${ciGroup}",
+    ]) {
+      runbld "./test/scripts/jenkins_ci_group.sh"
+    }
+  })
+}
+
+def getXpackCiGroupWorker(ciGroup) {
+  return getPostBuildWorker("xpack-ciGroup" + ciGroup, {
+    withEnv([
+      "CI_GROUP=${ciGroup}",
+      "JOB=xpack-kibana-ciGroup${ciGroup}",
+    ]) {
+      runbld "./test/scripts/jenkins_xpack_ci_group.sh"
+    }
+  })
+}
+
+def legacyJobRunner(name) {
+  return {
+    parallel([
+      "${name}": {
+        withEnv([
+          "JOB=${name}",
+        ]) {
+          jobRunner('linux && immutable', false) {
+            try {
+              runbld('.ci/run.sh', true)
+            } finally {
+              catchError {
+                uploadAllGcsArtifacts(name)
+              }
+              catchError {
+                publishJunit()
+              }
+              catchError {
+                runErrorReporter()
+              }
+            }
+          }
+        }
+      }
+    ])
+  }
+}
+
+def jobRunner(label, useRamDisk, closure) {
+  node(label) {
+    if (useRamDisk) {
+      // Move to a temporary workspace, so that we can symlink the real workspace into /dev/shm
+      def originalWorkspace = env.WORKSPACE
+      ws('/tmp/workspace') {
+        sh """
+          mkdir -p /dev/shm/workspace
+          mkdir -p '${originalWorkspace}' # create all of the directories leading up to the workspace, if they don't exist
+          rm --preserve-root -rf '${originalWorkspace}' # then remove just the workspace, just in case there's stuff in it
+          ln -s /dev/shm/workspace '${originalWorkspace}'
+        """
+      }
+    }
+
+    def scmVars = checkout scm
+
+    withEnv([
+      "CI=true",
+      "HOME=${env.JENKINS_HOME}",
+      "PR_SOURCE_BRANCH=${env.ghprbSourceBranch ?: ''}",
+      "PR_TARGET_BRANCH=${env.ghprbTargetBranch ?: ''}",
+      "PR_AUTHOR=${env.ghprbPullAuthorLogin ?: ''}",
+      "TEST_BROWSER_HEADLESS=1",
+      "GIT_BRANCH=${scmVars.GIT_BRANCH}",
+    ]) {
+      withCredentials([
+        string(credentialsId: 'vault-addr', variable: 'VAULT_ADDR'),
+        string(credentialsId: 'vault-role-id', variable: 'VAULT_ROLE_ID'),
+        string(credentialsId: 'vault-secret-id', variable: 'VAULT_SECRET_ID'),
+      ]) {
+        // scm is configured to check out to the ./kibana directory
+        dir('kibana') {
+          closure()
+        }
+      }
+    }
+  }
+}
+
+// TODO what should happen if GCS, Junit, or email publishing fails? Unstable build? Failed build?
+
+def uploadGcsArtifact(workerName, pattern) {
+  def storageLocation = "gs://kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/${workerName}" // TODO
+
+  googleStorageUpload(
+    credentialsId: 'kibana-ci-gcs-plugin',
+    bucket: storageLocation,
+    pattern: pattern,
+    sharedPublicly: true,
+    showInline: true,
+  )
+}
+
+def uploadAllGcsArtifacts(workerName) {
+  def ARTIFACT_PATTERNS = [
+    'target/kibana-*',
+    'target/junit/**/*',
+    'test/**/screenshots/**/*.png',
+    'test/functional/failure_debug/html/*.html',
+    'x-pack/test/**/screenshots/**/*.png',
+    'x-pack/test/functional/failure_debug/html/*.html',
+    'x-pack/test/functional/apps/reporting/reports/session/*.pdf',
+  ]
+
+  ARTIFACT_PATTERNS.each { pattern ->
+    uploadGcsArtifact(workerName, pattern)
+  }
+}
+
+def publishJunit() {
+  junit(testResults: 'target/junit/**/*.xml', allowEmptyResults: true, keepLongStdio: true)
+}
+
+def sendMail() {
+  // If the build doesn't have a result set by this point, there haven't been any errors and it can be marked as a success
+  // The e-mail plugin for the infra e-mail depends upon this being set
+  currentBuild.result = currentBuild.result ?: 'SUCCESS'
+
+  def buildStatus = buildUtils.getBuildStatus()
+  if (buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
+    node('flyweight') {
+      sendInfraMail()
+      sendKibanaMail()
+    }
+  }
+}
+
+def sendInfraMail() {
+  catchError {
+    step([
+      $class: 'Mailer',
+      notifyEveryUnstableBuild: true,
+      recipients: 'infra-root+build@elastic.co',
+      sendToIndividuals: false
+    ])
+  }
+}
+
+def sendKibanaMail() {
+  catchError {
+    def buildStatus = buildUtils.getBuildStatus()
+    if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
+      emailext(
+        to: 'build-kibana@elastic.co',
+        subject: "${env.JOB_NAME} - Build # ${env.BUILD_NUMBER} - ${buildStatus}",
+        body: '${SCRIPT,template="groovy-html.template"}',
+        mimeType: 'text/html',
+      )
+    }
+  }
+}
+
+def bash(script) {
+  sh "#!/bin/bash\n${script}"
+}
+
+def doSetup() {
+  runbld "./test/scripts/jenkins_setup.sh"
+}
+
+def buildOss() {
+  runbld "./test/scripts/jenkins_build_kibana.sh"
+}
+
+def buildXpack() {
+  runbld "./test/scripts/jenkins_xpack_build_kibana.sh"
+}
+
+def runErrorReporter() {
+  bash """
+    source src/dev/ci_setup/setup_env.sh
+    node scripts/report_failed_tests
+  """
+}
+
+return this
diff --git a/vars/runbld.groovy b/vars/runbld.groovy
new file mode 100644
index 00000000000000..501e2421ca65b5
--- /dev/null
+++ b/vars/runbld.groovy
@@ -0,0 +1,11 @@
+def call(script, enableJunitProcessing = false) {
+  def extraConfig = enableJunitProcessing ? "" : "--config ${env.WORKSPACE}/kibana/.ci/runbld_no_junit.yml"
+
+  sh "/usr/local/bin/runbld -d '${pwd()}' ${extraConfig} ${script}"
+}
+
+def junit() {
+  sh "/usr/local/bin/runbld -d '${pwd()}' ${env.WORKSPACE}/kibana/test/scripts/jenkins_runbld_junit.sh"
+}
+
+return this
diff --git a/webpackShims/lru-cache.js b/webpackShims/lru-cache.js
new file mode 100644
index 00000000000000..9cc11a516378e0
--- /dev/null
+++ b/webpackShims/lru-cache.js
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module.exports = require('../node_modules/lru-cache');
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 735ee0b6b67b59..6d0da2f0b693d3 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -7,7 +7,6 @@
     "xpack.apm": "legacy/plugins/apm",
     "xpack.beatsManagement": "legacy/plugins/beats_management",
     "xpack.canvas": "legacy/plugins/canvas",
-    "xpack.code": ["legacy/plugins/code", "plugins/code"],
     "xpack.crossClusterReplication": "legacy/plugins/cross_cluster_replication",
     "xpack.dashboardMode": "legacy/plugins/dashboard_mode",
     "xpack.features": "plugins/features",
@@ -31,10 +30,11 @@
     "xpack.rollupJobs": "legacy/plugins/rollup",
     "xpack.searchProfiler": "legacy/plugins/searchprofiler",
     "xpack.siem": "legacy/plugins/siem",
-    "xpack.security": "legacy/plugins/security",
+    "xpack.security": ["legacy/plugins/security", "plugins/security"],
     "xpack.server": "legacy/server",
     "xpack.snapshotRestore": "legacy/plugins/snapshot_restore",
     "xpack.spaces": ["legacy/plugins/spaces", "plugins/spaces"],
+    "xpack.taskManager": "legacy/plugins/task_manager",
     "xpack.transform": "legacy/plugins/transform",
     "xpack.upgradeAssistant": "legacy/plugins/upgrade_assistant",
     "xpack.uptime": "legacy/plugins/uptime",
diff --git a/x-pack/dev-tools/jest/setup/polyfills.js b/x-pack/dev-tools/jest/setup/polyfills.js
index 8e5c5a8025b823..566e4701eeaacc 100644
--- a/x-pack/dev-tools/jest/setup/polyfills.js
+++ b/x-pack/dev-tools/jest/setup/polyfills.js
@@ -14,5 +14,6 @@ bluebird.Promise.setScheduler(function (fn) { global.setImmediate.call(global, f
 const MutationObserver = require('mutation-observer');
 Object.defineProperty(window, 'MutationObserver', { value: MutationObserver });
 
+require('whatwg-fetch');
 const URL = { createObjectURL: () => '' };
 Object.defineProperty(window, 'URL', { value: URL });
diff --git a/x-pack/index.js b/x-pack/index.js
index 756d9b4d3127a5..2b467d2525d9b4 100644
--- a/x-pack/index.js
+++ b/x-pack/index.js
@@ -18,7 +18,6 @@ import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { logstash } from './legacy/plugins/logstash';
 import { beats } from './legacy/plugins/beats_management';
 import { apm } from './legacy/plugins/apm';
-import { code } from './legacy/plugins/code';
 import { maps } from './legacy/plugins/maps';
 import { licenseManagement } from './legacy/plugins/license_management';
 import { cloud } from './legacy/plugins/cloud';
@@ -62,7 +61,6 @@ module.exports = function (kibana) {
     logstash(kibana),
     beats(kibana),
     apm(kibana),
-    code(kibana),
     maps(kibana),
     canvas(kibana),
     licenseManagement(kibana),
diff --git a/x-pack/legacy/plugins/TEST_PLAN.md b/x-pack/legacy/plugins/TEST_PLAN.md
deleted file mode 100644
index dfda2522f27973..00000000000000
--- a/x-pack/legacy/plugins/TEST_PLAN.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# APM UI Test Plan
-
-Moved to: https://github.com/elastic/observability-dev/blob/master/docs/apm/apm-ui-test-plan.md
-
diff --git a/x-pack/legacy/plugins/actions/index.ts b/x-pack/legacy/plugins/actions/index.ts
index 7c4dd9f73c11f4..a58c936c637492 100644
--- a/x-pack/legacy/plugins/actions/index.ts
+++ b/x-pack/legacy/plugins/actions/index.ts
@@ -22,10 +22,10 @@ export function actions(kibana: any) {
   return new kibana.Plugin({
     id: 'actions',
     configPrefix: 'xpack.actions',
-    require: ['kibana', 'elasticsearch', 'task_manager', 'encrypted_saved_objects'],
+    require: ['kibana', 'elasticsearch', 'task_manager', 'encryptedSavedObjects'],
     isEnabled(config: Legacy.KibanaConfig) {
       return (
-        config.get('xpack.encrypted_saved_objects.enabled') === true &&
+        config.get('xpack.encryptedSavedObjects.enabled') === true &&
         config.get('xpack.actions.enabled') === true &&
         config.get('xpack.task_manager.enabled') === true
       );
diff --git a/x-pack/legacy/plugins/actions/server/actions_client.test.ts b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
index b582d9f2a1b0dc..933b7b0b239b68 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
@@ -11,9 +11,14 @@ import { ActionsClient } from './actions_client';
 import { ExecutorType } from './types';
 import { ActionExecutor, TaskRunnerFactory } from './lib';
 import { taskManagerMock } from '../../task_manager/task_manager.mock';
-import { SavedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import {
+  elasticsearchServiceMock,
+  savedObjectsClientMock,
+} from '../../../../../src/core/server/mocks';
 
-const savedObjectsClient = SavedObjectsClientMock.create();
+const defaultKibanaIndex = '.kibana';
+const savedObjectsClient = savedObjectsClientMock.create();
+const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
 
 const mockTaskManager = taskManagerMock.create();
 
@@ -22,11 +27,22 @@ const actionTypeRegistryParams = {
   taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
 };
 
+let actionsClient: ActionsClient;
+let actionTypeRegistry: ActionTypeRegistry;
 const executor: ExecutorType = async options => {
   return { status: 'ok' };
 };
 
-beforeEach(() => jest.resetAllMocks());
+beforeEach(() => {
+  jest.resetAllMocks();
+  actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
+  actionsClient = new ActionsClient({
+    actionTypeRegistry,
+    savedObjectsClient,
+    scopedClusterClient,
+    defaultKibanaIndex,
+  });
+});
 
 describe('create()', () => {
   test('creates an action with all given properties', async () => {
@@ -40,16 +56,11 @@ describe('create()', () => {
       },
       references: [],
     };
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
       executor,
     });
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     savedObjectsClient.create.mockResolvedValueOnce(savedObjectCreateResult);
     const result = await actionsClient.create({
       action: {
@@ -80,11 +91,6 @@ describe('create()', () => {
   });
 
   test('validates config', async () => {
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
@@ -110,11 +116,6 @@ describe('create()', () => {
   });
 
   test(`throws an error when an action type doesn't exist`, async () => {
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     await expect(
       actionsClient.create({
         action: {
@@ -130,16 +131,11 @@ describe('create()', () => {
   });
 
   test('encrypts action type options unless specified not to', async () => {
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
       executor,
     });
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     savedObjectsClient.create.mockResolvedValueOnce({
       id: '1',
       type: 'type',
@@ -198,11 +194,6 @@ describe('create()', () => {
 
 describe('get()', () => {
   test('calls savedObjectsClient with id', async () => {
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     savedObjectsClient.get.mockResolvedValueOnce({
       id: '1',
       type: 'type',
@@ -242,12 +233,12 @@ describe('find()', () => {
         },
       ],
     };
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     savedObjectsClient.find.mockResolvedValueOnce(expectedResult);
+    scopedClusterClient.callAsInternalUser.mockResolvedValueOnce({
+      aggregations: {
+        '1': { doc_count: 6 },
+      },
+    });
     const result = await actionsClient.find({});
     expect(result).toEqual({
       total: 1,
@@ -259,6 +250,7 @@ describe('find()', () => {
           config: {
             foo: 'bar',
           },
+          referencedByCount: 6,
         },
       ],
     });
@@ -276,11 +268,6 @@ describe('find()', () => {
 describe('delete()', () => {
   test('calls savedObjectsClient with id', async () => {
     const expectedResult = Symbol();
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     savedObjectsClient.delete.mockResolvedValueOnce(expectedResult);
     const result = await actionsClient.delete({ id: '1' });
     expect(result).toEqual(expectedResult);
@@ -296,16 +283,11 @@ describe('delete()', () => {
 
 describe('update()', () => {
   test('updates an action with all given properties', async () => {
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
       executor,
     });
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     savedObjectsClient.get.mockResolvedValueOnce({
       id: '1',
       type: 'action',
@@ -362,11 +344,6 @@ describe('update()', () => {
   });
 
   test('validates config', async () => {
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
@@ -400,16 +377,11 @@ describe('update()', () => {
   });
 
   test('encrypts action type options unless specified not to', async () => {
-    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
       executor,
     });
-    const actionsClient = new ActionsClient({
-      actionTypeRegistry,
-      savedObjectsClient,
-    });
     savedObjectsClient.get.mockResolvedValueOnce({
       id: 'my-action',
       type: 'action',
diff --git a/x-pack/legacy/plugins/actions/server/actions_client.ts b/x-pack/legacy/plugins/actions/server/actions_client.ts
index 823cb55abaf5e7..1e4135bd0d66fd 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.ts
@@ -4,10 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsClientContract, SavedObjectAttributes, SavedObject } from 'src/core/server';
+import {
+  IScopedClusterClient,
+  SavedObjectsClientContract,
+  SavedObjectAttributes,
+  SavedObject,
+} from 'src/core/server';
+
 import { ActionTypeRegistry } from './action_type_registry';
 import { validateConfig, validateSecrets } from './lib';
-import { ActionResult } from './types';
+import { ActionResult, FindActionResult, RawAction } from './types';
 
 interface ActionUpdate extends SavedObjectAttributes {
   description: string;
@@ -44,10 +50,12 @@ interface FindResult {
   page: number;
   perPage: number;
   total: number;
-  data: ActionResult[];
+  data: FindActionResult[];
 }
 
 interface ConstructorOptions {
+  defaultKibanaIndex: string;
+  scopedClusterClient: IScopedClusterClient;
   actionTypeRegistry: ActionTypeRegistry;
   savedObjectsClient: SavedObjectsClientContract;
 }
@@ -58,12 +66,21 @@ interface UpdateOptions {
 }
 
 export class ActionsClient {
+  private readonly defaultKibanaIndex: string;
+  private readonly scopedClusterClient: IScopedClusterClient;
   private readonly savedObjectsClient: SavedObjectsClientContract;
   private readonly actionTypeRegistry: ActionTypeRegistry;
 
-  constructor({ actionTypeRegistry, savedObjectsClient }: ConstructorOptions) {
+  constructor({
+    actionTypeRegistry,
+    defaultKibanaIndex,
+    scopedClusterClient,
+    savedObjectsClient,
+  }: ConstructorOptions) {
     this.actionTypeRegistry = actionTypeRegistry;
     this.savedObjectsClient = savedObjectsClient;
+    this.scopedClusterClient = scopedClusterClient;
+    this.defaultKibanaIndex = defaultKibanaIndex;
   }
 
   /**
@@ -134,16 +151,22 @@ export class ActionsClient {
    * Find actions
    */
   public async find({ options = {} }: FindOptions): Promise<FindResult> {
-    const findResult = await this.savedObjectsClient.find({
+    const findResult = await this.savedObjectsClient.find<RawAction>({
       ...options,
       type: 'action',
     });
 
+    const data = await injectExtraFindData(
+      this.defaultKibanaIndex,
+      this.scopedClusterClient,
+      findResult.saved_objects.map(actionFromSavedObject)
+    );
+
     return {
       page: findResult.page,
       perPage: findResult.per_page,
       total: findResult.total,
-      data: findResult.saved_objects.map(actionFromSavedObject),
+      data,
     };
   }
 
@@ -155,9 +178,64 @@ export class ActionsClient {
   }
 }
 
-function actionFromSavedObject(savedObject: SavedObject) {
+function actionFromSavedObject(savedObject: SavedObject<RawAction>): ActionResult {
   return {
     id: savedObject.id,
     ...savedObject.attributes,
   };
 }
+
+async function injectExtraFindData(
+  defaultKibanaIndex: string,
+  scopedClusterClient: IScopedClusterClient,
+  actionResults: ActionResult[]
+): Promise<FindActionResult[]> {
+  const aggs: Record<string, any> = {};
+  for (const actionResult of actionResults) {
+    aggs[actionResult.id] = {
+      filter: {
+        bool: {
+          must: {
+            nested: {
+              path: 'references',
+              query: {
+                bool: {
+                  filter: {
+                    bool: {
+                      must: [
+                        {
+                          term: {
+                            'references.id': actionResult.id,
+                          },
+                        },
+                        {
+                          term: {
+                            'references.type': 'action',
+                          },
+                        },
+                      ],
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+  }
+  const aggregationResult = await scopedClusterClient.callAsInternalUser('search', {
+    index: defaultKibanaIndex,
+    body: {
+      aggs,
+      size: 0,
+      query: {
+        match_all: {},
+      },
+    },
+  });
+  return actionResults.map(actionResult => ({
+    ...actionResult,
+    referencedByCount: aggregationResult.aggregations[actionResult.id].doc_count,
+  }));
+}
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts
index 4e2ef29dd740ff..8e6b1f19b172c1 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts
@@ -10,7 +10,7 @@ jest.mock('./lib/send_email', () => ({
 
 import { ActionType, ActionTypeExecutorOptions } from '../types';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
-import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { createActionTypeRegistry } from './index.test';
 import { sendEmail } from './lib/send_email';
 import { ActionParamsType, ActionTypeConfigType, ActionTypeSecretsType } from './email';
@@ -23,7 +23,7 @@ const NO_OP_FN = () => {};
 const services = {
   log: NO_OP_FN,
   callCluster: async (path: string, opts: any) => {},
-  savedObjectsClient: SavedObjectsClientMock.create(),
+  savedObjectsClient: savedObjectsClientMock.create(),
 };
 
 let actionType: ActionType;
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
index 57a107968ba70b..35d81ba74fa72d 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
@@ -10,7 +10,7 @@ jest.mock('./lib/send_email', () => ({
 
 import { ActionType, ActionTypeExecutorOptions } from '../types';
 import { validateConfig, validateParams } from '../lib';
-import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { createActionTypeRegistry } from './index.test';
 import { ActionParamsType, ActionTypeConfigType } from './es_index';
 
@@ -20,7 +20,7 @@ const NO_OP_FN = () => {};
 const services = {
   log: NO_OP_FN,
   callCluster: jest.fn(),
-  savedObjectsClient: SavedObjectsClientMock.create(),
+  savedObjectsClient: savedObjectsClientMock.create(),
 };
 
 let actionType: ActionType;
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts
index c891f3bf218e7d..256463251315d8 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/result_type.ts
@@ -8,16 +8,15 @@
 // Which is basically the Haskel equivalent of Rust/ML/Scala's Result
 // I'll reach out to other's in Kibana to see if we can merge these into one type
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type Ok<T> = {
+export interface Ok<T> {
   tag: 'ok';
   value: T;
-};
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-export type Err<E> = {
+}
+
+export interface Err<E> {
   tag: 'err';
   error: E;
-};
+}
 export type Result<T, E> = Ok<T> | Err<E>;
 
 export function asOk<T>(value: T): Ok<T> {
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts
index a9f3ea757e33b5..1d453d2bd23408 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts
@@ -10,7 +10,7 @@ jest.mock('./lib/post_pagerduty', () => ({
 
 import { ActionType, Services, ActionTypeExecutorOptions } from '../types';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
-import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { postPagerduty } from './lib/post_pagerduty';
 import { createActionTypeRegistry } from './index.test';
 
@@ -20,7 +20,7 @@ const ACTION_TYPE_ID = '.pagerduty';
 
 const services: Services = {
   callCluster: async (path: string, opts: any) => {},
-  savedObjectsClient: SavedObjectsClientMock.create(),
+  savedObjectsClient: savedObjectsClientMock.create(),
 };
 
 let actionType: ActionType;
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts
index e3feec6d1bc670..76e639c9948341 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts
@@ -7,7 +7,7 @@
 import { ActionType } from '../types';
 import { validateParams } from '../lib';
 import { Logger } from '../../../../../../src/core/server';
-import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { createActionTypeRegistry } from './index.test';
 
 const ACTION_TYPE_ID = '.server-log';
@@ -92,7 +92,7 @@ describe('execute()', () => {
       actionId,
       services: {
         callCluster: async (path: string, opts: any) => {},
-        savedObjectsClient: SavedObjectsClientMock.create(),
+        savedObjectsClient: savedObjectsClientMock.create(),
       },
       params: { message: 'message text here', level: 'info' },
       config: {},
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts
index 681f508b1d2145..f6bd2d2b254df3 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -6,7 +6,7 @@
 
 import { ActionType, Services, ActionTypeExecutorOptions } from '../types';
 import { ActionTypeRegistry } from '../action_type_registry';
-import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { ActionExecutor, validateParams, validateSecrets, TaskRunnerFactory } from '../lib';
 import { getActionType } from './slack';
 import { taskManagerMock } from '../../../task_manager/task_manager.mock';
@@ -15,7 +15,7 @@ const ACTION_TYPE_ID = '.slack';
 
 const services: Services = {
   callCluster: async (path: string, opts: any) => {},
-  savedObjectsClient: SavedObjectsClientMock.create(),
+  savedObjectsClient: savedObjectsClientMock.create(),
 };
 
 let actionTypeRegistry: ActionTypeRegistry;
diff --git a/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts b/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts
index e928eb491c1b5e..c6817b3bc12f3d 100644
--- a/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts
+++ b/x-pack/legacy/plugins/actions/server/create_execute_function.test.ts
@@ -6,10 +6,10 @@
 
 import { taskManagerMock } from '../../task_manager/task_manager.mock';
 import { createExecuteFunction } from './create_execute_function';
-import { SavedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 
 const mockTaskManager = taskManagerMock.create();
-const savedObjectsClient = SavedObjectsClientMock.create();
+const savedObjectsClient = savedObjectsClientMock.create();
 const getBasePath = jest.fn();
 
 beforeEach(() => jest.resetAllMocks());
diff --git a/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts b/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts
index 661a08df3dc30d..5ed67ae82b0ce5 100644
--- a/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts
@@ -8,14 +8,14 @@ import Hapi from 'hapi';
 import { schema } from '@kbn/config-schema';
 import { ActionExecutor } from './action_executor';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
 import {
-  SavedObjectsClientMock,
+  savedObjectsClientMock,
   loggingServiceMock,
 } from '../../../../../../src/core/server/mocks';
 
 const actionExecutor = new ActionExecutor();
-const savedObjectsClient = SavedObjectsClientMock.create();
+const savedObjectsClient = savedObjectsClientMock.create();
 
 function getServices() {
   return {
@@ -24,7 +24,7 @@ function getServices() {
     callCluster: jest.fn(),
   };
 }
-const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create();
+const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
 const actionTypeRegistry = actionTypeRegistryMock.create();
 
 const executeParams = {
diff --git a/x-pack/legacy/plugins/actions/server/lib/action_executor.ts b/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
index aef389262f884d..b7d4ea96ea0f88 100644
--- a/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
@@ -5,7 +5,7 @@
  */
 
 import Hapi from 'hapi';
-import { EncryptedSavedObjectsStartContract } from '../shim';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
 import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../../spaces';
 import { Logger } from '../../../../../../src/core/server';
 import { validateParams, validateConfig, validateSecrets } from './validate_with_schema';
diff --git a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
index cc18c7b1694298..3e71725713070d 100644
--- a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
@@ -11,15 +11,15 @@ import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
 import { TaskRunnerFactory } from './task_runner_factory';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { actionExecutorMock } from './action_executor.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
 import {
-  SavedObjectsClientMock,
+  savedObjectsClientMock,
   loggingServiceMock,
 } from '../../../../../../src/core/server/mocks';
 
 const spaceIdToNamespace = jest.fn();
 const actionTypeRegistry = actionTypeRegistryMock.create();
-const mockedEncryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create();
+const mockedEncryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
 const mockedActionExecutor = actionExecutorMock.create();
 
 let fakeTimer: sinon.SinonFakeTimers;
@@ -54,7 +54,7 @@ afterAll(() => fakeTimer.restore());
 const services = {
   log: jest.fn(),
   callCluster: jest.fn(),
-  savedObjectsClient: SavedObjectsClientMock.create(),
+  savedObjectsClient: savedObjectsClientMock.create(),
 };
 const actionExecutorInitializerParams = {
   logger: loggingServiceMock.create().get(),
diff --git a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts
index efe9ce7fa8be5f..c0cca22b2c3eba 100644
--- a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.ts
@@ -7,7 +7,7 @@
 import { ActionExecutorContract } from './action_executor';
 import { ExecutorError } from './executor_error';
 import { RunContext } from '../../../task_manager';
-import { EncryptedSavedObjectsStartContract } from '../shim';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
 import { ActionTaskParams, GetBasePathFunction, SpaceIdToNamespaceFunction } from '../types';
 
 export interface TaskRunnerContext {
diff --git a/x-pack/legacy/plugins/actions/server/plugin.ts b/x-pack/legacy/plugins/actions/server/plugin.ts
index 618c1d120c37ae..26b65b1a1689a6 100644
--- a/x-pack/legacy/plugins/actions/server/plugin.ts
+++ b/x-pack/legacy/plugins/actions/server/plugin.ts
@@ -22,6 +22,7 @@ import {
   ActionsCoreStart,
   ActionsPluginsSetup,
   ActionsPluginsStart,
+  KibanaConfig,
 } from './shim';
 import {
   createActionRoute,
@@ -44,6 +45,7 @@ export interface PluginStartContract {
 }
 
 export class Plugin {
+  private readonly kibana$: Observable<KibanaConfig>;
   private readonly config$: Observable<ActionsConfigType>;
   private readonly logger: Logger;
   private serverBasePath?: string;
@@ -51,10 +53,12 @@ export class Plugin {
   private taskRunnerFactory?: TaskRunnerFactory;
   private actionTypeRegistry?: ActionTypeRegistry;
   private actionExecutor?: ActionExecutor;
+  private defaultKibanaIndex?: string;
 
   constructor(initializerContext: ActionsPluginInitializerContext) {
     this.logger = initializerContext.logger.get('plugins', 'alerting');
     this.config$ = initializerContext.config.create();
+    this.kibana$ = initializerContext.config.kibana$;
   }
 
   public async setup(
@@ -63,6 +67,7 @@ export class Plugin {
   ): Promise<PluginSetupContract> {
     const config = await this.config$.pipe(first()).toPromise();
     this.adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
+    this.defaultKibanaIndex = (await this.kibana$.pipe(first()).toPromise()).index;
 
     plugins.xpack_main.registerFeature({
       id: 'actions',
@@ -92,12 +97,12 @@ export class Plugin {
     // - `secrets` properties will be encrypted
     // - `config` will be included in AAD
     // - everything else excluded from AAD
-    plugins.encrypted_saved_objects.registerType({
+    plugins.encryptedSavedObjects.registerType({
       type: 'action',
       attributesToEncrypt: new Set(['secrets']),
       attributesToExcludeFromAAD: new Set(['description']),
     });
-    plugins.encrypted_saved_objects.registerType({
+    plugins.encryptedSavedObjects.registerType({
       type: 'action_task_params',
       attributesToEncrypt: new Set(['apiKey']),
     });
@@ -141,6 +146,7 @@ export class Plugin {
       adminClient,
       serverBasePath,
       taskRunnerFactory,
+      defaultKibanaIndex,
     } = this;
 
     function getServices(request: any): Services {
@@ -163,11 +169,11 @@ export class Plugin {
       logger,
       spaces: plugins.spaces,
       getServices,
-      encryptedSavedObjectsPlugin: plugins.encrypted_saved_objects,
+      encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
       actionTypeRegistry: actionTypeRegistry!,
     });
     taskRunnerFactory!.initialize({
-      encryptedSavedObjectsPlugin: plugins.encrypted_saved_objects,
+      encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
       getBasePath,
       spaceIdToNamespace,
     });
@@ -186,6 +192,8 @@ export class Plugin {
         return new ActionsClient({
           savedObjectsClient,
           actionTypeRegistry: actionTypeRegistry!,
+          defaultKibanaIndex: defaultKibanaIndex!,
+          scopedClusterClient: adminClient!.asScoped(request),
         });
       },
     };
diff --git a/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts b/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts
index 340d341a5ef148..23356cedb3ab8c 100644
--- a/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/_mock_server.ts
@@ -5,10 +5,10 @@
  */
 
 import Hapi from 'hapi';
-import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { actionsClientMock } from '../actions_client.mock';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
 
 const defaultConfig = {
   'kibana.index': '.kibana',
@@ -21,8 +21,9 @@ export function createMockServer(config: Record<string, any> = defaultConfig) {
 
   const actionsClient = actionsClientMock.create();
   const actionTypeRegistry = actionTypeRegistryMock.create();
-  const savedObjectsClient = SavedObjectsClientMock.create();
-  const encryptedSavedObjects = encryptedSavedObjectsMock.create();
+  const savedObjectsClient = savedObjectsClientMock.create();
+  const encryptedSavedObjectsSetup = encryptedSavedObjectsMock.createSetup();
+  const encryptedSavedObjectsStart = encryptedSavedObjectsMock.createStart();
 
   server.config = () => {
     return {
@@ -49,21 +50,16 @@ export function createMockServer(config: Record<string, any> = defaultConfig) {
     },
   });
 
-  server.register({
-    name: 'encrypted_saved_objects',
-    register(pluginServer: Hapi.Server) {
-      pluginServer.expose('isEncryptionError', encryptedSavedObjects.isEncryptionError);
-      pluginServer.expose('registerType', encryptedSavedObjects.registerType);
-      pluginServer.expose(
-        'getDecryptedAsInternalUser',
-        encryptedSavedObjects.getDecryptedAsInternalUser
-      );
-    },
-  });
-
   server.decorate('request', 'getSavedObjectsClient', () => savedObjectsClient);
   server.decorate('request', 'getActionsClient', () => actionsClient);
   server.decorate('request', 'getBasePath', () => '/s/my-space');
 
-  return { server, savedObjectsClient, actionsClient, actionTypeRegistry, encryptedSavedObjects };
+  return {
+    server,
+    savedObjectsClient,
+    actionsClient,
+    actionTypeRegistry,
+    encryptedSavedObjectsSetup,
+    encryptedSavedObjectsStart,
+  };
 }
diff --git a/x-pack/legacy/plugins/actions/server/shim.ts b/x-pack/legacy/plugins/actions/server/shim.ts
index c457a40a78b679..0da6b84f2cc691 100644
--- a/x-pack/legacy/plugins/actions/server/shim.ts
+++ b/x-pack/legacy/plugins/actions/server/shim.ts
@@ -12,7 +12,10 @@ import { TaskManager } from '../../task_manager';
 import { XPackMainPlugin } from '../../xpack_main/xpack_main';
 import KbnServer from '../../../../../src/legacy/server/kbn_server';
 import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
-import { EncryptedSavedObjectsPlugin } from '../../encrypted_saved_objects';
+import {
+  PluginSetupContract as EncryptedSavedObjectsSetupContract,
+  PluginStartContract as EncryptedSavedObjectsStartContract,
+} from '../../../../plugins/encrypted_saved_objects/server';
 import { PluginSetupContract as SecurityPlugin } from '../../../../plugins/security/server';
 import {
   CoreSetup,
@@ -24,13 +27,16 @@ import {
 // due to being marked as dependencies
 interface Plugins extends Hapi.PluginProperties {
   task_manager: TaskManager;
-  encrypted_saved_objects: EncryptedSavedObjectsPlugin;
 }
 
 export interface Server extends Legacy.Server {
   plugins: Plugins;
 }
 
+export interface KibanaConfig {
+  index: string;
+}
+
 /**
  * Shim what we're thinking setup and start contracts will look like
  */
@@ -38,15 +44,10 @@ export type TaskManagerStartContract = Pick<TaskManager, 'schedule' | 'fetch' |
 export type XPackMainPluginSetupContract = Pick<XPackMainPlugin, 'registerFeature'>;
 export type SecurityPluginSetupContract = Pick<SecurityPlugin, 'config' | 'registerLegacyAPI'>;
 export type SecurityPluginStartContract = Pick<SecurityPlugin, 'authc'>;
-export type EncryptedSavedObjectsSetupContract = Pick<EncryptedSavedObjectsPlugin, 'registerType'>;
 export type TaskManagerSetupContract = Pick<
   TaskManager,
   'addMiddleware' | 'registerTaskDefinitions'
 >;
-export type EncryptedSavedObjectsStartContract = Pick<
-  EncryptedSavedObjectsPlugin,
-  'isEncryptionError' | 'getDecryptedAsInternalUser'
->;
 
 /**
  * New platform interfaces
@@ -54,6 +55,7 @@ export type EncryptedSavedObjectsStartContract = Pick<
 export interface ActionsPluginInitializerContext {
   logger: LoggerFactory;
   config: {
+    kibana$: Rx.Observable<KibanaConfig>;
     create(): Rx.Observable<ActionsConfigType>;
   };
 }
@@ -73,12 +75,12 @@ export interface ActionsPluginsSetup {
   security?: SecurityPluginSetupContract;
   task_manager: TaskManagerSetupContract;
   xpack_main: XPackMainPluginSetupContract;
-  encrypted_saved_objects: EncryptedSavedObjectsSetupContract;
+  encryptedSavedObjects: EncryptedSavedObjectsSetupContract;
 }
 export interface ActionsPluginsStart {
   security?: SecurityPluginStartContract;
   spaces: () => SpacesPluginStartContract | undefined;
-  encrypted_saved_objects: EncryptedSavedObjectsStartContract;
+  encryptedSavedObjects: EncryptedSavedObjectsStartContract;
   task_manager: TaskManagerStartContract;
 }
 
@@ -101,6 +103,9 @@ export function shim(
   const initializerContext: ActionsPluginInitializerContext = {
     logger: newPlatform.coreContext.logger,
     config: {
+      kibana$: Rx.of({
+        index: server.config().get('kibana.index'),
+      }),
       create() {
         return Rx.of({
           enabled: server.config().get('xpack.actions.enabled') as boolean,
@@ -126,7 +131,8 @@ export function shim(
     security: newPlatform.setup.plugins.security as SecurityPluginSetupContract | undefined,
     task_manager: server.plugins.task_manager,
     xpack_main: server.plugins.xpack_main,
-    encrypted_saved_objects: server.plugins.encrypted_saved_objects,
+    encryptedSavedObjects: newPlatform.setup.plugins
+      .encryptedSavedObjects as EncryptedSavedObjectsSetupContract,
   };
 
   const pluginsStart: ActionsPluginsStart = {
@@ -134,7 +140,8 @@ export function shim(
     // TODO: Currently a function because it's an optional dependency that
     // initializes after this function is called
     spaces: () => server.plugins.spaces,
-    encrypted_saved_objects: server.plugins.encrypted_saved_objects,
+    encryptedSavedObjects: newPlatform.start.plugins
+      .encryptedSavedObjects as EncryptedSavedObjectsStartContract,
     task_manager: server.plugins.task_manager,
   };
 
diff --git a/x-pack/legacy/plugins/actions/server/types.ts b/x-pack/legacy/plugins/actions/server/types.ts
index 9db89aea1b38d5..1ee5022338a465 100644
--- a/x-pack/legacy/plugins/actions/server/types.ts
+++ b/x-pack/legacy/plugins/actions/server/types.ts
@@ -45,6 +45,10 @@ export interface ActionResult {
   config: Record<string, any>;
 }
 
+export interface FindActionResult extends ActionResult {
+  referencedByCount: number;
+}
+
 // the result returned from an action type executor function
 export interface ActionTypeExecutorResult {
   status: 'ok' | 'error';
diff --git a/x-pack/legacy/plugins/alerting/README.md b/x-pack/legacy/plugins/alerting/README.md
index ffe3185328abdb..1b90cb78d870c1 100644
--- a/x-pack/legacy/plugins/alerting/README.md
+++ b/x-pack/legacy/plugins/alerting/README.md
@@ -198,6 +198,7 @@ Payload:
 |Property|Description|Type|
 |---|---|---|
 |enabled|Indicate if you want the alert to start executing on an interval basis after it has been created.|boolean| 
+|name|A name to reference and search in the future.|string|
 |alertTypeId|The id value of the alert type you want to call when the alert is scheduled to execute.|string|
 |interval|The interval in seconds, minutes, hours or days the alert should execute. Example: `10s`, `5m`, `1h`, `1d`.|string|
 |alertTypeParams|The parameters to pass in to the alert type executor `params` value. This will also validate against the alert type params validator if defined.|object|
@@ -242,6 +243,7 @@ Payload:
 |Property|Description|Type|
 |---|---|---|
 |interval|The interval in seconds, minutes, hours or days the alert should execute. Example: `10s`, `5m`, `1h`, `1d`.|string|
+|name|A name to reference and search in the future.|string|
 |alertTypeParams|The parameters to pass in to the alert type executor `params` value. This will also validate against the alert type params validator if defined.|object|
 |actions|Array of the following:<br> - `group` (string): We support grouping actions in the scenario of escalations or different types of alert instances. If you don't need this, feel free to use `default` as a value.<br>- `id` (string): The id of the action saved object to execute.<br>- `params` (object): There map to the `params` the action type will receive. In order to help apply context to strings, we handle them as mustache templates and pass in a default set of context. (see templating actions).|array|
 
diff --git a/x-pack/legacy/plugins/alerting/index.ts b/x-pack/legacy/plugins/alerting/index.ts
index 22db92baa8d28c..b3e33f782688c2 100644
--- a/x-pack/legacy/plugins/alerting/index.ts
+++ b/x-pack/legacy/plugins/alerting/index.ts
@@ -22,12 +22,12 @@ export function alerting(kibana: any) {
   return new kibana.Plugin({
     id: 'alerting',
     configPrefix: 'xpack.alerting',
-    require: ['kibana', 'elasticsearch', 'actions', 'task_manager', 'encrypted_saved_objects'],
+    require: ['kibana', 'elasticsearch', 'actions', 'task_manager', 'encryptedSavedObjects'],
     isEnabled(config: Legacy.KibanaConfig) {
       return (
         config.get('xpack.alerting.enabled') === true &&
         config.get('xpack.actions.enabled') === true &&
-        config.get('xpack.encrypted_saved_objects.enabled') === true &&
+        config.get('xpack.encryptedSavedObjects.enabled') === true &&
         config.get('xpack.task_manager.enabled') === true
       );
     },
diff --git a/x-pack/legacy/plugins/alerting/mappings.json b/x-pack/legacy/plugins/alerting/mappings.json
index bc648e874cfa4c..ff60ccc98cbaa6 100644
--- a/x-pack/legacy/plugins/alerting/mappings.json
+++ b/x-pack/legacy/plugins/alerting/mappings.json
@@ -4,6 +4,9 @@
       "enabled": {
         "type": "boolean"
       },
+      "name": {
+        "type": "text"
+      },
       "alertTypeId": {
         "type": "keyword"
       },
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
index 574aed3fe93293..99af7db2ef8d75 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
@@ -6,13 +6,13 @@
 
 import { schema } from '@kbn/config-schema';
 import { AlertsClient } from './alerts_client';
-import { SavedObjectsClientMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
+import { savedObjectsClientMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
 import { taskManagerMock } from '../../task_manager/task_manager.mock';
 import { alertTypeRegistryMock } from './alert_type_registry.mock';
 
 const taskManager = taskManagerMock.create();
 const alertTypeRegistry = alertTypeRegistryMock.create();
-const savedObjectsClient = SavedObjectsClientMock.create();
+const savedObjectsClient = savedObjectsClientMock.create();
 
 const alertsClientParams = {
   taskManager,
@@ -43,6 +43,7 @@ const mockedDate = new Date('2019-02-12T21:01:22.479Z');
 function getMockData(overwrites: Record<string, any> = {}) {
   return {
     enabled: true,
+    name: 'abc',
     alertTypeId: '123',
     interval: '10s',
     throttle: null,
@@ -172,6 +173,7 @@ describe('create()', () => {
         "interval": "10s",
         "muteAll": false,
         "mutedInstanceIds": Array [],
+        "name": "abc",
         "throttle": null,
         "updatedBy": "elastic",
       }
@@ -504,6 +506,7 @@ describe('create()', () => {
           },
         ],
         alertTypeId: '123',
+        name: 'abc',
         alertTypeParams: { bar: true },
         apiKey: Buffer.from('123:abc').toString('base64'),
         apiKeyOwner: 'elastic',
@@ -1173,6 +1176,7 @@ describe('update()', () => {
       id: '1',
       data: {
         interval: '10s',
+        name: 'abc',
         alertTypeParams: {
           bar: true,
         },
@@ -1230,6 +1234,7 @@ describe('update()', () => {
         "apiKeyOwner": null,
         "enabled": true,
         "interval": "10s",
+        "name": "abc",
         "scheduledTaskId": "task-123",
         "updatedBy": "elastic",
       }
@@ -1304,6 +1309,7 @@ describe('update()', () => {
       id: '1',
       data: {
         interval: '10s',
+        name: 'abc',
         alertTypeParams: {
           bar: true,
         },
@@ -1362,6 +1368,7 @@ describe('update()', () => {
         "apiKeyOwner": "elastic",
         "enabled": true,
         "interval": "10s",
+        "name": "abc",
         "scheduledTaskId": "task-123",
         "updatedBy": "elastic",
       }
@@ -1406,6 +1413,7 @@ describe('update()', () => {
         id: '1',
         data: {
           interval: '10s',
+          name: 'abc',
           alertTypeParams: {
             bar: true,
           },
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
index 39d0277ff53b3c..b92af43a1f1c63 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
@@ -72,6 +72,7 @@ interface CreateOptions {
 interface UpdateOptions {
   id: string;
   data: {
+    name: string;
     interval: string;
     actions: AlertAction[];
     alertTypeParams: Record<string, any>;
diff --git a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts
index ccc91ae2a90345..dcc74ed9488cea 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts
@@ -9,9 +9,9 @@ import { schema } from '@kbn/config-schema';
 import { AlertExecutorOptions } from '../types';
 import { ConcreteTaskInstance } from '../../../task_manager';
 import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
-import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/plugin.mock';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
 import {
-  SavedObjectsClientMock,
+  savedObjectsClientMock,
   loggingServiceMock,
 } from '../../../../../../src/core/server/mocks';
 
@@ -51,8 +51,8 @@ beforeAll(() => {
 
 afterAll(() => fakeTimer.restore());
 
-const savedObjectsClient = SavedObjectsClientMock.create();
-const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.create();
+const savedObjectsClient = savedObjectsClientMock.create();
+const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
 const services = {
   log: jest.fn(),
   callCluster: jest.fn(),
diff --git a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts
index ca11dc8533996d..0c6bd1b4a777a3 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts
@@ -11,7 +11,7 @@ import { createAlertInstanceFactory } from './create_alert_instance_factory';
 import { AlertInstance } from './alert_instance';
 import { getNextRunAt } from './get_next_run_at';
 import { validateAlertTypeParams } from './validate_alert_type_params';
-import { EncryptedSavedObjectsStartContract } from '../shim';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
 import { PluginStartContract as ActionsPluginStartContract } from '../../../actions';
 import {
   AlertType,
diff --git a/x-pack/legacy/plugins/alerting/server/plugin.ts b/x-pack/legacy/plugins/alerting/server/plugin.ts
index d6c6d5907e7ac4..c50bc795757f3e 100644
--- a/x-pack/legacy/plugins/alerting/server/plugin.ts
+++ b/x-pack/legacy/plugins/alerting/server/plugin.ts
@@ -85,7 +85,7 @@ export class Plugin {
     });
 
     // Encrypted attributes
-    plugins.encrypted_saved_objects.registerType({
+    plugins.encryptedSavedObjects.registerType({
       type: 'alert',
       attributesToEncrypt: new Set(['apiKey']),
       attributesToExcludeFromAAD: new Set([
@@ -147,7 +147,7 @@ export class Plugin {
         };
       },
       executeAction: plugins.actions.execute,
-      encryptedSavedObjectsPlugin: plugins.encrypted_saved_objects,
+      encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
       spaceIdToNamespace(spaceId?: string): string | undefined {
         const spacesPlugin = plugins.spaces();
         return spacesPlugin && spaceId ? spacesPlugin.spaceIdToNamespace(spaceId) : undefined;
diff --git a/x-pack/legacy/plugins/alerting/server/routes/create.test.ts b/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
index 3751aa968b3de8..bd153150849c8a 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
@@ -12,6 +12,7 @@ server.route(createAlertRoute);
 
 const mockedAlert = {
   alertTypeId: '1',
+  name: 'abc',
   interval: '10s',
   alertTypeParams: {
     bar: true,
@@ -44,24 +45,25 @@ test('creates an alert with proper parameters', async () => {
   expect(statusCode).toBe(200);
   const response = JSON.parse(payload);
   expect(response).toMatchInlineSnapshot(`
+    Object {
+      "actions": Array [
         Object {
-          "actions": Array [
-            Object {
-              "group": "default",
-              "id": "2",
-              "params": Object {
-                "foo": true,
-              },
-            },
-          ],
-          "alertTypeId": "1",
-          "alertTypeParams": Object {
-            "bar": true,
+          "group": "default",
+          "id": "2",
+          "params": Object {
+            "foo": true,
           },
-          "id": "123",
-          "interval": "10s",
-        }
-    `);
+        },
+      ],
+      "alertTypeId": "1",
+      "alertTypeParams": Object {
+        "bar": true,
+      },
+      "id": "123",
+      "interval": "10s",
+      "name": "abc",
+    }
+  `);
   expect(alertsClient.create).toHaveBeenCalledTimes(1);
   expect(alertsClient.create.mock.calls[0]).toMatchInlineSnapshot(`
     Array [
@@ -82,6 +84,7 @@ test('creates an alert with proper parameters', async () => {
           },
           "enabled": true,
           "interval": "10s",
+          "name": "abc",
           "throttle": null,
         },
       },
@@ -107,6 +110,7 @@ test('creates an alert with proper parameters', async () => {
           },
           "enabled": true,
           "interval": "10s",
+          "name": "abc",
           "throttle": null,
         },
       },
diff --git a/x-pack/legacy/plugins/alerting/server/routes/create.ts b/x-pack/legacy/plugins/alerting/server/routes/create.ts
index 984153d81e0f86..14f72b0041e76f 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/create.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/create.ts
@@ -12,6 +12,7 @@ import { getDurationSchema } from '../lib';
 interface ScheduleRequest extends Hapi.Request {
   payload: {
     enabled: boolean;
+    name: string;
     alertTypeId: string;
     interval: string;
     actions: AlertAction[];
@@ -32,6 +33,7 @@ export const createAlertRoute = {
       payload: Joi.object()
         .keys({
           enabled: Joi.boolean().default(true),
+          name: Joi.string().required(),
           alertTypeId: Joi.string().required(),
           throttle: getDurationSchema().default(null),
           interval: getDurationSchema().required(),
diff --git a/x-pack/legacy/plugins/alerting/server/routes/update.test.ts b/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
index 9e4f18fa1b40d2..2237d8245097c0 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
@@ -36,6 +36,7 @@ test('calls the update function with proper parameters', async () => {
     url: '/api/alert/1',
     payload: {
       throttle: null,
+      name: 'abc',
       interval: '12s',
       alertTypeParams: {
         otherField: false,
@@ -75,6 +76,7 @@ test('calls the update function with proper parameters', async () => {
             "otherField": false,
           },
           "interval": "12s",
+          "name": "abc",
           "throttle": null,
         },
         "id": "1",
diff --git a/x-pack/legacy/plugins/alerting/server/routes/update.ts b/x-pack/legacy/plugins/alerting/server/routes/update.ts
index 2b95b7bc340542..09362295ae73bd 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/update.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/update.ts
@@ -15,6 +15,7 @@ interface UpdateRequest extends Hapi.Request {
   };
   payload: {
     alertTypeId: string;
+    name: string;
     interval: string;
     actions: AlertAction[];
     alertTypeParams: Record<string, any>;
@@ -36,6 +37,7 @@ export const updateAlertRoute = {
           throttle: getDurationSchema()
             .required()
             .allow(null),
+          name: Joi.string().required(),
           interval: getDurationSchema().required(),
           alertTypeParams: Joi.object().required(),
           actions: Joi.array()
diff --git a/x-pack/legacy/plugins/alerting/server/shim.ts b/x-pack/legacy/plugins/alerting/server/shim.ts
index c977fda451df18..d86eab2038095d 100644
--- a/x-pack/legacy/plugins/alerting/server/shim.ts
+++ b/x-pack/legacy/plugins/alerting/server/shim.ts
@@ -10,7 +10,10 @@ import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
 import { TaskManager } from '../../task_manager';
 import { XPackMainPlugin } from '../../xpack_main/xpack_main';
 import KbnServer from '../../../../../src/legacy/server/kbn_server';
-import { EncryptedSavedObjectsPlugin } from '../../encrypted_saved_objects';
+import {
+  PluginSetupContract as EncryptedSavedObjectsSetupContract,
+  PluginStartContract as EncryptedSavedObjectsStartContract,
+} from '../../../../plugins/encrypted_saved_objects/server';
 import { PluginSetupContract as SecurityPlugin } from '../../../../plugins/security/server';
 import {
   CoreSetup,
@@ -28,7 +31,6 @@ import {
 interface Plugins extends Hapi.PluginProperties {
   actions: ActionsPlugin;
   task_manager: TaskManager;
-  encrypted_saved_objects: EncryptedSavedObjectsPlugin;
 }
 
 export interface Server extends Legacy.Server {
@@ -41,16 +43,11 @@ export interface Server extends Legacy.Server {
 export type TaskManagerStartContract = Pick<TaskManager, 'schedule' | 'fetch' | 'remove'>;
 export type SecurityPluginSetupContract = Pick<SecurityPlugin, 'config' | 'registerLegacyAPI'>;
 export type SecurityPluginStartContract = Pick<SecurityPlugin, 'authc'>;
-export type EncryptedSavedObjectsSetupContract = Pick<EncryptedSavedObjectsPlugin, 'registerType'>;
 export type XPackMainPluginSetupContract = Pick<XPackMainPlugin, 'registerFeature'>;
 export type TaskManagerSetupContract = Pick<
   TaskManager,
   'addMiddleware' | 'registerTaskDefinitions'
 >;
-export type EncryptedSavedObjectsStartContract = Pick<
-  EncryptedSavedObjectsPlugin,
-  'isEncryptionError' | 'getDecryptedAsInternalUser'
->;
 
 /**
  * New platform interfaces
@@ -75,13 +72,13 @@ export interface AlertingPluginsSetup {
   task_manager: TaskManagerSetupContract;
   actions: ActionsPluginSetupContract;
   xpack_main: XPackMainPluginSetupContract;
-  encrypted_saved_objects: EncryptedSavedObjectsSetupContract;
+  encryptedSavedObjects: EncryptedSavedObjectsSetupContract;
 }
 export interface AlertingPluginsStart {
   actions: ActionsPluginStartContract;
   security?: SecurityPluginStartContract;
   spaces: () => SpacesPluginStartContract | undefined;
-  encrypted_saved_objects: EncryptedSavedObjectsStartContract;
+  encryptedSavedObjects: EncryptedSavedObjectsStartContract;
   task_manager: TaskManagerStartContract;
 }
 
@@ -122,7 +119,8 @@ export function shim(
     task_manager: server.plugins.task_manager,
     actions: server.plugins.actions.setup,
     xpack_main: server.plugins.xpack_main,
-    encrypted_saved_objects: server.plugins.encrypted_saved_objects,
+    encryptedSavedObjects: newPlatform.setup.plugins
+      .encryptedSavedObjects as EncryptedSavedObjectsSetupContract,
   };
 
   const pluginsStart: AlertingPluginsStart = {
@@ -131,7 +129,8 @@ export function shim(
     // TODO: Currently a function because it's an optional dependency that
     // initializes after this function is called
     spaces: () => server.plugins.spaces,
-    encrypted_saved_objects: server.plugins.encrypted_saved_objects,
+    encryptedSavedObjects: newPlatform.start.plugins
+      .encryptedSavedObjects as EncryptedSavedObjectsStartContract,
     task_manager: server.plugins.task_manager,
   };
 
diff --git a/x-pack/legacy/plugins/alerting/server/types.ts b/x-pack/legacy/plugins/alerting/server/types.ts
index 3c71412da2c899..94b81c9e1b576d 100644
--- a/x-pack/legacy/plugins/alerting/server/types.ts
+++ b/x-pack/legacy/plugins/alerting/server/types.ts
@@ -60,6 +60,7 @@ export interface RawAlertAction extends SavedObjectAttributes {
 
 export interface Alert {
   enabled: boolean;
+  name: string;
   alertTypeId: string;
   interval: string;
   actions: AlertAction[];
@@ -76,6 +77,7 @@ export interface Alert {
 
 export interface RawAlert extends SavedObjectAttributes {
   enabled: boolean;
+  name: string;
   alertTypeId: string;
   interval: string;
   actions: RawAlertAction[];
diff --git a/x-pack/legacy/plugins/apm/common/projections/errors.ts b/x-pack/legacy/plugins/apm/common/projections/errors.ts
index c3094f5cbb0b66..adbd2eb1d6d27d 100644
--- a/x-pack/legacy/plugins/apm/common/projections/errors.ts
+++ b/x-pack/legacy/plugins/apm/common/projections/errors.ts
@@ -19,10 +19,10 @@ export function getErrorGroupsProjection({
   setup: Setup;
   serviceName: string;
 }) {
-  const { start, end, uiFiltersES, config } = setup;
+  const { start, end, uiFiltersES, indices } = setup;
 
   return {
-    index: config.get<string>('apm_oss.errorIndices'),
+    index: indices['apm_oss.errorIndices'],
     body: {
       query: {
         bool: {
diff --git a/x-pack/legacy/plugins/apm/common/projections/metrics.ts b/x-pack/legacy/plugins/apm/common/projections/metrics.ts
index 5c9eeb54744d7f..25d1484624e152 100644
--- a/x-pack/legacy/plugins/apm/common/projections/metrics.ts
+++ b/x-pack/legacy/plugins/apm/common/projections/metrics.ts
@@ -34,7 +34,7 @@ export function getMetricsProjection({
   serviceName: string;
   serviceNodeName?: string;
 }) {
-  const { start, end, uiFiltersES, config } = setup;
+  const { start, end, uiFiltersES, indices } = setup;
 
   const filter = [
     { term: { [SERVICE_NAME]: serviceName } },
@@ -45,7 +45,7 @@ export function getMetricsProjection({
   ];
 
   return {
-    index: config.get<string>('apm_oss.metricsIndices'),
+    index: indices['apm_oss.metricsIndices'],
     body: {
       query: {
         bool: {
diff --git a/x-pack/legacy/plugins/apm/common/projections/services.ts b/x-pack/legacy/plugins/apm/common/projections/services.ts
index ab72211f92aa71..e889899e116347 100644
--- a/x-pack/legacy/plugins/apm/common/projections/services.ts
+++ b/x-pack/legacy/plugins/apm/common/projections/services.ts
@@ -9,13 +9,13 @@ import { SERVICE_NAME, PROCESSOR_EVENT } from '../elasticsearch_fieldnames';
 import { rangeFilter } from '../../server/lib/helpers/range_filter';
 
 export function getServicesProjection({ setup }: { setup: Setup }) {
-  const { start, end, uiFiltersES, config } = setup;
+  const { start, end, uiFiltersES, indices } = setup;
 
   return {
     index: [
-      config.get<string>('apm_oss.metricsIndices'),
-      config.get<string>('apm_oss.errorIndices'),
-      config.get<string>('apm_oss.transactionIndices')
+      indices['apm_oss.metricsIndices'],
+      indices['apm_oss.errorIndices'],
+      indices['apm_oss.transactionIndices']
     ],
     body: {
       size: 0,
diff --git a/x-pack/legacy/plugins/apm/common/projections/transactions.ts b/x-pack/legacy/plugins/apm/common/projections/transactions.ts
index 63abb0572df878..fb249340c867c9 100644
--- a/x-pack/legacy/plugins/apm/common/projections/transactions.ts
+++ b/x-pack/legacy/plugins/apm/common/projections/transactions.ts
@@ -24,7 +24,7 @@ export function getTransactionsProjection({
   transactionName?: string;
   transactionType?: string;
 }) {
-  const { start, end, uiFiltersES, config } = setup;
+  const { start, end, uiFiltersES, indices } = setup;
 
   const transactionNameFilter = transactionName
     ? [{ term: { [TRANSACTION_NAME]: transactionName } }]
@@ -48,7 +48,7 @@ export function getTransactionsProjection({
   };
 
   return {
-    index: config.get<string>('apm_oss.transactionIndices'),
+    index: indices['apm_oss.transactionIndices'],
     body: {
       query: {
         bool
diff --git a/x-pack/legacy/plugins/apm/common/projections/typings.ts b/x-pack/legacy/plugins/apm/common/projections/typings.ts
index 0c56fd2f75bdef..2b55395b70c6ba 100644
--- a/x-pack/legacy/plugins/apm/common/projections/typings.ts
+++ b/x-pack/legacy/plugins/apm/common/projections/typings.ts
@@ -4,15 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SearchParams } from 'elasticsearch';
+import { ESSearchRequest, ESSearchBody } from '../../typings/elasticsearch';
+import {
+  AggregationOptionsByType,
+  AggregationInputMap
+} from '../../typings/elasticsearch/aggregations';
 
-export type Projection = Omit<SearchParams, 'body' | 'aggs'> & {
-  body: {
-    query: any;
-  } & {
+export type Projection = Omit<ESSearchRequest, 'body'> & {
+  body: Omit<ESSearchBody, 'aggs'> & {
     aggs?: {
       [key: string]: {
-        terms: any;
+        terms: AggregationOptionsByType['terms'];
+        aggs?: AggregationInputMap;
       };
     };
   };
diff --git a/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.test.ts b/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.test.ts
index ae1b7c552ab4e4..aa72b5fd71365a 100644
--- a/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.test.ts
+++ b/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.test.ts
@@ -29,12 +29,15 @@ describe('mergeProjection', () => {
   });
 
   it('merges plain objects', () => {
+    const termsAgg = { terms: { field: 'bar' } };
     expect(
       mergeProjection(
-        { body: { query: {}, aggs: { foo: { terms: { field: 'bar' } } } } },
+        { body: { query: {}, aggs: { foo: termsAgg } } },
         {
           body: {
-            aggs: { foo: { aggs: { bar: { terms: { field: 'baz' } } } } }
+            aggs: {
+              foo: { ...termsAgg, aggs: { bar: { terms: { field: 'baz' } } } }
+            }
           }
         }
       )
diff --git a/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.ts b/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.ts
index 5b6b5b0b7f058d..9a8f11c6493c50 100644
--- a/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.ts
+++ b/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.ts
@@ -4,10 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { merge, isPlainObject } from 'lodash';
+import { DeepPartial } from 'utility-types';
+import { AggregationInputMap } from '../../../../typings/elasticsearch/aggregations';
+import {
+  ESSearchRequest,
+  ESSearchBody
+} from '../../../../typings/elasticsearch';
 import { Projection } from '../../typings';
 
 type PlainObject = Record<string | number | symbol, any>;
 
+type SourceProjection = Omit<DeepPartial<ESSearchRequest>, 'body'> & {
+  body: Omit<DeepPartial<ESSearchBody>, 'aggs'> & {
+    aggs?: AggregationInputMap;
+  };
+};
+
 type DeepMerge<T, U> = U extends PlainObject
   ? (T extends PlainObject
       ? (Omit<T, keyof U> &
@@ -19,10 +31,10 @@ type DeepMerge<T, U> = U extends PlainObject
       : U)
   : U;
 
-export function mergeProjection<T extends Projection, U>(
-  target: T,
-  source: U
-): DeepMerge<T, U> {
+export function mergeProjection<
+  T extends Projection,
+  U extends SourceProjection
+>(target: T, source: U): DeepMerge<T, U> {
   return merge({}, target, source, (a, b) => {
     if (isPlainObject(a) && isPlainObject(b)) {
       return undefined;
diff --git a/x-pack/legacy/plugins/apm/dev_docs/github_commands.md b/x-pack/legacy/plugins/apm/dev_docs/github_commands.md
new file mode 100644
index 00000000000000..f2c32bafa7539d
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/dev_docs/github_commands.md
@@ -0,0 +1,6 @@
+### Useful Github Pull Request commands
+
+The following commands can be executed by writing them as comments on a pull request:
+
+- `@elasticmachine merge upstream`: Will merge the upstream (eg. master or 7.x) into the branch. This is useful if a bug has been fixed upstream and the fix is necessary to pass CI checks
+- `retest` Re-run the tests. This is useful if a flaky test caused the build to fail
diff --git a/x-pack/legacy/plugins/apm/dev_docs/typescript.md b/x-pack/legacy/plugins/apm/dev_docs/typescript.md
new file mode 100644
index 00000000000000..105c6edabf48ff
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/dev_docs/typescript.md
@@ -0,0 +1,11 @@
+#### Optimizing TypeScript 
+
+Kibana and X-Pack are very large TypeScript projects, and it comes at a cost. Editor responsiveness is not great, and the CLI type check for X-Pack takes about a minute. To get faster feedback, we create a smaller APM TypeScript project that only type checks the APM project and the files it uses. This optimization consists of creating a `tsconfig.json` in APM that includes the Kibana/X-Pack typings, and editing the Kibana/X-Pack configurations to not include any files, or removing the configurations altogether. The script configures git to ignore any changes in these files, and has an undo script as well.
+
+To run the optimization:
+
+`$ node x-pack/legacy/plugins/apm/scripts/optimize-tsconfig`
+
+To undo the optimization:
+
+`$ node x-pack/legacy/plugins/apm/scripts/unoptimize-tsconfig`
diff --git a/x-pack/legacy/plugins/apm/dev_docs/vscode_setup.md b/x-pack/legacy/plugins/apm/dev_docs/vscode_setup.md
new file mode 100644
index 00000000000000..e1901b3855f735
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/dev_docs/vscode_setup.md
@@ -0,0 +1,53 @@
+### Visual Studio Code
+
+When using [Visual Studio Code](https://code.visualstudio.com/) with APM it's best to set up a [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) and add the `x-pack/legacy/plugins/apm` directory, the `x-pack` directory, and the root of the Kibana repository to the workspace. This makes it so you can navigate and search within APM and use the wider workspace roots when you need to widen your search.
+
+#### Using the Jest extension
+
+The [vscode-jest extension](https://marketplace.visualstudio.com/items?itemName=Orta.vscode-jest) is a good way to run your Jest tests inside the editor.
+
+Some of the benefits of using the extension over just running it in a terminal are:
+
+• It shows the pass/fail of a test inline in the test file
+• It shows the error message in the test file if it fails
+• You don’t have to have the terminal process running
+• It can automatically update your snapshots when they change
+• Coverage mapping
+
+The extension doesn't really work well if you're trying to use it on all of Kibana or all of X-Pack, but it works well if you configure it to run only on the files in APM.
+
+If you have a workspace configured as described above you should have:
+
+```json
+"jest.disabledWorkspaceFolders": ["kibana", "x-pack"]
+```
+
+in your Workspace settings, and:
+
+```json
+"jest.pathToJest": "node scripts/jest.js --testPathPattern=legacy/plugins/apm",
+"jest.rootPath": "../../.."
+```
+
+in the settings for the APM folder.
+
+#### Jest debugging
+
+To make the [VSCode debugger](https://vscode.readthedocs.io/en/latest/editor/debugging/) work with Jest (you can set breakpoints in the code and tests and use the VSCode debugger) you'll need the [Node Debug extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.node-debug2) installed and can set up a launch configuration like:
+
+```json
+{
+  "type": "node",
+  "name": "APM Jest",
+  "request": "launch",
+  "args": ["--runInBand", "--testPathPattern=legacy/plugins/apm"],
+  "cwd": "${workspaceFolder}/../../..",
+  "console": "internalConsole",
+  "internalConsoleOptions": "openOnSessionStart",
+  "disableOptimisticBPs": true,
+  "program": "${workspaceFolder}/../../../scripts/jest.js",
+  "runtimeVersion": "10.15.2"
+}
+```
+
+(you'll want `runtimeVersion` to match what's in the Kibana root .nvmrc. Depending on your setup, you might be able to remove this line.)
diff --git a/x-pack/legacy/plugins/apm/index.ts b/x-pack/legacy/plugins/apm/index.ts
index 4d3d2b210bbae6..556bce9d37bb54 100644
--- a/x-pack/legacy/plugins/apm/index.ts
+++ b/x-pack/legacy/plugins/apm/index.ts
@@ -43,8 +43,7 @@ export const apm: LegacyPluginInitializer = kibana => {
           apmUiEnabled: config.get('xpack.apm.ui.enabled'),
           // TODO: rename to apm_oss.indexPatternTitle in 7.0 (breaking change)
           apmIndexPatternTitle: config.get('apm_oss.indexPattern'),
-          apmServiceMapEnabled: config.get('xpack.apm.serviceMapEnabled'),
-          apmTransactionIndices: config.get('apm_oss.transactionIndices')
+          apmServiceMapEnabled: config.get('xpack.apm.serviceMapEnabled')
         };
       },
       hacks: ['plugins/apm/hacks/toggle_app_link_in_nav'],
diff --git a/x-pack/legacy/plugins/apm/mappings.json b/x-pack/legacy/plugins/apm/mappings.json
index 26075d406c993a..0b31798242fadc 100644
--- a/x-pack/legacy/plugins/apm/mappings.json
+++ b/x-pack/legacy/plugins/apm/mappings.json
@@ -41,5 +41,30 @@
         }
       }
     }
+  },
+  "apm-indices": {
+    "properties": {
+      "apm_oss.sourcemapIndices": {
+        "type": "keyword"
+      },
+      "apm_oss.errorIndices": {
+        "type": "keyword"
+      },
+      "apm_oss.onboardingIndices": {
+        "type": "keyword"
+      },
+      "apm_oss.spanIndices": {
+        "type": "keyword"
+      },
+      "apm_oss.transactionIndices": {
+        "type": "keyword"
+      },
+      "apm_oss.metricsIndices": {
+        "type": "keyword"
+      },
+      "apm_oss.apmAgentConfigurationIndex": {
+        "type": "keyword"
+      }
+    }
   }
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ErrorTabs.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ErrorTabs.tsx
index 253580ce5cecdf..33b20b0f0f2265 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ErrorTabs.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ErrorTabs.tsx
@@ -17,7 +17,7 @@ export interface ErrorTab {
 export const logStacktraceTab: ErrorTab = {
   key: 'log_stacktrace',
   label: i18n.translate('xpack.apm.propertiesTable.tabs.logStacktraceLabel', {
-    defaultMessage: 'Log stacktrace'
+    defaultMessage: 'Log stack trace'
   })
 };
 
@@ -26,7 +26,7 @@ export const exceptionStacktraceTab: ErrorTab = {
   label: i18n.translate(
     'xpack.apm.propertiesTable.tabs.exceptionStacktraceLabel',
     {
-      defaultMessage: 'Exception stacktrace'
+      defaultMessage: 'Exception stack trace'
     }
   )
 };
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.test.tsx
new file mode 100644
index 00000000000000..8ec9c604e7038f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.test.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { ExceptionStacktrace } from './ExceptionStacktrace';
+
+describe('ExceptionStacktrace', () => {
+  describe('render', () => {
+    it('renders', () => {
+      const props = { exceptions: [] };
+
+      expect(() =>
+        shallow(<ExceptionStacktrace {...props} />)
+      ).not.toThrowError();
+    });
+
+    describe('with a stack trace', () => {
+      it('renders the stack trace', () => {
+        const props = { exceptions: [{}] };
+
+        expect(
+          shallow(<ExceptionStacktrace {...props} />).find('Stacktrace')
+        ).toHaveLength(1);
+      });
+    });
+
+    describe('with more than one stack trace', () => {
+      it('renders a cause stack trace', () => {
+        const props = { exceptions: [{}, {}] };
+
+        expect(
+          shallow(<ExceptionStacktrace {...props} />).find('CauseStacktrace')
+        ).toHaveLength(1);
+      });
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.tsx
new file mode 100644
index 00000000000000..13c904a1194499
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.tsx
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiTitle } from '@elastic/eui';
+import { idx } from '@kbn/elastic-idx/target';
+import { Exception } from '../../../../../typings/es_schemas/raw/ErrorRaw';
+import { Stacktrace } from '../../../shared/Stacktrace';
+import { CauseStacktrace } from '../../../shared/Stacktrace/CauseStacktrace';
+
+interface ExceptionStacktraceProps {
+  codeLanguage?: string;
+  exceptions: Exception[];
+}
+
+export function ExceptionStacktrace({
+  codeLanguage,
+  exceptions
+}: ExceptionStacktraceProps) {
+  const title = idx(exceptions, _ => _[0].message);
+
+  return (
+    <>
+      <EuiTitle size="xs">
+        <h4>{title}</h4>
+      </EuiTitle>
+      {exceptions.map((ex, index) => {
+        return index === 0 ? (
+          <Stacktrace
+            key={index}
+            stackframes={ex.stacktrace}
+            codeLanguage={codeLanguage}
+          />
+        ) : (
+          <CauseStacktrace
+            codeLanguage={codeLanguage}
+            key={index}
+            id={index.toString()}
+            message={ex.message}
+            stackframes={ex.stacktrace}
+          />
+        );
+      })}
+    </>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap
index be9d67f31cb113..39874c11b09bf6 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/__snapshots__/index.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`DetailView should render TabContent 1`] = `
   currentTab={
     Object {
       "key": "exception_stacktrace",
-      "label": "Exception stacktrace",
+      "label": "Exception stack trace",
     }
   }
   error={
@@ -71,7 +71,7 @@ exports[`DetailView should render tabs 1`] = `
     key="exception_stacktrace"
     onClick={[Function]}
   >
-    Exception stacktrace
+    Exception stack trace
   </EuiTab>
   <EuiTab
     isSelected={false}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
index 41fffc3b847b1f..5c7b2b7d0070e9 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
@@ -40,6 +40,7 @@ import { TimestampTooltip } from '../../../shared/TimestampTooltip';
 import { HttpInfoSummaryItem } from '../../../shared/Summary/HttpInfoSummaryItem';
 import { TransactionDetailLink } from '../../../shared/Links/apm/TransactionDetailLink';
 import { UserAgentSummaryItem } from '../../../shared/Summary/UserAgentSummaryItem';
+import { ExceptionStacktrace } from './ExceptionStacktrace';
 
 const HeaderContainer = styled.div`
   display: flex;
@@ -180,7 +181,7 @@ export function DetailView({ errorGroup, urlParams, location }: Props) {
   );
 }
 
-export function TabContent({
+function TabContent({
   error,
   currentTab
 }: {
@@ -188,7 +189,7 @@ export function TabContent({
   currentTab: ErrorTab;
 }) {
   const codeLanguage = idx(error, _ => _.service.language.name);
-  const excStackframes = idx(error, _ => _.error.exception[0].stacktrace);
+  const exceptions = idx(error, _ => _.error.exception) || [];
   const logStackframes = idx(error, _ => _.error.log.stacktrace);
 
   switch (currentTab.key) {
@@ -198,7 +199,10 @@ export function TabContent({
       );
     case exceptionStacktraceTab.key:
       return (
-        <Stacktrace stackframes={excStackframes} codeLanguage={codeLanguage} />
+        <ExceptionStacktrace
+          codeLanguage={codeLanguage}
+          exceptions={exceptions}
+        />
       );
     default:
       return <ErrorMetadata error={error} />;
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
index 2689ce8bd9424d..c663c52d7d639e 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
@@ -132,7 +132,11 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               data-test-subj="tableHeaderCell_groupId_0"
               role="columnheader"
               scope="col"
-              width="96px"
+              style={
+                Object {
+                  "width": "96px",
+                }
+              }
             >
               <div
                 className="euiTableCellContent"
@@ -149,7 +153,11 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               data-test-subj="tableHeaderCell_message_1"
               role="columnheader"
               scope="col"
-              width="50%"
+              style={
+                Object {
+                  "width": "50%",
+                }
+              }
             >
               <div
                 className="euiTableCellContent"
@@ -166,6 +174,11 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               data-test-subj="tableHeaderCell_handled_2"
               role="columnheader"
               scope="col"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight"
@@ -182,6 +195,11 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               data-test-subj="tableHeaderCell_occurrenceCount_3"
               role="columnheader"
               scope="col"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <button
                 className="euiTableHeaderButton"
@@ -212,6 +230,11 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               data-test-subj="tableHeaderCell_latestOccurrenceAt_4"
               role="columnheader"
               scope="col"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <button
                 className="euiTableHeaderButton euiTableHeaderButton-isSorted"
@@ -254,6 +277,11 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
             <td
               className="euiTableRowCell euiTableRowCell--isMobileFullWidth"
               colSpan={5}
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableCellContent euiTableCellContent--alignCenter"
@@ -483,7 +511,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               data-test-subj="tableHeaderCell_groupId_0"
               role="columnheader"
               scope="col"
-              width="96px"
+              style={
+                Object {
+                  "width": "96px",
+                }
+              }
             >
               <div
                 className="euiTableCellContent"
@@ -500,7 +532,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               data-test-subj="tableHeaderCell_message_1"
               role="columnheader"
               scope="col"
-              width="50%"
+              style={
+                Object {
+                  "width": "50%",
+                }
+              }
             >
               <div
                 className="euiTableCellContent"
@@ -517,6 +553,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               data-test-subj="tableHeaderCell_handled_2"
               role="columnheader"
               scope="col"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight"
@@ -533,6 +574,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               data-test-subj="tableHeaderCell_occurrenceCount_3"
               role="columnheader"
               scope="col"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <button
                 className="euiTableHeaderButton"
@@ -563,6 +609,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               data-test-subj="tableHeaderCell_latestOccurrenceAt_4"
               role="columnheader"
               scope="col"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <button
                 className="euiTableHeaderButton euiTableHeaderButton-isSorted"
@@ -604,7 +655,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
           >
             <td
               className="euiTableRowCell"
-              width="96px"
+              style={
+                Object {
+                  "width": "96px",
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -630,7 +685,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
-              width="50%"
+              style={
+                Object {
+                  "width": "50%",
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -684,6 +743,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight euiTableCellContent--overflowingContent"
@@ -691,6 +755,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -705,6 +774,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -714,7 +788,13 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight euiTableCellContent--overflowingContent"
               >
-                1337 minutes ago (mocking 1515578797)
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
+                >
+                  1337 minutes ago (mocking 1515578797)
+                </span>
               </div>
             </td>
           </tr>
@@ -723,7 +803,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
           >
             <td
               className="euiTableRowCell"
-              width="96px"
+              style={
+                Object {
+                  "width": "96px",
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -749,7 +833,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
-              width="50%"
+              style={
+                Object {
+                  "width": "50%",
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -803,6 +891,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight euiTableCellContent--overflowingContent"
@@ -810,6 +903,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -824,6 +922,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -833,7 +936,13 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight euiTableCellContent--overflowingContent"
               >
-                1337 minutes ago (mocking 1515578797)
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
+                >
+                  1337 minutes ago (mocking 1515578797)
+                </span>
               </div>
             </td>
           </tr>
@@ -842,7 +951,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
           >
             <td
               className="euiTableRowCell"
-              width="96px"
+              style={
+                Object {
+                  "width": "96px",
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -868,7 +981,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
-              width="50%"
+              style={
+                Object {
+                  "width": "50%",
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -922,6 +1039,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight euiTableCellContent--overflowingContent"
@@ -929,6 +1051,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -943,6 +1070,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -952,7 +1084,13 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight euiTableCellContent--overflowingContent"
               >
-                1337 minutes ago (mocking 1515578796)
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
+                >
+                  1337 minutes ago (mocking 1515578796)
+                </span>
               </div>
             </td>
           </tr>
@@ -961,7 +1099,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
           >
             <td
               className="euiTableRowCell"
-              width="96px"
+              style={
+                Object {
+                  "width": "96px",
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -987,7 +1129,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
-              width="50%"
+              style={
+                Object {
+                  "width": "50%",
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -1041,6 +1187,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight euiTableCellContent--overflowingContent"
@@ -1048,6 +1199,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -1062,6 +1218,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             </td>
             <td
               className="euiTableRowCell"
+              style={
+                Object {
+                  "width": undefined,
+                }
+              }
             >
               <div
                 className="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -1071,7 +1232,13 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               <div
                 className="euiTableCellContent euiTableCellContent--alignRight euiTableCellContent--overflowingContent"
               >
-                1337 minutes ago (mocking 1515578773)
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
+                >
+                  1337 minutes ago (mocking 1515578773)
+                </span>
               </div>
             </td>
           </tr>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/index.tsx
index 37fa6499ff1765..2f06f1d52de6ba 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/index.tsx
@@ -7,7 +7,6 @@
 import { EuiBadge, EuiToolTip } from '@elastic/eui';
 import numeral from '@elastic/numeral';
 import { i18n } from '@kbn/i18n';
-import moment from 'moment';
 import React, { useMemo } from 'react';
 import styled from 'styled-components';
 import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
@@ -22,6 +21,7 @@ import {
 import { useUrlParams } from '../../../../hooks/useUrlParams';
 import { ManagedTable } from '../../../shared/ManagedTable';
 import { ErrorDetailLink } from '../../../shared/Links/apm/ErrorDetailLink';
+import { TimestampTooltip } from '../../../shared/TimestampTooltip';
 
 const GroupIdLink = styled(ErrorDetailLink)`
   font-family: ${fontFamilyCode};
@@ -142,7 +142,11 @@ const ErrorGroupList: React.FC<Props> = props => {
         ),
         align: 'right',
         render: (value?: number) =>
-          value ? moment(value).fromNow() : NOT_AVAILABLE_LABEL
+          value ? (
+            <TimestampTooltip time={value} precision="minutes" />
+          ) : (
+            NOT_AVAILABLE_LABEL
+          )
       }
     ],
     [serviceName]
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx
index 92ae1737a408f8..fe1a80d702dbac 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx
@@ -49,6 +49,8 @@ const ErrorGroupOverview: React.SFC = () => {
 
   const { data: errorGroupListData } = useFetcher(
     callApmApi => {
+      const normalizedSortDirection = sortDirection === 'asc' ? 'asc' : 'desc';
+
       if (serviceName && start && end) {
         return callApmApi({
           pathname: '/api/apm/services/{serviceName}/errors',
@@ -60,7 +62,7 @@ const ErrorGroupOverview: React.SFC = () => {
               start,
               end,
               sortField,
-              sortDirection,
+              sortDirection: normalizedSortDirection,
               uiFilters: JSON.stringify(uiFilters)
             }
           }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx
index 0c1d20d65b7b9f..cfbe8b1edbd719 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.tsx
@@ -12,11 +12,10 @@ import {
   RouteProps,
   withRouter
 } from 'react-router-dom';
-import { StringMap } from '../../../../typings/common';
 import { RouteName } from './route_config/route_names';
 
 type LocationMatch = Pick<
-  RouteComponentProps<StringMap<string>>,
+  RouteComponentProps<Record<string, string>>,
   'location' | 'match'
 >;
 
@@ -75,7 +74,7 @@ export function getBreadcrumb({
       return null;
     }
 
-    const match = matchPath<StringMap<string>>(currentPath, route);
+    const match = matchPath<Record<string, string>>(currentPath, route);
 
     if (match) {
       return parse({
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 6c95095592fe4b..4769fe6400ac1c 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
@@ -15,7 +15,9 @@ import { TransactionDetails } from '../../TransactionDetails';
 import { Home } from '../../Home';
 import { BreadcrumbRoute } from '../ProvideBreadcrumbs';
 import { RouteName } from './route_names';
+import { Settings } from '../../Settings';
 import { AgentConfigurations } from '../../Settings/AgentConfigurations';
+import { ApmIndices } from '../../Settings/ApmIndices';
 import { toQuery } from '../../../shared/Links/url_helpers';
 import { ServiceNodeMetrics } from '../../ServiceNodeMetrics';
 import { resolveUrlParams } from '../../../../context/UrlParamsContext/resolveUrlParams';
@@ -69,12 +71,41 @@ export const routes: BreadcrumbRoute[] = [
   {
     exact: true,
     path: '/settings',
-    component: AgentConfigurations,
+    render: renderAsRedirectTo('/settings/agent-configuration'),
     breadcrumb: i18n.translate('xpack.apm.breadcrumb.listSettingsTitle', {
       defaultMessage: 'Settings'
     }),
     name: RouteName.SETTINGS
   },
+  {
+    exact: true,
+    path: '/settings/apm-indices',
+    component: () => (
+      <Settings>
+        <ApmIndices />
+      </Settings>
+    ),
+    breadcrumb: i18n.translate('xpack.apm.breadcrumb.settings.indicesTitle', {
+      defaultMessage: 'Indices'
+    }),
+    name: RouteName.INDICES
+  },
+  {
+    exact: true,
+    path: '/settings/agent-configuration',
+    component: () => (
+      <Settings>
+        <AgentConfigurations />
+      </Settings>
+    ),
+    breadcrumb: i18n.translate(
+      'xpack.apm.breadcrumb.settings.agentConfigurationTitle',
+      {
+        defaultMessage: 'Agent Configuration'
+      }
+    ),
+    name: RouteName.AGENT_CONFIGURATION
+  },
   {
     exact: true,
     path: '/services/:serviceName',
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 3af5b217ca738e..ab02e38ee9c9d9 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
@@ -19,5 +19,7 @@ export enum RouteName {
   TRANSACTION_TYPE = 'transaction_type',
   TRANSACTION_NAME = 'transaction_name',
   SETTINGS = 'settings',
+  AGENT_CONFIGURATION = 'agent_configuration',
+  INDICES = 'indices',
   SERVICE_NODES = 'nodes'
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts
index 4d6c3f4c116c96..c7860b81a7b1ec 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/__test__/createErrorGroupWatch.test.ts
@@ -7,7 +7,6 @@
 import { isArray, isObject, isString } from 'lodash';
 import mustache from 'mustache';
 import uuid from 'uuid';
-import { StringMap } from '../../../../../../typings/common';
 // @ts-ignore
 import * as rest from '../../../../../services/rest/watcher';
 import { createErrorGroupWatch } from '../createErrorGroupWatch';
@@ -85,8 +84,11 @@ describe('createErrorGroupWatch', () => {
 });
 
 // Recursively iterate a nested structure and render strings as mustache templates
-type InputOutput = string | string[] | StringMap<any>;
-function renderMustache(input: InputOutput, ctx: StringMap): InputOutput {
+type InputOutput = string | string[] | Record<string, any>;
+function renderMustache(
+  input: InputOutput,
+  ctx: Record<string, unknown>
+): InputOutput {
   if (isString(input)) {
     return mustache.render(input, {
       ctx,
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts
index 2617fef6de1d2b..e7d06403b8f8e1 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/createErrorGroupWatch.ts
@@ -17,7 +17,6 @@ import {
   PROCESSOR_EVENT,
   SERVICE_NAME
 } from '../../../../../common/elasticsearch_fieldnames';
-import { StringMap } from '../../../../../typings/common';
 // @ts-ignore
 import { createWatch } from '../../../../services/rest/watcher';
 
@@ -50,8 +49,8 @@ interface Arguments {
 
 interface Actions {
   log_error: { logging: { text: string } };
-  slack_webhook?: StringMap;
-  email?: StringMap;
+  slack_webhook?: Record<string, unknown>;
+  email?: Record<string, unknown>;
 }
 
 export async function createErrorGroupWatch({
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.tsx
index 2833b0476428c6..79874d6648d0ff 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeMetrics/index.tsx
@@ -113,7 +113,7 @@ export function ServiceNodeMetrics() {
                 </ElasticDocsLink>
               )
             }}
-          ></FormattedMessage>
+          />
         </EuiCallOut>
       ) : (
         <EuiFlexGroup gutterSize="xl">
@@ -129,7 +129,7 @@ export function ServiceNodeMetrics() {
                   <Truncate>{host}</Truncate>
                 </EuiToolTip>
               }
-            ></EuiStat>
+            />
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiStat
@@ -146,7 +146,7 @@ export function ServiceNodeMetrics() {
                   <Truncate>{containerId}</Truncate>
                 </EuiToolTip>
               }
-            ></EuiStat>
+            />
           </EuiFlexItem>
         </EuiFlexGroup>
       )}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
index 573278c407389a..6dcb9140a8bb98 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
@@ -143,7 +143,7 @@ NodeList [
   >
     <td
       class="euiTableRowCell"
-      width="40%"
+      style="width: 40%;"
     >
       <div
         class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -168,7 +168,7 @@ NodeList [
     </td>
     <td
       class="euiTableRowCell"
-      width="20%"
+      style="width: 20%;"
     >
       <div
         class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -241,7 +241,7 @@ NodeList [
   >
     <td
       class="euiTableRowCell"
-      width="40%"
+      style="width: 40%;"
     >
       <div
         class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
@@ -266,7 +266,7 @@ NodeList [
     </td>
     <td
       class="euiTableRowCell"
-      width="20%"
+      style="width: 20%;"
     >
       <div
         class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
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 e2630efbcf500e..9e95cfd0fad7fc 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
@@ -10,7 +10,6 @@ import {
   EuiTitle,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiButtonEmpty,
   EuiPanel,
   EuiSpacer,
   EuiButton
@@ -18,7 +17,6 @@ import {
 import { isEmpty } from 'lodash';
 import { useFetcher } from '../../../../hooks/useFetcher';
 import { AgentConfigurationListAPIResponse } from '../../../../../server/lib/settings/agent_configuration/list_configurations';
-import { HomeLink } from '../../../shared/Links/apm/HomeLink';
 import { AgentConfigurationList } from './AgentConfigurationList';
 import { useTrackPageview } from '../../../../../../infra/public';
 import { AddEditFlyout } from './AddEditFlyout';
@@ -62,30 +60,6 @@ export function AgentConfigurations() {
         />
       )}
 
-      <EuiFlexGroup alignItems="center">
-        <EuiFlexItem grow={false}>
-          <EuiTitle size="l">
-            <h1>
-              {i18n.translate('xpack.apm.settings.agentConf.pageTitle', {
-                defaultMessage: 'Settings'
-              })}
-            </h1>
-          </EuiTitle>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <HomeLink>
-            <EuiButtonEmpty size="s" color="primary" iconType="arrowLeft">
-              {i18n.translate(
-                'xpack.apm.settings.agentConf.returnToOverviewLinkLabel',
-                { defaultMessage: 'Return to overview' }
-              )}
-            </EuiButtonEmpty>
-          </HomeLink>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-
-      <EuiSpacer size="l" />
-
       <EuiPanel>
         <EuiFlexGroup alignItems="center">
           <EuiFlexItem grow={false}>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
new file mode 100644
index 00000000000000..67957ae76b1f10
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
@@ -0,0 +1,258 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState, useEffect } from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiTitle,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiPanel,
+  EuiSpacer,
+  EuiText,
+  EuiForm,
+  EuiFormRow,
+  EuiFieldText,
+  EuiButton,
+  EuiButtonEmpty
+} from '@elastic/eui';
+import { useFetcher } from '../../../../hooks/useFetcher';
+import { useCallApmApi } from '../../../../hooks/useCallApmApi';
+import { APMClient } from '../../../../services/rest/createCallApmApi';
+import { useKibanaCore } from '../../../../../../observability/public';
+
+const APM_INDEX_LABELS = [
+  {
+    configurationName: 'apm_oss.sourcemapIndices',
+    label: i18n.translate(
+      'xpack.apm.settings.apmIndices.sourcemapIndicesLabel',
+      { defaultMessage: 'Sourcemap Indices' }
+    )
+  },
+  {
+    configurationName: 'apm_oss.errorIndices',
+    label: i18n.translate('xpack.apm.settings.apmIndices.errorIndicesLabel', {
+      defaultMessage: 'Error Indices'
+    })
+  },
+  {
+    configurationName: 'apm_oss.onboardingIndices',
+    label: i18n.translate(
+      'xpack.apm.settings.apmIndices.onboardingIndicesLabel',
+      { defaultMessage: 'Onboarding Indices' }
+    )
+  },
+  {
+    configurationName: 'apm_oss.spanIndices',
+    label: i18n.translate('xpack.apm.settings.apmIndices.spanIndicesLabel', {
+      defaultMessage: 'Span Indices'
+    })
+  },
+  {
+    configurationName: 'apm_oss.transactionIndices',
+    label: i18n.translate(
+      'xpack.apm.settings.apmIndices.transactionIndicesLabel',
+      { defaultMessage: 'Transaction Indices' }
+    )
+  },
+  {
+    configurationName: 'apm_oss.metricsIndices',
+    label: i18n.translate('xpack.apm.settings.apmIndices.metricsIndicesLabel', {
+      defaultMessage: 'Metrics Indices'
+    })
+  },
+  {
+    configurationName: 'apm_oss.apmAgentConfigurationIndex',
+    label: i18n.translate(
+      'xpack.apm.settings.apmIndices.apmAgentConfigurationIndexLabel',
+      { defaultMessage: 'Agent Configuration Index' }
+    )
+  }
+];
+
+async function saveApmIndices({
+  callApmApi,
+  apmIndices
+}: {
+  callApmApi: APMClient;
+  apmIndices: Record<string, string>;
+}) {
+  await callApmApi({
+    method: 'POST',
+    pathname: '/api/apm/settings/apm-indices/save',
+    params: {
+      body: apmIndices
+    }
+  });
+}
+
+export function ApmIndices() {
+  const {
+    notifications: { toasts }
+  } = useKibanaCore();
+
+  const [apmIndices, setApmIndices] = useState<Record<string, string>>({});
+  const [isSaving, setIsSaving] = useState(false);
+
+  const callApmApiFromHook = useCallApmApi();
+
+  const { data = [], status, refetch } = useFetcher(
+    callApmApi =>
+      callApmApi({ pathname: `/api/apm/settings/apm-index-settings` }),
+    []
+  );
+
+  useEffect(() => {
+    setApmIndices(
+      data.reduce(
+        (acc, { configurationName, savedValue }) => ({
+          ...acc,
+          [configurationName]: savedValue
+        }),
+        {}
+      )
+    );
+  }, [data]);
+
+  const handleApplyChangesEvent = async (
+    event:
+      | React.FormEvent<HTMLFormElement>
+      | React.MouseEvent<HTMLButtonElement>
+  ) => {
+    event.preventDefault();
+    setIsSaving(true);
+    try {
+      await saveApmIndices({
+        callApmApi: callApmApiFromHook,
+        apmIndices
+      });
+      toasts.addSuccess({
+        title: i18n.translate(
+          'xpack.apm.settings.apmIndices.applyChanges.succeeded.title',
+          { defaultMessage: 'Indices applied' }
+        ),
+        text: i18n.translate(
+          'xpack.apm.settings.apmIndices.applyChanges.succeeded.text',
+          {
+            defaultMessage:
+              'The indices changes were successfully applied. These changes are reflected immediately in the APM UI'
+          }
+        )
+      });
+    } catch (error) {
+      toasts.addDanger({
+        title: i18n.translate(
+          'xpack.apm.settings.apmIndices.applyChanges.failed.title',
+          { defaultMessage: 'Indices could not be applied.' }
+        ),
+        text: i18n.translate(
+          'xpack.apm.settings.apmIndices.applyChanges.failed.text',
+          {
+            defaultMessage:
+              'Something went wrong when applying indices. Error: {errorMessage}',
+            values: { errorMessage: error.message }
+          }
+        )
+      });
+    }
+    setIsSaving(false);
+  };
+
+  const handleChangeIndexConfigurationEvent = async (
+    event: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    const { name, value } = event.target;
+    setApmIndices({
+      ...apmIndices,
+      [name]: value
+    });
+  };
+
+  return (
+    <EuiPanel>
+      <EuiFlexGroup alignItems="center">
+        <EuiFlexItem grow={false}>
+          <EuiTitle>
+            <h2>
+              {i18n.translate('xpack.apm.settings.apmIndices.title', {
+                defaultMessage: 'Indices'
+              })}
+            </h2>
+          </EuiTitle>
+          <EuiSpacer size="m" />
+          <EuiText size="s" grow={false}>
+            <p>
+              {i18n.translate('xpack.apm.settings.apmIndices.description', {
+                defaultMessage: `The APM UI uses index patterns to query your APM indices. If you've customized the index names that APM Server writes events to, you may need to update these patterns for the APM UI to work. Settings here take precedence over those set in kibana.yml.`
+              })}
+            </p>
+            <EuiForm>
+              {APM_INDEX_LABELS.map(({ configurationName, label }) => {
+                const matchedConfiguration = data.find(
+                  ({ configurationName: configName }) =>
+                    configName === configurationName
+                );
+                const defaultValue = matchedConfiguration
+                  ? matchedConfiguration.defaultValue
+                  : '';
+                const savedUiIndexValue = apmIndices[configurationName] || '';
+                return (
+                  <EuiFormRow
+                    key={configurationName}
+                    label={label}
+                    helpText={i18n.translate(
+                      'xpack.apm.settings.apmIndices.helpText',
+                      {
+                        defaultMessage:
+                          'Overrides {configurationName}: {defaultValue}',
+                        values: { configurationName, defaultValue }
+                      }
+                    )}
+                    fullWidth
+                  >
+                    <EuiFieldText
+                      fullWidth
+                      name={configurationName}
+                      placeholder={defaultValue}
+                      value={savedUiIndexValue}
+                      onChange={handleChangeIndexConfigurationEvent}
+                    />
+                  </EuiFormRow>
+                );
+              })}
+              <EuiSpacer />
+              <EuiFlexGroup justifyContent="flexEnd">
+                <EuiFlexItem grow={false}>
+                  <EuiButtonEmpty onClick={refetch}>
+                    {i18n.translate(
+                      'xpack.apm.settings.apmIndices.cancelButton',
+                      { defaultMessage: 'Cancel' }
+                    )}
+                  </EuiButtonEmpty>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    fill
+                    onClick={handleApplyChangesEvent}
+                    isLoading={isSaving}
+                    disabled={status !== 'success'}
+                  >
+                    {i18n.translate(
+                      'xpack.apm.settings.apmIndices.applyButton',
+                      { defaultMessage: 'Apply changes' }
+                    )}
+                  </EuiButton>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiForm>
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+
+      <EuiSpacer size="m" />
+    </EuiPanel>
+  );
+}
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
new file mode 100644
index 00000000000000..f3be5abe4d48ba
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/index.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiButtonEmpty,
+  EuiPage,
+  EuiSideNav,
+  EuiPageSideBar,
+  EuiPageBody
+} from '@elastic/eui';
+import { HomeLink } from '../../shared/Links/apm/HomeLink';
+import { useLocation } from '../../../hooks/useLocation';
+import { getAPMHref } from '../../shared/Links/apm/APMLink';
+
+export const Settings: React.FC = props => {
+  const { search, pathname } = useLocation();
+  return (
+    <>
+      <HomeLink>
+        <EuiButtonEmpty size="s" color="primary" iconType="arrowLeft">
+          {i18n.translate('xpack.apm.settings.returnToOverviewLinkLabel', {
+            defaultMessage: 'Return to overview'
+          })}
+        </EuiButtonEmpty>
+      </HomeLink>
+      <EuiPage>
+        <EuiPageSideBar>
+          <EuiSideNav
+            items={[
+              {
+                name: i18n.translate('xpack.apm.settings.pageTitle', {
+                  defaultMessage: 'Settings'
+                }),
+                id: 0,
+                items: [
+                  {
+                    name: 'Agent Configuration',
+                    id: '1',
+                    // @ts-ignore
+                    href: getAPMHref('/settings/agent-configuration', search),
+                    // @ts-ignore
+                    isSelected: pathname === '/settings/agent-configuration'
+                  },
+                  {
+                    name: 'Indices',
+                    id: '2',
+                    // @ts-ignore
+                    href: getAPMHref('/settings/apm-indices', search),
+                    // @ts-ignore
+                    isSelected: pathname === '/settings/apm-indices'
+                  }
+                ]
+              }
+            ]}
+          />
+        </EuiPageSideBar>
+        <EuiPageBody>{props.children}</EuiPageBody>
+      </EuiPage>
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx
index 4f14c4ba85932c..1ecf72f6fa3fc5 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx
@@ -49,7 +49,7 @@ export function TraceOverview() {
   return (
     <EuiFlexGroup>
       <EuiFlexItem grow={1}>
-        <LocalUIFilters {...localUIFiltersConfig}></LocalUIFilters>
+        <LocalUIFilters {...localUIFiltersConfig} />
       </EuiFlexItem>
       <EuiFlexItem grow={7}>
         <EuiPanel>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx
index 18e29c92d2e684..b01dc2c5398e2e 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/TruncateHeightSection.tsx
@@ -4,12 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiLink } from '@elastic/eui';
+import { EuiIcon, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment, useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
 import { px, units } from '../../../../../../../style/variables';
-import { Ellipsis } from '../../../../../../shared/Icons';
 
 const ToggleButtonContainer = styled.div`
   margin-top: ${px(units.half)};
@@ -55,7 +54,13 @@ export const TruncateHeightSection: React.SFC<Props> = ({
               setIsOpen(!isOpen);
             }}
           >
-            <Ellipsis horizontal={!isOpen} />{' '}
+            <EuiIcon
+              style={{
+                transition: 'transform 0.1s',
+                transform: `rotate(${isOpen ? 90 : 0}deg)`
+              }}
+              type="arrowRight"
+            />{' '}
             {isOpen
               ? i18n.translate('xpack.apm.toggleHeight.showLessButtonLabel', {
                   defaultMessage: 'Show fewer lines'
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx
index 7e9171197251d5..0f5893772fec8a 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/SpanFlyout/index.tsx
@@ -224,6 +224,7 @@ export function SpanFlyout({
                 ),
                 content: (
                   <Fragment>
+                    <EuiSpacer size="m" />
                     <SpanMetadata span={span} />
                   </Fragment>
                 )
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx
index db3e43574023c8..2020b8252035b7 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx
@@ -11,7 +11,8 @@ import {
   EuiFlyoutHeader,
   EuiPortal,
   EuiSpacer,
-  EuiTitle
+  EuiTitle,
+  EuiHorizontalRule
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
@@ -40,7 +41,6 @@ function TransactionPropertiesTable({
       <EuiTitle size="s">
         <h4>Metadata</h4>
       </EuiTitle>
-      <EuiSpacer />
       <TransactionMetadata transaction={transaction} />
     </div>
   );
@@ -87,7 +87,7 @@ export function TransactionFlyout({
             totalDuration={traceRootDuration}
             errorCount={errorCount}
           />
-          <EuiSpacer size="m" />
+          <EuiHorizontalRule margin="m" />
           <DroppedSpansWarning transactionDoc={transactionDoc} />
           <TransactionPropertiesTable transaction={transactionDoc} />
         </EuiFlyoutBody>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
index cc7697c1d89647..10f59e237ba7fd 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
@@ -17,7 +17,6 @@ import {
 } from 'lodash';
 import { idx } from '@kbn/elastic-idx';
 import { TraceAPIResponse } from '../../../../../../../../server/lib/traces/get_trace';
-import { StringMap } from '../../../../../../../../typings/common';
 import { Span } from '../../../../../../../../typings/es_schemas/ui/Span';
 import { Transaction } from '../../../../../../../../typings/es_schemas/ui/Transaction';
 
@@ -191,7 +190,7 @@ function getServices(items: IWaterfallItem[]) {
   return uniq(serviceNames);
 }
 
-export type IServiceColors = StringMap<string>;
+export type IServiceColors = Record<string, string>;
 
 function getServiceColors(services: string[]) {
   const assignedColors = [
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/__test__/DottedKeyValueTable.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/__test__/DottedKeyValueTable.test.tsx
deleted file mode 100644
index aebc86352a7745..00000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/__test__/DottedKeyValueTable.test.tsx
+++ /dev/null
@@ -1,134 +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 { DottedKeyValueTable } from '..';
-import { cleanup, render } from 'react-testing-library';
-
-function getKeys(output: ReturnType<typeof render>) {
-  const keys = output.getAllByTestId('dot-key');
-  return Array.isArray(keys) ? keys.map(node => node.textContent) : [];
-}
-
-function getValues(output: ReturnType<typeof render>) {
-  const values = output.getAllByTestId('value');
-  return Array.isArray(values) ? values.map(node => node.textContent) : [];
-}
-
-describe('DottedKeyValueTable', () => {
-  afterEach(cleanup);
-
-  it('should display a nested object with alpha-ordered, dot notation keys and values', () => {
-    const data = {
-      name: {
-        first: 'Jo',
-        last: 'Smith'
-      },
-      age: 29,
-      active: true,
-      useless: false,
-      start: null,
-      end: undefined,
-      nested: {
-        b: {
-          c: 'ccc'
-        },
-        a: 'aaa'
-      }
-    };
-    const output = render(<DottedKeyValueTable data={data} />);
-    const rows = output.container.querySelectorAll('tr');
-    expect(rows.length).toEqual(9);
-
-    expect(getKeys(output)).toEqual([
-      'active',
-      'age',
-      'end',
-      'name.first',
-      'name.last',
-      'nested.a',
-      'nested.b.c',
-      'start',
-      'useless'
-    ]);
-
-    expect(getValues(output)).toEqual([
-      'true',
-      '29',
-      'N/A',
-      'Jo',
-      'Smith',
-      'aaa',
-      'ccc',
-      'N/A',
-      'false'
-    ]);
-  });
-
-  it('should respect max depth', () => {
-    const data = {
-      nested: { b: { c: 'ccc' }, a: 'aaa' }
-    };
-    const output = render(<DottedKeyValueTable data={data} maxDepth={1} />);
-    const rows = output.container.querySelectorAll('tr');
-    expect(rows.length).toEqual(2);
-
-    expect(getKeys(output)).toEqual(['nested.a', 'nested.b']);
-
-    expect(getValues(output)).toEqual([
-      'aaa',
-      JSON.stringify({ c: 'ccc' }, null, 4)
-    ]);
-  });
-
-  it('should prepend a provided parent key to all of the dot-notation keys', () => {
-    const data = {
-      name: {
-        first: 'Jo',
-        last: 'Smith'
-      },
-      age: 29,
-      active: true
-    };
-    const output = render(<DottedKeyValueTable data={data} parentKey="top" />);
-    const rows = output.container.querySelectorAll('tr');
-    expect(rows.length).toEqual(4);
-
-    expect(getKeys(output)).toEqual([
-      'top.active',
-      'top.age',
-      'top.name.first',
-      'top.name.last'
-    ]);
-  });
-
-  it('should not add 0 sufix if value is an array with one element', () => {
-    const data = {
-      a: {
-        b: {
-          c1: ['foo', 'bar'],
-          c2: ['foo']
-        }
-      },
-      b: {
-        c: ['foo']
-      },
-      c: {
-        d: ['foo', 'bar']
-      }
-    };
-    const output = render(<DottedKeyValueTable data={data} maxDepth={5} />);
-
-    expect(getKeys(output)).toEqual([
-      'a.b.c1.0',
-      'a.b.c1.1',
-      'a.b.c2',
-      'b.c',
-      'c.d.0',
-      'c.d.1'
-    ]);
-  });
-});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/index.tsx
deleted file mode 100644
index 674df14c62eb0b..00000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/index.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { TableHTMLAttributes } from 'react';
-import { compact, isObject } from 'lodash';
-import {
-  EuiTable,
-  EuiTableProps,
-  EuiTableBody,
-  EuiTableRow,
-  EuiTableRowCell
-} from '@elastic/eui';
-import { StringMap } from '../../../../typings/common';
-import { FormattedValue } from './FormattedValue';
-
-interface PathifyOptions {
-  maxDepth?: number;
-  parentKey?: string;
-  depth?: number;
-}
-
-interface PathifyResult {
-  [key: string]: any;
-}
-
-/**
- * Converts a deeply-nested object into a one-level object
- * with dot-notation paths as keys.
- */
-export function pathify(
-  item: StringMap<any>,
-  { maxDepth, parentKey = '', depth = 0 }: PathifyOptions
-): PathifyResult {
-  const isArrayWithSingleValue = Array.isArray(item) && item.length === 1;
-  return Object.keys(item)
-    .sort()
-    .reduce((pathified, key) => {
-      const childKey = isArrayWithSingleValue ? '' : key;
-      const currentKey = compact([parentKey, childKey]).join('.');
-      if ((!maxDepth || depth + 1 <= maxDepth) && isObject(item[key])) {
-        return {
-          ...pathified,
-          ...pathify(item[key], {
-            maxDepth,
-            parentKey: currentKey,
-            depth: depth + 1
-          })
-        };
-      } else {
-        return { ...pathified, [currentKey]: item[key] };
-      }
-    }, {});
-}
-
-export function DottedKeyValueTable({
-  data,
-  parentKey,
-  maxDepth,
-  tableProps = {}
-}: {
-  data: StringMap;
-  parentKey?: string;
-  maxDepth?: number;
-  tableProps?: EuiTableProps & TableHTMLAttributes<HTMLTableElement>;
-}) {
-  const pathified = pathify(data, { maxDepth, parentKey });
-  const rows = Object.keys(pathified)
-    .sort()
-    .map(k => [k, pathified[k]]);
-  return (
-    <EuiTable compressed {...tableProps}>
-      <EuiTableBody>
-        {rows.map(([key, value]) => (
-          <EuiTableRow key={key}>
-            <EuiTableRowCell>
-              <strong data-testid="dot-key">{key}</strong>
-            </EuiTableRowCell>
-            <EuiTableRowCell data-testid="value">
-              <FormattedValue value={value} />
-            </EuiTableRowCell>
-          </EuiTableRow>
-        ))}
-      </EuiTableBody>
-    </EuiTable>
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/HeightRetainer/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/HeightRetainer/index.tsx
new file mode 100644
index 00000000000000..e6f4487312429f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/HeightRetainer/index.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect, useRef } from 'react';
+
+export const HeightRetainer: React.SFC = props => {
+  const containerElement = useRef<HTMLDivElement>(null);
+  const minHeight = useRef<number>(0);
+
+  useEffect(() => {
+    if (containerElement.current) {
+      const currentHeight = containerElement.current.clientHeight;
+      if (minHeight.current < currentHeight) {
+        minHeight.current = currentHeight;
+      }
+    }
+  });
+
+  return (
+    <div
+      {...props}
+      ref={containerElement}
+      style={{ minHeight: minHeight.current }}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Icons.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Icons.tsx
deleted file mode 100644
index 79b34b2818aace..00000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/Icons.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiIcon } from '@elastic/eui';
-import React from 'react';
-
-export function Ellipsis({ horizontal }: { horizontal: boolean }) {
-  return (
-    <EuiIcon
-      style={{
-        transition: 'transform 0.1s',
-        transform: `rotate(${horizontal ? 90 : 0}deg)`
-      }}
-      type="arrowRight"
-    />
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx
index 7f9d3c9f9f3b37..ed931191cfb963 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/ImpactBar/index.tsx
@@ -6,10 +6,9 @@
 
 import { EuiProgress } from '@elastic/eui';
 import React from 'react';
-import { StringMap } from '../../../../typings/common';
 
 // TODO: extend from EUI's EuiProgress prop interface
-export interface ImpactBarProps extends StringMap {
+export interface ImpactBarProps extends Record<string, unknown> {
   value: number;
   max?: number;
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/FormattedValue.tsx b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/FormattedValue.tsx
similarity index 100%
rename from x-pack/legacy/plugins/apm/public/components/shared/DottedKeyValueTable/FormattedValue.tsx
rename to x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/FormattedValue.tsx
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/__test__/KeyValueTable.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/__test__/KeyValueTable.test.tsx
new file mode 100644
index 00000000000000..2ce8feb08d4adb
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/__test__/KeyValueTable.test.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { KeyValueTable } from '..';
+import { cleanup, render } from 'react-testing-library';
+
+function getKeys(output: ReturnType<typeof render>) {
+  const keys = output.getAllByTestId('dot-key');
+  return Array.isArray(keys) ? keys.map(node => node.textContent) : [];
+}
+
+function getValues(output: ReturnType<typeof render>) {
+  const values = output.getAllByTestId('value');
+  return Array.isArray(values) ? values.map(node => node.textContent) : [];
+}
+
+describe('KeyValueTable', () => {
+  afterEach(cleanup);
+
+  it('displays key and value table', () => {
+    const data = [
+      { key: 'name.first', value: 'First Name' },
+      { key: 'name.last', value: 'Last Name' },
+      { key: 'age', value: '29' },
+      { key: 'active', value: true },
+      { key: 'useless', value: false },
+      { key: 'start', value: null },
+      { key: 'end', value: undefined },
+      { key: 'nested.b.c', value: 'ccc' },
+      { key: 'nested.a', value: 'aaa' }
+    ];
+    const output = render(<KeyValueTable keyValuePairs={data} />);
+    const rows = output.container.querySelectorAll('tr');
+    expect(rows.length).toEqual(9);
+
+    expect(getKeys(output)).toEqual([
+      'name.first',
+      'name.last',
+      'age',
+      'active',
+      'useless',
+      'start',
+      'end',
+      'nested.b.c',
+      'nested.a'
+    ]);
+
+    expect(getValues(output)).toEqual([
+      'First Name',
+      'Last Name',
+      '29',
+      'true',
+      'false',
+      'N/A',
+      'N/A',
+      'ccc',
+      'aaa'
+    ]);
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/index.tsx
new file mode 100644
index 00000000000000..b58f142f1abaad
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/KeyValueTable/index.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { TableHTMLAttributes } from 'react';
+import {
+  EuiTable,
+  EuiTableProps,
+  EuiTableBody,
+  EuiTableRow,
+  EuiTableRowCell
+} from '@elastic/eui';
+import { FormattedValue } from './FormattedValue';
+import { KeyValuePair } from '../../../utils/flattenObject';
+
+export function KeyValueTable({
+  keyValuePairs,
+  tableProps = {}
+}: {
+  keyValuePairs: KeyValuePair[];
+  tableProps?: EuiTableProps & TableHTMLAttributes<HTMLTableElement>;
+}) {
+  return (
+    <EuiTable compressed {...tableProps}>
+      <EuiTableBody>
+        {keyValuePairs.map(({ key, value }) => (
+          <EuiTableRow key={key}>
+            <EuiTableRowCell>
+              <strong data-testid="dot-key">{key}</strong>
+            </EuiTableRowCell>
+            <EuiTableRowCell data-testid="value">
+              <FormattedValue value={value} />
+            </EuiTableRowCell>
+          </EuiTableRow>
+        ))}
+      </EuiTableBody>
+    </EuiTable>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js
index fc08dee8b93cbb..7a7dfe8b50e3ed 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js
@@ -9,7 +9,6 @@ import PropTypes from 'prop-types';
 import Suggestions from './Suggestions';
 import ClickOutside from './ClickOutside';
 import { EuiFieldSearch, EuiProgress } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 
 const KEY_CODES = {
   LEFT: 37,
@@ -157,7 +156,7 @@ export class Typeahead extends Component {
   };
 
   render() {
-    const { queryExample } = this.props;
+    const { placeholder } = this.props;
 
     return (
       <ClickOutside
@@ -170,16 +169,7 @@ export class Typeahead extends Component {
             style={{
               backgroundImage: 'none'
             }}
-            placeholder={i18n.translate(
-              'xpack.apm.kueryBar.searchPlaceholder',
-              {
-                defaultMessage:
-                  'Search transactions, errors and metrics… (E.g. {queryExample})',
-                values: {
-                  queryExample
-                }
-              }
-            )}
+            placeholder={placeholder}
             inputRef={node => {
               if (node) {
                 this.inputRef = node;
@@ -227,7 +217,7 @@ Typeahead.propTypes = {
   onChange: PropTypes.func.isRequired,
   onSubmit: PropTypes.func.isRequired,
   suggestions: PropTypes.array.isRequired,
-  queryExample: PropTypes.string.isRequired
+  placeholder: PropTypes.string.isRequired
 };
 
 Typeahead.defaultProps = {
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.js b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.js
deleted file mode 100644
index 48a94a96acd3c9..00000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  TRANSACTION_TYPE,
-  ERROR_GROUP_ID,
-  PROCESSOR_EVENT,
-  TRANSACTION_NAME,
-  SERVICE_NAME
-} from '../../../../common/elasticsearch_fieldnames';
-
-export function getBoolFilter(urlParams) {
-  const boolFilter = [
-    {
-      range: {
-        '@timestamp': {
-          gte: new Date(urlParams.start).getTime(),
-          lte: new Date(urlParams.end).getTime(),
-          format: 'epoch_millis'
-        }
-      }
-    }
-  ];
-
-  if (urlParams.serviceName) {
-    boolFilter.push({
-      term: { [SERVICE_NAME]: urlParams.serviceName }
-    });
-  }
-
-  switch (urlParams.processorEvent) {
-    case 'transaction':
-      boolFilter.push({
-        term: { [PROCESSOR_EVENT]: 'transaction' }
-      });
-
-      if (urlParams.transactionName) {
-        boolFilter.push({
-          term: { [TRANSACTION_NAME]: urlParams.transactionName }
-        });
-      }
-
-      if (urlParams.transactionType) {
-        boolFilter.push({
-          term: { [TRANSACTION_TYPE]: urlParams.transactionType }
-        });
-      }
-      break;
-
-    case 'error':
-      boolFilter.push({
-        term: { [PROCESSOR_EVENT]: 'error' }
-      });
-
-      if (urlParams.errorGroupId) {
-        boolFilter.push({
-          term: { [ERROR_GROUP_ID]: urlParams.errorGroupId }
-        });
-      }
-      break;
-
-    default:
-      boolFilter.push({
-        bool: {
-          should: [
-            { term: { [PROCESSOR_EVENT]: 'error' } },
-            { term: { [PROCESSOR_EVENT]: 'transaction' } }
-          ]
-        }
-      });
-  }
-
-  return boolFilter;
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts
new file mode 100644
index 00000000000000..f4628524cced58
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ESFilter } from '../../../../typings/elasticsearch';
+import {
+  TRANSACTION_TYPE,
+  ERROR_GROUP_ID,
+  PROCESSOR_EVENT,
+  TRANSACTION_NAME,
+  SERVICE_NAME
+} from '../../../../common/elasticsearch_fieldnames';
+import { IUrlParams } from '../../../context/UrlParamsContext/types';
+
+export function getBoolFilter(urlParams: IUrlParams) {
+  const { start, end, serviceName, processorEvent } = urlParams;
+
+  if (!start || !end) {
+    throw new Error('Date range was not defined');
+  }
+
+  const boolFilter: ESFilter[] = [
+    {
+      range: {
+        '@timestamp': {
+          gte: new Date(start).getTime(),
+          lte: new Date(end).getTime(),
+          format: 'epoch_millis'
+        }
+      }
+    }
+  ];
+
+  if (serviceName) {
+    boolFilter.push({
+      term: { [SERVICE_NAME]: serviceName }
+    });
+  }
+
+  switch (processorEvent) {
+    case 'transaction':
+      boolFilter.push({
+        term: { [PROCESSOR_EVENT]: 'transaction' }
+      });
+
+      if (urlParams.transactionName) {
+        boolFilter.push({
+          term: { [TRANSACTION_NAME]: urlParams.transactionName }
+        });
+      }
+
+      if (urlParams.transactionType) {
+        boolFilter.push({
+          term: { [TRANSACTION_TYPE]: urlParams.transactionType }
+        });
+      }
+      break;
+
+    case 'error':
+      boolFilter.push({
+        term: { [PROCESSOR_EVENT]: 'error' }
+      });
+
+      if (urlParams.errorGroupId) {
+        boolFilter.push({
+          term: { [ERROR_GROUP_ID]: urlParams.errorGroupId }
+        });
+      }
+      break;
+
+    case 'metric':
+      boolFilter.push({
+        term: { [PROCESSOR_EVENT]: 'metric' }
+      });
+      break;
+
+    default:
+      boolFilter.push({
+        bool: {
+          should: [
+            { term: { [PROCESSOR_EVENT]: 'error' } },
+            { term: { [PROCESSOR_EVENT]: 'transaction' } },
+            { term: { [PROCESSOR_EVENT]: 'metric' } }
+          ]
+        }
+      });
+  }
+
+  return boolFilter;
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx
index 0e95bb94ea911f..7c0b6f24f87a7b 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx
@@ -6,29 +6,20 @@
 
 import React, { useState } from 'react';
 import { uniqueId, startsWith } from 'lodash';
-import { EuiCallOut } from '@elastic/eui';
 import styled from 'styled-components';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
 import { npStart } from 'ui/new_platform';
-import { StaticIndexPattern, getFromSavedObject } from 'ui/index_patterns';
+import { StaticIndexPattern } from 'ui/index_patterns';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
+import { i18n } from '@kbn/i18n';
 import { fromQuery, toQuery } from '../Links/url_helpers';
-import { KibanaLink } from '../Links/KibanaLink';
 // @ts-ignore
 import { Typeahead } from './Typeahead';
-// @ts-ignore
 import { getBoolFilter } from './get_bool_filter';
 import { useLocation } from '../../../hooks/useLocation';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { history } from '../../../utils/history';
-import { useMatchedRoutes } from '../../../hooks/useMatchedRoutes';
-import { RouteName } from '../../app/Main/route_config/route_names';
-import { useKibanaCore } from '../../../../../observability/public';
-import { ISavedObject } from '../../../services/rest/savedObjects';
 import { AutocompleteSuggestion } from '../../../../../../../../src/plugins/data/public';
-import { FETCH_STATUS } from '../../../hooks/useFetcher';
-import { useAPMIndexPattern } from '../../../hooks/useAPMIndexPattern';
+import { useKueryBarIndexPattern } from '../../../hooks/useKueryBarIndexPattern';
 
 const Container = styled.div`
   margin-bottom: 10px;
@@ -50,16 +41,10 @@ function convertKueryToEsQuery(
   return toElasticsearchQuery(ast, indexPattern);
 }
 
-function getAPMIndexPatternForKuery(
-  apmIndexPattern: ISavedObject
-): StaticIndexPattern | undefined {
-  return getFromSavedObject(apmIndexPattern);
-}
-
 function getSuggestions(
   query: string,
   selectionStart: number,
-  apmIndexPattern: StaticIndexPattern,
+  indexPattern: StaticIndexPattern,
   boolFilter: unknown
 ) {
   const autocompleteProvider = getAutocompleteProvider('kuery');
@@ -72,7 +57,7 @@ function getSuggestions(
 
   const getAutocompleteSuggestions = autocompleteProvider({
     config,
-    indexPatterns: [apmIndexPattern],
+    indexPatterns: [indexPattern],
     boolFilter
   });
   return getAutocompleteSuggestions({
@@ -83,43 +68,28 @@ function getSuggestions(
 }
 
 export function KueryBar() {
-  const core = useKibanaCore();
   const [state, setState] = useState<State>({
     suggestions: [],
     isLoadingSuggestions: false
   });
   const { urlParams } = useUrlParams();
   const location = useLocation();
-  const matchedRoutes = useMatchedRoutes();
-
-  const apmIndexPatternTitle = core.injectedMetadata.getInjectedVar(
-    'apmIndexPatternTitle'
-  );
-
-  const {
-    apmIndexPattern,
-    status: apmIndexPatternStatus
-  } = useAPMIndexPattern();
-
-  const indexPattern =
-    apmIndexPatternStatus === FETCH_STATUS.SUCCESS
-      ? getAPMIndexPatternForKuery(apmIndexPattern)
-      : null;
-
-  const indexPatternMissing = status === FETCH_STATUS.SUCCESS && !indexPattern;
 
   let currentRequestCheck;
 
-  const exampleMap: { [key: string]: string } = {
-    [RouteName.TRANSACTIONS]: 'transaction.duration.us > 300000',
-    [RouteName.ERRORS]: 'http.response.status_code >= 400',
-    [RouteName.METRICS]: 'process.pid = "1234"'
+  const { processorEvent } = urlParams;
+
+  const examples = {
+    transaction: 'transaction.duration.us > 300000',
+    error: 'http.response.status_code >= 400',
+    metric: 'process.pid = "1234"',
+    defaults:
+      'transaction.duration.us > 300000 AND http.response.status_code >= 400'
   };
 
-  // sets queryExample to the first matched example query, else default example
-  const queryExample =
-    matchedRoutes.map(({ name }) => exampleMap[name]).find(Boolean) ||
-    'transaction.duration.us > 300000 AND http.response.status_code >= 400';
+  const example = examples[processorEvent || 'defaults'];
+
+  const { indexPattern } = useKueryBarIndexPattern(processorEvent);
 
   async function onChange(inputValue: string, selectionStart: number) {
     if (indexPattern == null) {
@@ -179,42 +149,24 @@ export function KueryBar() {
   return (
     <Container>
       <Typeahead
-        disabled={indexPatternMissing}
         isLoading={state.isLoadingSuggestions}
         initialValue={urlParams.kuery}
         onChange={onChange}
         onSubmit={onSubmit}
         suggestions={state.suggestions}
-        queryExample={queryExample}
-      />
-
-      {indexPatternMissing && (
-        <EuiCallOut
-          style={{ display: 'inline-block', marginTop: '10px' }}
-          title={
-            <div>
-              <FormattedMessage
-                id="xpack.apm.kueryBar.indexPatternMissingWarningMessage"
-                defaultMessage="There's no APM index pattern with the title {apmIndexPatternTitle} available. To use the Query bar, please choose to import the APM index pattern via the {setupInstructionsLink}."
-                values={{
-                  apmIndexPatternTitle: `"${apmIndexPatternTitle}"`,
-                  setupInstructionsLink: (
-                    <KibanaLink path={`/home/tutorial/apm`}>
-                      {i18n.translate(
-                        'xpack.apm.kueryBar.setupInstructionsLinkLabel',
-                        { defaultMessage: 'Setup Instructions' }
-                      )}
-                    </KibanaLink>
-                  )
-                }}
-              />
-            </div>
+        placeholder={i18n.translate('xpack.apm.kueryBar.placeholder', {
+          defaultMessage: `Search {event, select,
+            transaction {transactions}
+            metric {metrics}
+            error {errors}
+            other {transactions, errors and metrics}
+          } (E.g. {queryExample})`,
+          values: {
+            queryExample: example,
+            event: processorEvent
           }
-          color="warning"
-          iconType="alert"
-          size="s"
-        />
-      )}
+        })}
+      />
     </Container>
   );
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts b/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts
index 763ee93df64156..357ea23d522a01 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts
@@ -6,13 +6,12 @@
 
 import qs from 'querystring';
 import { LocalUIFilterName } from '../../../../server/lib/ui_filters/local_ui_filters/config';
-import { StringMap } from '../../../../typings/common';
 
 export function toQuery(search?: string): APMQueryParamsRaw {
   return search ? qs.parse(search.slice(1)) : {};
 }
 
-export function fromQuery(query: StringMap<any>) {
+export function fromQuery(query: Record<string, any>) {
   return qs.stringify(query, undefined, undefined, {
     encodeURIComponent: (value: string) => {
       return encodeURIComponent(value).replace(/%3A/g, ':');
@@ -39,6 +38,7 @@ export type APMQueryParams = {
   rangeTo?: string;
   refreshPaused?: string | boolean;
   refreshInterval?: string | number;
+  searchTerm?: string;
 } & { [key in LocalUIFilterName]?: string };
 
 // forces every value of T[K] to be type: string
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx b/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx
index a1140dcbbb3fcf..01d2d56b6d142e 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx
@@ -32,7 +32,7 @@ const FilterBadgeList = ({ onRemove, value }: Props) => (
         >
           <EuiBadge color="hollow">
             <BadgeText>{val}</BadgeText>
-            <EuiIcon type="cross"></EuiIcon>
+            <EuiIcon type="cross" />
           </EuiBadge>
         </button>
       </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx
index aef8e5747d992c..412b92d525aa2e 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx
@@ -168,7 +168,7 @@ const Filter = ({
             }}
             value={value}
           />
-          <EuiSpacer size="s"></EuiSpacer>
+          <EuiSpacer size="s" />
         </>
       ) : null}
     </>
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx
index 0f5fcceea3d200..29a8528295dd78 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/ManagedTable/index.tsx
@@ -8,7 +8,6 @@ import { EuiBasicTable } from '@elastic/eui';
 import { sortByOrder } from 'lodash';
 import React, { useMemo, useCallback, ReactNode } from 'react';
 import { idx } from '@kbn/elastic-idx';
-import { StringMap } from '../../../../typings/common';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { history } from '../../../utils/history';
 import { fromQuery, toQuery } from '../Links/url_helpers';
@@ -16,7 +15,7 @@ import { fromQuery, toQuery } from '../Links/url_helpers';
 // TODO: this should really be imported from EUI
 export interface ITableColumn<T> {
   name: ReactNode;
-  actions?: StringMap[];
+  actions?: Array<Record<string, unknown>>;
   field?: string;
   dataType?: string;
   align?: string;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/index.tsx
index 652bb25afed8ea..04a5b604677304 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/index.tsx
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import { ERROR_METADATA_SECTIONS } from './sections';
 import { APMError } from '../../../../../typings/es_schemas/ui/APMError';
+import { getSectionsWithRows } from '../helper';
 import { MetadataTable } from '..';
 
 interface Props {
@@ -14,5 +15,9 @@ interface Props {
 }
 
 export function ErrorMetadata({ error }: Props) {
-  return <MetadataTable item={error} sections={ERROR_METADATA_SECTIONS} />;
+  const sectionsWithRows = useMemo(
+    () => getSectionsWithRows(ERROR_METADATA_SECTIONS, error),
+    [error]
+  );
+  return <MetadataTable sections={sectionsWithRows} />;
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/sections.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/sections.ts
index 526bb4e5bcf71c..1eeebc8543d72f 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/sections.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/ErrorMetadata/sections.ts
@@ -20,8 +20,8 @@ import {
 } from '../sections';
 
 export const ERROR_METADATA_SECTIONS: Section[] = [
-  ERROR,
   { ...LABELS, required: true },
+  ERROR,
   HTTP,
   HOST,
   CONTAINER,
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/Section.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/Section.tsx
new file mode 100644
index 00000000000000..6f67b2458ea102
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/Section.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiText } from '@elastic/eui';
+import { KeyValueTable } from '../KeyValueTable';
+import { KeyValuePair } from '../../../utils/flattenObject';
+
+interface Props {
+  keyValuePairs?: KeyValuePair[];
+}
+
+export function Section({ keyValuePairs }: Props) {
+  if (keyValuePairs) {
+    return <KeyValueTable keyValuePairs={keyValuePairs} />;
+  }
+  return (
+    <EuiText size="s">
+      {i18n.translate(
+        'xpack.apm.propertiesTable.agentFeature.noDataAvailableLabel',
+        { defaultMessage: 'No data available' }
+      )}
+    </EuiText>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/index.tsx
index 713863639d1b7d..03182062d324ac 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/index.tsx
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import { SPAN_METADATA_SECTIONS } from './sections';
 import { Span } from '../../../../../typings/es_schemas/ui/Span';
+import { getSectionsWithRows } from '../helper';
 import { MetadataTable } from '..';
 
 interface Props {
@@ -14,5 +15,9 @@ interface Props {
 }
 
 export function SpanMetadata({ span }: Props) {
-  return <MetadataTable item={span} sections={SPAN_METADATA_SECTIONS} />;
+  const sectionsWithRows = useMemo(
+    () => getSectionsWithRows(SPAN_METADATA_SECTIONS, span),
+    [span]
+  );
+  return <MetadataTable sections={sectionsWithRows} />;
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/sections.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/sections.ts
index 01e56bdb09f19a..7012bbcc8fceaf 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/sections.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/sections.ts
@@ -15,10 +15,10 @@ import {
 } from '../sections';
 
 export const SPAN_METADATA_SECTIONS: Section[] = [
+  LABELS,
   SPAN,
-  AGENT,
-  SERVICE,
   TRANSACTION,
-  LABELS,
-  TRACE
+  TRACE,
+  SERVICE,
+  AGENT
 ];
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/index.tsx
index fa2b32b403ee79..4216e37e0cb27e 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/index.tsx
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import { TRANSACTION_METADATA_SECTIONS } from './sections';
 import { Transaction } from '../../../../../typings/es_schemas/ui/Transaction';
+import { getSectionsWithRows } from '../helper';
 import { MetadataTable } from '..';
 
 interface Props {
@@ -14,10 +15,9 @@ interface Props {
 }
 
 export function TransactionMetadata({ transaction }: Props) {
-  return (
-    <MetadataTable
-      item={transaction}
-      sections={TRANSACTION_METADATA_SECTIONS}
-    />
+  const sectionsWithRows = useMemo(
+    () => getSectionsWithRows(TRANSACTION_METADATA_SECTIONS, transaction),
+    [transaction]
   );
+  return <MetadataTable sections={sectionsWithRows} />;
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/sections.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/sections.ts
index 04a0d64077c156..6b30c82bc35a06 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/sections.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/sections.ts
@@ -22,8 +22,8 @@ import {
 } from '../sections';
 
 export const TRANSACTION_METADATA_SECTIONS: Section[] = [
-  TRANSACTION,
   { ...LABELS, required: true },
+  TRANSACTION,
   HTTP,
   HOST,
   CONTAINER,
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx
index 331a8bf41642ec..bdf895f423913e 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/MetadataTable.test.tsx
@@ -8,77 +8,44 @@ import React from 'react';
 import 'jest-dom/extend-expect';
 import { render, cleanup } from 'react-testing-library';
 import { MetadataTable } from '..';
-import {
-  expectTextsInDocument,
-  expectTextsNotInDocument
-} from '../../../../utils/testHelpers';
-import { Transaction } from '../../../../../typings/es_schemas/ui/Transaction';
+import { expectTextsInDocument } from '../../../../utils/testHelpers';
+import { SectionsWithRows } from '../helper';
 
 describe('MetadataTable', () => {
   afterEach(cleanup);
+  it('shows sections', () => {
+    const sectionsWithRows = ([
+      { key: 'foo', label: 'Foo', required: true },
+      {
+        key: 'bar',
+        label: 'Bar',
+        required: false,
+        properties: ['props.A', 'props.B'],
+        rows: [{ key: 'props.A', value: 'A' }, { key: 'props.B', value: 'B' }]
+      }
+    ] as unknown) as SectionsWithRows;
+    const output = render(<MetadataTable sections={sectionsWithRows} />);
+    expectTextsInDocument(output, [
+      'Foo',
+      'No data available',
+      'Bar',
+      'props.A',
+      'A',
+      'props.B',
+      'B'
+    ]);
+  });
   describe('required sections', () => {
     it('shows "empty state message" if no data is available', () => {
-      const sections = [
+      const sectionsWithRows = ([
         {
           key: 'foo',
           label: 'Foo',
           required: true
         }
-      ];
-      const output = render(
-        <MetadataTable item={{} as Transaction} sections={sections} />
-      );
+      ] as unknown) as SectionsWithRows;
+      const output = render(<MetadataTable sections={sectionsWithRows} />);
       expectTextsInDocument(output, ['Foo', 'No data available']);
     });
-    it('shows "empty state message" if property is not available', () => {
-      const sections = [
-        {
-          key: 'foo',
-          label: 'Foo',
-          required: true,
-          properties: ['bar']
-        }
-      ];
-      const item = ({
-        foo: {
-          foobar: 'bar'
-        }
-      } as unknown) as Transaction;
-
-      const output = render(<MetadataTable item={item} sections={sections} />);
-      expectTextsInDocument(output, ['Foo', 'No data available']);
-    });
-  });
-  describe('not required sections', () => {
-    it('does not show section when no items are provided', () => {
-      const sections = [
-        {
-          key: 'foo',
-          label: 'Foo',
-          required: false
-        }
-      ];
-      const output = render(
-        <MetadataTable item={{} as Transaction} sections={sections} />
-      );
-      expectTextsNotInDocument(output, ['Foo']);
-    });
-    it('does not show section if property is not available', () => {
-      const sections = [
-        {
-          key: 'foo',
-          label: 'Foo',
-          required: false,
-          properties: ['bar']
-        }
-      ];
-      const item = ({
-        foo: {
-          foobar: 'bar'
-        }
-      } as unknown) as Transaction;
-      const output = render(<MetadataTable item={item} sections={sections} />);
-      expectTextsNotInDocument(output, ['Foo']);
-    });
   });
 });
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/Section.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/Section.test.tsx
new file mode 100644
index 00000000000000..7e68b2f84eeadf
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/Section.test.tsx
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import 'jest-dom/extend-expect';
+import { render } from 'react-testing-library';
+import { Section } from '../Section';
+import { expectTextsInDocument } from '../../../../utils/testHelpers';
+
+describe('Section', () => {
+  it('shows "empty state message" if no data is available', () => {
+    const output = render(<Section />);
+    expectTextsInDocument(output, ['No data available']);
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/helper.test.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/helper.test.ts
new file mode 100644
index 00000000000000..aaf73619e481a4
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/__test__/helper.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 { getSectionsWithRows, filterSectionsByTerm } from '../helper';
+import { LABELS, HTTP, SERVICE } from '../sections';
+import { Transaction } from '../../../../../typings/es_schemas/ui/Transaction';
+
+describe('MetadataTable Helper', () => {
+  const sections = [
+    { ...LABELS, required: true },
+    HTTP,
+    { ...SERVICE, properties: ['environment'] }
+  ];
+  const apmDoc = ({
+    http: {
+      headers: {
+        Connection: 'close',
+        Host: 'opbeans:3000',
+        request: { method: 'get' }
+      }
+    },
+    service: {
+      framework: { name: 'express' },
+      environment: 'production'
+    }
+  } as unknown) as Transaction;
+  const metadataItems = getSectionsWithRows(sections, apmDoc);
+
+  it('returns flattened data and required section', () => {
+    expect(metadataItems).toEqual([
+      { key: 'labels', label: 'Labels', required: true, rows: [] },
+      {
+        key: 'http',
+        label: 'HTTP',
+        rows: [
+          { key: 'http.headers.Connection', value: 'close' },
+          { key: 'http.headers.Host', value: 'opbeans:3000' },
+          { key: 'http.headers.request.method', value: 'get' }
+        ]
+      },
+      {
+        key: 'service',
+        label: 'Service',
+        properties: ['environment'],
+        rows: [{ key: 'service.environment', value: 'production' }]
+      }
+    ]);
+  });
+  describe('filter', () => {
+    it('items by key', () => {
+      const filteredItems = filterSectionsByTerm(metadataItems, 'http');
+      expect(filteredItems).toEqual([
+        {
+          key: 'http',
+          label: 'HTTP',
+          rows: [
+            { key: 'http.headers.Connection', value: 'close' },
+            { key: 'http.headers.Host', value: 'opbeans:3000' },
+            { key: 'http.headers.request.method', value: 'get' }
+          ]
+        }
+      ]);
+    });
+
+    it('items by value', () => {
+      const filteredItems = filterSectionsByTerm(metadataItems, 'product');
+      expect(filteredItems).toEqual([
+        {
+          key: 'service',
+          label: 'Service',
+          properties: ['environment'],
+          rows: [{ key: 'service.environment', value: 'production' }]
+        }
+      ]);
+    });
+
+    it('returns empty when no item matches', () => {
+      const filteredItems = filterSectionsByTerm(metadataItems, 'post');
+      expect(filteredItems).toEqual([]);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/helper.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/helper.ts
new file mode 100644
index 00000000000000..c272790826d8dd
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/helper.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { get, pick, isEmpty } from 'lodash';
+import { Section } from './sections';
+import { Transaction } from '../../../../typings/es_schemas/ui/Transaction';
+import { APMError } from '../../../../typings/es_schemas/ui/APMError';
+import { Span } from '../../../../typings/es_schemas/ui/Span';
+import { flattenObject, KeyValuePair } from '../../../utils/flattenObject';
+
+export type SectionsWithRows = ReturnType<typeof getSectionsWithRows>;
+
+export const getSectionsWithRows = (
+  sections: Section[],
+  apmDoc: Transaction | APMError | Span
+) => {
+  return sections
+    .map(section => {
+      const sectionData: Record<string, unknown> = get(apmDoc, section.key);
+      const filteredData:
+        | Record<string, unknown>
+        | undefined = section.properties
+        ? pick(sectionData, section.properties)
+        : sectionData;
+
+      const rows: KeyValuePair[] = flattenObject(filteredData, section.key);
+      return { ...section, rows };
+    })
+    .filter(({ required, rows }) => required || !isEmpty(rows));
+};
+
+export const filterSectionsByTerm = (
+  sections: SectionsWithRows,
+  searchTerm: string
+) => {
+  if (!searchTerm) {
+    return sections;
+  }
+  return sections
+    .map(section => {
+      const { rows = [] } = section;
+      const filteredRows = rows.filter(({ key, value }) => {
+        const valueAsString = String(value).toLowerCase();
+        return (
+          key.toLowerCase().includes(searchTerm) ||
+          valueAsString.includes(searchTerm)
+        );
+      });
+      return { ...section, rows: filteredRows };
+    })
+    .filter(({ rows }) => !isEmpty(rows));
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/index.tsx
index d7f3bf5504d405..53d54ae5de7ad1 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/index.tsx
@@ -9,42 +9,50 @@ import {
   EuiFlexItem,
   EuiIcon,
   EuiSpacer,
-  EuiTitle
+  EuiTitle,
+  EuiFieldSearch
 } from '@elastic/eui';
-import React from 'react';
-import { get, pick, isEmpty } from 'lodash';
-import { EuiText } from '@elastic/eui';
+import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
-import { DottedKeyValueTable } from '../DottedKeyValueTable';
+import { isEmpty } from 'lodash';
+import { EuiText } from '@elastic/eui';
 import { ElasticDocsLink } from '../../shared/Links/ElasticDocsLink';
-import { Section as SectionType } from './sections';
-import { Transaction } from '../../../../typings/es_schemas/ui/Transaction';
-import { APMError } from '../../../../typings/es_schemas/ui/APMError';
-import { Span } from '../../../../typings/es_schemas/ui/Span';
-
-type Item = Transaction | APMError | Span;
+import { HeightRetainer } from '../HeightRetainer';
+import { Section } from './Section';
+import { history } from '../../../utils/history';
+import { fromQuery, toQuery } from '../Links/url_helpers';
+import { useLocation } from '../../../hooks/useLocation';
+import { useUrlParams } from '../../../hooks/useUrlParams';
+import { SectionsWithRows, filterSectionsByTerm } from './helper';
 
 interface Props {
-  item: Item;
-  sections: SectionType[];
+  sections: SectionsWithRows;
 }
 
-const filterSections = (sections: SectionType[], item: Item) =>
-  sections
-    .map(section => {
-      const data: Record<string, unknown> = get(item, section.key);
-      return {
-        ...section,
-        data: section.properties ? pick(data, section.properties) : data
-      };
-    })
-    .filter(({ required, data }) => required || !isEmpty(data));
+export function MetadataTable({ sections }: Props) {
+  const location = useLocation();
+  const { urlParams } = useUrlParams();
+  const { searchTerm = '' } = urlParams;
 
-export function MetadataTable({ item, sections }: Props) {
-  const filteredSections = filterSections(sections, item);
+  const filteredSections = filterSectionsByTerm(sections, searchTerm);
+
+  const onSearchChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const value = e.target.value.trim().toLowerCase();
+      history.replace({
+        ...location,
+        search: fromQuery({
+          ...toQuery(location.search),
+          searchTerm: value
+        })
+      });
+    },
+    [location]
+  );
+  const noResultFound = Boolean(searchTerm) && isEmpty(filteredSections);
   return (
     <React.Fragment>
-      <EuiFlexGroup justifyContent="flexEnd">
+      <EuiFlexGroup justifyContent="flexEnd" alignItems="center">
         <EuiFlexItem grow={false}>
           <ElasticDocsLink section="/apm/get-started" path="/metadata.html">
             <EuiText size="s">
@@ -52,40 +60,49 @@ export function MetadataTable({ item, sections }: Props) {
             </EuiText>
           </ElasticDocsLink>
         </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiFieldSearch
+            onChange={onSearchChange}
+            placeholder={i18n.translate('xpack.apm.searchInput.filter', {
+              defaultMessage: 'Filter...'
+            })}
+            style={{
+              width: 400
+            }}
+            isInvalid={noResultFound}
+            value={searchTerm}
+          />
+        </EuiFlexItem>
       </EuiFlexGroup>
-      {filteredSections.map(section => (
-        <div key={section.key}>
-          <EuiTitle size="xs">
-            <h6>{section.label}</h6>
-          </EuiTitle>
-          <EuiSpacer size="s" />
-          <Section propData={section.data} propKey={section.key} />
-          <EuiSpacer size="xl" />
-        </div>
-      ))}
+      <HeightRetainer>
+        {filteredSections.map(section => (
+          <div key={section.key}>
+            <EuiTitle size="xs">
+              <h6>{section.label}</h6>
+            </EuiTitle>
+            <EuiSpacer size="s" />
+            <Section keyValuePairs={section.rows} />
+            <EuiSpacer size="xl" />
+          </div>
+        ))}
+        {noResultFound && <NoResultFound value={searchTerm} />}
+      </HeightRetainer>
     </React.Fragment>
   );
 }
 
-function Section({
-  propData = {},
-  propKey
-}: {
-  propData?: Record<string, unknown>;
-  propKey?: string;
-}) {
-  if (isEmpty(propData)) {
-    return (
+const NoResultFound = ({ value }: { value: string }) => (
+  <EuiFlexGroup justifyContent="spaceAround">
+    <EuiFlexItem grow={false}>
       <EuiText size="s">
         {i18n.translate(
-          'xpack.apm.propertiesTable.agentFeature.noDataAvailableLabel',
-          { defaultMessage: 'No data available' }
+          'xpack.apm.propertiesTable.agentFeature.noResultFound',
+          {
+            defaultMessage: `No results for "{value}".`,
+            values: { value }
+          }
         )}
       </EuiText>
-    );
-  }
-
-  return (
-    <DottedKeyValueTable data={propData} parentKey={propKey} maxDepth={5} />
-  );
-}
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.test.tsx
new file mode 100644
index 00000000000000..f36b91a522e928
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.test.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { mount, shallow } from 'enzyme';
+import { CauseStacktrace } from './CauseStacktrace';
+
+describe('CauseStacktrace', () => {
+  describe('render', () => {
+    describe('with no stack trace', () => {
+      it('renders without the accordion', () => {
+        const props = { id: 'testId', message: 'testMessage' };
+
+        expect(
+          mount(<CauseStacktrace {...props} />).find('CausedBy')
+        ).toHaveLength(1);
+      });
+    });
+
+    describe('with no message and a stack trace', () => {
+      it('says "Caused by …', () => {
+        const props = {
+          id: 'testId',
+          stackframes: [{ filename: 'testFilename', line: { number: 1 } }]
+        };
+
+        expect(
+          mount(<CauseStacktrace {...props} />)
+            .find('EuiTitle span')
+            .text()
+        ).toEqual('…');
+      });
+    });
+
+    describe('with a message and a stack trace', () => {
+      it('renders with the accordion', () => {
+        const props = {
+          id: 'testId',
+          message: 'testMessage',
+          stackframes: [{ filename: 'testFilename', line: { number: 1 } }]
+        };
+
+        expect(
+          shallow(<CauseStacktrace {...props} />).find('Styled(EuiAccordion)')
+        ).toHaveLength(1);
+      });
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx
new file mode 100644
index 00000000000000..52f2ba45867181
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import styled from 'styled-components';
+import theme from '@elastic/eui/dist/eui_theme_light.json';
+import { i18n } from '@kbn/i18n';
+import { EuiAccordion, EuiTitle } from '@elastic/eui';
+import { px, unit } from '../../../style/variables';
+import { Stacktrace } from '.';
+import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe';
+
+// @ts-ignore Styled Components has trouble inferring the types of the default props here.
+const Accordion = styled(EuiAccordion)`
+  border-top: ${theme.euiBorderThin};
+`;
+
+const CausedByContainer = styled('h5')`
+  padding: ${theme.spacerSizes.s} 0;
+`;
+
+const CausedByHeading = styled('span')`
+  color: ${theme.textColors.subdued};
+  display: block;
+  font-size: ${theme.euiFontSizeXS};
+  font-weight: ${theme.euiFontWeightBold};
+  text-transform: uppercase;
+`;
+
+const FramesContainer = styled('div')`
+  padding-left: ${px(unit)};
+`;
+
+function CausedBy({ message }: { message: string }) {
+  return (
+    <CausedByContainer>
+      <CausedByHeading>
+        {i18n.translate(
+          'xpack.apm.stacktraceTab.causedByFramesToogleButtonLabel',
+          {
+            defaultMessage: 'Caused By'
+          }
+        )}
+      </CausedByHeading>
+      <EuiTitle size="xxs">
+        <span>{message}</span>
+      </EuiTitle>
+    </CausedByContainer>
+  );
+}
+
+interface CauseStacktraceProps {
+  codeLanguage?: string;
+  id: string;
+  message?: string;
+  stackframes?: IStackframe[];
+}
+
+export function CauseStacktrace({
+  codeLanguage,
+  id,
+  message = '…',
+  stackframes = []
+}: CauseStacktraceProps) {
+  if (stackframes.length === 0) {
+    return <CausedBy message={message} />;
+  }
+
+  return (
+    <Accordion buttonContent={<CausedBy message={message} />} id={id}>
+      <FramesContainer>
+        <Stacktrace stackframes={stackframes} codeLanguage={codeLanguage} />
+      </FramesContainer>
+    </Accordion>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Context.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Context.tsx
index c5d610d0b8e1b4..9685ba920a73ce 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Context.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Context.tsx
@@ -32,7 +32,7 @@ registerLanguage('ruby', ruby);
 
 const ContextContainer = styled.div`
   position: relative;
-  border-radius: 0 0 ${borderRadius} ${borderRadius};
+  border-radius: ${borderRadius};
 `;
 
 const LINE_HEIGHT = units.eighth * 9;
@@ -49,7 +49,7 @@ const LineNumberContainer = styled.div<{ isLibraryFrame: boolean }>`
   position: absolute;
   top: 0;
   left: 0;
-  border-radius: 0 0 0 ${borderRadius};
+  border-radius: ${borderRadius};
   background: ${props =>
     props.isLibraryFrame
       ? theme.euiColorEmptyShade
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
index c9f7158f464a4a..c9f7057d2fb868 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
@@ -12,16 +12,17 @@ import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackfram
 import { fontFamilyCode, fontSize, px, units } from '../../../style/variables';
 
 const FileDetails = styled.div`
-  color: ${theme.euiColorMediumShade};
-  padding: ${px(units.half)};
+  color: ${theme.euiColorDarkShade};
+  padding: ${px(units.half)} 0;
   font-family: ${fontFamilyCode};
   font-size: ${fontSize};
 `;
+
 const LibraryFrameFileDetail = styled.span`
   color: ${theme.euiColorDarkShade};
 `;
+
 const AppFrameFileDetail = styled.span`
-  font-weight: bold;
   color: ${theme.euiColorFullShade};
 `;
 
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStackFrames.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStackFrames.tsx
deleted file mode 100644
index 9f8229e024c37e..00000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStackFrames.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiLink, EuiSpacer } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React, { Fragment } from 'react';
-import styled from 'styled-components';
-import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe';
-import { Ellipsis } from '../../shared/Icons';
-import { Stackframe } from './Stackframe';
-
-const LibraryFrameToggle = styled.div`
-  user-select: none;
-`;
-
-interface Props {
-  stackframes: IStackframe[];
-  codeLanguage?: string;
-  initialVisiblity: boolean;
-}
-
-interface State {
-  isVisible: boolean;
-}
-
-export class LibraryStackFrames extends React.Component<Props, State> {
-  public state = {
-    isVisible: this.props.initialVisiblity
-  };
-
-  public onClick = () => {
-    this.setState(({ isVisible }) => ({ isVisible: !isVisible }));
-  };
-
-  public render() {
-    const { stackframes, codeLanguage } = this.props;
-    const { isVisible } = this.state;
-    if (stackframes.length === 0) {
-      return null;
-    }
-
-    return (
-      <div>
-        <LibraryFrameToggle>
-          <EuiLink onClick={this.onClick}>
-            <Ellipsis horizontal={isVisible} />{' '}
-            {i18n.translate(
-              'xpack.apm.stacktraceTab.libraryFramesToogleButtonLabel',
-              {
-                defaultMessage:
-                  '{count, plural, one {# library frame} other {# library frames}}',
-                values: { count: stackframes.length }
-              }
-            )}
-          </EuiLink>
-        </LibraryFrameToggle>
-
-        <div>
-          {isVisible && (
-            <Fragment>
-              <EuiSpacer size="m" />
-              {stackframes.map((stackframe, i) => (
-                <Stackframe
-                  key={i}
-                  isLibraryFrame
-                  codeLanguage={codeLanguage}
-                  stackframe={stackframe}
-                />
-              ))}
-            </Fragment>
-          )}
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.tsx
new file mode 100644
index 00000000000000..94751f9d0461d2
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { LibraryStacktrace } from './LibraryStacktrace';
+
+describe('LibraryStacktrace', () => {
+  describe('render', () => {
+    describe('with no stack frames', () => {
+      it('renders null', () => {
+        const props = { id: 'testId', stackframes: [] };
+
+        expect(shallow(<LibraryStacktrace {...props} />).html()).toBeNull();
+      });
+    });
+
+    describe('with stack frames', () => {
+      it('renders an accordion', () => {
+        const props = {
+          id: 'testId',
+          stackframes: [{ filename: 'testFilename', line: { number: 1 } }]
+        };
+
+        expect(
+          shallow(<LibraryStacktrace {...props} />).find('EuiAccordion')
+        ).toHaveLength(1);
+      });
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.tsx
new file mode 100644
index 00000000000000..f62ba954078931
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.tsx
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiAccordion } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import styled from 'styled-components';
+import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe';
+import { Stackframe } from './Stackframe';
+import { px, unit } from '../../../style/variables';
+
+const FramesContainer = styled('div')`
+  padding-left: ${px(unit)};
+`;
+
+interface Props {
+  codeLanguage?: string;
+  stackframes: IStackframe[];
+  id: string;
+}
+
+export function LibraryStacktrace({ codeLanguage, id, stackframes }: Props) {
+  if (stackframes.length === 0) {
+    return null;
+  }
+
+  return (
+    <EuiAccordion
+      buttonContent={i18n.translate(
+        'xpack.apm.stacktraceTab.libraryFramesToogleButtonLabel',
+        {
+          defaultMessage:
+            '{count, plural, one {# library frame} other {# library frames}}',
+          values: { count: stackframes.length }
+        }
+      )}
+      id={id}
+    >
+      <FramesContainer>
+        {stackframes.map((stackframe, i) => (
+          <Stackframe
+            key={i}
+            id={i.toString(10)}
+            isLibraryFrame
+            codeLanguage={codeLanguage}
+            stackframe={stackframe}
+          />
+        ))}
+      </FramesContainer>
+    </EuiAccordion>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx
index cd6c7ce9224a58..a307cc56cc71a7 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx
@@ -7,6 +7,7 @@
 import theme from '@elastic/eui/dist/eui_theme_light.json';
 import React from 'react';
 import styled from 'styled-components';
+import { EuiAccordion } from '@elastic/eui';
 import {
   IStackframe,
   IStackframeWithLineContext
@@ -16,16 +17,11 @@ import {
   fontFamilyCode,
   fontSize
 } from '../../../style/variables';
-import { FrameHeading } from '../Stacktrace/FrameHeading';
+import { FrameHeading } from './FrameHeading';
 import { Context } from './Context';
 import { Variables } from './Variables';
 
-const CodeHeader = styled.div`
-  border-bottom: 1px solid ${theme.euiColorLightShade};
-  border-radius: ${borderRadius} ${borderRadius} 0 0;
-`;
-
-const Container = styled.div<{ isLibraryFrame: boolean }>`
+const ContextContainer = styled.div<{ isLibraryFrame: boolean }>`
   position: relative;
   font-family: ${fontFamilyCode};
   font-size: ${fontSize};
@@ -40,12 +36,16 @@ const Container = styled.div<{ isLibraryFrame: boolean }>`
 interface Props {
   stackframe: IStackframe;
   codeLanguage?: string;
+  id: string;
+  initialIsOpen?: boolean;
   isLibraryFrame?: boolean;
 }
 
 export function Stackframe({
   stackframe,
   codeLanguage,
+  id,
+  initialIsOpen = false,
   isLibraryFrame = false
 }: Props) {
   if (!hasLineContext(stackframe)) {
@@ -55,19 +55,22 @@ export function Stackframe({
   }
 
   return (
-    <Container isLibraryFrame={isLibraryFrame}>
-      <CodeHeader>
+    <EuiAccordion
+      buttonContent={
         <FrameHeading stackframe={stackframe} isLibraryFrame={isLibraryFrame} />
-      </CodeHeader>
-
-      <Context
-        stackframe={stackframe}
-        codeLanguage={codeLanguage}
-        isLibraryFrame={isLibraryFrame}
-      />
-
+      }
+      id={id}
+      initialIsOpen={initialIsOpen}
+    >
+      <ContextContainer isLibraryFrame={isLibraryFrame}>
+        <Context
+          stackframe={stackframe}
+          codeLanguage={codeLanguage}
+          isLibraryFrame={isLibraryFrame}
+        />
+      </ContextContainer>
       <Variables vars={stackframe.vars} />
-    </Container>
+    </EuiAccordion>
   );
 }
 
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Variables.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Variables.tsx
index 34c46f84c76b9d..6d1b10c90a9997 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Variables.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/Variables.tsx
@@ -11,11 +11,11 @@ import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { borderRadius, px, unit, units } from '../../../style/variables';
 import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe';
-import { DottedKeyValueTable } from '../DottedKeyValueTable';
+import { KeyValueTable } from '../KeyValueTable';
+import { flattenObject } from '../../../utils/flattenObject';
 
 const VariablesContainer = styled.div`
   background: ${theme.euiColorEmptyShade};
-  border-top: 1px solid ${theme.euiColorLightShade};
   border-radius: 0 0 ${borderRadius} ${borderRadius};
   padding: ${px(units.half)} ${px(unit)};
 `;
@@ -24,29 +24,27 @@ interface Props {
   vars: IStackframe['vars'];
 }
 
-export class Variables extends React.Component<Props> {
-  public render() {
-    if (!this.props.vars) {
-      return null;
-    }
-
-    return (
-      <React.Fragment>
-        <VariablesContainer>
-          <EuiAccordion
-            id="local-variables"
-            className="euiAccordion"
-            buttonContent={i18n.translate(
-              'xpack.apm.stacktraceTab.localVariablesToogleButtonLabel',
-              { defaultMessage: 'Local variables' }
-            )}
-          >
-            <React.Fragment>
-              <DottedKeyValueTable data={this.props.vars} maxDepth={5} />
-            </React.Fragment>
-          </EuiAccordion>
-        </VariablesContainer>
-      </React.Fragment>
-    );
+export const Variables = ({ vars }: Props) => {
+  if (!vars) {
+    return null;
   }
-}
+  const flattenedVariables = flattenObject(vars);
+  return (
+    <React.Fragment>
+      <VariablesContainer>
+        <EuiAccordion
+          id="local-variables"
+          className="euiAccordion"
+          buttonContent={i18n.translate(
+            'xpack.apm.stacktraceTab.localVariablesToogleButtonLabel',
+            { defaultMessage: 'Local variables' }
+          )}
+        >
+          <React.Fragment>
+            <KeyValueTable keyValuePairs={flattenedVariables} />
+          </React.Fragment>
+        </EuiAccordion>
+      </VariablesContainer>
+    </React.Fragment>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx
index b0052e8c17b64f..5f6519b7c7b968 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx
@@ -16,7 +16,7 @@ describe('Stackframe', () => {
     let wrapper: ReactWrapper;
     beforeEach(() => {
       const stackframe = stacktracesMock[0];
-      wrapper = mount(<Stackframe stackframe={stackframe} />);
+      wrapper = mount(<Stackframe id="test" stackframe={stackframe} />);
     });
 
     it('should render correctly', () => {
@@ -38,7 +38,7 @@ describe('Stackframe', () => {
     let wrapper: ReactWrapper;
     beforeEach(() => {
       const stackframe = { line: {} } as IStackframe;
-      wrapper = mount(<Stackframe stackframe={stackframe} />);
+      wrapper = mount(<Stackframe id="test" stackframe={stackframe} />);
     });
 
     it('should render only FrameHeading', () => {
@@ -55,7 +55,7 @@ describe('Stackframe', () => {
   it('should respect isLibraryFrame', () => {
     const stackframe = { line: {} } as IStackframe;
     const wrapper = shallow(
-      <Stackframe stackframe={stackframe} isLibraryFrame />
+      <Stackframe id="test" stackframe={stackframe} isLibraryFrame />
     );
     expect(wrapper.find('FrameHeading').prop('isLibraryFrame')).toBe(true);
   });
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
index 1b465db1c6263a..55cec7389dc5c0 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
@@ -1,24 +1,23 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Stackframe when stackframe has source lines should render correctly 1`] = `
-.c2 {
-  color: #98a2b3;
-  padding: 8px;
+.c0 {
+  color: #69707d;
+  padding: 8px 0;
   font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
   font-size: 14px;
 }
 
-.c3 {
-  font-weight: bold;
+.c1 {
   color: #000000;
 }
 
-.c4 {
+.c3 {
   position: relative;
-  border-radius: 0 0 4px 4px;
+  border-radius: 4px;
 }
 
-.c5 {
+.c4 {
   position: absolute;
   width: 100%;
   height: 18px;
@@ -27,15 +26,15 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
   background-color: #fef6e5;
 }
 
-.c6 {
+.c5 {
   position: absolute;
   top: 0;
   left: 0;
-  border-radius: 0 0 0 4px;
+  border-radius: 4px;
   background: #f5f7fa;
 }
 
-.c7 {
+.c6 {
   position: relative;
   min-width: 42px;
   padding-left: 8px;
@@ -46,11 +45,11 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
   border-right: 1px solid #d3dae6;
 }
 
-.c7:last-of-type {
+.c6:last-of-type {
   border-radius: 0 0 0 4px;
 }
 
-.c8 {
+.c7 {
   position: relative;
   min-width: 42px;
   padding-left: 8px;
@@ -62,22 +61,22 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
   background-color: #fef6e5;
 }
 
-.c8:last-of-type {
+.c7:last-of-type {
   border-radius: 0 0 0 4px;
 }
 
-.c9 {
+.c8 {
   overflow: auto;
   margin: 0 0 0 42px;
   padding: 0;
   background-color: #ffffff;
 }
 
-.c9:last-of-type {
+.c8:last-of-type {
   border-radius: 0 0 4px 0;
 }
 
-.c10 {
+.c9 {
   margin: 0;
   color: inherit;
   background: inherit;
@@ -88,7 +87,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
   line-height: 18px;
 }
 
-.c11 {
+.c10 {
   position: relative;
   padding: 0;
   margin: 0;
@@ -96,12 +95,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
   z-index: 2;
 }
 
-.c1 {
-  border-bottom: 1px solid #d3dae6;
-  border-radius: 4px 4px 0 0;
-}
-
-.c0 {
+.c2 {
   position: relative;
   font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
   font-size: 14px;
@@ -111,6 +105,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
 }
 
 <Stackframe
+  id="test"
   stackframe={
     Object {
       "abs_path": "/app/server/routes.js",
@@ -135,77 +130,9 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
     }
   }
 >
-  <styled.div
-    isLibraryFrame={false}
-  >
-    <div
-      className="c0"
-    >
-      <styled.div>
-        <div
-          className="c1"
-        >
-          <FrameHeading
-            isLibraryFrame={false}
-            stackframe={
-              Object {
-                "abs_path": "/app/server/routes.js",
-                "context": Object {
-                  "post": Array [
-                    "    req.body.lines.forEach(function (line) {",
-                    "      client.query('SELECT id FROM products WHERE id=$1', [line.id], next())",
-                  ],
-                  "pre": Array [
-                    "    })",
-                    "",
-                  ],
-                },
-                "exclude_from_grouping": false,
-                "filename": "server/routes.js",
-                "function": "<anonymous>",
-                "library_frame": false,
-                "line": Object {
-                  "context": "    client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())",
-                  "number": 307,
-                },
-              }
-            }
-          >
-            <styled.div>
-              <div
-                className="c2"
-              >
-                <styled.span>
-                  <span
-                    className="c3"
-                  >
-                    server/routes.js
-                  </span>
-                </styled.span>
-                 in
-                 
-                <styled.span>
-                  <span
-                    className="c3"
-                  >
-                    &lt;anonymous&gt;
-                  </span>
-                </styled.span>
-                 at 
-                <styled.span>
-                  <span
-                    className="c3"
-                  >
-                    line 
-                    307
-                  </span>
-                </styled.span>
-              </div>
-            </styled.div>
-          </FrameHeading>
-        </div>
-      </styled.div>
-      <Context
+  <EuiAccordion
+    buttonContent={
+      <FrameHeading
         isLibraryFrame={false}
         stackframe={
           Object {
@@ -230,938 +157,1101 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
             },
           }
         }
+      />
+    }
+    id="test"
+    initialIsOpen={false}
+    paddingSize="none"
+  >
+    <div
+      className="euiAccordion"
+    >
+      <div
+        className="euiAccordion__triggerWrapper"
       >
-        <styled.div>
-          <div
-            className="c4"
+        <button
+          aria-controls="test"
+          aria-expanded={false}
+          className="euiAccordion__button"
+          onClick={[Function]}
+          type="button"
+        >
+          <span
+            className="euiAccordion__iconWrapper"
           >
-            <styled.div
-              lineNumber={2}
+            <EuiIcon
+              className="euiAccordion__icon"
+              size="m"
+              type="arrowRight"
             >
-              <div
-                className="c5"
-              />
-            </styled.div>
-            <styled.div
+              <EuiIconEmpty
+                className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
+                focusable="false"
+                style={null}
+              >
+                <svg
+                  className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
+                  focusable="false"
+                  height={16}
+                  style={null}
+                  viewBox="0 0 16 16"
+                  width={16}
+                  xmlns="http://www.w3.org/2000/svg"
+                />
+              </EuiIconEmpty>
+            </EuiIcon>
+          </span>
+          <span>
+            <FrameHeading
               isLibraryFrame={false}
+              stackframe={
+                Object {
+                  "abs_path": "/app/server/routes.js",
+                  "context": Object {
+                    "post": Array [
+                      "    req.body.lines.forEach(function (line) {",
+                      "      client.query('SELECT id FROM products WHERE id=$1', [line.id], next())",
+                    ],
+                    "pre": Array [
+                      "    })",
+                      "",
+                    ],
+                  },
+                  "exclude_from_grouping": false,
+                  "filename": "server/routes.js",
+                  "function": "<anonymous>",
+                  "library_frame": false,
+                  "line": Object {
+                    "context": "    client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())",
+                    "number": 307,
+                  },
+                }
+              }
             >
-              <div
-                className="c6"
-              >
-                <styled.div
-                  highlight={false}
-                  key="    })0"
-                >
-                  <div
-                    className="c7"
-                  >
-                    305
-                    .
-                  </div>
-                </styled.div>
-                <styled.div
-                  highlight={false}
-                  key="1"
-                >
-                  <div
-                    className="c7"
-                  >
-                    306
-                    .
-                  </div>
-                </styled.div>
-                <styled.div
-                  highlight={true}
-                  key="    client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())2"
-                >
-                  <div
-                    className="c8"
-                  >
-                    307
-                    .
-                  </div>
-                </styled.div>
-                <styled.div
-                  highlight={false}
-                  key="    req.body.lines.forEach(function (line) {3"
-                >
-                  <div
-                    className="c7"
-                  >
-                    308
-                    .
-                  </div>
-                </styled.div>
-                <styled.div
-                  highlight={false}
-                  key="      client.query('SELECT id FROM products WHERE id=$1', [line.id], next())4"
+              <styled.div>
+                <div
+                  className="c0"
                 >
-                  <div
-                    className="c7"
-                  >
-                    309
-                    .
-                  </div>
-                </styled.div>
-              </div>
-            </styled.div>
-            <styled.div>
-              <div
-                className="c9"
-              >
-                <SyntaxHighlighter
-                  CodeTag={[Function]}
-                  PreTag={[Function]}
-                  customStyle={
-                    Object {
-                      "overflowX": null,
-                      "padding": null,
-                    }
-                  }
-                  key="    })0"
-                  language="javascript"
-                  style={
-                    Object {
-                      "hljs": Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": "auto",
-                        "padding": "0.5em",
-                      },
-                      "hljs-addition": Object {
-                        "backgroundColor": "#baeeba",
-                      },
-                      "hljs-attr": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-attribute": Object {
-                        "color": "#000",
-                      },
-                      "hljs-built_in": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-builtin-name": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-bullet": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-class .hljs-title": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-comment": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-deletion": Object {
-                        "backgroundColor": "#ffc8bd",
-                      },
-                      "hljs-doctag": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-emphasis": Object {
-                        "fontStyle": "italic",
-                      },
-                      "hljs-formula": Object {
-                        "backgroundColor": "#eee",
-                        "fontStyle": "italic",
-                      },
-                      "hljs-keyword": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-link": Object {
-                        "color": "#080",
-                      },
-                      "hljs-literal": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-meta": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-name": Object {
-                        "color": "#008",
-                      },
-                      "hljs-number": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-params": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-quote": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-regexp": Object {
-                        "color": "#080",
-                      },
-                      "hljs-section": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-selector-class": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-id": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-tag": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-string": Object {
-                        "color": "#c41a16",
-                      },
-                      "hljs-strong": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-subst": Object {
-                        "color": "#000",
-                      },
-                      "hljs-symbol": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-tag": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-template-variable": Object {
-                        "color": "#660",
-                      },
-                      "hljs-title": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-type": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-variable": Object {
-                        "color": "#660",
-                      },
-                    }
-                  }
-                >
-                  <styled.pre
-                    style={
-                      Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": null,
-                        "padding": null,
-                      }
-                    }
-                  >
-                    <pre
-                      className="c10"
-                      style={
-                        Object {
-                          "background": "#fff",
-                          "color": "black",
-                          "display": "block",
-                          "overflowX": null,
-                          "padding": null,
-                        }
-                      }
+                  <styled.span>
+                    <span
+                      className="c1"
                     >
-                      <styled.code>
-                        <code
-                          className="c11"
-                        >
-                              })
-                        </code>
-                      </styled.code>
-                    </pre>
-                  </styled.pre>
-                </SyntaxHighlighter>
-                <SyntaxHighlighter
-                  CodeTag={[Function]}
-                  PreTag={[Function]}
-                  customStyle={
-                    Object {
-                      "overflowX": null,
-                      "padding": null,
-                    }
-                  }
-                  key="1"
-                  language="javascript"
-                  style={
-                    Object {
-                      "hljs": Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": "auto",
-                        "padding": "0.5em",
-                      },
-                      "hljs-addition": Object {
-                        "backgroundColor": "#baeeba",
-                      },
-                      "hljs-attr": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-attribute": Object {
-                        "color": "#000",
-                      },
-                      "hljs-built_in": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-builtin-name": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-bullet": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-class .hljs-title": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-comment": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-deletion": Object {
-                        "backgroundColor": "#ffc8bd",
-                      },
-                      "hljs-doctag": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-emphasis": Object {
-                        "fontStyle": "italic",
-                      },
-                      "hljs-formula": Object {
-                        "backgroundColor": "#eee",
-                        "fontStyle": "italic",
-                      },
-                      "hljs-keyword": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-link": Object {
-                        "color": "#080",
-                      },
-                      "hljs-literal": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-meta": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-name": Object {
-                        "color": "#008",
-                      },
-                      "hljs-number": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-params": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-quote": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-regexp": Object {
-                        "color": "#080",
-                      },
-                      "hljs-section": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-selector-class": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-id": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-tag": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-string": Object {
-                        "color": "#c41a16",
-                      },
-                      "hljs-strong": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-subst": Object {
-                        "color": "#000",
-                      },
-                      "hljs-symbol": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-tag": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-template-variable": Object {
-                        "color": "#660",
-                      },
-                      "hljs-title": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-type": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-variable": Object {
-                        "color": "#660",
-                      },
-                    }
-                  }
-                >
-                  <styled.pre
-                    style={
-                      Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": null,
-                        "padding": null,
-                      }
-                    }
-                  >
-                    <pre
-                      className="c10"
-                      style={
-                        Object {
-                          "background": "#fff",
-                          "color": "black",
-                          "display": "block",
-                          "overflowX": null,
-                          "padding": null,
-                        }
-                      }
+                      server/routes.js
+                    </span>
+                  </styled.span>
+                   in
+                   
+                  <styled.span>
+                    <span
+                      className="c1"
                     >
-                      <styled.code>
-                        <code
-                          className="c11"
-                        >
-                          
-
-                        </code>
-                      </styled.code>
-                    </pre>
-                  </styled.pre>
-                </SyntaxHighlighter>
-                <SyntaxHighlighter
-                  CodeTag={[Function]}
-                  PreTag={[Function]}
-                  customStyle={
-                    Object {
-                      "overflowX": null,
-                      "padding": null,
-                    }
-                  }
-                  key="    client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())2"
-                  language="javascript"
-                  style={
-                    Object {
-                      "hljs": Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": "auto",
-                        "padding": "0.5em",
-                      },
-                      "hljs-addition": Object {
-                        "backgroundColor": "#baeeba",
-                      },
-                      "hljs-attr": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-attribute": Object {
-                        "color": "#000",
-                      },
-                      "hljs-built_in": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-builtin-name": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-bullet": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-class .hljs-title": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-comment": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-deletion": Object {
-                        "backgroundColor": "#ffc8bd",
-                      },
-                      "hljs-doctag": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-emphasis": Object {
-                        "fontStyle": "italic",
-                      },
-                      "hljs-formula": Object {
-                        "backgroundColor": "#eee",
-                        "fontStyle": "italic",
-                      },
-                      "hljs-keyword": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-link": Object {
-                        "color": "#080",
-                      },
-                      "hljs-literal": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-meta": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-name": Object {
-                        "color": "#008",
-                      },
-                      "hljs-number": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-params": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-quote": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-regexp": Object {
-                        "color": "#080",
-                      },
-                      "hljs-section": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-selector-class": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-id": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-tag": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-string": Object {
-                        "color": "#c41a16",
-                      },
-                      "hljs-strong": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-subst": Object {
-                        "color": "#000",
-                      },
-                      "hljs-symbol": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-tag": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-template-variable": Object {
-                        "color": "#660",
-                      },
-                      "hljs-title": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-type": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-variable": Object {
-                        "color": "#660",
-                      },
-                    }
-                  }
-                >
-                  <styled.pre
-                    style={
-                      Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": null,
-                        "padding": null,
-                      }
-                    }
-                  >
-                    <pre
-                      className="c10"
-                      style={
-                        Object {
-                          "background": "#fff",
-                          "color": "black",
-                          "display": "block",
-                          "overflowX": null,
-                          "padding": null,
-                        }
-                      }
+                      &lt;anonymous&gt;
+                    </span>
+                  </styled.span>
+                   at 
+                  <styled.span>
+                    <span
+                      className="c1"
                     >
-                      <styled.code>
-                        <code
-                          className="c11"
-                        >
-                              client.query(
-                          <span
-                            key="code-segement1"
-                            style={
-                              Object {
-                                "color": "#c41a16",
-                              }
-                            }
-                          >
-                            'SELECT id FROM customers WHERE id=$1'
-                          </span>
-                          , [req.body.customer_id], next())
-                        </code>
-                      </styled.code>
-                    </pre>
-                  </styled.pre>
-                </SyntaxHighlighter>
-                <SyntaxHighlighter
-                  CodeTag={[Function]}
-                  PreTag={[Function]}
-                  customStyle={
-                    Object {
-                      "overflowX": null,
-                      "padding": null,
-                    }
-                  }
-                  key="    req.body.lines.forEach(function (line) {3"
-                  language="javascript"
-                  style={
-                    Object {
-                      "hljs": Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": "auto",
-                        "padding": "0.5em",
-                      },
-                      "hljs-addition": Object {
-                        "backgroundColor": "#baeeba",
-                      },
-                      "hljs-attr": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-attribute": Object {
-                        "color": "#000",
-                      },
-                      "hljs-built_in": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-builtin-name": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-bullet": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-class .hljs-title": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-comment": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-deletion": Object {
-                        "backgroundColor": "#ffc8bd",
-                      },
-                      "hljs-doctag": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-emphasis": Object {
-                        "fontStyle": "italic",
-                      },
-                      "hljs-formula": Object {
-                        "backgroundColor": "#eee",
-                        "fontStyle": "italic",
-                      },
-                      "hljs-keyword": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-link": Object {
-                        "color": "#080",
-                      },
-                      "hljs-literal": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-meta": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-name": Object {
-                        "color": "#008",
-                      },
-                      "hljs-number": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-params": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-quote": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-regexp": Object {
-                        "color": "#080",
-                      },
-                      "hljs-section": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-selector-class": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-id": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-tag": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-string": Object {
-                        "color": "#c41a16",
-                      },
-                      "hljs-strong": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-subst": Object {
-                        "color": "#000",
-                      },
-                      "hljs-symbol": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-tag": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-template-variable": Object {
-                        "color": "#660",
-                      },
-                      "hljs-title": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-type": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-variable": Object {
-                        "color": "#660",
-                      },
-                    }
-                  }
+                      line 
+                      307
+                    </span>
+                  </styled.span>
+                </div>
+              </styled.div>
+            </FrameHeading>
+          </span>
+        </button>
+      </div>
+      <div
+        className="euiAccordion__childWrapper"
+        id="test"
+      >
+        <EuiMutationObserver
+          observerOptions={
+            Object {
+              "attributeFilter": Array [
+                "style",
+              ],
+              "childList": true,
+              "subtree": true,
+            }
+          }
+          onMutation={[Function]}
+        >
+          <div>
+            <div
+              className=""
+            >
+              <styled.div
+                isLibraryFrame={false}
+              >
+                <div
+                  className="c2"
                 >
-                  <styled.pre
-                    style={
+                  <Context
+                    isLibraryFrame={false}
+                    stackframe={
                       Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": null,
-                        "padding": null,
+                        "abs_path": "/app/server/routes.js",
+                        "context": Object {
+                          "post": Array [
+                            "    req.body.lines.forEach(function (line) {",
+                            "      client.query('SELECT id FROM products WHERE id=$1', [line.id], next())",
+                          ],
+                          "pre": Array [
+                            "    })",
+                            "",
+                          ],
+                        },
+                        "exclude_from_grouping": false,
+                        "filename": "server/routes.js",
+                        "function": "<anonymous>",
+                        "library_frame": false,
+                        "line": Object {
+                          "context": "    client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())",
+                          "number": 307,
+                        },
                       }
                     }
                   >
-                    <pre
-                      className="c10"
-                      style={
-                        Object {
-                          "background": "#fff",
-                          "color": "black",
-                          "display": "block",
-                          "overflowX": null,
-                          "padding": null,
-                        }
-                      }
-                    >
-                      <styled.code>
-                        <code
-                          className="c11"
+                    <styled.div>
+                      <div
+                        className="c3"
+                      >
+                        <styled.div
+                          lineNumber={2}
+                        >
+                          <div
+                            className="c4"
+                          />
+                        </styled.div>
+                        <styled.div
+                          isLibraryFrame={false}
                         >
-                              req.body.lines.forEach(
-                          <span
-                            key="code-segement1"
-                            style={Object {}}
+                          <div
+                            className="c5"
                           >
-                            <span
-                              key="code-segment-1-0"
+                            <styled.div
+                              highlight={false}
+                              key="    })0"
+                            >
+                              <div
+                                className="c6"
+                              >
+                                305
+                                .
+                              </div>
+                            </styled.div>
+                            <styled.div
+                              highlight={false}
+                              key="1"
+                            >
+                              <div
+                                className="c6"
+                              >
+                                306
+                                .
+                              </div>
+                            </styled.div>
+                            <styled.div
+                              highlight={true}
+                              key="    client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())2"
+                            >
+                              <div
+                                className="c7"
+                              >
+                                307
+                                .
+                              </div>
+                            </styled.div>
+                            <styled.div
+                              highlight={false}
+                              key="    req.body.lines.forEach(function (line) {3"
+                            >
+                              <div
+                                className="c6"
+                              >
+                                308
+                                .
+                              </div>
+                            </styled.div>
+                            <styled.div
+                              highlight={false}
+                              key="      client.query('SELECT id FROM products WHERE id=$1', [line.id], next())4"
+                            >
+                              <div
+                                className="c6"
+                              >
+                                309
+                                .
+                              </div>
+                            </styled.div>
+                          </div>
+                        </styled.div>
+                        <styled.div>
+                          <div
+                            className="c8"
+                          >
+                            <SyntaxHighlighter
+                              CodeTag={[Function]}
+                              PreTag={[Function]}
+                              customStyle={
+                                Object {
+                                  "overflowX": null,
+                                  "padding": null,
+                                }
+                              }
+                              key="    })0"
+                              language="javascript"
                               style={
                                 Object {
-                                  "color": "#aa0d91",
+                                  "hljs": Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": "auto",
+                                    "padding": "0.5em",
+                                  },
+                                  "hljs-addition": Object {
+                                    "backgroundColor": "#baeeba",
+                                  },
+                                  "hljs-attr": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-attribute": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-built_in": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-builtin-name": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-bullet": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-class .hljs-title": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-comment": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-deletion": Object {
+                                    "backgroundColor": "#ffc8bd",
+                                  },
+                                  "hljs-doctag": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-emphasis": Object {
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-formula": Object {
+                                    "backgroundColor": "#eee",
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-keyword": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-link": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-literal": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-meta": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-name": Object {
+                                    "color": "#008",
+                                  },
+                                  "hljs-number": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-params": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-quote": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-regexp": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-section": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-selector-class": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-id": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-tag": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-string": Object {
+                                    "color": "#c41a16",
+                                  },
+                                  "hljs-strong": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-subst": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-symbol": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-tag": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-template-variable": Object {
+                                    "color": "#660",
+                                  },
+                                  "hljs-title": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-type": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-variable": Object {
+                                    "color": "#660",
+                                  },
                                 }
                               }
                             >
-                              function
-                            </span>
-                             (
-                            <span
-                              key="code-segment-1-2"
+                              <styled.pre
+                                style={
+                                  Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": null,
+                                    "padding": null,
+                                  }
+                                }
+                              >
+                                <pre
+                                  className="c9"
+                                  style={
+                                    Object {
+                                      "background": "#fff",
+                                      "color": "black",
+                                      "display": "block",
+                                      "overflowX": null,
+                                      "padding": null,
+                                    }
+                                  }
+                                >
+                                  <styled.code>
+                                    <code
+                                      className="c10"
+                                    >
+                                          })
+                                    </code>
+                                  </styled.code>
+                                </pre>
+                              </styled.pre>
+                            </SyntaxHighlighter>
+                            <SyntaxHighlighter
+                              CodeTag={[Function]}
+                              PreTag={[Function]}
+                              customStyle={
+                                Object {
+                                  "overflowX": null,
+                                  "padding": null,
+                                }
+                              }
+                              key="1"
+                              language="javascript"
                               style={
                                 Object {
-                                  "color": "#5c2699",
+                                  "hljs": Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": "auto",
+                                    "padding": "0.5em",
+                                  },
+                                  "hljs-addition": Object {
+                                    "backgroundColor": "#baeeba",
+                                  },
+                                  "hljs-attr": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-attribute": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-built_in": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-builtin-name": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-bullet": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-class .hljs-title": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-comment": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-deletion": Object {
+                                    "backgroundColor": "#ffc8bd",
+                                  },
+                                  "hljs-doctag": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-emphasis": Object {
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-formula": Object {
+                                    "backgroundColor": "#eee",
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-keyword": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-link": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-literal": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-meta": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-name": Object {
+                                    "color": "#008",
+                                  },
+                                  "hljs-number": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-params": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-quote": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-regexp": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-section": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-selector-class": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-id": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-tag": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-string": Object {
+                                    "color": "#c41a16",
+                                  },
+                                  "hljs-strong": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-subst": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-symbol": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-tag": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-template-variable": Object {
+                                    "color": "#660",
+                                  },
+                                  "hljs-title": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-type": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-variable": Object {
+                                    "color": "#660",
+                                  },
                                 }
                               }
                             >
-                              line
-                            </span>
-                            ) 
-                          </span>
-                          {
-                        </code>
-                      </styled.code>
-                    </pre>
-                  </styled.pre>
-                </SyntaxHighlighter>
-                <SyntaxHighlighter
-                  CodeTag={[Function]}
-                  PreTag={[Function]}
-                  customStyle={
-                    Object {
-                      "overflowX": null,
-                      "padding": null,
-                    }
-                  }
-                  key="      client.query('SELECT id FROM products WHERE id=$1', [line.id], next())4"
-                  language="javascript"
-                  style={
-                    Object {
-                      "hljs": Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": "auto",
-                        "padding": "0.5em",
-                      },
-                      "hljs-addition": Object {
-                        "backgroundColor": "#baeeba",
-                      },
-                      "hljs-attr": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-attribute": Object {
-                        "color": "#000",
-                      },
-                      "hljs-built_in": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-builtin-name": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-bullet": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-class .hljs-title": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-comment": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-deletion": Object {
-                        "backgroundColor": "#ffc8bd",
-                      },
-                      "hljs-doctag": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-emphasis": Object {
-                        "fontStyle": "italic",
-                      },
-                      "hljs-formula": Object {
-                        "backgroundColor": "#eee",
-                        "fontStyle": "italic",
-                      },
-                      "hljs-keyword": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-link": Object {
-                        "color": "#080",
-                      },
-                      "hljs-literal": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-meta": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-name": Object {
-                        "color": "#008",
-                      },
-                      "hljs-number": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-params": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-quote": Object {
-                        "color": "#006a00",
-                      },
-                      "hljs-regexp": Object {
-                        "color": "#080",
-                      },
-                      "hljs-section": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-selector-class": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-id": Object {
-                        "color": "#9b703f",
-                      },
-                      "hljs-selector-tag": Object {
-                        "color": "#aa0d91",
-                      },
-                      "hljs-string": Object {
-                        "color": "#c41a16",
-                      },
-                      "hljs-strong": Object {
-                        "fontWeight": "bold",
-                      },
-                      "hljs-subst": Object {
-                        "color": "#000",
-                      },
-                      "hljs-symbol": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-tag": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-template-variable": Object {
-                        "color": "#660",
-                      },
-                      "hljs-title": Object {
-                        "color": "#1c00cf",
-                      },
-                      "hljs-type": Object {
-                        "color": "#5c2699",
-                      },
-                      "hljs-variable": Object {
-                        "color": "#660",
-                      },
-                    }
-                  }
-                >
-                  <styled.pre
-                    style={
-                      Object {
-                        "background": "#fff",
-                        "color": "black",
-                        "display": "block",
-                        "overflowX": null,
-                        "padding": null,
-                      }
-                    }
-                  >
-                    <pre
-                      className="c10"
-                      style={
-                        Object {
-                          "background": "#fff",
-                          "color": "black",
-                          "display": "block",
-                          "overflowX": null,
-                          "padding": null,
-                        }
-                      }
-                    >
-                      <styled.code>
-                        <code
-                          className="c11"
-                        >
-                                client.query(
-                          <span
-                            key="code-segement1"
-                            style={
-                              Object {
-                                "color": "#c41a16",
+                              <styled.pre
+                                style={
+                                  Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": null,
+                                    "padding": null,
+                                  }
+                                }
+                              >
+                                <pre
+                                  className="c9"
+                                  style={
+                                    Object {
+                                      "background": "#fff",
+                                      "color": "black",
+                                      "display": "block",
+                                      "overflowX": null,
+                                      "padding": null,
+                                    }
+                                  }
+                                >
+                                  <styled.code>
+                                    <code
+                                      className="c10"
+                                    >
+                                      
+
+                                    </code>
+                                  </styled.code>
+                                </pre>
+                              </styled.pre>
+                            </SyntaxHighlighter>
+                            <SyntaxHighlighter
+                              CodeTag={[Function]}
+                              PreTag={[Function]}
+                              customStyle={
+                                Object {
+                                  "overflowX": null,
+                                  "padding": null,
+                                }
                               }
-                            }
-                          >
-                            'SELECT id FROM products WHERE id=$1'
-                          </span>
-                          , [line.id], next())
-                        </code>
-                      </styled.code>
-                    </pre>
-                  </styled.pre>
-                </SyntaxHighlighter>
-              </div>
-            </styled.div>
+                              key="    client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())2"
+                              language="javascript"
+                              style={
+                                Object {
+                                  "hljs": Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": "auto",
+                                    "padding": "0.5em",
+                                  },
+                                  "hljs-addition": Object {
+                                    "backgroundColor": "#baeeba",
+                                  },
+                                  "hljs-attr": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-attribute": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-built_in": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-builtin-name": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-bullet": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-class .hljs-title": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-comment": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-deletion": Object {
+                                    "backgroundColor": "#ffc8bd",
+                                  },
+                                  "hljs-doctag": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-emphasis": Object {
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-formula": Object {
+                                    "backgroundColor": "#eee",
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-keyword": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-link": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-literal": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-meta": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-name": Object {
+                                    "color": "#008",
+                                  },
+                                  "hljs-number": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-params": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-quote": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-regexp": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-section": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-selector-class": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-id": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-tag": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-string": Object {
+                                    "color": "#c41a16",
+                                  },
+                                  "hljs-strong": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-subst": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-symbol": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-tag": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-template-variable": Object {
+                                    "color": "#660",
+                                  },
+                                  "hljs-title": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-type": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-variable": Object {
+                                    "color": "#660",
+                                  },
+                                }
+                              }
+                            >
+                              <styled.pre
+                                style={
+                                  Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": null,
+                                    "padding": null,
+                                  }
+                                }
+                              >
+                                <pre
+                                  className="c9"
+                                  style={
+                                    Object {
+                                      "background": "#fff",
+                                      "color": "black",
+                                      "display": "block",
+                                      "overflowX": null,
+                                      "padding": null,
+                                    }
+                                  }
+                                >
+                                  <styled.code>
+                                    <code
+                                      className="c10"
+                                    >
+                                          client.query(
+                                      <span
+                                        key="code-segement1"
+                                        style={
+                                          Object {
+                                            "color": "#c41a16",
+                                          }
+                                        }
+                                      >
+                                        'SELECT id FROM customers WHERE id=$1'
+                                      </span>
+                                      , [req.body.customer_id], next())
+                                    </code>
+                                  </styled.code>
+                                </pre>
+                              </styled.pre>
+                            </SyntaxHighlighter>
+                            <SyntaxHighlighter
+                              CodeTag={[Function]}
+                              PreTag={[Function]}
+                              customStyle={
+                                Object {
+                                  "overflowX": null,
+                                  "padding": null,
+                                }
+                              }
+                              key="    req.body.lines.forEach(function (line) {3"
+                              language="javascript"
+                              style={
+                                Object {
+                                  "hljs": Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": "auto",
+                                    "padding": "0.5em",
+                                  },
+                                  "hljs-addition": Object {
+                                    "backgroundColor": "#baeeba",
+                                  },
+                                  "hljs-attr": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-attribute": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-built_in": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-builtin-name": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-bullet": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-class .hljs-title": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-comment": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-deletion": Object {
+                                    "backgroundColor": "#ffc8bd",
+                                  },
+                                  "hljs-doctag": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-emphasis": Object {
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-formula": Object {
+                                    "backgroundColor": "#eee",
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-keyword": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-link": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-literal": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-meta": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-name": Object {
+                                    "color": "#008",
+                                  },
+                                  "hljs-number": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-params": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-quote": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-regexp": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-section": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-selector-class": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-id": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-tag": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-string": Object {
+                                    "color": "#c41a16",
+                                  },
+                                  "hljs-strong": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-subst": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-symbol": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-tag": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-template-variable": Object {
+                                    "color": "#660",
+                                  },
+                                  "hljs-title": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-type": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-variable": Object {
+                                    "color": "#660",
+                                  },
+                                }
+                              }
+                            >
+                              <styled.pre
+                                style={
+                                  Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": null,
+                                    "padding": null,
+                                  }
+                                }
+                              >
+                                <pre
+                                  className="c9"
+                                  style={
+                                    Object {
+                                      "background": "#fff",
+                                      "color": "black",
+                                      "display": "block",
+                                      "overflowX": null,
+                                      "padding": null,
+                                    }
+                                  }
+                                >
+                                  <styled.code>
+                                    <code
+                                      className="c10"
+                                    >
+                                          req.body.lines.forEach(
+                                      <span
+                                        key="code-segement1"
+                                        style={Object {}}
+                                      >
+                                        <span
+                                          key="code-segment-1-0"
+                                          style={
+                                            Object {
+                                              "color": "#aa0d91",
+                                            }
+                                          }
+                                        >
+                                          function
+                                        </span>
+                                         (
+                                        <span
+                                          key="code-segment-1-2"
+                                          style={
+                                            Object {
+                                              "color": "#5c2699",
+                                            }
+                                          }
+                                        >
+                                          line
+                                        </span>
+                                        ) 
+                                      </span>
+                                      {
+                                    </code>
+                                  </styled.code>
+                                </pre>
+                              </styled.pre>
+                            </SyntaxHighlighter>
+                            <SyntaxHighlighter
+                              CodeTag={[Function]}
+                              PreTag={[Function]}
+                              customStyle={
+                                Object {
+                                  "overflowX": null,
+                                  "padding": null,
+                                }
+                              }
+                              key="      client.query('SELECT id FROM products WHERE id=$1', [line.id], next())4"
+                              language="javascript"
+                              style={
+                                Object {
+                                  "hljs": Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": "auto",
+                                    "padding": "0.5em",
+                                  },
+                                  "hljs-addition": Object {
+                                    "backgroundColor": "#baeeba",
+                                  },
+                                  "hljs-attr": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-attribute": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-built_in": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-builtin-name": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-bullet": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-class .hljs-title": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-comment": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-deletion": Object {
+                                    "backgroundColor": "#ffc8bd",
+                                  },
+                                  "hljs-doctag": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-emphasis": Object {
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-formula": Object {
+                                    "backgroundColor": "#eee",
+                                    "fontStyle": "italic",
+                                  },
+                                  "hljs-keyword": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-link": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-literal": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-meta": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-name": Object {
+                                    "color": "#008",
+                                  },
+                                  "hljs-number": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-params": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-quote": Object {
+                                    "color": "#006a00",
+                                  },
+                                  "hljs-regexp": Object {
+                                    "color": "#080",
+                                  },
+                                  "hljs-section": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-selector-class": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-id": Object {
+                                    "color": "#9b703f",
+                                  },
+                                  "hljs-selector-tag": Object {
+                                    "color": "#aa0d91",
+                                  },
+                                  "hljs-string": Object {
+                                    "color": "#c41a16",
+                                  },
+                                  "hljs-strong": Object {
+                                    "fontWeight": "bold",
+                                  },
+                                  "hljs-subst": Object {
+                                    "color": "#000",
+                                  },
+                                  "hljs-symbol": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-tag": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-template-variable": Object {
+                                    "color": "#660",
+                                  },
+                                  "hljs-title": Object {
+                                    "color": "#1c00cf",
+                                  },
+                                  "hljs-type": Object {
+                                    "color": "#5c2699",
+                                  },
+                                  "hljs-variable": Object {
+                                    "color": "#660",
+                                  },
+                                }
+                              }
+                            >
+                              <styled.pre
+                                style={
+                                  Object {
+                                    "background": "#fff",
+                                    "color": "black",
+                                    "display": "block",
+                                    "overflowX": null,
+                                    "padding": null,
+                                  }
+                                }
+                              >
+                                <pre
+                                  className="c9"
+                                  style={
+                                    Object {
+                                      "background": "#fff",
+                                      "color": "black",
+                                      "display": "block",
+                                      "overflowX": null,
+                                      "padding": null,
+                                    }
+                                  }
+                                >
+                                  <styled.code>
+                                    <code
+                                      className="c10"
+                                    >
+                                            client.query(
+                                      <span
+                                        key="code-segement1"
+                                        style={
+                                          Object {
+                                            "color": "#c41a16",
+                                          }
+                                        }
+                                      >
+                                        'SELECT id FROM products WHERE id=$1'
+                                      </span>
+                                      , [line.id], next())
+                                    </code>
+                                  </styled.code>
+                                </pre>
+                              </styled.pre>
+                            </SyntaxHighlighter>
+                          </div>
+                        </styled.div>
+                      </div>
+                    </styled.div>
+                  </Context>
+                </div>
+              </styled.div>
+              <Variables />
+            </div>
           </div>
-        </styled.div>
-      </Context>
-      <Variables />
+        </EuiMutationObserver>
+      </div>
     </div>
-  </styled.div>
+  </EuiAccordion>
 </Stackframe>
 `;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/index.tsx
index ffa740792ceded..ca14be237d22bb 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/index.tsx
@@ -10,7 +10,7 @@ import { isEmpty, last } from 'lodash';
 import React, { Fragment } from 'react';
 import { IStackframe } from '../../../../typings/es_schemas/raw/fields/Stackframe';
 import { EmptyMessage } from '../../shared/EmptyMessage';
-import { LibraryStackFrames } from './LibraryStackFrames';
+import { LibraryStacktrace } from './LibraryStacktrace';
 import { Stackframe } from './Stackframe';
 
 interface Props {
@@ -25,7 +25,7 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) {
         heading={i18n.translate(
           'xpack.apm.stacktraceTab.noStacktraceAvailableLabel',
           {
-            defaultMessage: 'No stacktrace available.'
+            defaultMessage: 'No stack trace available.'
           }
         )}
         hideSubheading
@@ -34,16 +34,17 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) {
   }
 
   const groups = getGroupedStackframes(stackframes);
+
   return (
     <Fragment>
       {groups.map((group, i) => {
         // library frame
-        if (group.isLibraryFrame) {
+        if (group.isLibraryFrame && groups.length > 1) {
           return (
             <Fragment key={i}>
               <EuiSpacer size="m" />
-              <LibraryStackFrames
-                initialVisiblity={false}
+              <LibraryStacktrace
+                id={i.toString()}
                 stackframes={group.stackframes}
                 codeLanguage={codeLanguage}
               />
@@ -56,7 +57,12 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) {
         return group.stackframes.map((stackframe, idx) => (
           <Fragment key={`${i}-${idx}`}>
             {idx > 0 && <EuiSpacer size="m" />}
-            <Stackframe codeLanguage={codeLanguage} stackframe={stackframe} />
+            <Stackframe
+              codeLanguage={codeLanguage}
+              id={`${i}-${idx}`}
+              initialIsOpen={i === 0 && groups.length > 1}
+              stackframe={stackframe}
+            />
           </Fragment>
         ));
       })}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItem.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItem.tsx
index 9f07c06f6ff5aa..964debbedb2e42 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItem.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItem.tsx
@@ -6,7 +6,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
-import { px } from '../../../../../code/public/style/variables';
+import { px } from '../../../../public/style/variables';
 import { ErrorCountBadge } from '../../app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge';
 import { units } from '../../../style/variables';
 
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx
index 8f91b8cc5e2af1..b6e783a00b5d67 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.tsx
@@ -61,7 +61,7 @@ const TransactionSummary = ({
     ) : null
   ];
 
-  return <Summary items={items}></Summary>;
+  return <Summary items={items} />;
 };
 
 export { TransactionSummary };
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TimestampTooltip/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TimestampTooltip/index.test.tsx
index c9f6afa0b36116..a7149c7604695f 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TimestampTooltip/index.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TimestampTooltip/index.test.tsx
@@ -7,17 +7,56 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import moment from 'moment-timezone';
-import { TimestampTooltip } from './index';
+import { TimestampTooltip, asAbsoluteTime } from './index';
 import { mockNow } from '../../../utils/testHelpers';
 
+describe('asAbsoluteTime', () => {
+  afterAll(() => moment.tz.setDefault(''));
+
+  it('should add a leading plus for timezones with positive UTC offset', () => {
+    moment.tz.setDefault('Europe/Copenhagen');
+    expect(asAbsoluteTime({ time: 1559390400000, precision: 'minutes' })).toBe(
+      'Jun 1, 2019, 14:00 (UTC+2)'
+    );
+  });
+
+  it('should add a leading minus for timezones with negative UTC offset', () => {
+    moment.tz.setDefault('America/Los_Angeles');
+    expect(asAbsoluteTime({ time: 1559390400000, precision: 'minutes' })).toBe(
+      'Jun 1, 2019, 05:00 (UTC-7)'
+    );
+  });
+
+  it('should use default UTC offset formatting when offset contains minutes', () => {
+    moment.tz.setDefault('Canada/Newfoundland');
+    expect(asAbsoluteTime({ time: 1559390400000, precision: 'minutes' })).toBe(
+      'Jun 1, 2019, 09:30 (UTC-02:30)'
+    );
+  });
+
+  it('should respect DST', () => {
+    moment.tz.setDefault('Europe/Copenhagen');
+    const timeWithDST = 1559390400000; //  Jun 1, 2019
+    const timeWithoutDST = 1575201600000; //  Dec 1, 2019
+
+    expect(asAbsoluteTime({ time: timeWithDST })).toBe(
+      'Jun 1, 2019, 14:00:00.000 (UTC+2)'
+    );
+
+    expect(asAbsoluteTime({ time: timeWithoutDST })).toBe(
+      'Dec 1, 2019, 13:00:00.000 (UTC+1)'
+    );
+  });
+});
+
 describe('TimestampTooltip', () => {
-  const timestamp = 1570720000123;
+  const timestamp = 1570720000123; // Oct 10, 2019, 08:06:40.123 (UTC-7)
 
   beforeAll(() => {
     // mock Date.now
     mockNow(1570737000000);
 
-    moment.tz.setDefault('Etc/GMT');
+    moment.tz.setDefault('America/Los_Angeles');
   });
 
   afterAll(() => moment.tz.setDefault(''));
@@ -26,7 +65,7 @@ describe('TimestampTooltip', () => {
     expect(shallow(<TimestampTooltip time={timestamp} />))
       .toMatchInlineSnapshot(`
       <EuiToolTip
-        content="Oct 10th 2019, 15:06:40.123 (+0000 GMT)"
+        content="Oct 10, 2019, 08:06:40.123 (UTC-7)"
         delay="regular"
         position="top"
       >
@@ -40,7 +79,15 @@ describe('TimestampTooltip', () => {
       shallow(<TimestampTooltip time={timestamp} />)
         .find('EuiToolTip')
         .prop('content')
-    ).toBe('Oct 10th 2019, 15:06:40.123 (+0000 GMT)');
+    ).toBe('Oct 10, 2019, 08:06:40.123 (UTC-7)');
+  });
+
+  it('should format with precision in seconds', () => {
+    expect(
+      shallow(<TimestampTooltip time={timestamp} precision="seconds" />)
+        .find('EuiToolTip')
+        .prop('content')
+    ).toBe('Oct 10, 2019, 08:06:40 (UTC-7)');
   });
 
   it('should format with precision in minutes', () => {
@@ -48,7 +95,7 @@ describe('TimestampTooltip', () => {
       shallow(<TimestampTooltip time={timestamp} precision="minutes" />)
         .find('EuiToolTip')
         .prop('content')
-    ).toBe('Oct 10th 2019, 15:06 (+0000 GMT)');
+    ).toBe('Oct 10, 2019, 08:06 (UTC-7)');
   });
 
   it('should format with precision in days', () => {
@@ -56,6 +103,6 @@ describe('TimestampTooltip', () => {
       shallow(<TimestampTooltip time={timestamp} precision="days" />)
         .find('EuiToolTip')
         .prop('content')
-    ).toBe('Oct 10th 2019 (+0000 GMT)');
+    ).toBe('Oct 10, 2019 (UTC-7)');
   });
 });
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TimestampTooltip/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TimestampTooltip/index.tsx
index 1f7fcccdd56d0e..d7ef6517c2fb83 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TimestampTooltip/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TimestampTooltip/index.tsx
@@ -12,7 +12,7 @@ interface Props {
    * timestamp in milliseconds
    */
   time: number;
-  precision?: 'days' | 'minutes' | 'milliseconds';
+  precision?: 'days' | 'minutes' | 'seconds' | 'milliseconds';
 }
 
 function getPreciseTime(precision: Props['precision']) {
@@ -21,17 +21,33 @@ function getPreciseTime(precision: Props['precision']) {
       return '';
     case 'minutes':
       return ', HH:mm';
+    case 'seconds':
+      return ', HH:mm:ss';
     default:
       return ', HH:mm:ss.SSS';
   }
 }
 
+function withLeadingPlus(value: number) {
+  return value > 0 ? `+${value}` : value;
+}
+
+export function asAbsoluteTime({ time, precision = 'milliseconds' }: Props) {
+  const momentTime = moment(time);
+  const utcOffsetHours = momentTime.utcOffset() / 60;
+  const utcOffsetFormatted = Number.isInteger(utcOffsetHours)
+    ? withLeadingPlus(utcOffsetHours)
+    : 'Z';
+
+  return momentTime.format(
+    `MMM D, YYYY${getPreciseTime(precision)} (UTC${utcOffsetFormatted})`
+  );
+}
+
 export function TimestampTooltip({ time, precision = 'milliseconds' }: Props) {
   const momentTime = moment(time);
   const relativeTimeLabel = momentTime.fromNow();
-  const absoluteTimeLabel = momentTime.format(
-    `MMM Do YYYY${getPreciseTime(precision)} (ZZ zz)`
-  );
+  const absoluteTimeLabel = asAbsoluteTime({ time, precision });
 
   return (
     <EuiToolTip content={absoluteTimeLabel}>
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
index a121e8dc25b437..533bc845f14f99 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
@@ -81,7 +81,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = (
 
   const infraConfigItems: InfraConfigItem[] = [
     {
-      icon: 'loggingApp',
+      icon: 'logsApp',
       label: i18n.translate(
         'xpack.apm.transactionActionMenu.showPodLogsLinkLabel',
         { defaultMessage: 'Show pod logs' }
@@ -91,7 +91,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = (
       query: { time }
     },
     {
-      icon: 'loggingApp',
+      icon: 'logsApp',
       label: i18n.translate(
         'xpack.apm.transactionActionMenu.showContainerLogsLinkLabel',
         { defaultMessage: 'Show container logs' }
@@ -101,7 +101,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = (
       query: { time }
     },
     {
-      icon: 'loggingApp',
+      icon: 'logsApp',
       label: i18n.translate(
         'xpack.apm.transactionActionMenu.showHostLogsLinkLabel',
         { defaultMessage: 'Show host logs' }
@@ -111,7 +111,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = (
       query: { time }
     },
     {
-      icon: 'loggingApp',
+      icon: 'logsApp',
       label: i18n.translate(
         'xpack.apm.transactionActionMenu.showTraceLogsLinkLabel',
         { defaultMessage: 'Show trace logs' }
@@ -124,7 +124,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = (
       }
     },
     {
-      icon: 'infraApp',
+      icon: 'metricsApp',
       label: i18n.translate(
         'xpack.apm.transactionActionMenu.showPodMetricsLinkLabel',
         { defaultMessage: 'Show pod metrics' }
@@ -134,7 +134,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = (
       query: infraMetricsQuery
     },
     {
-      icon: 'infraApp',
+      icon: 'metricsApp',
       label: i18n.translate(
         'xpack.apm.transactionActionMenu.showContainerMetricsLinkLabel',
         { defaultMessage: 'Show container metrics' }
@@ -144,7 +144,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = (
       query: infraMetricsQuery
     },
     {
-      icon: 'infraApp',
+      icon: 'metricsApp',
       label: i18n.translate(
         'xpack.apm.transactionActionMenu.showHostMetricsLinkLabel',
         { defaultMessage: 'Show host metrics' }
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts
index 0605c7dc8b02ac..dc815145db4ade 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/getTimezoneOffsetInMs.test.ts
@@ -7,7 +7,8 @@
 import { getTimezoneOffsetInMs } from './getTimezoneOffsetInMs';
 import moment from 'moment-timezone';
 
-describe('getTimezoneOffsetInMs', () => {
+// FAILING: https://github.com/elastic/kibana/issues/50005
+describe.skip('getTimezoneOffsetInMs', () => {
   describe('when no default timezone is set', () => {
     it('guesses the timezone', () => {
       const guess = jest.fn(() => 'Etc/UTC');
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Tooltip/index.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Tooltip/index.js
index 20096d81a94cb8..f5992ac7fc63b5 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Tooltip/index.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Tooltip/index.js
@@ -7,7 +7,6 @@
 import React from 'react';
 import { isEmpty } from 'lodash';
 import { Hint } from 'react-vis';
-import moment from 'moment';
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
 import {
@@ -20,6 +19,7 @@ import {
 } from '../../../../style/variables';
 import Legend from '../Legend';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
+import { asAbsoluteTime } from '../../TimestampTooltip';
 
 const TooltipElm = styled.div`
   margin: 0 ${px(unit)};
@@ -87,7 +87,9 @@ export default function Tooltip({
   return (
     <Hint {...props} value={{ x, y }}>
       <TooltipElm>
-        <Header>{header || moment(x).format('MMMM Do YYYY, HH:mm:ss')}</Header>
+        <Header>
+          {header || asAbsoluteTime({ time: x, precision: 'seconds' })}
+        </Header>
 
         <Content>
           {showLegends ? (
diff --git a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/helpers.ts b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/helpers.ts
index 29a27f034be8aa..75b5e0f2a05c8a 100644
--- a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/helpers.ts
+++ b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/helpers.ts
@@ -8,6 +8,13 @@ import { compact, pick } from 'lodash';
 import datemath from '@elastic/datemath';
 import { IUrlParams } from './types';
 
+interface PathParams {
+  processorEvent?: 'error' | 'metric' | 'transaction';
+  serviceName?: string;
+  errorGroupId?: string;
+  serviceNodeName?: string;
+}
+
 export function getParsedDate(rawDate?: string, opts = {}) {
   if (rawDate) {
     const parsed = datemath.parse(rawDate, opts);
@@ -56,7 +63,7 @@ export function removeUndefinedProps<T>(obj: T): Partial<T> {
   return pick(obj, value => value !== undefined);
 }
 
-export function getPathParams(pathname: string = '') {
+export function getPathParams(pathname: string = ''): PathParams {
   const paths = getPathAsArray(pathname);
   const pageName = paths[0];
 
@@ -92,17 +99,15 @@ export function getPathParams(pathname: string = '') {
           };
         case 'nodes':
           return {
+            processorEvent: 'metric',
             serviceName
           };
         case 'service-map':
           return {
-            processorEvent: 'service-map',
             serviceName
           };
         default:
-          return {
-            processorEvent: 'transaction'
-          };
+          return {};
       }
 
     case 'traces':
diff --git a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/resolveUrlParams.ts b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/resolveUrlParams.ts
index febe0691d7c1ce..7972bdbcf2ee63 100644
--- a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/resolveUrlParams.ts
+++ b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/resolveUrlParams.ts
@@ -53,7 +53,8 @@ export function resolveUrlParams(location: Location, state: TimeUrlParams) {
     refreshInterval = TIMEPICKER_DEFAULTS.refreshInterval,
     rangeFrom = TIMEPICKER_DEFAULTS.rangeFrom,
     rangeTo = TIMEPICKER_DEFAULTS.rangeTo,
-    environment
+    environment,
+    searchTerm
   } = query;
 
   const localUIFilters = pickKeys(query, ...localUIFilterNames);
@@ -81,6 +82,7 @@ export function resolveUrlParams(location: Location, state: TimeUrlParams) {
     kuery: kuery && decodeURIComponent(kuery),
     transactionName,
     transactionType,
+    searchTerm: toString(searchTerm),
 
     // path params
     processorEvent,
diff --git a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/types.ts b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/types.ts
index ca4e0413aa4bfc..fc5f5dfb6e3013 100644
--- a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/types.ts
+++ b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/types.ts
@@ -29,4 +29,6 @@ export type IUrlParams = {
   page?: number;
   pageSize?: number;
   serviceNodeName?: string;
+  searchTerm?: string;
+  processorEvent?: 'transaction' | 'error' | 'metric';
 } & Partial<Record<LocalUIFilterName, string>>;
diff --git a/x-pack/legacy/plugins/apm/public/hooks/useKueryBarIndexPattern.ts b/x-pack/legacy/plugins/apm/public/hooks/useKueryBarIndexPattern.ts
new file mode 100644
index 00000000000000..5fb9405559d560
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/hooks/useKueryBarIndexPattern.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 { useFetcher } from './useFetcher';
+
+export function useKueryBarIndexPattern(
+  processorEvent: 'transaction' | 'metric' | 'error' | undefined
+) {
+  const { data: indexPattern, status } = useFetcher(
+    callApmApi => {
+      return callApmApi({
+        pathname: '/api/apm/kuery_bar_index_pattern',
+        forceCache: true,
+        params: {
+          query: {
+            processorEvent
+          }
+        }
+      });
+    },
+    [processorEvent]
+  );
+
+  return {
+    indexPattern,
+    status
+  };
+}
diff --git a/x-pack/legacy/plugins/apm/public/index.tsx b/x-pack/legacy/plugins/apm/public/index.tsx
index 16b8e9527245c4..d724a2976c8974 100644
--- a/x-pack/legacy/plugins/apm/public/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/index.tsx
@@ -9,7 +9,6 @@ import ReactDOM from 'react-dom';
 import { npStart } from 'ui/new_platform';
 import 'react-vis/dist/style.css';
 import 'ui/autoload/all';
-import 'ui/autoload/styles';
 import chrome from 'ui/chrome';
 // @ts-ignore
 import { uiModules } from 'ui/modules';
diff --git a/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts b/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts
index 4b65190d8ef222..b15231e89365a3 100644
--- a/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts
+++ b/x-pack/legacy/plugins/apm/public/selectors/chartSelectors.ts
@@ -11,7 +11,6 @@ import mean from 'lodash.mean';
 import { rgba } from 'polished';
 import { TimeSeriesAPIResponse } from '../../server/lib/transactions/charts';
 import { ApmTimeSeriesResponse } from '../../server/lib/transactions/charts/get_timeseries_data/transform';
-import { StringMap } from '../../typings/common';
 import {
   Coordinate,
   RectCoordinate,
@@ -192,7 +191,7 @@ function getColorByKey(keys: string[]) {
   const assignedColors = ['HTTP 2xx', 'HTTP 3xx', 'HTTP 4xx', 'HTTP 5xx'];
 
   const unknownKeys = difference(keys, assignedColors);
-  const unassignedColors: StringMap<string> = zipObject(unknownKeys, [
+  const unassignedColors: Record<string, string> = zipObject(unknownKeys, [
     theme.euiColorVis1,
     theme.euiColorVis3,
     theme.euiColorVis4,
diff --git a/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts b/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts
index abe44a0fb39345..83e8f020e25291 100644
--- a/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts
+++ b/x-pack/legacy/plugins/apm/public/services/__test__/SessionStorageMock.ts
@@ -4,10 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { StringMap } from '../../../typings/common';
-
 export class SessionStorageMock {
-  private store: StringMap = {};
+  private store: Record<string, unknown> = {};
 
   public clear() {
     this.store = {};
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/ml.ts b/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
index 968450e6aa796e..28b14fa722bbd4 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { npStart } from 'ui/new_platform';
-import { ESFilter } from 'elasticsearch';
 import { HttpServiceBase } from 'kibana/public';
 import {
   PROCESSOR_EVENT,
@@ -14,6 +12,8 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { getMlJobId, getMlPrefix } from '../../../common/ml_job_constants';
 import { callApi } from './callApi';
+import { ESFilter } from '../../../typings/elasticsearch';
+import { createCallApmApi, APMClient } from './createCallApmApi';
 
 interface MlResponseItem {
   id: string;
@@ -32,7 +32,14 @@ interface StartedMLJobApiResponse {
   jobs: MlResponseItem[];
 }
 
-const { core } = npStart;
+async function getTransactionIndices(http: HttpServiceBase) {
+  const callApmApi: APMClient = createCallApmApi(http);
+  const indices = await callApmApi({
+    method: 'GET',
+    pathname: `/api/apm/settings/apm-indices`
+  });
+  return indices['apm_oss.transactionIndices'];
+}
 
 export async function startMLJob({
   serviceName,
@@ -43,9 +50,7 @@ export async function startMLJob({
   transactionType: string;
   http: HttpServiceBase;
 }) {
-  const indexPatternName = core.injectedMetadata.getInjectedVar(
-    'apmTransactionIndices'
-  );
+  const transactionIndices = await getTransactionIndices(http);
   const groups = ['apm', serviceName.toLowerCase()];
   const filter: ESFilter[] = [
     { term: { [SERVICE_NAME]: serviceName } },
@@ -59,7 +64,7 @@ export async function startMLJob({
     body: JSON.stringify({
       prefix: getMlPrefix(serviceName, transactionType),
       groups,
-      indexPatternName,
+      indexPatternName: transactionIndices,
       startDatafeed: true,
       query: {
         bool: {
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts b/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts
index 146376665a0e69..95e283cd67709d 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts
@@ -5,7 +5,6 @@
  */
 
 import { HttpServiceBase } from 'kibana/public';
-import { StringMap } from '../../../typings/common';
 import { callApi } from './callApi';
 
 export interface LicenseApiResponse {
@@ -13,11 +12,11 @@ export interface LicenseApiResponse {
     is_active: boolean;
   };
   features: {
-    beats_management?: StringMap;
-    graph?: StringMap;
-    grokdebugger?: StringMap;
-    index_management?: StringMap;
-    logstash?: StringMap;
+    beats_management?: Record<string, unknown>;
+    graph?: Record<string, unknown>;
+    grokdebugger?: Record<string, unknown>;
+    index_management?: Record<string, unknown>;
+    logstash?: Record<string, unknown>;
     ml?: {
       is_available: boolean;
       license_type: number;
@@ -25,12 +24,12 @@ export interface LicenseApiResponse {
       enable_links: boolean;
       show_links: boolean;
     };
-    reporting?: StringMap;
-    rollup?: StringMap;
-    searchprofiler?: StringMap;
-    security?: StringMap;
-    spaces?: StringMap;
-    tilemap?: StringMap;
+    reporting?: Record<string, unknown>;
+    rollup?: Record<string, unknown>;
+    searchprofiler?: Record<string, unknown>;
+    security?: Record<string, unknown>;
+    spaces?: Record<string, unknown>;
+    tilemap?: Record<string, unknown>;
     watcher?: {
       is_available: boolean;
       enable_links: boolean;
diff --git a/x-pack/legacy/plugins/apm/public/utils/__test__/flattenObject.test.ts b/x-pack/legacy/plugins/apm/public/utils/__test__/flattenObject.test.ts
new file mode 100644
index 00000000000000..8ec826c7f3d084
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/utils/__test__/flattenObject.test.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { flattenObject } from '../flattenObject';
+
+describe('FlattenObject', () => {
+  it('flattens multi level item', () => {
+    const data = {
+      foo: {
+        item1: 'value 1',
+        item2: { itemA: 'value 2' }
+      },
+      bar: {
+        item3: { itemA: { itemAB: 'value AB' } },
+        item4: 'value 4',
+        item5: [1],
+        item6: [1, 2, 3]
+      }
+    };
+
+    const flatten = flattenObject(data);
+    expect(flatten).toEqual([
+      { key: 'bar.item3.itemA.itemAB', value: 'value AB' },
+      { key: 'bar.item4', value: 'value 4' },
+      { key: 'bar.item5', value: 1 },
+      { key: 'bar.item6.0', value: 1 },
+      { key: 'bar.item6.1', value: 2 },
+      { key: 'bar.item6.2', value: 3 },
+      { key: 'foo.item1', value: 'value 1' },
+      { key: 'foo.item2.itemA', value: 'value 2' }
+    ]);
+  });
+  it('returns an empty array if no valid object is provided', () => {
+    expect(flattenObject({})).toEqual([]);
+    expect(flattenObject(null)).toEqual([]);
+    expect(flattenObject(undefined)).toEqual([]);
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/utils/flattenObject.ts b/x-pack/legacy/plugins/apm/public/utils/flattenObject.ts
new file mode 100644
index 00000000000000..01a58ac03d0c3f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/utils/flattenObject.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 { compact, isObject } from 'lodash';
+
+export interface KeyValuePair {
+  key: string;
+  value: unknown;
+}
+
+export const flattenObject = (
+  item: Record<string, any | any[]> | null | undefined,
+  parentKey?: string
+): KeyValuePair[] => {
+  if (item) {
+    const isArrayWithSingleValue = Array.isArray(item) && item.length === 1;
+    return Object.keys(item)
+      .sort()
+      .reduce((acc: KeyValuePair[], key) => {
+        const childKey = isArrayWithSingleValue ? '' : key;
+        const currentKey = compact([parentKey, childKey]).join('.');
+        // item[key] can be a primitive (string, number, boolean, null, undefined) or Object or Array
+        if (isObject(item[key])) {
+          return acc.concat(flattenObject(item[key], currentKey));
+        } else {
+          acc.push({ key: currentKey, value: item[key] });
+          return acc;
+        }
+      }, []);
+  }
+  return [];
+};
diff --git a/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts b/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts
index db1ed490eb7f20..130a7b52ea33be 100644
--- a/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts
+++ b/x-pack/legacy/plugins/apm/public/utils/httpStatusCodeToColor.ts
@@ -5,8 +5,6 @@
  */
 
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { StringMap } from '../../typings/common';
-
 const { euiColorDarkShade, euiColorWarning } = theme;
 
 export const errorColor = '#c23c2b';
@@ -14,7 +12,7 @@ export const neutralColor = euiColorDarkShade;
 export const successColor = '#327a42';
 export const warningColor = euiColorWarning;
 
-const httpStatusCodeColors: StringMap<string> = {
+const httpStatusCodeColors: Record<string, string> = {
   1: neutralColor,
   2: successColor,
   3: neutralColor,
diff --git a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
index 73b81bfed4794c..a18882120fe757 100644
--- a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
@@ -15,9 +15,9 @@ import { Moment } from 'moment-timezone';
 import React from 'react';
 import { render, waitForElement } from 'react-testing-library';
 import { MemoryRouter } from 'react-router-dom';
-import { ESFilter } from 'elasticsearch';
 import { LocationProvider } from '../context/LocationContext';
 import { PromiseReturnType } from '../../typings/common';
+import { ESFilter } from '../../typings/elasticsearch';
 
 export function toJson(wrapper: ReactWrapper) {
   return enzymeToJson(wrapper, {
@@ -102,6 +102,15 @@ interface MockSetup {
     has: any;
   };
   uiFiltersES: ESFilter[];
+  indices: {
+    'apm_oss.sourcemapIndices': string;
+    'apm_oss.errorIndices': string;
+    'apm_oss.onboardingIndices': string;
+    'apm_oss.spanIndices': string;
+    'apm_oss.transactionIndices': string;
+    'apm_oss.metricsIndices': string;
+    'apm_oss.apmAgentConfigurationIndex': string;
+  };
 }
 
 export async function inspectSearchParams(
@@ -127,7 +136,16 @@ export async function inspectSearchParams(
       {
         term: { 'service.environment': 'prod' }
       }
-    ]
+    ],
+    indices: {
+      'apm_oss.sourcemapIndices': 'myIndex',
+      'apm_oss.errorIndices': 'myIndex',
+      'apm_oss.onboardingIndices': 'myIndex',
+      'apm_oss.spanIndices': 'myIndex',
+      'apm_oss.transactionIndices': 'myIndex',
+      'apm_oss.metricsIndices': 'myIndex',
+      'apm_oss.apmAgentConfigurationIndex': 'myIndex'
+    }
   };
   try {
     await fn(mockSetup);
diff --git a/x-pack/legacy/plugins/apm/readme.md b/x-pack/legacy/plugins/apm/readme.md
index 90974cbe695880..a46b0c2895fcae 100644
--- a/x-pack/legacy/plugins/apm/readme.md
+++ b/x-pack/legacy/plugins/apm/readme.md
@@ -29,6 +29,13 @@ cd apm-integration-testing/
 
 _Docker Compose is required_
 
+### Debugging Elasticsearch queries
+
+All APM api endpoints accept `_debug=true` as a query param that will result in the underlying ES query being outputted in the Kibana backend process.
+
+Example:
+`/api/apm/services/my_service?_debug=true`
+
 ### Unit testing
 
 Note: Run the following commands from `kibana/x-pack`.
@@ -45,10 +52,6 @@ node scripts/jest.js plugins/apm --watch
 node scripts/jest.js plugins/apm --updateSnapshot
 ```
 
-### Cypress E2E tests
-
-See the Cypress-specific [readme.md](cypress/README.md)
-
 ### Linting
 
 _Note: Run the following commands from `kibana/`._
@@ -65,56 +68,8 @@ yarn prettier  "./x-pack/legacy/plugins/apm/**/*.{tsx,ts,js}" --write
 yarn eslint ./x-pack/legacy/plugins/apm --fix
 ```
 
-### Visual Studio Code
-
-When using [Visual Studio Code](https://code.visualstudio.com/) with APM it's best to set up a [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) and add the `x-pack/legacy/plugins/apm` directory, the `x-pack` directory, and the root of the Kibana repository to the workspace. This makes it so you can navigate and search within APM and use the wider workspace roots when you need to widen your search.
-
-#### Using the Jest extension
-
-The [vscode-jest extension](https://marketplace.visualstudio.com/items?itemName=Orta.vscode-jest) is a good way to run your Jest tests inside the editor.
-
-Some of the benefits of using the extension over just running it in a terminal are:
-
-• It shows the pass/fail of a test inline in the test file
-• It shows the error message in the test file if it fails
-• You don’t have to have the terminal process running
-• It can automatically update your snapshots when they change
-• Coverage mapping
-
-The extension doesn't really work well if you're trying to use it on all of Kibana or all of X-Pack, but it works well if you configure it to run only on the files in APM.
-
-If you have a workspace configured as described above you should have:
-
-```json
-"jest.disabledWorkspaceFolders": ["kibana", "x-pack"]
-```
-
-in your Workspace settings, and:
-
-```json
-"jest.pathToJest": "node scripts/jest.js --testPathPattern=legacy/plugins/apm",
-"jest.rootPath": "../../.."
-```
-
-in the settings for the APM folder.
-
-#### Jest debugging
-
-To make the [VSCode debugger](https://vscode.readthedocs.io/en/latest/editor/debugging/) work with Jest (you can set breakpoints in the code and tests and use the VSCode debugger) you'll need the [Node Debug extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.node-debug2) installed and can set up a launch configuration like:
-
-```json
-{
-  "type": "node",
-  "name": "APM Jest",
-  "request": "launch",
-  "args": ["--runInBand", "--testPathPattern=legacy/plugins/apm"],
-  "cwd": "${workspaceFolder}/../../..",
-  "console": "internalConsole",
-  "internalConsoleOptions": "openOnSessionStart",
-  "disableOptimisticBPs": true,
-  "program": "${workspaceFolder}/../../../scripts/jest.js",
-  "runtimeVersion": "10.15.2"
-}
-```
+#### Further resources
 
-(you'll want `runtimeVersion` to match what's in the Kibana root .nvmrc. Depending on your setup, you might be able to remove this line.)
+- [Cypress integration tests](cypress/README.md)
+- [VSCode setup instructions](./dev_docs/vscode_setup.md)
+- [Github PR commands](./dev_docs/github_commands.md)
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig.js b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig.js
new file mode 100644
index 00000000000000..c1f1472dc90241
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig.js
@@ -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.
+ */
+
+const { optimizeTsConfig } = require('./optimize-tsconfig/optimize');
+
+optimizeTsConfig();
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/optimize.js b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/optimize.js
new file mode 100644
index 00000000000000..ef9e393db3eca7
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/optimize.js
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable import/no-extraneous-dependencies */
+
+const fs = require('fs');
+const promisify = require('util').promisify;
+const path = require('path');
+const json5 = require('json5');
+const execa = require('execa');
+
+const copyFile = promisify(fs.copyFile);
+const rename = promisify(fs.rename);
+const readFile = promisify(fs.readFile);
+const writeFile = promisify(fs.writeFile);
+
+const {
+  xpackRoot,
+  kibanaRoot,
+  apmRoot,
+  tsconfigTpl,
+  filesToIgnore
+} = require('./paths');
+const { unoptimizeTsConfig } = require('./unoptimize');
+
+function updateParentTsConfigs() {
+  return Promise.all(
+    [
+      path.resolve(xpackRoot, 'apm.tsconfig.json'),
+      path.resolve(kibanaRoot, 'tsconfig.json')
+    ].map(async filename => {
+      const config = json5.parse(await readFile(filename, 'utf-8'));
+
+      await writeFile(
+        filename,
+        JSON.stringify(
+          {
+            ...config,
+            include: []
+          },
+          null,
+          2
+        ),
+        { encoding: 'utf-8' }
+      );
+    })
+  );
+}
+
+async function setIgnoreChanges() {
+  for (const filename of filesToIgnore) {
+    await execa('git', ['update-index', '--skip-worktree', filename]);
+  }
+}
+
+const optimizeTsConfig = () => {
+  return unoptimizeTsConfig()
+    .then(() =>
+      Promise.all([
+        copyFile(tsconfigTpl, path.resolve(apmRoot, './tsconfig.json')),
+        rename(
+          path.resolve(xpackRoot, 'tsconfig.json'),
+          path.resolve(xpackRoot, 'apm.tsconfig.json')
+        )
+      ])
+    )
+    .then(() => updateParentTsConfigs())
+    .then(() => setIgnoreChanges())
+    .then(() => {
+      // eslint-disable-next-line no-console
+      console.log(
+        'Created an optimized tsconfig.json for APM. To undo these changes, run `./scripts/unoptimize-tsconfig.js`'
+      );
+    });
+};
+
+module.exports = {
+  optimizeTsConfig
+};
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/paths.js b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/paths.js
new file mode 100644
index 00000000000000..cdb8e4d878ea36
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/paths.js
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+const path = require('path');
+
+const apmRoot = path.resolve(__dirname, '../..');
+const xpackRoot = path.resolve(apmRoot, '../../..');
+const kibanaRoot = path.resolve(xpackRoot, '..');
+
+const tsconfigTpl = path.resolve(__dirname, './tsconfig.json');
+
+const filesToIgnore = [
+  path.resolve(xpackRoot, 'tsconfig.json'),
+  path.resolve(kibanaRoot, 'tsconfig.json')
+];
+
+module.exports = {
+  apmRoot,
+  xpackRoot,
+  kibanaRoot,
+  tsconfigTpl,
+  filesToIgnore
+};
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/tsconfig.json b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/tsconfig.json
new file mode 100644
index 00000000000000..e7d9abea65a3ac
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../../apm.tsconfig.json",
+  "include": [
+    "./**/*",
+    "../../../typings/**/*"
+  ],
+  "exclude": [
+    "**/__fixtures__/**/*",
+    "./cypress/**/*"
+  ]
+}
diff --git a/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/unoptimize.js b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/unoptimize.js
new file mode 100644
index 00000000000000..3fdf2a97363a8c
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/optimize-tsconfig/unoptimize.js
@@ -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.
+ */
+/* eslint-disable import/no-extraneous-dependencies */
+
+const path = require('path');
+const execa = require('execa');
+const fs = require('fs');
+const promisify = require('util').promisify;
+const removeFile = promisify(fs.unlink);
+const exists = promisify(fs.exists);
+
+const { apmRoot, filesToIgnore } = require('./paths');
+
+async function unoptimizeTsConfig() {
+  for (const filename of filesToIgnore) {
+    await execa('git', ['update-index', '--no-skip-worktree', filename]);
+    await execa('git', ['checkout', filename]);
+  }
+
+  const apmTsConfig = path.join(apmRoot, 'tsconfig.json');
+  if (await exists(apmTsConfig)) {
+    await removeFile(apmTsConfig);
+  }
+}
+
+module.exports = {
+  unoptimizeTsConfig: () => {
+    return unoptimizeTsConfig().then(() => {
+      // eslint-disable-next-line no-console
+      console.log('Removed APM TypeScript optimizations');
+    });
+  }
+};
diff --git a/x-pack/legacy/plugins/apm/scripts/unoptimize-tsconfig.js b/x-pack/legacy/plugins/apm/scripts/unoptimize-tsconfig.js
new file mode 100644
index 00000000000000..5362b6a6d52e20
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/unoptimize-tsconfig.js
@@ -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.
+ */
+
+const { unoptimizeTsConfig } = require('./optimize-tsconfig/unoptimize');
+
+unoptimizeTsConfig();
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/__snapshots__/get_buckets.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/__snapshots__/get_buckets.test.ts.snap
index 8d89e22fa98643..d336d71424750e 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/__snapshots__/get_buckets.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/__snapshots__/get_buckets.test.ts.snap
@@ -50,7 +50,7 @@ Array [
         },
         "size": 0,
       },
-      "index": "myIndex",
+      "index": "apm-*",
     },
   ],
 ]
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts
index 0b8cd8ae8703f8..b7081c43465bf8 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts
@@ -39,7 +39,16 @@ describe('timeseriesFetcher', () => {
           {
             term: { 'service.environment': 'prod' }
           }
-        ]
+        ],
+        indices: {
+          'apm_oss.sourcemapIndices': 'apm-*',
+          'apm_oss.errorIndices': 'apm-*',
+          'apm_oss.onboardingIndices': 'apm-*',
+          'apm_oss.spanIndices': 'apm-*',
+          'apm_oss.transactionIndices': 'apm-*',
+          'apm_oss.metricsIndices': 'apm-*',
+          'apm_oss.apmAgentConfigurationIndex': '.apm-agent-configuration'
+        }
       }
     });
   });
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts
index 9c49a7f613aaa1..afb8237178a20a 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from 'elasticsearch';
 import { idx } from '@kbn/elastic-idx';
+import { ESFilter } from '../../../../typings/elasticsearch';
 import {
   ERROR_GROUP_ID,
   PROCESSOR_EVENT,
@@ -25,7 +25,7 @@ export async function getBuckets({
   bucketSize: number;
   setup: Setup;
 }) {
-  const { start, end, uiFiltersES, client, config } = setup;
+  const { start, end, uiFiltersES, client, indices } = setup;
   const filter: ESFilter[] = [
     { term: { [PROCESSOR_EVENT]: 'error' } },
     { term: { [SERVICE_NAME]: serviceName } },
@@ -38,7 +38,7 @@ export async function getBuckets({
   }
 
   const params = {
-    index: config.get<string>('apm_oss.errorIndices'),
+    index: indices['apm_oss.errorIndices'],
     body: {
       size: 0,
       query: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts
index dee5deb4064e49..caadbfef326984 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_group.ts
@@ -29,10 +29,10 @@ export async function getErrorGroup({
   groupId: string;
   setup: Setup;
 }) {
-  const { start, end, uiFiltersES, client, config } = setup;
+  const { start, end, uiFiltersES, client, indices } = setup;
 
   const params = {
-    index: config.get<string>('apm_oss.errorIndices'),
+    index: indices['apm_oss.errorIndices'],
     body: {
       size: 1,
       query: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_groups.ts b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_groups.ts
index f692f94e255fc3..193ee4c2bbd1c2 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_groups.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_groups.ts
@@ -17,6 +17,7 @@ import { APMError } from '../../../typings/es_schemas/ui/APMError';
 import { Setup } from '../helpers/setup_request';
 import { getErrorGroupsProjection } from '../../../common/projections/errors';
 import { mergeProjection } from '../../../common/projections/util/merge_projection';
+import { SortOptions } from '../../../typings/elasticsearch/aggregations';
 
 export type ErrorGroupListAPIResponse = PromiseReturnType<
   typeof getErrorGroups
@@ -30,7 +31,7 @@ export async function getErrorGroups({
 }: {
   serviceName: string;
   sortField?: string;
-  sortDirection?: string;
+  sortDirection?: 'asc' | 'desc';
   setup: Setup;
 }) {
   const { client } = setup;
@@ -40,18 +41,21 @@ export async function getErrorGroups({
 
   const projection = getErrorGroupsProjection({ setup, serviceName });
 
+  const order: SortOptions = sortByLatestOccurrence
+    ? {
+        max_timestamp: sortDirection
+      }
+    : { _count: sortDirection };
+
   const params = mergeProjection(projection, {
     body: {
       size: 0,
       aggs: {
         error_groups: {
           terms: {
+            ...projection.body.aggs.error_groups.terms,
             size: 500,
-            order: sortByLatestOccurrence
-              ? {
-                  max_timestamp: sortDirection
-                }
-              : { _count: sortDirection }
+            order
           },
           aggs: {
             sample: {
@@ -64,7 +68,7 @@ export async function getErrorGroups({
                   ERROR_GROUP_ID,
                   '@timestamp'
                 ],
-                sort: [{ '@timestamp': 'desc' }],
+                sort: [{ '@timestamp': 'desc' as const }],
                 size: 1
               }
             },
@@ -98,13 +102,13 @@ export async function getErrorGroups({
     };
   }
 
-  const resp = await client.search(params);
+  const resp = await client.search<SampleError, typeof params>(params);
 
   // aggregations can be undefined when no matching indices are found.
   // this is an exception rather than the rule so the ES type does not account for this.
   const hits = (idx(resp, _ => _.aggregations.error_groups.buckets) || []).map(
     bucket => {
-      const source = bucket.sample.hits.hits[0]._source as SampleError;
+      const source = bucket.sample.hits.hits[0]._source;
       const message =
         idx(source, _ => _.error.log.message) ||
         idx(source, _ => _.error.exception[0].message);
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts b/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts
index aaac56d16c5996..9a6aed02e2a84c 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/get_trace_errors_per_transaction.ts
@@ -24,10 +24,10 @@ export async function getTraceErrorsPerTransaction(
   traceId: string,
   setup: Setup
 ): Promise<ErrorsPerTransaction> {
-  const { start, end, client, config } = setup;
+  const { start, end, client, indices } = setup;
 
   const params = {
-    index: config.get<string>('apm_oss.errorIndices'),
+    index: indices['apm_oss.errorIndices'],
     body: {
       size: 0,
       query: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts
index df471af4f5ee08..0f0a11a868d6d7 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from 'elasticsearch';
 import { getEnvironmentUiFilterES } from '../get_environment_ui_filter_es';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../../../common/environment_filter_values';
 import { SERVICE_ENVIRONMENT } from '../../../../../common/elasticsearch_fieldnames';
+import { ESFilter } from '../../../../../typings/elasticsearch';
 
 describe('getEnvironmentUiFilterES', () => {
   it('should return undefined, when environment is undefined', () => {
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
index 8a94e42a40b217..57feaf6a6fd0ed 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from 'elasticsearch';
+import { ESFilter } from '../../../../typings/elasticsearch';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../../common/environment_filter_values';
 import { SERVICE_ENVIRONMENT } from '../../../../common/elasticsearch_fieldnames';
 
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_kuery_ui_filter_es.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_kuery_ui_filter_es.ts
index 4ba4caa8c69d8e..2543c2b9a8a618 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_kuery_ui_filter_es.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_kuery_ui_filter_es.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from 'elasticsearch';
 import { Server } from 'hapi';
 import { idx } from '@kbn/elastic-idx';
 import { toElasticsearchQuery, fromKueryExpression } from '@kbn/es-query';
+import { ESFilter } from '../../../../typings/elasticsearch';
 import { ISavedObject } from '../../../../public/services/rest/savedObjects';
 import { StaticIndexPattern } from '../../../../../../../../src/legacy/core_plugins/data/public';
 import { getAPMIndexPattern } from '../../../lib/index_pattern';
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts
index 1658cb07e4d2f6..bea7e510875db3 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts
@@ -5,7 +5,7 @@
  */
 
 import { Server } from 'hapi';
-import { ESFilter } from 'elasticsearch';
+import { ESFilter } from '../../../../typings/elasticsearch';
 import { UIFilters } from '../../../../typings/ui-filters';
 import { getEnvironmentUiFilterES } from './get_environment_ui_filter_es';
 import { getKueryUiFilterES } from './get_kuery_ui_filter_es';
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
index 79fcfe95c05528..ee41599454dd69 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
@@ -9,28 +9,20 @@ import {
   SearchParams,
   IndexDocumentParams,
   IndicesDeleteParams,
-  IndicesCreateParams,
-  AggregationSearchResponseWithTotalHitsAsObject
+  IndicesCreateParams
 } from 'elasticsearch';
 import { Legacy } from 'kibana';
-import { cloneDeep, has, isString, set } from 'lodash';
+import { cloneDeep, has, isString, set, pick } from 'lodash';
 import { OBSERVER_VERSION_MAJOR } from '../../../common/elasticsearch_fieldnames';
-import { StringMap } from '../../../typings/common';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
+import {
+  ESSearchResponse,
+  ESSearchRequest
+} from '../../../typings/elasticsearch';
 
 // `type` was deprecated in 7.0
 export type APMIndexDocumentParams<T> = Omit<IndexDocumentParams<T>, 'type'>;
 
-function getApmIndices(config: Legacy.KibanaConfig) {
-  return [
-    config.get<string>('apm_oss.errorIndices'),
-    config.get<string>('apm_oss.metricsIndices'),
-    config.get<string>('apm_oss.onboardingIndices'),
-    config.get<string>('apm_oss.sourcemapIndices'),
-    config.get<string>('apm_oss.spanIndices'),
-    config.get<string>('apm_oss.transactionIndices')
-  ];
-}
-
 export function isApmIndex(
   apmIndices: string[],
   indexParam: SearchParams['index']
@@ -73,10 +65,23 @@ async function getParamsForSearchRequest(
   params: SearchParams,
   apmOptions?: APMOptions
 ) {
-  const config = req.server.config();
   const uiSettings = req.getUiSettingsService();
-  const apmIndices = getApmIndices(config);
-  const includeFrozen = await uiSettings.get('search:includeFrozen');
+  const [indices, includeFrozen] = await Promise.all([
+    getApmIndices(req.server),
+    uiSettings.get('search:includeFrozen')
+  ]);
+
+  // Get indices for legacy data filter (only those which apply)
+  const apmIndices: string[] = Object.values(
+    pick(indices, [
+      'apm_oss.sourcemapIndices',
+      'apm_oss.errorIndices',
+      'apm_oss.onboardingIndices',
+      'apm_oss.spanIndices',
+      'apm_oss.transactionIndices',
+      'apm_oss.metricsIndices'
+    ])
+  );
   return {
     ...addFilterForLegacyData(apmIndices, params, apmOptions), // filter out pre-7.0 data
     ignore_throttled: !includeFrozen // whether to query frozen indices or not
@@ -89,13 +94,16 @@ interface APMOptions {
 
 export function getESClient(req: Legacy.Request) {
   const cluster = req.server.plugins.elasticsearch.getCluster('data');
-  const query = req.query as StringMap;
+  const query = req.query as Record<string, unknown>;
 
   return {
-    search: async <Hits = unknown, U extends SearchParams = {}>(
-      params: U,
+    search: async <
+      TDocument = unknown,
+      TSearchRequest extends ESSearchRequest = {}
+    >(
+      params: TSearchRequest,
       apmOptions?: APMOptions
-    ): Promise<AggregationSearchResponseWithTotalHitsAsObject<Hits, U>> => {
+    ): Promise<ESSearchResponse<TDocument, TSearchRequest>> => {
       const nextParams = await getParamsForSearchRequest(
         req,
         params,
@@ -117,9 +125,7 @@ export function getESClient(req: Legacy.Request) {
         req,
         'search',
         nextParams
-      ) as unknown) as Promise<
-        AggregationSearchResponseWithTotalHitsAsObject<Hits, U>
-      >;
+      ) as unknown) as Promise<ESSearchResponse<TDocument, TSearchRequest>>;
     },
     index: <Body>(params: APMIndexDocumentParams<Body>) => {
       return cluster.callWithRequest(req, 'index', params);
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/saved_objects_client.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/saved_objects_client.ts
index 3070d7b00b6843..81dd8b34c88472 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/saved_objects_client.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/saved_objects_client.ts
@@ -6,10 +6,10 @@
 
 import { Server } from 'hapi';
 
-export function getSavedObjectsClient(server: Server) {
+export function getSavedObjectsClient(server: Server, clusterName = 'admin') {
   const { SavedObjectsClient, getSavedObjectsRepository } = server.savedObjects;
   const { callWithInternalUser } = server.plugins.elasticsearch.getCluster(
-    'admin'
+    clusterName
   );
   const internalRepository = getSavedObjectsRepository(callWithInternalUser);
   return new SavedObjectsClient(internalRepository);
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts
index cfc33b4fad7ea3..57de438be7f2ad 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.test.ts
@@ -3,11 +3,22 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
 import { Legacy } from 'kibana';
 import { setupRequest } from './setup_request';
 import { uiSettingsServiceMock } from 'src/core/server/mocks';
 
+jest.mock('../settings/apm_indices/get_apm_indices', () => ({
+  getApmIndices: async () => ({
+    'apm_oss.sourcemapIndices': 'apm-*',
+    'apm_oss.errorIndices': 'apm-*',
+    'apm_oss.onboardingIndices': 'apm-*',
+    'apm_oss.spanIndices': 'apm-*',
+    'apm_oss.transactionIndices': 'apm-*',
+    'apm_oss.metricsIndices': 'apm-*',
+    'apm_oss.apmAgentConfigurationIndex': 'apm-*'
+  })
+}));
+
 function getMockRequest() {
   const callWithRequestSpy = jest.fn();
   const mockRequest = ({
@@ -31,7 +42,7 @@ describe('setupRequest', () => {
   it('should call callWithRequest with default args', async () => {
     const { mockRequest, callWithRequestSpy } = getMockRequest();
     const { client } = await setupRequest(mockRequest);
-    await client.search({ index: 'apm-*', body: { foo: 'bar' } });
+    await client.search({ index: 'apm-*', body: { foo: 'bar' } } as any);
     expect(callWithRequestSpy).toHaveBeenCalledWith(mockRequest, 'search', {
       index: 'apm-*',
       body: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts
index 4054537e04b40f..3ec519d5e71b57 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts
@@ -10,6 +10,7 @@ import moment from 'moment';
 import { getESClient } from './es_client';
 import { getUiFiltersES } from './convert_ui_filters/get_ui_filters_es';
 import { PromiseReturnType } from '../../../typings/common';
+import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
 
 function decodeUiFilters(server: Server, uiFiltersEncoded?: string) {
   if (!uiFiltersEncoded) {
@@ -31,12 +32,17 @@ export async function setupRequest(req: Legacy.Request) {
   const query = (req.query as unknown) as APMRequestQuery;
   const { server } = req;
   const config = server.config();
+  const [uiFiltersES, indices] = await Promise.all([
+    decodeUiFilters(server, query.uiFilters),
+    getApmIndices(server)
+  ]);
 
   return {
     start: moment.utc(query.start).valueOf(),
     end: moment.utc(query.end).valueOf(),
-    uiFiltersES: await decodeUiFilters(server, query.uiFilters),
+    uiFiltersES,
     client: getESClient(req),
-    config
+    config,
+    indices
   };
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.ts b/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.ts
new file mode 100644
index 00000000000000..a5ba4573cfd58a
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/index_pattern/getKueryBarIndexPattern.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Legacy } from 'kibana';
+import { StaticIndexPattern } from 'ui/index_patterns';
+import { APICaller } from 'src/core/server';
+import { IndexPatternsFetcher } from '../../../../../../../src/plugins/data/server';
+import { Setup } from '../helpers/setup_request';
+
+export const getKueryBarIndexPattern = async ({
+  request,
+  processorEvent,
+  setup
+}: {
+  request: Legacy.Request;
+  processorEvent?: 'transaction' | 'error' | 'metric';
+  setup: Setup;
+}) => {
+  const { indices } = setup;
+
+  const indexPatternsFetcher = new IndexPatternsFetcher(
+    (...rest: Parameters<APICaller>) =>
+      request.server.plugins.elasticsearch
+        .getCluster('data')
+        .callWithRequest(request, ...rest)
+  );
+
+  const indexNames = processorEvent
+    ? [processorEvent]
+    : ['transaction' as const, 'metric' as const, 'error' as const];
+
+  const indicesMap = {
+    transaction: indices['apm_oss.transactionIndices'],
+    metric: indices['apm_oss.metricsIndices'],
+    error: indices['apm_oss.errorIndices']
+  };
+
+  const configuredIndices = indexNames.map(name => indicesMap[name]);
+
+  const fields = await indexPatternsFetcher.getFieldsForWildcard({
+    pattern: configuredIndices
+  });
+
+  const pattern: StaticIndexPattern = {
+    fields,
+    title: configuredIndices.join(',')
+  };
+
+  return pattern;
+};
diff --git a/x-pack/legacy/plugins/apm/server/lib/metrics/by_agent/java/gc/fetchAndTransformGcMetrics.ts b/x-pack/legacy/plugins/apm/server/lib/metrics/by_agent/java/gc/fetchAndTransformGcMetrics.ts
index 7b8fc4ac44f644..f785e450628079 100644
--- a/x-pack/legacy/plugins/apm/server/lib/metrics/by_agent/java/gc/fetchAndTransformGcMetrics.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/metrics/by_agent/java/gc/fetchAndTransformGcMetrics.ts
@@ -124,7 +124,7 @@ export async function fetchAndTransformGcMetrics({
   }
 
   const series = aggregations.per_pool.buckets.map((poolBucket, i) => {
-    const label = poolBucket.key;
+    const label = poolBucket.key as string;
     const timeseriesData = poolBucket.over_time;
 
     const data = (idx(timeseriesData, _ => _.buckets) || []).map(bucket => {
diff --git a/x-pack/legacy/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts b/x-pack/legacy/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
index 9837fb21b6da0f..3d425e50bc60af 100644
--- a/x-pack/legacy/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
@@ -4,20 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Unionize } from 'utility-types';
 import { Setup } from '../helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../helpers/metrics';
 import { ChartBase } from './types';
 import { transformDataToMetricsChart } from './transform_metrics_chart';
 import { getMetricsProjection } from '../../../common/projections/metrics';
 import { mergeProjection } from '../../../common/projections/util/merge_projection';
+import { AggregationOptionsByType } from '../../../typings/elasticsearch/aggregations';
 
 interface Aggs {
-  [key: string]: {
-    min?: any;
-    max?: any;
-    sum?: any;
-    avg?: any;
-  };
+  [key: string]: Unionize<{
+    min: AggregationOptionsByType['min'];
+    max: AggregationOptionsByType['max'];
+    sum: AggregationOptionsByType['sum'];
+    avg: AggregationOptionsByType['avg'];
+  }>;
 }
 
 interface Filter {
diff --git a/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts b/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts
index 89bc3b4107a5ff..594a0d35ed176c 100644
--- a/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts
@@ -4,12 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import {
-  AggregationSearchResponseWithTotalHitsAsObject,
-  AggregatedValue
-} from 'elasticsearch';
 import { idx } from '@kbn/elastic-idx';
+import { Unionize, Overwrite } from 'utility-types';
 import { ChartBase } from './types';
+import {
+  ESSearchResponse,
+  ESSearchRequest
+} from '../../../typings/elasticsearch';
+import { AggregationOptionsByType } from '../../../typings/elasticsearch/aggregations';
 
 const colors = [
   theme.euiColorVis0,
@@ -25,33 +27,30 @@ export type GenericMetricsChart = ReturnType<
   typeof transformDataToMetricsChart
 >;
 
-interface AggregatedParams {
-  body: {
-    aggs: {
-      timeseriesData: {
-        date_histogram: any;
-        aggs: {
-          min?: any;
-          max?: any;
-          sum?: any;
-          avg?: any;
+interface MetricsAggregationMap {
+  min: AggregationOptionsByType['min'];
+  max: AggregationOptionsByType['max'];
+  sum: AggregationOptionsByType['sum'];
+  avg: AggregationOptionsByType['avg'];
+}
+
+type GenericMetricsRequest = Overwrite<
+  ESSearchRequest,
+  {
+    body: {
+      aggs: {
+        timeseriesData: {
+          date_histogram: AggregationOptionsByType['date_histogram'];
+          aggs: Record<string, Unionize<MetricsAggregationMap>>;
         };
-      };
-    } & {
-      [key: string]: {
-        min?: any;
-        max?: any;
-        sum?: any;
-        avg?: any;
-      };
+      } & Record<string, Partial<MetricsAggregationMap>>;
     };
-  };
-}
+  }
+>;
 
-export function transformDataToMetricsChart<Params extends AggregatedParams>(
-  result: AggregationSearchResponseWithTotalHitsAsObject<unknown, Params>,
-  chartBase: ChartBase
-) {
+export function transformDataToMetricsChart<
+  TRequest extends GenericMetricsRequest
+>(result: ESSearchResponse<unknown, TRequest>, chartBase: ChartBase) {
   const { aggregations, hits } = result;
   const timeseriesData = idx(aggregations, _ => _.timeseriesData);
 
@@ -70,7 +69,7 @@ export function transformDataToMetricsChart<Params extends AggregatedParams>(
         color: chartBase.series[seriesKey].color || colors[i],
         overallValue,
         data: (idx(timeseriesData, _ => _.buckets) || []).map(bucket => {
-          const { value } = bucket[seriesKey] as AggregatedValue;
+          const { value } = bucket[seriesKey] as { value: number | null };
           const y = value === null || isNaN(value) ? null : value;
           return {
             x: bucket.key,
diff --git a/x-pack/legacy/plugins/apm/server/lib/service_nodes/index.ts b/x-pack/legacy/plugins/apm/server/lib/service_nodes/index.ts
index afdf4795c4d297..1e415252200ce4 100644
--- a/x-pack/legacy/plugins/apm/server/lib/service_nodes/index.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/service_nodes/index.ts
@@ -24,45 +24,45 @@ const getServiceNodes = async ({
 }) => {
   const { client } = setup;
 
-  const projection = mergeProjection(
-    getServiceNodesProjection({ setup, serviceName }),
-    {
-      body: {
-        aggs: {
-          nodes: {
-            terms: {
-              size: 10000,
-              missing: SERVICE_NODE_NAME_MISSING
+  const projection = getServiceNodesProjection({ setup, serviceName });
+
+  const params = mergeProjection(projection, {
+    body: {
+      aggs: {
+        nodes: {
+          terms: {
+            ...projection.body.aggs.nodes.terms,
+            size: 10000,
+            missing: SERVICE_NODE_NAME_MISSING
+          },
+          aggs: {
+            cpu: {
+              avg: {
+                field: METRIC_PROCESS_CPU_PERCENT
+              }
+            },
+            heapMemory: {
+              avg: {
+                field: METRIC_JAVA_HEAP_MEMORY_USED
+              }
             },
-            aggs: {
-              cpu: {
-                avg: {
-                  field: METRIC_PROCESS_CPU_PERCENT
-                }
-              },
-              heapMemory: {
-                avg: {
-                  field: METRIC_JAVA_HEAP_MEMORY_USED
-                }
-              },
-              nonHeapMemory: {
-                avg: {
-                  field: METRIC_JAVA_NON_HEAP_MEMORY_USED
-                }
-              },
-              threadCount: {
-                max: {
-                  field: METRIC_JAVA_THREAD_COUNT
-                }
+            nonHeapMemory: {
+              avg: {
+                field: METRIC_JAVA_NON_HEAP_MEMORY_USED
+              }
+            },
+            threadCount: {
+              max: {
+                field: METRIC_JAVA_THREAD_COUNT
               }
             }
           }
         }
       }
     }
-  );
+  });
 
-  const response = await client.search(projection);
+  const response = await client.search(params);
 
   if (!response.aggregations) {
     return [];
@@ -70,7 +70,7 @@ const getServiceNodes = async ({
 
   return response.aggregations.nodes.buckets.map(bucket => {
     return {
-      name: bucket.key,
+      name: bucket.key as string,
       cpu: bucket.cpu.value,
       heapMemory: bucket.heapMemory.value,
       nonHeapMemory: bucket.nonHeapMemory.value,
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
index 71217ccc36f7b6..acd5dc119b737c 100644
--- a/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
@@ -56,9 +56,7 @@ Object {
     },
     "size": 0,
   },
-  "index": Array [
-    "myIndex",
-  ],
+  "index": "myIndex",
   "terminateAfter": 1,
 }
 `;
@@ -228,8 +226,6 @@ Object {
     },
     "size": 0,
   },
-  "index": Array [
-    "myIndex",
-  ],
+  "index": "myIndex",
 }
 `;
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_service_agent_name.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_service_agent_name.ts
index 3c6f6843899702..bbb18eae7eb091 100644
--- a/x-pack/legacy/plugins/apm/server/lib/services/get_service_agent_name.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/services/get_service_agent_name.ts
@@ -13,14 +13,14 @@ import { rangeFilter } from '../helpers/range_filter';
 import { Setup } from '../helpers/setup_request';
 
 export async function getServiceAgentName(serviceName: string, setup: Setup) {
-  const { start, end, client, config } = setup;
+  const { start, end, client, indices } = setup;
 
   const params = {
     terminateAfter: 1,
     index: [
-      config.get<string>('apm_oss.errorIndices'),
-      config.get<string>('apm_oss.transactionIndices'),
-      config.get<string>('apm_oss.metricsIndices')
+      indices['apm_oss.errorIndices'],
+      indices['apm_oss.transactionIndices'],
+      indices['apm_oss.metricsIndices']
     ],
     body: {
       size: 0,
@@ -44,6 +44,8 @@ export async function getServiceAgentName(serviceName: string, setup: Setup) {
   };
 
   const { aggregations } = await client.search(params);
-  const agentName = idx(aggregations, _ => _.agents.buckets[0].key);
+  const agentName = idx(aggregations, _ => _.agents.buckets[0].key) as
+    | string
+    | undefined;
   return { agentName };
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_service_transaction_types.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_service_transaction_types.ts
index a1f035da9dc1ac..00ffa7484bb48f 100644
--- a/x-pack/legacy/plugins/apm/server/lib/services/get_service_transaction_types.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/services/get_service_transaction_types.ts
@@ -16,10 +16,10 @@ export async function getServiceTransactionTypes(
   serviceName: string,
   setup: Setup
 ) {
-  const { start, end, client, config } = setup;
+  const { start, end, client, indices } = setup;
 
   const params = {
-    index: [config.get<string>('apm_oss.transactionIndices')],
+    index: indices['apm_oss.transactionIndices'],
     body: {
       size: 0,
       query: {
@@ -41,6 +41,6 @@ export async function getServiceTransactionTypes(
 
   const { aggregations } = await client.search(params);
   const buckets = idx(aggregations, _ => _.types.buckets) || [];
-  const transactionTypes = buckets.map(bucket => bucket.key);
+  const transactionTypes = buckets.map(bucket => bucket.key as string);
   return { transactionTypes };
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_agent_status.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_agent_status.ts
index d1654632dbb262..6c28d19a147119 100644
--- a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_agent_status.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_agent_status.ts
@@ -4,21 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SearchParams } from 'elasticsearch';
 import { PROCESSOR_EVENT } from '../../../../common/elasticsearch_fieldnames';
 import { Setup } from '../../helpers/setup_request';
 
 // Note: this logic is duplicated in tutorials/apm/envs/on_prem
 export async function getAgentStatus(setup: Setup) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
-  const params: SearchParams = {
+  const params = {
     terminateAfter: 1,
     index: [
-      config.get('apm_oss.errorIndices'),
-      config.get('apm_oss.metricsIndices'),
-      config.get('apm_oss.sourcemapIndices'),
-      config.get('apm_oss.transactionIndices')
+      indices['apm_oss.errorIndices'],
+      indices['apm_oss.metricsIndices'],
+      indices['apm_oss.sourcemapIndices'],
+      indices['apm_oss.transactionIndices']
     ],
     body: {
       size: 0,
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_legacy_data_status.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_legacy_data_status.ts
index 1379d79326adde..5497eaa13d34b1 100644
--- a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_legacy_data_status.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_legacy_data_status.ts
@@ -12,11 +12,11 @@ import { Setup } from '../../helpers/setup_request';
 
 // returns true if 6.x data is found
 export async function getLegacyDataStatus(setup: Setup) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   const params = {
     terminateAfter: 1,
-    index: [config.get<string>('apm_oss.transactionIndices')],
+    index: indices['apm_oss.transactionIndices'],
     body: {
       size: 0,
       query: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_services_items.ts b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_services_items.ts
index c50506db1faecf..60f3091567059a 100644
--- a/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_services_items.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/services/get_services/get_services_items.ts
@@ -28,6 +28,7 @@ export async function getServicesItems(setup: Setup) {
       aggs: {
         services: {
           terms: {
+            ...projection.body.aggs.services.terms,
             size: 500
           },
           aggs: {
@@ -69,12 +70,14 @@ export async function getServicesItems(setup: Setup) {
 
     const environmentsBuckets = bucket.environments.buckets;
     const environments = environmentsBuckets.map(
-      environmentBucket => environmentBucket.key
+      environmentBucket => environmentBucket.key as string
     );
 
     return {
-      serviceName: bucket.key,
-      agentName: idx(bucket, _ => _.agents.buckets[0].key),
+      serviceName: bucket.key as string,
+      agentName: idx(bucket, _ => _.agents.buckets[0].key) as
+        | string
+        | undefined,
       transactionsPerMinute,
       errorsPerMinute,
       avgResponseTime: bucket.avg.value,
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
index 4226c073b1de02..861732ee039232 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
@@ -6,15 +6,15 @@
 
 import { InternalCoreSetup } from 'src/core/server';
 import { CallCluster } from '../../../../../../../../src/legacy/core_plugins/elasticsearch';
+import { getApmIndices } from '../apm_indices/get_apm_indices';
 
 export async function createApmAgentConfigurationIndex(
   core: InternalCoreSetup
 ) {
   try {
     const { server } = core.http;
-    const index = server
-      .config()
-      .get<string>('apm_oss.apmAgentConfigurationIndex');
+    const indices = await getApmIndices(server);
+    const index = indices['apm_oss.apmAgentConfigurationIndex'];
     const { callWithInternalUser } = server.plugins.elasticsearch.getCluster(
       'admin'
     );
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts
index 9f0d8e2f1c7183..25a4f5141498f4 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/create_or_update_configuration.ts
@@ -21,11 +21,11 @@ export async function createOrUpdateConfiguration({
   >;
   setup: Setup;
 }) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   const params: APMIndexDocumentParams<AgentConfiguration> = {
     refresh: true,
-    index: config.get<string>('apm_oss.apmAgentConfigurationIndex'),
+    index: indices['apm_oss.apmAgentConfigurationIndex'],
     body: {
       agent_name: configuration.agent_name,
       service: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/delete_configuration.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/delete_configuration.ts
index 82b192125a5cff..896363c054ba78 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/delete_configuration.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/delete_configuration.ts
@@ -13,11 +13,11 @@ export async function deleteConfiguration({
   configurationId: string;
   setup: Setup;
 }) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   const params = {
     refresh: 'wait_for',
-    index: config.get<string>('apm_oss.apmAgentConfigurationIndex'),
+    index: indices['apm_oss.apmAgentConfigurationIndex'],
     id: configurationId
   };
 
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts
index a18873e86c5a8e..21663b813f01f6 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts
@@ -19,14 +19,14 @@ export async function getAgentNameByService({
   serviceName: string;
   setup: Setup;
 }) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   const params = {
     terminateAfter: 1,
     index: [
-      config.get<string>('apm_oss.metricsIndices'),
-      config.get<string>('apm_oss.errorIndices'),
-      config.get<string>('apm_oss.transactionIndices')
+      indices['apm_oss.metricsIndices'],
+      indices['apm_oss.errorIndices'],
+      indices['apm_oss.transactionIndices']
     ],
     body: {
       size: 0,
@@ -49,6 +49,8 @@ export async function getAgentNameByService({
   };
 
   const { aggregations } = await client.search(params);
-  const agentName = idx(aggregations, _ => _.agent_names.buckets[0].key);
+  const agentName = idx(aggregations, _ => _.agent_names.buckets[0].key) as
+    | string
+    | undefined;
   return { agentName };
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts
index 76ebf75aada290..8215e2b9fd6686 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_all_environments.ts
@@ -20,7 +20,7 @@ export async function getAllEnvironments({
   serviceName: string | undefined;
   setup: Setup;
 }) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   // omit filter for service.name if "All" option is selected
   const serviceNameFilter = serviceName
@@ -29,9 +29,9 @@ export async function getAllEnvironments({
 
   const params = {
     index: [
-      config.get<string>('apm_oss.metricsIndices'),
-      config.get<string>('apm_oss.errorIndices'),
-      config.get<string>('apm_oss.transactionIndices')
+      indices['apm_oss.metricsIndices'],
+      indices['apm_oss.errorIndices'],
+      indices['apm_oss.transactionIndices']
     ],
     body: {
       size: 0,
@@ -58,6 +58,6 @@ export async function getAllEnvironments({
 
   const resp = await client.search(params);
   const buckets = idx(resp.aggregations, _ => _.environments.buckets) || [];
-  const environments = buckets.map(bucket => bucket.key);
+  const environments = buckets.map(bucket => bucket.key as string);
   return [ALL_OPTION_VALUE, ...environments];
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts
index 120cc62cc3bc99..d5aa389cea3357 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts
@@ -19,14 +19,14 @@ export async function getExistingEnvironmentsForService({
   serviceName: string | undefined;
   setup: Setup;
 }) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   const bool = serviceName
     ? { filter: [{ term: { [SERVICE_NAME]: serviceName } }] }
     : { must_not: [{ exists: { field: SERVICE_NAME } }] };
 
   const params = {
-    index: config.get<string>('apm_oss.apmAgentConfigurationIndex'),
+    index: indices['apm_oss.apmAgentConfigurationIndex'],
     body: {
       size: 0,
       query: { bool },
@@ -44,5 +44,5 @@ export async function getExistingEnvironmentsForService({
 
   const resp = await client.search(params);
   const buckets = idx(resp.aggregations, _ => _.environments.buckets) || [];
-  return buckets.map(bucket => bucket.key);
+  return buckets.map(bucket => bucket.key as string);
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
index 55af96acbc7192..51a4564f535763 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
@@ -17,13 +17,13 @@ export type AgentConfigurationServicesAPIResponse = PromiseReturnType<
   typeof getServiceNames
 >;
 export async function getServiceNames({ setup }: { setup: Setup }) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   const params = {
     index: [
-      config.get<string>('apm_oss.metricsIndices'),
-      config.get<string>('apm_oss.errorIndices'),
-      config.get<string>('apm_oss.transactionIndices')
+      indices['apm_oss.metricsIndices'],
+      indices['apm_oss.errorIndices'],
+      indices['apm_oss.transactionIndices']
     ],
     body: {
       size: 0,
@@ -47,6 +47,6 @@ export async function getServiceNames({ setup }: { setup: Setup }) {
 
   const resp = await client.search(params);
   const buckets = idx(resp.aggregations, _ => _.services.buckets) || [];
-  const serviceNames = buckets.map(bucket => bucket.key).sort();
+  const serviceNames = buckets.map(bucket => bucket.key as string).sort();
   return [ALL_OPTION_VALUE, ...serviceNames];
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts
index 9edceb86dda8db..283f30b51441d3 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/list_configurations.ts
@@ -12,10 +12,10 @@ export type AgentConfigurationListAPIResponse = PromiseReturnType<
   typeof listConfigurations
 >;
 export async function listConfigurations({ setup }: { setup: Setup }) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   const params = {
-    index: config.get<string>('apm_oss.apmAgentConfigurationIndex')
+    index: indices['apm_oss.apmAgentConfigurationIndex']
   };
 
   const resp = await client.search<AgentConfiguration>(params);
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts
index 867045142cea06..e5349edb67f308 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/mark_applied_by_agent.ts
@@ -16,10 +16,10 @@ export async function markAppliedByAgent({
   body: AgentConfiguration;
   setup: Setup;
 }) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   const params = {
-    index: config.get<string>('apm_oss.apmAgentConfigurationIndex'),
+    index: indices['apm_oss.apmAgentConfigurationIndex'],
     id, // by specifying the `id` elasticsearch will do an "upsert"
     body: {
       ...body,
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.test.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.test.ts
index e8db37891e7ae5..400bd0207771af 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.test.ts
@@ -15,7 +15,18 @@ describe('search configurations', () => {
       environment: 'production',
       setup: ({
         config: { get: () => '' },
-        client: { search: async () => searchMocks }
+        client: { search: async () => searchMocks },
+        indices: {
+          apm_oss: {
+            sourcemapIndices: 'myIndex',
+            errorIndices: 'myIndex',
+            onboardingIndices: 'myIndex',
+            spanIndices: 'myIndex',
+            transactionIndices: 'myIndex',
+            metricsIndices: 'myIndex',
+            apmAgentConfigurationIndex: 'myIndex'
+          }
+        }
       } as unknown) as Setup
     });
 
@@ -29,7 +40,18 @@ describe('search configurations', () => {
       environment: 'production',
       setup: ({
         config: { get: () => '' },
-        client: { search: async () => searchMocks }
+        client: { search: async () => searchMocks },
+        indices: {
+          apm_oss: {
+            sourcemapIndices: 'myIndex',
+            errorIndices: 'myIndex',
+            onboardingIndices: 'myIndex',
+            spanIndices: 'myIndex',
+            transactionIndices: 'myIndex',
+            metricsIndices: 'myIndex',
+            apmAgentConfigurationIndex: 'myIndex'
+          }
+        }
       } as unknown) as Setup
     });
 
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts
index 664bcb9325472e..35d76d745cf4f1 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts
@@ -3,8 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
-import { ESSearchHit } from 'elasticsearch';
+import { ESSearchHit } from '../../../../typings/elasticsearch';
 import {
   SERVICE_NAME,
   SERVICE_ENVIRONMENT
@@ -21,7 +20,7 @@ export async function searchConfigurations({
   environment?: string;
   setup: Setup;
 }) {
-  const { client, config } = setup;
+  const { client, indices } = setup;
 
   // sorting order
   // 1. exact match: service.name AND service.environment (eg. opbeans-node / production)
@@ -34,7 +33,7 @@ export async function searchConfigurations({
     : [];
 
   const params = {
-    index: config.get<string>('apm_oss.apmAgentConfigurationIndex'),
+    index: indices['apm_oss.apmAgentConfigurationIndex'],
     body: {
       query: {
         bool: {
@@ -50,7 +49,7 @@ export async function searchConfigurations({
     }
   };
 
-  const resp = await client.search<AgentConfiguration>(params);
+  const resp = await client.search<AgentConfiguration, typeof params>(params);
   const { hits } = resp.hits;
 
   const exactMatch = hits.find(
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts
new file mode 100644
index 00000000000000..cd237a52640990
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts
@@ -0,0 +1,101 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Server } from 'hapi';
+import { merge } from 'lodash';
+import { KibanaConfig } from 'src/legacy/server/kbn_server';
+import { getSavedObjectsClient } from '../../helpers/saved_objects_client';
+import { Setup } from '../../helpers/setup_request';
+import { PromiseReturnType } from '../../../../typings/common';
+
+export interface ApmIndicesConfig {
+  'apm_oss.sourcemapIndices': string;
+  'apm_oss.errorIndices': string;
+  'apm_oss.onboardingIndices': string;
+  'apm_oss.spanIndices': string;
+  'apm_oss.transactionIndices': string;
+  'apm_oss.metricsIndices': string;
+  'apm_oss.apmAgentConfigurationIndex': string;
+}
+
+export type ApmIndicesName = keyof ApmIndicesConfig;
+
+export const APM_INDICES_SAVED_OBJECT_TYPE = 'apm-indices';
+export const APM_INDICES_SAVED_OBJECT_ID = 'apm-indices';
+
+async function getApmIndicesSavedObject(server: Server) {
+  const savedObjectsClient = getSavedObjectsClient(server, 'data');
+  const apmIndices = await savedObjectsClient.get<Partial<ApmIndicesConfig>>(
+    APM_INDICES_SAVED_OBJECT_TYPE,
+    APM_INDICES_SAVED_OBJECT_ID
+  );
+  return apmIndices.attributes;
+}
+
+function getApmIndicesConfig(config: KibanaConfig): ApmIndicesConfig {
+  return {
+    'apm_oss.sourcemapIndices': config.get<string>('apm_oss.sourcemapIndices'),
+    'apm_oss.errorIndices': config.get<string>('apm_oss.errorIndices'),
+    'apm_oss.onboardingIndices': config.get<string>(
+      'apm_oss.onboardingIndices'
+    ),
+    'apm_oss.spanIndices': config.get<string>('apm_oss.spanIndices'),
+    'apm_oss.transactionIndices': config.get<string>(
+      'apm_oss.transactionIndices'
+    ),
+    'apm_oss.metricsIndices': config.get<string>('apm_oss.metricsIndices'),
+    'apm_oss.apmAgentConfigurationIndex': config.get<string>(
+      'apm_oss.apmAgentConfigurationIndex'
+    )
+  };
+}
+
+export async function getApmIndices(server: Server) {
+  try {
+    const apmIndicesSavedObject = await getApmIndicesSavedObject(server);
+    const apmIndicesConfig = getApmIndicesConfig(server.config());
+    return merge({}, apmIndicesConfig, apmIndicesSavedObject);
+  } catch (error) {
+    return getApmIndicesConfig(server.config());
+  }
+}
+
+const APM_UI_INDICES: ApmIndicesName[] = [
+  'apm_oss.sourcemapIndices',
+  'apm_oss.errorIndices',
+  'apm_oss.onboardingIndices',
+  'apm_oss.spanIndices',
+  'apm_oss.transactionIndices',
+  'apm_oss.metricsIndices',
+  'apm_oss.apmAgentConfigurationIndex'
+];
+
+export async function getApmIndexSettings({
+  setup,
+  server
+}: {
+  setup: Setup;
+  server: Server;
+}) {
+  const { config } = setup;
+  let apmIndicesSavedObject: PromiseReturnType<typeof getApmIndicesSavedObject>;
+  try {
+    apmIndicesSavedObject = await getApmIndicesSavedObject(server);
+  } catch (error) {
+    if (error.output && error.output.statusCode === 404) {
+      apmIndicesSavedObject = {};
+    } else {
+      throw error;
+    }
+  }
+  const apmIndicesConfig = getApmIndicesConfig(config);
+
+  return APM_UI_INDICES.map(configurationName => ({
+    configurationName,
+    defaultValue: apmIndicesConfig[configurationName], // value defined in kibana[.dev].yml
+    savedValue: apmIndicesSavedObject[configurationName] // value saved via Saved Objects service
+  }));
+}
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/save_apm_indices.ts b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/save_apm_indices.ts
new file mode 100644
index 00000000000000..8de47c5c44144f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/save_apm_indices.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Server } from 'hapi';
+import { getSavedObjectsClient } from '../../helpers/saved_objects_client';
+import {
+  ApmIndicesConfig,
+  APM_INDICES_SAVED_OBJECT_TYPE,
+  APM_INDICES_SAVED_OBJECT_ID
+} from './get_apm_indices';
+
+export async function saveApmIndices(
+  server: Server,
+  apmIndicesSavedObject: Partial<ApmIndicesConfig>
+) {
+  const savedObjectsClient = getSavedObjectsClient(server, 'data');
+  return await savedObjectsClient.create(
+    APM_INDICES_SAVED_OBJECT_TYPE,
+    apmIndicesSavedObject,
+    {
+      id: APM_INDICES_SAVED_OBJECT_ID,
+      overwrite: true
+    }
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts b/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts
index 74e16424b10989..0df5cc016431d6 100644
--- a/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/traces/get_trace_items.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SearchParams } from 'elasticsearch';
 import {
   PROCESSOR_EVENT,
   TRACE_ID,
@@ -18,13 +17,13 @@ import { rangeFilter } from '../helpers/range_filter';
 import { Setup } from '../helpers/setup_request';
 
 export async function getTraceItems(traceId: string, setup: Setup) {
-  const { start, end, client, config } = setup;
+  const { start, end, client, config, indices } = setup;
   const maxTraceItems = config.get<number>('xpack.apm.ui.maxTraceItems');
 
-  const params: SearchParams = {
+  const params = {
     index: [
-      config.get('apm_oss.spanIndices'),
-      config.get('apm_oss.transactionIndices')
+      indices['apm_oss.spanIndices'],
+      indices['apm_oss.transactionIndices']
     ],
     body: {
       size: maxTraceItems,
@@ -41,9 +40,9 @@ export async function getTraceItems(traceId: string, setup: Setup) {
         }
       },
       sort: [
-        { _score: { order: 'asc' } },
-        { [TRANSACTION_DURATION]: { order: 'desc' } },
-        { [SPAN_DURATION]: { order: 'desc' } }
+        { _score: { order: 'asc' as const } },
+        { [TRANSACTION_DURATION]: { order: 'desc' as const } },
+        { [SPAN_DURATION]: { order: 'desc' as const } }
       ],
       track_total_hits: true
     }
diff --git a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.test.ts b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.test.ts
index fc7b1b4127892f..99553690359cf5 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.test.ts
@@ -16,15 +16,22 @@ function getSetup() {
     config: {
       get: jest.fn<any, string[]>((key: string) => {
         switch (key) {
-          case 'apm_oss.transactionIndices':
-            return 'myIndex';
           case 'xpack.apm.ui.transactionGroupBucketSize':
             return 100;
         }
       }),
       has: () => true
     },
-    uiFiltersES: [{ term: { 'service.environment': 'test' } }]
+    uiFiltersES: [{ term: { 'service.environment': 'test' } }],
+    indices: {
+      'apm_oss.sourcemapIndices': 'myIndex',
+      'apm_oss.errorIndices': 'myIndex',
+      'apm_oss.onboardingIndices': 'myIndex',
+      'apm_oss.spanIndices': 'myIndex',
+      'apm_oss.transactionIndices': 'myIndex',
+      'apm_oss.metricsIndices': 'myIndex',
+      'apm_oss.apmAgentConfigurationIndex': 'myIndex'
+    }
   };
 }
 
diff --git a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.ts b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.ts
index a647bd2faff363..bfa46abcad36fd 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.ts
@@ -12,6 +12,8 @@ import { PromiseReturnType } from '../../../typings/common';
 import { Setup } from '../helpers/setup_request';
 import { getTransactionGroupsProjection } from '../../../common/projections/transaction_groups';
 import { mergeProjection } from '../../../common/projections/util/merge_projection';
+import { SortOptions } from '../../../typings/elasticsearch/aggregations';
+import { Transaction } from '../../../typings/es_schemas/ui/Transaction';
 
 interface TopTransactionOptions {
   type: 'top_transactions';
@@ -36,6 +38,11 @@ export function transactionGroupsFetcher(options: Options, setup: Setup) {
     options
   });
 
+  const sort: SortOptions = [
+    { _score: 'desc' as const }, // sort by _score to ensure that buckets with sampled:true ends up on top
+    { '@timestamp': { order: 'desc' as const } }
+  ];
+
   const params = mergeProjection(projection, {
     body: {
       size: 0,
@@ -48,17 +55,15 @@ export function transactionGroupsFetcher(options: Options, setup: Setup) {
       aggs: {
         transactions: {
           terms: {
-            order: { sum: 'desc' },
+            ...projection.body.aggs.transactions.terms,
+            order: { sum: 'desc' as const },
             size: config.get<number>('xpack.apm.ui.transactionGroupBucketSize')
           },
           aggs: {
             sample: {
               top_hits: {
                 size: 1,
-                sort: [
-                  { _score: 'desc' }, // sort by _score to ensure that buckets with sampled:true ends up on top
-                  { '@timestamp': { order: 'desc' } }
-                ]
+                sort
               }
             },
             avg: { avg: { field: TRANSACTION_DURATION } },
@@ -72,5 +77,5 @@ export function transactionGroupsFetcher(options: Options, setup: Setup) {
     }
   });
 
-  return client.search(params);
+  return client.search<Transaction, typeof params>(params);
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/transform.ts b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/transform.ts
index b4e70d260f512c..3ec64be08d1173 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/transform.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/transform.ts
@@ -6,7 +6,6 @@
 
 import moment from 'moment';
 import { idx } from '@kbn/elastic-idx';
-import { Transaction } from '../../../typings/es_schemas/ui/Transaction';
 import { ESResponse } from './fetcher';
 
 function calculateRelativeImpacts(transactionGroups: ITransactionGroup[]) {
@@ -34,10 +33,10 @@ function getTransactionGroup(
   const averageResponseTime = bucket.avg.value;
   const transactionsPerMinute = bucket.doc_count / minutes;
   const impact = bucket.sum.value;
-  const sample = bucket.sample.hits.hits[0]._source as Transaction;
+  const sample = bucket.sample.hits.hits[0]._source;
 
   return {
-    name: bucket.key,
+    name: bucket.key as string,
     sample,
     p95: bucket.p95.values['95.0'],
     averageResponseTime,
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_country/index.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_country/index.ts
index c440ee9c1ecbee..e092942a25ba65 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_country/index.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_country/index.ts
@@ -21,9 +21,9 @@ export async function getTransactionAvgDurationByCountry({
   setup: Setup;
   serviceName: string;
 }) {
-  const { uiFiltersES, client, config, start, end } = setup;
+  const { uiFiltersES, client, start, end, indices } = setup;
   const params = {
-    index: config.get<string>('apm_oss.transactionIndices'),
+    index: indices['apm_oss.transactionIndices'],
     body: {
       size: 0,
       query: {
@@ -63,7 +63,7 @@ export async function getTransactionAvgDurationByCountry({
   const buckets = resp.aggregations.country_code.buckets;
   const avgDurationsByCountry = buckets.map(
     ({ key, doc_count, avg_duration: { value } }) => ({
-      key,
+      key: key as string,
       docCount: doc_count,
       value: value === null ? 0 : value
     })
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts
index e707ce3eafe18a..67816d67a29a2a 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.test.ts
@@ -9,6 +9,16 @@ import * as constants from './constants';
 import noDataResponse from './mock-responses/noData.json';
 import dataResponse from './mock-responses/data.json';
 
+const mockIndices = {
+  'apm_oss.sourcemapIndices': 'myIndex',
+  'apm_oss.errorIndices': 'myIndex',
+  'apm_oss.onboardingIndices': 'myIndex',
+  'apm_oss.spanIndices': 'myIndex',
+  'apm_oss.transactionIndices': 'myIndex',
+  'apm_oss.metricsIndices': 'myIndex',
+  'apm_oss.apmAgentConfigurationIndex': 'myIndex'
+};
+
 describe('getTransactionBreakdown', () => {
   it('returns an empty array if no data is available', async () => {
     const clientSpy = jest.fn().mockReturnValueOnce(noDataResponse);
@@ -24,7 +34,8 @@ describe('getTransactionBreakdown', () => {
           get: () => 'myIndex' as any,
           has: () => true
         },
-        uiFiltersES: []
+        uiFiltersES: [],
+        indices: mockIndices
       }
     });
 
@@ -47,7 +58,8 @@ describe('getTransactionBreakdown', () => {
           get: () => 'myIndex' as any,
           has: () => true
         },
-        uiFiltersES: []
+        uiFiltersES: [],
+        indices: mockIndices
       }
     });
 
@@ -87,7 +99,8 @@ describe('getTransactionBreakdown', () => {
           get: () => 'myIndex' as any,
           has: () => true
         },
-        uiFiltersES: []
+        uiFiltersES: [],
+        indices: mockIndices
       }
     });
 
@@ -126,7 +139,8 @@ describe('getTransactionBreakdown', () => {
           get: () => 'myIndex' as any,
           has: () => true
         },
-        uiFiltersES: []
+        uiFiltersES: [],
+        indices: mockIndices
       }
     });
 
@@ -149,7 +163,8 @@ describe('getTransactionBreakdown', () => {
           get: () => 'myIndex' as any,
           has: () => true
         },
-        uiFiltersES: []
+        uiFiltersES: [],
+        indices: mockIndices
       }
     });
 
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.ts
index b3c1c6603f3157..a21c4f38ac30cc 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/breakdown/index.ts
@@ -32,7 +32,7 @@ export async function getTransactionBreakdown({
   transactionName?: string;
   transactionType: string;
 }) {
-  const { uiFiltersES, client, config, start, end } = setup;
+  const { uiFiltersES, client, start, end, indices } = setup;
 
   const subAggs = {
     sum_all_self_times: {
@@ -50,7 +50,7 @@ export async function getTransactionBreakdown({
         field: SPAN_TYPE,
         size: 20,
         order: {
-          _count: 'desc'
+          _count: 'desc' as const
         }
       },
       aggs: {
@@ -60,7 +60,7 @@ export async function getTransactionBreakdown({
             missing: '',
             size: 20,
             order: {
-              _count: 'desc'
+              _count: 'desc' as const
             }
           },
           aggs: {
@@ -88,7 +88,7 @@ export async function getTransactionBreakdown({
   }
 
   const params = {
-    index: config.get<string>('apm_oss.metricsIndices'),
+    index: indices['apm_oss.metricsIndices'],
     body: {
       size: 0,
       query: {
@@ -117,11 +117,11 @@ export async function getTransactionBreakdown({
 
     const breakdowns = flatten(
       aggs.types.buckets.map(bucket => {
-        const type = bucket.key;
+        const type = bucket.key as string;
 
         return bucket.subtypes.buckets.map(subBucket => {
           return {
-            name: subBucket.key || type,
+            name: (subBucket.key as string) || type,
             percentage:
               (subBucket.total_self_time_per_subtype.value || 0) /
               sumAllSelfTimes
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/get_ml_bucket_size.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/get_ml_bucket_size.ts
index 293cede80cbfc9..27cff20b7ff376 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/get_ml_bucket_size.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/get_ml_bucket_size.ts
@@ -49,7 +49,7 @@ export async function getMlBucketSize({
   };
 
   try {
-    const resp = await client.search<ESResponse>(params);
+    const resp = await client.search<ESResponse, typeof params>(params);
     return idx(resp, _ => _.hits.hits[0]._source.bucket_span) || 0;
   } catch (err) {
     const isHttpError = 'statusCode' in err;
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.test.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.test.ts
index 07f1d96618198b..cddc66e52cf701 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.test.ts
@@ -30,7 +30,16 @@ describe('getAnomalySeries', () => {
           get: () => 'myIndex' as any,
           has: () => true
         },
-        uiFiltersES: []
+        uiFiltersES: [],
+        indices: {
+          'apm_oss.sourcemapIndices': 'myIndex',
+          'apm_oss.errorIndices': 'myIndex',
+          'apm_oss.onboardingIndices': 'myIndex',
+          'apm_oss.spanIndices': 'myIndex',
+          'apm_oss.transactionIndices': 'myIndex',
+          'apm_oss.metricsIndices': 'myIndex',
+          'apm_oss.apmAgentConfigurationIndex': 'myIndex'
+        }
       }
     });
   });
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts
index dc568d653a5eef..5056a100de3ce6 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts
@@ -29,7 +29,16 @@ describe('timeseriesFetcher', () => {
           {
             term: { 'service.environment': 'test' }
           }
-        ]
+        ],
+        indices: {
+          'apm_oss.sourcemapIndices': 'myIndex',
+          'apm_oss.errorIndices': 'myIndex',
+          'apm_oss.onboardingIndices': 'myIndex',
+          'apm_oss.spanIndices': 'myIndex',
+          'apm_oss.transactionIndices': 'myIndex',
+          'apm_oss.metricsIndices': 'myIndex',
+          'apm_oss.apmAgentConfigurationIndex': 'myIndex'
+        }
       }
     });
   });
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
index dc5cb925b72023..0d9cccb3b56d35 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from 'elasticsearch';
+import { ESFilter } from '../../../../../typings/elasticsearch';
 import {
   PROCESSOR_EVENT,
   SERVICE_NAME,
@@ -30,7 +30,7 @@ export function timeseriesFetcher({
   transactionName: string | undefined;
   setup: Setup;
 }) {
-  const { start, end, uiFiltersES, client, config } = setup;
+  const { start, end, uiFiltersES, client, indices } = setup;
   const { intervalString } = getBucketSize(start, end, 'auto');
 
   const filter: ESFilter[] = [
@@ -50,7 +50,7 @@ export function timeseriesFetcher({
   }
 
   const params = {
-    index: config.get<string>('apm_oss.transactionIndices'),
+    index: indices['apm_oss.transactionIndices'],
     body: {
       size: 0,
       query: { bool: { filter } },
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/transform.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/transform.ts
index f403c64a94aea5..42828367f79415 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/transform.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/transform.ts
@@ -57,7 +57,8 @@ export function getTpmBuckets(
       });
 
       // Handle empty string result keys
-      const key = resultKey === '' ? NOT_AVAILABLE_LABEL : resultKey;
+      const key =
+        resultKey === '' ? NOT_AVAILABLE_LABEL : (resultKey as string);
 
       return { key, dataPoints };
     }
@@ -65,7 +66,7 @@ export function getTpmBuckets(
 
   return sortBy(
     buckets,
-    bucket => bucket.key.replace(/^HTTP (\d)xx$/, '00$1') // ensure that HTTP 3xx are sorted at the top
+    bucket => bucket.key.toString().replace(/^HTTP (\d)xx$/, '00$1') // ensure that HTTP 3xx are sorted at the top
   );
 }
 
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_buckets/fetcher.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_buckets/fetcher.ts
index 458aad225fd941..90d9a925a1f36d 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_buckets/fetcher.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_buckets/fetcher.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Transaction } from '../../../../../typings/es_schemas/ui/Transaction';
 import {
   PROCESSOR_EVENT,
   SERVICE_NAME,
@@ -17,7 +18,7 @@ import {
 import { rangeFilter } from '../../../helpers/range_filter';
 import { Setup } from '../../../helpers/setup_request';
 
-export function bucketFetcher(
+export async function bucketFetcher(
   serviceName: string,
   transactionName: string,
   transactionType: string,
@@ -27,10 +28,10 @@ export function bucketFetcher(
   bucketSize: number,
   setup: Setup
 ) {
-  const { start, end, uiFiltersES, client, config } = setup;
+  const { start, end, uiFiltersES, client, indices } = setup;
 
   const params = {
-    index: config.get<string>('apm_oss.transactionIndices'),
+    index: indices['apm_oss.transactionIndices'],
     body: {
       size: 0,
       query: {
@@ -74,5 +75,7 @@ export function bucketFetcher(
     }
   };
 
-  return client.search(params);
+  const response = await client.search<Transaction, typeof params>(params);
+
+  return response;
 }
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
index f49cf2b8c8541e..a54fa9c10de13d 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts
@@ -19,10 +19,10 @@ export async function getDistributionMax(
   transactionType: string,
   setup: Setup
 ) {
-  const { start, end, uiFiltersES, client, config } = setup;
+  const { start, end, uiFiltersES, client, indices } = setup;
 
   const params = {
-    index: config.get<string>('apm_oss.transactionIndices'),
+    index: indices['apm_oss.transactionIndices'],
     body: {
       size: 0,
       query: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts
index cdaddc3af3e956..20152ecf06480c 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/get_transaction/index.ts
@@ -19,10 +19,10 @@ export async function getTransaction(
   traceId: string,
   setup: Setup
 ) {
-  const { start, end, uiFiltersES, client, config } = setup;
+  const { start, end, uiFiltersES, client, indices } = setup;
 
   const params = {
-    index: config.get<string>('apm_oss.transactionIndices'),
+    index: indices['apm_oss.transactionIndices'],
     body: {
       size: 1,
       query: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts b/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts
index 3b48bfc7a98697..ade491be32fc7b 100644
--- a/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from 'elasticsearch';
 import { idx } from '@kbn/elastic-idx';
 import {
   PROCESSOR_EVENT,
@@ -14,9 +13,10 @@ import {
 import { rangeFilter } from '../helpers/range_filter';
 import { Setup } from '../helpers/setup_request';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../common/environment_filter_values';
+import { ESFilter } from '../../../typings/elasticsearch';
 
 export async function getEnvironments(setup: Setup, serviceName?: string) {
-  const { start, end, client, config } = setup;
+  const { start, end, client, indices } = setup;
 
   const filter: ESFilter[] = [
     { terms: { [PROCESSOR_EVENT]: ['transaction', 'error', 'metric'] } },
@@ -31,9 +31,9 @@ export async function getEnvironments(setup: Setup, serviceName?: string) {
 
   const params = {
     index: [
-      config.get<string>('apm_oss.metricsIndices'),
-      config.get<string>('apm_oss.errorIndices'),
-      config.get<string>('apm_oss.transactionIndices')
+      indices['apm_oss.metricsIndices'],
+      indices['apm_oss.errorIndices'],
+      indices['apm_oss.transactionIndices']
     ],
     body: {
       size: 0,
@@ -58,7 +58,7 @@ export async function getEnvironments(setup: Setup, serviceName?: string) {
   const environmentsBuckets = idx(aggs, _ => _.environments.buckets) || [];
 
   const environments = environmentsBuckets.map(
-    environmentBucket => environmentBucket.key
+    environmentBucket => environmentBucket.key as string
   );
 
   return environments;
diff --git a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/get_filter_aggregations.ts b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/get_filter_aggregations.ts
index 9c9a5c45f697c2..b7aaae2ff26525 100644
--- a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/get_filter_aggregations.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/get_filter_aggregations.ts
@@ -53,7 +53,7 @@ export const getFilterAggregations = async ({
               terms: {
                 field: field.fieldName,
                 order: {
-                  _count: 'desc'
+                  _count: 'desc' as const
                 }
               },
               ...bucketCountAggregation
diff --git a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts
index 7632b03584167b..e8c29c29434e6e 100644
--- a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts
@@ -68,7 +68,7 @@ export async function getLocalUIFilters({
       options: sortByOrder(
         aggregationsForFilter.by_terms.buckets.map(bucket => {
           return {
-            name: bucket.key,
+            name: bucket.key as string,
             count:
               'bucket_count' in bucket
                 ? bucket.bucket_count.value
diff --git a/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts b/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts
index 682ebf27207c42..7d22d9488718f5 100644
--- a/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts
+++ b/x-pack/legacy/plugins/apm/server/routes/create_apm_api.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { indexPatternRoute } from './index_pattern';
+import { indexPatternRoute, kueryBarIndexPatternRoute } from './index_pattern';
 import {
   errorDistributionRoute,
   errorGroupsRoute,
@@ -25,7 +25,12 @@ import {
   listAgentConfigurationServicesRoute,
   updateAgentConfigurationRoute,
   agentConfigurationAgentNameRoute
-} from './settings';
+} from './settings/agent_configuration';
+import {
+  apmIndexSettingsRoute,
+  apmIndicesRoute,
+  saveApmIndicesRoute
+} from './settings/apm_indices';
 import { metricsChartsRoute } from './metrics';
 import { serviceNodesRoute } from './service_nodes';
 import { tracesRoute, tracesByIdRoute } from './traces';
@@ -53,6 +58,7 @@ const createApmApi = () => {
   const api = createApi()
     // index pattern
     .add(indexPatternRoute)
+    .add(kueryBarIndexPatternRoute)
 
     // Errors
     .add(errorDistributionRoute)
@@ -75,6 +81,11 @@ const createApmApi = () => {
     .add(listAgentConfigurationServicesRoute)
     .add(updateAgentConfigurationRoute)
 
+    // APM indices
+    .add(apmIndexSettingsRoute)
+    .add(apmIndicesRoute)
+    .add(saveApmIndicesRoute)
+
     // Metrics
     .add(metricsChartsRoute)
     .add(serviceNodesRoute)
diff --git a/x-pack/legacy/plugins/apm/server/routes/errors.ts b/x-pack/legacy/plugins/apm/server/routes/errors.ts
index 73bb6e97b999b4..a315dd10023dcf 100644
--- a/x-pack/legacy/plugins/apm/server/routes/errors.ts
+++ b/x-pack/legacy/plugins/apm/server/routes/errors.ts
@@ -21,7 +21,7 @@ export const errorsRoute = createRoute(core => ({
     query: t.intersection([
       t.partial({
         sortField: t.string,
-        sortDirection: t.string
+        sortDirection: t.union([t.literal('asc'), t.literal('desc')])
       }),
       uiFiltersRt,
       rangeRt
diff --git a/x-pack/legacy/plugins/apm/server/routes/index_pattern.ts b/x-pack/legacy/plugins/apm/server/routes/index_pattern.ts
index e838fb1a4b526a..100df4dc238fe9 100644
--- a/x-pack/legacy/plugins/apm/server/routes/index_pattern.ts
+++ b/x-pack/legacy/plugins/apm/server/routes/index_pattern.ts
@@ -3,8 +3,11 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import * as t from 'io-ts';
 import { getAPMIndexPattern } from '../lib/index_pattern';
 import { createRoute } from './create_route';
+import { getKueryBarIndexPattern } from '../lib/index_pattern/getKueryBarIndexPattern';
+import { setupRequest } from '../lib/helpers/setup_request';
 
 export const indexPatternRoute = createRoute(core => ({
   path: '/api/apm/index_pattern',
@@ -13,3 +16,23 @@ export const indexPatternRoute = createRoute(core => ({
     return await getAPMIndexPattern(server);
   }
 }));
+
+export const kueryBarIndexPatternRoute = createRoute(core => ({
+  path: '/api/apm/kuery_bar_index_pattern',
+  params: {
+    query: t.partial({
+      processorEvent: t.union([
+        t.literal('transaction'),
+        t.literal('metric'),
+        t.literal('error')
+      ])
+    })
+  },
+  handler: async (request, { query }) => {
+    const { processorEvent } = query;
+
+    const setup = await setupRequest(request);
+
+    return getKueryBarIndexPattern({ request, processorEvent, setup });
+  }
+}));
diff --git a/x-pack/legacy/plugins/apm/server/routes/settings.ts b/x-pack/legacy/plugins/apm/server/routes/settings.ts
deleted file mode 100644
index 65ef5df78f3e12..00000000000000
--- a/x-pack/legacy/plugins/apm/server/routes/settings.ts
+++ /dev/null
@@ -1,169 +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 { setupRequest } from '../lib/helpers/setup_request';
-import { getServiceNames } from '../lib/settings/agent_configuration/get_service_names';
-import { createOrUpdateConfiguration } from '../lib/settings/agent_configuration/create_or_update_configuration';
-import { searchConfigurations } from '../lib/settings/agent_configuration/search';
-import { listConfigurations } from '../lib/settings/agent_configuration/list_configurations';
-import { getEnvironments } from '../lib/settings/agent_configuration/get_environments';
-import { deleteConfiguration } from '../lib/settings/agent_configuration/delete_configuration';
-import { createRoute } from './create_route';
-import { transactionSampleRateRt } from '../../common/runtime_types/transaction_sample_rate_rt';
-import { transactionMaxSpansRt } from '../../common/runtime_types/transaction_max_spans_rt';
-import { getAgentNameByService } from '../lib/settings/agent_configuration/get_agent_name_by_service';
-import { markAppliedByAgent } from '../lib/settings/agent_configuration/mark_applied_by_agent';
-
-// get list of configurations
-export const agentConfigurationRoute = createRoute(core => ({
-  path: '/api/apm/settings/agent-configuration',
-  handler: async req => {
-    const setup = await setupRequest(req);
-    return await listConfigurations({ setup });
-  }
-}));
-
-// delete configuration
-export const deleteAgentConfigurationRoute = createRoute(() => ({
-  method: 'DELETE',
-  path: '/api/apm/settings/agent-configuration/{configurationId}',
-  params: {
-    path: t.type({
-      configurationId: t.string
-    })
-  },
-  handler: async (req, { path }) => {
-    const setup = await setupRequest(req);
-    const { configurationId } = path;
-    return await deleteConfiguration({
-      configurationId,
-      setup
-    });
-  }
-}));
-
-// get list of services
-export const listAgentConfigurationServicesRoute = createRoute(() => ({
-  method: 'GET',
-  path: '/api/apm/settings/agent-configuration/services',
-  handler: async req => {
-    const setup = await setupRequest(req);
-    return await getServiceNames({
-      setup
-    });
-  }
-}));
-
-const agentPayloadRt = t.intersection([
-  t.partial({ agent_name: t.string }),
-  t.type({
-    service: t.intersection([
-      t.partial({ name: t.string }),
-      t.partial({ environment: t.string })
-    ])
-  }),
-  t.type({
-    settings: t.intersection([
-      t.partial({ transaction_sample_rate: transactionSampleRateRt }),
-      t.partial({ capture_body: t.string }),
-      t.partial({ transaction_max_spans: transactionMaxSpansRt })
-    ])
-  })
-]);
-
-// get environments for service
-export const listAgentConfigurationEnvironmentsRoute = createRoute(() => ({
-  path: '/api/apm/settings/agent-configuration/environments',
-  params: {
-    query: t.partial({ serviceName: t.string })
-  },
-  handler: async (req, { query }) => {
-    const setup = await setupRequest(req);
-    const { serviceName } = 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 (req, { query }) => {
-    const setup = await setupRequest(req);
-    const { serviceName } = query;
-    const agentName = await getAgentNameByService({ serviceName, setup });
-    return agentName;
-  }
-}));
-
-export const createAgentConfigurationRoute = createRoute(() => ({
-  method: 'POST',
-  path: '/api/apm/settings/agent-configuration/new',
-  params: {
-    body: agentPayloadRt
-  },
-  handler: async (req, { body }) => {
-    const setup = await setupRequest(req);
-    return await createOrUpdateConfiguration({ configuration: body, setup });
-  }
-}));
-
-export const updateAgentConfigurationRoute = createRoute(() => ({
-  method: 'PUT',
-  path: '/api/apm/settings/agent-configuration/{configurationId}',
-  params: {
-    path: t.type({
-      configurationId: t.string
-    }),
-    body: agentPayloadRt
-  },
-  handler: async (req, { path, body }) => {
-    const setup = await setupRequest(req);
-    const { configurationId } = path;
-    return await createOrUpdateConfiguration({
-      configurationId,
-      configuration: body,
-      setup
-    });
-  }
-}));
-
-// Lookup single configuration (used by APM Server)
-export const agentConfigurationSearchRoute = createRoute(core => ({
-  method: 'POST',
-  path: '/api/apm/settings/agent-configuration/search',
-  params: {
-    body: t.type({
-      service: t.intersection([
-        t.type({ name: t.string }),
-        t.partial({ environment: t.string })
-      ]),
-      etag: t.string
-    })
-  },
-  handler: async (req, { body }, h) => {
-    const setup = await setupRequest(req);
-    const config = await searchConfigurations({
-      serviceName: body.service.name,
-      environment: body.service.environment,
-      setup
-    });
-
-    if (!config) {
-      return h.response().code(404);
-    }
-
-    // update `applied_by_agent` field if etags match
-    if (body.etag === config._source.etag && !config._source.applied_by_agent) {
-      markAppliedByAgent({ id: config._id, body: config._source, setup });
-    }
-
-    return config;
-  }
-}));
diff --git a/x-pack/legacy/plugins/apm/server/routes/settings/agent_configuration.ts b/x-pack/legacy/plugins/apm/server/routes/settings/agent_configuration.ts
new file mode 100644
index 00000000000000..d25ad949d6ddef
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/routes/settings/agent_configuration.ts
@@ -0,0 +1,169 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { setupRequest } from '../../lib/helpers/setup_request';
+import { getServiceNames } from '../../lib/settings/agent_configuration/get_service_names';
+import { createOrUpdateConfiguration } from '../../lib/settings/agent_configuration/create_or_update_configuration';
+import { searchConfigurations } from '../../lib/settings/agent_configuration/search';
+import { listConfigurations } from '../../lib/settings/agent_configuration/list_configurations';
+import { getEnvironments } from '../../lib/settings/agent_configuration/get_environments';
+import { deleteConfiguration } from '../../lib/settings/agent_configuration/delete_configuration';
+import { createRoute } from '../create_route';
+import { transactionSampleRateRt } from '../../../common/runtime_types/transaction_sample_rate_rt';
+import { transactionMaxSpansRt } from '../../../common/runtime_types/transaction_max_spans_rt';
+import { getAgentNameByService } from '../../lib/settings/agent_configuration/get_agent_name_by_service';
+import { markAppliedByAgent } from '../../lib/settings/agent_configuration/mark_applied_by_agent';
+
+// get list of configurations
+export const agentConfigurationRoute = createRoute(core => ({
+  path: '/api/apm/settings/agent-configuration',
+  handler: async req => {
+    const setup = await setupRequest(req);
+    return await listConfigurations({ setup });
+  }
+}));
+
+// delete configuration
+export const deleteAgentConfigurationRoute = createRoute(() => ({
+  method: 'DELETE',
+  path: '/api/apm/settings/agent-configuration/{configurationId}',
+  params: {
+    path: t.type({
+      configurationId: t.string
+    })
+  },
+  handler: async (req, { path }) => {
+    const setup = await setupRequest(req);
+    const { configurationId } = path;
+    return await deleteConfiguration({
+      configurationId,
+      setup
+    });
+  }
+}));
+
+// get list of services
+export const listAgentConfigurationServicesRoute = createRoute(() => ({
+  method: 'GET',
+  path: '/api/apm/settings/agent-configuration/services',
+  handler: async req => {
+    const setup = await setupRequest(req);
+    return await getServiceNames({
+      setup
+    });
+  }
+}));
+
+const agentPayloadRt = t.intersection([
+  t.partial({ agent_name: t.string }),
+  t.type({
+    service: t.intersection([
+      t.partial({ name: t.string }),
+      t.partial({ environment: t.string })
+    ])
+  }),
+  t.type({
+    settings: t.intersection([
+      t.partial({ transaction_sample_rate: transactionSampleRateRt }),
+      t.partial({ capture_body: t.string }),
+      t.partial({ transaction_max_spans: transactionMaxSpansRt })
+    ])
+  })
+]);
+
+// get environments for service
+export const listAgentConfigurationEnvironmentsRoute = createRoute(() => ({
+  path: '/api/apm/settings/agent-configuration/environments',
+  params: {
+    query: t.partial({ serviceName: t.string })
+  },
+  handler: async (req, { query }) => {
+    const setup = await setupRequest(req);
+    const { serviceName } = 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 (req, { query }) => {
+    const setup = await setupRequest(req);
+    const { serviceName } = query;
+    const agentName = await getAgentNameByService({ serviceName, setup });
+    return agentName;
+  }
+}));
+
+export const createAgentConfigurationRoute = createRoute(() => ({
+  method: 'POST',
+  path: '/api/apm/settings/agent-configuration/new',
+  params: {
+    body: agentPayloadRt
+  },
+  handler: async (req, { body }) => {
+    const setup = await setupRequest(req);
+    return await createOrUpdateConfiguration({ configuration: body, setup });
+  }
+}));
+
+export const updateAgentConfigurationRoute = createRoute(() => ({
+  method: 'PUT',
+  path: '/api/apm/settings/agent-configuration/{configurationId}',
+  params: {
+    path: t.type({
+      configurationId: t.string
+    }),
+    body: agentPayloadRt
+  },
+  handler: async (req, { path, body }) => {
+    const setup = await setupRequest(req);
+    const { configurationId } = path;
+    return await createOrUpdateConfiguration({
+      configurationId,
+      configuration: body,
+      setup
+    });
+  }
+}));
+
+// Lookup single configuration (used by APM Server)
+export const agentConfigurationSearchRoute = createRoute(core => ({
+  method: 'POST',
+  path: '/api/apm/settings/agent-configuration/search',
+  params: {
+    body: t.type({
+      service: t.intersection([
+        t.type({ name: t.string }),
+        t.partial({ environment: t.string })
+      ]),
+      etag: t.string
+    })
+  },
+  handler: async (req, { body }, h) => {
+    const setup = await setupRequest(req);
+    const config = await searchConfigurations({
+      serviceName: body.service.name,
+      environment: body.service.environment,
+      setup
+    });
+
+    if (!config) {
+      return h.response().code(404);
+    }
+
+    // update `applied_by_agent` field if etags match
+    if (body.etag === config._source.etag && !config._source.applied_by_agent) {
+      markAppliedByAgent({ id: config._id, body: config._source, setup });
+    }
+
+    return config;
+  }
+}));
diff --git a/x-pack/legacy/plugins/apm/server/routes/settings/apm_indices.ts b/x-pack/legacy/plugins/apm/server/routes/settings/apm_indices.ts
new file mode 100644
index 00000000000000..3c82a35ec79033
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/routes/settings/apm_indices.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 * as t from 'io-ts';
+import { setupRequest } from '../../lib/helpers/setup_request';
+import { createRoute } from '../create_route';
+import {
+  getApmIndices,
+  getApmIndexSettings
+} from '../../lib/settings/apm_indices/get_apm_indices';
+import { saveApmIndices } from '../../lib/settings/apm_indices/save_apm_indices';
+
+// get list of apm indices and values
+export const apmIndexSettingsRoute = createRoute(core => ({
+  method: 'GET',
+  path: '/api/apm/settings/apm-index-settings',
+  handler: async req => {
+    const { server } = core.http;
+    const setup = await setupRequest(req);
+    return await getApmIndexSettings({ setup, server });
+  }
+}));
+
+// get apm indices configuration object
+export const apmIndicesRoute = createRoute(core => ({
+  method: 'GET',
+  path: '/api/apm/settings/apm-indices',
+  handler: async req => {
+    const { server } = core.http;
+    return await getApmIndices(server);
+  }
+}));
+
+// save ui indices
+export const saveApmIndicesRoute = createRoute(core => ({
+  method: 'POST',
+  path: '/api/apm/settings/apm-indices/save',
+  params: {
+    body: t.partial({
+      'apm_oss.sourcemapIndices': t.string,
+      'apm_oss.errorIndices': t.string,
+      'apm_oss.onboardingIndices': t.string,
+      'apm_oss.spanIndices': t.string,
+      'apm_oss.transactionIndices': t.string,
+      'apm_oss.metricsIndices': t.string,
+      'apm_oss.apmAgentConfigurationIndex': t.string
+    })
+  },
+  handler: async (req, { body }) => {
+    const { server } = core.http;
+    return await saveApmIndices(server, body);
+  }
+}));
diff --git a/x-pack/legacy/plugins/apm/typings/common.d.ts b/x-pack/legacy/plugins/apm/typings/common.d.ts
new file mode 100644
index 00000000000000..d79b05ed99b496
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/typings/common.d.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import '../../infra/types/rison_node';
+import '../../infra/types/eui';
+// EUIBasicTable
+import {} from '../../reporting/public/components/report_listing';
+// .svg
+import '../../canvas/types/webpack';
+
+// Allow unknown properties in an object
+export type AllowUnknownProperties<T> = T extends Array<infer X>
+  ? Array<AllowUnknownObjectProperties<X>>
+  : AllowUnknownObjectProperties<T>;
+
+type AllowUnknownObjectProperties<T> = T extends object
+  ? { [Prop in keyof T]: AllowUnknownProperties<T[Prop]> } & {
+      [key: string]: unknown;
+    }
+  : T;
+
+export type PromiseReturnType<Func> = Func extends (
+  ...args: any[]
+) => Promise<infer Value>
+  ? Value
+  : Func;
diff --git a/x-pack/legacy/plugins/apm/typings/common.ts b/x-pack/legacy/plugins/apm/typings/common.ts
deleted file mode 100644
index cfe6c9c572dc40..00000000000000
--- a/x-pack/legacy/plugins/apm/typings/common.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export interface StringMap<T = unknown> {
-  [key: string]: T;
-}
-
-// Allow unknown properties in an object
-export type AllowUnknownProperties<T> = T extends Array<infer X>
-  ? Array<AllowUnknownObjectProperties<X>>
-  : AllowUnknownObjectProperties<T>;
-
-type AllowUnknownObjectProperties<T> = T extends object
-  ? { [Prop in keyof T]: AllowUnknownProperties<T[Prop]> } & {
-      [key: string]: unknown;
-    }
-  : T;
-
-export type PromiseReturnType<Func> = Func extends (
-  ...args: any[]
-) => Promise<infer Value>
-  ? Value
-  : Func;
-
-export type IndexAsString<Map> = {
-  [k: string]: Map[keyof Map];
-} & Map;
-
-export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
diff --git a/x-pack/legacy/plugins/apm/typings/elasticsearch.ts b/x-pack/legacy/plugins/apm/typings/elasticsearch.ts
deleted file mode 100644
index 08d1e2b37492e5..00000000000000
--- a/x-pack/legacy/plugins/apm/typings/elasticsearch.ts
+++ /dev/null
@@ -1,203 +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 { StringMap, IndexAsString } from './common';
-
-declare module 'elasticsearch' {
-  // extending SearchResponse to be able to have typed aggregations
-
-  type ESSearchHit<T> = SearchResponse<T>['hits']['hits'][0];
-
-  type AggregationType =
-    | 'date_histogram'
-    | 'histogram'
-    | 'terms'
-    | 'avg'
-    | 'top_hits'
-    | 'max'
-    | 'min'
-    | 'percentiles'
-    | 'sum'
-    | 'extended_stats'
-    | 'filter'
-    | 'filters'
-    | 'cardinality'
-    | 'sampler'
-    | 'value_count'
-    | 'derivative'
-    | 'bucket_script';
-
-  type AggOptions = AggregationOptionMap & {
-    [key: string]: any;
-  };
-
-  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-  export type AggregationOptionMap = {
-    aggs?: {
-      [aggregationName: string]: {
-        [T in AggregationType]?: AggOptions & AggregationOptionMap;
-      };
-    };
-  };
-
-  type SubAggregation<T> = T extends { aggs: any }
-    ? AggregationResultMap<T['aggs']>
-    : {};
-
-  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-  type BucketAggregation<SubAggregationMap, KeyType = string> = {
-    buckets: Array<
-      {
-        key: KeyType;
-        key_as_string: string;
-        doc_count: number;
-      } & (SubAggregation<SubAggregationMap>)
-    >;
-  };
-
-  type FilterAggregation<SubAggregationMap> = {
-    doc_count: number;
-  } & SubAggregation<SubAggregationMap>;
-
-  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-  type FiltersAggregation<SubAggregationMap> = {
-    // The filters aggregation can have named filters or anonymous filters,
-    // which changes the structure of the return
-    // https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filters-aggregation.html
-    buckets: SubAggregationMap extends {
-      filters: { filters: Record<string, unknown> };
-    }
-      ? {
-          [key in keyof SubAggregationMap['filters']['filters']]: {
-            doc_count: number;
-          } & SubAggregation<SubAggregationMap>;
-        }
-      : Array<
-          {
-            doc_count: number;
-          } & SubAggregation<SubAggregationMap>
-        >;
-  };
-
-  type SamplerAggregation<SubAggregationMap> = SubAggregation<
-    SubAggregationMap
-  > & {
-    doc_count: number;
-  };
-
-  interface AggregatedValue {
-    value: number | null;
-  }
-
-  interface HitsTotal {
-    value: number;
-    relation: 'eq' | 'gte';
-  }
-
-  type AggregationResultMap<AggregationOption> = IndexAsString<
-    {
-      [AggregationName in keyof AggregationOption]: {
-        avg: AggregatedValue;
-        max: AggregatedValue;
-        min: AggregatedValue;
-        sum: AggregatedValue;
-        value_count: AggregatedValue;
-        // Elasticsearch might return terms with numbers, but this is a more limited type
-        terms: BucketAggregation<AggregationOption[AggregationName], string>;
-        date_histogram: BucketAggregation<
-          AggregationOption[AggregationName],
-          number
-        >;
-        histogram: BucketAggregation<
-          AggregationOption[AggregationName],
-          number
-        >;
-        top_hits: {
-          hits: {
-            total: HitsTotal;
-            max_score: number | null;
-            hits: Array<{
-              _source: AggregationOption[AggregationName] extends {
-                Mapping: any;
-              }
-                ? AggregationOption[AggregationName]['Mapping']
-                : never;
-            }>;
-          };
-        };
-        percentiles: {
-          values: {
-            [key: string]: number;
-          };
-        };
-        extended_stats: {
-          count: number;
-          min: number | null;
-          max: number | null;
-          avg: number | null;
-          sum: number;
-          sum_of_squares: number | null;
-          variance: number | null;
-          std_deviation: number | null;
-          std_deviation_bounds: {
-            upper: number | null;
-            lower: number | null;
-          };
-        };
-        filter: FilterAggregation<AggregationOption[AggregationName]>;
-        filters: FiltersAggregation<AggregationOption[AggregationName]>;
-        cardinality: {
-          value: number;
-        };
-        sampler: SamplerAggregation<AggregationOption[AggregationName]>;
-        derivative: BucketAggregation<
-          AggregationOption[AggregationName],
-          number
-        >;
-        bucket_script: {
-          value: number | null;
-        };
-      }[AggregationType & keyof AggregationOption[AggregationName]];
-    }
-  >;
-
-  export type AggregationSearchResponseWithTotalHitsAsInt<
-    HitType,
-    SearchParams
-  > = Pick<
-    SearchResponse<HitType>,
-    Exclude<keyof SearchResponse<HitType>, 'aggregations'>
-  > &
-    (SearchParams extends { body: Required<AggregationOptionMap> }
-      ? {
-          aggregations?: AggregationResultMap<SearchParams['body']['aggs']>;
-        }
-      : {});
-
-  type Hits<HitType> = Pick<
-    SearchResponse<HitType>['hits'],
-    Exclude<keyof SearchResponse<HitType>['hits'], 'total'>
-  > & {
-    total: HitsTotal;
-  };
-
-  export type AggregationSearchResponseWithTotalHitsAsObject<
-    HitType,
-    SearchParams
-  > = Pick<
-    AggregationSearchResponseWithTotalHitsAsInt<HitType, SearchParams>,
-    Exclude<
-      keyof AggregationSearchResponseWithTotalHitsAsInt<HitType, SearchParams>,
-      'hits'
-    >
-  > & { hits: Hits<HitType> };
-
-  export interface ESFilter {
-    [key: string]: {
-      [key: string]: string | string[] | number | StringMap | ESFilter[];
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts
new file mode 100644
index 00000000000000..9f17b0197a5b21
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.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 { Unionize } from 'utility-types';
+
+type SortOrder = 'asc' | 'desc';
+type SortInstruction = Record<string, SortOrder | { order: SortOrder }>;
+export type SortOptions = SortOrder | SortInstruction | SortInstruction[];
+
+type Script =
+  | string
+  | {
+      lang?: string;
+      id?: string;
+      source?: string;
+      params?: Record<string, string | number>;
+    };
+
+type BucketsPath = string | Record<string, string>;
+
+type SourceOptions = string | string[];
+
+type MetricsAggregationOptions =
+  | {
+      field: string;
+      missing?: number;
+    }
+  | {
+      script?: Script;
+    };
+
+interface MetricsAggregationResponsePart {
+  value: number | null;
+}
+
+export interface AggregationOptionsByType {
+  terms: {
+    field: string;
+    size?: number;
+    missing?: string;
+    order?: SortOptions;
+  };
+  date_histogram: {
+    field: string;
+    format?: string;
+    min_doc_count?: number;
+    extended_bounds?: {
+      min: number;
+      max: number;
+    };
+  } & ({ calendar_interval: string } | { fixed_interval: string });
+  histogram: {
+    field: string;
+    interval: number;
+    min_doc_count?: number;
+    extended_bounds?: {
+      min?: number | string;
+      max?: number | string;
+    };
+  };
+  avg: MetricsAggregationOptions;
+  max: MetricsAggregationOptions;
+  min: MetricsAggregationOptions;
+  sum: MetricsAggregationOptions;
+  value_count: MetricsAggregationOptions;
+  cardinality: MetricsAggregationOptions & {
+    precision_threshold?: number;
+  };
+  percentiles: {
+    field: string;
+    percents?: number[];
+  };
+  extended_stats: {
+    field: string;
+  };
+  top_hits: {
+    from?: number;
+    size?: number;
+    sort?: SortOptions;
+    _source?: SourceOptions;
+  };
+  filter: Record<string, any>;
+  filters: {
+    filters: Record<string, any> | any[];
+  };
+  sampler: {
+    shard_size?: number;
+  };
+  derivative: {
+    buckets_path: BucketsPath;
+  };
+  bucket_script: {
+    buckets_path: BucketsPath;
+    script?: Script;
+  };
+}
+
+type AggregationType = keyof AggregationOptionsByType;
+
+type AggregationOptionsMap = Unionize<
+  {
+    [TAggregationType in AggregationType]: AggregationOptionsByType[TAggregationType];
+  }
+> & { aggs?: AggregationInputMap };
+
+export interface AggregationInputMap {
+  [key: string]: AggregationOptionsMap;
+}
+
+type BucketSubAggregationResponse<
+  TAggregationInputMap extends AggregationInputMap | undefined,
+  TDocument
+> = TAggregationInputMap extends AggregationInputMap
+  ? AggregationResponseMap<TAggregationInputMap, TDocument>
+  : {};
+
+interface AggregationResponsePart<
+  TAggregationOptionsMap extends AggregationOptionsMap,
+  TDocument
+> {
+  terms: {
+    buckets: Array<
+      {
+        doc_count: number;
+        key: string | number;
+      } & BucketSubAggregationResponse<
+        TAggregationOptionsMap['aggs'],
+        TDocument
+      >
+    >;
+  };
+  histogram: {
+    buckets: Array<
+      {
+        doc_count: number;
+        key: number;
+      } & BucketSubAggregationResponse<
+        TAggregationOptionsMap['aggs'],
+        TDocument
+      >
+    >;
+  };
+  date_histogram: {
+    buckets: Array<
+      {
+        doc_count: number;
+        key: number;
+        key_as_string: string;
+      } & BucketSubAggregationResponse<
+        TAggregationOptionsMap['aggs'],
+        TDocument
+      >
+    >;
+  };
+  avg: MetricsAggregationResponsePart;
+  sum: MetricsAggregationResponsePart;
+  max: MetricsAggregationResponsePart;
+  min: MetricsAggregationResponsePart;
+  value_count: MetricsAggregationResponsePart;
+  cardinality: {
+    value: number;
+  };
+  percentiles: {
+    values: Record<string, number>;
+  };
+  extended_stats: {
+    count: number;
+    min: number | null;
+    max: number | null;
+    avg: number | null;
+    sum: number | null;
+    sum_of_squares: number | null;
+    variance: number | null;
+    std_deviation: number | null;
+    std_deviation_bounds: {
+      upper: number | null;
+      lower: number | null;
+    };
+  };
+  top_hits: {
+    hits: {
+      total: {
+        value: number;
+        relation: 'eq' | 'gte';
+      };
+      max_score: number | null;
+      hits: Array<{
+        _source: TDocument;
+      }>;
+    };
+  };
+  filter: {
+    doc_count: number;
+  } & AggregationResponseMap<TAggregationOptionsMap['aggs'], TDocument>;
+  filters: TAggregationOptionsMap extends { filters: { filters: any[] } }
+    ? Array<
+        { doc_count: number } & AggregationResponseMap<
+          TAggregationOptionsMap['aggs'],
+          TDocument
+        >
+      >
+    : (TAggregationOptionsMap extends {
+        filters: {
+          filters: Record<string, any>;
+        };
+      }
+        ? {
+            buckets: {
+              [key in keyof TAggregationOptionsMap['filters']['filters']]: {
+                doc_count: number;
+              } & AggregationResponseMap<
+                TAggregationOptionsMap['aggs'],
+                TDocument
+              >;
+            };
+          }
+        : never);
+  sampler: {
+    doc_count: number;
+  } & AggregationResponseMap<TAggregationOptionsMap['aggs'], TDocument>;
+  derivative:
+    | {
+        value: number;
+      }
+    | undefined;
+  bucket_script:
+    | {
+        value: number | null;
+      }
+    | undefined;
+}
+
+// Type for debugging purposes. If you see an error in AggregationResponseMap
+// similar to "cannot be used to index type", uncomment the type below and hover
+// over it to see what aggregation response types are missing compared to the
+// input map.
+
+// type MissingAggregationResponseTypes = Exclude<
+//   AggregationType,
+//   keyof AggregationResponsePart<{}>
+// >;
+
+export type AggregationResponseMap<
+  TAggregationInputMap extends AggregationInputMap | undefined,
+  TDocument
+> = TAggregationInputMap extends AggregationInputMap
+  ? {
+      [TName in keyof TAggregationInputMap]: AggregationResponsePart<
+        TAggregationInputMap[TName],
+        TDocument
+      >[AggregationType & keyof TAggregationInputMap[TName]];
+    }
+  : undefined;
diff --git a/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts b/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts
new file mode 100644
index 00000000000000..56cd0ff23a3fb5
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SearchParams, SearchResponse } from 'elasticsearch';
+import { AggregationResponseMap, AggregationInputMap } from './aggregations';
+
+export interface ESSearchBody {
+  query?: any;
+  size?: number;
+  aggs?: AggregationInputMap;
+  track_total_hits?: boolean | number;
+}
+
+export type ESSearchRequest = Omit<SearchParams, 'body'> & {
+  body?: ESSearchBody;
+};
+
+export interface ESSearchOptions {
+  restTotalHitsAsInt: boolean;
+}
+
+export type ESSearchHit<T> = SearchResponse<T>['hits']['hits'][0];
+
+export type ESSearchResponse<
+  TDocument,
+  TSearchRequest extends ESSearchRequest,
+  TOptions extends ESSearchOptions = { restTotalHitsAsInt: false }
+> = Omit<SearchResponse<TDocument>, 'aggregations' | 'hits'> &
+  (TSearchRequest extends { body: { aggs: AggregationInputMap } }
+    ? {
+        aggregations?: AggregationResponseMap<
+          TSearchRequest['body']['aggs'],
+          TDocument
+        >;
+      }
+    : {}) &
+  ({
+    hits: Omit<SearchResponse<TDocument>['hits'], 'total'> &
+      (TOptions['restTotalHitsAsInt'] extends true
+        ? {
+            total: number;
+          }
+        : {
+            total: {
+              value: number;
+              relation: 'eq' | 'gte';
+            };
+          });
+  });
+
+export interface ESFilter {
+  [key: string]: {
+    [key: string]:
+      | string
+      | string[]
+      | number
+      | Record<string, unknown>
+      | ESFilter[];
+  };
+}
diff --git a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/ErrorRaw.ts b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/ErrorRaw.ts
index 545bcc86b2f951..2f6e857e82470a 100644
--- a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/ErrorRaw.ts
+++ b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/ErrorRaw.ts
@@ -21,7 +21,7 @@ interface Processor {
   event: 'error';
 }
 
-interface Exception {
+export interface Exception {
   message?: string; // either message or type are given
   type?: string;
   module?: string;
diff --git a/x-pack/legacy/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/legacy/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx
index 64e7bf6b7f09e5..2ae475475829ff 100644
--- a/x-pack/legacy/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx
+++ b/x-pack/legacy/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx
@@ -18,29 +18,23 @@ interface SuggestionItemProps {
   suggestion: AutocompleteSuggestion;
 }
 
-export class SuggestionItem extends React.Component<SuggestionItemProps> {
-  public static defaultProps: Partial<SuggestionItemProps> = {
-    isSelected: false,
-  };
+export const SuggestionItem: React.SFC<SuggestionItemProps> = props => {
+  const { isSelected, onClick, onMouseEnter, suggestion } = props;
 
-  public render() {
-    const { isSelected, onClick, onMouseEnter, suggestion } = this.props;
+  return (
+    <SuggestionItemContainer isSelected={isSelected} onClick={onClick} onMouseEnter={onMouseEnter}>
+      <SuggestionItemIconField suggestionType={suggestion.type}>
+        <EuiIcon type={getEuiIconType(suggestion.type)} />
+      </SuggestionItemIconField>
+      <SuggestionItemTextField>{suggestion.text}</SuggestionItemTextField>
+      <SuggestionItemDescriptionField>{suggestion.description}</SuggestionItemDescriptionField>
+    </SuggestionItemContainer>
+  );
+};
 
-    return (
-      <SuggestionItemContainer
-        isSelected={isSelected}
-        onClick={onClick}
-        onMouseEnter={onMouseEnter}
-      >
-        <SuggestionItemIconField suggestionType={suggestion.type}>
-          <EuiIcon type={getEuiIconType(suggestion.type)} />
-        </SuggestionItemIconField>
-        <SuggestionItemTextField>{suggestion.text}</SuggestionItemTextField>
-        <SuggestionItemDescriptionField>{suggestion.description}</SuggestionItemDescriptionField>
-      </SuggestionItemContainer>
-    );
-  }
-}
+SuggestionItem.defaultProps = {
+  isSelected: false,
+};
 
 const SuggestionItemContainer = styled.div<{
   isSelected?: boolean;
diff --git a/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts b/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts
index d4a42ba662db41..526728bd77cac6 100644
--- a/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts
+++ b/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts
@@ -7,16 +7,16 @@
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 import { isEmpty } from 'lodash';
 import { npStart } from 'ui/new_platform';
-import { RestAPIAdapter } from '../rest_api/adapter_types';
 import { ElasticsearchAdapter } from './adapter_types';
 import { AutocompleteSuggestion } from '../../../../../../../../src/plugins/data/public';
+import { setup as data } from '../../../../../../../../src/legacy/core_plugins/data/public/legacy';
 
 const getAutocompleteProvider = (language: string) =>
   npStart.plugins.data.autocomplete.getProvider(language);
 
 export class RestElasticsearchAdapter implements ElasticsearchAdapter {
   private cachedIndexPattern: any = null;
-  constructor(private readonly api: RestAPIAdapter, private readonly indexPatternName: string) {}
+  constructor(private readonly indexPatternName: string) {}
 
   public isKueryValid(kuery: string): boolean {
     try {
@@ -65,9 +65,9 @@ export class RestElasticsearchAdapter implements ElasticsearchAdapter {
     if (this.cachedIndexPattern) {
       return this.cachedIndexPattern;
     }
-    const res = await this.api.get<any>(
-      `/api/index_patterns/_fields_for_wildcard?pattern=${this.indexPatternName}`
-    );
+    const res = await data.indexPatterns.indexPatterns.getFieldsForWildcard({
+      pattern: this.indexPatternName,
+    });
     if (isEmpty(res.fields)) {
       return;
     }
diff --git a/x-pack/legacy/plugins/beats_management/public/lib/compose/kibana.ts b/x-pack/legacy/plugins/beats_management/public/lib/compose/kibana.ts
index 3d8ca51e006bf7..2ebda89ba13fd6 100644
--- a/x-pack/legacy/plugins/beats_management/public/lib/compose/kibana.ts
+++ b/x-pack/legacy/plugins/beats_management/public/lib/compose/kibana.ts
@@ -35,7 +35,7 @@ const onKibanaReady = chrome.dangerouslyGetActiveInjector;
 
 export function compose(): FrontendLibs {
   const api = new AxiosRestAPIAdapter(chrome.getXsrfToken(), chrome.getBasePath());
-  const esAdapter = new RestElasticsearchAdapter(api, INDEX_NAMES.BEATS);
+  const esAdapter = new RestElasticsearchAdapter(INDEX_NAMES.BEATS);
   const elasticsearchLib = new ElasticsearchLib(esAdapter);
   const configBlocks = new ConfigBlocksLib(
     new RestConfigBlocksAdapter(api),
diff --git a/x-pack/legacy/plugins/beats_management/public/pages/walkthrough/initial/index.tsx b/x-pack/legacy/plugins/beats_management/public/pages/walkthrough/initial/index.tsx
index 6ac66437557656..26f2aa80de7639 100644
--- a/x-pack/legacy/plugins/beats_management/public/pages/walkthrough/initial/index.tsx
+++ b/x-pack/legacy/plugins/beats_management/public/pages/walkthrough/initial/index.tsx
@@ -6,93 +6,90 @@
 import { EuiBetaBadge, EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
-import React, { Component } from 'react';
+import React from 'react';
 import { NoDataLayout } from '../../../components/layouts/no_data';
 import { WalkthroughLayout } from '../../../components/layouts/walkthrough';
 import { ChildRoutes } from '../../../components/navigation/child_routes';
 import { ConnectedLink } from '../../../components/navigation/connected_link';
 import { AppPageProps } from '../../../frontend_types';
 
-class InitialWalkthroughPageComponent extends Component<
-  AppPageProps & {
-    intl: InjectedIntl;
-  }
-> {
-  public render() {
-    const { intl } = this.props;
+type Props = AppPageProps & {
+  intl: InjectedIntl;
+};
 
-    if (this.props.location.pathname === '/walkthrough/initial') {
-      return (
-        <NoDataLayout
-          title={
-            <EuiFlexGroup alignItems="center" gutterSize="m">
-              <EuiFlexItem grow={false}>{'Beats central management '}</EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiBetaBadge
-                  label={i18n.translate('xpack.beatsManagement.walkthrough.initial.betaBadgeText', {
-                    defaultMessage: 'Beta',
-                  })}
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          }
-          actionSection={
-            <ConnectedLink path="/walkthrough/initial/beat">
-              <EuiButton color="primary" fill>
-                <FormattedMessage
-                  id="xpack.beatsManagement.enrollBeat.enrollBeatButtonLabel"
-                  defaultMessage="Enroll Beat"
-                />{' '}
-              </EuiButton>
-            </ConnectedLink>
-          }
-        >
-          <p>
-            <FormattedMessage
-              id="xpack.beatsManagement.enrollBeat.beatsCentralManagementDescription"
-              defaultMessage="Manage your configurations in a central location."
-            />
-          </p>
-        </NoDataLayout>
-      );
-    }
+const InitialWalkthroughPageComponent: React.SFC<Props> = props => {
+  if (props.location.pathname === '/walkthrough/initial') {
     return (
-      <WalkthroughLayout
-        title={intl.formatMessage({
-          id: 'xpack.beatsManagement.enrollBeat.getStartedBeatsCentralManagementTitle',
-          defaultMessage: 'Get started with Beats central management',
-        })}
-        walkthroughSteps={[
-          {
-            id: '/walkthrough/initial/beat',
-            name: intl.formatMessage({
-              id: 'xpack.beatsManagement.enrollBeat.enrollBeatStepLabel',
-              defaultMessage: 'Enroll Beat',
-            }),
-          },
-          {
-            id: '/walkthrough/initial/tag',
-            name: intl.formatMessage({
-              id: 'xpack.beatsManagement.enrollBeat.createTagStepLabel',
-              defaultMessage: 'Create tag',
-            }),
-          },
-          {
-            id: '/walkthrough/initial/finish',
-            name: intl.formatMessage({
-              id: 'xpack.beatsManagement.enrollBeat.finishStepLabel',
-              defaultMessage: 'Finish',
-            }),
-          },
-        ]}
-        goTo={() => {
-          // FIXME implament goto
-        }}
-        activePath={this.props.location.pathname}
+      <NoDataLayout
+        title={
+          <EuiFlexGroup alignItems="center" gutterSize="m">
+            <EuiFlexItem grow={false}>{'Beats central management '}</EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiBetaBadge
+                label={i18n.translate('xpack.beatsManagement.walkthrough.initial.betaBadgeText', {
+                  defaultMessage: 'Beta',
+                })}
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        }
+        actionSection={
+          <ConnectedLink path="/walkthrough/initial/beat">
+            <EuiButton color="primary" fill>
+              <FormattedMessage
+                id="xpack.beatsManagement.enrollBeat.enrollBeatButtonLabel"
+                defaultMessage="Enroll Beat"
+              />{' '}
+            </EuiButton>
+          </ConnectedLink>
+        }
       >
-        <ChildRoutes routes={this.props.routes} {...this.props} />
-      </WalkthroughLayout>
+        <p>
+          <FormattedMessage
+            id="xpack.beatsManagement.enrollBeat.beatsCentralManagementDescription"
+            defaultMessage="Manage your configurations in a central location."
+          />
+        </p>
+      </NoDataLayout>
     );
   }
-}
+  return (
+    <WalkthroughLayout
+      title={props.intl.formatMessage({
+        id: 'xpack.beatsManagement.enrollBeat.getStartedBeatsCentralManagementTitle',
+        defaultMessage: 'Get started with Beats central management',
+      })}
+      walkthroughSteps={[
+        {
+          id: '/walkthrough/initial/beat',
+          name: props.intl.formatMessage({
+            id: 'xpack.beatsManagement.enrollBeat.enrollBeatStepLabel',
+            defaultMessage: 'Enroll Beat',
+          }),
+        },
+        {
+          id: '/walkthrough/initial/tag',
+          name: props.intl.formatMessage({
+            id: 'xpack.beatsManagement.enrollBeat.createTagStepLabel',
+            defaultMessage: 'Create tag',
+          }),
+        },
+        {
+          id: '/walkthrough/initial/finish',
+          name: props.intl.formatMessage({
+            id: 'xpack.beatsManagement.enrollBeat.finishStepLabel',
+            defaultMessage: 'Finish',
+          }),
+        },
+      ]}
+      goTo={() => {
+        // FIXME implament goto
+      }}
+      activePath={props.location.pathname}
+    >
+      <ChildRoutes routes={props.routes} {...props} />
+    </WalkthroughLayout>
+  );
+};
+
 export const InitialWalkthroughPage = injectI18n(InitialWalkthroughPageComponent);
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
index cad46e81ffc0cd..063e69d1d21416 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ExpressionType } from 'src/plugins/expressions/common';
+import { ExpressionType } from 'src/plugins/expressions/public';
 import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
 import { EmbeddableTypes } from './embeddable_types';
 
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
index c94b0dcd2bd9d9..546e8967a74397 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
@@ -6,8 +6,8 @@
 
 // @ts-ignore
 import { MAP_SAVED_OBJECT_TYPE } from '../../../maps/common/constants';
-import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/embeddable';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/embeddable/constants';
+import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/embeddable/constants';
 
 export const EmbeddableTypes = {
   map: MAP_SAVED_OBJECT_TYPE,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts
index 958d9c6a3a6f08..abaa16c4e32710 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts
@@ -3,7 +3,6 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { Filter as ESFilterType } from '@kbn/es-query';
 import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/public';
 import { TimeRange } from 'src/plugins/data/public';
 import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
@@ -15,6 +14,7 @@ import {
   EmbeddableExpression,
 } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 interface Arguments {
   id: string;
@@ -29,7 +29,7 @@ interface SavedMapInput extends EmbeddableInput {
     isPaused: boolean;
     interval: number;
   };
-  filters: ESFilterType[];
+  filters: esFilters.Filter[];
 }
 
 type Return = EmbeddableExpression<SavedMapInput>;
diff --git a/x-pack/legacy/plugins/canvas/common/lib/constants.ts b/x-pack/legacy/plugins/canvas/common/lib/constants.ts
index d4b092c830f72c..7494ea13e6c08e 100644
--- a/x-pack/legacy/plugins/canvas/common/lib/constants.ts
+++ b/x-pack/legacy/plugins/canvas/common/lib/constants.ts
@@ -36,6 +36,6 @@ export const DATATABLE_COLUMN_TYPES = ['string', 'number', 'null', 'boolean', 'd
 export const LAUNCHED_FULLSCREEN = 'workpad-full-screen-launch';
 export const LAUNCHED_FULLSCREEN_AUTOPLAY = 'workpad-full-screen-launch-with-autoplay';
 export const API_ROUTE_SHAREABLE_BASE = '/public/canvas';
-export const API_ROUTE_SHAREABLE_ZIP = `${API_ROUTE_SHAREABLE_BASE}/zip`;
-export const API_ROUTE_SHAREABLE_RUNTIME = `${API_ROUTE_SHAREABLE_BASE}/runtime`;
-export const API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD = `${API_ROUTE_SHAREABLE_BASE}/${SHAREABLE_RUNTIME_NAME}.js`;
+export const API_ROUTE_SHAREABLE_ZIP = '/public/canvas/zip';
+export const API_ROUTE_SHAREABLE_RUNTIME = '/public/canvas/runtime';
+export const API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD = `/public/canvas/${SHAREABLE_RUNTIME_NAME}.js`;
diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot
index 5bb55dd1a8b60c..89ed05a1eea93c 100644
--- a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot
@@ -19,16 +19,17 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
       >
         <figure
           className="euiImage canvasAsset__img"
-          style={
-            Object {
-              "backgroundImage": "url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4=)",
-            }
-          }
+          role="figure"
         >
           <img
             alt="Asset thumbnail"
             className="euiImage__img"
             src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4="
+            style={
+              Object {
+                "backgroundImage": "url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4=)",
+              }
+            }
           />
         </figure>
       </div>
@@ -213,16 +214,17 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
       >
         <figure
           className="euiImage canvasAsset__img"
-          style={
-            Object {
-              "backgroundImage": "url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4=)",
-            }
-          }
+          role="figure"
         >
           <img
             alt="Asset thumbnail"
             className="euiImage__img"
             src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4="
+            style={
+              Object {
+                "backgroundImage": "url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4=)",
+              }
+            }
           />
         </figure>
       </div>
diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/flyout/snippets_step.tsx b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/flyout/snippets_step.tsx
index f933d9009d3674..a65ec1ddba0810 100644
--- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/flyout/snippets_step.tsx
+++ b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/flyout/snippets_step.tsx
@@ -58,7 +58,7 @@ export const SnippetsStep: FC<{ onCopy: OnCopyFn }> = ({ onCopy }) => (
     <EuiHorizontalRule />
     <EuiDescriptionList>
       <EuiDescriptionListTitle>
-        <EuiCode>kbn-canvas-shareable="canvas"</EuiCode> ({strings.getRequiredLabel()})
+        <EuiCode>kbn-canvas-shareable=&quot;canvas&quot;</EuiCode> ({strings.getRequiredLabel()})
       </EuiDescriptionListTitle>
       <EuiDescriptionListDescription>
         {strings.getShareableParameterDescription()}
diff --git a/x-pack/legacy/plugins/canvas/public/lib/clipboard.js b/x-pack/legacy/plugins/canvas/public/lib/clipboard.js
index 2cebf2a5bad968..f9d68769c9c3a0 100644
--- a/x-pack/legacy/plugins/canvas/public/lib/clipboard.js
+++ b/x-pack/legacy/plugins/canvas/public/lib/clipboard.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Storage } from 'ui/storage';
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { LOCALSTORAGE_CLIPBOARD } from '../../common/lib/constants';
 import { getWindow } from './get_window';
 
diff --git a/x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js b/x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js
index 11723587b057dc..f867e4dc77a119 100644
--- a/x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js
+++ b/x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js
@@ -16,10 +16,10 @@ const execa = require('execa');
 const asyncPipeline = promisify(pipeline);
 
 const {
-  SHAREABLE_RUNTIME_SRC: RUNTIME_SRC,
+  SHAREABLE_RUNTIME_SRC,
   KIBANA_ROOT,
   STATS_OUTPUT,
-  SHAREABLE_RUNTIME_FILE: RUNTIME_FILE,
+  SHAREABLE_RUNTIME_FILE,
 } = require('../shareable_runtime/constants');
 
 run(
@@ -36,11 +36,11 @@ run(
       ...options,
     });
 
-    const webpackConfig = path.resolve(RUNTIME_SRC, 'webpack.config.js');
+    const webpackConfig = path.resolve(SHAREABLE_RUNTIME_SRC, 'webpack.config.js');
 
     const clean = () => {
       log.info('Deleting previous build.');
-      del.sync([RUNTIME_FILE], { force: true });
+      del.sync([SHAREABLE_RUNTIME_FILE], { force: true });
     };
 
     if (flags.clean) {
@@ -66,7 +66,7 @@ run(
           '--display-entrypoints',
           'false',
           '--content-base',
-          RUNTIME_SRC,
+          SHAREABLE_RUNTIME_SRC,
         ],
         options
       );
@@ -91,10 +91,20 @@ run(
 
     clean();
     log.info('Building Canvas Shareable Workpad Runtime...');
-    execa.sync('yarn', ['webpack', '--config', webpackConfig, '--hide-modules', '--progress'], {
-      ...options,
-      env,
-    });
+    execa.sync(
+      'yarn',
+      [
+        'webpack',
+        '--config',
+        webpackConfig,
+        '--hide-modules',
+        ...(process.stdout.isTTY ? ['--progress'] : []),
+      ],
+      {
+        ...options,
+        env,
+      }
+    );
     log.success('...runtime built!');
   },
   {
diff --git a/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts b/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts
index 8de813255a2301..ca34246531bff5 100644
--- a/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts
+++ b/x-pack/legacy/plugins/canvas/server/lib/build_embeddable_filters.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { buildQueryFilter, Filter as ESFilterType } from '@kbn/es-query';
 import { TimeRange } from 'src/plugins/data/public';
 import { Filter } from '../../types';
 // @ts-ignore Untyped Local
 import { buildBoolArray } from './build_bool_array';
+import { esFilters } from '../../../../../../src/plugins/data/common';
 
 export interface EmbeddableFilterInput {
-  filters: ESFilterType[];
+  filters: esFilters.Filter[];
   timeRange?: TimeRange;
 }
 
@@ -30,8 +30,10 @@ function getTimeRangeFromFilters(filters: Filter[]): TimeRange | undefined {
     : undefined;
 }
 
-function getQueryFilters(filters: Filter[]): ESFilterType[] {
-  return buildBoolArray(filters.filter(filter => filter.type !== 'time')).map(buildQueryFilter);
+function getQueryFilters(filters: Filter[]): esFilters.Filter[] {
+  return buildBoolArray(filters.filter(filter => filter.type !== 'time')).map(
+    esFilters.buildQueryFilter
+  );
 }
 
 export function buildEmbeddableFilters(filters: Filter[]): EmbeddableFilterInput {
diff --git a/x-pack/legacy/plugins/canvas/server/routes/shareables.ts b/x-pack/legacy/plugins/canvas/server/routes/shareables.ts
index cdb6a810519963..e8186ceceb47f2 100644
--- a/x-pack/legacy/plugins/canvas/server/routes/shareables.ts
+++ b/x-pack/legacy/plugins/canvas/server/routes/shareables.ts
@@ -25,8 +25,14 @@ export function shareableWorkpads(route: CoreSetup['http']['route']) {
   route({
     method: 'GET',
     path: API_ROUTE_SHAREABLE_RUNTIME,
+
     handler: {
-      file: SHAREABLE_RUNTIME_FILE,
+      file: {
+        path: SHAREABLE_RUNTIME_FILE,
+        // The option setting is not for typical use.  We're using it here to avoid
+        // problems in Cloud environments.  See elastic/kibana#47405.
+        confine: false,
+      },
     },
   });
 
@@ -34,9 +40,12 @@ export function shareableWorkpads(route: CoreSetup['http']['route']) {
   route({
     method: 'GET',
     path: API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD,
+
     handler(_request, handler) {
+      // The option setting is not for typical use.  We're using it here to avoid
+      // problems in Cloud environments.  See elastic/kibana#47405.
       // @ts-ignore No type for inert Hapi handler
-      const file = handler.file(SHAREABLE_RUNTIME_FILE);
+      const file = handler.file(SHAREABLE_RUNTIME_FILE, { confine: false });
       file.type('application/octet-stream');
       return file;
     },
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx b/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx
index ea944bd30e9b83..a55c87c2d74a2c 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx
@@ -32,7 +32,7 @@ describe('Canvas Shareable Workpad API', () => {
   test('Placed successfully with default properties', async () => {
     const container = document.createElement('div');
     document.body.appendChild(container);
-    const wrapper = mount(<div kbn-canvas-shareable="canvas" kbn-canvas-url="workpad.json"></div>, {
+    const wrapper = mount(<div kbn-canvas-shareable="canvas" kbn-canvas-url="workpad.json" />, {
       attachTo: container,
     });
 
@@ -46,11 +46,7 @@ describe('Canvas Shareable Workpad API', () => {
     const container = document.createElement('div');
     document.body.appendChild(container);
     const wrapper = mount(
-      <div
-        kbn-canvas-shareable="canvas"
-        kbn-canvas-height="350"
-        kbn-canvas-url="workpad.json"
-      ></div>,
+      <div kbn-canvas-shareable="canvas" kbn-canvas-height="350" kbn-canvas-url="workpad.json" />,
       {
         attachTo: container,
       }
@@ -69,11 +65,7 @@ describe('Canvas Shareable Workpad API', () => {
     const container = document.createElement('div');
     document.body.appendChild(container);
     const wrapper = mount(
-      <div
-        kbn-canvas-shareable="canvas"
-        kbn-canvas-width="400"
-        kbn-canvas-url="workpad.json"
-      ></div>,
+      <div kbn-canvas-shareable="canvas" kbn-canvas-width="400" kbn-canvas-url="workpad.json" />,
       {
         attachTo: container,
       }
@@ -97,7 +89,7 @@ describe('Canvas Shareable Workpad API', () => {
         kbn-canvas-width="350"
         kbn-canvas-height="350"
         kbn-canvas-url="workpad.json"
-      ></div>,
+      />,
       {
         attachTo: container,
       }
@@ -116,7 +108,7 @@ describe('Canvas Shareable Workpad API', () => {
     const container = document.createElement('div');
     document.body.appendChild(container);
     const wrapper = mount(
-      <div kbn-canvas-shareable="canvas" kbn-canvas-page="0" kbn-canvas-url="workpad.json"></div>,
+      <div kbn-canvas-shareable="canvas" kbn-canvas-page="0" kbn-canvas-url="workpad.json" />,
       {
         attachTo: container,
       }
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
index baa0b509ccb73a..072cf01255a0d2 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
@@ -17,8 +17,11 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
       data-focus-lock-disabled="disabled"
     >
       <div
+        aira-modal="true"
+        aria-describedby="generated-id"
         aria-live="assertive"
         class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle"
+        role="dialog"
         style="top: -16px; left: -22px; z-index: 2000;"
       >
         <div
@@ -138,8 +141,11 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
       data-focus-lock-disabled="disabled"
     >
       <div
+        aira-modal="true"
+        aria-describedby="generated-id"
         aria-live="assertive"
         class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-isOpen euiPopover__panel-withTitle"
+        role="dialog"
         style="top: -16px; left: -22px; z-index: 2000;"
       >
         <div
@@ -460,8 +466,11 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
       data-focus-lock-disabled="disabled"
     >
       <div
+        aira-modal="true"
+        aria-describedby="generated-id"
         aria-live="assertive"
         class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle"
+        role="dialog"
         style="top: -16px; left: -22px; z-index: 2000;"
       >
         <div
@@ -564,6 +573,6 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
 </div>
 `;
 
-exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] = `"<div><div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"disabled\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-isOpen euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path d=\\"M4.608 3.063C4.345 2.895 4 3.089 4 3.418v9.167c0 .329.345.523.608.356l7.2-4.584a.426.426 0 0 0 0-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 0 1 0 2.399l-7.2 4.583C4.21 14.38 3 13.696 3 12.585V3.418C3 2.307 4.21 1.624 5.146 2.22z\\"></path></svg><span class=\\"euiContextMenuItem__text\\">Auto Play</span><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path d=\\"M0 6h4v4H0V6zm1 1v2h2V7H1zm5-1h4v4H6V6zm1 1v2h2V7H7zm5-1h4v4h-4V6zm1 3h2V7h-2v2z\\"></path></svg><span class=\\"euiContextMenuItem__text\\">Toolbar</span><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 0 1 0-.768l4.61-4.685a.552.552 0 0 0 0-.771.53.53 0 0 0-.759 0l-4.61 4.684a1.65 1.65 0 0 0 0 2.312l4.61 4.684a.53.53 0 0 0 .76 0 .552.552 0 0 0 0-.771z\\"></path></svg><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><input class=\\"euiSwitch__input\\" name=\\"toolbarHide\\" id=\\"generated-id\\" type=\\"checkbox\\" data-test-subj=\\"hideToolbarSwitch\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon\\" focusable=\\"false\\"><path d=\\"M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z\\"></path></svg><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon euiSwitch__icon--checked\\" focusable=\\"false\\"><path fill-rule=\\"evenodd\\" d=\\"M6.5 12a.502.502 0 0 1-.354-.146l-4-4a.502.502 0 0 1 .708-.708L6.5 10.793l6.646-6.647a.502.502 0 0 1 .708.708l-7 7A.502.502 0 0 1 6.5 12\\"></path></svg></span></span><label class=\\"euiSwitch__label\\" for=\\"generated-id\\">Hide Toolbar</label></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div></div>"`;
+exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] = `"<div><div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"disabled\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-isOpen euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" role=\\"dialog\\" aira-modal=\\"true\\" aria-describedby=\\"generated-id\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path d=\\"M4.608 3.063C4.345 2.895 4 3.089 4 3.418v9.167c0 .329.345.523.608.356l7.2-4.584a.426.426 0 0 0 0-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 0 1 0 2.399l-7.2 4.583C4.21 14.38 3 13.696 3 12.585V3.418C3 2.307 4.21 1.624 5.146 2.22z\\"></path></svg><span class=\\"euiContextMenuItem__text\\">Auto Play</span><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path d=\\"M0 6h4v4H0V6zm1 1v2h2V7H1zm5-1h4v4H6V6zm1 1v2h2V7H7zm5-1h4v4h-4V6zm1 3h2V7h-2v2z\\"></path></svg><span class=\\"euiContextMenuItem__text\\">Toolbar</span><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 0 1 0-.768l4.61-4.685a.552.552 0 0 0 0-.771.53.53 0 0 0-.759 0l-4.61 4.684a1.65 1.65 0 0 0 0 2.312l4.61 4.684a.53.53 0 0 0 .76 0 .552.552 0 0 0 0-.771z\\"></path></svg><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><input class=\\"euiSwitch__input\\" name=\\"toolbarHide\\" id=\\"generated-id\\" type=\\"checkbox\\" data-test-subj=\\"hideToolbarSwitch\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon\\" focusable=\\"false\\"><path d=\\"M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z\\"></path></svg><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon euiSwitch__icon--checked\\" focusable=\\"false\\"><path fill-rule=\\"evenodd\\" d=\\"M6.5 12a.502.502 0 0 1-.354-.146l-4-4a.502.502 0 0 1 .708-.708L6.5 10.793l6.646-6.647a.502.502 0 0 1 .708.708l-7 7A.502.502 0 0 1 6.5 12\\"></path></svg></span></span><label class=\\"euiSwitch__label\\" for=\\"generated-id\\">Hide Toolbar</label></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div></div>"`;
 
-exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"disabled\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path d=\\"M4.608 3.063C4.345 2.895 4 3.089 4 3.418v9.167c0 .329.345.523.608.356l7.2-4.584a.426.426 0 0 0 0-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 0 1 0 2.399l-7.2 4.583C4.21 14.38 3 13.696 3 12.585V3.418C3 2.307 4.21 1.624 5.146 2.22z\\"></path></svg><span class=\\"euiContextMenuItem__text\\">Auto Play</span><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path d=\\"M0 6h4v4H0V6zm1 1v2h2V7H1zm5-1h4v4H6V6zm1 1v2h2V7H7zm5-1h4v4h-4V6zm1 3h2V7h-2v2z\\"></path></svg><span class=\\"euiContextMenuItem__text\\">Toolbar</span><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 0 1 0-.768l4.61-4.685a.552.552 0 0 0 0-.771.53.53 0 0 0-.759 0l-4.61 4.684a1.65 1.65 0 0 0 0 2.312l4.61 4.684a.53.53 0 0 0 .76 0 .552.552 0 0 0 0-.771z\\"></path></svg><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><input class=\\"euiSwitch__input\\" name=\\"toolbarHide\\" id=\\"generated-id\\" type=\\"checkbox\\" data-test-subj=\\"hideToolbarSwitch\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon\\" focusable=\\"false\\"><path d=\\"M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z\\"></path></svg><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon euiSwitch__icon--checked\\" focusable=\\"false\\"><path fill-rule=\\"evenodd\\" d=\\"M6.5 12a.502.502 0 0 1-.354-.146l-4-4a.502.502 0 0 1 .708-.708L6.5 10.793l6.646-6.647a.502.502 0 0 1 .708.708l-7 7A.502.502 0 0 1 6.5 12\\"></path></svg></span></span><label class=\\"euiSwitch__label\\" for=\\"generated-id\\">Hide Toolbar</label></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div></div>"`;
+exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div><div data-focus-lock-disabled=\\"disabled\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" role=\\"dialog\\" aira-modal=\\"true\\" aria-describedby=\\"generated-id\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path d=\\"M4.608 3.063C4.345 2.895 4 3.089 4 3.418v9.167c0 .329.345.523.608.356l7.2-4.584a.426.426 0 0 0 0-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 0 1 0 2.399l-7.2 4.583C4.21 14.38 3 13.696 3 12.585V3.418C3 2.307 4.21 1.624 5.146 2.22z\\"></path></svg><span class=\\"euiContextMenuItem__text\\">Auto Play</span><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path d=\\"M0 6h4v4H0V6zm1 1v2h2V7H1zm5-1h4v4H6V6zm1 1v2h2V7H7zm5-1h4v4h-4V6zm1 3h2V7h-2v2z\\"></path></svg><span class=\\"euiContextMenuItem__text\\">Toolbar</span><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771z\\"></path></svg></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon\\" focusable=\\"false\\"><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 0 1 0-.768l4.61-4.685a.552.552 0 0 0 0-.771.53.53 0 0 0-.759 0l-4.61 4.684a1.65 1.65 0 0 0 0 2.312l4.61 4.684a.53.53 0 0 0 .76 0 .552.552 0 0 0 0-.771z\\"></path></svg><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><input class=\\"euiSwitch__input\\" name=\\"toolbarHide\\" id=\\"generated-id\\" type=\\"checkbox\\" data-test-subj=\\"hideToolbarSwitch\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon\\" focusable=\\"false\\"><path d=\\"M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z\\"></path></svg><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon euiSwitch__icon--checked\\" focusable=\\"false\\"><path fill-rule=\\"evenodd\\" d=\\"M6.5 12a.502.502 0 0 1-.354-.146l-4-4a.502.502 0 0 1 .708-.708L6.5 10.793l6.646-6.647a.502.502 0 0 1 .708.708l-7 7A.502.502 0 0 1 6.5 12\\"></path></svg></span></span><label class=\\"euiSwitch__label\\" for=\\"generated-id\\">Hide Toolbar</label></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"-1\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div></div>"`;
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx
index 78fefead027e56..5ebb30d79e0469 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx
@@ -18,6 +18,11 @@ import { Settings } from '../settings';
 
 jest.mock('../../../../supported_renderers');
 jest.mock(`@elastic/eui/lib/components/form/form_row/make_id`, () => () => `generated-id`);
+jest.mock('@elastic/eui/lib/services/accessibility', () => {
+  return {
+    htmlIdGenerator: () => () => `generated-id`,
+  };
+});
 jest.mock('@elastic/eui/lib/components/portal/portal', () => {
   // eslint-disable-next-line no-shadow
   const React = require.requireActual('react');
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/constants.js b/x-pack/legacy/plugins/canvas/shareable_runtime/constants.js
index cc70a536ac9d7a..605591167c499b 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/constants.js
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/constants.js
@@ -8,23 +8,24 @@ const path = require('path');
 
 const LIBRARY_NAME = 'KbnCanvas';
 const SHAREABLE_RUNTIME_NAME = 'kbn_canvas';
-const SHAREABLE_RUNTIME_CSS_NAME = 'kbn_canvas_css';
-const KIBANA_ROOT = path.resolve(__dirname, '../../../../..');
-const SHAREABLE_RUNTIME_SRC = path.resolve(
-  KIBANA_ROOT,
-  'x-pack/legacy/plugins/canvas/shareable_runtime'
-);
-const SHAREABLE_RUNTIME_OUTPUT = path.resolve(SHAREABLE_RUNTIME_SRC, 'build');
-const SHAREABLE_RUNTIME_FILE = path.resolve(
-  SHAREABLE_RUNTIME_OUTPUT,
-  SHAREABLE_RUNTIME_NAME + '.js'
-);
-const STATS_OUTPUT = path.resolve(SHAREABLE_RUNTIME_OUTPUT, 'webpack_stats.json');
+
+const KIBANA_ROOT_PATH = '../../../../..';
+const CANVAS_ROOT_PATH = 'x-pack/legacy/plugins/canvas';
+const SHAREABLE_RUNTIME_PATH = 'shareable_runtime';
+const SHAREABLE_RUNTIME_OUTPUT_PATH = 'shareable_runtime/build';
+const SHAREABLE_RUNTIME_FILE_PATH = 'shareable_runtime/build/kbn_canvas.js';
+const STATS_OUTPUT_PATH = 'shareable_runtime/build/webpack_stats.json';
+
+const KIBANA_ROOT = path.resolve(__dirname, KIBANA_ROOT_PATH);
+const CANVAS_ROOT = path.resolve(KIBANA_ROOT, CANVAS_ROOT_PATH);
+const SHAREABLE_RUNTIME_SRC = path.resolve(CANVAS_ROOT, SHAREABLE_RUNTIME_PATH);
+const SHAREABLE_RUNTIME_OUTPUT = path.resolve(CANVAS_ROOT, SHAREABLE_RUNTIME_OUTPUT_PATH);
+const SHAREABLE_RUNTIME_FILE = path.resolve(CANVAS_ROOT, SHAREABLE_RUNTIME_FILE_PATH);
+const STATS_OUTPUT = path.resolve(CANVAS_ROOT, STATS_OUTPUT_PATH);
 
 module.exports = {
   KIBANA_ROOT,
   LIBRARY_NAME,
-  SHAREABLE_RUNTIME_CSS_NAME,
   SHAREABLE_RUNTIME_FILE,
   SHAREABLE_RUNTIME_NAME,
   SHAREABLE_RUNTIME_OUTPUT,
diff --git a/x-pack/legacy/plugins/canvas/types/elements.ts b/x-pack/legacy/plugins/canvas/types/elements.ts
index b3af9e5eee70d8..c70f2af1002aa3 100644
--- a/x-pack/legacy/plugins/canvas/types/elements.ts
+++ b/x-pack/legacy/plugins/canvas/types/elements.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ExpressionAST } from 'src/plugins/expressions/common/expressions';
+import { ExpressionAST } from 'src/plugins/expressions/public';
 import { CanvasElement } from '.';
 
 export interface ElementSpec {
diff --git a/x-pack/legacy/plugins/canvas/types/index.ts b/x-pack/legacy/plugins/canvas/types/index.ts
index 8c857d8d5f3a9e..54b73b2d2f362f 100644
--- a/x-pack/legacy/plugins/canvas/types/index.ts
+++ b/x-pack/legacy/plugins/canvas/types/index.ts
@@ -10,7 +10,7 @@ export {
   BackgroundRepeat,
   BackgroundSize,
 } from '../../../../../src/legacy/core_plugins/interpreter/public/types/style';
-export * from '../../../../../src/plugins/expressions/common';
+export * from '../../../../../src/plugins/expressions/public';
 export * from './assets';
 export * from './canvas';
 export * from './elements';
diff --git a/x-pack/legacy/plugins/canvas/types/state.ts b/x-pack/legacy/plugins/canvas/types/state.ts
index 2deab0a6fc8a47..494965d060788f 100644
--- a/x-pack/legacy/plugins/canvas/types/state.ts
+++ b/x-pack/legacy/plugins/canvas/types/state.ts
@@ -13,7 +13,7 @@ import {
   Render,
   Style,
   Range,
-} from 'src/plugins/expressions/common/expressions/expression_types';
+} from 'src/plugins/expressions/public';
 import { CanvasFunction } from './functions';
 import { AssetType } from './assets';
 import { CanvasWorkpad } from './canvas';
diff --git a/x-pack/legacy/plugins/code/common/commit_utils.test.ts b/x-pack/legacy/plugins/code/common/commit_utils.test.ts
deleted file mode 100644
index 9deb15e9a26e75..00000000000000
--- a/x-pack/legacy/plugins/code/common/commit_utils.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { parseCommitMessage } from './commit_utils';
-
-describe('Commit Utils', () => {
-  describe('parseCommitMessage', () => {
-    it('parses the summary from a commit message', () => {
-      const message = "This is a summary\n\nAnd here's the body";
-      const { summary } = parseCommitMessage(message);
-
-      expect(summary).toEqual('This is a summary');
-    });
-
-    it('parses the body from a commit message', () => {
-      const message = "This is a summary\n\nAnd here's the body";
-      const { body } = parseCommitMessage(message);
-
-      expect(body).toEqual("And here's the body");
-    });
-
-    it('includes the second line as body, if erroneously present', () => {
-      const messageWithSecondLine = 'summary\nsecond\ndescription';
-      const { summary, body } = parseCommitMessage(messageWithSecondLine);
-
-      expect(summary).toEqual('summary');
-      expect(body).toEqual('second\ndescription');
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/code/common/commit_utils.ts b/x-pack/legacy/plugins/code/common/commit_utils.ts
deleted file mode 100644
index 4a5a6d9f2da5aa..00000000000000
--- a/x-pack/legacy/plugins/code/common/commit_utils.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-const parseCommitMessage: (message: string) => { summary: string; body: string } = message => {
-  const [summary, ...rest] = message.split('\n');
-  const body = rest.join('\n').trim();
-
-  return { summary, body };
-};
-
-export { parseCommitMessage };
diff --git a/x-pack/legacy/plugins/code/common/constants.ts b/x-pack/legacy/plugins/code/common/constants.ts
deleted file mode 100644
index 15c4ffd09f0336..00000000000000
--- a/x-pack/legacy/plugins/code/common/constants.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const APP_TITLE = 'Code (Beta)';
-export const APP_USAGE_TYPE = 'code';
-export const SAVED_OBJ_REPO = 'code-repo';
diff --git a/x-pack/legacy/plugins/code/common/file.ts b/x-pack/legacy/plugins/code/common/file.ts
deleted file mode 100644
index 518bd4321a2e50..00000000000000
--- a/x-pack/legacy/plugins/code/common/file.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const TEXT_FILE_LIMIT = 1024 * 1024; // 1mb
diff --git a/x-pack/legacy/plugins/code/common/git_blame.ts b/x-pack/legacy/plugins/code/common/git_blame.ts
deleted file mode 100644
index 17f0622c69a30c..00000000000000
--- a/x-pack/legacy/plugins/code/common/git_blame.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.
- */
-
-export interface GitBlame {
-  committer: {
-    name: string;
-    email: string;
-  };
-  startLine: number;
-  lines: number;
-  commit: {
-    id: string;
-    message: string;
-    date: string;
-  };
-}
diff --git a/x-pack/legacy/plugins/code/common/git_diff.ts b/x-pack/legacy/plugins/code/common/git_diff.ts
deleted file mode 100644
index 89f1bd1cf2fad2..00000000000000
--- a/x-pack/legacy/plugins/code/common/git_diff.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { CommitInfo } from '../model/commit';
-
-export interface Diff {
-  additions: number;
-  deletions: number;
-  files: FileDiff[];
-}
-
-export interface CommitDiff extends Diff {
-  commit: CommitInfo;
-}
-
-export interface FileDiff {
-  path: string;
-  originPath?: string;
-  kind: DiffKind;
-  originCode?: string;
-  modifiedCode?: string;
-  language?: string;
-  additions: number;
-  deletions: number;
-}
-
-export enum DiffKind {
-  ADDED = 'ADDED',
-  DELETED = 'DELETED',
-  MODIFIED = 'MODIFIED',
-  RENAMED = 'RENAMED',
-}
diff --git a/x-pack/legacy/plugins/code/common/git_url_utils.test.ts b/x-pack/legacy/plugins/code/common/git_url_utils.test.ts
deleted file mode 100644
index 107624a70a0810..00000000000000
--- a/x-pack/legacy/plugins/code/common/git_url_utils.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { validateGitUrl } from './git_url_utils';
-
-test('Git url validation', () => {
-  // An url ends with .git
-  expect(validateGitUrl('https://github.com/elastic/elasticsearch.git')).toBeTruthy();
-
-  // An url ends without .git
-  expect(validateGitUrl('https://github.com/elastic/elasticsearch')).toBeTruthy();
-
-  // An url with http://
-  expect(validateGitUrl('http://github.com/elastic/elasticsearch')).toBeTruthy();
-
-  // An url with ssh://
-  expect(validateGitUrl('ssh://elastic@github.com/elastic/elasticsearch.git')).toBeTruthy();
-
-  // An url with ssh:// and port
-  expect(validateGitUrl('ssh://elastic@github.com:9999/elastic/elasticsearch.git')).toBeTruthy();
-
-  // An url with git://
-  expect(validateGitUrl('git://elastic@github.com/elastic/elasticsearch.git')).toBeTruthy();
-
-  // An url with an invalid protocol
-  expect(() => {
-    validateGitUrl('file:///Users/elastic/elasticsearch', [], ['ssh', 'https', 'git']);
-  }).toThrow('Git url protocol is not whitelisted.');
-
-  // An url without protocol
-  expect(() => {
-    validateGitUrl('/Users/elastic/elasticsearch', [], ['ssh', 'https', 'git']);
-  }).toThrow('Git url protocol is not whitelisted.');
-  expect(() => {
-    validateGitUrl('github.com/elastic/elasticsearch', [], ['ssh', 'https', 'git']);
-  }).toThrow('Git url protocol is not whitelisted.');
-
-  // An valid git url but without whitelisted host
-  expect(() => {
-    validateGitUrl('https://github.com/elastic/elasticsearch.git', ['gitlab.com']);
-  }).toThrow('Git url host is not whitelisted.');
-
-  // An valid git url but without whitelisted protocol
-  expect(() => {
-    validateGitUrl('https://github.com/elastic/elasticsearch.git', [], ['ssh']);
-  }).toThrow('Git url protocol is not whitelisted.');
-
-  // An valid git url but contains invalid content
-  expect(() => {
-    validateGitUrl('https://github.com/elastic/../../elasticsearch.git', [], ['ssh']);
-  }).toThrow('Git url contains invalid content.');
-
-  // An valid git url with both whitelisted host and protocol
-  expect(
-    validateGitUrl('https://github.com/elastic/elasticsearch.git', ['github.com'], ['https'])
-  ).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/common/git_url_utils.ts b/x-pack/legacy/plugins/code/common/git_url_utils.ts
deleted file mode 100644
index 26bcec72c1e182..00000000000000
--- a/x-pack/legacy/plugins/code/common/git_url_utils.ts
+++ /dev/null
@@ -1,49 +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 GitUrlParse from 'git-url-parse';
-
-// return true if the git url is valid, otherwise throw Error with
-// exact reasons.
-export function validateGitUrl(
-  url: string,
-  hostWhitelist?: string[],
-  protocolWhitelist?: string[]
-): boolean {
-  if (url.split('/').includes('..')) {
-    throw new Error(
-      i18n.translate('xpack.code.gitUrlUtil.urlContainInvalidContent', {
-        defaultMessage: 'Git url contains invalid content.',
-      })
-    );
-  }
-
-  const repo = GitUrlParse(url);
-
-  if (hostWhitelist && hostWhitelist.length > 0) {
-    const hostSet = new Set(hostWhitelist);
-    if (!hostSet.has(repo.source)) {
-      throw new Error(
-        i18n.translate('xpack.code.gitUrlUtil.urlNotWhitelistedMessage', {
-          defaultMessage: 'Git url host is not whitelisted.',
-        })
-      );
-    }
-  }
-
-  if (protocolWhitelist && protocolWhitelist.length > 0) {
-    const protocolSet = new Set(protocolWhitelist);
-    if (!protocolSet.has(repo.protocol)) {
-      throw new Error(
-        i18n.translate('xpack.code.gitUrlUtil.protocolNotWhitelistedMessage', {
-          defaultMessage: 'Git url protocol is not whitelisted.',
-        })
-      );
-    }
-  }
-  return true;
-}
diff --git a/x-pack/legacy/plugins/code/common/installation.ts b/x-pack/legacy/plugins/code/common/installation.ts
deleted file mode 100644
index c6a9b7383297b0..00000000000000
--- a/x-pack/legacy/plugins/code/common/installation.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export enum InstallationType {
-  Embed,
-  Plugin,
-}
diff --git a/x-pack/legacy/plugins/code/common/jsonrpc.ts b/x-pack/legacy/plugins/code/common/jsonrpc.ts
deleted file mode 100644
index 304989b8d86a32..00000000000000
--- a/x-pack/legacy/plugins/code/common/jsonrpc.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { UnknownErrorCode } from './lsp_error_codes';
-
-// Since vscode-jsonrpc can't be used under IE, we copy some type definitions from
-// https://github.com/Microsoft/vscode-languageserver-node/blob/8801c20b/jsonrpc/src/messages.ts
-
-/**
- * An error object return in a response in case a request
- * has failed.
- */
-export class ResponseError extends Error {
-  public readonly code: number;
-  public readonly data: any | undefined;
-
-  constructor(code: number, message: string, data?: any) {
-    super(message);
-    this.code = Number.isInteger(code) ? code : UnknownErrorCode;
-    this.data = data;
-    Object.setPrototypeOf(this, ResponseError.prototype);
-  }
-
-  public toJson() {
-    return {
-      code: this.code,
-      message: this.message,
-      data: this.data,
-    };
-  }
-}
-
-export interface Message {
-  jsonrpc: string;
-}
-
-/**
- * A response message.
- */
-export interface ResponseMessage extends Message {
-  /**
-   * The request id.
-   */
-  id: number | string | null;
-  /**
-   * The result of a request. This can be omitted in
-   * the case of an error.
-   */
-  result?: any;
-  /**
-   * The error object in case a request fails.
-   */
-  error?: ResponseError;
-}
diff --git a/x-pack/legacy/plugins/code/common/language_server.ts b/x-pack/legacy/plugins/code/common/language_server.ts
deleted file mode 100644
index 20be92055cd055..00000000000000
--- a/x-pack/legacy/plugins/code/common/language_server.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { InstallationType } from './installation';
-
-export enum LanguageServerStatus {
-  NOT_INSTALLED,
-  INSTALLING,
-  READY, // installed but not running
-  RUNNING,
-  LAUNCH_FAILED,
-}
-
-export interface LanguageServer {
-  name: string;
-  languages: string[];
-  installationType: InstallationType;
-  version?: string;
-  build?: string;
-  status?: LanguageServerStatus;
-  downloadUrl?: any;
-  pluginName?: string;
-}
-
-export const CTAGS_SUPPORT_LANGS = [
-  'c',
-  'cpp',
-  'clojure',
-  'csharp',
-  'css',
-  'go',
-  'html',
-  'ini',
-  'kotlin',
-  'lua',
-  'json',
-  'objective-c',
-  'pascal',
-  'perl',
-  'php',
-  'python',
-  'r',
-  'ruby',
-  'rust',
-  'scheme',
-  'shell',
-  'sql',
-  'swift',
-  'tcl',
-  'typescript',
-  'java',
-  'javascript',
-];
diff --git a/x-pack/legacy/plugins/code/common/line_mapper.ts b/x-pack/legacy/plugins/code/common/line_mapper.ts
deleted file mode 100644
index c11b22acba3bd9..00000000000000
--- a/x-pack/legacy/plugins/code/common/line_mapper.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-
-import { SourceLocation } from '../model';
-
-export class LineMapper {
-  private lines: string[];
-  private acc: number[];
-
-  constructor(content: string) {
-    this.lines = content.split('\n');
-    this.acc = [0];
-    this.getLocation = this.getLocation.bind(this);
-
-    for (let i = 0; i < this.lines.length - 1; i++) {
-      this.acc[i + 1] = this.acc[i] + this.lines[i].length + 1;
-    }
-  }
-
-  public getLocation(offset: number): SourceLocation {
-    let line = _.sortedIndex(this.acc, offset);
-    if (offset !== this.acc[line]) {
-      line -= 1;
-    }
-    const column = offset - this.acc[line];
-    return { line, column, offset };
-  }
-
-  public getLines(): string[] {
-    return this.lines;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/common/lsp_client.ts b/x-pack/legacy/plugins/code/common/lsp_client.ts
deleted file mode 100644
index f76d5ea8088919..00000000000000
--- a/x-pack/legacy/plugins/code/common/lsp_client.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { npStart } from 'ui/new_platform';
-
-import { ResponseError, ResponseMessage } from './jsonrpc';
-
-export { TextDocumentMethods } from './text_document_methods';
-
-export interface LspClient {
-  sendRequest(method: string, params: any, singal?: AbortSignal): Promise<ResponseMessage>;
-}
-
-export class LspRestClient implements LspClient {
-  private baseUri: string;
-
-  constructor(baseUri: string) {
-    this.baseUri = baseUri;
-  }
-
-  public async sendRequest(
-    method: string,
-    params: any,
-    signal?: AbortSignal
-  ): Promise<ResponseMessage> {
-    try {
-      const response = await npStart.core.http.post(`${this.baseUri}/${method}`, {
-        body: JSON.stringify(params),
-        signal,
-      });
-      return response as ResponseMessage;
-    } catch (e) {
-      let error = e;
-      if (error.body && error.body.error) {
-        error = error.body.error;
-      }
-      throw new ResponseError(error.code, error.message, error.data);
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/common/lsp_error_codes.ts b/x-pack/legacy/plugins/code/common/lsp_error_codes.ts
deleted file mode 100644
index 9d23935f71bd2d..00000000000000
--- a/x-pack/legacy/plugins/code/common/lsp_error_codes.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const ServerNotInitialized: number = -32002;
-export const UnknownErrorCode: number = -32001;
-export const RequestCancelled: number = -32800;
-export const InternalError: number = -32603;
-export const UnknownFileLanguage: number = -42404;
-export const LanguageServerNotInstalled: number = -42403;
-export const LanguageDisabled: number = -42402;
-export const LanguageServerStartFailed: number = -42405;
diff --git a/x-pack/legacy/plugins/code/common/lsp_method.ts b/x-pack/legacy/plugins/code/common/lsp_method.ts
deleted file mode 100644
index 82353b671080f8..00000000000000
--- a/x-pack/legacy/plugins/code/common/lsp_method.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { AsyncTask } from '../public/monaco/computer';
-import { LspClient } from './lsp_client';
-
-export class LspMethod<INPUT, OUTPUT> {
-  private client: LspClient;
-  private method: string;
-
-  constructor(method: string, client: LspClient) {
-    this.client = client;
-    this.method = method;
-  }
-
-  public asyncTask(input: INPUT): AsyncTask<OUTPUT> {
-    const abortController = new AbortController();
-    const promise = () => {
-      return this.client
-        .sendRequest(this.method, input, abortController.signal)
-        .then(result => result.result as OUTPUT);
-    };
-    return {
-      cancel() {
-        abortController.abort();
-      },
-      promise,
-    };
-  }
-
-  public async send(input: INPUT): Promise<OUTPUT> {
-    return await this.client
-      .sendRequest(this.method, input)
-      .then(result => result.result as OUTPUT);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/common/repo_file_status.ts b/x-pack/legacy/plugins/code/common/repo_file_status.ts
deleted file mode 100644
index 3e485faa32ceb1..00000000000000
--- a/x-pack/legacy/plugins/code/common/repo_file_status.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-export enum RepoFileStatus {
-  LANG_SERVER_IS_INITIALIZING = 'Language server is initializing.',
-  LANG_SERVER_INITIALIZED = 'Language server initialized.',
-  INDEXING = 'Indexing in progress',
-  FILE_NOT_SUPPORTED = 'Current file is not of a supported language.',
-  REVISION_NOT_INDEXED = 'Current revision is not indexed.',
-  LANG_SERVER_NOT_INSTALLED = 'Install additional language server to support current file.',
-  FILE_IS_TOO_BIG = 'Current file is too big.',
-  LANG_SERVER_LAUNCH_FAILED = 'Language server failed to launch',
-}
-
-export enum Severity {
-  NONE,
-  NOTICE,
-  WARNING,
-  ERROR,
-}
-
-export enum LangServerType {
-  NONE = 'Current file is not supported by any language server',
-  GENERIC = 'Current file is only covered by generic language server',
-  DEDICATED = 'Current file is covered by dedicated language server',
-}
-
-export const RepoFileStatusText = {
-  [RepoFileStatus.LANG_SERVER_IS_INITIALIZING]: i18n.translate(
-    'xpack.code.repoFileStatus.langugageServerIsInitializitingMessage',
-    {
-      defaultMessage: 'Language server is initializing.',
-    }
-  ),
-  [RepoFileStatus.LANG_SERVER_INITIALIZED]: i18n.translate(
-    'xpack.code.repoFileStatus.languageServerInitializedMessage',
-    {
-      defaultMessage: 'Language server initialized.',
-    }
-  ),
-  [RepoFileStatus.INDEXING]: i18n.translate('xpack.code.repoFileStatus.IndexingInProgressMessage', {
-    defaultMessage: 'Indexing in progress.',
-  }),
-  [RepoFileStatus.FILE_NOT_SUPPORTED]: i18n.translate(
-    'xpack.code.repoFileStatus.fileNotSupportedMessage',
-    {
-      defaultMessage: 'Current file is not of a supported language.',
-    }
-  ),
-  [RepoFileStatus.REVISION_NOT_INDEXED]: i18n.translate(
-    'xpack.code.repoFileStatus.revisionNotIndexedMessage',
-    {
-      defaultMessage: 'Current revision is not indexed.',
-    }
-  ),
-  [RepoFileStatus.LANG_SERVER_NOT_INSTALLED]: i18n.translate(
-    'xpack.code.repoFileStatus.langServerNotInstalledMessage',
-    {
-      defaultMessage: 'Install additional language server to support current file.',
-    }
-  ),
-  [RepoFileStatus.FILE_IS_TOO_BIG]: i18n.translate(
-    'xpack.code.repoFileStatus.fileIsTooBigMessage',
-    {
-      defaultMessage: 'Current file is too big.',
-    }
-  ),
-  [LangServerType.NONE]: i18n.translate('xpack.code.repoFileStatus.langserverType.noneMessage', {
-    defaultMessage: 'Current file is not supported by any language server.',
-  }),
-  [LangServerType.GENERIC]: i18n.translate(
-    'xpack.code.repoFileStatus.langserverType.genericMessage',
-    {
-      defaultMessage: 'Current file is only covered by generic language server.',
-    }
-  ),
-  [LangServerType.DEDICATED]: i18n.translate(
-    'xpack.code.repoFileStatus.langserverType.dedicatedMessage',
-    {
-      defaultMessage: 'Current file is covered by dedicated language server.',
-    }
-  ),
-  [RepoFileStatus.LANG_SERVER_LAUNCH_FAILED]: i18n.translate(
-    'xpack.code.repoFileStatus.langServerLaunchFailed',
-    {
-      defaultMessage: 'Language server launch failed.',
-    }
-  ),
-};
-
-export enum CTA {
-  SWITCH_TO_HEAD,
-  GOTO_LANG_MANAGE_PAGE,
-}
-
-export const REPO_FILE_STATUS_SEVERITY = {
-  [RepoFileStatus.LANG_SERVER_IS_INITIALIZING]: {
-    severity: Severity.NOTICE,
-  },
-  [RepoFileStatus.INDEXING]: {
-    severity: Severity.NOTICE,
-  },
-  [RepoFileStatus.FILE_NOT_SUPPORTED]: {
-    severity: Severity.NOTICE,
-  },
-  [LangServerType.GENERIC]: {
-    severity: Severity.NOTICE,
-  },
-  [RepoFileStatus.REVISION_NOT_INDEXED]: {
-    severity: Severity.WARNING,
-    fix: CTA.SWITCH_TO_HEAD,
-  },
-  [RepoFileStatus.LANG_SERVER_NOT_INSTALLED]: {
-    severity: Severity.WARNING,
-    fix: CTA.GOTO_LANG_MANAGE_PAGE,
-  },
-  [RepoFileStatus.FILE_IS_TOO_BIG]: {
-    severity: Severity.NOTICE,
-  },
-};
-
-export interface StatusReport {
-  repoStatus?: RepoFileStatus.INDEXING | RepoFileStatus.REVISION_NOT_INDEXED;
-  fileStatus?: RepoFileStatus.FILE_NOT_SUPPORTED | RepoFileStatus.FILE_IS_TOO_BIG;
-  langServerType?: LangServerType;
-  langServerStatus?:
-    | RepoFileStatus.LANG_SERVER_IS_INITIALIZING
-    | RepoFileStatus.LANG_SERVER_NOT_INSTALLED
-    | RepoFileStatus.LANG_SERVER_LAUNCH_FAILED
-    | RepoFileStatus.LANG_SERVER_INITIALIZED;
-}
diff --git a/x-pack/legacy/plugins/code/common/repository_utils.test.ts b/x-pack/legacy/plugins/code/common/repository_utils.test.ts
deleted file mode 100644
index aceb9da4a10b8b..00000000000000
--- a/x-pack/legacy/plugins/code/common/repository_utils.test.ts
+++ /dev/null
@@ -1,253 +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 { FileTreeItemType } from '../model';
-import { RepositoryUtils } from './repository_utils';
-
-test('Repository url parsing', () => {
-  // Valid git url without .git suffix.
-  const repo1 = RepositoryUtils.buildRepository('https://github.com/apache/sqoop');
-  expect(repo1).toEqual({
-    uri: 'github.com/apache/sqoop',
-    url: 'https://github.com/apache/sqoop',
-    name: 'sqoop',
-    org: 'apache',
-    protocol: 'https',
-  });
-
-  // Valid git url with .git suffix.
-  const repo2 = RepositoryUtils.buildRepository('https://github.com/apache/sqoop.git');
-  expect(repo2).toEqual({
-    uri: 'github.com/apache/sqoop',
-    url: 'https://github.com/apache/sqoop.git',
-    name: 'sqoop',
-    protocol: 'https',
-    org: 'apache',
-  });
-
-  // An invalid git url
-  const repo3 = RepositoryUtils.buildRepository('github.com/apache/sqoop');
-  expect(repo3).toMatchObject({
-    uri: 'github.com/apache/sqoop',
-    url: 'github.com/apache/sqoop',
-  });
-
-  const repo4 = RepositoryUtils.buildRepository('git://a/b');
-  expect(repo4).toEqual({
-    uri: 'a/_/b',
-    url: 'git://a/b',
-    name: 'b',
-    org: '_',
-    protocol: 'git',
-  });
-
-  const repo5 = RepositoryUtils.buildRepository('git://a/b/c');
-  expect(repo5).toEqual({
-    uri: 'a/b/c',
-    url: 'git://a/b/c',
-    name: 'c',
-    org: 'b',
-    protocol: 'git',
-  });
-
-  const repo6 = RepositoryUtils.buildRepository('git@github.com:foo/bar.git');
-  expect(repo6).toEqual({
-    uri: 'github.com/foo/bar',
-    url: 'git@github.com:foo/bar.git',
-    name: 'bar',
-    protocol: 'ssh',
-    org: 'foo',
-  });
-
-  const repo7 = RepositoryUtils.buildRepository('ssh://git@github.com:foo/bar.git');
-  expect(repo7).toEqual({
-    uri: 'github.com/foo/bar',
-    url: 'ssh://git@github.com:foo/bar.git',
-    name: 'bar',
-    org: 'foo',
-    protocol: 'ssh',
-  });
-
-  const repo8 = RepositoryUtils.buildRepository('https://github.com/apache/sqoop/a/b');
-  expect(repo8).toEqual({
-    uri: 'github.com/apache_sqoop_a/b',
-    url: 'https://github.com/apache/sqoop/a/b',
-    name: 'b',
-    org: 'apache_sqoop_a',
-    protocol: 'https',
-  });
-
-  const repo9 = RepositoryUtils.buildRepository('https://github.com/apache/sqoop/tree/master');
-  expect(repo9).toEqual({
-    uri: 'github.com/apache_sqoop_tree/master',
-    url: 'https://github.com/apache/sqoop/tree/master',
-    name: 'master',
-    org: 'apache_sqoop_tree',
-    protocol: 'https',
-  });
-});
-
-test('Repository url parsing with non standard segments', () => {
-  const repo1 = RepositoryUtils.buildRepository('git://a/b/c/d');
-  expect(repo1).toEqual({
-    uri: 'a/b_c/d',
-    url: 'git://a/b/c/d',
-    name: 'd',
-    org: 'b_c',
-    protocol: 'git',
-  });
-
-  const repo2 = RepositoryUtils.buildRepository('git://a/b/c/d/e');
-  expect(repo2).toEqual({
-    uri: 'a/b_c_d/e',
-    url: 'git://a/b/c/d/e',
-    name: 'e',
-    org: 'b_c_d',
-    protocol: 'git',
-  });
-
-  const repo3 = RepositoryUtils.buildRepository('git://a');
-  expect(repo3).toEqual({
-    uri: 'a/_/_',
-    url: 'git://a',
-    name: '_',
-    protocol: 'git',
-    org: '_',
-  });
-});
-
-test('Repository url parsing with port', () => {
-  const repo1 = RepositoryUtils.buildRepository('ssh://mine@mydomain.com:27017/gitolite-admin');
-  expect(repo1).toEqual({
-    uri: 'mydomain.com:27017/_/gitolite-admin',
-    url: 'ssh://mine@mydomain.com:27017/gitolite-admin',
-    name: 'gitolite-admin',
-    org: '_',
-    protocol: 'ssh',
-  });
-
-  const repo2 = RepositoryUtils.buildRepository(
-    'ssh://mine@mydomain.com:27017/elastic/gitolite-admin'
-  );
-  expect(repo2).toEqual({
-    uri: 'mydomain.com:27017/elastic/gitolite-admin',
-    url: 'ssh://mine@mydomain.com:27017/elastic/gitolite-admin',
-    name: 'gitolite-admin',
-    protocol: 'ssh',
-    org: 'elastic',
-  });
-});
-
-test('Normalize repository index name', () => {
-  // index name with repository URI should be case insensitive even after attaching a hash at the end.
-  const indexName1 = RepositoryUtils.normalizeRepoUriToIndexName('github.com/elastic/Kibana');
-  const indexName2 = RepositoryUtils.normalizeRepoUriToIndexName('github.com/elastic/kibana');
-  expect(indexName1 === indexName2).toBeTruthy();
-  expect(indexName1).toEqual('github.com-elastic-kibana-7bf00473');
-  expect(indexName2).toEqual('github.com-elastic-kibana-7bf00473');
-
-  const indexName3 = RepositoryUtils.normalizeRepoUriToIndexName('github.com/elastic-kibana/code');
-  const indexName4 = RepositoryUtils.normalizeRepoUriToIndexName('github.com/elastic/kibana-code');
-  expect(indexName3 === indexName4).toBeFalsy();
-
-  // illegal characters should be replaced
-  const indexName5 = RepositoryUtils.normalizeRepoUriToIndexName(
-    'github.com:1234/elastic-kibana/code'
-  );
-  const indexName6 = RepositoryUtils.normalizeRepoUriToIndexName(
-    'github.com/1234?elastic/kibana-code'
-  );
-  expect(indexName5 === indexName6).toBeFalsy();
-  expect(indexName5).toEqual('github.com-1234-elastic-kibana-code-2a9788f8');
-  expect(indexName6).toEqual('github.com-1234-elastic-kibana-code-2b342309');
-
-  // the normalized index name must not exceed RepositoryUtils.MAX_NORMALIZED_NAME_LEN
-  const uniqNames = new Set<string>();
-  let repoName: string = '';
-  for (let i = 0; i < 1024; i++) {
-    const normalized = RepositoryUtils.normalizeRepoUriToIndexName(repoName);
-    expect(normalized.length).toBeLessThanOrEqual(RepositoryUtils.MAX_NORMALIZED_NAME_LEN);
-    if (
-      repoName.length >=
-      RepositoryUtils.MAX_NORMALIZED_NAME_LEN - RepositoryUtils.MAX_HASH_LEN - 1
-    ) {
-      expect(normalized.length).toEqual(RepositoryUtils.MAX_NORMALIZED_NAME_LEN);
-    }
-    // a weak confliction test
-    expect(uniqNames.has(normalized)).toBeFalsy();
-    uniqNames.add(normalized);
-    repoName = repoName + String.fromCharCode(97 + (i % 26));
-  }
-});
-
-test('Parse repository uri', () => {
-  expect(RepositoryUtils.orgNameFromUri('github.com/elastic/kibana')).toEqual('elastic');
-  expect(RepositoryUtils.repoNameFromUri('github.com/elastic/kibana')).toEqual('kibana');
-  expect(RepositoryUtils.repoFullNameFromUri('github.com/elastic/kibana')).toEqual(
-    'elastic/kibana'
-  );
-
-  // For invalid repository uri
-  expect(() => {
-    RepositoryUtils.orgNameFromUri('foo/bar');
-  }).toThrowError('Invalid repository uri.');
-  expect(() => {
-    RepositoryUtils.repoNameFromUri('foo/bar');
-  }).toThrowError('Invalid repository uri.');
-  expect(() => {
-    RepositoryUtils.repoFullNameFromUri('foo/bar');
-  }).toThrowError('Invalid repository uri.');
-});
-
-test('Repository local path', () => {
-  expect(RepositoryUtils.repositoryLocalPath('/tmp', 'github.com/elastic/kibana')).toEqual(
-    '/tmp/github.com/elastic/kibana'
-  );
-  expect(RepositoryUtils.repositoryLocalPath('tmp', 'github.com/elastic/kibana')).toEqual(
-    'tmp/github.com/elastic/kibana'
-  );
-});
-
-test('Parse location to url', () => {
-  expect(
-    RepositoryUtils.locationToUrl({
-      uri: 'git://github.com/elastic/eui/blob/master/generator-eui/app/component.js',
-      range: {
-        start: {
-          line: 4,
-          character: 17,
-        },
-        end: {
-          line: 27,
-          character: 1,
-        },
-      },
-    })
-  ).toEqual('/github.com/elastic/eui/blob/master/generator-eui/app/component.js!L5:17');
-});
-
-test('Get all files from a repository file tree', () => {
-  expect(
-    RepositoryUtils.getAllFiles({
-      name: 'foo',
-      type: FileTreeItemType.Directory,
-      path: '/foo',
-      children: [
-        {
-          name: 'bar',
-          type: FileTreeItemType.File,
-          path: '/foo/bar',
-        },
-        {
-          name: 'boo',
-          type: FileTreeItemType.File,
-          path: '/foo/boo',
-        },
-      ],
-      childrenCount: 2,
-    })
-  ).toEqual(['/foo/bar', '/foo/boo']);
-});
diff --git a/x-pack/legacy/plugins/code/common/repository_utils.ts b/x-pack/legacy/plugins/code/common/repository_utils.ts
deleted file mode 100644
index 03e8f11d70b136..00000000000000
--- a/x-pack/legacy/plugins/code/common/repository_utils.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import crypto from 'crypto';
-import GitUrlParse from 'git-url-parse';
-import path from 'path';
-import { Location } from 'vscode-languageserver';
-
-import { CloneProgress, FileTree, FileTreeItemType, Repository, RepositoryUri } from '../model';
-import { parseLspUrl, toCanonicalUrl } from './uri_util';
-
-export class RepositoryUtils {
-  // visible for tests
-  // the max length of the hash part used to normalize the repository URI
-  static readonly MAX_HASH_LEN = 8;
-  // as the normalized uri is used to create the name of code indices, and a valid index name cannot be longer than 255,
-  // see https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html
-  // the utf8 encoded max normalized name length cannot be greater than (255 - len(index_prefix) - len(index_suffix))
-  // the index prefixes currently in use are '.code-document-', '.code-reference-', '.code-symbol-',
-  // the index suffix currently in use is `-${version}`,
-  // and also leave some room for future extensions
-  static readonly MAX_NORMALIZED_NAME_LEN = 200;
-  static readonly MAX_NORMALIZED_URI_LEN =
-    RepositoryUtils.MAX_NORMALIZED_NAME_LEN - RepositoryUtils.MAX_HASH_LEN - 1;
-
-  // Generate a Repository instance by parsing repository remote url
-  public static buildRepository(remoteUrl: string): Repository {
-    const repo = GitUrlParse(remoteUrl.trim());
-    let host = repo.source ? repo.source : '';
-    if (repo.port !== null) {
-      host = host + ':' + repo.port;
-    }
-
-    // Remove the leading `/` and tailing `.git` if necessary.
-    const pathname =
-      repo.pathname && repo.git_suffix
-        ? repo.pathname.substr(1, repo.pathname.length - 5)
-        : repo.pathname.substr(1);
-
-    // The pathname should look like `a/b/c` now.
-    const segs = pathname.split('/').filter(s => s.length > 0);
-
-    const org = segs.length >= 2 ? segs.slice(0, segs.length - 1).join('_') : '_';
-    const name = segs.length >= 1 ? segs[segs.length - 1] : '_';
-    const uri: RepositoryUri = host ? `${host}/${org}/${name}` : repo.full_name;
-    return {
-      uri,
-      url: repo.href as string,
-      name,
-      org,
-      protocol: repo.protocol,
-    };
-  }
-
-  // From uri 'origin/org/name' to 'org'
-  public static orgNameFromUri(repoUri: RepositoryUri): string {
-    const segs = repoUri.split('/');
-    if (segs && segs.length === 3) {
-      return segs[1];
-    }
-
-    throw new Error('Invalid repository uri.');
-  }
-
-  // From uri 'origin/org/name' to 'name'
-  public static repoNameFromUri(repoUri: RepositoryUri): string {
-    const segs = repoUri.split('/');
-    if (segs && segs.length === 3) {
-      return segs[2];
-    }
-
-    throw new Error('Invalid repository uri.');
-  }
-
-  // From uri 'origin/org/name' to 'org/name'
-  public static repoFullNameFromUri(repoUri: RepositoryUri): string {
-    const segs = repoUri.split('/');
-    if (segs && segs.length === 3) {
-      return segs[1] + '/' + segs[2];
-    }
-
-    throw new Error('Invalid repository uri.');
-  }
-
-  // Return the local data path of a given repository.
-  public static repositoryLocalPath(repoPath: string, repoUri: RepositoryUri) {
-    return path.join(repoPath, repoUri);
-  }
-
-  public static normalizeRepoUriToIndexName(repoUri: RepositoryUri) {
-    // the return value should be <capped readable repository name>-<hash after lowercased uri>
-    // the repoUri is encoded in case there is non-ascii character
-    const lcRepoUri = encodeURI(repoUri).toLowerCase();
-
-    // Following the unit test here in Elasticsearch repository:
-    // https://github.com/elastic/elasticsearch/blob/c75773745cd048cd81a58c7d8a74272b45a25cc6/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java#L404
-    // the hash is calculated from the lowercased repoUri to make it case insensitive
-    const hash = crypto
-      .createHash('md5')
-      .update(lcRepoUri)
-      .digest('hex')
-      .substring(0, RepositoryUtils.MAX_HASH_LEN);
-    // Invalid chars in index can be found here:
-    // https://github.com/elastic/elasticsearch/blob/237650e9c054149fd08213b38a81a3666c1868e5/server/src/main/java/org/elasticsearch/common/Strings.java#L376
-    const normalizedUri = lcRepoUri.replace(/[/\\?%*:|"<> ,]/g, '-');
-    const cappedNormalizedUri = normalizedUri.substr(0, RepositoryUtils.MAX_NORMALIZED_URI_LEN);
-    // Elasticsearch index name is case insensitive
-    return `${cappedNormalizedUri}-${hash}`.toLowerCase();
-  }
-
-  public static locationToUrl(loc: Location) {
-    const url = parseLspUrl(loc.uri);
-    const { repoUri, file, revision } = url;
-    if (repoUri && file && revision) {
-      return toCanonicalUrl({ repoUri, file, revision, position: loc.range.start });
-    }
-    return '';
-  }
-
-  public static getAllFiles(fileTree: FileTree): string[] {
-    if (!fileTree) {
-      return [];
-    }
-    let result: string[] = [];
-    switch (fileTree.type) {
-      case FileTreeItemType.File:
-        result.push(fileTree.path!);
-        break;
-      case FileTreeItemType.Directory:
-        for (const node of fileTree.children!) {
-          result = result.concat(RepositoryUtils.getAllFiles(node));
-        }
-        break;
-      default:
-        break;
-    }
-    return result;
-  }
-
-  public static hasFullyCloned(cloneProgress?: CloneProgress | null): boolean {
-    return !!cloneProgress && cloneProgress.isCloned !== undefined && cloneProgress.isCloned;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/common/text_document_methods.ts b/x-pack/legacy/plugins/code/common/text_document_methods.ts
deleted file mode 100644
index bc9bfcf477be4d..00000000000000
--- a/x-pack/legacy/plugins/code/common/text_document_methods.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { SymbolLocator } from '@elastic/lsp-extension';
-import { TextDocumentPositionParams } from 'vscode-languageserver';
-import {
-  Definition,
-  DocumentSymbolParams,
-  Hover,
-  Location,
-  SymbolInformation,
-} from 'vscode-languageserver-types';
-import { LspClient } from './lsp_client';
-import { LspMethod } from './lsp_method';
-
-export class TextDocumentMethods {
-  public documentSymbol: LspMethod<DocumentSymbolParams, SymbolInformation[]>;
-  public hover: LspMethod<TextDocumentPositionParams, Hover>;
-  public definition: LspMethod<TextDocumentPositionParams, Definition>;
-  public edefinition: LspMethod<TextDocumentPositionParams, SymbolLocator[]>;
-  public references: LspMethod<TextDocumentPositionParams, Location[]>;
-
-  private readonly client: LspClient;
-
-  constructor(client: LspClient) {
-    this.client = client;
-    this.documentSymbol = new LspMethod('textDocument/documentSymbol', this.client);
-    this.hover = new LspMethod('textDocument/hover', this.client);
-    this.definition = new LspMethod('textDocument/definition', this.client);
-    this.edefinition = new LspMethod('textDocument/edefinition', this.client);
-    this.references = new LspMethod('textDocument/references', this.client);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/common/uri_util.test.ts b/x-pack/legacy/plugins/code/common/uri_util.test.ts
deleted file mode 100644
index fbdc739b8f944a..00000000000000
--- a/x-pack/legacy/plugins/code/common/uri_util.test.ts
+++ /dev/null
@@ -1,86 +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 { RepositoryUri } from '../model';
-import { parseLspUrl, toCanonicalUrl, toRepoName, toRepoNameWithOrg } from './uri_util';
-
-test('parse a complete uri', () => {
-  const fullUrl =
-    'git://github.com/Microsoft/vscode/blob/f2e49a2/src/vs/base/parts/ipc/test/node/ipc.net.test.ts';
-  const result = parseLspUrl(fullUrl);
-  expect(result).toEqual({
-    uri:
-      '/github.com/Microsoft/vscode/blob/f2e49a2/src/vs/base/parts/ipc/test/node/ipc.net.test.ts',
-    repoUri: 'github.com/Microsoft/vscode',
-    pathType: 'blob',
-    revision: 'f2e49a2',
-    file: 'src/vs/base/parts/ipc/test/node/ipc.net.test.ts',
-    schema: 'git:',
-  });
-});
-
-test('parseLspUrl a uri without schema', () => {
-  const url =
-    'github.com/Microsoft/vscode/blob/f2e49a2/src/vs/base/parts/ipc/test/node/ipc.net.test.ts';
-  const result = parseLspUrl(url);
-  expect(result).toEqual({
-    uri:
-      '/github.com/Microsoft/vscode/blob/f2e49a2/src/vs/base/parts/ipc/test/node/ipc.net.test.ts',
-    repoUri: 'github.com/Microsoft/vscode',
-    pathType: 'blob',
-    revision: 'f2e49a2',
-    file: 'src/vs/base/parts/ipc/test/node/ipc.net.test.ts',
-  });
-});
-
-test('parseLspUrl a tree uri', () => {
-  const uri = 'github.com/Microsoft/vscode/tree/head/src';
-  const result = parseLspUrl(uri);
-  expect(result).toEqual({
-    uri: '/github.com/Microsoft/vscode/tree/head/src',
-    repoUri: 'github.com/Microsoft/vscode',
-    pathType: 'tree',
-    revision: 'head',
-    file: 'src',
-  });
-});
-
-test('touri', () => {
-  const uri =
-    'git://github.com/Microsoft/vscode/blob/f2e49a2/src/vs/base/parts/ipc/test/node/ipc.net.test.ts';
-  const result = parseLspUrl(uri);
-  expect(result).toEqual({
-    uri:
-      '/github.com/Microsoft/vscode/blob/f2e49a2/src/vs/base/parts/ipc/test/node/ipc.net.test.ts',
-    repoUri: 'github.com/Microsoft/vscode',
-    pathType: 'blob',
-    revision: 'f2e49a2',
-    file: 'src/vs/base/parts/ipc/test/node/ipc.net.test.ts',
-    schema: 'git:',
-  });
-  const convertBack = toCanonicalUrl(result!);
-  expect(convertBack).toEqual(uri);
-});
-
-test('toRepoName', () => {
-  const uri: RepositoryUri = 'github.com/elastic/elasticsearch';
-  expect(toRepoName(uri)).toEqual('elasticsearch');
-
-  const invalidUri: RepositoryUri = 'github.com/elastic/elasticsearch/invalid';
-  expect(() => {
-    toRepoName(invalidUri);
-  }).toThrow();
-});
-
-test('toRepoNameWithOrg', () => {
-  const uri: RepositoryUri = 'github.com/elastic/elasticsearch';
-  expect(toRepoNameWithOrg(uri)).toEqual('elastic/elasticsearch');
-
-  const invalidUri: RepositoryUri = 'github.com/elastic/elasticsearch/invalid';
-  expect(() => {
-    toRepoNameWithOrg(invalidUri);
-  }).toThrow();
-});
diff --git a/x-pack/legacy/plugins/code/common/uri_util.ts b/x-pack/legacy/plugins/code/common/uri_util.ts
deleted file mode 100644
index ef74be89605507..00000000000000
--- a/x-pack/legacy/plugins/code/common/uri_util.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Uri } from 'monaco-editor';
-import pathToRegexp from 'path-to-regexp';
-import { Position } from 'vscode-languageserver-types';
-
-import { RepositoryUri } from '../model';
-import { MAIN, MAIN_ROOT } from '../public/components/routes';
-
-const mainRe = pathToRegexp(MAIN);
-const mainRootRe = pathToRegexp(MAIN_ROOT);
-
-export interface ParsedUrl {
-  schema?: string;
-  uri?: string;
-}
-
-export interface CompleteParsedUrl extends ParsedUrl {
-  repoUri: string;
-  revision: string;
-  pathType?: string;
-  file?: string;
-  schema?: string;
-  position?: Position;
-}
-
-export function parseSchema(url: string): { uri: string; schema?: string } {
-  let [schema, uri] = url.toString().split('//');
-  if (!uri) {
-    uri = schema;
-    // @ts-ignore
-    schema = undefined;
-  }
-  if (!uri.startsWith('/')) {
-    uri = '/' + uri;
-  }
-  return { uri, schema };
-}
-
-export function parseGoto(goto: string): Position | undefined {
-  const regex = /L(\d+)(:\d+)?$/;
-  const m = regex.exec(goto);
-  if (m) {
-    const line = parseInt(m[1], 10);
-    let character = 0;
-    if (m[2]) {
-      character = parseInt(m[2].substring(1), 10);
-    }
-    return {
-      line,
-      character,
-    };
-  }
-}
-
-export function parseLspUrl(url: Uri | string): CompleteParsedUrl {
-  const { schema, uri } = parseSchema(url.toString());
-  const mainParsed = mainRe.exec(uri);
-  const mainRootParsed = mainRootRe.exec(uri);
-  if (mainParsed) {
-    const [resource, org, repo, pathType, revision, file, goto] = mainParsed.slice(1);
-    let position;
-    if (goto) {
-      position = parseGoto(goto);
-    }
-    return {
-      uri: uri.replace(goto, ''),
-      repoUri: `${resource}/${org}/${repo}`,
-      pathType,
-      revision,
-      file,
-      schema,
-      position,
-    };
-  } else if (mainRootParsed) {
-    const [resource, org, repo, pathType, revision] = mainRootParsed.slice(1);
-    return {
-      uri,
-      repoUri: `${resource}/${org}/${repo}`,
-      pathType,
-      revision,
-      schema,
-    };
-  } else {
-    throw new Error('invalid url ' + url);
-  }
-}
-
-/*
- * From RepositoryUri to repository name.
- * e.g. github.com/elastic/elasticsearch -> elasticsearch
- */
-export function toRepoName(uri: RepositoryUri): string {
-  const segs = uri.split('/');
-  if (segs.length !== 3) {
-    throw new Error(`Invalid repository uri ${uri}`);
-  }
-  return segs[2];
-}
-
-/*
- * From RepositoryUri to repository name with organization prefix.
- * e.g. github.com/elastic/elasticsearch -> elastic/elasticsearch
- */
-export function toRepoNameWithOrg(uri: RepositoryUri): string {
-  const segs = uri.split('/');
-  if (segs.length !== 3) {
-    throw new Error(`Invalid repository uri ${uri}`);
-  }
-  return `${segs[1]}/${segs[2]}`;
-}
-
-const compiled = pathToRegexp.compile(MAIN);
-
-export function toCanonicalUrl(lspUrl: CompleteParsedUrl) {
-  const [resource, org, repo] = lspUrl.repoUri!.split('/');
-  if (!lspUrl.pathType) {
-    lspUrl.pathType = 'blob';
-  }
-  let goto;
-  if (lspUrl.position) {
-    goto = `!L${lspUrl.position.line + 1}:${lspUrl.position.character}`;
-  }
-  const data = { resource, org, repo, path: lspUrl.file, goto, ...lspUrl };
-  const uri = decodeURIComponent(compiled(data));
-  return lspUrl.schema ? `${lspUrl.schema}/${uri}` : uri;
-}
-
-export const decodeRevisionString = (revision: string) => {
-  return revision.replace(/:/g, '/');
-};
-
-export const encodeRevisionString = (revision: string) => {
-  return revision.replace(/\//g, ':');
-};
diff --git a/x-pack/legacy/plugins/code/index.ts b/x-pack/legacy/plugins/code/index.ts
deleted file mode 100644
index e0519ab4e8d62d..00000000000000
--- a/x-pack/legacy/plugins/code/index.ts
+++ /dev/null
@@ -1,97 +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 { RequestQuery, ResponseToolkit, RouteOptions, ServerRoute } from 'hapi';
-import JoiNamespace from 'joi';
-import { Legacy } from 'kibana';
-import { resolve } from 'path';
-import { CoreSetup } from 'src/core/server';
-
-import { APP_TITLE, SAVED_OBJ_REPO } from './common/constants';
-import { codePlugin } from './server';
-import { PluginSetupContract } from '../../../plugins/code/server';
-import { mappings } from './mappings';
-
-export type RequestFacade = Legacy.Request;
-export type RequestQueryFacade = RequestQuery;
-export type ResponseToolkitFacade = ResponseToolkit;
-export type RouteOptionsFacade = RouteOptions;
-export type ServerFacade = Legacy.Server;
-export type ServerRouteFacade = ServerRoute;
-
-export const code = (kibana: any) =>
-  new kibana.Plugin({
-    require: ['kibana', 'elasticsearch'],
-    id: 'code',
-    configPrefix: 'xpack.code',
-    publicDir: resolve(__dirname, 'public'),
-
-    uiExports: {
-      app: {
-        title: APP_TITLE,
-        main: 'plugins/code/index',
-        euiIconType: 'codeApp',
-      },
-      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      injectDefaultVars(server: ServerFacade) {
-        const config = server.config();
-        return {
-          codeUiEnabled: config.get('xpack.code.ui.enabled'),
-          codeIntegrationsEnabled: config.get('xpack.code.integrations.enabled'),
-          codeDiffPageEnabled: config.get('xpack.code.diffPage.enabled'),
-        };
-      },
-      hacks: ['plugins/code/hacks/toggle_app_link_in_nav'],
-      savedObjectSchemas: {
-        [SAVED_OBJ_REPO]: {
-          isNamespaceAgnostic: false,
-        },
-      },
-      mappings,
-    },
-    config(Joi: typeof JoiNamespace) {
-      return Joi.object({
-        // Still keep this config item here for the injectDefaultVars
-        // in line 40 here.
-        ui: Joi.object({
-          enabled: Joi.boolean().default(true),
-        }).default(),
-        integrations: Joi.object({
-          enabled: Joi.boolean().default(false),
-        }).default(),
-        diffPage: Joi.object({
-          enabled: Joi.boolean().default(false),
-        }).default(),
-        enabled: Joi.boolean().default(true),
-      })
-        .default()
-        .unknown(true);
-    },
-    async init(server: ServerFacade) {
-      const initializerContext = server.newPlatform.setup.plugins.code as PluginSetupContract;
-      if (!initializerContext.legacy.config.ui.enabled) {
-        return;
-      }
-
-      const coreSetup = ({
-        http: { server },
-      } as any) as CoreSetup;
-
-      // Set up with the new platform plugin lifecycle API.
-      const plugin = codePlugin(initializerContext);
-      await plugin.setup(coreSetup, initializerContext.legacy.http);
-
-      // @ts-ignore
-      const kbnServer = this.kbnServer;
-      kbnServer.ready().then(async () => {
-        await plugin.start(coreSetup);
-      });
-
-      server.events.on('stop', async () => {
-        await plugin.stop();
-      });
-    },
-  });
diff --git a/x-pack/legacy/plugins/code/kibana.json b/x-pack/legacy/plugins/code/kibana.json
deleted file mode 100644
index 5536f1e5957cf9..00000000000000
--- a/x-pack/legacy/plugins/code/kibana.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "id": "code",
-  "version": "kibana",
-  "server": true,
-  "ui": true,
-  "requiredPlugins": ["elasticsearch"]
-}
diff --git a/x-pack/legacy/plugins/code/mappings.ts b/x-pack/legacy/plugins/code/mappings.ts
deleted file mode 100644
index 651ee607473d3c..00000000000000
--- a/x-pack/legacy/plugins/code/mappings.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { SAVED_OBJ_REPO } from './common/constants';
-
-export const mappings = {
-  [SAVED_OBJ_REPO]: {
-    properties: {
-      uri: {
-        type: 'keyword',
-      },
-    },
-  },
-};
diff --git a/x-pack/legacy/plugins/code/model/commit.ts b/x-pack/legacy/plugins/code/model/commit.ts
deleted file mode 100644
index 2690e249431c37..00000000000000
--- a/x-pack/legacy/plugins/code/model/commit.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export interface CommitInfo {
-  updated: Date;
-  message: string;
-  committer: string;
-  committerEmail?: string;
-  author: string;
-  authorEmail?: string;
-  id: string;
-  parents: string[];
-  treeId: string;
-}
-
-export interface ReferenceInfo {
-  name: string;
-  reference: string;
-  commit?: CommitInfo;
-  type: ReferenceType;
-}
-
-export enum ReferenceType {
-  BRANCH = 'BRANCH',
-  TAG = 'TAG',
-  REMOTE_BRANCH = 'REMOTE_BRANCH',
-  OTHER = 'OTHER',
-}
diff --git a/x-pack/legacy/plugins/code/model/highlight.ts b/x-pack/legacy/plugins/code/model/highlight.ts
deleted file mode 100644
index 3deacd72eb8a45..00000000000000
--- a/x-pack/legacy/plugins/code/model/highlight.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.
- */
-
-export type CodeLine = Token[];
-
-export interface Token {
-  value: string;
-  scopes: string[];
-  range?: Range;
-}
-
-export interface Range {
-  start: number; // start pos in line
-  end: number;
-  pos?: number; // position in file
-}
diff --git a/x-pack/legacy/plugins/code/model/index.ts b/x-pack/legacy/plugins/code/model/index.ts
deleted file mode 100644
index 5db839932a2476..00000000000000
--- a/x-pack/legacy/plugins/code/model/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './highlight';
-export * from './search';
-export * from './repository';
-export * from './task';
-export * from './lsp';
-export * from './workspace';
diff --git a/x-pack/legacy/plugins/code/model/lsp.ts b/x-pack/legacy/plugins/code/model/lsp.ts
deleted file mode 100644
index 6d07ccd4f72c90..00000000000000
--- a/x-pack/legacy/plugins/code/model/lsp.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export interface LspRequest {
-  method: string;
-  params: any;
-  documentUri?: string; // assert there is only one uri per request for now.
-  resolvedFilePath?: string;
-  workspacePath?: string;
-  workspaceRevision?: string;
-  isNotification?: boolean; // if this is a notification request that doesn't need response
-}
diff --git a/x-pack/legacy/plugins/code/model/repository.ts b/x-pack/legacy/plugins/code/model/repository.ts
deleted file mode 100644
index c4469a7d593d72..00000000000000
--- a/x-pack/legacy/plugins/code/model/repository.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { IndexRequest } from './search';
-import { CancellationReason } from '../server/queue/cancellation_service';
-
-export type RepositoryUri = string;
-
-export interface Repository {
-  /** In the form of git://github.com/lambdalab/lambdalab  */
-  uri: RepositoryUri;
-  /** Original Clone Url */
-  url: string;
-  name?: string;
-  org?: string;
-  defaultBranch?: string;
-  revision?: string;
-  protocol?: string;
-  // The timestamp of next update for this repository.
-  nextUpdateTimestamp?: Date;
-  // The timestamp of next index for this repository.
-  nextIndexTimestamp?: Date;
-  // The current indexed revision in Elasticsearch.
-  indexedRevision?: string;
-}
-
-export interface RepositoryConfig {
-  uri: RepositoryUri;
-  disableGo?: boolean;
-  disableJava?: boolean;
-  disableTypescript?: boolean;
-}
-
-export interface FileTree {
-  name: string;
-  type: FileTreeItemType;
-
-  /** Full Path of the tree, don't need to be set by the server */
-  path?: string;
-  /**
-   * Children of the file tree, if it is undefined, then it's a file, if it is null, it means it is a
-   * directory and its children haven't been evaluated.
-   */
-  children?: FileTree[];
-  /**
-   * count of children nodes for current node, use this for pagination
-   */
-  childrenCount?: number;
-  sha1?: string;
-  /**
-   *  current repo uri
-   */
-  repoUri?: string;
-}
-
-export function sortFileTree(a: FileTree, b: FileTree) {
-  // consider Link and File are the same type, Submodule and Directory are the same type when sorting.
-  // Submodule and Directory are before Link and File
-  const types1 = [FileTreeItemType.File, FileTreeItemType.Link];
-  const types2 = [FileTreeItemType.Directory, FileTreeItemType.Submodule];
-  if (types1.includes(a.type)) {
-    if (types1.includes(b.type)) {
-      return a.name.localeCompare(b.name);
-    } else {
-      return 1;
-    }
-  } else if (types2.includes(a.type)) {
-    if (types2.includes(b.type)) {
-      return a.name.localeCompare(b.name);
-    } else {
-      return -1;
-    }
-  }
-  return a.name.localeCompare(b.name);
-}
-
-export enum FileTreeItemType {
-  File,
-  Directory,
-  Submodule,
-  Link,
-}
-
-export interface WorkerResult {
-  uri: string;
-  cancelled?: boolean;
-  cancelledReason?: CancellationReason;
-}
-
-// TODO(mengwei): create a AbstractGitWorkerResult since we now have an
-// AbstractGitWorker now.
-export interface CloneWorkerResult extends WorkerResult {
-  repo?: Repository;
-}
-
-export interface DeleteWorkerResult extends WorkerResult {
-  res: boolean;
-}
-
-export interface UpdateWorkerResult extends WorkerResult {
-  branch: string;
-  revision: string;
-}
-
-export enum IndexStatsKey {
-  Commit = 'commit-added-count',
-  CommitDeleted = 'commit-deleted-count',
-  File = 'file-added-count',
-  FileDeleted = 'file-deleted-count',
-  Symbol = 'symbol-added-count',
-  SymbolDeleted = 'symbol-deleted-count',
-  Reference = 'reference-added-count',
-  ReferenceDeleted = 'reference-deleted-count',
-}
-export type IndexStats = Map<IndexStatsKey, number>;
-
-export interface IndexWorkerResult extends WorkerResult {
-  revision: string;
-  stats: IndexStats;
-}
-
-export enum WorkerReservedProgress {
-  INIT = 0,
-  COMPLETED = 100,
-  ERROR = -100,
-  TIMEOUT = -200,
-}
-
-export interface WorkerProgress {
-  // Job payload repository uri.
-  uri: string;
-  progress: number;
-  timestamp: Date;
-  revision?: string;
-  errorMessage?: string;
-}
-
-export interface CloneProgress {
-  isCloned?: boolean;
-  receivedObjects: number;
-  indexedObjects: number;
-  totalObjects: number;
-  localObjects: number;
-  totalDeltas: number;
-  indexedDeltas: number;
-  receivedBytes: number;
-}
-
-export interface CloneWorkerProgress extends WorkerProgress {
-  cloneProgress?: CloneProgress;
-}
-
-export interface IndexProgress {
-  type: string;
-  total: number;
-  success: number;
-  fail: number;
-  percentage: number;
-  checkpoint?: IndexRequest;
-}
-
-export interface IndexWorkerProgress extends WorkerProgress {
-  // Index progress for LSP indexing.
-  indexProgress?: IndexProgress;
-  // Index progress for commit indexing.
-  commitIndexProgress?: IndexProgress;
-}
-
-export enum RepoState {
-  CLONING,
-  UPDATING,
-  DELETING,
-  INDEXING,
-  READY,
-  CLONE_ERROR,
-  DELETE_ERROR,
-  INDEX_ERROR,
-  UNKNOWN,
-}
diff --git a/x-pack/legacy/plugins/code/model/search.ts b/x-pack/legacy/plugins/code/model/search.ts
deleted file mode 100644
index 8d2a9f29254db2..00000000000000
--- a/x-pack/legacy/plugins/code/model/search.ts
+++ /dev/null
@@ -1,294 +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 { DetailSymbolInformation } from '@elastic/lsp-extension';
-import { IRange } from 'monaco-editor';
-
-import { DiffKind } from '../common/git_diff';
-import { Repository } from '../model';
-import { RepositoryUri } from './repository';
-
-export interface Document {
-  repoUri: RepositoryUri;
-  path: string;
-  content: string;
-  qnames: string[];
-  language?: string;
-  sha1?: string;
-}
-
-export interface Commit {
-  repoUri: RepositoryUri;
-  id: string;
-  message: string;
-  body: string;
-  date: Date;
-  parents: string[];
-  author: {
-    name: string;
-    email: string;
-  };
-  committer: {
-    name: string;
-    email: string;
-  };
-}
-
-// The base interface of indexer requests
-export interface IndexRequest {
-  repoUri: RepositoryUri;
-}
-
-export enum IndexerType {
-  LSP = 'LSP',
-  LSP_INC = 'LSP_INCREMENTAL',
-  COMMIT = 'COMMIT',
-  COMMIT_INC = 'COMMIT_INCREMENTAL',
-  REPOSITORY = 'REPOSITORY',
-  UNKNOWN = 'UNKNOWN',
-}
-
-// The request for LspIndexer
-export interface LspIndexRequest extends IndexRequest {
-  filePath: string; // The file path within the repository
-  revision: string; // The revision of the current repository
-}
-
-// The request for CommitIndexer
-export interface CommitIndexRequest extends IndexRequest {
-  // The git ref as the starting point for the entire commit index job.
-  revision: string;
-  commit: Commit;
-}
-
-export interface LspIncIndexRequest extends LspIndexRequest {
-  originPath?: string;
-  kind: DiffKind;
-  originRevision: string;
-}
-
-// The request for RepositoryIndexer
-export interface RepositoryIndexRequest extends IndexRequest {
-  repoUri: RepositoryUri;
-}
-
-// The base interface of any kind of search requests.
-export interface SearchRequest {
-  query: string;
-  page: number;
-  resultsPerPage?: number;
-}
-
-export interface RepositorySearchRequest extends SearchRequest {
-  query: string;
-  repoScope?: RepositoryUri[];
-}
-
-export interface DocumentSearchRequest extends SearchRequest {
-  // repoFilters is used for search within these repos but return
-  // search stats across all repositories.
-  repoFilters?: string[];
-  // repoScope hard limit the search coverage only to these repositories.
-  repoScope?: RepositoryUri[];
-  langFilters?: string[];
-}
-
-export interface CommitSearchRequest extends SearchRequest {
-  // repoFilters is used for search within these repos but return
-  // search stats across all repositories.
-  repoFilters?: string[];
-  // repoScope hard limit the search coverage only to these repositories.
-  repoScope?: RepositoryUri[];
-}
-
-export interface SymbolSearchRequest extends SearchRequest {
-  query: string;
-  repoScope?: RepositoryUri[];
-}
-
-export interface StackTraceItem {
-  filePath: string;
-  lineNumStart: number;
-  lineNumEnd?: number;
-  // We could add more in here in the future, e.g. qname.
-}
-
-export interface StackTraceSnippetsRequest {
-  repoUris: RepositoryUri[];
-  revision?: string; // Not used for now.
-  stacktraceItems: StackTraceItem[];
-}
-
-export interface ResolveSnippetsRequest {
-  repoUris: RepositoryUri[];
-  revision?: string; // Not used for now.
-  filePath: string;
-  lineNumStart: number;
-  lineNumEnd?: number;
-}
-
-// The base interface of any kind of search result.
-export interface SearchResult {
-  total: number;
-  took: number;
-}
-
-export interface RepositorySearchResult extends SearchResult {
-  repositories: Repository[];
-  from?: number;
-  page?: number;
-  totalPage?: number;
-}
-
-export interface SymbolSearchResult extends SearchResult {
-  // TODO: we might need an additional data structure for symbol search result.
-  symbols: DetailSymbolInformation[];
-}
-
-// All the interfaces for search page
-
-// The item of the search result stats. e.g. Typescript -> 123
-export interface SearchResultStatsItem {
-  name: string;
-  value: number;
-}
-
-export interface SearchResultStats {
-  total: number; // Total number of results
-  from: number; // The beginning of the result range
-  to: number; // The end of the result range
-  page: number; // The page number
-  totalPage: number; // The total number of pages
-  repoStats: SearchResultStatsItem[];
-  languageStats: SearchResultStatsItem[];
-}
-
-export interface CompositeSourceContent {
-  content: string;
-  lineMapping: string[];
-  ranges: IRange[];
-}
-
-export interface SearchResultItem {
-  uri: string;
-  hits: number;
-  filePath: string;
-  language: string;
-  compositeContent: CompositeSourceContent;
-}
-
-export interface DocumentSearchResult extends SearchResult {
-  query: string;
-  from?: number;
-  page?: number;
-  totalPage?: number;
-  stats?: SearchResultStats;
-  results?: SearchResultItem[];
-  repoAggregations?: any[];
-  langAggregations?: any[];
-}
-
-export type CommitSearchResultItem = Commit;
-
-export interface CommitSearchResult extends DocumentSearchResult {
-  commits: CommitSearchResultItem[];
-}
-
-export interface IntegrationsSearchResult extends SearchResult {
-  results?: SearchResultItem[];
-  fallback: boolean;
-}
-
-export interface SourceLocation {
-  line: number;
-  column: number;
-  offset: number;
-}
-
-export interface SourceRange {
-  startLoc: SourceLocation;
-  endLoc: SourceLocation;
-}
-
-export interface SourceHit {
-  range: SourceRange;
-  score: number;
-  term: string;
-}
-
-export enum SearchScope {
-  DEFAULT = 'default', // Search everything
-  SYMBOL = 'symbol', // Only search symbols
-  REPOSITORY = 'repository', // Only search repositories
-  FILE = 'file', // Only search files
-}
-
-export interface SearchOptions {
-  repoScope: Repository[];
-  defaultRepoScopeOn: boolean;
-  defaultRepoScope?: Repository;
-}
-
-export function emptySearchResult(): SearchResult {
-  return {
-    total: 0,
-    took: 0,
-  };
-}
-
-export function emptyRepositorySearchResult(): RepositorySearchResult {
-  return {
-    ...emptySearchResult(),
-    repositories: [],
-    from: 0,
-    page: 0,
-    totalPage: 0,
-  };
-}
-
-export function emptySymbolSearchResult(): SymbolSearchResult {
-  return {
-    ...emptySearchResult(),
-    symbols: [],
-  };
-}
-
-export function emptyDocumentSearchResult(query: string): DocumentSearchResult {
-  return {
-    ...emptySearchResult(),
-    query,
-    from: 0,
-    page: 0,
-    totalPage: 0,
-    stats: {
-      total: 0,
-      from: 0,
-      to: 0,
-      page: 0,
-      totalPage: 0,
-      repoStats: [],
-      languageStats: [],
-    },
-    results: [],
-    repoAggregations: [],
-    langAggregations: [],
-  };
-}
-
-export function emptyCommitSearchResult(query: string): CommitSearchResult {
-  return {
-    ...emptyDocumentSearchResult(query),
-    commits: [],
-  };
-}
-
-export function emptyIntegrationsSearchResult(): IntegrationsSearchResult {
-  return {
-    ...emptySearchResult(),
-    results: [],
-    fallback: false,
-  };
-}
diff --git a/x-pack/legacy/plugins/code/model/task.ts b/x-pack/legacy/plugins/code/model/task.ts
deleted file mode 100644
index 9bc983b9c7f8f1..00000000000000
--- a/x-pack/legacy/plugins/code/model/task.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RepositoryUri } from './repository';
-
-/** Time consuming task that should be queued and executed seperately */
-export interface Task {
-  repoUri: RepositoryUri;
-  type: TaskType;
-  /** Percentage of the task, 100 means task completed */
-  progress: number;
-
-  /** Revision of the repo that the task run on. May only apply to Index task */
-  revision?: string;
-}
-
-export enum TaskType {
-  Import,
-  Update,
-  Delete,
-  Index,
-}
diff --git a/x-pack/legacy/plugins/code/model/test_config.ts b/x-pack/legacy/plugins/code/model/test_config.ts
deleted file mode 100644
index 45f8cf34684efb..00000000000000
--- a/x-pack/legacy/plugins/code/model/test_config.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.
- */
-
-export interface Repo {
-  url: string;
-  path: string;
-  language: string;
-}
-
-export interface TestConfig {
-  repos: Repo[];
-}
-
-export enum RequestType {
-  INITIALIZE,
-  HOVER,
-  FULL,
-}
diff --git a/x-pack/legacy/plugins/code/model/usage_telemetry_metrics.ts b/x-pack/legacy/plugins/code/model/usage_telemetry_metrics.ts
deleted file mode 100644
index 7e0242d751214c..00000000000000
--- a/x-pack/legacy/plugins/code/model/usage_telemetry_metrics.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export enum CodeUsageMetrics {
-  ENABLED = 'enabled',
-  REPOSITORIES = 'repositories',
-  LANGUAGE_SERVERS = 'langserver',
-}
-
-export enum CodeUIUsageMetrics {
-  ADMIN_PAGE_LOAD_COUNT = 'adminPageLoadCount',
-  SOURCE_VIEW_PAGE_LOAD_COUNT = 'sourceViewPageLoadCount',
-  SEARCH_PAGE_LOAD_COUNT = 'searchPageLoadCount',
-  FILE_TREE_CLICK_COUNT = 'fileTreeClickCount',
-  BREADCRUMB_CLICK_COUNT = 'breadcrumbClickCount',
-  LINE_NUMBER_CLICK_COUNT = 'lineNumberClickCount',
-  STRUCTURE_TREE_CLICK_COUNT = 'structureTreeClickCount',
-  LSP_DATA_AVAILABLE_PAGE_VIEW_COUNT = 'lspDataAvailablePageViewCount',
-}
diff --git a/x-pack/legacy/plugins/code/model/workspace.ts b/x-pack/legacy/plugins/code/model/workspace.ts
deleted file mode 100644
index efa48e28e73882..00000000000000
--- a/x-pack/legacy/plugins/code/model/workspace.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export type RepoCmd = string | string[];
-export interface RepoConfig {
-  repo: string;
-  init: RepoCmd;
-}
-
-export interface RepoConfigs {
-  [repoUri: string]: RepoConfig;
-}
diff --git a/x-pack/legacy/plugins/code/public/actions/blame.ts b/x-pack/legacy/plugins/code/public/actions/blame.ts
deleted file mode 100644
index e78a0d05eeffbe..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/blame.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createAction } from 'redux-actions';
-import { GitBlame } from '../../common/git_blame';
-
-export interface LoadBlamePayload {
-  repoUri: string;
-  revision: string;
-  path: string;
-}
-
-export const loadBlame = createAction<LoadBlamePayload>('LOAD BLAME');
-export const loadBlameSuccess = createAction<GitBlame[]>('LOAD BLAME SUCCESS');
-export const loadBlameFailed = createAction<Error>('LOAD BLAME FAILED');
diff --git a/x-pack/legacy/plugins/code/public/actions/commit.ts b/x-pack/legacy/plugins/code/public/actions/commit.ts
deleted file mode 100644
index aabf0e179beedf..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/commit.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createAction } from 'redux-actions';
-import { CommitDiff } from '../../common/git_diff';
-
-export const loadCommit = createAction<string>('LOAD COMMIT');
-export const loadCommitSuccess = createAction<CommitDiff>('LOAD COMMIT SUCCESS');
-export const loadCommitFailed = createAction<Error>('LOAD COMMIT FAILED');
diff --git a/x-pack/legacy/plugins/code/public/actions/editor.ts b/x-pack/legacy/plugins/code/public/actions/editor.ts
deleted file mode 100644
index 0baeae10fe93c1..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/editor.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 { Range } from 'monaco-editor';
-import { createAction } from 'redux-actions';
-import { Hover, Position, TextDocumentPositionParams } from 'vscode-languageserver';
-
-export interface PanelResults {
-  repos: GroupedRepoResults[];
-  title: string;
-}
-
-export interface GroupedRepoResults {
-  repo: string;
-  files: GroupedFileResults[];
-}
-
-export interface GroupedFileResults {
-  uri: string;
-  file: string;
-  language: string;
-  code: string;
-  lineNumbers: string[];
-  repo: string;
-  revision: string;
-  highlights: Range[];
-}
-
-export const findReferences = createAction<TextDocumentPositionParams>('FIND REFERENCES');
-export const findReferencesSuccess = createAction<PanelResults>('FIND REFERENCES SUCCESS');
-export const findReferencesFailed = createAction<Error>('FIND REFERENCES ERROR');
-export const closePanel = createAction<boolean>('CLOSE PANEL');
-export const hoverResult = createAction<Hover>('HOVER RESULT');
-export const revealPosition = createAction<Position | undefined>('REVEAL POSITION');
-
-export const findDefinitions = createAction<TextDocumentPositionParams>('FIND DEFINITIONS');
-export const findDefinitionsSuccess = createAction<PanelResults>('FIND DEFINITIONS SUCCESS');
-export const findDefinitionsFailed = createAction<Error>('FIND DEFINITIONS ERROR');
diff --git a/x-pack/legacy/plugins/code/public/actions/file.ts b/x-pack/legacy/plugins/code/public/actions/file.ts
deleted file mode 100644
index c1f27cdc0a9f85..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/file.ts
+++ /dev/null
@@ -1,86 +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 { createAction } from 'redux-actions';
-import { FileTree } from '../../model';
-import { CommitInfo, ReferenceInfo } from '../../model/commit';
-
-export interface FetchRepoPayload {
-  uri: string;
-}
-
-export interface FetchRepoPayloadWithRevision extends FetchRepoPayload {
-  revision: string;
-}
-export interface FetchFilePayload extends FetchRepoPayloadWithRevision {
-  path: string;
-}
-export interface FetchRepoTreePayload extends FetchFilePayload {
-  limit?: number;
-  parents?: boolean;
-  isDir: boolean;
-}
-
-export interface FetchFileResponse {
-  payload: FetchFilePayload;
-  isNotFound?: boolean;
-  content?: string;
-  lang?: string;
-  isImage?: boolean;
-  isUnsupported?: boolean;
-  isOversize?: boolean;
-  url?: string;
-}
-
-export interface RepoTreePayload {
-  tree: FileTree;
-  path: string;
-  withParents: boolean | undefined;
-  revision: string;
-}
-
-export interface TreeCommitPayload {
-  path: string;
-  commits: CommitInfo[];
-  append?: boolean;
-}
-
-export const fetchRootRepoTree = createAction<FetchRepoPayloadWithRevision>('FETCH ROOT REPO TREE');
-export const fetchRootRepoTreeSuccess = createAction<{ tree: FileTree; revision: string }>(
-  'FETCH ROOT REPO TREE SUCCESS'
-);
-export const fetchRootRepoTreeFailed = createAction<Error>('FETCH ROOT REPO TREE FAILED');
-
-export const fetchRepoTree = createAction<FetchRepoTreePayload>('FETCH REPO TREE');
-export const fetchRepoTreeSuccess = createAction<RepoTreePayload>('FETCH REPO TREE SUCCESS');
-export const fetchRepoTreeFailed = createAction<Error>('FETCH REPO TREE FAILED');
-
-export const fetchRepoBranches = createAction<FetchRepoPayload>('FETCH REPO BRANCHES');
-export const fetchRepoBranchesSuccess = createAction<ReferenceInfo[]>(
-  'FETCH REPO BRANCHES SUCCESS'
-);
-export const fetchRepoBranchesFailed = createAction<Error>('FETCH REPO BRANCHES FAILED');
-export const fetchRepoCommits = createAction<FetchRepoPayloadWithRevision>('FETCH REPO COMMITS');
-export const fetchRepoCommitsSuccess = createAction<CommitInfo[]>('FETCH REPO COMMITS SUCCESS');
-export const fetchRepoCommitsFailed = createAction<Error>('FETCH REPO COMMITS FAILED');
-
-export const fetchFile = createAction<FetchFilePayload>('FETCH FILE');
-export const fetchFileSuccess = createAction<FetchFileResponse>('FETCH FILE SUCCESS');
-export const fetchFileFailed = createAction<Error>('FETCH FILE ERROR');
-
-export const fetchDirectory = createAction<FetchRepoTreePayload>('FETCH REPO DIR');
-export const fetchDirectorySuccess = createAction<FileTree>('FETCH REPO DIR SUCCESS');
-export const fetchDirectoryFailed = createAction<Error>('FETCH REPO DIR FAILED');
-export const setNotFound = createAction<boolean>('SET FILE NOT FOUND');
-export const dirNotFound = createAction<string>('DIR NOT FOUND');
-
-export const fetchTreeCommits = createAction<FetchFilePayload>('FETCH TREE COMMITS');
-export const fetchTreeCommitsSuccess = createAction<TreeCommitPayload>(
-  'FETCH TREE COMMITS SUCCESS'
-);
-export const fetchTreeCommitsFailed = createAction<Error>('FETCH TREE COMMITS FAILED');
-
-export const fetchMoreCommits = createAction<string>('FETCH MORE COMMITS');
diff --git a/x-pack/legacy/plugins/code/public/actions/index.ts b/x-pack/legacy/plugins/code/public/actions/index.ts
deleted file mode 100644
index df0083b3c8a366..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createAction } from 'redux-actions';
-
-export * from './repository';
-export * from './search';
-export * from './file';
-export * from './structure';
-export * from './editor';
-export * from './commit';
-export * from './status';
-export * from './project_config';
-export * from './shortcuts';
-export * from './route';
-
-export interface Match {
-  isExact?: boolean;
-  params: { [key: string]: string };
-  path: string;
-  url: string;
-  location: Location;
-}
-
-export const routeChange = createAction<Match>('CODE SEARCH ROUTE CHANGE');
-
-export const checkSetupSuccess = createAction('SETUP CHECK SUCCESS');
-export const checkSetupFailed = createAction('SETUP CHECK FAILED');
diff --git a/x-pack/legacy/plugins/code/public/actions/language_server.ts b/x-pack/legacy/plugins/code/public/actions/language_server.ts
deleted file mode 100644
index 6d14d11d1e5c2a..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/language_server.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 { createAction } from 'redux-actions';
-import { LanguageServer } from '../../common/language_server';
-
-export const loadLanguageServers = createAction('LOAD LANGUAGE SERVERS');
-export const loadLanguageServersSuccess = createAction<LanguageServer[]>(
-  'LOAD LANGUAGE SERVERS SUCCESS'
-);
-export const loadLanguageServersFailed = createAction<Error>('LOAD LANGUAGE SERVERS FAILED');
-
-export const requestInstallLanguageServer = createAction('REQUEST INSTALL LANGUAGE SERVERS');
-export const requestInstallLanguageServerSuccess = createAction<string>(
-  'REQUEST INSTALL LANGUAGE SERVERS SUCCESS'
-);
-export const requestInstallLanguageServerFailed = createAction<Error>(
-  'REQUEST INSTALL LANGUAGE SERVERS FAILED'
-);
-
-export const installLanguageServerSuccess = createAction<any>('INSTALL LANGUAGE SERVERS SUCCESS');
-
-export const languageServerInitializing = createAction('LANGUAGE SERVER INITIALIZING');
diff --git a/x-pack/legacy/plugins/code/public/actions/project_config.ts b/x-pack/legacy/plugins/code/public/actions/project_config.ts
deleted file mode 100644
index 4b518cdab63fda..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/project_config.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createAction } from 'redux-actions';
-import { RepositoryConfig } from '../../model';
-
-export interface RepoLangserverConfigs {
-  [key: string]: RepositoryConfig;
-}
-
-export const loadConfigs = createAction('LOAD CONFIGS');
-export const loadConfigsSuccess = createAction<RepoLangserverConfigs>('LOAD CONFIGS SUCCESS');
-export const loadConfigsFailed = createAction<Error>('LOAD CONFIGS FAILED');
diff --git a/x-pack/legacy/plugins/code/public/actions/recent_projects.ts b/x-pack/legacy/plugins/code/public/actions/recent_projects.ts
deleted file mode 100644
index e278744f10c767..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/recent_projects.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createAction } from 'redux-actions';
-
-export const loadRecentProjects = createAction('LOAD RECENT PROJECTS');
-export const loadRecentProjectsSuccess = createAction<any>('LOAD RECENT PROJECTS SUCCESS');
-export const loadRecentProjectsFailed = createAction<Error>('LOAD RECENT PROJECTS FAILED');
diff --git a/x-pack/legacy/plugins/code/public/actions/repository.ts b/x-pack/legacy/plugins/code/public/actions/repository.ts
deleted file mode 100644
index 05cd51accc6f5d..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/repository.ts
+++ /dev/null
@@ -1,47 +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 { createAction } from 'redux-actions';
-
-import { Repository, RepositoryConfig } from '../../model';
-import { RepoConfigs } from '../../model/workspace';
-
-export interface RepoConfigPayload {
-  repoUri: string;
-  config: RepositoryConfig;
-}
-
-export const fetchRepos = createAction('FETCH REPOS');
-export const fetchReposSuccess = createAction<Repository[]>('FETCH REPOS SUCCESS');
-export const fetchReposFailed = createAction<Error>('FETCH REPOS FAILED');
-
-export const deleteRepo = createAction<string>('DELETE REPOS');
-export const deleteRepoSuccess = createAction<string>('DELETE REPOS SUCCESS');
-export const deleteRepoFinished = createAction<string>('DELETE REPOS FINISHED');
-export const deleteRepoFailed = createAction<Error>('DELETE REPOS FAILED');
-
-export const indexRepo = createAction<string>('INDEX REPOS');
-export const indexRepoSuccess = createAction<string>('INDEX REPOS SUCCESS');
-export const indexRepoFailed = createAction<Error>('INDEX REPOS FAILED');
-
-export const importRepo = createAction<string>('IMPORT REPO');
-export const importRepoSuccess = createAction<Repository>('IMPORT REPO SUCCESS');
-export const importRepoFailed = createAction<Error>('IMPORT REPO FAILED');
-
-export const closeToast = createAction('CLOSE TOAST');
-
-export const fetchRepoConfigs = createAction('FETCH REPO CONFIGS');
-export const fetchRepoConfigSuccess = createAction<RepoConfigs>('FETCH REPO CONFIGS SUCCESS');
-export const fetchRepoConfigFailed = createAction<Error>('FETCH REPO CONFIGS FAILED');
-
-export const initRepoCommand = createAction<string>('INIT REPO CMD');
-
-export const gotoRepo = createAction<string>('GOTO REPO');
-export const gotoRepoFailed = createAction('GOTO REPO FAILED');
-
-export const switchLanguageServer = createAction<RepoConfigPayload>('SWITCH LANGUAGE SERVER');
-export const switchLanguageServerSuccess = createAction('SWITCH LANGUAGE SERVER SUCCESS');
-export const switchLanguageServerFailed = createAction<Error>('SWITCH LANGUAGE SERVER FAILED');
diff --git a/x-pack/legacy/plugins/code/public/actions/route.ts b/x-pack/legacy/plugins/code/public/actions/route.ts
deleted file mode 100644
index 3adcdc6111d174..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/route.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createAction } from 'redux-actions';
-
-export const routePathChange = createAction('ROUTE PATH CHANGE');
-export const repoChange = createAction<string>('REPOSITORY CHANGE');
-export const revisionChange = createAction('REVISION CHANGE');
-export const filePathChange = createAction('FILE PATH CHANGE');
diff --git a/x-pack/legacy/plugins/code/public/actions/search.ts b/x-pack/legacy/plugins/code/public/actions/search.ts
deleted file mode 100644
index 10123be25c2aa9..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/search.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createAction } from 'redux-actions';
-import {
-  DocumentSearchResult,
-  Repository,
-  SearchOptions,
-  SearchScope,
-  RepositorySearchResult,
-} from '../../model';
-
-export interface DocumentSearchPayload {
-  query: string;
-  page?: string;
-  languages?: string;
-  repositories?: string;
-  repoScope?: string;
-}
-
-export interface RepositorySearchPayload {
-  query: string;
-}
-
-// For document search page
-export const documentSearch = createAction<DocumentSearchPayload>('DOCUMENT SEARCH');
-export const documentSearchSuccess = createAction<DocumentSearchResult>('DOCUMENT SEARCH SUCCESS');
-export const documentSearchFailed = createAction<Error>('DOCUMENT SEARCH FAILED');
-
-// For repository search page
-export const repositorySearch = createAction<RepositorySearchPayload>('REPOSITORY SEARCH');
-export const repositorySearchSuccess = createAction<RepositorySearchResult>(
-  'REPOSITORY SEARCH SUCCESS'
-);
-export const repositorySearchFailed = createAction<Error>('REPOSITORY SEARCH FAILED');
-
-export const changeSearchScope = createAction<SearchScope>('CHANGE SEARCH SCOPE');
-
-export const suggestionSearch = createAction<string>('SUGGESTION SEARCH');
-
-// For repository search typeahead
-export const repositorySearchQueryChanged = createAction<RepositorySearchPayload>(
-  'REPOSITORY SEARCH QUERY CHANGED'
-);
-export const repositoryTypeaheadSearchSuccess = createAction<string>('REPOSITORY SEARCH SUCCESS');
-export const repositoryTypeaheadSearchFailed = createAction<string>('REPOSITORY SEARCH FAILED');
-
-export const saveSearchOptions = createAction<SearchOptions>('SAVE SEARCH OPTIONS');
-
-export const turnOnDefaultRepoScope = createAction<Repository>('TURN ON DEFAULT REPO SCOPE');
-export const turnOffDefaultRepoScope = createAction('TURN OFF DEFAULT REPO SCOPE');
-
-export const searchReposForScope = createAction<RepositorySearchPayload>('SEARCH REPOS FOR SCOPE');
-export const searchReposForScopeSuccess = createAction<RepositorySearchResult>(
-  'SEARCH REPOS FOR SCOPE SUCCESS'
-);
-export const searchReposForScopeFailed = createAction<Error>('SEARCH REPOS FOR SCOPE FAILED');
diff --git a/x-pack/legacy/plugins/code/public/actions/shortcuts.ts b/x-pack/legacy/plugins/code/public/actions/shortcuts.ts
deleted file mode 100644
index 14f93b220d466f..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/shortcuts.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createAction } from 'redux-actions';
-import { HotKey } from '../components/shortcuts';
-
-export const registerShortcut = createAction<HotKey>('REGISTER SHORTCUT');
-export const unregisterShortcut = createAction<HotKey>('UNREGISTER SHORTCUT');
-
-export const toggleHelp = createAction<boolean | null>('TOGGLE SHORTCUTS HELP');
diff --git a/x-pack/legacy/plugins/code/public/actions/status.ts b/x-pack/legacy/plugins/code/public/actions/status.ts
deleted file mode 100644
index 354f593f3a6437..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/status.ts
+++ /dev/null
@@ -1,67 +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 { createAction } from 'redux-actions';
-
-import {
-  CloneProgress,
-  CloneWorkerProgress,
-  Repository,
-  RepositoryUri,
-  RepoState,
-  WorkerProgress,
-} from '../../model';
-import { FetchFilePayload } from './file';
-import { StatusReport } from '../../common/repo_file_status';
-
-export interface RepoStatus {
-  uri: string;
-  progress: number;
-  cloneProgress?: CloneProgress;
-  timestamp?: Date;
-  state?: RepoState;
-  errorMessage?: string;
-}
-
-export interface StatusSuccessPayload {
-  [key: string]: {
-    gitStatus: CloneWorkerProgress | null;
-    indexStatus: WorkerProgress | null;
-    deleteStatus: WorkerProgress | null;
-  };
-}
-
-export const loadStatus = createAction<string>('LOAD STATUS');
-export const loadStatusSuccess = createAction<StatusSuccessPayload>('LOAD STATUS SUCCESS');
-export const loadStatusFailed = createAction<Error>('LOAD STATUS FAILED');
-
-export const loadRepo = createAction<string>('LOAD REPO');
-export const loadRepoSuccess = createAction<Repository[]>('LOAD REPO SUCCESS');
-export const loadRepoFailed = createAction<Error>('LOAD REPO FAILED');
-
-export const updateCloneProgress = createAction<RepoStatus>('UPDATE CLONE PROGRESS');
-export const updateIndexProgress = createAction<RepoStatus>('UPDATE INDEX PROGRESS');
-export const updateDeleteProgress = createAction<RepoStatus>('UPDATE DELETE PROGRESS');
-
-export const pollRepoCloneStatusStart = createAction<string>('POLL CLONE STATUS START');
-export const pollRepoIndexStatusStart = createAction<string>('POLL INDEX STATUS START');
-export const pollRepoDeleteStatusStart = createAction<string>('POLL DELETE STATUS START');
-
-export const pollRepoCloneStatusStop = createAction<RepositoryUri>('POLL CLONE STATUS STOP');
-export const pollRepoIndexStatusStop = createAction<RepositoryUri>('POLL INDEX STATUS STOP');
-export const pollRepoDeleteStatusStop = createAction<RepositoryUri>('POLL DELETE STATUS STOP');
-
-export const FetchRepoFileStatus = createAction<FetchFilePayload>('FETCH REPO FILE STATUS');
-export const FetchRepoFileStatusSuccess = createAction<{
-  path: FetchFilePayload;
-  statusReport: StatusReport;
-}>('FETCH REPO FILE STATUS SUCCESS');
-export const FetchRepoFileStatusFailed = createAction<any>('FETCH REPO FILE STATUS FAILED');
-
-export const StatusChanged = createAction<{
-  prevStatus: StatusReport;
-  currentStatus: StatusReport;
-}>('STATUS CHANGED');
diff --git a/x-pack/legacy/plugins/code/public/actions/structure.ts b/x-pack/legacy/plugins/code/public/actions/structure.ts
deleted file mode 100644
index fcf6cb43b5d9db..00000000000000
--- a/x-pack/legacy/plugins/code/public/actions/structure.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 { createAction } from 'redux-actions';
-import { DocumentSymbol } from 'vscode-languageserver-types';
-
-export interface SymbolWithMembers extends DocumentSymbol {
-  members?: SymbolWithMembers[];
-  path?: string;
-}
-
-export interface SymbolsPayload {
-  path: string;
-  data: DocumentSymbol[];
-  structureTree: SymbolWithMembers[];
-}
-
-export const loadStructure = createAction<string>('LOAD STRUCTURE');
-export const loadStructureSuccess = createAction<SymbolsPayload>('LOAD STRUCTURE SUCCESS');
-export const loadStructureFailed = createAction<Error>('LOAD STRUCTURE FAILED');
-
-export const openSymbolPath = createAction<string>('OPEN SYMBOL PATH');
-export const closeSymbolPath = createAction<string>('CLOSE SYMBOL PATH');
diff --git a/x-pack/legacy/plugins/code/public/app.tsx b/x-pack/legacy/plugins/code/public/app.tsx
deleted file mode 100644
index d0e84bd843d92f..00000000000000
--- a/x-pack/legacy/plugins/code/public/app.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { render, unmountComponentAtNode } from 'react-dom';
-import { Provider } from 'react-redux';
-
-import { i18n } from '@kbn/i18n';
-import { I18nProvider } from '@kbn/i18n/react';
-import moment from 'moment';
-import { CoreStart } from 'src/core/public';
-import 'ui/autoload/all';
-import 'ui/autoload/styles';
-import chrome from 'ui/chrome';
-// @ts-ignore
-import { uiModules } from 'ui/modules';
-
-import { APP_TITLE } from '../common/constants';
-import { App } from './components/app';
-import { HelpMenu } from './components/help_menu';
-import { store } from './stores';
-
-export function startApp(coreStart: CoreStart) {
-  // `getInjected` is not currently available in new platform `coreStart.chrome`
-  if (chrome.getInjected('codeUiEnabled')) {
-    // TODO the entire Kibana uses moment, we might need to move it to a more common place
-    moment.locale(i18n.getLocale());
-
-    const app = uiModules.get('apps/code');
-    app.config(($locationProvider: any) => {
-      $locationProvider.html5Mode({
-        enabled: false,
-        requireBase: false,
-        rewriteLinks: false,
-      });
-    });
-    app.config((stateManagementConfigProvider: any) => stateManagementConfigProvider.disable());
-
-    function RootController($scope: any, $element: any, $http: any) {
-      const domNode = $element[0];
-
-      // render react to DOM
-      render(
-        <I18nProvider>
-          <Provider store={store}>
-            <App />
-          </Provider>
-        </I18nProvider>,
-        domNode
-      );
-
-      // unmount react on controller destroy
-      $scope.$on('$destroy', () => {
-        unmountComponentAtNode(domNode);
-      });
-    }
-
-    // `setRootController` is not available now in `coreStart.chrome`
-    chrome.setRootController('code', RootController);
-    coreStart.chrome.setBreadcrumbs([
-      {
-        text: APP_TITLE,
-        href: '#/',
-      },
-    ]);
-
-    coreStart.chrome.setHelpExtension(domNode => {
-      render(<HelpMenu />, domNode);
-      return () => {
-        unmountComponentAtNode(domNode);
-      };
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/common/types.ts b/x-pack/legacy/plugins/code/public/common/types.ts
deleted file mode 100644
index e131c231562c75..00000000000000
--- a/x-pack/legacy/plugins/code/public/common/types.ts
+++ /dev/null
@@ -1,66 +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 { ReactNode } from 'react';
-import { SearchScope } from '../../model';
-
-export enum PathTypes {
-  blob = 'blob',
-  tree = 'tree',
-  blame = 'blame',
-  commits = 'commits',
-}
-
-export const SearchScopeText = {
-  [SearchScope.DEFAULT]: i18n.translate('xpack.code.searchScope.defaultDropDownOptionLabel', {
-    defaultMessage: 'Search Everything',
-  }),
-  [SearchScope.REPOSITORY]: i18n.translate('xpack.code.searchScope.repositoryDropDownOptionLabel', {
-    defaultMessage: 'Search Repositories',
-  }),
-  [SearchScope.SYMBOL]: i18n.translate('xpack.code.searchScope.symbolDropDownOptionLabel', {
-    defaultMessage: 'Search Symbols',
-  }),
-  [SearchScope.FILE]: i18n.translate('xpack.code.searchScope.fileDropDownOptionLabel', {
-    defaultMessage: 'Search Files',
-  }),
-};
-
-export const SearchScopePlaceholderText = {
-  [SearchScope.DEFAULT]: i18n.translate('xpack.code.searchScope.defaultPlaceholder', {
-    defaultMessage: 'Type to find anything',
-  }),
-  [SearchScope.REPOSITORY]: i18n.translate('xpack.code.searchScope.repositoryPlaceholder', {
-    defaultMessage: 'Type to find repositories',
-  }),
-  [SearchScope.SYMBOL]: i18n.translate('xpack.code.searchScope.symbolPlaceholder', {
-    defaultMessage: 'Type to find symbols',
-  }),
-  [SearchScope.FILE]: i18n.translate('xpack.code.searchScope.filePlaceholder', {
-    defaultMessage: 'Type to find files',
-  }),
-};
-
-export interface MainRouteParams {
-  path: string;
-  repo: string;
-  resource: string;
-  org: string;
-  revision: string;
-  pathType: PathTypes;
-  goto?: string;
-}
-
-export interface EuiSideNavItem {
-  id: string;
-  name: string;
-  isSelected?: boolean;
-  renderItem?: () => ReactNode;
-  forceOpen?: boolean;
-  items?: EuiSideNavItem[];
-  onClick: () => void;
-}
diff --git a/x-pack/legacy/plugins/code/public/components/admin_page/admin.tsx b/x-pack/legacy/plugins/code/public/components/admin_page/admin.tsx
deleted file mode 100644
index ca97c7a091c22e..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/admin_page/admin.tsx
+++ /dev/null
@@ -1,170 +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 { parse as parseQuery } from 'querystring';
-import React from 'react';
-import { connect } from 'react-redux';
-import { RouteComponentProps, withRouter } from 'react-router-dom';
-import url from 'url';
-import { EuiTab, EuiTabs } from '@elastic/eui';
-import { Repository, SearchOptions, SearchScope } from '../../../model';
-import { changeSearchScope } from '../../actions';
-import { RootState } from '../../reducers';
-import { SearchBar } from '../search_bar';
-import { EmptyProject } from './empty_project';
-import { LanguageSeverTab } from './language_server_tab';
-import { ProjectTab } from './project_tab';
-import { METRIC_TYPE, trackCodeUiMetric } from '../../services/ui_metric';
-import { CodeUIUsageMetrics } from '../../../model/usage_telemetry_metrics';
-
-enum AdminTabs {
-  projects = '0',
-  languageServers = '1',
-}
-
-interface Props extends RouteComponentProps {
-  searchOptions: SearchOptions;
-  query: string;
-  onSearchScopeChanged: (s: SearchScope) => void;
-  repositories: Repository[];
-  repositoryLoading: boolean;
-}
-
-interface State {
-  tab: AdminTabs;
-}
-
-class AdminPage extends React.PureComponent<Props, State> {
-  public static getDerivedStateFromProps(props: Props) {
-    const getTab = () => {
-      const { search } = props.location;
-      let qs = search;
-      if (search.charAt(0) === '?') {
-        qs = search.substr(1);
-      }
-      return parseQuery(qs).tab || AdminTabs.projects;
-    };
-    return {
-      tab: getTab() as AdminTabs,
-    };
-  }
-
-  public searchBar: any = null;
-
-  public tabs = [
-    {
-      id: AdminTabs.projects,
-      name: i18n.translate('xpack.code.adminPage.repoTabLabel', { defaultMessage: 'Repositories' }),
-      disabled: false,
-    },
-    {
-      id: AdminTabs.languageServers,
-      name: i18n.translate('xpack.code.adminPage.langserverTabLabel', {
-        defaultMessage: 'Language servers',
-      }),
-      disabled: false,
-    },
-  ];
-  constructor(props: Props) {
-    super(props);
-    const getTab = () => {
-      const { search } = props.location;
-      let qs = search;
-      if (search.charAt(0) === '?') {
-        qs = search.substr(1);
-      }
-      return parseQuery(qs).tab || AdminTabs.projects;
-    };
-    this.state = {
-      tab: getTab() as AdminTabs,
-    };
-  }
-
-  componentDidMount() {
-    // track admin page load count
-    trackCodeUiMetric(METRIC_TYPE.LOADED, CodeUIUsageMetrics.ADMIN_PAGE_LOAD_COUNT);
-  }
-
-  public getAdminTabClickHandler = (tab: AdminTabs) => () => {
-    this.setState({ tab });
-    this.props.history.push(url.format({ pathname: '/admin', query: { tab } }));
-  };
-
-  public renderTabs() {
-    const tabs = this.tabs.map(tab => (
-      <EuiTab
-        onClick={this.getAdminTabClickHandler(tab.id)}
-        isSelected={tab.id === this.state.tab}
-        disabled={tab.disabled}
-        key={tab.id}
-      >
-        {tab.name}
-      </EuiTab>
-    ));
-    return <EuiTabs>{tabs}</EuiTabs>;
-  }
-
-  public filterRepos = () => {
-    return this.props.repositories;
-  };
-
-  public renderTabContent = () => {
-    switch (this.state.tab) {
-      case AdminTabs.languageServers: {
-        return <LanguageSeverTab />;
-      }
-      case AdminTabs.projects:
-      default: {
-        const repositoriesCount = this.props.repositories.length;
-        const showEmpty = repositoriesCount === 0 && !this.props.repositoryLoading;
-        if (showEmpty) {
-          return <EmptyProject />;
-        }
-        return <ProjectTab />;
-      }
-    }
-  };
-
-  public render() {
-    return (
-      <main className="codeContainer__root">
-        <div className="codeContainer__rootInner">
-          <div className="codeContainer__adminWrapper">
-            <SearchBar
-              searchOptions={this.props.searchOptions}
-              query={this.props.query}
-              onSearchScopeChanged={this.props.onSearchScopeChanged}
-              enableSubmitWhenOptionsChanged={false}
-              ref={element => (this.searchBar = element)}
-            />
-            <div className="codeContainer__adminMain">
-              {this.renderTabs()}
-              {this.renderTabContent()}
-            </div>
-          </div>
-        </div>
-      </main>
-    );
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  ...state.search,
-  repositories: state.repositoryManagement.repositories,
-  repositoryLoading: state.repositoryManagement.loading,
-});
-
-const mapDispatchToProps = {
-  onSearchScopeChanged: changeSearchScope,
-};
-
-export const Admin = withRouter(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-  )(AdminPage)
-);
diff --git a/x-pack/legacy/plugins/code/public/components/admin_page/empty_project.tsx b/x-pack/legacy/plugins/code/public/components/admin_page/empty_project.tsx
deleted file mode 100644
index f071fd06f84c92..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/admin_page/empty_project.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { get } from 'lodash';
-import React from 'react';
-import { Link } from 'react-router-dom';
-
-import { EuiButton, EuiFlexGroup, EuiSpacer, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { npStart } from 'ui/new_platform';
-
-import { ImportProject } from './import_project';
-
-export const EmptyProject = () => {
-  const isAdmin = get(npStart.core.application.capabilities, 'code.admin') as boolean;
-  return (
-    <div className="codeTab__projects">
-      <EuiSpacer size="xl" />
-      <div className="codeTab__projects--emptyHeader">
-        <EuiText>
-          <h1>
-            <FormattedMessage
-              id="xpack.code.adminPage.repoTab.emptyRepo.noRepositoryText"
-              defaultMessage="You don't have any repos yet"
-            />
-          </h1>
-        </EuiText>
-        <EuiText color="subdued">
-          {isAdmin && (
-            <p>
-              <FormattedMessage
-                id="xpack.code.adminPage.repoTab.emptyRepo.importFirstRepositoryText"
-                defaultMessage="Let's import your first one"
-              />
-            </p>
-          )}
-        </EuiText>
-      </div>
-      {isAdmin && <ImportProject />}
-      <EuiSpacer />
-      <EuiFlexGroup justifyContent="center">
-        <Link to="/setup-guide">
-          <EuiButton>
-            <FormattedMessage
-              id="xpack.code.adminPage.repoTab.emptyRepo.viewSetupGuideButtonLabel"
-              defaultMessage="View the Setup Guide"
-            />
-          </EuiButton>
-        </Link>
-      </EuiFlexGroup>
-    </div>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/admin_page/import_project.tsx b/x-pack/legacy/plugins/code/public/components/admin_page/import_project.tsx
deleted file mode 100644
index 3238d549faab76..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/admin_page/import_project.tsx
+++ /dev/null
@@ -1,134 +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,
-  EuiFieldText,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFormRow,
-  EuiGlobalToastList,
-  EuiSpacer,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import React, { ChangeEvent } from 'react';
-import { connect } from 'react-redux';
-import { closeToast, importRepo } from '../../actions';
-import { RootState } from '../../reducers';
-import { ToastType } from '../../reducers/repository_management';
-import { isImportRepositoryURLInvalid } from '../../utils/url';
-
-class CodeImportProject extends React.PureComponent<
-  {
-    importRepo: (p: string) => void;
-    importLoading: boolean;
-    toastMessage?: string;
-    showToast: boolean;
-    toastType?: ToastType;
-    closeToast: () => void;
-  },
-  { value: string; isInvalid: boolean }
-> {
-  public state = {
-    value: '',
-    isInvalid: false,
-  };
-
-  public onChange = (e: ChangeEvent<HTMLInputElement>) => {
-    this.setState({
-      value: e.target.value,
-      isInvalid: isImportRepositoryURLInvalid(e.target.value),
-    });
-  };
-
-  public submitImportProject = () => {
-    if (!isImportRepositoryURLInvalid(this.state.value)) {
-      this.props.importRepo(this.state.value);
-    } else if (!this.state.isInvalid) {
-      this.setState({ isInvalid: true });
-    }
-  };
-
-  public updateIsInvalid = () => {
-    this.setState({ isInvalid: isImportRepositoryURLInvalid(this.state.value) });
-  };
-
-  public render() {
-    const { importLoading, toastMessage, showToast, toastType } = this.props;
-
-    return (
-      <div className="codeContainer__import">
-        {showToast && (
-          <EuiGlobalToastList
-            toasts={[{ title: '', color: toastType, text: toastMessage, id: toastMessage || '' }]}
-            dismissToast={this.props.closeToast}
-            toastLifeTimeMs={6000}
-          />
-        )}
-        <EuiSpacer />
-        <EuiFlexGroup>
-          <EuiFlexItem>
-            <EuiFormRow
-              label={i18n.translate('xpack.code.adminPage.repoTab.repositoryUrlTitle', {
-                defaultMessage: 'Repository URL',
-              })}
-              helpText="e.g. https://github.com/Microsoft/TypeScript-Node-Starter"
-              fullWidth
-              isInvalid={this.state.isInvalid}
-              error={i18n.translate('xpack.code.adminPage.repoTab.repositoryUrlEmptyText', {
-                defaultMessage: "The URL shouldn't be empty.",
-              })}
-            >
-              <EuiFieldText
-                value={this.state.value}
-                onChange={this.onChange}
-                aria-label="input project url"
-                data-test-subj="importRepositoryUrlInputBox"
-                isLoading={importLoading}
-                fullWidth={true}
-                isInvalid={this.state.isInvalid}
-                autoFocus={true}
-              />
-            </EuiFormRow>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            {/*
-  // @ts-ignore */}
-            <EuiButton
-              className="codeButton__projectImport"
-              onClick={this.submitImportProject}
-              data-test-subj="importRepositoryButton"
-            >
-              <FormattedMessage
-                id="xpack.code.adminPage.repoTab.importButtonLabel"
-                defaultMessage="Import"
-              />
-            </EuiButton>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </div>
-    );
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  importLoading: state.repositoryManagement.importLoading,
-  toastMessage: state.repositoryManagement.toastMessage,
-  toastType: state.repositoryManagement.toastType,
-  showToast: state.repositoryManagement.showToast,
-});
-
-const mapDispatchToProps = {
-  importRepo,
-  closeToast,
-};
-
-export const ImportProject = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CodeImportProject);
diff --git a/x-pack/legacy/plugins/code/public/components/admin_page/language_server_tab.tsx b/x-pack/legacy/plugins/code/public/components/admin_page/language_server_tab.tsx
deleted file mode 100644
index 5c33aa513c8392..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/admin_page/language_server_tab.tsx
+++ /dev/null
@@ -1,303 +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,
-  EuiCodeBlock,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiModal,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiOverlayMask,
-  EuiPanel,
-  EuiSpacer,
-  EuiTabbedContent,
-  EuiText,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
-import { connect } from 'react-redux';
-import { InstallationType } from '../../../common/installation';
-import { LanguageServer, LanguageServerStatus } from '../../../common/language_server';
-import { requestInstallLanguageServer } from '../../actions/language_server';
-import { RootState } from '../../reducers';
-import { JavaIcon, TypeScriptIcon, GoIcon, CtagsIcon } from '../shared/icons';
-
-const LanguageServerLi = (props: {
-  languageServer: LanguageServer;
-  requestInstallLanguageServer: (l: string) => void;
-  loading: boolean;
-}) => {
-  const { status, name } = props.languageServer;
-
-  const languageIcon = () => {
-    if (name === 'TypeScript') {
-      return <TypeScriptIcon />;
-    } else if (name === 'Java') {
-      return <JavaIcon />;
-    } else if (name === 'Go') {
-      return <GoIcon />;
-    } else if (name === 'Ctags') {
-      return <CtagsIcon />;
-    }
-  };
-
-  const onInstallClick = () => props.requestInstallLanguageServer(name);
-  let button = null;
-  let state = null;
-  if (status === LanguageServerStatus.RUNNING) {
-    state = (
-      <EuiText size="xs">
-        <FormattedMessage
-          id="xpack.code.adminPage.langserverTab.runningText"
-          defaultMessage="Running ..."
-        />
-      </EuiText>
-    );
-  } else if (status === LanguageServerStatus.NOT_INSTALLED) {
-    state = (
-      <EuiText size="xs" color={'subdued'}>
-        <FormattedMessage
-          id="xpack.code.adminPage.langserverTab.notInstalledText"
-          defaultMessage="Not Installed"
-        />
-      </EuiText>
-    );
-  } else if (status === LanguageServerStatus.READY) {
-    state = (
-      <EuiText size="xs" color={'subdued'}>
-        <FormattedMessage
-          id="xpack.code.adminPage.langserverTab.installedText"
-          defaultMessage="Installed"
-        />
-      </EuiText>
-    );
-  }
-  if (props.languageServer.installationType === InstallationType.Plugin) {
-    button = (
-      <EuiButton size="s" color="secondary" onClick={onInstallClick}>
-        <FormattedMessage
-          id="xpack.code.adminPage.langserverTab.setupButtonLabel"
-          defaultMessage="Setup"
-        />
-      </EuiButton>
-    );
-  }
-  return (
-    <EuiFlexItem>
-      <EuiPanel>
-        <EuiFlexGroup alignItems="center">
-          <EuiFlexItem>
-            <EuiFlexGroup>
-              <EuiFlexItem grow={false}> {languageIcon()} </EuiFlexItem>
-              <EuiFlexItem>
-                <EuiText>
-                  <strong>{name}</strong>
-                </EuiText>
-                <EuiText size="s">
-                  <h6> {state} </h6>
-                </EuiText>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}> {button} </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiPanel>
-    </EuiFlexItem>
-  );
-};
-
-interface Props {
-  languageServers: LanguageServer[];
-  requestInstallLanguageServer: (ls: string) => void;
-  installLoading: { [ls: string]: boolean };
-}
-interface State {
-  showingInstruction: boolean;
-  name?: string;
-  url?: string;
-  pluginName?: string;
-}
-
-class AdminLanguageSever extends React.PureComponent<Props, State> {
-  constructor(props: Props, context: any) {
-    super(props, context);
-    this.state = { showingInstruction: false };
-  }
-
-  public toggleInstruction = (
-    showingInstruction: boolean,
-    name?: string,
-    url?: string,
-    pluginName?: string
-  ) => {
-    this.setState({ showingInstruction, name, url, pluginName });
-  };
-
-  public render() {
-    const languageServers = this.props.languageServers.map(ls => (
-      <LanguageServerLi
-        languageServer={ls}
-        key={ls.name}
-        requestInstallLanguageServer={() =>
-          this.toggleInstruction(true, ls.name, ls.downloadUrl, ls.pluginName)
-        }
-        loading={this.props.installLoading[ls.name]}
-      />
-    ));
-    return (
-      <div>
-        <EuiSpacer />
-        <EuiText>
-          <h3>
-            <span>
-              <FormattedMessage
-                id="xpack.code.adminPage.langserverTab.languageServersDescription"
-                defaultMessage="{serverCount} {serverCount, plural, one {Language server} other {Language servers}}"
-                values={{ serverCount: this.props.languageServers.length }}
-              />
-            </span>
-          </h3>
-        </EuiText>
-        <EuiSpacer />
-        <EuiFlexGroup direction="column" gutterSize="s">
-          {languageServers}
-        </EuiFlexGroup>
-        <LanguageServerInstruction
-          show={this.state.showingInstruction}
-          name={this.state.name!}
-          pluginName={this.state.pluginName!}
-          url={this.state.url!}
-          close={() => this.toggleInstruction(false)}
-        />
-      </div>
-    );
-  }
-}
-
-const SupportedOS = [
-  { id: 'windows', name: 'Windows' },
-  { id: 'linux', name: 'Linux' },
-  { id: 'darwin', name: 'macOS' },
-];
-
-const LanguageServerInstruction = (props: {
-  name: string;
-  pluginName: string;
-  url: string;
-  show: boolean;
-  close: () => void;
-}) => {
-  const tabs = SupportedOS.map(({ id, name }) => {
-    const url = props.url ? props.url.replace('$OS', id) : '';
-    const installCode = `bin/kibana-plugin install ${url}`;
-    return {
-      id,
-      name,
-      content: (
-        <div>
-          <EuiSpacer />
-          <EuiText grow={false}>
-            <h3>
-              <FormattedMessage
-                id="xpack.code.adminPage.langserverTab.setup.installTitle"
-                defaultMessage="Install"
-              />
-            </h3>
-            <ol>
-              <li>
-                <FormattedMessage
-                  id="xpack.code.adminPage.langserverTab.setup.stopKibanaDescription"
-                  defaultMessage="Stop your kibana Code node."
-                />
-              </li>
-              <li>
-                <FormattedMessage
-                  id="xpack.code.adminPage.langserverTab.setup.useFollowingCommandToInstallDescription"
-                  defaultMessage="Use the following command to install the {name} language server."
-                  values={{ name: props.name }}
-                />
-              </li>
-            </ol>
-            <EuiCodeBlock language="shell">{installCode}</EuiCodeBlock>
-            <h3>
-              <FormattedMessage
-                id="xpack.code.adminPage.langserverTab.setup.uninstallTitle"
-                defaultMessage="Uninstall"
-              />
-            </h3>
-            <ol>
-              <li>
-                <FormattedMessage
-                  id="xpack.code.adminPage.langserverTab.setup.stopKibanaDescription"
-                  defaultMessage="Stop your kibana Code node."
-                />
-              </li>
-              <li>
-                <FormattedMessage
-                  id="xpack.code.adminPage.langserverTab.setup.useFollowingCommandToRemoveDescription"
-                  defaultMessage="Use the following command to remove the {name} language server."
-                  values={{ name: props.name }}
-                />
-              </li>
-            </ol>
-            <EuiCodeBlock language="shell">
-              bin/kibana-plugin remove {props.pluginName}
-            </EuiCodeBlock>
-          </EuiText>
-        </div>
-      ),
-    };
-  });
-
-  return (
-    <React.Fragment>
-      {' '}
-      {props.show && (
-        <EuiOverlayMask>
-          <EuiModal onClose={props.close} maxWidth={false}>
-            <EuiModalHeader>
-              <EuiModalHeaderTitle>
-                <FormattedMessage
-                  id="xpack.code.adminPage.langserverTab.setup.installationInstructionTitle"
-                  defaultMessage="Installation Instructions"
-                />
-              </EuiModalHeaderTitle>
-            </EuiModalHeader>
-            <EuiModalBody>
-              <EuiTabbedContent tabs={tabs} initialSelectedTab={tabs[1]} size={'m'} />
-            </EuiModalBody>
-            <EuiModalFooter>
-              <EuiButton onClick={props.close} fill>
-                <FormattedMessage
-                  id="xpack.code.adminPage.langserverTab.setup.closeButtonLabel"
-                  defaultMessage="Close"
-                />
-              </EuiButton>
-            </EuiModalFooter>
-          </EuiModal>
-        </EuiOverlayMask>
-      )}
-    </React.Fragment>
-  );
-};
-
-const mapStateToProps = (state: RootState) => ({
-  languageServers: state.languageServer.languageServers,
-  installLoading: state.languageServer.installServerLoading,
-});
-
-const mapDispatchToProps = {
-  requestInstallLanguageServer,
-};
-
-export const LanguageSeverTab = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(AdminLanguageSever);
diff --git a/x-pack/legacy/plugins/code/public/components/admin_page/project_item.tsx b/x-pack/legacy/plugins/code/public/components/admin_page/project_item.tsx
deleted file mode 100644
index b3a2c49c08f516..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/admin_page/project_item.tsx
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiLink,
-  EuiPanel,
-  EuiProgress,
-  EuiText,
-  EuiTextColor,
-  EuiToolTip,
-  EuiConfirmModal,
-  EuiOverlayMask,
-  EUI_MODAL_CONFIRM_BUTTON,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import moment from 'moment';
-import React from 'react';
-import { connect } from 'react-redux';
-import { Link } from 'react-router-dom';
-import { i18n } from '@kbn/i18n';
-import { Repository, RepoState, WorkerReservedProgress } from '../../../model';
-import { deleteRepo, indexRepo, initRepoCommand } from '../../actions';
-import { RepoStatus } from '../../actions/status';
-
-const stateColor = {
-  [RepoState.CLONING]: 'secondary',
-  [RepoState.UPDATING]: 'secondary',
-  [RepoState.DELETING]: 'accent',
-  [RepoState.INDEXING]: 'primary',
-};
-
-class CodeProjectItem extends React.PureComponent<
-  {
-    project: Repository;
-    enableManagement: boolean;
-    showStatus: boolean;
-    status?: RepoStatus;
-    deleteRepo?: (uri: string) => void;
-    indexRepo?: (uri: string) => void;
-    initRepoCommand?: (uri: string) => void;
-    openSettings?: (uri: string, url: string) => void;
-  },
-  { showReindexConfirmModal: boolean; showDeleteConfirmModal: boolean }
-> {
-  state = {
-    showDeleteConfirmModal: false,
-    showReindexConfirmModal: false,
-  };
-
-  openReindexModal = () => {
-    this.setState({ showReindexConfirmModal: true });
-  };
-
-  closeReindexModal = () => {
-    this.setState({ showReindexConfirmModal: false });
-  };
-
-  openDeleteModal = () => {
-    this.setState({ showDeleteConfirmModal: true });
-  };
-
-  closeDeleteModal = () => {
-    this.setState({ showDeleteConfirmModal: false });
-  };
-
-  confirmDelete = () => {
-    if (this.props.deleteRepo) {
-      this.props.deleteRepo(this.props.project.uri);
-      this.closeDeleteModal();
-    }
-  };
-
-  confirmReindex = () => {
-    if (this.props.indexRepo) {
-      this.props.indexRepo(this.props.project.uri);
-      this.closeReindexModal();
-    }
-  };
-
-  public render() {
-    const { project, showStatus, status, enableManagement } = this.props;
-    const { name, org, uri, url } = project;
-    const onClickSettings = () => this.props.openSettings && this.props.openSettings(uri, url);
-    let footer = null;
-    let disableRepoLink = false;
-    let hasError = false;
-    if (!status) {
-      footer = (
-        <div className="codeFooter">
-          <FormattedMessage id="xpack.code.repoItem.initText" defaultMessage="INIT..." />
-        </div>
-      );
-    } else if (status.state === RepoState.READY) {
-      footer = (
-        <div className="codeFooter" data-test-subj="repositoryIndexDone">
-          <FormattedMessage
-            id="xpack.code.repoItem.lastUpdatedText"
-            defaultMessage="LAST UPDATED"
-          />
-          :{' '}
-          {moment(status.timestamp)
-            .locale(i18n.getLocale())
-            .fromNow()}
-        </div>
-      );
-    } else if (status.state === RepoState.DELETING) {
-      footer = (
-        <div className="codeFooter">
-          <FormattedMessage id="xpack.code.repoItem.deletingText" defaultMessage="DELETING..." />
-        </div>
-      );
-    } else if (status.state === RepoState.INDEXING) {
-      footer = (
-        <div className="codeFooter" data-test-subj="repositoryIndexOngoing">
-          <FormattedMessage id="xpack.code.repoItem.indexingText" defaultMessage="INDEXING..." />
-        </div>
-      );
-    } else if (status.state === RepoState.CLONING) {
-      footer = (
-        <div className="codeFooter">
-          <FormattedMessage id="xpack.code.repoItem.cloningText" defaultMessage="CLONING..." />
-        </div>
-      );
-    } else if (status.state === RepoState.UPDATING) {
-      footer = (
-        <div className="codeFooter">
-          <FormattedMessage id="xpack.code.repoItem.updatingText" defaultMessage="UPDATING..." />
-        </div>
-      );
-    } else if (status.state === RepoState.DELETE_ERROR) {
-      footer = (
-        <div className="codeFooter codeFooter--error">
-          <FormattedMessage
-            id="xpack.code.repoItem.deleteErrorText"
-            defaultMessage="ERROR DELETE REPO"
-          />
-        </div>
-      );
-      hasError = true;
-    } else if (status.state === RepoState.INDEX_ERROR) {
-      footer = (
-        <div className="codeFooter codeFooter--error">
-          <FormattedMessage
-            id="xpack.code.repoItem.indexErrorText"
-            defaultMessage="ERROR INDEX REPO"
-          />
-        </div>
-      );
-      hasError = true;
-    } else if (status.state === RepoState.CLONE_ERROR) {
-      footer = (
-        <div className="codeFooter codeFooter--error">
-          <FormattedMessage
-            id="xpack.code.repoItem.cloneErrorText"
-            defaultMessage="ERROR CLONING REPO"
-          />
-          &nbsp;
-          <EuiToolTip position="top" content={status.errorMessage}>
-            <EuiIcon type="iInCircle" />
-          </EuiToolTip>
-        </div>
-      );
-      // Disable repo link is clone failed.
-      disableRepoLink = true;
-      hasError = true;
-    }
-
-    const repoTitle = (
-      <EuiText data-test-subj="codeRepositoryItem">
-        <EuiTextColor color="subdued">{org}</EuiTextColor>/<strong>{name}</strong>
-      </EuiText>
-    );
-
-    const settingsShow =
-      status && status.state !== RepoState.CLONING && status.state !== RepoState.DELETING;
-    const settingsVisibility = settingsShow ? 'visible' : 'hidden';
-
-    const indexShow =
-      status &&
-      status.state !== RepoState.CLONING &&
-      status.state !== RepoState.DELETING &&
-      status.state !== RepoState.INDEXING &&
-      status.state !== RepoState.CLONE_ERROR;
-    const indexVisibility = indexShow ? 'visible' : 'hidden';
-
-    const deleteShow = status && status.state !== RepoState.DELETING;
-    const deleteVisibility = deleteShow ? 'visible' : 'hidden';
-
-    const projectManagement = (
-      <EuiFlexItem grow={false}>
-        <EuiFlexGroup gutterSize="none">
-          <EuiFlexItem grow={false} style={{ display: 'none' }}>
-            <div
-              className="codeButton__project"
-              data-test-subj="settingsRepositoryButton"
-              tabIndex={0}
-              onKeyPress={onClickSettings}
-              onClick={onClickSettings}
-              role="button"
-              style={{ visibility: settingsVisibility }}
-            >
-              <EuiIcon type="gear" />
-              <EuiText size="xs" color="subdued">
-                <FormattedMessage
-                  id="xpack.code.repoItem.settingsButtonLabel"
-                  defaultMessage="Settings"
-                />
-              </EuiText>
-            </div>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <div
-              className="codeButton__project"
-              data-test-subj="indexRepositoryButton"
-              tabIndex={0}
-              onKeyPress={this.openReindexModal}
-              onClick={this.openReindexModal}
-              role="button"
-              style={{ visibility: indexVisibility }}
-            >
-              <EuiIcon type="indexSettings" />
-              <EuiText size="xs" color="subdued">
-                <FormattedMessage
-                  id="xpack.code.repoItem.reindexButtonLabel"
-                  defaultMessage="Reindex"
-                />
-              </EuiText>
-            </div>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <div
-              className="codeButton__project"
-              data-test-subj="deleteRepositoryButton"
-              tabIndex={0}
-              onKeyPress={this.openDeleteModal}
-              onClick={this.openDeleteModal}
-              role="button"
-              style={{ visibility: deleteVisibility }}
-            >
-              <EuiIcon type="trash" color="danger" />
-              <EuiText size="xs" color="subdued">
-                <FormattedMessage
-                  id="xpack.code.repoItem.deleteButtonLabel"
-                  defaultMessage="Delete"
-                />
-              </EuiText>
-            </div>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlexItem>
-    );
-
-    const repoStatus = (
-      <EuiText>
-        <h6>
-          <EuiTextColor color="subdued">{footer}</EuiTextColor>
-        </h6>
-      </EuiText>
-    );
-
-    return (
-      <EuiPanel
-        className={hasError ? 'codePanel__project codePanel__project--error' : 'codePanel__project'}
-      >
-        {this.renderProgress()}
-        <EuiFlexGroup alignItems="center" justifyContent="flexStart">
-          <EuiFlexItem grow={3}>
-            {disableRepoLink ? (
-              repoTitle
-            ) : (
-              <Link to={`/${uri}`} data-test-subj={`adminLinkTo${name}`}>
-                {repoTitle}
-              </Link>
-            )}
-            {showStatus ? repoStatus : null}
-          </EuiFlexItem>
-          <EuiFlexItem grow={3}>
-            <EuiText color="subdued" size="s">
-              <EuiLink href={'https://' + uri} target="_blank">
-                {uri}
-              </EuiLink>
-            </EuiText>
-          </EuiFlexItem>
-          {enableManagement && projectManagement}
-        </EuiFlexGroup>
-        {this.state.showDeleteConfirmModal && this.renderDeleteConfirmModal()}
-        {this.state.showReindexConfirmModal && this.renderReindexConfirmModal()}
-      </EuiPanel>
-    );
-  }
-
-  renderReindexConfirmModal = () => {
-    return (
-      <EuiOverlayMask>
-        <EuiConfirmModal
-          title={i18n.translate('xpack.code.repoItem.reindexConfirmTitle', {
-            defaultMessage: 'Reindex this repository?',
-          })}
-          onCancel={this.closeReindexModal}
-          onConfirm={this.confirmReindex}
-          cancelButtonText={i18n.translate('xpack.code.repoItem.cancelButtonText', {
-            defaultMessage: "No, don't do it",
-          })}
-          confirmButtonText={i18n.translate('xpack.code.repoItem.confirmButtonText', {
-            defaultMessage: 'Yes, do it',
-          })}
-          defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
-        />
-      </EuiOverlayMask>
-    );
-  };
-
-  renderDeleteConfirmModal = () => {
-    return (
-      <EuiOverlayMask>
-        <EuiConfirmModal
-          title={i18n.translate('xpack.code.repoItem.deleteConfirmTitle', {
-            defaultMessage: 'Delete this repository?',
-          })}
-          onCancel={this.closeDeleteModal}
-          onConfirm={this.confirmDelete}
-          cancelButtonText={i18n.translate('xpack.code.repoItem.cancelButtonText', {
-            defaultMessage: "No, don't do it",
-          })}
-          confirmButtonText={i18n.translate('xpack.code.repoItem.confirmButtonText', {
-            defaultMessage: 'Yes, do it',
-          })}
-          buttonColor="danger"
-          defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
-        />
-      </EuiOverlayMask>
-    );
-  };
-
-  private renderProgress() {
-    const { status } = this.props;
-    if (
-      status &&
-      (status.state === RepoState.CLONING ||
-        status.state === RepoState.DELETING ||
-        status.state === RepoState.INDEXING)
-    ) {
-      const color = stateColor[status.state] as 'primary' | 'secondary' | 'accent';
-      if (status.progress! === WorkerReservedProgress.COMPLETED) {
-        return null;
-      } else if (status.progress! > WorkerReservedProgress.INIT) {
-        return (
-          <EuiProgress
-            max={100}
-            value={status.progress}
-            size="s"
-            color={color}
-            position="absolute"
-          />
-        );
-      } else {
-        return <EuiProgress size="s" color={color} position="absolute" />;
-      }
-    }
-  }
-}
-
-const mapDispatchToProps = {
-  deleteRepo,
-  indexRepo,
-  initRepoCommand,
-};
-
-export const ProjectItem = connect(
-  null,
-  mapDispatchToProps
-)(CodeProjectItem);
diff --git a/x-pack/legacy/plugins/code/public/components/admin_page/project_settings.tsx b/x-pack/legacy/plugins/code/public/components/admin_page/project_settings.tsx
deleted file mode 100644
index c4f01b09a7afde..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/admin_page/project_settings.tsx
+++ /dev/null
@@ -1,150 +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,
-  EuiModal,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiOverlayMask,
-  EuiSwitch,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
-import React, { ChangeEvent } from 'react';
-import { connect } from 'react-redux';
-import { Link } from 'react-router-dom';
-import { LanguageServer } from '../../../common/language_server';
-import { RepositoryUtils } from '../../../common/repository_utils';
-import { RepositoryConfig } from '../../../model';
-import { RepoConfigPayload, switchLanguageServer } from '../../actions';
-import { RootState } from '../../reducers';
-import { JavaIcon, TypeScriptIcon } from '../shared/icons';
-
-const defaultConfig = {
-  disableGo: true,
-  disableJava: true,
-  disableTypescript: true,
-};
-
-interface StateProps {
-  languageServers: LanguageServer[];
-  config: RepositoryConfig;
-}
-
-interface DispatchProps {
-  switchLanguageServer: (p: RepoConfigPayload) => void;
-}
-
-interface OwnProps {
-  repoUri: string;
-  url: string;
-  onClose: () => void;
-}
-
-interface State {
-  config: RepositoryConfig;
-}
-
-class ProjectSettingsModal extends React.PureComponent<
-  StateProps & DispatchProps & OwnProps,
-  State
-> {
-  public state = {
-    config: this.props.config,
-  };
-
-  public onSwitchChange = (ls: string) => (e: ChangeEvent<HTMLInputElement>) => {
-    const { checked } = e.target;
-    this.setState((prevState: State) => ({
-      config: { ...prevState.config, [`disable${ls}`]: !checked },
-    }));
-  };
-
-  public saveChanges = () => {
-    this.props.switchLanguageServer({
-      repoUri: this.props.repoUri,
-      config: this.state.config,
-    });
-  };
-
-  public render() {
-    const { repoUri, languageServers, onClose } = this.props;
-    const { disableJava, disableTypescript } = this.state.config;
-    const org = RepositoryUtils.orgNameFromUri(repoUri);
-    const repoName = RepositoryUtils.repoNameFromUri(repoUri);
-    const languageServerSwitches = languageServers.map(ls => {
-      const checked = ls.name === 'Java' ? !disableJava : !disableTypescript;
-      return (
-        <div key={ls.name}>
-          <EuiSwitch
-            name={ls.name}
-            label={
-              <span>
-                {ls.name === 'Java' ? (
-                  <div className="codeSettingsPanel__icon">
-                    <JavaIcon />
-                  </div>
-                ) : (
-                  <div className="codeSettingsPanel__icon">
-                    <TypeScriptIcon />
-                  </div>
-                )}
-                {ls.name}
-              </span>
-            }
-            checked={checked}
-            onChange={this.onSwitchChange(ls.name)}
-          />
-        </div>
-      );
-    });
-    return (
-      <EuiOverlayMask>
-        <EuiModal onClose={onClose}>
-          <EuiModalHeader>
-            <EuiModalHeaderTitle>
-              <h3>Project Settings</h3>
-              <EuiText>
-                {org}/{repoName}
-              </EuiText>
-            </EuiModalHeaderTitle>
-          </EuiModalHeader>
-          <EuiModalBody>
-            <EuiTitle size="xxs">
-              <h5>Language Servers</h5>
-            </EuiTitle>
-            {languageServerSwitches}
-          </EuiModalBody>
-          <EuiModalFooter>
-            <EuiButtonEmpty>
-              <Link to="/admin?tab=LanguageServers">Manage Language Servers</Link>
-            </EuiButtonEmpty>
-            <EuiButton onClick={this.saveChanges}>Save Changes</EuiButton>
-          </EuiModalFooter>
-        </EuiModal>
-      </EuiOverlayMask>
-    );
-  }
-}
-
-const mapStateToProps = (state: RootState, ownProps: { repoUri: string }) => ({
-  languageServers: state.languageServer.languageServers,
-  config: state.repositoryManagement.repoLangseverConfigs![ownProps.repoUri] || defaultConfig,
-});
-
-const mapDispatchToProps = {
-  switchLanguageServer,
-};
-
-export const ProjectSettings = connect<StateProps, DispatchProps, OwnProps>(
-  // @ts-ignore
-  mapStateToProps,
-  mapDispatchToProps
-)(ProjectSettingsModal);
diff --git a/x-pack/legacy/plugins/code/public/components/admin_page/project_tab.tsx b/x-pack/legacy/plugins/code/public/components/admin_page/project_tab.tsx
deleted file mode 100644
index 3bca381d741d63..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/admin_page/project_tab.tsx
+++ /dev/null
@@ -1,289 +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,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFormRow,
-  EuiGlobalToastList,
-  EuiSpacer,
-  EuiSuperSelect,
-  EuiText,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import moment from 'moment';
-import { get } from 'lodash';
-import React, { ChangeEvent } from 'react';
-import { connect } from 'react-redux';
-import { npStart } from 'ui/new_platform';
-
-import { Repository } from '../../../model';
-import { closeToast, importRepo, RepoStatus } from '../../actions';
-import { RootState } from '../../reducers';
-import { ToastType } from '../../reducers/repository_management';
-import { isImportRepositoryURLInvalid } from '../../utils/url';
-import { ProjectItem } from './project_item';
-import { ProjectSettings } from './project_settings';
-import { ImportModal } from '../integrations/import_modal';
-
-enum SortOptionsValue {
-  AlphabeticalAsc = 'alphabetical_asc',
-  AlphabeticalDesc = 'alphabetical_desc',
-  UpdatedAsc = 'updated_asc',
-  UpdatedDesc = 'updated_desc',
-  RecentlyAdded = 'recently_added',
-}
-
-const sortFunctionsFactory = (status: { [key: string]: RepoStatus }) => {
-  const sortFunctions: { [k: string]: (a: Repository, b: Repository) => number } = {
-    [SortOptionsValue.AlphabeticalAsc]: (a: Repository, b: Repository) =>
-      a.name!.localeCompare(b.name!),
-    [SortOptionsValue.AlphabeticalDesc]: (a: Repository, b: Repository) =>
-      b.name!.localeCompare(a.name!),
-    [SortOptionsValue.UpdatedAsc]: (a: Repository, b: Repository) =>
-      moment(status[b.uri].timestamp).diff(moment(status[a.uri].timestamp)),
-    [SortOptionsValue.UpdatedDesc]: (a: Repository, b: Repository) =>
-      moment(status[a.uri].timestamp).diff(moment(status[b.uri].timestamp)),
-    [SortOptionsValue.RecentlyAdded]: () => {
-      return -1;
-    },
-  };
-  return sortFunctions;
-};
-
-const sortOptions = [
-  {
-    value: SortOptionsValue.AlphabeticalAsc,
-    inputDisplay: i18n.translate('xpack.code.adminPage.repoTab.sort.aToZDropDownOptionLabel', {
-      defaultMessage: 'A to Z',
-    }),
-  },
-  {
-    value: SortOptionsValue.AlphabeticalDesc,
-    inputDisplay: i18n.translate('xpack.code.adminPage.repoTab.sort.zToADropDownOptionLabel', {
-      defaultMessage: 'Z to A',
-    }),
-  },
-  {
-    value: SortOptionsValue.UpdatedAsc,
-    inputDisplay: i18n.translate(
-      'xpack.code.adminPage.repoTab.sort.updatedAscDropDownOptionLabel',
-      {
-        defaultMessage: 'Last Updated ASC',
-      }
-    ),
-  },
-  {
-    value: SortOptionsValue.UpdatedDesc,
-    inputDisplay: i18n.translate(
-      'xpack.code.adminPage.repoTab.sort.updatedDescDropDownOptionLabel',
-      {
-        defaultMessage: 'Last Updated DESC',
-      }
-    ),
-  },
-  // { value: SortOptionsValue.recently_added, inputDisplay: 'Recently Added' },
-];
-
-interface Props {
-  projects: Repository[];
-  status: { [key: string]: RepoStatus };
-  importRepo: (repoUrl: string) => void;
-  importLoading: boolean;
-  toastMessage?: string;
-  showToast: boolean;
-  toastType?: ToastType;
-  closeToast: () => void;
-}
-interface State {
-  showImportProjectModal: boolean;
-  importLoading: boolean;
-  settingModal: { url?: string; uri?: string; show: boolean };
-  repoURL: string;
-  isInvalid: boolean;
-  sortOption: SortOptionsValue;
-}
-
-class CodeProjectTab extends React.PureComponent<Props, State> {
-  public static getDerivedStateFromProps(props: Readonly<Props>, state: State) {
-    if (state.importLoading && !props.importLoading) {
-      return { showImportProjectModal: false, importLoading: props.importLoading, repoURL: '' };
-    }
-    return { importLoading: props.importLoading };
-  }
-
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      importLoading: false,
-      showImportProjectModal: false,
-      settingModal: { show: false },
-      repoURL: '',
-      sortOption: SortOptionsValue.AlphabeticalAsc,
-      isInvalid: false,
-    };
-  }
-
-  public closeModal = () => {
-    this.setState({ showImportProjectModal: false, repoURL: '', isInvalid: false });
-  };
-
-  public openModal = () => {
-    this.setState({ showImportProjectModal: true });
-  };
-
-  public openSettingModal = (uri: string, url: string) => {
-    this.setState({ settingModal: { uri, url, show: true } });
-  };
-
-  public closeSettingModal = () => {
-    this.setState({ settingModal: { show: false } });
-  };
-
-  public onChange = (e: ChangeEvent<HTMLInputElement>) => {
-    this.setState({
-      repoURL: e.target.value,
-      isInvalid: isImportRepositoryURLInvalid(e.target.value),
-    });
-  };
-
-  public submitImportProject = () => {
-    if (!isImportRepositoryURLInvalid(this.state.repoURL)) {
-      this.props.importRepo(this.state.repoURL);
-    } else if (!this.state.isInvalid) {
-      this.setState({ isInvalid: true });
-    }
-  };
-
-  public renderImportModal = () => {
-    const { isInvalid, repoURL, showImportProjectModal } = this.state;
-
-    if (showImportProjectModal) {
-      return (
-        <ImportModal
-          isInvalid={isInvalid}
-          isLoading={this.props.importLoading}
-          onChange={this.onChange}
-          onClose={this.closeModal}
-          onSubmit={this.submitImportProject}
-          value={repoURL}
-        />
-      );
-    }
-  };
-
-  public setSortOption = (value: string) => {
-    this.setState({ sortOption: value as SortOptionsValue });
-  };
-
-  public render() {
-    const { projects, status, toastMessage, showToast, toastType } = this.props;
-    const projectsCount = projects.length;
-    const sortedProjects = projects.sort(sortFunctionsFactory(status)[this.state.sortOption]);
-
-    const repoList = sortedProjects.map((repo: Repository) => (
-      <ProjectItem
-        openSettings={this.openSettingModal}
-        key={repo.uri}
-        project={repo}
-        showStatus={true}
-        status={status[repo.uri]}
-        enableManagement={get(npStart.core.application.capabilities, 'code.admin') as boolean}
-      />
-    ));
-
-    let settings = null;
-    if (this.state.settingModal.show) {
-      settings = (
-        <ProjectSettings
-          onClose={this.closeSettingModal}
-          repoUri={this.state.settingModal.uri}
-          url={this.state.settingModal.url}
-        />
-      );
-    }
-
-    return (
-      <div className="code-sidebar" data-test-subj="codeRepositoryList">
-        {showToast && (
-          <EuiGlobalToastList
-            toasts={[{ title: '', color: toastType, text: toastMessage, id: toastMessage || '' }]}
-            dismissToast={this.props.closeToast}
-            toastLifeTimeMs={6000}
-          />
-        )}
-        <EuiSpacer />
-        <EuiFlexGroup>
-          <EuiFlexItem>
-            <EuiFormRow
-              label={i18n.translate('xpack.code.adminPage.repoTab.sort.sortByFormLabel', {
-                defaultMessage: 'Sort By',
-              })}
-            >
-              <EuiSuperSelect
-                options={sortOptions}
-                valueOfSelected={this.state.sortOption}
-                onChange={this.setSortOption}
-              />
-            </EuiFormRow>
-          </EuiFlexItem>
-          <EuiFlexItem grow />
-          <EuiFlexItem grow />
-          <EuiFlexItem>
-            {(get(npStart.core.application.capabilities, 'code.admin') as boolean) && (
-              // @ts-ignore
-              <EuiButton
-                className="codeButton__projectImport"
-                onClick={this.openModal}
-                data-test-subj="newProjectButton"
-              >
-                <FormattedMessage
-                  id="xpack.code.adminPage.repoTab.importRepoButtonLabel"
-                  defaultMessage="Import a new repo"
-                />
-              </EuiButton>
-            )}
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiSpacer />
-        <EuiText>
-          <h3>
-            <FormattedMessage
-              id="xpack.code.adminPage.repoTab.repoDescription"
-              defaultMessage="{projectsCount} {projectsCount, plural, one {Repo} other {Repos}}"
-              values={{ projectsCount }}
-            />
-          </h3>
-        </EuiText>
-        <EuiSpacer />
-        {repoList}
-        {this.renderImportModal()}
-        {settings}
-      </div>
-    );
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  projects: state.repositoryManagement.repositories,
-  status: state.status.status,
-  importLoading: state.repositoryManagement.importLoading,
-  toastMessage: state.repositoryManagement.toastMessage,
-  toastType: state.repositoryManagement.toastType,
-  showToast: state.repositoryManagement.showToast,
-});
-
-const mapDispatchToProps = {
-  importRepo,
-  closeToast,
-};
-
-export const ProjectTab = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CodeProjectTab);
diff --git a/x-pack/legacy/plugins/code/public/components/admin_page/setup_guide.tsx b/x-pack/legacy/plugins/code/public/components/admin_page/setup_guide.tsx
deleted file mode 100644
index 29d2cdad9a4664..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/admin_page/setup_guide.tsx
+++ /dev/null
@@ -1,274 +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,
-  EuiCallOut,
-  EuiGlobalToastList,
-  EuiPanel,
-  EuiSpacer,
-  EuiSteps,
-  EuiText,
-  EuiTitle,
-  EuiLink,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
-import { connect } from 'react-redux';
-import { Link } from 'react-router-dom';
-import { documentationLinks } from '../../lib/documentation_links';
-import { RootState } from '../../reducers';
-
-const steps = [
-  {
-    title: i18n.translate('xpack.code.adminPage.setupGuide.checkMultiInstanceTitle', {
-      defaultMessage: 'Check if multiple Kibana instances are used as a clusterURL',
-    }),
-    children: (
-      <EuiText>
-        <p>
-          <FormattedMessage
-            id="xpack.code.adminPage.setupGuide.checkMultiInstanceDescription1"
-            defaultMessage="If you are using single Kibana instance, you can skip this step."
-          />
-        </p>
-
-        <p>
-          <FormattedMessage
-            id="xpack.code.adminPage.setupGuide.checkMultiInstanceDescription2"
-            defaultMessage="If you are using multiple Kibana instances, you need to assign one Kibana instance as `Code node`.
-                  To do this, add the following line of code into your kibana.yml file of every
-                  Kibana instance and restart the instances:"
-          />
-        </p>
-        <pre>
-          <code>xpack.code.codeNodeUrl: 'http://$YourCodeNodeAddress'</code>
-        </pre>
-        <p>
-          <FormattedMessage
-            id="xpack.code.adminPage.setupGuide.checkMultiInstanceDescription3"
-            defaultMessage="Where `$YourCodeNoteAddress` is the URL of your assigned Code node accessible by other Kibana instances."
-          />
-        </p>
-      </EuiText>
-    ),
-  },
-  {
-    title: i18n.translate('xpack.code.adminPage.setupGuide.installExtraLangSupportTitle', {
-      defaultMessage: 'Install extra language support optionally',
-    }),
-    children: (
-      <EuiText>
-        <p>
-          <FormattedMessage
-            id="xpack.code.adminPage.setupGuide.installExtraLangSupportDescription1"
-            defaultMessage="Look {link} to learn more about supported languages and language server installation."
-            values={{
-              link: (
-                <EuiLink href={documentationLinks.codeInstallLangServer} target="_blank">
-                  <FormattedMessage
-                    id="xpack.code.adminPage.setupGuide.installExtraLangSupportHereLinkText"
-                    defaultMessage="here"
-                  />
-                </EuiLink>
-              ),
-            }}
-          />
-        </p>
-        <p>
-          <FormattedMessage
-            id="xpack.code.adminPage.setupGuide.installExtraLangSupportDescription2"
-            defaultMessage="If you need Java language support, you can manage language server installation {link}."
-            values={{
-              link: (
-                <Link to="/admin?tab=LanguageServers">
-                  <FormattedMessage
-                    id="xpack.code.adminPage.setupGuide.installExtraLangSupportHereLinkText"
-                    defaultMessage="here"
-                  />
-                </Link>
-              ),
-            }}
-          />
-        </p>
-      </EuiText>
-    ),
-  },
-  {
-    title: i18n.translate('xpack.code.adminPage.setupGuide.addRepositoryTitle', {
-      defaultMessage: 'Add a repository to Code',
-    }),
-    children: (
-      <EuiText>
-        <p>
-          <FormattedMessage
-            id="xpack.code.adminPage.setupGuide.addRepositoryDescription"
-            defaultMessage="Import {sampleRepoLink} or {ownRepoLink}. It is as easy as copy and paste git clone URLs to Code."
-            values={{
-              sampleRepoLink: (
-                <EuiLink href={documentationLinks.codeGettingStarted} target="_blank">
-                  <FormattedMessage
-                    id="xpack.code.adminPage.setupGuide.addRepositorySampleRepoLinkText"
-                    defaultMessage="a sample repo"
-                  />
-                </EuiLink>
-              ),
-              ownRepoLink: (
-                <EuiLink href={documentationLinks.codeRepoManagement} target="_blank">
-                  <FormattedMessage
-                    id="xpack.code.adminPage.setupGuide.addRepositoryOwnRepoLinkText"
-                    defaultMessage="your own repo"
-                  />
-                </EuiLink>
-              ),
-            }}
-          />
-        </p>
-      </EuiText>
-    ),
-  },
-  {
-    title: i18n.translate('xpack.code.adminPage.setupGuide.verifyImportTitle', {
-      defaultMessage: 'Verify the repo is successfully imported',
-    }),
-    children: (
-      <EuiText>
-        <p>
-          <FormattedMessage
-            id="xpack.code.adminPage.setupGuide.verifyImportDescription"
-            defaultMessage="You can verify your repo is successfully imported by {searchingLink} and {navigatingLink} the repo. If language support is available to the repo, make sure {semanticNavigationLink} is available as well."
-            values={{
-              searchingLink: (
-                <EuiLink href={documentationLinks.codeSearch} target="_blank">
-                  <FormattedMessage
-                    id="xpack.code.adminPage.setupGuide.verifyImportSearchingLinkText"
-                    defaultMessage="searching"
-                  />
-                </EuiLink>
-              ),
-              navigatingLink: (
-                <EuiLink href={documentationLinks.codeOtherFeatures} target="_blank">
-                  <FormattedMessage
-                    id="xpack.code.adminPage.setupGuide.verifyImportNavigatingLinkText"
-                    defaultMessage="navigating"
-                  />
-                </EuiLink>
-              ),
-              semanticNavigationLink: (
-                <EuiLink href={documentationLinks.semanticNavigation} target="_blank">
-                  <FormattedMessage
-                    id="xpack.code.adminPage.setupGuide.verifyImportSemanticNavigatingLinkText"
-                    defaultMessage="semantic navigation"
-                  />
-                </EuiLink>
-              ),
-            }}
-          />
-        </p>
-      </EuiText>
-    ),
-  },
-];
-
-const toastMessage = (
-  <div>
-    <p>
-      <FormattedMessage
-        id="xpack.code.adminPage.setupGuide.permissionChangesDescription"
-        defaultMessage="We’ve made some changes to roles and permissions in Kibana. Read more about how these changes affect your Code implementation below."
-      />
-    </p>
-    <EuiButton size="s" href={documentationLinks.kibanaRoleManagement}>
-      <FormattedMessage
-        id="xpack.code.adminPage.setupGuide.learnMoreButtonLabel"
-        defaultMessage="Learn more"
-      />
-    </EuiButton>
-  </div>
-);
-
-class SetupGuidePage extends React.PureComponent<{ setupOk?: boolean }, { hideToast: boolean }> {
-  constructor(props: { setupOk?: boolean }) {
-    super(props);
-
-    this.state = {
-      hideToast: false,
-    };
-  }
-
-  public render() {
-    let setup = null;
-    if (this.props.setupOk !== undefined) {
-      setup = (
-        <div>
-          {!this.state.hideToast && (
-            <EuiGlobalToastList
-              toasts={[
-                {
-                  title: i18n.translate('xpack.code.adminPage.setupGuide.permissionChangesTitle', {
-                    defaultMessage: 'Permission Changes',
-                  }),
-                  color: 'primary',
-                  iconType: 'iInCircle',
-                  text: toastMessage,
-                  id: '',
-                },
-              ]}
-              dismissToast={() => {
-                this.setState({ hideToast: true });
-              }}
-              toastLifeTimeMs={10000}
-            />
-          )}
-          <React.Fragment>
-            {this.props.setupOk === false && (
-              <EuiCallOut title="Code instance not found." color="danger" iconType="cross">
-                <p>
-                  Please follow the guide below to configure your Kibana instance. Once configured,
-                  refresh this page.
-                </p>
-              </EuiCallOut>
-            )}
-            {this.props.setupOk === true && (
-              <React.Fragment>
-                <EuiSpacer size="s" />
-                <Link to="/admin">
-                  <EuiButton iconType="sortLeft">
-                    <FormattedMessage
-                      id="xpack.code.adminPage.setupGuide.backToDashboardButtonLabel"
-                      defaultMessage="Back To repository dashboard"
-                    />
-                  </EuiButton>
-                </Link>
-                <EuiSpacer size="s" />
-              </React.Fragment>
-            )}
-            <EuiPanel>
-              <EuiTitle>
-                <h3>
-                  <FormattedMessage
-                    id="xpack.code.adminPage.setupGuide.getStartedTitle"
-                    defaultMessage="Getting started in Elastic Code"
-                  />
-                </h3>
-              </EuiTitle>
-              <EuiSpacer />
-              <EuiSteps steps={steps} />
-            </EuiPanel>
-          </React.Fragment>
-        </div>
-      );
-    }
-    return <div className="codeContainer__setup">{setup}</div>;
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  setupOk: state.setup.ok,
-});
-
-export const SetupGuide = connect(mapStateToProps)(SetupGuidePage);
diff --git a/x-pack/legacy/plugins/code/public/components/app.tsx b/x-pack/legacy/plugins/code/public/components/app.tsx
deleted file mode 100644
index e87e9dd88e6a46..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/app.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { HashRouter as Router, Redirect, Switch } from 'react-router-dom';
-
-import chrome from 'ui/chrome';
-import { connect } from 'react-redux';
-import { RootState } from '../reducers';
-import { Admin } from './admin_page/admin';
-import { SetupGuide } from './admin_page/setup_guide';
-import { Diff } from './diff_page/diff';
-import { Main } from './main/main';
-import { NotFound } from './main/not_found';
-import { Route } from './route';
-import * as ROUTES from './routes';
-import { Search } from './search_page/search';
-import { Integrations } from './integrations';
-
-const RooComponent = (props: { setupOk?: boolean }) => {
-  if (props.setupOk) {
-    return <Redirect to={'/admin'} />;
-  }
-  return <SetupGuide />;
-};
-
-const mapStateToProps = (state: RootState) => ({
-  setupOk: state.setup.ok,
-});
-
-const Root = connect(mapStateToProps)(RooComponent);
-
-const Empty = () => null;
-
-const integrationsEnabled = chrome.getInjected('codeIntegrationsEnabled');
-
-export const App = () => {
-  return (
-    <Router>
-      <Switch>
-        <Route path={ROUTES.DIFF} exact={true} component={Diff} />
-        <Route path={ROUTES.ROOT} exact={true} component={Root} />
-        <Route path={ROUTES.MAIN} component={Main} exact={true} />
-        <Route path={ROUTES.MAIN_ROOT} component={Main} />
-        <Route path={ROUTES.ADMIN} component={Admin} />
-        <Route path={ROUTES.SEARCH} component={Search} />
-        <Route path={ROUTES.REPO} render={Empty} exact={true} />
-        <Route path={ROUTES.SETUP} component={SetupGuide} exact={true} />
-        {integrationsEnabled && (
-          <Route path={ROUTES.INTEGRATIONS} component={Integrations} exact={true} />
-        )}
-        <Route path="*" component={NotFound} />
-      </Switch>
-    </Router>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/code_block/code_block.tsx b/x-pack/legacy/plugins/code/public/components/code_block/code_block.tsx
deleted file mode 100644
index 394d2dfb97b0ec..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/code_block/code_block.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { editor, IRange } from 'monaco-editor';
-import React, { createRef } from 'react';
-
-import { ResizeChecker } from '../shared/resize_checker';
-import { monaco } from '../../monaco/monaco';
-import { registerEditor } from '../../monaco/single_selection_helper';
-
-export interface Position {
-  lineNumber: string;
-  column: number;
-}
-
-export interface Props {
-  lines: string[];
-  language: string;
-  /**
-   * Returns whether to highlight the given line.
-   * @param lineIndex The index of the line (0-based)
-   */
-  highlightLine: (lineIndex: number) => boolean;
-  highlightRanges: IRange[];
-  onClick: (event: Position) => void;
-  folding: boolean;
-  /**
-   * Returns the line number to display for a given line.
-   * @param lineIndex The index of the line (0-based)
-   */
-  lineNumber: (lineIndex: number) => string;
-}
-
-export class CodeBlock extends React.PureComponent<Props> {
-  static defaultProps = {
-    folding: false,
-    highlightLine: () => {},
-    highlightRanges: [],
-    language: 'text',
-    lineNumber: String,
-    onClick: () => {},
-  };
-
-  private el = createRef<HTMLDivElement>();
-  private ed?: editor.IStandaloneCodeEditor;
-  private resizeChecker?: ResizeChecker;
-  private currentDecorations: string[] = [];
-
-  public async componentDidMount() {
-    const { language, onClick } = this.props;
-
-    if (this.el.current) {
-      await this.tryLoadFile(this.text, language);
-      this.ed!.onMouseDown((e: editor.IEditorMouseEvent) => {
-        if (
-          onClick &&
-          (e.target.type === monaco.editor.MouseTargetType.GUTTER_LINE_NUMBERS ||
-            e.target.type === monaco.editor.MouseTargetType.CONTENT_TEXT)
-        ) {
-          const position = e.target.position || { lineNumber: 0, column: 0 };
-          const lineNumber = this.lineNumber(position.lineNumber);
-
-          onClick({
-            lineNumber,
-            column: position.column,
-          });
-        }
-      });
-      registerEditor(this.ed!);
-
-      this.setDecorations();
-
-      this.resizeChecker = new ResizeChecker(this.el.current!);
-      this.resizeChecker.on('resize', () => {
-        setTimeout(() => {
-          this.ed!.layout();
-        });
-      });
-    }
-  }
-
-  private async tryLoadFile(text: string, language: string) {
-    try {
-      await monaco.editor.colorize(text, language, {});
-      this.loadFile(text, language);
-    } catch (e) {
-      this.loadFile(text);
-    }
-  }
-
-  private loadFile(text: string, language: string = 'text') {
-    this.ed = monaco.editor.create(this.el.current!, {
-      value: text,
-      language,
-      lineNumbers: this.lineNumber,
-      readOnly: true,
-      folding: this.props.folding,
-      minimap: {
-        enabled: false,
-      },
-      scrollbar: {
-        vertical: 'hidden',
-        handleMouseWheel: false,
-        verticalScrollbarSize: 0,
-      },
-      hover: {
-        enabled: false, // disable default hover;
-      },
-      contextmenu: false,
-      selectOnLineNumbers: false,
-      selectionHighlight: false,
-      renderLineHighlight: 'none',
-      renderIndentGuides: false,
-      automaticLayout: false,
-    });
-  }
-
-  public componentDidUpdate(prevProps: Readonly<Props>) {
-    const { highlightRanges } = this.props;
-    const prevText = prevProps.lines.join('\n');
-
-    if (prevText !== this.text || prevProps.highlightRanges !== highlightRanges) {
-      if (this.ed) {
-        const model = this.ed.getModel();
-        if (model) {
-          model.setValue(this.text);
-          this.setDecorations();
-        }
-      }
-    }
-  }
-
-  public componentWillUnmount(): void {
-    if (this.ed) {
-      this.ed.dispose();
-    }
-  }
-
-  public render() {
-    const height = this.props.lines.length * 18;
-
-    return <div ref={this.el} className="codeContainer__monaco" style={{ height }} />;
-  }
-
-  private lineNumber = (lineIndex: number) => this.props.lineNumber(lineIndex - 1);
-
-  private get text(): string {
-    return this.props.lines.join('\n');
-  }
-
-  private setDecorations() {
-    const decorations = this.decorations;
-    if (decorations.length) {
-      this.currentDecorations = this.ed!.deltaDecorations(this.currentDecorations, decorations);
-    }
-  }
-
-  private get decorations(): editor.IModelDeltaDecoration[] {
-    const { lines, highlightRanges, highlightLine } = this.props;
-
-    const rangeHighlights = highlightRanges.map(range => ({
-      range,
-      options: {
-        inlineClassName: 'codeSearch__highlight',
-      },
-    }));
-
-    const lineHighlights = lines
-      .map((line, lineIndex) => ({
-        range: new monaco.Range(lineIndex + 1, 0, lineIndex + 1, 0),
-        options: {
-          isWholeLine: true,
-          className: 'codeBlock__line--highlighted',
-          linesDecorationsClassName: 'codeBlock__line--highlighted',
-        },
-      }))
-      .filter((decorations, lineIndex) => highlightLine(lineIndex));
-
-    return [...rangeHighlights, ...lineHighlights];
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/code_block/code_block_panel.tsx b/x-pack/legacy/plugins/code/public/components/code_block/code_block_panel.tsx
deleted file mode 100644
index e8360c8f1998db..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/code_block/code_block_panel.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { ReactNode } from 'react';
-import { EuiPanel } from '@elastic/eui';
-
-import { CodeBlock, Props as CodeBlockProps } from './code_block';
-
-export interface Props extends CodeBlockProps {
-  className?: string;
-  header?: ReactNode;
-}
-
-export const CodeBlockPanel = ({ className, header, ...rest }: Props) => (
-  <EuiPanel paddingSize="s" className={className}>
-    {header}
-    <CodeBlock {...rest} />
-  </EuiPanel>
-);
-
-CodeBlockPanel.defaultProps = CodeBlock.defaultProps;
diff --git a/x-pack/legacy/plugins/code/public/components/code_block/index.ts b/x-pack/legacy/plugins/code/public/components/code_block/index.ts
deleted file mode 100644
index f0a67df7fd5464..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/code_block/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { CodeBlock, Position, Props as CodeBlockProps } from './code_block';
-export { CodeBlockPanel, Props as CodeBlockPanelProps } from './code_block_panel';
diff --git a/x-pack/legacy/plugins/code/public/components/commits/__snapshots__/commit.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/commits/__snapshots__/commit.test.tsx.snap
deleted file mode 100644
index fc4db9ed95bf1e..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/commits/__snapshots__/commit.test.tsx.snap
+++ /dev/null
@@ -1,235 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Commit component renders correctly for a commit 1`] = `
-<Commit
-  commit={
-    Object {
-      "author": "author",
-      "committer": "committer",
-      "id": "4ba67b8",
-      "message": "This is my commit message
-
-This is the description",
-      "parents": Array [
-        "9817575",
-      ],
-      "treeId": "96440ceb55e04a99d33c1c8ee021400a680fbf74",
-      "updated": 2222-11-11T00:00:00.000Z,
-    }
-  }
-  date="11/11/2222"
-  repoUri="github.com/elastic/code"
-  showRepoLink={false}
->
-  <EuiPanel
-    className="code-timeline__commit--root"
-  >
-    <div
-      className="euiPanel euiPanel--paddingMedium code-timeline__commit--root"
-    >
-      <EuiFlexGroup
-        alignItems="center"
-        gutterSize="none"
-        justifyContent="spaceBetween"
-      >
-        <div
-          className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            className="eui-textTruncate"
-          >
-            <EuiTitle
-              className="eui-textTruncate"
-              size="xxs"
-            >
-              <h4
-                className="euiTitle euiTitle--xxsmall eui-textTruncate"
-              >
-                This is my commit message
-              </h4>
-            </EuiTitle>
-            <EuiText
-              className="commit__metadata"
-              size="xs"
-            >
-              <div
-                className="euiText euiText--extraSmall commit__metadata"
-              >
-                <EuiTextColor
-                  color="subdued"
-                >
-                  <span
-                    className="euiTextColor euiTextColor--subdued"
-                  >
-                    <FormattedMessage
-                      defaultMessage="Committed on {date} by {committer}"
-                      id="xpack.code.commits.committedDescription"
-                      values={
-                        Object {
-                          "committer": "committer",
-                          "date": "11/11/2222",
-                        }
-                      }
-                    >
-                      <span>
-                        Committed on 11/11/2222 by committer
-                      </span>
-                    </FormattedMessage>
-                  </span>
-                </EuiTextColor>
-              </div>
-            </EuiText>
-            <EuiText
-              size="s"
-            >
-              <div
-                className="euiText euiText--small"
-              >
-                <p
-                  className="eui-textTruncate"
-                >
-                  This is the description
-                </p>
-              </div>
-            </EuiText>
-          </div>
-          <CommitActions
-            commitId="4ba67b8"
-            repoUri="github.com/elastic/code"
-          >
-            <div
-              className="commit__actions"
-            >
-              <EuiCopy
-                afterMessage="Copied"
-                textToCopy="4ba67b8"
-              >
-                <EuiToolTip
-                  delay="regular"
-                  onMouseOut={[Function]}
-                  position="top"
-                >
-                  <span
-                    className="euiToolTipAnchor"
-                    onMouseOut={[Function]}
-                    onMouseOver={[Function]}
-                  >
-                    <EuiButtonIcon
-                      aria-label="Copy the full commit ID"
-                      iconType="copyClipboard"
-                      onBlur={[Function]}
-                      onClick={[Function]}
-                      onFocus={[Function]}
-                    >
-                      <button
-                        aria-label="Copy the full commit ID"
-                        className="euiButtonIcon euiButtonIcon--primary"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        type="button"
-                      >
-                        <EuiIcon
-                          aria-hidden="true"
-                          className="euiButtonIcon__icon"
-                          size="m"
-                          type="copyClipboard"
-                        >
-                          <EuiIconEmpty
-                            aria-hidden="true"
-                            className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-                            focusable="false"
-                            style={null}
-                          >
-                            <svg
-                              aria-hidden="true"
-                              className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-                              focusable="false"
-                              height={16}
-                              style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </EuiIconEmpty>
-                        </EuiIcon>
-                      </button>
-                    </EuiButtonIcon>
-                  </span>
-                </EuiToolTip>
-              </EuiCopy>
-              <EuiButtonEmpty
-                aria-label="View the project at this commit"
-                className="commit__diff-link"
-                href="#/github.com/elastic/code/tree/4ba67b8"
-              >
-                <a
-                  aria-label="View the project at this commit"
-                  className="euiButtonEmpty euiButtonEmpty--primary commit__diff-link"
-                  href="#/github.com/elastic/code/tree/4ba67b8"
-                  rel="noreferrer"
-                >
-                  <span
-                    className="euiButtonEmpty__content"
-                  >
-                    <span
-                      className="euiButtonEmpty__text"
-                    >
-                      <EuiText
-                        size="s"
-                      >
-                        <div
-                          className="euiText euiText--small"
-                        >
-                          4ba67b8
-                        </div>
-                      </EuiText>
-                    </span>
-                  </span>
-                </a>
-              </EuiButtonEmpty>
-              <EuiButtonIcon
-                aria-label="View the project at this commit"
-                href="#/github.com/elastic/code/tree/4ba67b8"
-                iconType="editorCodeBlock"
-              >
-                <a
-                  aria-label="View the project at this commit"
-                  className="euiButtonIcon euiButtonIcon--primary"
-                  href="#/github.com/elastic/code/tree/4ba67b8"
-                  rel="noreferrer"
-                >
-                  <EuiIcon
-                    aria-hidden="true"
-                    className="euiButtonIcon__icon"
-                    size="m"
-                    type="editorCodeBlock"
-                  >
-                    <EuiIconEmpty
-                      aria-hidden="true"
-                      className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-                      focusable="false"
-                      style={null}
-                    >
-                      <svg
-                        aria-hidden="true"
-                        className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-                        focusable="false"
-                        height={16}
-                        style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
-                    </EuiIconEmpty>
-                  </EuiIcon>
-                </a>
-              </EuiButtonIcon>
-            </div>
-          </CommitActions>
-        </div>
-      </EuiFlexGroup>
-    </div>
-  </EuiPanel>
-</Commit>
-`;
diff --git a/x-pack/legacy/plugins/code/public/components/commits/commit.test.tsx b/x-pack/legacy/plugins/code/public/components/commits/commit.test.tsx
deleted file mode 100644
index 1c87f7cc72235c..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/commits/commit.test.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-
-import { Commit } from './commit';
-import { CommitInfo } from '../../../model/commit';
-
-describe('Commit component', () => {
-  test('renders correctly for a commit', () => {
-    const commitInfo: CommitInfo = {
-      updated: new Date(Date.UTC(2222, 10, 11)),
-      message: 'This is my commit message\n\nThis is the description',
-      author: 'author',
-      committer: 'committer',
-      id: '4ba67b8',
-      parents: ['9817575'],
-      treeId: '96440ceb55e04a99d33c1c8ee021400a680fbf74',
-    };
-    const wrapper = mount(
-      <Commit
-        showRepoLink={false}
-        commit={commitInfo}
-        date="11/11/2222"
-        repoUri="github.com/elastic/code"
-      />
-    );
-
-    expect(toJson(wrapper)).toMatchSnapshot();
-  });
-});
diff --git a/x-pack/legacy/plugins/code/public/components/commits/commit.tsx b/x-pack/legacy/plugins/code/public/components/commits/commit.tsx
deleted file mode 100644
index 9326fdffe7ef8b..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/commits/commit.tsx
+++ /dev/null
@@ -1,129 +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 {
-  EuiButtonIcon,
-  EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiLink,
-  EuiPanel,
-  EuiText,
-  EuiTextColor,
-  EuiCopy,
-  EuiTitle,
-} from '@elastic/eui';
-import chrome from 'ui/chrome';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { CommitInfo } from '../../../model/commit';
-import { RepositoryUtils } from '../../../common/repository_utils';
-import { parseCommitMessage } from '../../../common/commit_utils';
-import { PathTypes } from '../../common/types';
-
-const COMMIT_ID_LENGTH = 8;
-
-const RepoLink = ({ repoUri }: { repoUri: string }) => {
-  const repoOrg = RepositoryUtils.orgNameFromUri(repoUri);
-  const repoName = RepositoryUtils.repoNameFromUri(repoUri);
-  const repoPath = `#/${repoUri}`;
-
-  return (
-    <>
-      <EuiLink href={repoPath}>
-        {repoOrg} / {repoName}
-      </EuiLink>
-      <EuiTextColor color="subdued" className="commit__inline-separator">
-        •
-      </EuiTextColor>
-    </>
-  );
-};
-
-interface ActionProps {
-  repoUri: string;
-  commitId: string;
-}
-
-const copyLabel = i18n.translate('xpack.code.commits.copyCommitAriaLabel', {
-  defaultMessage: 'Copy the full commit ID',
-});
-const revisionLinkLabel = i18n.translate('xpack.code.commits.revisionLinkAriaLabel', {
-  defaultMessage: 'View the project at this commit',
-});
-
-const getRevisionPath = (repoUri: string, commitId: string) => {
-  const diffPageEnabled = chrome.getInjected('codeDiffPageEnabled');
-  if (diffPageEnabled) {
-    return `#/${repoUri}/commit/${commitId}`;
-  } else {
-    return `#/${repoUri}/${PathTypes.tree}/${commitId}`;
-  }
-};
-
-const CommitActions = ({ commitId, repoUri }: ActionProps) => {
-  const revisionPath = getRevisionPath(repoUri, commitId);
-
-  return (
-    <div className="commit__actions">
-      <EuiCopy textToCopy={commitId}>
-        {copy => <EuiButtonIcon aria-label={copyLabel} onClick={copy} iconType="copyClipboard" />}
-      </EuiCopy>
-      <EuiButtonEmpty
-        className="commit__diff-link"
-        href={revisionPath}
-        aria-label={revisionLinkLabel}
-      >
-        <EuiText size="s">{commitId}</EuiText>
-      </EuiButtonEmpty>
-      <EuiButtonIcon
-        href={revisionPath}
-        aria-label={revisionLinkLabel}
-        iconType="editorCodeBlock"
-      />
-    </div>
-  );
-};
-
-interface Props {
-  commit: CommitInfo;
-  date: string;
-  repoUri: string;
-  showRepoLink: boolean;
-}
-
-export const Commit = (props: Props) => {
-  const { date, commit, repoUri, showRepoLink } = props;
-  const { message, committer, id } = commit;
-  const { summary, body } = parseCommitMessage(message);
-  const commitId = id.substring(0, COMMIT_ID_LENGTH);
-
-  return (
-    <EuiPanel className="code-timeline__commit--root">
-      <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween" alignItems="center">
-        <div className="eui-textTruncate">
-          <EuiTitle size="xxs" className="eui-textTruncate">
-            <h4>{summary}</h4>
-          </EuiTitle>
-          <EuiText size="xs" className="commit__metadata">
-            {showRepoLink && <RepoLink repoUri={repoUri} />}
-            <EuiTextColor color="subdued">
-              <FormattedMessage
-                id="xpack.code.commits.committedDescription"
-                defaultMessage="Committed on {date} by {committer}"
-                values={{ committer, date }}
-              />
-            </EuiTextColor>
-          </EuiText>
-          <EuiText size="s">
-            <p className="eui-textTruncate">{body}</p>
-          </EuiText>
-        </div>
-        <CommitActions repoUri={repoUri} commitId={commitId} />
-      </EuiFlexGroup>
-    </EuiPanel>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/commits/group.tsx b/x-pack/legacy/plugins/code/public/components/commits/group.tsx
deleted file mode 100644
index 01c2844d38622e..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/commits/group.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiText, EuiTextColor } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { CommitInfo } from '../../../model/commit';
-import { Commit } from './commit';
-
-interface Props {
-  commits: CommitInfo[];
-  date: string;
-  repoUri: string;
-}
-
-export const CommitGroup = (props: Props) => {
-  const commitList = props.commits.map(commit => (
-    <Commit
-      commit={commit}
-      key={commit.id}
-      date={props.date}
-      repoUri={props.repoUri}
-      showRepoLink={false}
-    />
-  ));
-
-  return (
-    <div className="code-timeline__commit-container">
-      <EuiFlexGroup justifyContent="flexStart" gutterSize="s">
-        <EuiFlexItem grow={false}>
-          <div className="code-timeline__marker" />
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiText>
-            <h4>
-              <EuiTextColor color="subdued">
-                <FormattedMessage
-                  id="xpack.code.mainPage.history.commitsOnTitle"
-                  defaultMessage="Commits on {date}"
-                  values={{ date: props.date }}
-                />
-              </EuiTextColor>
-            </h4>
-          </EuiText>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <div className="code-timeline">{commitList}</div>
-    </div>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/commits/history.tsx b/x-pack/legacy/plugins/code/public/components/commits/history.tsx
deleted file mode 100644
index 590e081dc29675..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/commits/history.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import moment from 'moment';
-import React from 'react';
-import { connect } from 'react-redux';
-import { i18n } from '@kbn/i18n';
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import { CommitGroup } from './group';
-import { CommitInfo } from '../../../model/commit';
-import { RootState } from '../../reducers';
-import { hasMoreCommitsSelector, treeCommitsSelector } from '../../selectors';
-import { fetchMoreCommits } from '../../actions';
-
-const CommitHistoryLoading = () => (
-  <div className="codeLoader">
-    <EuiLoadingSpinner size="xl" />
-  </div>
-);
-
-const PageButtons = (props: { loading?: boolean; disabled: boolean; onClick: () => void }) => (
-  <EuiFlexGroup justifyContent="spaceAround">
-    <EuiFlexItem grow={false}>
-      <EuiButton
-        onClick={props.onClick}
-        iconType="arrowDown"
-        isLoading={props.loading}
-        isDisabled={props.disabled}
-        size="s"
-      >
-        <FormattedMessage id="xpack.code.mainPage.history.moreButtonLabel" defaultMessage="More" />
-      </EuiButton>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-);
-
-const commitDateFormatMap: { [key: string]: string } = {
-  en: 'MMM Do, YYYY',
-  'zh-cn': 'YYYY年MoDo',
-};
-
-export const CommitHistoryComponent = (props: {
-  commits: CommitInfo[];
-  repoUri: string;
-  header: React.ReactNode;
-  loadingCommits?: boolean;
-  showPagination?: boolean;
-  hasMoreCommit?: boolean;
-  fetchMoreCommits: any;
-}) => {
-  const commits = _.groupBy(props.commits, commit => moment(commit.updated).format('YYYYMMDD'));
-  const commitDates = Object.keys(commits).sort((a, b) => b.localeCompare(a)); // sort desc
-  const locale = i18n.getLocale();
-  const commitDateFormat =
-    locale in commitDateFormatMap ? commitDateFormatMap[locale] : commitDateFormatMap.en;
-  const commitList = commitDates.map(cd => (
-    <CommitGroup
-      commits={commits[cd]}
-      date={moment(cd).format(commitDateFormat)}
-      key={cd}
-      repoUri={props.repoUri}
-    />
-  ));
-  return (
-    <div className="codeContainer__commitMessages">
-      <div className="codeHeader__commit">{props.header}</div>
-      {commitList}
-      {!props.showPagination && props.loadingCommits && <CommitHistoryLoading />}
-      {props.showPagination && (
-        <PageButtons
-          disabled={!props.hasMoreCommit || props.commits.length < 10}
-          onClick={() => props.fetchMoreCommits(props.repoUri)}
-          loading={props.loadingCommits}
-        />
-      )}
-    </div>
-  );
-};
-
-const mapStateToProps = (state: RootState) => ({
-  file: state.file.file,
-  commits: treeCommitsSelector(state) || [],
-  loadingCommits: state.revision.loadingCommits,
-  hasMoreCommit: hasMoreCommitsSelector(state),
-});
-
-const mapDispatchToProps = {
-  fetchMoreCommits,
-};
-export const CommitHistory = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CommitHistoryComponent);
diff --git a/x-pack/legacy/plugins/code/public/components/commits/index.ts b/x-pack/legacy/plugins/code/public/components/commits/index.ts
deleted file mode 100644
index 868597cc5e9c42..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/commits/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { Commit } from './commit';
-export { CommitGroup } from './group';
-export { CommitHistory, CommitHistoryComponent } from './history';
diff --git a/x-pack/legacy/plugins/code/public/components/diff_page/accordion.tsx b/x-pack/legacy/plugins/code/public/components/diff_page/accordion.tsx
deleted file mode 100644
index 2d5bf8e63a4372..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/diff_page/accordion.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useState } from 'react';
-import { EuiIcon, EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
-
-interface Props {
-  initialIsOpen: boolean;
-  title: React.ReactNode;
-  children: React.ReactNode;
-  className: string;
-}
-
-export const Accordion = (props: Props) => {
-  const [isOpen, setOpen] = useState(props.initialIsOpen);
-  return (
-    <EuiPanel paddingSize="none" className={props.className}>
-      <EuiFlexGroup
-        gutterSize="none"
-        justifyContent="spaceBetween"
-        alignItems="center"
-        onClick={() => {
-          setOpen(!isOpen);
-        }}
-      >
-        <EuiFlexItem>{props.title}</EuiFlexItem>
-        <EuiFlexItem grow={false} className="codeAccordionCollapse__icon">
-          <EuiIcon type={isOpen ? 'arrowDown' : 'arrowRight'} />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <div hidden={!isOpen}>{props.children}</div>
-    </EuiPanel>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/diff_page/diff.scss b/x-pack/legacy/plugins/code/public/components/diff_page/diff.scss
deleted file mode 100644
index c10feae4f9dab2..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/diff_page/diff.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-.codeDiffCommitSelectorsContainer {
-  border-left: $euiBorderThin solid $euiColorLightShade;
-  padding-left: $euiSize;
-}
-
-.codeDiffCommitMessage {
-  padding: $euiSizeS $euiSize;
-}
-
-.codeDiffChangedFiles {
-  color: $euiColorPrimary;
-}
-
-.codeDiffMetadata {
-  padding: 0 $euiSize $euiSizeS $euiSize;
-}
-
-.codeVisualizerIcon {
-  margin-right: $euiSizeS;
-}
-
-.codeDiffDeletion {
-  margin: 0 $euiSizeS;
-  background-color: $euiColorVis0;
-}
-
-.codeDiff__panel {
-  padding: 0 $euiSize;
-}
-
-.codeDiff__header {
-  border-bottom: $euiBorderThin solid $euiColorLightShade;
-  height: $euiSizeXXL;
-  padding: $euiSize;
-}
-
-.codeAccordionCollapse__icon {
-  margin: auto $euiSize auto 0;
-  cursor: pointer;
-}
-
-.codeViewFile__button {
-  height: $euiSizeL !important;
-}
-
-.codeAccordion {
-  margin-bottom: $euiSizeM;
-}
diff --git a/x-pack/legacy/plugins/code/public/components/diff_page/diff.tsx b/x-pack/legacy/plugins/code/public/components/diff_page/diff.tsx
deleted file mode 100644
index 98a694c2542d14..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/diff_page/diff.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiText,
-  EuiBadge,
-  EuiNotificationBadge,
-} from '@elastic/eui';
-import React from 'react';
-import { connect } from 'react-redux';
-import { Link, RouteComponentProps, withRouter } from 'react-router-dom';
-import { CommitDiff, FileDiff } from '../../../common/git_diff';
-import { SearchScope, SearchOptions } from '../../../model';
-import { changeSearchScope } from '../../actions';
-import { RootState } from '../../reducers';
-import { SearchBar } from '../search_bar';
-import { DiffEditor } from './diff_editor';
-import { Accordion } from './accordion';
-
-const COMMIT_ID_LENGTH = 16;
-
-interface Props extends RouteComponentProps<{ resource: string; org: string; repo: string }> {
-  commit: CommitDiff | null;
-  query: string;
-  onSearchScopeChanged: (s: SearchScope) => void;
-  repoScope: string[];
-  searchOptions: SearchOptions;
-}
-
-export enum DiffLayout {
-  Unified,
-  Split,
-}
-
-const Difference = (props: {
-  fileDiff: FileDiff;
-  repoUri: string;
-  revision: string;
-  initialIsOpen: boolean;
-}) => (
-  <Accordion
-    initialIsOpen={props.initialIsOpen}
-    className="codeAccordion"
-    title={
-      <EuiFlexGroup
-        gutterSize="none"
-        alignItems="center"
-        justifyContent="spaceBetween"
-        className="codeDiff__header"
-      >
-        <EuiFlexItem>
-          <EuiFlexGroup gutterSize="none" alignItems="center">
-            <EuiFlexItem grow={false}>
-              <EuiFlexGroup gutterSize="none">
-                <EuiNotificationBadge size="m">{props.fileDiff.additions}</EuiNotificationBadge>
-                <EuiNotificationBadge className="codeDiffDeletion" size="m">
-                  {props.fileDiff.deletions}
-                </EuiNotificationBadge>
-              </EuiFlexGroup>
-            </EuiFlexItem>
-            <EuiFlexItem>{props.fileDiff.path}</EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <div
-            className="euiButton euiButton--primary euiButton--small codeViewFile__button"
-            role="button"
-          >
-            <span className="euiButton__content">
-              <Link to={`/${props.repoUri}/blob/${props.revision}/${props.fileDiff.path}`}>
-                View File
-              </Link>
-            </span>
-          </div>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    }
-  >
-    <DiffEditor
-      originCode={props.fileDiff.originCode!}
-      modifiedCode={props.fileDiff.modifiedCode!}
-      language={props.fileDiff.language!}
-      renderSideBySide={true}
-    />
-  </Accordion>
-);
-
-export class DiffPage extends React.Component<Props> {
-  public state = {
-    diffLayout: DiffLayout.Split,
-  };
-
-  public setLayoutUnified = () => {
-    this.setState({ diffLayout: DiffLayout.Unified });
-  };
-
-  public setLayoutSplit = () => {
-    this.setState({ diffLayout: DiffLayout.Split });
-  };
-
-  public render() {
-    const DEFAULT_OPEN_FILE_DIFF_COUNT = 1;
-    const { commit, match } = this.props;
-    const { repo, org, resource } = match.params;
-    const repoUri = `${resource}/${org}/${repo}`;
-    if (!commit) {
-      return null;
-    }
-    const { additions, deletions, files } = commit;
-    const fileCount = files.length;
-    const diffs = commit.files.map((file, index) => (
-      <Difference
-        repoUri={repoUri}
-        revision={commit.commit.id}
-        fileDiff={file}
-        key={file.path}
-        initialIsOpen={index < DEFAULT_OPEN_FILE_DIFF_COUNT}
-      />
-    ));
-    return (
-      <div>
-        <SearchBar
-          query={this.props.query}
-          onSearchScopeChanged={this.props.onSearchScopeChanged}
-          searchOptions={this.props.searchOptions}
-          enableSubmitWhenOptionsChanged={false}
-        />
-        <div className="codeDiffCommitMessage">
-          <EuiText size="s">{commit.commit.message}</EuiText>
-        </div>
-        <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween" className="codeDiffMetadata">
-          <EuiFlexItem grow={false}>
-            <EuiText size="s">
-              <EuiIcon type="dataVisualizer" color="subdued" className="codeVisualizerIcon" />
-              Showing
-              <b className="codeDiffChangedFiles"> {fileCount} Changed files </b>
-              with
-              <b> {additions} additions</b> and <b>{deletions} deletions </b>
-            </EuiText>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiText size="s">
-              Committed by
-              <b> {commit.commit.committer} </b>
-              <EuiBadge color="hollow">{commit.commit.id.substr(0, COMMIT_ID_LENGTH)}</EuiBadge>
-            </EuiText>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <div className="codeDiff__panel">{diffs}</div>
-      </div>
-    );
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  commit: state.commit.commit,
-  query: state.search.query,
-  repoScope: state.search.searchOptions.repoScope.map(r => r.uri),
-  searchOptions: state.search.searchOptions,
-});
-
-const mapDispatchToProps = {
-  onSearchScopeChanged: changeSearchScope,
-};
-
-export const Diff = withRouter(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-  )(DiffPage)
-);
diff --git a/x-pack/legacy/plugins/code/public/components/diff_page/diff_editor.tsx b/x-pack/legacy/plugins/code/public/components/diff_page/diff_editor.tsx
deleted file mode 100644
index e02d54a729192e..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/diff_page/diff_editor.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { editor } from 'monaco-editor';
-import React from 'react';
-import { MonacoDiffEditor } from '../../monaco/monaco_diff_editor';
-
-interface Props {
-  originCode: string;
-  modifiedCode: string;
-  language: string;
-  renderSideBySide: boolean;
-}
-
-export class DiffEditor extends React.Component<Props> {
-  lineHeight = 18;
-  static linesCount(s: string = '') {
-    let count = 0;
-    let position = 0;
-    while (position !== -1) {
-      count++;
-      position = position + 1;
-      position = s.indexOf('\n', position);
-    }
-    return count;
-  }
-  private diffEditor: MonacoDiffEditor | null = null;
-  public mountDiffEditor = (container: HTMLDivElement) => {
-    this.diffEditor = new MonacoDiffEditor(
-      container,
-      this.props.originCode,
-      this.props.modifiedCode,
-      this.props.language,
-      this.props.renderSideBySide
-    );
-    this.diffEditor.init();
-  };
-
-  getEditorHeight = () => {
-    const originalLinesCount = DiffEditor.linesCount(this.props.originCode);
-    const modifiedLinesCount = DiffEditor.linesCount(this.props.modifiedCode);
-    return Math.min(Math.max(originalLinesCount, modifiedLinesCount) * this.lineHeight, 400);
-  };
-
-  public componentDidUpdate(prevProps: Props) {
-    if (prevProps.renderSideBySide !== this.props.renderSideBySide) {
-      this.updateLayout(this.props.renderSideBySide);
-    }
-  }
-
-  public updateLayout(renderSideBySide: boolean) {
-    this.diffEditor!.diffEditor!.updateOptions({ renderSideBySide } as editor.IDiffEditorOptions);
-  }
-
-  public render() {
-    return (
-      <div
-        id="diffEditor"
-        className="codeContainer__monaco"
-        ref={this.mountDiffEditor}
-        style={{ height: this.getEditorHeight() }}
-      />
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/editor/editor.tsx b/x-pack/legacy/plugins/code/public/components/editor/editor.tsx
deleted file mode 100644
index b5ac5b37338815..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/editor/editor.tsx
+++ /dev/null
@@ -1,282 +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 { EuiFlexItem } from '@elastic/eui';
-import { editor as editorInterfaces, IDisposable } from 'monaco-editor';
-import React from 'react';
-import { connect } from 'react-redux';
-import { RouteComponentProps, withRouter } from 'react-router-dom';
-import { Hover, Position } from 'vscode-languageserver-protocol';
-import { GitBlame } from '../../../common/git_blame';
-import { closePanel, FetchFileResponse, hoverResult } from '../../actions';
-import { MainRouteParams } from '../../common/types';
-import { BlameWidget } from '../../monaco/blame/blame_widget';
-import { monaco } from '../../monaco/monaco';
-import { MonacoHelper } from '../../monaco/monaco_helper';
-import { RootState } from '../../reducers';
-import { refUrlSelector } from '../../selectors';
-import { history } from '../../utils/url';
-import { Modifier, Shortcut } from '../shortcuts';
-import { ReferencesPanel } from './references_panel';
-import { encodeRevisionString } from '../../../common/uri_util';
-import { trackCodeUiMetric, METRIC_TYPE } from '../../services/ui_metric';
-import { CodeUIUsageMetrics } from '../../../model/usage_telemetry_metrics';
-
-export interface EditorActions {
-  closePanel(changeUrl: boolean): void;
-  hoverResult(hover: Hover): void;
-}
-
-interface Props {
-  hidden?: boolean;
-  file?: FetchFileResponse;
-  revealPosition?: Position;
-  panelShowing: boolean;
-  isPanelLoading: boolean;
-  panelContents: any[];
-  panelTitle: string;
-  hover?: Hover;
-  refUrl?: string;
-  blames: GitBlame[];
-  showBlame: boolean;
-}
-
-type IProps = Props & EditorActions & RouteComponentProps<MainRouteParams>;
-
-export class EditorComponent extends React.Component<IProps> {
-  static defaultProps = {
-    hidden: false,
-  };
-
-  public blameWidgets: any;
-  private container: HTMLElement | undefined;
-  private monaco: MonacoHelper | undefined;
-  private editor: editorInterfaces.IStandaloneCodeEditor | undefined;
-  private lineDecorations: string[] | null = null;
-  private gutterClickHandler: IDisposable | undefined;
-
-  constructor(props: IProps, context: any) {
-    super(props, context);
-  }
-
-  registerGutterClickHandler = () => {
-    if (!this.gutterClickHandler) {
-      this.gutterClickHandler = this.editor!.onMouseDown(
-        (e: editorInterfaces.IEditorMouseEvent) => {
-          // track line number click count
-          trackCodeUiMetric(METRIC_TYPE.COUNT, CodeUIUsageMetrics.LINE_NUMBER_CLICK_COUNT);
-          const { resource, org, repo, revision, path, pathType } = this.props.match.params;
-          const queryString = this.props.location.search;
-          const repoUri = `${resource}/${org}/${repo}`;
-          if (e.target.type === monaco.editor.MouseTargetType.GUTTER_LINE_NUMBERS) {
-            const url = `${repoUri}/${pathType}/${encodeRevisionString(revision)}/${path}`;
-            const position = e.target.position || { lineNumber: 0, column: 0 };
-            history.push(`/${url}!L${position.lineNumber}:0${queryString}`);
-          }
-          this.monaco!.container.focus();
-        }
-      );
-    }
-  };
-
-  public componentDidMount(): void {
-    this.container = document.getElementById('mainEditor') as HTMLElement;
-    this.monaco = new MonacoHelper(this.container, this.props, this.props.location.search);
-    if (!this.props.revealPosition) {
-      this.monaco.clearLineSelection();
-    }
-    const { file } = this.props;
-    if (file && file.content) {
-      const { uri, path, revision } = file.payload;
-      this.loadText(file.content, uri, path, file.lang!, revision).then(() => {
-        if (this.props.revealPosition) {
-          this.revealPosition(this.props.revealPosition);
-        }
-        if (this.props.showBlame) {
-          this.loadBlame(this.props.blames);
-        }
-      });
-    }
-  }
-
-  public componentDidUpdate(prevProps: IProps) {
-    const { file } = this.props;
-    if (!file) {
-      return;
-    }
-    const { uri, path, revision } = file.payload;
-    const {
-      resource,
-      org,
-      repo,
-      revision: routeRevision,
-      path: routePath,
-    } = this.props.match.params;
-    const prevContent = prevProps.file && prevProps.file.content;
-    const qs = this.props.location.search;
-    if (!this.props.revealPosition && this.monaco) {
-      this.monaco.clearLineSelection();
-    }
-    if (prevContent !== file.content) {
-      this.loadText(file.content!, uri, path, file.lang!, revision).then(() => {
-        if (this.props.revealPosition) {
-          this.revealPosition(this.props.revealPosition);
-        }
-      });
-    } else if (
-      file.payload.uri === `${resource}/${org}/${repo}` &&
-      file.payload.revision === routeRevision &&
-      file.payload.path === routePath &&
-      prevProps.revealPosition !== this.props.revealPosition
-    ) {
-      this.revealPosition(this.props.revealPosition);
-    }
-    if (this.monaco && qs !== prevProps.location.search) {
-      this.monaco.updateUrlQuery(qs);
-    }
-    if (this.editor) {
-      if (prevProps.showBlame !== this.props.showBlame && this.props.showBlame) {
-        this.editor.updateOptions({ lineDecorationsWidth: 316 });
-        this.loadBlame(this.props.blames);
-      } else if (!this.props.showBlame) {
-        this.destroyBlameWidgets();
-        this.editor.updateOptions({ lineDecorationsWidth: 16 });
-      }
-      if (prevProps.blames !== this.props.blames && this.props.showBlame) {
-        this.editor.updateOptions({ lineDecorationsWidth: 316 });
-        this.loadBlame(this.props.blames);
-      }
-    }
-  }
-
-  public componentWillUnmount() {
-    if (this.gutterClickHandler) {
-      this.gutterClickHandler.dispose();
-    }
-    this.monaco!.destroy();
-  }
-  public render() {
-    return (
-      <EuiFlexItem
-        data-test-subj="codeSourceViewer"
-        className="codeOverflowHidden"
-        grow={this.props.hidden ? false : 1}
-        hidden={this.props.hidden}
-      >
-        <Shortcut
-          keyCode="f"
-          help="With editor ‘active’ Find in file"
-          linuxModifier={[Modifier.ctrl]}
-          macModifier={[Modifier.meta]}
-          winModifier={[Modifier.ctrl]}
-        />
-        <div
-          tabIndex={0}
-          className="codeContainer__editor codeContainer__monaco"
-          id="mainEditor"
-          hidden={this.props.hidden}
-        />
-        {this.renderReferences()}
-      </EuiFlexItem>
-    );
-  }
-
-  public loadBlame(blames: GitBlame[]) {
-    if (this.blameWidgets) {
-      this.destroyBlameWidgets();
-    }
-    if (!this.lineDecorations) {
-      this.lineDecorations = this.monaco!.editor!.deltaDecorations(
-        [],
-        [
-          {
-            range: new monaco.Range(1, 1, Infinity, 1),
-            options: { isWholeLine: true, linesDecorationsClassName: 'code-line-decoration' },
-          },
-        ]
-      );
-    }
-    this.blameWidgets = blames.map((b, index) => {
-      return new BlameWidget(b, index === 0, this.monaco!.editor!);
-    });
-  }
-
-  public destroyBlameWidgets() {
-    if (this.blameWidgets) {
-      this.blameWidgets.forEach((bw: BlameWidget) => bw.destroy());
-    }
-    if (this.lineDecorations) {
-      this.monaco!.editor!.deltaDecorations(this.lineDecorations!, []);
-      this.lineDecorations = null;
-    }
-    this.blameWidgets = null;
-  }
-
-  private async loadText(text: string, repo: string, file: string, lang: string, revision: string) {
-    if (this.monaco) {
-      try {
-        await monaco.editor.colorize(text, lang, {});
-      } catch (e) {
-        // workaround a upstream issue: https://github.com/microsoft/monaco-editor/issues/134
-        lang = 'text';
-      }
-      this.editor = await this.monaco.loadFile(repo, file, text, lang, revision);
-      if (this.props.showBlame) {
-        this.editor.updateOptions({ lineDecorationsWidth: 316 });
-        this.loadBlame(this.props.blames);
-      }
-      this.registerGutterClickHandler();
-    }
-  }
-
-  private revealPosition(pos: Position | undefined) {
-    if (this.monaco) {
-      if (pos) {
-        this.monaco.revealPosition(pos.line, pos.character);
-      } else {
-        this.monaco.clearLineSelection();
-      }
-    }
-  }
-
-  private renderReferences() {
-    return (
-      this.props.panelShowing && (
-        <ReferencesPanel
-          onClose={() => this.props.closePanel(true)}
-          references={this.props.panelContents}
-          isLoading={this.props.isPanelLoading}
-          title={this.props.panelTitle}
-          refUrl={this.props.refUrl}
-        />
-      )
-    );
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  file: state.file.file,
-  panelShowing: state.editor.panelShowing,
-  isPanelLoading: state.editor.loading,
-  panelContents: state.editor.panelContents,
-  panelTitle: state.editor.panelTitle,
-  hover: state.editor.hover,
-  refUrl: refUrlSelector(state),
-  revealPosition: state.editor.revealPosition,
-  blames: state.blame.blames,
-});
-
-const mapDispatchToProps = {
-  closePanel,
-  hoverResult,
-};
-
-export const Editor = withRouter(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-  )(EditorComponent)
-);
diff --git a/x-pack/legacy/plugins/code/public/components/editor/references_panel.scss b/x-pack/legacy/plugins/code/public/components/editor/references_panel.scss
deleted file mode 100644
index 13d1c45e616609..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/editor/references_panel.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-.code-editor-references-panel {
-  position: relative;
-  max-height: 50vh;
-  display: flex;
-  flex-direction: column;
-  box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.05), 0px -4px 4px rgba(0, 0, 0, 0.03),
-  0px -6px 12px rgba(0, 0, 0, 0.05), 0px -12px 24px rgba(0, 0, 0, 0.05);
-}
-
-.code-editor-references-panel.expanded {
-  position: relative;
-  flex-grow: 10;
-  max-height: 95%;
-  height: 95%;
-}
-
-.code-editor-reference-accordion-button {
-  font-size: 13px;
-}
-
-.expandButton {
-  position: absolute;
-  top: -1 * $euiSize;
-  right: $euiSize + 1px;
-  background: $euiColorLightestShade;
-  border: $euiBorderThin;
-  border-bottom: 0;
-  height: 0;
-  min-height: $euiSize;
-  padding: 0;
-  border-radius: $euiSizeXS $euiSizeXS 0 0;
-}
- 
-.referencesPanel__code-block {
-  margin-bottom: $euiSizeXL;
-}
diff --git a/x-pack/legacy/plugins/code/public/components/editor/references_panel.tsx b/x-pack/legacy/plugins/code/public/components/editor/references_panel.tsx
deleted file mode 100644
index 6294c0973a33cd..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/editor/references_panel.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 {
-  EuiAccordion,
-  EuiButtonIcon,
-  EuiLoadingKibana,
-  EuiPanel,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
-import classname from 'classnames';
-import queryString from 'querystring';
-import React from 'react';
-import { parseSchema } from '../../../common/uri_util';
-import { GroupedFileResults, GroupedRepoResults } from '../../actions';
-import { history } from '../../utils/url';
-import { CodeBlockPanel, Position } from '../code_block';
-
-interface Props {
-  isLoading: boolean;
-  title: string;
-  references: GroupedRepoResults[];
-  refUrl?: string;
-  onClose(): void;
-}
-interface State {
-  expanded: boolean;
-}
-
-export class ReferencesPanel extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      expanded: false,
-    };
-  }
-
-  public close = () => {
-    this.props.onClose();
-  };
-
-  public toggleExpand = () => {
-    this.setState({ expanded: !this.state.expanded });
-  };
-
-  public render() {
-    const body = this.props.isLoading ? <EuiLoadingKibana size="xl" /> : this.renderGroupByRepo();
-    const styles: any = {};
-    const expanded = this.state.expanded;
-    return (
-      <EuiPanel
-        grow={false}
-        className={classname(['code-editor-references-panel', expanded ? 'expanded' : ''])}
-        style={styles}
-      >
-        <EuiButtonIcon
-          size="s"
-          onClick={this.toggleExpand}
-          iconType={expanded ? 'arrowDown' : 'arrowUp'}
-          aria-label="Next"
-          className="expandButton"
-        />
-        {!expanded && (
-          <EuiButtonIcon
-            className="euiFlyout__closeButton"
-            size="s"
-            onClick={this.close}
-            iconType="cross"
-            aria-label="Next"
-          />
-        )}
-        <EuiTitle size="s">
-          <h3>{this.props.title}</h3>
-        </EuiTitle>
-        <EuiSpacer size="m" />
-        <div className="code-auto-overflow-y">{body}</div>
-      </EuiPanel>
-    );
-  }
-
-  private renderGroupByRepo() {
-    return this.props.references.map((ref: GroupedRepoResults) => {
-      return this.renderReferenceRepo(ref);
-    });
-  }
-
-  private renderReferenceRepo({ repo, files }: GroupedRepoResults) {
-    const [org, name] = repo.split('/').slice(1);
-    const buttonContent = (
-      <span>
-        <span>{org}</span>/<b>{name}</b>
-      </span>
-    );
-
-    return (
-      <EuiAccordion
-        id={repo}
-        key={repo}
-        buttonContentClassName="code-editor-reference-accordion-button"
-        buttonContent={buttonContent}
-        paddingSize="s"
-        initialIsOpen={true}
-      >
-        {files.map(file => this.renderReference(file))}
-      </EuiAccordion>
-    );
-  }
-
-  private renderReference(file: GroupedFileResults) {
-    const key = `${file.uri}`;
-    const header = (
-      <React.Fragment>
-        <EuiText size="s">
-          <a href={`#${this.computeUrl(file.uri)}`}>{file.file}</a>
-        </EuiText>
-        <EuiSpacer size="s" />
-      </React.Fragment>
-    );
-
-    return (
-      <CodeBlockPanel
-        className="referencesPanel__code-block"
-        key={key}
-        header={header}
-        lines={file.code.split('\n')}
-        language={file.language}
-        lineNumber={i => file.lineNumbers[i]}
-        highlightRanges={file.highlights}
-        onClick={this.onCodeClick(file.uri)}
-      />
-    );
-  }
-
-  private onCodeClick = (url: string) => (position: Position) => {
-    const lineNum = parseInt(position.lineNumber, 10);
-    history.push(this.computeUrl(url, lineNum));
-  };
-
-  private computeUrl(url: string, line?: number) {
-    const { uri } = parseSchema(url)!;
-    let search = history.location.search;
-    if (search.startsWith('?')) {
-      search = search.substring(1);
-    }
-    const queries = queryString.parse(search);
-    const query = queryString.stringify({
-      ...queries,
-      tab: 'references',
-      refUrl: this.props.refUrl,
-    });
-
-    return line !== undefined ? `${uri}!L${line}:0?${query}` : `${uri}?${query}`;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/file_tree/__fixtures__/props.json b/x-pack/legacy/plugins/code/public/components/file_tree/__fixtures__/props.json
deleted file mode 100644
index f6cd6cbd4e9aa0..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/file_tree/__fixtures__/props.json
+++ /dev/null
@@ -1,203 +0,0 @@
-{
-  "node":{
-     "name":"",
-     "path":"",
-     "type":1,
-     "childrenCount":19,
-     "children":[
-        {
-           "name":"android",
-           "path":"android",
-           "sha1":"a2ea0b08e5d3c02cdfd6648b1e6e930eea95c2f2",
-           "type":1
-        },
-        {
-           "name":"futures",
-           "path":"futures",
-           "sha1":"9d34a7a1aeb1c0a158134897d689b45ee3ba10cc",
-           "type":1
-        },
-        {
-           "name":"guava",
-           "path":"guava",
-           "sha1":"17532aab4ac810a06f0f258bffaff50d55e4ee94",
-           "type":1,
-           "childrenCount":3,
-           "children":[
-              {
-                 "name":"javadoc-link",
-                 "path":"guava/javadoc-link",
-                 "sha1":"c03fe568863a7d437f1f69712583c5381f1225f2",
-                 "type":1
-              },
-              {
-                 "name":"pom.xml",
-                 "path":"guava/pom.xml",
-                 "sha1":"845e4b4c9428c26f3403c55eb75ecc2c0f4bb798",
-                 "type":0
-              },
-              {
-                 "name":"src",
-                 "path":"guava/src",
-                 "sha1":"c652417027db78632a0458783eb5424eed30ec15",
-                 "type":1,
-                 "childrenCount":1,
-                 "children":[
-                    {
-                       "name":"com",
-                       "path":"guava/src/com",
-                       "sha1":"8aef9b1b3385f9480a8ccc5d3f3f3fe9e225bf30",
-                       "type":1,
-                       "childrenCount":1,
-                       "children":[
-                          {
-                             "name":"google",
-                             "path":"guava/src/com/google",
-                             "sha1":"8ea38b7a4b545ee5e194cdf018601fb802b08173",
-                             "type":1,
-                             "childrenCount":2,
-                             "children":[
-                                {
-                                   "name":"common",
-                                   "path":"guava/src/com/google/common",
-                                   "sha1":"ad31410caf6bd224498690453f7699080a3e0df6",
-                                   "type":1
-                                },
-                                {
-                                   "name":"thirdparty",
-                                   "path":"guava/src/com/google/thirdparty",
-                                   "sha1":"935695a8668173410c23e8a4d44871bce3bddb32",
-                                   "type":1,
-                                   "childrenCount":1,
-                                   "children":[
-                                      {
-                                         "name":"publicsuffix",
-                                         "path":"guava/src/com/google/thirdparty/publicsuffix",
-                                         "sha1":"ca7a68b3c5a0ebe251364d342e1d9309a63bfd65",
-                                         "type":1
-                                      }
-                                   ]
-                                }
-                             ]
-                          }
-                       ]
-                    }
-                 ]
-              }
-           ]
-        },
-        {
-           "name":"guava-bom",
-           "path":"guava-bom",
-           "sha1":"506da491b49b1a9db603ffe96ff748dbe6c666cf",
-           "type":1,
-           "childrenCount":1,
-           "children":[
-              {
-                 "name":"pom.xml",
-                 "path":"guava-bom/pom.xml",
-                 "sha1":"d32778eaae10d029fab8129a90d942da166b6e29",
-                 "type":0
-              }
-           ]
-        },
-        {
-           "name":"guava-gwt",
-           "path":"guava-gwt",
-           "sha1":"01b81f8d124d4cc4222ec9be4426940dd066dd64",
-           "type":1
-        },
-        {
-           "name":"guava-testlib",
-           "path":"guava-testlib",
-           "sha1":"ba68ef1df869adbc3e2a72372ec96f80d7723d7c",
-           "type":1
-        },
-        {
-           "name":"guava-tests",
-           "path":"guava-tests",
-           "sha1":"c51f5c29a9320903910db537270fbc04039ea3ef",
-           "type":1
-        },
-        {
-           "name":"refactorings",
-           "path":"refactorings",
-           "sha1":"73dc70e964c07e5c4d1dc210e8c95f160fd7e4c1",
-           "type":1
-        },
-        {
-           "name":"util",
-           "path":"util",
-           "sha1":"121ac413ef81b5f3d80d059f024b0d4c2dde31ae",
-           "type":1
-        },
-        {
-           "name":".gitattributes",
-           "path":".gitattributes",
-           "sha1":"1e3b76511d02b52d500387c8d40060a57d109c79",
-           "type":0
-        },
-        {
-           "name":".gitignore",
-           "path":".gitignore",
-           "sha1":"942c3986a9b7a2d5fb5c66f0d404f2665fe89fc0",
-           "type":0
-        },
-        {
-           "name":".travis.yml",
-           "path":".travis.yml",
-           "sha1":"0890618156c2427bb0f75df4b286b8d06e393dd8",
-           "type":0
-        },
-        {
-           "name":"CONTRIBUTING.md",
-           "path":"CONTRIBUTING.md",
-           "sha1":"8acd79c21bb287fe73323cc046ab1157cafb194a",
-           "type":0
-        },
-        {
-           "name":"CONTRIBUTORS",
-           "path":"CONTRIBUTORS",
-           "sha1":"88ecb640d1a2d7af7b1b58657bb0475db0e07d77",
-           "type":0
-        },
-        {
-           "name":"COPYING",
-           "path":"COPYING",
-           "sha1":"d645695673349e3947e8e5ae42332d0ac3164cd7",
-           "type":0
-        },
-        {
-           "name":"README.md",
-           "path":"README.md",
-           "sha1":"dea66d815f15cec63775c536e90cb309af501dec",
-           "type":0
-        },
-        {
-           "name":"cycle_whitelist.txt",
-           "path":"cycle_whitelist.txt",
-           "sha1":"e9c70c3ef79a97f22156f01be7d3768eec8b1405",
-           "type":0
-        },
-        {
-           "name":"javadoc-stylesheet.css",
-           "path":"javadoc-stylesheet.css",
-           "sha1":"64cbb4fbc6ef079832263190e209c27cecad8fff",
-           "type":0
-        },
-        {
-           "name":"pom.xml",
-           "path":"pom.xml",
-           "sha1":"e688d8edf2b4ce5bf847743fee567a34c2f601d2",
-           "type":0
-        }
-     ],
-     "repoUri":"github.com/google/guava"
-  },
-  "openedPaths":[
-     "guava/src/com/google",
-     "guava",
-     "guava/src",
-     "guava/src/com"
-  ]
-}
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/code/public/components/file_tree/__snapshots__/file_tree.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/file_tree/__snapshots__/file_tree.test.tsx.snap
deleted file mode 100644
index f06c4234d28920..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/file_tree/__snapshots__/file_tree.test.tsx.snap
+++ /dev/null
@@ -1,1257 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`render correctly 1`] = `
-<nav
-  className="euiSideNav codeContainer__sideTabTree euiSideNav-isOpenMobile"
->
-  <button
-    className="euiSideNav__mobileToggle euiLink"
-    type="button"
-  >
-    <span
-      className="euiSideNav__mobileWrap"
-    >
-      <span
-        className="euiSideNav__mobileTitle"
-      />
-      <svg
-        aria-hidden="true"
-        className="euiIcon euiIcon--medium euiIcon-isLoading euiSideNav__mobileIcon"
-        focusable="false"
-        height={16}
-        style={null}
-        viewBox="0 0 16 16"
-        width={16}
-        xmlns="http://www.w3.org/2000/svg"
-      />
-    </span>
-  </button>
-  <div
-    className="euiSideNav__content"
-    role="menubar"
-  >
-    <div
-      className="euiSideNavItem euiSideNavItem--root euiSideNavItem--hasChildItems"
-    >
-      <div
-        aria-label={
-          <span
-            className="euiSideNavItemButton__content"
-          >
-            <span
-              className="euiSideNavItemButton__label"
-            >
-              
-            </span>
-          </span>
-        }
-        className="euiSideNavItemButton"
-      >
-        <span
-          className="euiSideNavItemButton__content"
-        >
-          <span
-            className="euiSideNavItemButton__label"
-          >
-            
-          </span>
-        </span>
-      </div>
-      <div
-        className="euiSideNavItem__items"
-      >
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                data-test-subj="codeFileTreeNode-Directory-Icon-android-closed"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  android
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-Directory-android"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                data-test-subj="codeFileTreeNode-Directory-Icon-futures-closed"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  futures
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-Directory-futures"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk euiSideNavItem--hasChildItems"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                data-test-subj="codeFileTreeNode-Directory-Icon-guava-open"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  guava
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-Directory-guava"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-          <div
-            className="euiSideNavItem__items"
-          >
-            <div
-              className="euiSideNavItem euiSideNavItem--branch"
-            >
-              <div
-                className="codeFileTree__node"
-              >
-                <div
-                  className="codeFileTree__item kbn-resetFocusState"
-                  onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex={0}
-                >
-                  <svg
-                    className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                    focusable="false"
-                    height={16}
-                    style={null}
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <svg
-                    className="euiIcon euiIcon--medium euiIcon-isLoading"
-                    data-test-subj="codeFileTreeNode-Directory-Icon-guava/javadoc-link-closed"
-                    focusable="false"
-                    height={16}
-                    style={null}
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <span
-                    className="codeFileTree__directory"
-                  >
-                    <div
-                      className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                    >
-                      javadoc-link
-                    </div>
-                  </span>
-                </div>
-                <div
-                  className="codeFileTree__node--link"
-                  data-test-subj="codeFileTreeNode-Directory-guava/javadoc-link"
-                  onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex={0}
-                />
-              </div>
-            </div>
-            <div
-              className="euiSideNavItem euiSideNavItem--branch"
-            >
-              <div
-                className="codeFileTree__node"
-              >
-                <div
-                  className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-                  onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex={0}
-                >
-                  <svg
-                    className="euiIcon euiIcon--medium euiIcon-isLoading"
-                    focusable="false"
-                    height={16}
-                    style={null}
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <span
-                    className="codeFileTree__directory"
-                  >
-                    <div
-                      className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                    >
-                      <div
-                        className="euiTextColor euiTextColor--default"
-                      >
-                        pom.xml
-                      </div>
-                    </div>
-                  </span>
-                </div>
-                <div
-                  className="codeFileTree__node--link"
-                  data-test-subj="codeFileTreeNode-File-guava/pom.xml"
-                  onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex={0}
-                />
-              </div>
-            </div>
-            <div
-              className="euiSideNavItem euiSideNavItem--branch euiSideNavItem--hasChildItems"
-            >
-              <div
-                className="codeFileTree__node"
-              >
-                <div
-                  className="codeFileTree__item kbn-resetFocusState"
-                  onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex={0}
-                >
-                  <svg
-                    className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                    focusable="false"
-                    height={16}
-                    style={null}
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <svg
-                    className="euiIcon euiIcon--medium euiIcon-isLoading"
-                    data-test-subj="codeFileTreeNode-Directory-Icon-guava/src/com/google-open"
-                    focusable="false"
-                    height={16}
-                    style={null}
-                    viewBox="0 0 16 16"
-                    width={16}
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <span
-                    className="codeFileTree__directory"
-                  >
-                    <div
-                      className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                    >
-                      src/com/google
-                    </div>
-                  </span>
-                </div>
-                <div
-                  className="codeFileTree__node--fullWidth"
-                  data-test-subj="codeFileTreeNode-Directory-guava/src/com/google"
-                  onClick={[Function]}
-                  onKeyDown={[Function]}
-                  role="button"
-                  tabIndex={0}
-                />
-              </div>
-              <div
-                className="euiSideNavItem__items"
-              >
-                <div
-                  className="euiSideNavItem euiSideNavItem--branch"
-                >
-                  <div
-                    className="codeFileTree__node"
-                  >
-                    <div
-                      className="codeFileTree__item kbn-resetFocusState"
-                      onClick={[Function]}
-                      onKeyDown={[Function]}
-                      role="button"
-                      tabIndex={0}
-                    >
-                      <svg
-                        className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                        focusable="false"
-                        height={16}
-                        style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
-                      <svg
-                        className="euiIcon euiIcon--medium euiIcon-isLoading"
-                        data-test-subj="codeFileTreeNode-Directory-Icon-guava/src/com/google/common-closed"
-                        focusable="false"
-                        height={16}
-                        style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
-                      <span
-                        className="codeFileTree__directory"
-                      >
-                        <div
-                          className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                        >
-                          common
-                        </div>
-                      </span>
-                    </div>
-                    <div
-                      className="codeFileTree__node--link"
-                      data-test-subj="codeFileTreeNode-Directory-guava/src/com/google/common"
-                      onClick={[Function]}
-                      onKeyDown={[Function]}
-                      role="button"
-                      tabIndex={0}
-                    />
-                  </div>
-                </div>
-                <div
-                  className="euiSideNavItem euiSideNavItem--branch"
-                >
-                  <div
-                    className="codeFileTree__node"
-                  >
-                    <div
-                      className="codeFileTree__item kbn-resetFocusState"
-                      onClick={[Function]}
-                      onKeyDown={[Function]}
-                      role="button"
-                      tabIndex={0}
-                    >
-                      <svg
-                        className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                        focusable="false"
-                        height={16}
-                        style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
-                      <svg
-                        className="euiIcon euiIcon--medium euiIcon-isLoading"
-                        data-test-subj="codeFileTreeNode-Directory-Icon-guava/src/com/google/thirdparty/publicsuffix-closed"
-                        focusable="false"
-                        height={16}
-                        style={null}
-                        viewBox="0 0 16 16"
-                        width={16}
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
-                      <span
-                        className="codeFileTree__directory"
-                      >
-                        <div
-                          className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                        >
-                          thirdparty/publicsuffix
-                        </div>
-                      </span>
-                    </div>
-                    <div
-                      className="codeFileTree__node--link"
-                      data-test-subj="codeFileTreeNode-Directory-guava/src/com/google/thirdparty/publicsuffix"
-                      onClick={[Function]}
-                      onKeyDown={[Function]}
-                      role="button"
-                      tabIndex={0}
-                    />
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                data-test-subj="codeFileTreeNode-Directory-Icon-guava-bom-closed"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  guava-bom
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-Directory-guava-bom"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                data-test-subj="codeFileTreeNode-Directory-Icon-guava-gwt-closed"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  guava-gwt
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-Directory-guava-gwt"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                data-test-subj="codeFileTreeNode-Directory-Icon-guava-testlib-closed"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  guava-testlib
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-Directory-guava-testlib"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                data-test-subj="codeFileTreeNode-Directory-Icon-guava-tests-closed"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  guava-tests
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-Directory-guava-tests"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                data-test-subj="codeFileTreeNode-Directory-Icon-refactorings-closed"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  refactorings
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-Directory-refactorings"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--small euiIcon-isLoading codeFileTree__icon"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                data-test-subj="codeFileTreeNode-Directory-Icon-util-closed"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  util
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-Directory-util"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    .gitattributes
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-.gitattributes"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    .gitignore
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-.gitignore"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    .travis.yml
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-.travis.yml"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    CONTRIBUTING.md
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-CONTRIBUTING.md"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    CONTRIBUTORS
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-CONTRIBUTORS"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    COPYING
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-COPYING"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    README.md
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-README.md"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    cycle_whitelist.txt
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-cycle_whitelist.txt"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    javadoc-stylesheet.css
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-javadoc-stylesheet.css"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-        <div
-          className="euiSideNavItem euiSideNavItem--trunk"
-        >
-          <div
-            className="codeFileTree__node"
-          >
-            <div
-              className="codeFileTree__item kbn-resetFocusState codeFileTree__file"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            >
-              <svg
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                height={16}
-                style={null}
-                viewBox="0 0 16 16"
-                width={16}
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                className="codeFileTree__directory"
-              >
-                <div
-                  className="euiText euiText--extraSmall eui-displayInlineBlock euiText--constrainedWidth"
-                >
-                  <div
-                    className="euiTextColor euiTextColor--default"
-                  >
-                    pom.xml
-                  </div>
-                </div>
-              </span>
-            </div>
-            <div
-              className="codeFileTree__node--link"
-              data-test-subj="codeFileTreeNode-File-pom.xml"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex={0}
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</nav>
-`;
diff --git a/x-pack/legacy/plugins/code/public/components/file_tree/file_tree.test.tsx b/x-pack/legacy/plugins/code/public/components/file_tree/file_tree.test.tsx
deleted file mode 100644
index 77146b827fae22..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/file_tree/file_tree.test.tsx
+++ /dev/null
@@ -1,49 +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 { History, Location } from 'history';
-import React from 'react';
-import { match } from 'react-router-dom';
-import renderer from 'react-test-renderer';
-import { MainRouteParams, PathTypes } from '../../common/types';
-import { createHistory, createLocation, createMatch } from '../../utils/test_utils';
-import props from './__fixtures__/props.json';
-import { CodeFileTree } from './file_tree';
-
-const location: Location = createLocation({
-  pathname: '/github.com/google/guava/tree/master/guava/src/com/google',
-});
-
-const m: match<MainRouteParams> = createMatch({
-  path: '/:resource/:org/:repo/:pathType(blob|tree)/:revision/:path*:goto(!.*)?',
-  url: '/github.com/google/guava/tree/master/guava/src/com/google',
-  isExact: true,
-  params: {
-    resource: 'github.com',
-    org: 'google',
-    repo: 'guava',
-    pathType: PathTypes.tree,
-    revision: 'master',
-    path: 'guava/src/com/google',
-  },
-});
-
-const history: History = createHistory({ location, length: 8, action: 'POP' });
-
-test('render correctly', () => {
-  const tree = renderer
-    .create(
-      <CodeFileTree
-        node={props.node}
-        history={history}
-        match={m}
-        location={location}
-        isNotFound={false}
-      />
-    )
-    .toJSON();
-  expect(tree).toMatchSnapshot();
-});
diff --git a/x-pack/legacy/plugins/code/public/components/file_tree/file_tree.tsx b/x-pack/legacy/plugins/code/public/components/file_tree/file_tree.tsx
deleted file mode 100644
index 0c9df3e563c35b..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/file_tree/file_tree.tsx
+++ /dev/null
@@ -1,325 +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 { EuiIcon, EuiSideNav, EuiText } from '@elastic/eui';
-import classes from 'classnames';
-import { connect } from 'react-redux';
-import { RouteComponentProps, withRouter } from 'react-router-dom';
-import { FileTree as Tree, FileTreeItemType } from '../../../model';
-import { EuiSideNavItem, MainRouteParams, PathTypes } from '../../common/types';
-import { RootState } from '../../reducers';
-import { encodeRevisionString } from '../../../common/uri_util';
-import { trackCodeUiMetric, METRIC_TYPE } from '../../services/ui_metric';
-import { CodeUIUsageMetrics } from '../../../model/usage_telemetry_metrics';
-
-interface Props extends RouteComponentProps<MainRouteParams> {
-  node?: Tree;
-  isNotFound: boolean;
-}
-
-interface State {
-  closedPaths: string[];
-  openPaths: string[];
-}
-
-export class CodeFileTree extends React.Component<Props, State> {
-  static getDerivedStateFromProps(props: Props, state: State) {
-    return { openPaths: CodeFileTree.getOpenPaths(props.match.params.path || '', state.openPaths) };
-  }
-
-  constructor(props: Props) {
-    super(props);
-    const { path } = props.match.params;
-    if (path) {
-      this.state = {
-        openPaths: CodeFileTree.getOpenPaths(path, []),
-        closedPaths: [],
-      };
-    } else {
-      this.state = {
-        openPaths: [],
-        closedPaths: [],
-      };
-    }
-  }
-
-  static getOpenPaths = (path: string, openPaths: string[]) => {
-    let p = path;
-    const newOpenPaths = [...openPaths];
-    const pathSegs = p.split('/');
-    while (!openPaths.includes(p)) {
-      newOpenPaths.push(p);
-      pathSegs.pop();
-      if (pathSegs.length <= 0) {
-        break;
-      }
-      p = pathSegs.join('/');
-    }
-    return newOpenPaths;
-  };
-
-  openTreePath = (path: string) => {
-    const newClosedPaths = this.state.closedPaths.filter(p => !(p === path));
-    this.setState({
-      openPaths: CodeFileTree.getOpenPaths(path, this.state.openPaths),
-      closedPaths: newClosedPaths,
-    });
-  };
-
-  closeTreePath = (path: string) => {
-    const isSubFolder = (p: string) => p.startsWith(path + '/');
-    const newOpenPaths = this.state.openPaths.filter(p => !(p === path || isSubFolder(p)));
-    const newClosedPaths = [...this.state.closedPaths, path];
-    this.setState({ openPaths: newOpenPaths, closedPaths: newClosedPaths });
-  };
-
-  public onClick = (node: Tree) => {
-    const { resource, org, repo, revision, path } = this.props.match.params;
-    if (!(path === node.path)) {
-      let pathType: PathTypes;
-      if (node.type === FileTreeItemType.Link || node.type === FileTreeItemType.File) {
-        pathType = PathTypes.blob;
-      } else {
-        pathType = PathTypes.tree;
-      }
-      this.props.history.push(
-        `/${resource}/${org}/${repo}/${pathType}/${encodeRevisionString(revision)}/${node.path}`
-      );
-    }
-  };
-
-  public toggleTree = (path: string) => {
-    if (this.isPathOpen(path)) {
-      this.closeTreePath(path);
-    } else {
-      this.openTreePath(path);
-    }
-  };
-
-  public flattenDirectory: (node: Tree) => Tree[] = (node: Tree) => {
-    if (node.childrenCount === 1 && node.children![0].type === FileTreeItemType.Directory) {
-      if (node.children![0].path === this.props.match.params.path) {
-        return [node, node.children![0]];
-      } else {
-        return [node, ...this.flattenDirectory(node.children![0])];
-      }
-    } else {
-      return [node];
-    }
-  };
-
-  public scrollIntoView(el: any) {
-    if (el) {
-      const rect = el.getBoundingClientRect();
-      const elemTop = rect.top;
-      const elemBottom = rect.bottom;
-      const isVisible = elemTop >= 0 && elemBottom <= window.innerHeight;
-      if (!isVisible) {
-        el.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'center' });
-      }
-    }
-  }
-
-  public getItemRenderer = (node: Tree, forceOpen: boolean, flattenFrom?: Tree) => () => {
-    const className = 'codeFileTree__item kbn-resetFocusState';
-    const onClick = () => {
-      const path = flattenFrom ? flattenFrom.path! : node.path!;
-      this.toggleTree(path);
-      this.onClick(node);
-      // track file tree click count
-      trackCodeUiMetric(METRIC_TYPE.COUNT, CodeUIUsageMetrics.FILE_TREE_CLICK_COUNT);
-    };
-    const nodeTypeMap = {
-      [FileTreeItemType.Directory]: 'Directory',
-      [FileTreeItemType.File]: 'File',
-      [FileTreeItemType.Link]: 'Link',
-      [FileTreeItemType.Submodule]: 'Submodule',
-    };
-    let bg = (
-      <div
-        tabIndex={0}
-        className="codeFileTree__node--link"
-        data-test-subj={`codeFileTreeNode-${nodeTypeMap[node.type]}-${node.path}`}
-        onClick={onClick}
-        onKeyDown={onClick}
-        role="button"
-      />
-    );
-    if (this.props.match.params.path === node.path) {
-      bg = (
-        <div
-          ref={el => this.scrollIntoView(el)}
-          className="codeFileTree__node--fullWidth"
-          tabIndex={0}
-          data-test-subj={`codeFileTreeNode-${nodeTypeMap[node.type]}-${node.path}`}
-          onClick={onClick}
-          onKeyDown={onClick}
-          role="button"
-        />
-      );
-    }
-    switch (node.type) {
-      case FileTreeItemType.Directory: {
-        return (
-          <div className="codeFileTree__node">
-            <div
-              className={className}
-              role="button"
-              tabIndex={0}
-              onKeyDown={onClick}
-              onClick={onClick}
-            >
-              {forceOpen ? (
-                <EuiIcon type="arrowDown" size="s" className="codeFileTree__icon" />
-              ) : (
-                <EuiIcon type="arrowRight" size="s" className="codeFileTree__icon" />
-              )}
-              <EuiIcon
-                type={forceOpen ? 'folderOpen' : 'folderClosed'}
-                data-test-subj={`codeFileTreeNode-Directory-Icon-${node.path}-${
-                  forceOpen ? 'open' : 'closed'
-                }`}
-              />
-              <span className="codeFileTree__directory">
-                <EuiText size="xs" grow={false} className="eui-displayInlineBlock">
-                  {node.name}
-                </EuiText>
-              </span>
-            </div>
-            {bg}
-          </div>
-        );
-      }
-      case FileTreeItemType.Submodule: {
-        return (
-          <div className="codeFileTree__node">
-            <div
-              tabIndex={0}
-              onKeyDown={onClick}
-              onClick={onClick}
-              className={classes(className, 'codeFileTree__file')}
-              role="button"
-            >
-              <EuiIcon type="submodule" />
-              <span className="codeFileTree__directory">
-                <EuiText size="xs" grow={false} color="default" className="eui-displayInlineBlock">
-                  {node.name}
-                </EuiText>
-              </span>
-            </div>
-            {bg}
-          </div>
-        );
-      }
-      case FileTreeItemType.Link: {
-        return (
-          <div className="codeFileTree__node">
-            <div
-              tabIndex={0}
-              onKeyDown={onClick}
-              onClick={onClick}
-              className={classes(className, 'codeFileTree__file')}
-              role="button"
-            >
-              <EuiIcon type="symlink" />
-              <span className="codeFileTree__directory">
-                <EuiText size="xs" grow={false} color="default" className="eui-displayInlineBlock">
-                  {node.name}
-                </EuiText>
-              </span>
-            </div>
-            {bg}
-          </div>
-        );
-      }
-      case FileTreeItemType.File: {
-        return (
-          <div className="codeFileTree__node">
-            <div
-              tabIndex={0}
-              onKeyDown={onClick}
-              onClick={onClick}
-              className={classes(className, 'codeFileTree__file')}
-              role="button"
-            >
-              <EuiIcon type="document" />
-              <span className="codeFileTree__directory">
-                <EuiText size="xs" grow={false} color="default" className="eui-displayInlineBlock">
-                  {node.name}
-                </EuiText>
-              </span>
-            </div>
-            {bg}
-          </div>
-        );
-      }
-    }
-  };
-
-  public treeToItems = (node: Tree): EuiSideNavItem => {
-    const forceOpen =
-      node.type === FileTreeItemType.Directory ? this.isPathOpen(node.path!) : false;
-    const data: EuiSideNavItem = {
-      id: node.name,
-      name: node.name,
-      isSelected: false,
-      renderItem: this.getItemRenderer(node, forceOpen),
-      forceOpen,
-      onClick: () => void 0,
-    };
-    if (node.type === FileTreeItemType.Directory && Number(node.childrenCount) > 0) {
-      const nodes = this.flattenDirectory(node);
-      const length = nodes.length;
-      if (length > 1 && !(this.props.match.params.path === node.path)) {
-        data.name = nodes.map(n => n.name).join('/');
-        data.id = data.name;
-        const lastNode = nodes[length - 1];
-        const flattenNode = {
-          ...lastNode,
-          name: data.name,
-          id: data.id,
-        };
-        data.forceOpen = this.isPathOpen(node.path!);
-        data.renderItem = this.getItemRenderer(flattenNode, data.forceOpen, node);
-        if (data.forceOpen && Number(flattenNode.childrenCount) > 0) {
-          data.items = flattenNode.children!.map(this.treeToItems);
-        }
-      } else if (forceOpen && node.children) {
-        data.items = node.children.map(this.treeToItems);
-      }
-    }
-    return data;
-  };
-
-  public render() {
-    const items = [
-      {
-        name: '',
-        id: '',
-        items: (this.props.node!.children || []).map(this.treeToItems),
-      },
-    ];
-    return (
-      this.props.node && (
-        <EuiSideNav items={items} isOpenOnMobile={true} className="codeContainer__sideTabTree" />
-      )
-    );
-  }
-
-  private isPathOpen(path: string) {
-    if (this.props.isNotFound) return false;
-    return this.state.openPaths.includes(path) && !this.state.closedPaths.includes(path);
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  node: state.fileTree.tree,
-  isNotFound: state.file.isNotFound,
-});
-
-export const FileTree = withRouter(connect(mapStateToProps)(CodeFileTree));
diff --git a/x-pack/legacy/plugins/code/public/components/help_menu/help_menu.tsx b/x-pack/legacy/plugins/code/public/components/help_menu/help_menu.tsx
deleted file mode 100644
index 009db11fe2f70b..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/help_menu/help_menu.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { npStart } from 'ui/new_platform';
-import { EuiButton, EuiHorizontalRule, EuiText, EuiSpacer } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { documentationLinks } from '../../lib/documentation_links';
-
-export class HelpMenu extends React.PureComponent {
-  public render() {
-    return (
-      <React.Fragment>
-        <EuiHorizontalRule margin="none" />
-        <EuiSpacer />
-        <EuiText size="s">
-          <p>
-            <FormattedMessage
-              id="xpack.code.helpMenu.helpDescription"
-              defaultMessage="For Code specific information"
-            />
-          </p>
-        </EuiText>
-        <EuiSpacer />
-        <EuiButton
-          fill
-          iconType="popout"
-          href={npStart.core.http.basePath.prepend('/app/code#/setup-guide')}
-        >
-          <FormattedMessage
-            id="xpack.code.helpMenu.setupGuideButtonLabel"
-            defaultMessage="Setup Guide"
-          />
-        </EuiButton>
-        <EuiSpacer />
-        <EuiButton fill iconType="popout" href={documentationLinks.code} target="_blank">
-          <FormattedMessage
-            id="xpack.code.helpMenu.codeDocumentationButtonLabel"
-            defaultMessage="Code documentation"
-          />
-        </EuiButton>
-      </React.Fragment>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/help_menu/index.ts b/x-pack/legacy/plugins/code/public/components/help_menu/index.ts
deleted file mode 100644
index 47682169c51e03..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/help_menu/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { HelpMenu } from './help_menu';
diff --git a/x-pack/legacy/plugins/code/public/components/hover/hover_buttons.tsx b/x-pack/legacy/plugins/code/public/components/hover/hover_buttons.tsx
deleted file mode 100644
index 818a9570982b8e..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/hover/hover_buttons.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiButton, EuiFlexGroup } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import React from 'react';
-import { HoverState } from './hover_widget';
-
-export interface HoverButtonProps {
-  state: HoverState;
-  gotoDefinition: () => void;
-  findReferences: () => void;
-}
-
-export class HoverButtons extends React.PureComponent<HoverButtonProps> {
-  public render() {
-    return (
-      <React.Fragment>
-        <EuiFlexGroup className="button-group euiFlexGroup" gutterSize="none" responsive={true}>
-          <EuiButton
-            size="s"
-            isDisabled={this.props.state !== HoverState.READY}
-            onClick={this.props.gotoDefinition}
-            data-test-subj="codeGoToDefinitionButton"
-          >
-            <FormattedMessage
-              id="xpack.code.monaco.hover.gotoDefinitionButtonLabel"
-              defaultMessage="Goto Definition"
-            />
-          </EuiButton>
-          <EuiButton
-            size="s"
-            isDisabled={this.props.state !== HoverState.READY}
-            onClick={this.props.findReferences}
-            data-test-subj="codeFindReferenceButton"
-          >
-            <FormattedMessage
-              id="xpack.code.monaco.hover.findReferenceButtonLabel"
-              defaultMessage="Find Reference"
-            />
-          </EuiButton>
-        </EuiFlexGroup>
-      </React.Fragment>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/hover/hover_widget.tsx b/x-pack/legacy/plugins/code/public/components/hover/hover_widget.tsx
deleted file mode 100644
index 69dcc2ebea6b78..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/hover/hover_widget.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiText, EuiLink } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
-import { MarkedString } from 'vscode-languageserver-types';
-import ReactMarkdown from 'react-markdown';
-// @ts-ignore
-import { tokenizeToString } from 'monaco-editor/esm/vs/editor/common/modes/textToHtmlTokenizer';
-// @ts-ignore
-import { TokenizationRegistry } from 'monaco-editor/esm/vs/editor/common/modes';
-
-export interface HoverWidgetProps {
-  state: HoverState;
-  contents?: MarkedString[];
-  gotoDefinition: () => void;
-  findReferences: () => void;
-}
-
-export enum HoverState {
-  LOADING,
-  INITIALIZING,
-  READY,
-}
-
-export class HoverWidget extends React.PureComponent<HoverWidgetProps> {
-  public render() {
-    let contents;
-
-    switch (this.props.state) {
-      case HoverState.READY:
-        contents = this.renderContents();
-        break;
-      case HoverState.INITIALIZING:
-        contents = this.renderInitialting();
-        break;
-      case HoverState.LOADING:
-      default:
-        contents = this.renderLoading();
-    }
-    return <React.Fragment>{contents}</React.Fragment>;
-  }
-
-  private renderLoading() {
-    return (
-      <div className="hover-row">
-        <div className="text-placeholder gradient" />
-        <div className="text-placeholder gradient" style={{ width: '90%' }} />
-        <div className="text-placeholder gradient" style={{ width: '75%' }} />
-      </div>
-    );
-  }
-
-  private renderContents() {
-    const markdownRenderers = {
-      link: ({ children, href }: { children: React.ReactNode[]; href?: string }) => (
-        <EuiLink href={href} target="_blank">
-          {children}
-        </EuiLink>
-      ),
-      code: ({ value, language }: { value: string; language: string }) => {
-        const support = TokenizationRegistry.get(language);
-        const code = tokenizeToString(value || '', support);
-        return <div className="code" dangerouslySetInnerHTML={{ __html: code }} />;
-      },
-    };
-    return this.props
-      .contents!.filter(content => !!content)
-      .map((markedString, idx) => {
-        let markdown: string;
-        if (typeof markedString === 'string') {
-          markdown = markedString;
-        } else if (markedString.language) {
-          markdown = '```' + markedString.language + '\n' + markedString.value + '\n```';
-        } else {
-          markdown = markedString.value;
-        }
-
-        return (
-          <div className="hover-row" key={`hover_${idx}`}>
-            <ReactMarkdown
-              source={markdown}
-              escapeHtml={true}
-              skipHtml={true}
-              renderers={markdownRenderers}
-            />
-          </div>
-        );
-      });
-  }
-
-  private renderInitialting() {
-    return (
-      <div className="hover-row">
-        {/*
-              // @ts-ignore */}
-        <EuiText textAlign="center">
-          <h4>
-            <FormattedMessage
-              id="xpack.code.monaco.hover.languageServerInitializingTitle"
-              defaultMessage="Language Server is initializing…"
-            />
-          </h4>
-          <EuiText size="xs" color="subdued">
-            <p>
-              <FormattedMessage
-                id="xpack.code.monaco.hover.languageServerInitializingDescription"
-                defaultMessage="Depending on the size of your repo, this could take a few minutes."
-              />
-            </p>
-          </EuiText>
-        </EuiText>
-      </div>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/code_flyout.scss b/x-pack/legacy/plugins/code/public/components/integrations/code_flyout.scss
deleted file mode 100644
index 90f28229480a37..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/code_flyout.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-.codeFlyout__subHeader {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-
-.codeFlyout__fileHeader {
-  position: absolute;
-  display: flex;
-  align-items: center;
-  z-index: 1;
-}
-
-.codeFlyout__fileLink {
-  font-weight: $euiFontWeightBold;
-}
-
-.codeFlyout__icon {
-  margin: $euiSizeS;
-}
-
-.codeFlyout__tabs {
-  justify-content: flex-end;
-}
-
-.codeFlyout__content {
-  display: flex;
-  height: 100%;
-}
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/code_flyout.tsx b/x-pack/legacy/plugins/code/public/components/integrations/code_flyout.tsx
deleted file mode 100644
index ed023aa8a52c69..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/code_flyout.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import React from 'react';
-import { EuiFlyout } from '@elastic/eui';
-import { CodeFlyoutMain } from './code_flyout_main';
-
-export const CodeFlyout = (props: {
-  repo: string;
-  file: string;
-  revision: string;
-  open: boolean;
-  onClose: () => void;
-}) => {
-  if (props.open) {
-    return (
-      <EuiFlyout
-        onClose={props.onClose}
-        size="l"
-        aria-labelledby="flyoutTitle"
-        className="codeFlyout"
-      >
-        <CodeFlyoutMain repo={props.repo} file={props.file} revision={props.revision} />
-      </EuiFlyout>
-    );
-  } else {
-    return null;
-  }
-};
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/code_flyout_main.tsx b/x-pack/legacy/plugins/code/public/components/integrations/code_flyout_main.tsx
deleted file mode 100644
index 7468fc15bafc29..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/code_flyout_main.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { Fragment, ReactNode } from 'react';
-import {
-  EuiTitle,
-  EuiFlyoutHeader,
-  EuiText,
-  EuiTabs,
-  EuiTab,
-  EuiIcon,
-  EuiLink,
-} from '@elastic/eui';
-import { CodeViewer } from './code_viewer';
-import { History } from './history';
-import { absoluteCodeFileURI } from './helpers';
-
-enum Tab {
-  code,
-  history,
-  blame,
-}
-
-export const CodeFlyoutMain = (props: { repo: string; file: string; revision: string }) => {
-  const [selectedTab, setSelectedTab] = React.useState<Tab>(Tab.code);
-
-  let content: ReactNode;
-
-  switch (selectedTab) {
-    case Tab.blame:
-      content = (
-        <CodeViewer
-          key="blame"
-          repo={props.repo}
-          file={props.file}
-          revision={props.revision}
-          showBlame={true}
-        />
-      );
-      break;
-    case Tab.history:
-      content = <History revision={props.revision} repo={props.repo} file={props.file} />;
-      break;
-    case Tab.code:
-      content = (
-        <CodeViewer key="code" repo={props.repo} file={props.file} revision={props.revision} />
-      );
-      break;
-  }
-
-  return (
-    <Fragment>
-      <EuiFlyoutHeader hasBorder>
-        <EuiTitle size="m">
-          <h2 id="flyoutTitle">File Preview</h2>
-        </EuiTitle>
-      </EuiFlyoutHeader>
-      <div className="codeFlyout__subHeader">
-        <div className="codeFlyout__fileHeader">
-          <EuiIcon className="codeFlyout__icon" type="codeApp" size="m" />
-          <EuiText size="s">
-            <EuiLink
-              className="codeFlyout__fileLink"
-              href={absoluteCodeFileURI(props.repo, props.file, props.revision)}
-            >
-              {props.file}
-            </EuiLink>
-          </EuiText>
-        </div>
-        <EuiTabs className="codeFlyout__tabs">
-          <EuiTab onClick={() => setSelectedTab(Tab.code)} isSelected={selectedTab === Tab.code}>
-            Code
-          </EuiTab>
-          <EuiTab
-            onClick={() => setSelectedTab(Tab.history)}
-            isSelected={selectedTab === Tab.history}
-          >
-            History
-          </EuiTab>
-          <EuiTab onClick={() => setSelectedTab(Tab.blame)} isSelected={selectedTab === Tab.blame}>
-            Blame
-          </EuiTab>
-        </EuiTabs>
-      </div>
-      <div className="codeFlyout__content">{content}</div>
-    </Fragment>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/code_integrator.tsx b/x-pack/legacy/plugins/code/public/components/integrations/code_integrator.tsx
deleted file mode 100644
index 5f69c6f2ca4792..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/code_integrator.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useState } from 'react';
-import { EuiButtonEmpty, EuiPopover, EuiText } from '@elastic/eui';
-
-import { RepoSelector } from './repo_selector';
-
-export interface Props {
-  onRepoSelect: (repo: string) => void;
-  onImportSuccess: (repo: string) => void;
-  repos: string[];
-}
-
-export const CodeIntegrator = ({ onRepoSelect, onImportSuccess, repos }: Props) => {
-  const [showSelector, setShowSelector] = useState(false);
-
-  const handleClick = () => setShowSelector(true);
-
-  const handleSelect = (codeId: string) => {
-    onRepoSelect(codeId);
-    setShowSelector(false);
-    // TODO: show success
-  };
-
-  const link = (
-    <EuiButtonEmpty
-      className="codeIntegrations__link--external"
-      iconType="codeApp"
-      onClick={handleClick}
-    >
-      <EuiText size="s">View in Code</EuiText>
-    </EuiButtonEmpty>
-  );
-
-  return (
-    <EuiPopover
-      anchorPosition="leftCenter"
-      button={link}
-      isOpen={showSelector}
-      closePopover={() => setShowSelector(false)}
-    >
-      <EuiText size="s" className="codeIntegrations__popover">
-        <h3>No repository mapping found</h3>
-        <p>
-          We can't find the mapping between service and the source code. Select the repository or
-          import a new one.
-        </p>
-      </EuiText>
-      <RepoSelector onSelect={handleSelect} onImport={onImportSuccess} repos={repos} />
-    </EuiPopover>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/code_viewer.tsx b/x-pack/legacy/plugins/code/public/components/integrations/code_viewer.tsx
deleted file mode 100644
index ae14ece21b245e..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/code_viewer.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { Component } from 'react';
-import { editor } from 'monaco-editor';
-import { ResizeChecker } from 'ui/resize_checker';
-import {
-  EuiFlexGroup,
-  EuiProgress,
-  EuiPage,
-  EuiPageBody,
-  EuiPageContent,
-  EuiPageContentHeader,
-  EuiPageContentHeaderSection,
-  EuiPageContentBody,
-} from '@elastic/eui';
-import { monaco } from '../../monaco/monaco';
-import { requestFile } from '../../sagas/file';
-import { GitBlame } from '../../../common/git_blame';
-import { BlameWidget } from '../../monaco/blame/blame_widget';
-import { requestBlame } from '../../sagas/blame';
-
-export interface Props {
-  repo: string;
-  file: string;
-  revision: string;
-  showBlame?: boolean;
-}
-
-interface State {
-  loading: boolean;
-}
-
-export class CodeViewer extends Component<Props, State> {
-  public readonly state: State = {
-    loading: true,
-  };
-  public blameWidgets: any;
-
-  private ed?: editor.IStandaloneCodeEditor;
-  private lineDecorations: string[] | null = null;
-  private resizeChecker?: ResizeChecker;
-  private viewerRef = React.createRef<HTMLDivElement>();
-
-  public componentDidMount(): void {
-    this.tryLoadFile(this.props);
-  }
-
-  public componentWillUnmount(): void {
-    if (this.ed) {
-      this.ed.dispose();
-      this.destroyBlameWidgets();
-    }
-  }
-
-  private async tryLoadFile({ file, revision, repo, showBlame }: Props) {
-    this.setState({ loading: true });
-    const { content, lang } = await requestFile({
-      path: file,
-      revision,
-      uri: repo,
-    });
-    try {
-      await monaco.editor.colorize(content!, lang!, {});
-      this.loadFile(content!, lang);
-    } catch (e) {
-      this.loadFile(content!);
-    }
-    if (showBlame) {
-      const blames: GitBlame[] = await requestBlame(repo, revision, file);
-      this.loadBlame(blames);
-    }
-    this.setState({ loading: false });
-  }
-
-  public loadBlame(blames: GitBlame[]) {
-    if (this.blameWidgets) {
-      this.destroyBlameWidgets();
-    }
-    if (!this.lineDecorations) {
-      this.lineDecorations = this.ed!.deltaDecorations(
-        [],
-        [
-          {
-            range: new monaco.Range(1, 1, Infinity, 1),
-            options: { isWholeLine: true, linesDecorationsClassName: 'code-line-decoration' },
-          },
-        ]
-      );
-    }
-    this.blameWidgets = blames.map((b, index) => {
-      return new BlameWidget(b, index === 0, this.ed!);
-    });
-  }
-
-  public destroyBlameWidgets() {
-    if (this.blameWidgets) {
-      this.blameWidgets.forEach((bw: BlameWidget) => bw.destroy());
-    }
-    if (this.lineDecorations) {
-      this.ed!.deltaDecorations(this.lineDecorations!, []);
-      this.lineDecorations = null;
-    }
-    this.blameWidgets = null;
-    if (this.resizeChecker) {
-      this.resizeChecker.destroy();
-    }
-  }
-
-  private loadFile(code: string, language: string = 'text') {
-    const container = this.viewerRef.current!;
-    this.ed = monaco.editor.create(container, {
-      value: code,
-      language,
-      readOnly: true,
-      minimap: {
-        enabled: false,
-      },
-      hover: {
-        enabled: false,
-      },
-      contextmenu: false,
-      selectOnLineNumbers: false,
-      selectionHighlight: false,
-      renderLineHighlight: 'none',
-      scrollBeyondLastLine: false,
-      renderIndentGuides: false,
-      automaticLayout: false,
-      lineDecorationsWidth: this.props.showBlame ? 316 : 16,
-    });
-    this.resizeChecker = new ResizeChecker(container);
-    this.resizeChecker.on('resize', () => {
-      setTimeout(() => {
-        this.ed!.layout();
-      });
-    });
-  }
-
-  renderFileLoadingIndicator = () => {
-    const fileName = this.props.file;
-    return (
-      <EuiPage restrictWidth>
-        <EuiPageBody>
-          <EuiPageContent verticalPosition="center" horizontalPosition="center">
-            <EuiPageContentHeader>
-              <EuiPageContentHeaderSection>
-                <h2>{fileName} is loading...</h2>
-              </EuiPageContentHeaderSection>
-            </EuiPageContentHeader>
-            <EuiPageContentBody>
-              <EuiProgress size="s" color="primary" />
-            </EuiPageContentBody>
-          </EuiPageContent>
-        </EuiPageBody>
-      </EuiPage>
-    );
-  };
-
-  render() {
-    return (
-      <EuiFlexGroup direction="row" className="codeContainer__blame" gutterSize="none">
-        {this.state.loading && this.renderFileLoadingIndicator()}
-        <div tabIndex={0} className="codeViewer codeContainer__monaco" ref={this.viewerRef} />
-      </EuiFlexGroup>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/data.ts b/x-pack/legacy/plugins/code/public/components/integrations/data.ts
deleted file mode 100644
index 5af3cd3839a28f..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/data.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export interface Snippet {
-  uri: string;
-  filePath: string;
-  language?: string;
-  compositeContent: {
-    content: string;
-    lineMapping: string[];
-  };
-}
-
-export type Results = Record<string, Snippet>;
-
-export const results: Results = {
-  'user.ts#L15': {
-    uri: 'github.com/Microsoft/Typescript-Node-Starter',
-    filePath: 'src/controllers/user.ts',
-    language: 'typescript',
-    compositeContent: {
-      content:
-        '\nimport nodemailer from "nodemailer";\nimport passport from "passport";\nimport { User, UserDocument, AuthToken } from "../models/User";\nimport { Request, Response, NextFunction } from "express";\nimport { IVerifyOptions } from "passport-local";\n\n */\nexport const getLogin = (req: Request, res: Response) => {\n    if (req.user) {\n        return res.redirect("/");\n    }\n\n    }\n\n    passport.authenticate("local", (err: Error, user: UserDocument, info: IVerifyOptions) => {\n        if (err) { return next(err); }\n        if (!user) {\n',
-      lineMapping: [
-        '..',
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '..',
-        '15',
-        '16',
-        '17',
-        '18',
-        '19',
-        '..',
-        '40',
-        '41',
-        '42',
-        '43',
-        '44',
-        '..',
-      ],
-    },
-  },
-  'User.ts#L8': {
-    uri: 'github.com/Microsoft/Typescript-Node-Starter',
-    filePath: 'src/models/User.ts',
-    language: 'typescript',
-    compositeContent: {
-      content:
-        '\nimport mongoose from "mongoose";\n\nexport type UserDocument = mongoose.Document & {\n    email: string;\n    password: string;\n\n}\n\nconst userSchema = new mongoose.Schema({\n    email: { type: String, unique: true },\n    password: String,\n\n * Password hash middleware.\n */\nuserSchema.pre("save", function save(next) {\n    const user = this as UserDocument;\n    if (!user.isModified("password")) { return next(); }\n    bcrypt.genSalt(10, (err, salt) => {\n',
-      lineMapping: [
-        '..',
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '..',
-        '31',
-        '32',
-        '33',
-        '34',
-        '35',
-        '..',
-        '54',
-        '55',
-        '56',
-        '57',
-        '58',
-        '59',
-        '..',
-      ],
-    },
-  },
-  'passport.ts#L10': {
-    uri: 'github.com/Microsoft/Typescript-Node-Starter',
-    filePath: 'src/config/passport.ts',
-    language: 'typescript',
-    compositeContent: {
-      content:
-        '\nimport _ from "lodash";\n\n// import { User, UserType } from \'../models/User\';\nimport { User, UserDocument } from "../models/User";\nimport { Request, Response, NextFunction } from "express";\n\n',
-      lineMapping: ['..', '4', '5', '6', '7', '8', '9', '..'],
-    },
-  },
-  'user.test.ts#L3': {
-    uri: 'github.com/Microsoft/Typescript-Node-Starter',
-    filePath: 'test/user.test.ts',
-    language: 'typescript',
-    compositeContent: {
-      content:
-        'import request from "supertest";\nimport app from "../src/app";\nimport { expect } from "chai";\n',
-      lineMapping: ['1', '2', '3', '..'],
-    },
-  },
-  'app.ts#L60': {
-    uri: 'github.com/Microsoft/Typescript-Node-Starter',
-    filePath: 'src/app.ts',
-    language: 'typescript',
-    compositeContent: {
-      content:
-        '\n// Controllers (route handlers)\nimport * as homeController from "./controllers/home";\nimport * as userController from "./controllers/user";\nimport * as apiController from "./controllers/api";\nimport * as contactController from "./controllers/contact";\n\napp.use(lusca.xssProtection(true));\napp.use((req, res, next) => {\n    res.locals.user = req.user;\n    next();\n});\napp.use((req, res, next) => {\n    // After successful login, redirect back to the intended page\n    if (!req.user &&\n    req.path !== "/login" &&\n    req.path !== "/signup" &&\n',
-      lineMapping: [
-        '..',
-        '16',
-        '17',
-        '18',
-        '19',
-        '20',
-        '..',
-        '60',
-        '61',
-        '62',
-        '63',
-        '64',
-        '65',
-        '66',
-        '67',
-        '68',
-        '69',
-        '..',
-      ],
-    },
-  },
-};
-
-export interface Frame {
-  fileName: string;
-  lineNumber: number;
-  functionName?: string;
-}
-
-export const frames: Frame[] = [
-  { fileName: 'user.ts', lineNumber: 15 },
-  { fileName: 'user.ts', lineNumber: 25 },
-  { fileName: 'User.ts', lineNumber: 8 },
-  { fileName: 'passport.ts', lineNumber: 10 },
-  { fileName: 'app.ts', lineNumber: 60 },
-  { fileName: 'app.ts', lineNumber: 2 },
-  { fileName: 'user.test.ts', lineNumber: 18 },
-  { fileName: 'user.test.ts', lineNumber: 3 },
-];
-
-export const repos = [
-  'https://github.com/a/repo',
-  'https://github.com/another/repo',
-  'https://github.com/also/a_repo',
-];
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/frame_header.tsx b/x-pack/legacy/plugins/code/public/components/integrations/frame_header.tsx
deleted file mode 100644
index c63faf75603dad..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/frame_header.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-
-import { EuiButtonIcon, EuiFlexGroup, EuiLink, EuiText, EuiTextColor } from '@elastic/eui';
-
-export const FrameHeader = ({
-  fileName,
-  lineNumber,
-  onClick,
-}: {
-  fileName: string;
-  lineNumber: number | string;
-  onClick: () => void;
-}) => (
-  <EuiFlexGroup
-    className="codeIntegrations__snippet-info"
-    alignItems="center"
-    justifyContent="spaceBetween"
-    gutterSize="none"
-  >
-    <EuiText size="s">
-      <EuiLink onClick={onClick}>{fileName}</EuiLink>
-      <span> at </span>
-      <EuiLink onClick={onClick}>line {lineNumber}</EuiLink>
-    </EuiText>
-    <EuiText size="xs">
-      <EuiTextColor color="subdued">Last updated: 14 mins ago</EuiTextColor>
-      <EuiButtonIcon
-        className="codeIntegrations__link--external codeIntegrations__button-icon"
-        iconType="codeApp"
-        onClick={onClick}
-      />
-    </EuiText>
-  </EuiFlexGroup>
-);
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/helpers.ts b/x-pack/legacy/plugins/code/public/components/integrations/helpers.ts
deleted file mode 100644
index 9913ab80a6f653..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/helpers.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-// TODO(rylnd): make this an actual external link
-export const externalFileURI: (repoUri: string, filePath: string) => string = (uri, path) =>
-  `/${uri}/blob/HEAD/${path}`;
-
-export const absoluteCodeFileURI: (
-  repoUri: string,
-  filePath: string,
-  revision: string
-) => string = (uri, path, revision = 'HEAD') => `/app/code#/${uri}/blob/${revision}/${path}`;
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/history.tsx b/x-pack/legacy/plugins/code/public/components/integrations/history.tsx
deleted file mode 100644
index c867bb31b657d7..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/history.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import React from 'react';
-import { EuiTitle } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { CommitHistoryComponent } from '../commits';
-import { requestCommits } from '../../sagas/file';
-import { CommitInfo } from '../../../model/commit';
-
-const PAGE_SIZE = 20;
-
-export const History = (props: { repo: string; file: string; revision: string }) => {
-  const [loading, setLoading] = React.useState(true);
-  const [commits, setCommits] = React.useState<CommitInfo[]>([]);
-  const [hasMore, setHasMore] = React.useState(false);
-
-  const fetchCommits = async (loadMore: boolean) => {
-    setLoading(true);
-    const revision = loadMore ? commits[commits.length - 1].id : props.revision;
-    const newCommits = await requestCommits(
-      { uri: props.repo, revision },
-      props.file,
-      loadMore,
-      PAGE_SIZE
-    );
-    setLoading(false);
-    setHasMore(newCommits.length >= PAGE_SIZE);
-    setCommits(commits.concat(newCommits));
-    return newCommits;
-  };
-
-  React.useEffect(() => {
-    fetchCommits(false).then(setCommits);
-  }, []);
-
-  return (
-    <CommitHistoryComponent
-      commits={commits}
-      fetchMoreCommits={() => fetchCommits(true)}
-      loadingCommits={loading}
-      hasMoreCommit={hasMore}
-      header={
-        <EuiTitle className="codeMargin__title">
-          <h3>
-            <FormattedMessage
-              id="xpack.code.mainPage.history.commitHistoryTitle"
-              defaultMessage="Commit History"
-            />
-          </h3>
-        </EuiTitle>
-      }
-      showPagination={true}
-      repoUri={props.repo}
-    />
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/import_modal.tsx b/x-pack/legacy/plugins/code/public/components/integrations/import_modal.tsx
deleted file mode 100644
index de526d4046e285..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/import_modal.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { ChangeEvent } from 'react';
-
-import {
-  EuiButton,
-  EuiButtonEmpty,
-  EuiFieldText,
-  EuiForm,
-  EuiFormRow,
-  EuiModal,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiOverlayMask,
-  EuiTitle,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-
-interface Props {
-  isInvalid: boolean;
-  isLoading: boolean;
-  onChange: (e: ChangeEvent<HTMLInputElement>) => void;
-  onClose: () => void;
-  onSubmit: () => void;
-  value: string;
-}
-
-export const ImportModal = ({
-  isInvalid,
-  isLoading,
-  onChange,
-  onClose,
-  onSubmit,
-  value,
-}: Props) => (
-  <EuiOverlayMask>
-    <EuiModal onClose={onClose}>
-      <EuiModalHeader>
-        <EuiModalHeaderTitle>
-          <FormattedMessage
-            id="xpack.code.adminPage.repoTab.importRepoTitle"
-            defaultMessage="Import a new repo"
-          />
-        </EuiModalHeaderTitle>
-      </EuiModalHeader>
-      <EuiModalBody>
-        <EuiTitle size="xs">
-          <h3>
-            <FormattedMessage
-              id="xpack.code.adminPage.repoTab.repositoryUrlFormLabel"
-              defaultMessage="Repository URL"
-            />
-          </h3>
-        </EuiTitle>
-        <EuiForm>
-          <EuiFormRow
-            isInvalid={isInvalid}
-            error={i18n.translate('xpack.code.adminPage.repoTab.repositoryUrlEmptyText', {
-              defaultMessage: "The URL shouldn't be empty.",
-            })}
-          >
-            <EuiFieldText
-              value={value}
-              onChange={onChange}
-              onBlur={onChange}
-              placeholder="https://github.com/Microsoft/TypeScript-Node-Starter"
-              aria-label="input project url"
-              data-test-subj="importRepositoryUrlInputBox"
-              isLoading={isLoading}
-              fullWidth={true}
-              isInvalid={isInvalid}
-              autoFocus={true}
-            />
-          </EuiFormRow>
-        </EuiForm>
-      </EuiModalBody>
-      <EuiModalFooter>
-        <EuiButtonEmpty onClick={onClose}>
-          <FormattedMessage
-            id="xpack.code.adminPage.repoTab.cancelButtonLabel"
-            defaultMessage="Cancel"
-          />
-        </EuiButtonEmpty>
-        <EuiButton fill onClick={onSubmit} disabled={isLoading}>
-          <FormattedMessage
-            id="xpack.code.adminPage.repoTab.importButtonLabel"
-            defaultMessage="Import"
-          />
-        </EuiButton>
-      </EuiModalFooter>
-    </EuiModal>
-  </EuiOverlayMask>
-);
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/index.tsx b/x-pack/legacy/plugins/code/public/components/integrations/index.tsx
deleted file mode 100644
index 81e53398b851e1..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/index.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 from 'react';
-import { EuiFlexGroup, EuiPanel, EuiText } from '@elastic/eui';
-
-import { CodeBlock } from '../code_block';
-import { FrameHeader } from './frame_header';
-import { RepoTitle } from './repo_title';
-import { CodeIntegrator } from './code_integrator';
-import { frames, Frame, repos, results } from './data';
-import { CodeFlyout } from './code_flyout';
-
-const associateToService = (frame: Frame) => (repo: string) =>
-  alert(`repo ${repo} associated with service ${JSON.stringify(frame)}`);
-
-const handleImport = (repo: string) => alert(`import done: ${repo}`);
-
-export const Integrations = () => {
-  const [isFlyoutVisible, setVisible] = React.useState(false);
-  const [flyoutFile, setflyoutFile] = React.useState({
-    repo: 'github.com/Microsoft/TypeScript-Node-Starter',
-    file: 'src/app.ts',
-    revision: 'master',
-  });
-
-  const closeFlyout = () => {
-    setVisible(false);
-  };
-
-  const showFlyout = (repo: string, file: string, revision: string = 'master') => {
-    setflyoutFile({
-      repo,
-      file,
-      revision,
-    });
-    setVisible(true);
-  };
-
-  return (
-    <div className="codeIntegrations__container">
-      <CodeFlyout
-        open={isFlyoutVisible}
-        onClose={closeFlyout}
-        file={flyoutFile.file}
-        repo={flyoutFile.repo}
-        revision={flyoutFile.revision}
-      />
-      {frames.map(frame => {
-        const { fileName, lineNumber } = frame;
-        const key = `${fileName}#L${lineNumber}`;
-        const snippet = results[key];
-
-        if (snippet) {
-          const { compositeContent, filePath, language, uri } = snippet;
-          const { content, lineMapping } = compositeContent;
-          const lines = content.split('\n');
-
-          return (
-            <div key={key} className="codeIntegrations__frame">
-              <RepoTitle uri={snippet.uri} />
-              <EuiPanel paddingSize="s">
-                <FrameHeader
-                  fileName={fileName}
-                  lineNumber={lineNumber}
-                  onClick={() => showFlyout(uri, filePath)}
-                />
-                <CodeBlock lines={lines} language={language} lineNumber={i => lineMapping[i]} />
-              </EuiPanel>
-            </div>
-          );
-        }
-
-        return (
-          <div key={key} className="codeIntegrations__frame">
-            <EuiFlexGroup justifyContent="spaceBetween" gutterSize="none" alignItems="center">
-              <EuiText size="s" className="codeIntegrations__code">
-                <span>{fileName}</span>
-                <span className="codeIntegrations__preposition">at</span>
-                <span>line {lineNumber}</span>
-              </EuiText>
-              <CodeIntegrator
-                onRepoSelect={associateToService(frame)}
-                onImportSuccess={handleImport}
-                repos={repos}
-              />
-            </EuiFlexGroup>
-          </div>
-        );
-      })}
-    </div>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/integrations.scss b/x-pack/legacy/plugins/code/public/components/integrations/integrations.scss
deleted file mode 100644
index 1def1c4c85b051..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/integrations.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-.codeIntegrations__container {
-  padding: $euiSize;
-}
-
-.codeIntegrations__frame {
-  margin: $euiSizeS 0;
-}
-
-.codeIntegrations__code {
-  @include euiCodeFont;
-}
-
-.codeIntegrations__link--external {
-  margin-left: $euiSizeS;
-}
-
-.codeIntegrations__preposition {
-  margin: 0 $euiSizeS;
-  color: $euiColorMediumShade;
-}
-
-.codeIntegrations__button-icon {
-  padding: $euiSizeXS;
-  background-color: $euiColorLightestShade;
-  border: 1px solid $euiColorLightShade;
-}
-
-.codeIntegrations__snippet-info {
-  margin-bottom: $euiSizeS;
-}
-
-.codeIntegrations__snippet-title {
-  margin-bottom: $euiSizeS;
-}
-
-.codeIntegrations__text--bold {
-  font-weight: $euiFontWeightBold;
-}
-
-.codeIntegrations__popover {
-  margin-bottom: 1rem;
-  width: 300px;
-}
-
-
-@import "./code_flyout.scss";
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/repo_selector.tsx b/x-pack/legacy/plugins/code/public/components/integrations/repo_selector.tsx
deleted file mode 100644
index 8aeba2b600ed25..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/repo_selector.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useState } from 'react';
-import { EuiButton, EuiSelect } from '@elastic/eui';
-import { ImportModal } from './import_modal';
-import { isImportRepositoryURLInvalid } from '../../utils/url';
-
-interface Props {
-  onSelect: (repo: string) => void;
-  onImport: (repo: string) => void;
-  repos: string[];
-}
-
-const placeHolderOption = { value: 'select_new', text: 'Select' };
-const importNewOption = { value: 'import_new', text: 'Import new' };
-const importStub: (repo: string) => Promise<string> = repo =>
-  new Promise(resolve => setTimeout(() => resolve(repo), 5000));
-
-export const RepoSelector = ({ onImport, onSelect, repos: _repos }: Props) => {
-  const [selectedValue, setSelectedValue] = useState(placeHolderOption.value);
-  const [newRepo, setNewRepo] = useState('');
-  const [isInvalid, setIsInvalid] = useState(false);
-  const [showModal, setShowModal] = useState(false);
-
-  const repos = newRepo ? [..._repos, newRepo] : _repos;
-  const selectedRepo = repos.find(repo => repo === selectedValue);
-
-  const options = [
-    placeHolderOption,
-    ...repos.map(repo => ({ value: repo, text: repo })),
-    importNewOption,
-  ];
-
-  const handleNewRepoChange = ({ target: { value } }: React.ChangeEvent<HTMLInputElement>) => {
-    setIsInvalid(isImportRepositoryURLInvalid(value));
-    setNewRepo(value);
-  };
-
-  const handleChange = ({ target: { value } }: React.ChangeEvent<HTMLSelectElement>) => {
-    setSelectedValue(value);
-
-    if (value === 'import_new') {
-      setShowModal(true);
-    }
-  };
-
-  const handleSave = () => selectedRepo && onSelect(selectedRepo);
-
-  const handleImportSubmit = () => {
-    setSelectedValue(newRepo);
-    importStub(newRepo).then(onImport);
-    setShowModal(false);
-  };
-
-  const handleClose = () => {
-    setSelectedValue(placeHolderOption.value);
-    setShowModal(false);
-  };
-
-  return (
-    <>
-      <EuiSelect options={options} value={selectedValue} onChange={handleChange} />
-      <EuiButton disabled={!selectedRepo} onClick={handleSave} style={{ marginTop: '1rem' }}>
-        Save Mapping
-      </EuiButton>
-      {showModal && (
-        <ImportModal
-          onChange={handleNewRepoChange}
-          value={newRepo}
-          isInvalid={isInvalid}
-          isLoading={false}
-          onClose={handleClose}
-          onSubmit={handleImportSubmit}
-        />
-      )}
-    </>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/integrations/repo_title.tsx b/x-pack/legacy/plugins/code/public/components/integrations/repo_title.tsx
deleted file mode 100644
index f3577d5f642669..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/integrations/repo_title.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-
-import { EuiText } from '@elastic/eui';
-import { RepositoryUtils } from '../../../common/repository_utils';
-
-export const RepoTitle = ({ uri }: { uri: string }) => {
-  const org = RepositoryUtils.orgNameFromUri(uri);
-  const name = RepositoryUtils.repoNameFromUri(uri);
-
-  return (
-    <EuiText size="s" className="codeIntegrations__snippet-title">
-      <span>{org}/</span>
-      <span className="codeIntegrations__text--bold">{name}</span>
-    </EuiText>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/main/__fixtures__/branch_selector_props.json b/x-pack/legacy/plugins/code/public/components/main/__fixtures__/branch_selector_props.json
deleted file mode 100644
index c898e9a6c53f35..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/__fixtures__/branch_selector_props.json
+++ /dev/null
@@ -1,412 +0,0 @@
-{
-  "branches": [
-    {
-      "name": "VS",
-      "reference": "refs/remotes/origin/VS",
-      "type": "REMOTE_BRANCH",
-      "commit": {
-        "id": "ba73782df210e0a7744ac9b623d58081a1801738",
-        "author": "Bowden Kelly",
-        "committer": "Bowden Kelly",
-        "message": "added a few more files to project file\n",
-        "updated": "2018-02-27T00:18:24.000Z",
-        "parents": ["fe3461dc756f2c02bffe74209e2fbebe119663a3"],
-        "treeId": "53be7154f8f1e00c5b1d44f8d45618e4a380023c"
-      }
-    },
-    {
-      "name": "addAzure",
-      "reference": "refs/remotes/origin/addAzure",
-      "type": "REMOTE_BRANCH",
-      "commit": {
-        "id": "56993dd47e252e453aacb020c43502423c709412",
-        "author": "Bowden",
-        "committer": "Bowden",
-        "message": "fixed some imports\n",
-        "updated": "2018-03-12T16:43:29.000Z",
-        "parents": ["3b76dc49de5e18dc7bb0f23f7f33d106d58e3697"],
-        "treeId": "a8bb97b18f46b99ea5887274183c8d1086781176"
-      }
-    },
-    {
-      "name": "connectionRework",
-      "reference": "refs/remotes/origin/connectionRework",
-      "type": "REMOTE_BRANCH",
-      "commit": {
-        "id": "5120755a8421ef6bf8f5d8c64ca8cc1cac2bf3a8",
-        "author": "Bowden",
-        "committer": "Bowden",
-        "message": "updated git ignore to ignore coverage folder\n",
-        "updated": "2018-02-21T21:22:16.000Z",
-        "parents": ["e8ecc30c63126f97caa1d7115c9d7ff3b20ae2ff"],
-        "treeId": "befdda6fcbe2e723ac611ce3e06242a4f781bb5f"
-      }
-    },
-    {
-      "name": "master",
-      "reference": "refs/remotes/origin/master",
-      "type": "REMOTE_BRANCH",
-      "commit": {
-        "id": "261557d657fdfddf78119d15d38b1f6a7be005ed",
-        "author": "spacedragon",
-        "committer": "spacedragon",
-        "message": "add a dummy file\n",
-        "updated": "2019-03-28T02:24:27.000Z",
-        "parents": ["46971a8454761f1a11d8fde4d96ff8d29bc4e754"],
-        "treeId": "7b3ee2972005b6e36da666ab45340535c9cbe837"
-      }
-    },
-    {
-      "name": "noDatabase",
-      "reference": "refs/remotes/origin/noDatabase",
-      "type": "REMOTE_BRANCH",
-      "commit": {
-        "id": "a0e78c9d053c455614153a74ea4a2055d9cc7788",
-        "author": "Bowden",
-        "committer": "Bowden",
-        "message": "WIP - still need to use NO_DATABASE env var to safely avoid db errors\n",
-        "updated": "2018-01-10T17:28:58.000Z",
-        "parents": ["a92223a67267d1ee40d7191e4fcc95d8695f60d7"],
-        "treeId": "0867a12c7d805ad1d6ca96afc149dcb610896873"
-      }
-    },
-    {
-      "name": "simpleTemplate",
-      "reference": "refs/remotes/origin/simpleTemplate",
-      "type": "REMOTE_BRANCH",
-      "commit": {
-        "id": "a92223a67267d1ee40d7191e4fcc95d8695f60d7",
-        "author": "Bowden",
-        "committer": "Bowden",
-        "message": "updating README\n",
-        "updated": "2018-01-08T22:33:41.000Z",
-        "parents": ["bcc40c81491659385c293b9dd03dd14dcf49a83e"],
-        "treeId": "744959c50d005c7a7ab3f1ad76bf3aa2179a18b7"
-      }
-    },
-    {
-      "name": "template",
-      "reference": "refs/remotes/origin/template",
-      "type": "REMOTE_BRANCH",
-      "commit": {
-        "id": "a92223a67267d1ee40d7191e4fcc95d8695f60d7",
-        "author": "Bowden",
-        "committer": "Bowden",
-        "message": "updating README\n",
-        "updated": "2018-01-08T22:33:41.000Z",
-        "parents": ["bcc40c81491659385c293b9dd03dd14dcf49a83e"],
-        "treeId": "744959c50d005c7a7ab3f1ad76bf3aa2179a18b7"
-      }
-    }
-  ],
-  "tags": [
-    {
-      "name": "v0.1.0",
-      "reference": "refs/tags/v0.1.0",
-      "type": "TAG",
-      "commit": {
-        "id": "a4ac502e360f982a8b406bedc9f4189ab25485ea",
-        "author": "Maxime Gréau",
-        "committer": "Maxime Gréau",
-        "message": "[maven-release-plugin] prepare release v0.1.0\n",
-        "updated": "2018-04-09T10:16:06.000Z",
-        "parents": ["be4248b908e4706f0f38879703a263ce07d79350"],
-        "treeId": "17d9ec7aaae075c6feb2ea310d1243e0ac429573"
-      }
-    },
-    {
-      "name": "v0.1.1",
-      "reference": "refs/tags/v0.1.1",
-      "type": "TAG",
-      "commit": {
-        "id": "836b82fd37a7e85a96e466ea9db85939f5924be4",
-        "author": "Maxime Gréau",
-        "committer": "Maxime Gréau",
-        "message": "[maven-release-plugin] prepare release v0.1.1\n",
-        "updated": "2018-04-09T13:42:13.000Z",
-        "parents": ["56f57df4792c20d24798e03af0cdadf5c6f96831"],
-        "treeId": "12c2297211f7a784c8adf5cb08b9c5ae7ab374a1"
-      }
-    },
-    {
-      "name": "v0.1.2",
-      "reference": "refs/tags/v0.1.2",
-      "type": "TAG",
-      "commit": {
-        "id": "72995ae72e9d93bb4c4304afbb0915e5ec94a2a3",
-        "author": "Maxime Gréau",
-        "committer": "Maxime Gréau",
-        "message": "[maven-release-plugin] prepare release v0.1.2\n",
-        "updated": "2018-04-16T09:21:13.000Z",
-        "parents": ["8936e3e1beb0c77ae292281ac94c20da0acd3b1d"],
-        "treeId": "b095727185f317ba7a7d80e82c220f3e375937eb"
-      }
-    },
-    {
-      "name": "v0.5.0",
-      "reference": "refs/tags/v0.5.0",
-      "type": "TAG",
-      "commit": {
-        "id": "1f4ceadcdd7c1bd9885e7d77e9042e27e889ae6e",
-        "author": "Maxime Gréau",
-        "committer": "Maxime Gréau",
-        "message": "[maven-release-plugin] prepare release v0.5.0\n",
-        "updated": "2018-05-28T15:54:06.000Z",
-        "parents": ["454f1c14a6a9fc1140d48964e7cb75195c4cc644"],
-        "treeId": "c0b2175dfdf9d3973fec7209e759686752187615"
-      }
-    },
-    {
-      "name": "v0.5.1",
-      "reference": "refs/tags/v0.5.1",
-      "type": "TAG",
-      "commit": {
-        "id": "31d89f451768ea53378c45bca809b4c5d7a73e15",
-        "author": "Maxime Gréau",
-        "committer": "Maxime Gréau",
-        "message": "[maven-release-plugin] prepare release v0.5.1\n",
-        "updated": "2018-05-28T21:07:12.000Z",
-        "parents": ["5c54a6be202b72de8b28d33fa3e78ce7f43a7272"],
-        "treeId": "13042613afe7a597dd2025191276caa08e0b0f86"
-      }
-    },
-    {
-      "name": "v0.6.0",
-      "reference": "refs/tags/v0.6.0",
-      "type": "TAG",
-      "commit": {
-        "id": "140978ec133da3c05b25004431bb9c68097363cf",
-        "author": "Felix Barnsteiner",
-        "committer": "Felix Barnsteiner",
-        "message": "[maven-release-plugin] prepare release v0.6.0\n",
-        "updated": "2018-07-05T08:21:29.000Z",
-        "parents": ["fd0adee74ec1c58338ec100f379a4806dbb73d65"],
-        "treeId": "d8bf0384f099cd74e202b97c4d125b4befd61b06"
-      }
-    },
-    {
-      "name": "v0.6.1",
-      "reference": "refs/tags/v0.6.1",
-      "type": "TAG",
-      "commit": {
-        "id": "c04b0d1e5f8b4837dea511a97d90214f43873f4b",
-        "author": "Felix Barnsteiner",
-        "committer": "Felix Barnsteiner",
-        "message": "[maven-release-plugin] prepare release v0.6.1\n",
-        "updated": "2018-08-07T09:06:37.000Z",
-        "parents": ["c2687d63c813b4643eda833ac759ff907294753c"],
-        "treeId": "88f1f4f57ad2e83ea032e3d63f464be37ea75841"
-      }
-    },
-    {
-      "name": "v0.6.2",
-      "reference": "refs/tags/v0.6.2",
-      "type": "TAG",
-      "commit": {
-        "id": "41e705e463482e54ecdb27667151bca56879ffc5",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v0.6.2\n",
-        "updated": "2018-08-13T12:27:54.000Z",
-        "parents": ["ccda4b6ad37e05168aec2742b11e6ecd8e1aa021"],
-        "treeId": "d80686f8e6067af55625885a2e451b545e6701a8"
-      }
-    },
-    {
-      "name": "v0.7.0",
-      "reference": "refs/tags/v0.7.0",
-      "type": "TAG",
-      "commit": {
-        "id": "6b6e430fb6ff9180d5e89d2a4d845ddb4bf5b440",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v0.7.0\n",
-        "updated": "2018-09-12T12:53:14.000Z",
-        "parents": ["c9d93470331d993b07e101211fbf4bbe99993a2b"],
-        "treeId": "b72efc4b58957e7411a785690ff3461b136a2fda"
-      }
-    },
-    {
-      "name": "v0.7.1",
-      "reference": "refs/tags/v0.7.1",
-      "type": "TAG",
-      "commit": {
-        "id": "338a03a1a5e44a7e00c455326a5431dc1f70afd5",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v0.7.1\n",
-        "updated": "2018-10-24T08:51:21.000Z",
-        "parents": ["c2de8edb8ab49485b503fac256373bc25a80668d"],
-        "treeId": "47da3181c9bf78fbb706fd7dbc5a65249b4f7be4"
-      }
-    },
-    {
-      "name": "v1.0.0",
-      "reference": "refs/tags/v1.0.0",
-      "type": "TAG",
-      "commit": {
-        "id": "613d9d8d2c83375a2d0d4a534f7a9ac431455639",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.0.0\n",
-        "updated": "2018-11-14T14:40:00.000Z",
-        "parents": ["96a627f8596a42d545b5f0f04f6e24287504b6bc"],
-        "treeId": "b8aaddb055ebe88ce077d37b78012acb6b42ce02"
-      }
-    },
-    {
-      "name": "v1.0.0.RC1",
-      "reference": "refs/tags/v1.0.0.RC1",
-      "type": "TAG",
-      "commit": {
-        "id": "48f7385e8c88be0b3c2305591b10b2cbf8a51843",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.0.0.RC1\n",
-        "updated": "2018-11-06T09:02:48.000Z",
-        "parents": ["4ad7813f7fa5309f5d7fff541bd17668d00e938b"],
-        "treeId": "c694098a648b4dc7a5d891588923673cc8c10397"
-      }
-    },
-    {
-      "name": "v1.0.1",
-      "reference": "refs/tags/v1.0.1",
-      "type": "TAG",
-      "commit": {
-        "id": "352ddb69ba733036ac400c247486c516f62d65b2",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.0.1\n",
-        "updated": "2018-11-15T16:12:30.000Z",
-        "parents": ["a48b483741dfd561ef00273f65404da9f16efa95"],
-        "treeId": "2c4427e4bdcf3f2f21fed786eefe9cc87606c990"
-      }
-    },
-    {
-      "name": "v1.1.0",
-      "reference": "refs/tags/v1.1.0",
-      "type": "TAG",
-      "commit": {
-        "id": "6c8ff30bc8ac8d7d82196c248090e8d65a835b54",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.1.0\n",
-        "updated": "2018-11-27T13:49:02.000Z",
-        "parents": ["3464fe0118c6d60a37ebf59b77c2e431ee469101"],
-        "treeId": "7ee9bf61fc05f875858f7ddf8e9b034812f1b4b1"
-      }
-    },
-    {
-      "name": "v1.2.0",
-      "reference": "refs/tags/v1.2.0",
-      "type": "TAG",
-      "commit": {
-        "id": "ba3c62a4b32f17603dfadfc06d260fc62d8f9cfc",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.2.0\n",
-        "updated": "2018-12-19T08:42:40.000Z",
-        "parents": ["a0754fdc6e18d729153a2bd1440f932ebbcdfe56"],
-        "treeId": "57528f17162333c9ac2c55a9e3b5542d7ab1ac71"
-      }
-    },
-    {
-      "name": "v1.3.0",
-      "reference": "refs/tags/v1.3.0",
-      "type": "TAG",
-      "commit": {
-        "id": "ddf65c5654be6786d0fe44f543f14c57715c0355",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.3.0\n",
-        "updated": "2019-01-10T14:13:23.000Z",
-        "parents": ["5b7995504b159be365af1f7722819d87782b6352"],
-        "treeId": "3bf0bc3c366212b06f6e7a0ded2adc8dcd78c579"
-      }
-    },
-    {
-      "name": "v1.4.0",
-      "reference": "refs/tags/v1.4.0",
-      "type": "TAG",
-      "commit": {
-        "id": "e48a2b035463416a7d39b90e8568aaa5bf2e0671",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.4.0\n",
-        "updated": "2019-02-14T09:02:25.000Z",
-        "parents": ["83d7533820cd340c9ed9da99781b5322ea41c26d"],
-        "treeId": "6bca998b5143cf8795eab96414903032f02fc19b"
-      }
-    },
-    {
-      "name": "v1.5.0",
-      "reference": "refs/tags/v1.5.0",
-      "type": "TAG",
-      "commit": {
-        "id": "3dcd470810216c162048a0e85ec76611074f49f8",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.5.0\n",
-        "updated": "2019-03-26T10:38:10.000Z",
-        "parents": ["a04c1b59097853d760a07f579391dea16896fcd2"],
-        "treeId": "7ffe9081ebcd1c3d458a11a3e136edd5776eaf0a"
-      }
-    },
-    {
-      "name": "v1.6.0",
-      "reference": "refs/tags/v1.6.0",
-      "type": "TAG",
-      "commit": {
-        "id": "b294e4ee2602da3fde29aa24484507077f8bfa88",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.6.0\n",
-        "updated": "2019-04-16T13:54:06.000Z",
-        "parents": ["ea9e613ce8c96869032e6207457604853c7d1909"],
-        "treeId": "612c8b2e13be700144edd6cf26ab097236bae2bd"
-      }
-    },
-    {
-      "name": "v1.6.1",
-      "reference": "refs/tags/v1.6.1",
-      "type": "TAG",
-      "commit": {
-        "id": "9385a9914420f0366ed5df2b12a718ecdbb45346",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.6.1\n",
-        "updated": "2019-04-26T08:53:42.000Z",
-        "parents": ["6d54e100cccbee62db42fb828a9845921c08231f"],
-        "treeId": "656916ad6de50faba1b9d635f429290693e35095"
-      }
-    },
-    {
-      "name": "v1.7.0",
-      "reference": "refs/tags/v1.7.0",
-      "type": "TAG",
-      "commit": {
-        "id": "cebeef9d71236f0a6f87e682fd1d69d6f6d455e3",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.7.0\n",
-        "updated": "2019-06-13T08:24:23.000Z",
-        "parents": ["c08608741f72ac2c8e6a7d247c4a906385722066"],
-        "treeId": "48e8d1d940815033021af1c2f8bd2ca1c0b5cbd3"
-      }
-    },
-    {
-      "name": "v1.8.0",
-      "reference": "refs/tags/v1.8.0",
-      "type": "TAG",
-      "commit": {
-        "id": "5118961eb75485437c2be97fbcf206ab4d51520f",
-        "author": "Jenkins CI",
-        "committer": "Jenkins CI",
-        "message": "[maven-release-plugin] prepare release v1.8.0\n",
-        "updated": "2019-07-30T13:34:38.000Z",
-        "parents": ["0cb1c7233d1613336da53a687af07b2b22d6fcd1"],
-        "treeId": "ce041e06aaf516276f06727cee9ecad84c46e73a"
-      }
-    }
-  ]
-}
diff --git a/x-pack/legacy/plugins/code/public/components/main/__fixtures__/breadcrumb_props.json b/x-pack/legacy/plugins/code/public/components/main/__fixtures__/breadcrumb_props.json
deleted file mode 100644
index 5132797c96df28..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/__fixtures__/breadcrumb_props.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "routeParams": {
-    "org": "elastic",
-    "path": "src/public/css/lib/bootstrap/mixins/_alerts.scss",
-    "pathType": "blob",
-    "repo": "TypeScript-Node-Starter",
-    "resource": "github.com",
-    "revision": "master"
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/main/__snapshots__/branch_selector.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/main/__snapshots__/branch_selector.test.tsx.snap
deleted file mode 100644
index e0c7037f70515c..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/__snapshots__/branch_selector.test.tsx.snap
+++ /dev/null
@@ -1,79 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`render correctly 1`] = `
-<div
-  className="euiPopover euiPopover--anchorDownLeft euiPopover--displayBlock"
-  onKeyDown={[Function]}
-  onMouseDown={[Function]}
-  onMouseUp={[Function]}
-  onTouchEnd={[Function]}
-  onTouchStart={[Function]}
->
-  <div
-    className="euiPopover__anchor"
-  >
-    <div
-      className="euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock euiSuperSelect"
-      onKeyDown={[Function]}
-      onMouseDown={[Function]}
-      onMouseUp={[Function]}
-      onTouchEnd={[Function]}
-      onTouchStart={[Function]}
-    >
-      <div
-        className="euiPopover__anchor"
-      >
-        <input
-          type="hidden"
-          value="master"
-        />
-        <div
-          className="euiFormControlLayout"
-        >
-          <div
-            className="euiFormControlLayout__childrenWrapper"
-          >
-            <span
-              className="euiScreenReaderOnly"
-              id="generated-id"
-            >
-              Select an option: master, is selected
-            </span>
-            <button
-              aria-haspopup="true"
-              aria-labelledby="undefined generated-id"
-              aria-selected={true}
-              className="euiSuperSelectControl"
-              data-test-subj="codeBranchSelector"
-              onClick={[Function]}
-              onKeyDown={[Function]}
-              role="option"
-              type="button"
-            >
-              master
-            </button>
-            <div
-              className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-            >
-              <span
-                className="euiFormControlLayoutCustomIcon"
-              >
-                <svg
-                  aria-hidden="true"
-                  className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                  focusable="false"
-                  height={16}
-                  style={null}
-                  viewBox="0 0 16 16"
-                  width={16}
-                  xmlns="http://www.w3.org/2000/svg"
-                />
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/x-pack/legacy/plugins/code/public/components/main/__snapshots__/breadcrumb.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/main/__snapshots__/breadcrumb.test.tsx.snap
deleted file mode 100644
index 05e7cc4639dec1..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/__snapshots__/breadcrumb.test.tsx.snap
+++ /dev/null
@@ -1,72 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`render correctly 1`] = `
-<nav
-  aria-label="breadcrumb"
-  className="euiBreadcrumbs codeBreadcrumbs euiBreadcrumbs--truncate euiBreadcrumbs--responsive"
->
-  <a
-    className="euiLink euiLink--subdued euiBreadcrumb"
-    data-test-subj="codeFileBreadcrumb-src"
-    href="#github.com/elastic/TypeScript-Node-Starter/tree/master/src"
-    onClick={[Function]}
-    rel="noreferrer"
-  >
-    src
-  </a>
-  <div
-    className="euiBreadcrumbSeparator"
-  />
-  <div
-    className="euiPopover euiPopover--anchorDownCenter"
-    onKeyDown={[Function]}
-    onMouseDown={[Function]}
-    onMouseUp={[Function]}
-    onTouchEnd={[Function]}
-    onTouchStart={[Function]}
-  >
-    <div
-      className="euiPopover__anchor"
-    >
-      <button
-        aria-label="Show all breadcrumbs"
-        className="euiBadge euiBadge-isClickable euiBadge--iconLeft euiBadge--default euiBreadcrumb euiBreadcrumb__collapsedBadge"
-        onClick={[Function]}
-        title="View hidden breadcrumbs"
-      >
-        <span
-          className="euiBadge__content"
-        >
-          <span
-            className="euiBadge__text"
-          >
-            …
-          </span>
-        </span>
-      </button>
-    </div>
-  </div>
-  <div
-    className="euiBreadcrumbSeparator"
-  />
-  <a
-    className="euiLink euiLink--subdued euiBreadcrumb"
-    data-test-subj="codeFileBreadcrumb-mixins"
-    href="#github.com/elastic/TypeScript-Node-Starter/tree/master/src/public/css/lib/bootstrap/mixins"
-    onClick={[Function]}
-    rel="noreferrer"
-  >
-    mixins
-  </a>
-  <div
-    className="euiBreadcrumbSeparator"
-  />
-  <span
-    aria-current="page"
-    className="euiBreadcrumb euiBreadcrumb--last"
-    data-test-subj="codeFileBreadcrumb-_alerts.scss"
-  >
-    _alerts.scss
-  </span>
-</nav>
-`;
diff --git a/x-pack/legacy/plugins/code/public/components/main/blame.tsx b/x-pack/legacy/plugins/code/public/components/main/blame.tsx
deleted file mode 100644
index e25c4c2ff121da..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/blame.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiText, EuiTextColor } from '@elastic/eui';
-import _ from 'lodash';
-import moment from 'moment';
-import React from 'react';
-import { GitBlame } from '../../../common/git_blame';
-
-export class Blame extends React.PureComponent<{ blame: GitBlame; isFirstLine: boolean }> {
-  public render(): React.ReactNode {
-    const { blame, isFirstLine } = this.props;
-    return (
-      <EuiFlexGroup
-        className={isFirstLine ? 'codeBlame__item codeBlame__item--first ' : 'codeBlame__item'}
-        gutterSize="none"
-        justifyContent="spaceBetween"
-      >
-        <EuiFlexItem grow={false}>
-          <EuiText size="xs" className="codeText__blameMessage eui-textTruncate">
-            {blame.commit.message}
-          </EuiText>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false} className="eui-textTruncate">
-          <EuiText size="xs" className="eui-textTruncate code-auto-margin">
-            <EuiTextColor color="subdued">{moment(blame.commit.date).fromNow()}</EuiTextColor>
-          </EuiText>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/main/branch_selector.test.tsx b/x-pack/legacy/plugins/code/public/components/main/branch_selector.test.tsx
deleted file mode 100644
index 129d65c0bb7079..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/branch_selector.test.tsx
+++ /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 React from 'react';
-import renderer from 'react-test-renderer';
-import { BranchSelector } from './branch_selector';
-import props from './__fixtures__/branch_selector_props.json';
-
-jest.mock(`@elastic/eui/lib/components/form/form_row/make_id`, () => () => `generated-id`);
-
-test('render correctly', () => {
-  const tree = renderer
-    .create(
-      <BranchSelector
-        revision="master"
-        tags={props.tags}
-        branches={props.branches}
-        getHrefFromRevision={() => ''}
-      />
-    )
-    .toJSON();
-  expect(tree).toMatchSnapshot();
-});
diff --git a/x-pack/legacy/plugins/code/public/components/main/branch_selector.tsx b/x-pack/legacy/plugins/code/public/components/main/branch_selector.tsx
deleted file mode 100644
index 8efb2323dd797f..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/branch_selector.tsx
+++ /dev/null
@@ -1,117 +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 {
-  EuiPopover,
-  // @ts-ignore
-  EuiFieldSearch,
-  EuiListGroup,
-  EuiTabbedContent,
-  EuiListGroupItem,
-  EuiSuperSelect,
-} from '@elastic/eui';
-import { ReferenceInfo } from '../../../model/commit';
-
-interface Props {
-  branches: ReferenceInfo[];
-  tags: ReferenceInfo[];
-  revision: string;
-  getHrefFromRevision: (r: string) => string;
-}
-
-enum RevisionSelectorTabs {
-  Branches = 'Branches',
-  Tags = 'Tags',
-}
-
-export const BranchSelector = (props: Props) => {
-  const [isPopoverOpen, togglePopoverOpen] = useState(false);
-  const [query, setQuery] = useState('');
-  const filterRevision = (r: ReferenceInfo) => r.name.toLowerCase().includes(query.toLowerCase());
-  const filteredBranches = props.branches.filter(filterRevision);
-  const filteredTags = props.tags.filter(filterRevision);
-  const getListItem = (b: string) =>
-    b === props.revision ? (
-      <EuiListGroupItem
-        size="s"
-        className="codeBranchSelectorRevisionItem"
-        label={b}
-        isActive={true}
-        iconType="check"
-        key={b}
-        href={props.getHrefFromRevision(b)}
-        data-test-subj={`codeBranchSelectOption-${b}Active`}
-      ></EuiListGroupItem>
-    ) : (
-      <EuiListGroupItem
-        size="s"
-        className="codeBranchSelectorRevisionItem"
-        label={b}
-        key={b}
-        href={props.getHrefFromRevision(b)}
-        iconType="empty"
-        data-test-subj={`codeBranchSelectOption-${b}`}
-      ></EuiListGroupItem>
-    );
-  const tabs = [
-    {
-      id: RevisionSelectorTabs.Branches,
-      name: RevisionSelectorTabs.Branches,
-      content: (
-        <div className="codeBranchSelectorTabContentContainer">
-          <EuiFieldSearch
-            value={query}
-            incremental={true}
-            onChange={e => setQuery(e.target.value)}
-            placeholder="Search branches"
-          />
-          <EuiListGroup className="codeBranchSelectorTabs">
-            {filteredBranches.map(b => getListItem(b.name))}
-          </EuiListGroup>
-        </div>
-      ),
-    },
-    {
-      id: RevisionSelectorTabs.Tags,
-      name: RevisionSelectorTabs.Tags,
-      content: (
-        <div className="codeBranchSelectorTabContentContainer">
-          <EuiFieldSearch
-            value={query}
-            incremental={true}
-            onChange={e => setQuery(e.target.value)}
-            placeholder="Search tags"
-          />
-          <EuiListGroup className="codeBranchSelectorTabs">
-            {filteredTags.map(b => getListItem(b.name))}
-          </EuiListGroup>
-        </div>
-      ),
-    },
-  ];
-  return (
-    // @ts-ignore
-    <EuiPopover
-      anchorPosition="downLeft"
-      panelClassName="codeBranchSelectorPopover"
-      display="block"
-      isOpen={isPopoverOpen}
-      hasArrow={false}
-      button={
-        <EuiSuperSelect
-          onClick={() => togglePopoverOpen(true)}
-          data-test-subj="codeBranchSelector"
-          valueOfSelected={props.revision}
-          options={[{ value: props.revision, inputDisplay: props.revision }]}
-        ></EuiSuperSelect>
-      }
-      closePopover={() => togglePopoverOpen(false)}
-    >
-      <EuiTabbedContent tabs={tabs} initialSelectedTab={tabs[0]} size={'s'} />
-    </EuiPopover>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/main/breadcrumb.test.tsx b/x-pack/legacy/plugins/code/public/components/main/breadcrumb.test.tsx
deleted file mode 100644
index fcb06ecfd04e2a..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/breadcrumb.test.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import renderer from 'react-test-renderer';
-import { Breadcrumb } from './breadcrumb';
-import props from './__fixtures__/breadcrumb_props.json';
-
-test('render correctly', () => {
-  const tree = renderer.create(<Breadcrumb routeParams={props.routeParams} />).toJSON();
-  expect(tree).toMatchSnapshot();
-});
diff --git a/x-pack/legacy/plugins/code/public/components/main/breadcrumb.tsx b/x-pack/legacy/plugins/code/public/components/main/breadcrumb.tsx
deleted file mode 100644
index 52c5bfa59d536c..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/breadcrumb.tsx
+++ /dev/null
@@ -1,51 +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 { EuiBreadcrumbs, Breadcrumb as EuiBreadcrumb } from '@elastic/eui';
-import React from 'react';
-import { MainRouteParams } from '../../common/types';
-import { encodeRevisionString } from '../../../common/uri_util';
-import { trackCodeUiMetric, METRIC_TYPE } from '../../services/ui_metric';
-import { CodeUIUsageMetrics } from '../../../model/usage_telemetry_metrics';
-
-interface Props {
-  routeParams: MainRouteParams;
-}
-export class Breadcrumb extends React.PureComponent<Props> {
-  public render() {
-    const { resource, org, repo, revision, path } = this.props.routeParams;
-    const repoUri = `${resource}/${org}/${repo}`;
-
-    const breadcrumbs: EuiBreadcrumb[] = [];
-    const pathSegments = path ? path.split('/') : [];
-
-    pathSegments.forEach((p, index, array) => {
-      const paths = pathSegments.slice(0, index + 1);
-      const href = `#${repoUri}/tree/${encodeRevisionString(revision)}/${paths.join('/')}`;
-      const breadcrumb = {
-        text: p,
-        href,
-        ['data-test-subj']: `codeFileBreadcrumb-${p}`,
-        onClick: () => {
-          // track breadcrumb click count
-          trackCodeUiMetric(METRIC_TYPE.COUNT, CodeUIUsageMetrics.BREADCRUMB_CLICK_COUNT);
-        },
-      };
-      if (index === array.length - 1) {
-        delete breadcrumb.href;
-      }
-      breadcrumbs.push(breadcrumb);
-    });
-    return (
-      <EuiBreadcrumbs
-        max={3}
-        showMaxPopover
-        breadcrumbs={breadcrumbs}
-        className="codeBreadcrumbs"
-      />
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/main/clone_status.tsx b/x-pack/legacy/plugins/code/public/components/main/clone_status.tsx
deleted file mode 100644
index 195fd89422faa5..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/clone_status.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiProgress, EuiSpacer, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import theme from '@elastic/eui/dist/eui_theme_light.json';
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { CloneProgress } from '../../../model';
-
-interface Props {
-  repoName: string;
-  progress: number;
-  cloneProgress: CloneProgress;
-}
-
-export const CloneStatus = (props: Props) => {
-  const { progress: progressRate, cloneProgress, repoName } = props;
-  let progress = i18n.translate(
-    'xpack.code.mainPage.content.cloneStatus.progress.receivingRateOnlyText',
-    {
-      defaultMessage: 'Receiving objects: {progressRate}%',
-      values: { progressRate: progressRate.toFixed(2) },
-    }
-  );
-  if (progressRate < 0) {
-    progress = i18n.translate('xpack.code.mainPage.content.cloneStatus.progress.cloneFailedText', {
-      defaultMessage: 'Clone Failed',
-    });
-  } else if (cloneProgress) {
-    const { receivedObjects, totalObjects, indexedObjects } = cloneProgress;
-
-    if (receivedObjects === totalObjects) {
-      progress = i18n.translate('xpack.code.mainPage.content.cloneStatus.progress.indexingText', {
-        defaultMessage: 'Indexing objects: {progressRate}% {indexedObjects}/{totalObjects}',
-        values: {
-          progressRate: ((indexedObjects * 100) / totalObjects).toFixed(2),
-          indexedObjects,
-          totalObjects,
-        },
-      });
-    } else {
-      progress = i18n.translate('xpack.code.mainPage.content.cloneStatus.progress.receivingText', {
-        defaultMessage: 'Receiving objects: {progressRate}% {receivedObjects}/{totalObjects}',
-        values: {
-          progressRate: ((receivedObjects * 100) / totalObjects).toFixed(2),
-          receivedObjects,
-          totalObjects,
-        },
-      });
-    }
-  }
-  return (
-    <EuiFlexGroup direction="column" alignItems="center">
-      <EuiSpacer size="xxl" />
-      <EuiSpacer size="xxl" />
-      <EuiFlexItem grow={false}>
-        <EuiText style={{ fontSize: theme.euiSizeXXL, color: '#1A1A1A' }}>
-          {repoName}{' '}
-          <FormattedMessage
-            id="xpack.code.mainPage.content.cloneStatus.isCloningText"
-            defaultMessage="is cloning"
-          />
-        </EuiText>
-      </EuiFlexItem>
-      <EuiSpacer size="s" />
-      <EuiFlexItem grow={false}>
-        <EuiText style={{ fontSize: theme.euiSizeM, color: '#69707D' }}>
-          <FormattedMessage
-            id="xpack.code.mainPage.content.cloneStatus.yourProjectWillBeAvailableText"
-            defaultMessage="Your project will be available when this process is complete"
-          />
-        </EuiText>
-      </EuiFlexItem>
-      <EuiSpacer size="xl" />
-      <EuiFlexItem grow={false}>
-        <div>
-          <EuiText size="m" color="subdued">
-            {progress}
-          </EuiText>
-        </div>
-      </EuiFlexItem>
-      <EuiFlexItem grow={false} style={{ minWidth: 640 }}>
-        <EuiProgress color="primary" size="s" max={100} value={progressRate} />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/main/content.tsx b/x-pack/legacy/plugins/code/public/components/main/content.tsx
deleted file mode 100644
index 6a5eef6ad03eda..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/content.tsx
+++ /dev/null
@@ -1,554 +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,
-  EuiButtonGroup,
-  EuiFlexGroup,
-  EuiTitle,
-  EuiLink,
-  EuiPage,
-  EuiPageBody,
-  EuiPageContent,
-  EuiPageContentHeader,
-  EuiPageContentHeaderSection,
-  EuiPageContentBody,
-  EuiProgress,
-  EuiButtonGroupOption,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import 'github-markdown-css/github-markdown.css';
-import React from 'react';
-import ReactMarkdown from 'react-markdown';
-import { connect } from 'react-redux';
-import { RouteComponentProps } from 'react-router-dom';
-import { withRouter } from 'react-router-dom';
-import { npStart } from 'ui/new_platform';
-
-import { RepositoryUtils } from '../../../common/repository_utils';
-import {
-  FileTree,
-  FileTreeItemType,
-  SearchOptions,
-  SearchScope,
-  WorkerReservedProgress,
-  Repository,
-  RepoState,
-} from '../../../model';
-import { CommitInfo, ReferenceInfo } from '../../../model/commit';
-import { changeSearchScope, FetchFileResponse, RepoStatus } from '../../actions';
-import { MainRouteParams, PathTypes } from '../../common/types';
-import { RootState } from '../../reducers';
-import {
-  currentTreeSelector,
-  hasMoreCommitsSelector,
-  repoUriSelector,
-  repoStatusSelector,
-} from '../../selectors';
-import { encodeRevisionString } from '../../../common/uri_util';
-import { history } from '../../utils/url';
-import { Editor } from '../editor/editor';
-import { CloneStatus } from './clone_status';
-import { CommitHistory } from '../commits';
-import { Directory } from './directory';
-import { ErrorPanel } from './error_panel';
-import { NotFound } from './not_found';
-import { TopBar } from './top_bar';
-
-interface Props extends RouteComponentProps<MainRouteParams> {
-  isNotFound: boolean;
-  fileLoading: boolean;
-  repoStatus?: RepoStatus;
-  tree: FileTree;
-  file: FetchFileResponse | undefined;
-  currentTree: FileTree | null;
-  commits: CommitInfo[];
-  branches: ReferenceInfo[];
-  tags: ReferenceInfo[];
-  hasMoreCommits: boolean;
-  loadingCommits: boolean;
-  onSearchScopeChanged: (s: SearchScope) => void;
-  repoScope: string[];
-  notFoundDirs: string[];
-  fileTreeLoadingPaths: string[];
-  searchOptions: SearchOptions;
-  query: string;
-  currentRepository: Repository;
-}
-const LANG_MD = 'markdown';
-
-enum ButtonOption {
-  Code = 'Code',
-  Blame = 'Blame',
-  History = 'History',
-  Folder = 'Directory',
-}
-
-interface State {
-  fileLoading: boolean;
-}
-
-class CodeContent extends React.PureComponent<Props, State> {
-  static getDerivedStateFromProps(props: Props, state: State) {
-    if (!props.fileLoading) {
-      return { fileLoading: props.fileLoading };
-    }
-    return null;
-  }
-  state = {
-    fileLoading: this.props.fileLoading,
-  };
-
-  componentDidUpdate(prevProps: Props) {
-    // after this amount of time, show file loading indicator if necessary
-    const TIME_DELAY_MS: number = 500;
-    if (!prevProps.fileLoading && this.props.fileLoading && !this.state.fileLoading) {
-      setTimeout(
-        () =>
-          this.setState({
-            fileLoading: this.props.fileLoading,
-          }),
-        TIME_DELAY_MS
-      );
-    }
-  }
-
-  public findNode = (pathSegments: string[], node: FileTree): FileTree | undefined => {
-    if (!node) {
-      return undefined;
-    } else if (pathSegments.length === 0) {
-      return node;
-    } else if (pathSegments.length === 1) {
-      return (node.children || []).find(n => n.name === pathSegments[0]);
-    } else {
-      const currentFolder = pathSegments.shift();
-      const nextNode = (node.children || []).find(n => n.name === currentFolder);
-      if (nextNode) {
-        return this.findNode(pathSegments, nextNode);
-      } else {
-        return undefined;
-      }
-    }
-  };
-
-  public switchButton = (id: string) => {
-    const { path, resource, org, repo, revision } = this.props.match.params;
-    const queryString = this.props.location.search;
-    const repoUri = `${resource}/${org}/${repo}`;
-    switch (id) {
-      case ButtonOption.Code:
-        history.push(
-          `/${repoUri}/${PathTypes.blob}/${encodeRevisionString(revision)}/${path ||
-            ''}${queryString}`
-        );
-        break;
-      case ButtonOption.Folder:
-        history.push(
-          `/${repoUri}/${PathTypes.tree}/${encodeRevisionString(revision)}/${path ||
-            ''}${queryString}`
-        );
-        break;
-      case ButtonOption.Blame:
-        history.push(
-          `/${repoUri}/${PathTypes.blame}/${encodeRevisionString(revision)}/${path ||
-            ''}${queryString}`
-        );
-        break;
-      case ButtonOption.History:
-        history.push(
-          `/${repoUri}/${PathTypes.commits}/${encodeRevisionString(revision)}/${path ||
-            ''}${queryString}`
-        );
-        break;
-    }
-  };
-
-  public openRawFile = () => {
-    const { path, resource, org, repo, revision } = this.props.match.params;
-    const repoUri = `${resource}/${org}/${repo}`;
-    window.open(
-      npStart.core.http.basePath.prepend(
-        `/app/code/repo/${repoUri}/raw/${encodeRevisionString(revision)}/${path}`
-      )
-    );
-  };
-
-  renderFileLoadingIndicator = () => {
-    const fileName = (this.props.match.params.path || '').split('/').slice(-1)[0];
-    return (
-      <EuiPage restrictWidth>
-        <EuiPageBody>
-          <EuiPageContent verticalPosition="center" horizontalPosition="center">
-            <EuiPageContentHeader>
-              <EuiPageContentHeaderSection>
-                <h2>{fileName} is loading...</h2>
-              </EuiPageContentHeaderSection>
-            </EuiPageContentHeader>
-            <EuiPageContentBody>
-              <EuiProgress size="s" color="primary" />
-            </EuiPageContentBody>
-          </EuiPageContent>
-        </EuiPageBody>
-      </EuiPage>
-    );
-  };
-
-  public renderButtons = () => {
-    let buttonId: string | undefined;
-    switch (this.props.match.params.pathType) {
-      case PathTypes.blame:
-        buttonId = ButtonOption.Blame;
-        break;
-      case PathTypes.blob:
-        buttonId = ButtonOption.Code;
-        break;
-      case PathTypes.tree:
-        buttonId = ButtonOption.Folder;
-        break;
-      case PathTypes.commits:
-        buttonId = ButtonOption.History;
-        break;
-      default:
-        break;
-    }
-    const currentTree = this.props.currentTree;
-    if (
-      currentTree &&
-      (currentTree.type === FileTreeItemType.File || currentTree.type === FileTreeItemType.Link)
-    ) {
-      let isText = true;
-      let isMarkdown = false;
-      let blameDisabled = false;
-
-      if (this.props.file) {
-        const { isUnsupported, isOversize, isImage, lang } = this.props.file;
-        isMarkdown = lang === LANG_MD;
-        isText = !isUnsupported && !isOversize && !isImage;
-        blameDisabled = !!(isUnsupported || isOversize || isImage);
-      }
-      const rawButtonOptions: EuiButtonGroupOption[] = [
-        {
-          id: 'Raw',
-          className: 'eui-hideFor--m eui-hideFor--s eui-hideFor--xs',
-          label: isText
-            ? i18n.translate('xpack.code.mainPage.content.buttons.rawButtonLabel', {
-                defaultMessage: 'Raw',
-              })
-            : i18n.translate('xpack.code.mainPage.content.buttons.downloadButtonLabel', {
-                defaultMessage: 'Download',
-              }),
-        },
-      ];
-      const buttonOptions = [
-        {
-          id: ButtonOption.Code,
-          label:
-            isText && !isMarkdown
-              ? i18n.translate('xpack.code.mainPage.content.buttons.codeButtonLabel', {
-                  defaultMessage: 'Code',
-                })
-              : i18n.translate('xpack.code.mainPage.content.buttons.contentButtonLabel', {
-                  defaultMessage: 'content',
-                }),
-        },
-        {
-          id: ButtonOption.Blame,
-          label: i18n.translate('xpack.code.mainPage.content.buttons.blameButtonLabel', {
-            defaultMessage: 'Blame',
-          }),
-          isDisabled: blameDisabled,
-        },
-        {
-          id: ButtonOption.History,
-          label: i18n.translate('xpack.code.mainPage.content.buttons.historyButtonLabel', {
-            defaultMessage: 'History',
-          }),
-        },
-      ];
-
-      return (
-        <EuiFlexGroup direction="row" alignItems="center" gutterSize="none">
-          <EuiButtonGroup
-            buttonSize="s"
-            color="primary"
-            options={buttonOptions}
-            type="single"
-            idSelected={buttonId}
-            onChange={this.switchButton}
-            className="codeButtonGroup"
-          />
-          <EuiButtonGroup
-            buttonSize="s"
-            color="primary"
-            options={rawButtonOptions}
-            type="single"
-            idSelected={''}
-            onChange={this.openRawFile}
-            className="codeButtonGroup"
-          />
-        </EuiFlexGroup>
-      );
-    } else if (this.shouldRenderCloneProgress()) {
-      return null;
-    } else {
-      return (
-        <EuiFlexGroup direction="row" alignItems="center" gutterSize="none">
-          <EuiButtonGroup
-            className="codeButtonGroup"
-            buttonSize="s"
-            color="primary"
-            options={[
-              {
-                id: ButtonOption.Folder,
-                label: i18n.translate('xpack.code.mainPage.content.buttons.folderButtonLabel', {
-                  defaultMessage: 'Directory',
-                }),
-              },
-              {
-                id: ButtonOption.History,
-                label: i18n.translate('xpack.code.mainPage.content.buttons.historyButtonLabel', {
-                  defaultMessage: 'History',
-                }),
-              },
-            ]}
-            type="single"
-            idSelected={buttonId}
-            onChange={this.switchButton}
-          />
-        </EuiFlexGroup>
-      );
-    }
-  };
-
-  public render() {
-    return (
-      <div className="codeContainer__main">
-        <TopBar
-          routeParams={this.props.match.params}
-          onSearchScopeChanged={this.props.onSearchScopeChanged}
-          buttons={this.renderButtons()}
-          searchOptions={this.props.searchOptions}
-          branches={this.props.branches}
-          tags={this.props.tags}
-          query={this.props.query}
-          currentRepository={this.props.currentRepository}
-        />
-        {this.renderContent()}
-      </div>
-    );
-  }
-
-  public shouldRenderCloneProgress() {
-    if (!this.props.repoStatus) {
-      return false;
-    }
-    const { progress, cloneProgress, state } = this.props.repoStatus;
-    return (
-      !!progress &&
-      state === RepoState.CLONING &&
-      progress < WorkerReservedProgress.COMPLETED &&
-      !RepositoryUtils.hasFullyCloned(cloneProgress)
-    );
-  }
-
-  public renderCloneProgress() {
-    if (!this.props.repoStatus) {
-      return null;
-    }
-    const { progress, cloneProgress } = this.props.repoStatus;
-    const { org, repo } = this.props.match.params;
-    return (
-      <CloneStatus
-        repoName={`${org}/${repo}`}
-        progress={progress ? progress : 0}
-        cloneProgress={cloneProgress!}
-      />
-    );
-  }
-
-  public renderContent() {
-    const { file, match, tree, fileTreeLoadingPaths, isNotFound, notFoundDirs } = this.props;
-    const { path, pathType, resource, org, repo, revision } = match.params;
-
-    // The clone progress rendering should come before the NotFound rendering.
-    if (this.shouldRenderCloneProgress()) {
-      return this.renderCloneProgress();
-    }
-
-    if (isNotFound || notFoundDirs.includes(path || '')) {
-      return <NotFound />;
-    }
-
-    const repoUri = `${resource}/${org}/${repo}`;
-    switch (pathType) {
-      case PathTypes.tree:
-        const node = this.findNode(path ? path.split('/') : [], tree);
-        return (
-          <div className="codeContainer__directoryView">
-            <Directory node={node} loading={fileTreeLoadingPaths.includes(path)} />
-            <CommitHistory
-              repoUri={repoUri}
-              header={
-                <React.Fragment>
-                  <EuiTitle size="s" className="codeMargin__title">
-                    <h3>
-                      <FormattedMessage
-                        id="xpack.code.mainPage.directory.recentCommitsTitle"
-                        defaultMessage="Recent Commits"
-                      />
-                    </h3>
-                  </EuiTitle>
-                  <EuiButton
-                    size="s"
-                    href={`#/${resource}/${org}/${repo}/${PathTypes.commits}/${encodeRevisionString(
-                      revision
-                    )}/${path || ''}`}
-                  >
-                    <FormattedMessage
-                      id="xpack.code.mainPage.directory.viewAllCommitsButtonLabel"
-                      defaultMessage="View All"
-                    />
-                  </EuiButton>
-                </React.Fragment>
-              }
-            />
-          </div>
-        );
-      case PathTypes.blob: {
-        const { fileLoading } = this.state;
-        if (!file) {
-          return (
-            fileLoading && (
-              <EuiFlexGroup direction="row" className="codeContainer__blame" gutterSize="none">
-                {fileLoading && this.renderFileLoadingIndicator()}
-                <Editor showBlame={false} hidden={fileLoading} />
-              </EuiFlexGroup>
-            )
-          );
-        } else {
-          const {
-            lang: fileLanguage,
-            content: fileContent,
-            isUnsupported,
-            isOversize,
-            isImage,
-          } = file;
-          if (isUnsupported) {
-            return (
-              <ErrorPanel
-                title={<h2>Unsupported File</h2>}
-                content="Unfortunately that’s an unsupported file type and we’re unable to render it here."
-              />
-            );
-          }
-          if (isOversize) {
-            return (
-              <ErrorPanel
-                title={<h2>File is too big</h2>}
-                content="Sorry about that, but we can’t show files that are this big right now."
-              />
-            );
-          }
-          if (fileLanguage === LANG_MD) {
-            const markdownRenderers = {
-              link: ({ children, href }: { children: React.ReactNode[]; href?: string }) => (
-                <EuiLink href={href} target="_blank">
-                  {children}
-                </EuiLink>
-              ),
-            };
-
-            return (
-              <div className="markdown-body code-markdown-container kbnMarkdown__body">
-                <ReactMarkdown
-                  source={fileContent}
-                  escapeHtml={true}
-                  skipHtml={true}
-                  renderers={markdownRenderers}
-                />
-              </div>
-            );
-          } else if (isImage) {
-            const rawUrl = npStart.core.http.basePath.prepend(
-              `/app/code/repo/${repoUri}/raw/${revision}/${path}`
-            );
-            return (
-              <div className="code-auto-margin">
-                <img src={rawUrl} alt={rawUrl} />
-              </div>
-            );
-          } else {
-            return (
-              <EuiFlexGroup direction="row" className="codeContainer__blame" gutterSize="none">
-                {fileLoading && this.renderFileLoadingIndicator()}
-                <Editor showBlame={false} hidden={fileLoading} />
-              </EuiFlexGroup>
-            );
-          }
-        }
-      }
-      case PathTypes.blame:
-        const { fileLoading } = this.state;
-        return (
-          <EuiFlexGroup direction="row" className="codeContainer__blame" gutterSize="none">
-            {fileLoading && this.renderFileLoadingIndicator()}
-            <Editor showBlame={true} hidden={fileLoading} />
-          </EuiFlexGroup>
-        );
-      case PathTypes.commits:
-        return (
-          <div className="codeContainer__history">
-            <CommitHistory
-              repoUri={repoUri}
-              header={
-                <EuiTitle className="codeMargin__title">
-                  <h3>
-                    <FormattedMessage
-                      id="xpack.code.mainPage.history.commitHistoryTitle"
-                      defaultMessage="Commit History"
-                    />
-                  </h3>
-                </EuiTitle>
-              }
-              showPagination={true}
-            />
-          </div>
-        );
-    }
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  isNotFound: state.file.isNotFound,
-  notFoundDirs: state.fileTree.notFoundDirs,
-  file: state.file.file,
-  tree: state.fileTree.tree,
-  fileTreeLoadingPaths: state.fileTree.fileTreeLoadingPaths,
-  currentTree: currentTreeSelector(state),
-  branches: state.revision.branches,
-  tags: state.revision.tags,
-  hasMoreCommits: hasMoreCommitsSelector(state),
-  loadingCommits: state.revision.loadingCommits,
-  repoStatus: repoStatusSelector(state, repoUriSelector(state)),
-  searchOptions: state.search.searchOptions,
-  query: state.search.query,
-  currentRepository: state.repository.repository,
-  fileLoading: state.file.loading,
-});
-
-const mapDispatchToProps = {
-  onSearchScopeChanged: changeSearchScope,
-};
-
-export const Content = withRouter(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-    // @ts-ignore
-  )(CodeContent)
-);
diff --git a/x-pack/legacy/plugins/code/public/components/main/directory.tsx b/x-pack/legacy/plugins/code/public/components/main/directory.tsx
deleted file mode 100644
index 090e594f82a65a..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/directory.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiText,
-  EuiTitle,
-  IconType,
-  EuiLoadingSpinner,
-  EuiSpacer,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-import React from 'react';
-import { Link, RouteComponentProps, withRouter } from 'react-router-dom';
-import { FileTree, FileTreeItemType } from '../../../model';
-import { MainRouteParams, PathTypes } from '../../common/types';
-import { encodeRevisionString } from '../../../common/uri_util';
-
-interface DirectoryNodesProps {
-  title: string;
-  nodes: FileTree[];
-  getUrl: (path: string) => string;
-}
-
-const DirectoryNodes = (props: DirectoryNodesProps) => {
-  const typeIconMap: { [k: number]: IconType } = {
-    [FileTreeItemType.File]: 'document',
-    [FileTreeItemType.Directory]: 'folderClosed',
-    [FileTreeItemType.Link]: 'symlink',
-    [FileTreeItemType.Submodule]: 'submodule',
-  };
-  const nodes = props.nodes.map(n => (
-    <EuiFlexItem key={n.path} grow={false}>
-      <Link
-        className="code-link"
-        to={props.getUrl(n.path!)}
-        data-test-subj={`codeFileExplorerNode-${n.name}`}
-      >
-        <div className="code-directory__node">
-          <EuiIcon type={typeIconMap[n.type]} color="subdued" />
-          <EuiText size="xs" className="code-fileNodeName eui-textTruncate">
-            {n.name}
-          </EuiText>
-        </div>
-      </Link>
-    </EuiFlexItem>
-  ));
-  return (
-    <div className="codeContainer__directoryList">
-      <div>
-        <div>
-          <EuiTitle size="s">
-            <h3>{props.title}</h3>
-          </EuiTitle>
-        </div>
-        <EuiFlexGroup wrap direction="row" gutterSize="none" justifyContent="flexStart">
-          {nodes}
-        </EuiFlexGroup>
-      </div>
-    </div>
-  );
-};
-
-interface Props extends RouteComponentProps<MainRouteParams> {
-  node?: FileTree;
-  loading: boolean;
-}
-
-export const Directory = withRouter((props: Props) => {
-  let files: FileTree[] = [];
-  let folders: FileTree[] = [];
-  if (props.node && props.node.children) {
-    files = props.node.children.filter(
-      n => n.type === FileTreeItemType.File || n.type === FileTreeItemType.Link
-    );
-    folders = props.node.children.filter(
-      n => n.type === FileTreeItemType.Directory || n.type === FileTreeItemType.Submodule
-    );
-  }
-  const { resource, org, repo, revision } = props.match.params;
-  const getUrl = (pathType: PathTypes) => (path: string) =>
-    `/${resource}/${org}/${repo}/${pathType}/${encodeRevisionString(revision)}/${path}`;
-  const fileList = (
-    <DirectoryNodes
-      nodes={files}
-      title={i18n.translate('xpack.code.mainPage.content.directory.filesTitle', {
-        defaultMessage: 'Files',
-      })}
-      getUrl={getUrl(PathTypes.blob)}
-    />
-  );
-  const folderList = (
-    <DirectoryNodes
-      nodes={folders}
-      title={i18n.translate('xpack.code.mainPage.content.directory.directoriesTitle', {
-        defaultMessage: 'Directories',
-      })}
-      getUrl={getUrl(PathTypes.tree)}
-    />
-  );
-  const children = props.loading ? (
-    <div>
-      <EuiSpacer size="xl" />
-      <EuiSpacer size="xl" />
-      <EuiText textAlign="center">Loading...</EuiText>
-      <EuiSpacer size="m" />
-      <EuiText textAlign="center">
-        <EuiLoadingSpinner size="xl" />
-      </EuiText>
-    </div>
-  ) : (
-    <React.Fragment>
-      {files.length > 0 && fileList}
-      {folders.length > 0 && folderList}
-    </React.Fragment>
-  );
-  return <div>{children}</div>;
-});
diff --git a/x-pack/legacy/plugins/code/public/components/main/error_panel.tsx b/x-pack/legacy/plugins/code/public/components/main/error_panel.tsx
deleted file mode 100644
index 69bfd2a3cafdc6..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/error_panel.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiButton, EuiPanel, EuiSpacer, EuiText, EuiTextColor } from '@elastic/eui';
-import React, { ReactNode } from 'react';
-import { history } from '../../utils/url';
-import { ErrorIcon } from '../shared/icons';
-
-export const ErrorPanel = (props: { title: ReactNode; content: string }) => {
-  return (
-    <div className="codePanel__error" data-test-subj="codeNotFoundErrorPage">
-      <EuiPanel>
-        <EuiSpacer />
-        <EuiText textAlign="center">
-          <ErrorIcon />
-        </EuiText>
-        <EuiText textAlign="center">{props.title}</EuiText>
-        <EuiSpacer />
-        <EuiText textAlign="center">
-          <EuiTextColor>{props.content}</EuiTextColor>
-        </EuiText>
-        <EuiSpacer />
-        <EuiSpacer />
-        <EuiText textAlign="center">
-          <EuiButton fill={true} onClick={history.goBack}>
-            Go Back
-          </EuiButton>
-        </EuiText>
-        <EuiSpacer />
-        <EuiSpacer />
-        <EuiSpacer />
-      </EuiPanel>
-    </div>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/main/main.scss b/x-pack/legacy/plugins/code/public/components/main/main.scss
deleted file mode 100644
index 840cbad26ffaad..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/main.scss
+++ /dev/null
@@ -1,297 +0,0 @@
-.code-auto-overflow {
-  overflow: auto;
-}
-
-.code-auto-overflow-y {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.codeOverflowHidden {
-  overflow: hidden;
-}
-
-.code-markdown-container {
-  padding: $euiSizeXL;
-  overflow: auto;
-}
-
-.code-auto-margin {
-  margin: auto;
-}
-
-.code-navigation__sidebar {
-  background-color: $euiColorLightestShade;
-  width: 16rem;
-  border-right: $euiBorderThin;
-  display: flex;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-direction: column;
-  height: 100%;
-  div[role='tablist'] {
-    flex-grow: 0;
-    flex-shrink: 0;
-  }
-  div[role='tabpanel'] {
-    @include euiScrollBar;
-    width: 100%;
-    flex-grow: 1;
-    flex-shrink: 1;
-    overflow: auto;
-  }
-}
-
-.codeFileTree--container {
-  flex-grow: 1;
-  flex-shrink: 1;
-  padding: $euiSizeM;
-  background-color: $euiColorLightestShade;
-  position: relative;
-  display: inline-block;
-  min-width: 100%;
-  height: 100%;
-}
-
-.codeFileTree__icon {
-  margin-right: $euiSizeS;
-}
-
-.code-directory__node {
-  width: calc(200rem / 14);
-  padding: 0.25rem $euiSizeS;
-  border-radius: $euiBorderRadius;
-  white-space: nowrap;
-  color: $euiColorFullShade;
-  transition: background-color $euiAnimSlightResistance $euiAnimSpeedFast;
-  &:hover {
-    background-color: $euiColorLightShade;
-    cursor: pointer;
-  }
-}
-
-.code-fileNodeName {
-  display: inline-block;
-  vertical-align: middle;
-  margin-left: $euiSizeS;
-}
-
-.code-timeline {
-  border-left: $euiBorderThick;
-  margin-left: $euiSizeXS;
-  padding: $euiSizeS 0 $euiSizeS $euiSizeS;
-}
-
-.code-timeline__marker {
-  width: $euiSizeS;
-  height: $euiSizeS;
-  border-radius: $euiSizeS / 2;
-  background-color: $euiBorderColor;
-  margin: auto;
-}
-
-.code-timeline__commit-container {
-  margin: 0 0 $euiSizeXS $euiSizeM;
-  .euiPanel:not(:first-of-type),
-  .euiPanel:not(:last-of-type) {
-    border-radius: 0;
-  }
-}
-
-.euiPanel.code-timeline__commit--root {
-  &:not(:first-child) {
-    border-top: none;
-  }
-  &:not(:first-child):not(:last-child) {
-    border-radius: 0;
-  }
-  &:first-child {
-    border-radius: $euiSizeXS $euiSizeXS 0 0;
-  }
-  &:last-child {
-    border-radius: 0 0 $euiSizeXS $euiSizeXS;
-  }
-  &:only-child {
-    border-radius: $euiSizeXS;
-  }
-}
-
-.code-top-bar__container {
-  box-sizing: content-box;
-  display: flex;
-  flex-shrink: 0;
-  flex-direction: column;
-  justify-content: space-between;
-  min-height: 80px;
-  border-bottom: $euiBorderThin;
-  nav {
-    a {
-      display: inline;
-    }
-    div {
-      vertical-align: baseline;
-    }
-  }
-}
-
-.codeTopBar__toolbar {
-  padding: $euiSizeS;
-  flex-wrap: wrap;
-}
-
-.codeTopBar__left {
-  min-width: 12rem;
-  width: calc(100% - 29rem);
-}
-
-.codeSearch__suggestion-item {
-  height: 3rem;
-  margin: 0 $euiSize;
-  border-radius: $euiSizeXS;
-  cursor: pointer;
-
-  &:hover {
-    background: $euiFocusBackgroundColor;
-  }
-}
-
-.codeSearch__suggestion-item--active {
-  background: $euiFocusBackgroundColor;
-}
-
-.codeSearch-suggestion--inner {
-  display: flex;
-  flex-grow: 1;
-  align-items: center;
-  white-space: nowrap;
-}
-
-.codeSearch__suggestionTextContainer {
-  min-width: 0;
-  flex: 1;
-}
-
-.codeSearch__suggestion-text {
-  color: $euiColorFullShade;
-  font-family: $euiCodeFontFamily;
-  margin-right: $euiSizeXL;
-  width: auto;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: $euiSizeXS $euiSizeS;
-  font-size: $euiFontSizeS;
-}
-
-.codeSearch__full-text-button {
-  border-top: $euiBorderWidthThin solid $euiBorderColor;
-  padding: $euiSizeS;
-  text-align: center;
-  font-weight: bold;
-  background: $euiColorLightShade;
-  margin: $euiSizeS;
-  padding: $euiSizeS;
-  font-size: $euiFontSizeS;
-}
-
-.kbnTypeahead .kbnTypeahead__popover .kbnTypeahead__items {
-  overflow-x: hidden;
-}
-
-.codeSearch-suggestion__group {
-  border-top: $euiBorderThin;
-}
-
-.codeSearch-suggestion__group-header {
-  padding: $euiSizeL;
-}
-.codeSearch-suggestion__group-title {
-  font-weight: bold;
-  margin-left: $euiSizeS;
-  display: inline-block;
-}
-
-.codeSearch-suggestion__group-result {
-  color: $euiColorDarkShade;
-  font-size: $euiFontSizeXS;
-}
-
-.codeSearch-suggestion__link {
-  height: $euiSize;
-  line-height: $euiSize;
-  text-align: center;
-  font-size: $euiFontSizeXS;
-  margin: $euiSizeS;
-}
-
-.codeSearch-suggestion__description {
-  color: $euiColorDarkShade;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  font-size: $euiFontSizeXS;
-  padding: $euiSizeXS $euiSizeS;
-}
-
-.codeSearch-suggestion__token {
-  color: $euiColorFullShade;
-  box-sizing: border-box;
-  flex: 0 0 $euiSizeXL;
-  height: $euiSizeXL;
-  text-align: center;
-  overflow: hidden;
-  padding: $euiSizeXS;
-  justify-content: center;
-  align-items: center;
-  margin-left: $euiSizeXS;
-}
-
-.code-link {
-  margin: 0 $euiSizeS $euiSizeS;
-  border-radius: $euiBorderRadius;
-  &:focus {
-    text-decoration: underline;
-  }
-}
-
-.codeBlame__item {
-  padding-right: $euiSizeM;
-  padding-left: $euiSizeM;
-  border-top: $euiBorderThin;
-  &.codeBlame__item--first {
-    border-top: none;
-  }
-}
-
-.codeIcon__language {
-  fill: $euiColorDarkestShade;
-}
-
-.code-line-decoration {
-  border-right: $euiBorderThick;
-  margin-left: $euiSize;
-  border-left: $euiBorderThin;
-  width: 300px !important;
-}
-
-.codeBranchSelectorTabs {
-  @include euiScrollBar;
-  max-height: calc(100vh - 19rem);
-  overflow: auto;
-}
-
-.codeBranchSelectorTabContentContainer {
-  padding-top: $euiSizeS;
-}
-
-.codeBranchSelectorPopover {
-  margin-top: $euiSizeXS;
-  padding-top: $euiSizeS !important;
-}
-
-.codeBranchSelectorRevisionItem:hover *,
-.codeBranchSelectorRevisionItem:focus * {
-  text-decoration: none !important;
-  &:focus,
-  &:hover {
-    text-decoration: none !important;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/main/main.tsx b/x-pack/legacy/plugins/code/public/components/main/main.tsx
deleted file mode 100644
index c3ae03760e3970..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/main.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { connect } from 'react-redux';
-import { RouteComponentProps } from 'react-router-dom';
-
-import { npStart } from 'ui/new_platform';
-import { APP_TITLE } from '../../../common/constants';
-import { MainRouteParams } from '../../common/types';
-import { ShortcutsProvider } from '../shortcuts';
-import { Content } from './content';
-import { SideTabs } from './side_tabs';
-import { structureSelector, currentTreeSelector } from '../../selectors';
-import { RootState } from '../../reducers';
-import { FileTree } from '../../../model';
-import { trackCodeUiMetric, METRIC_TYPE } from '../../services/ui_metric';
-import { CodeUIUsageMetrics } from '../../../model/usage_telemetry_metrics';
-
-interface Props extends RouteComponentProps<MainRouteParams> {
-  loadingFileTree: boolean;
-  loadingStructureTree: boolean;
-  hasStructure: boolean;
-  languageServerInitializing: boolean;
-  currentTree: FileTree | null;
-}
-
-class CodeMain extends React.Component<Props> {
-  public componentDidMount() {
-    this.setBreadcrumbs();
-    // track source page load count
-    trackCodeUiMetric(METRIC_TYPE.LOADED, CodeUIUsageMetrics.SOURCE_VIEW_PAGE_LOAD_COUNT);
-  }
-
-  public componentDidUpdate() {
-    this.setBreadcrumbs();
-  }
-
-  public setBreadcrumbs() {
-    const { resource, org, repo } = this.props.match.params;
-    npStart.core.chrome.setBreadcrumbs([
-      { text: APP_TITLE, href: '#/' },
-      {
-        text: `${org} → ${repo}`,
-        href: `#/${resource}/${org}/${repo}`,
-      },
-    ]);
-  }
-
-  public componentWillUnmount() {
-    npStart.core.chrome.setBreadcrumbs([{ text: APP_TITLE, href: '#/' }]);
-  }
-
-  public render() {
-    const {
-      loadingFileTree,
-      loadingStructureTree,
-      hasStructure,
-      languageServerInitializing,
-    } = this.props;
-    return (
-      <div className="codeContainer__root">
-        <div className="codeContainer__rootInner">
-          <React.Fragment>
-            <SideTabs
-              currentTree={this.props.currentTree}
-              loadingFileTree={loadingFileTree}
-              loadingStructureTree={loadingStructureTree}
-              hasStructure={hasStructure}
-              languageServerInitializing={languageServerInitializing}
-            />
-            <Content />
-          </React.Fragment>
-        </div>
-        <ShortcutsProvider />
-      </div>
-    );
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  loadingFileTree: state.fileTree.fileTreeLoadingPaths.includes(''),
-  loadingStructureTree: state.symbol.loading,
-  hasStructure: structureSelector(state).length > 0 && !state.symbol.error,
-  languageServerInitializing: state.symbol.languageServerInitializing,
-  currentTree: currentTreeSelector(state),
-});
-
-export const Main = connect(mapStateToProps)(CodeMain);
diff --git a/x-pack/legacy/plugins/code/public/components/main/not_found.tsx b/x-pack/legacy/plugins/code/public/components/main/not_found.tsx
deleted file mode 100644
index ed385a65c70040..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/not_found.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiFlexGroup } from '@elastic/eui';
-import React from 'react';
-import { ErrorPanel } from './error_panel';
-
-export const NotFound = () => (
-  <EuiFlexGroup alignItems="center" justifyContent="flexStart">
-    <ErrorPanel
-      title={<h2>404</h2>}
-      content="Unfortunately that page doesn’t exist. You can try searching to find what you’re looking for."
-    />
-  </EuiFlexGroup>
-);
diff --git a/x-pack/legacy/plugins/code/public/components/main/side_tabs.tsx b/x-pack/legacy/plugins/code/public/components/main/side_tabs.tsx
deleted file mode 100644
index 4bc271ce9254da..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/side_tabs.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiLoadingSpinner, EuiSpacer, EuiTabbedContent, EuiText } from '@elastic/eui';
-import { parse as parseQuery } from 'querystring';
-import React from 'react';
-import { RouteComponentProps, withRouter } from 'react-router-dom';
-import { i18n } from '@kbn/i18n';
-
-import { MainRouteParams } from '../../common/types';
-import { replaceParamInUrl } from '../../utils/query_string';
-import { FileTree } from '../file_tree/file_tree';
-import { Shortcut } from '../shortcuts';
-import { SymbolTree } from '../symbol_tree/symbol_tree';
-import { FileTree as IFileTree, FileTreeItemType } from '../../../model';
-
-enum Tabs {
-  file = 'file',
-  structure = 'structure',
-}
-
-interface Props extends RouteComponentProps<MainRouteParams> {
-  loadingFileTree: boolean;
-  loadingStructureTree: boolean;
-  hasStructure: boolean;
-  languageServerInitializing: boolean;
-  currentTree: IFileTree | null;
-}
-
-class CodeSideTabs extends React.PureComponent<Props> {
-  public get sideTab(): Tabs {
-    const { search } = this.props.location;
-    let qs = search;
-    if (search.charAt(0) === '?') {
-      qs = search.substr(1);
-    }
-    const tab = parseQuery(qs).sideTab;
-    return tab === Tabs.structure ? Tabs.structure : Tabs.file;
-  }
-
-  public renderLoadingSpinner(text: string) {
-    return (
-      <div>
-        <EuiSpacer size="xl" />
-        <EuiSpacer size="xl" />
-        <EuiText textAlign="center">{text}</EuiText>
-        <EuiSpacer size="m" />
-        <EuiText textAlign="center">
-          <EuiLoadingSpinner size="xl" />
-        </EuiText>
-      </div>
-    );
-  }
-
-  public get tabs() {
-    const { languageServerInitializing, loadingFileTree, loadingStructureTree } = this.props;
-    const fileTabContent = loadingFileTree ? (
-      this.renderLoadingSpinner(
-        i18n.translate('xpack.code.mainPage.sideTab.loadingFileTreeText', {
-          defaultMessage: 'Loading file tree',
-        })
-      )
-    ) : (
-      <div className="codeFileTree__container">{<FileTree />}</div>
-    );
-    let structureTabContent: React.ReactNode;
-    if (languageServerInitializing) {
-      structureTabContent = this.renderLoadingSpinner(
-        i18n.translate('xpack.code.mainPage.sideTab.languageServerInitializingText', {
-          defaultMessage: 'Language server is initializing',
-        })
-      );
-    } else if (loadingStructureTree) {
-      structureTabContent = this.renderLoadingSpinner(
-        i18n.translate('xpack.code.mainPage.sideTab.loadingStructureTreeText', {
-          defaultMessage: 'Loading structure tree',
-        })
-      );
-    } else {
-      const { resource, org, repo, revision, path } = this.props.match.params;
-      const uri = `git://${resource}/${org}/${repo}/blob/${revision}/${path}`;
-      structureTabContent = <SymbolTree uri={uri} />;
-    }
-    return [
-      {
-        id: Tabs.file,
-        name: i18n.translate('xpack.code.mainPage.sideTab.fileTabLabel', {
-          defaultMessage: 'Files',
-        }),
-        content: fileTabContent,
-        'data-test-subj': `codeFileTreeTab${this.sideTab === Tabs.file ? 'Active' : ''}`,
-      },
-      {
-        id: Tabs.structure,
-        name: i18n.translate('xpack.code.mainPage.sideTab.structureTabLabel', {
-          defaultMessage: 'Structure',
-        }),
-        content: structureTabContent,
-        disabled:
-          !(this.props.currentTree && this.props.currentTree.type === FileTreeItemType.File) ||
-          !this.props.hasStructure,
-        'data-test-subj': 'codeStructureTreeTab',
-      },
-    ];
-  }
-
-  public switchTab = (tab: Tabs) => {
-    const { history } = this.props;
-    const { pathname, search } = history.location;
-    history.push(replaceParamInUrl(`${pathname}${search}`, 'sideTab', tab));
-  };
-
-  public render() {
-    const tabs = this.tabs;
-    const selectedTab = tabs.find(t => t.id === this.sideTab);
-    return (
-      <div>
-        <EuiTabbedContent
-          className="code-navigation__sidebar"
-          tabs={tabs}
-          onTabClick={tab => this.switchTab(tab.id as Tabs)}
-          expand={true}
-          selectedTab={selectedTab}
-        />
-        <Shortcut
-          keyCode="t"
-          help="Toggle tree and symbol view in sidebar"
-          onPress={this.toggleTab}
-        />
-      </div>
-    );
-  }
-  private toggleTab = () => {
-    const currentTab = this.sideTab;
-    if (currentTab === Tabs.file) {
-      this.switchTab(Tabs.structure);
-    } else {
-      this.switchTab(Tabs.file);
-    }
-  };
-}
-
-export const SideTabs = withRouter(CodeSideTabs);
diff --git a/x-pack/legacy/plugins/code/public/components/main/top_bar.tsx b/x-pack/legacy/plugins/code/public/components/main/top_bar.tsx
deleted file mode 100644
index 7682d087c8ea21..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/main/top_bar.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import React from 'react';
-import { SearchOptions, SearchScope, Repository } from '../../../model';
-import { ReferenceInfo } from '../../../model/commit';
-import { MainRouteParams } from '../../common/types';
-import { decodeRevisionString } from '../../../common/uri_util';
-import { Breadcrumb } from './breadcrumb';
-import { SearchBar } from '../search_bar';
-import { StatusIndicator } from '../status_indicator/status_indicator';
-import { BranchSelector } from './branch_selector';
-
-interface Props {
-  routeParams: MainRouteParams;
-  onSearchScopeChanged: (s: SearchScope) => void;
-  buttons: React.ReactNode;
-  searchOptions: SearchOptions;
-  branches: ReferenceInfo[];
-  tags: ReferenceInfo[];
-  query: string;
-  currentRepository?: Repository;
-}
-
-export class TopBar extends React.Component<Props, { value: string }> {
-  static getDerivedStateFromProps(props: Props) {
-    return { value: decodeRevisionString(props.routeParams.revision) };
-  }
-  public state = {
-    value: decodeRevisionString(this.props.routeParams.revision),
-  };
-
-  public get branch() {
-    return this.getBranch(this.state.value);
-  }
-
-  getBranch = (revision: string) => {
-    const r = decodeRevisionString(revision);
-    if (r.toUpperCase() === 'HEAD' && this.props.currentRepository) {
-      return this.props.currentRepository.defaultBranch;
-    }
-    if (this.props.branches.length === 0 && this.props.tags.length === 0) {
-      return r;
-    }
-    const branch = this.props.branches.find(b => b.name === r);
-    const tag = this.props.tags.find(b => b.name === r);
-    if (branch) {
-      return branch.name;
-    } else if (tag) {
-      return tag.name;
-    } else {
-      return `tree: ${r}`;
-    }
-  };
-
-  public get branchOptions() {
-    return this.props.branches.map(b => ({
-      value: b.name,
-      text: b.name,
-      ['data-test-subj']: `codeBranchSelectOption-${b.name}${
-        this.branch === b.name ? 'Active' : ''
-      }`,
-    }));
-  }
-
-  getHrefFromRevision = (r: string) => {
-    const { resource, org, repo, path = '', pathType } = this.props.routeParams;
-    return `#/${resource}/${org}/${repo}/${pathType}/${r}/${path}`;
-  };
-
-  public render() {
-    const { branch } = this;
-    return (
-      <div className="code-top-bar__container">
-        <SearchBar
-          query={this.props.query}
-          onSearchScopeChanged={this.props.onSearchScopeChanged}
-          enableSubmitWhenOptionsChanged={false}
-          searchOptions={this.props.searchOptions}
-        />
-        <EuiFlexGroup
-          gutterSize="none"
-          justifyContent="spaceBetween"
-          className="codeTopBar__toolbar"
-        >
-          <EuiFlexItem className="codeTopBar__left">
-            <EuiFlexGroup gutterSize="l" alignItems="center">
-              <EuiFlexItem className="codeContainer__select" grow={false}>
-                <BranchSelector
-                  getHrefFromRevision={this.getHrefFromRevision}
-                  branches={this.props.branches}
-                  tags={this.props.tags}
-                  revision={branch!}
-                />
-              </EuiFlexItem>
-              <Breadcrumb routeParams={this.props.routeParams} />
-              <EuiFlexItem grow={false}>
-                <StatusIndicator />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>{this.props.buttons}</EuiFlexItem>
-        </EuiFlexGroup>
-      </div>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/__fixtures__/props.json b/x-pack/legacy/plugins/code/public/components/query_bar/components/__fixtures__/props.json
deleted file mode 100644
index 942dbeca5f814e..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/__fixtures__/props.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "file": {
-    "type": "file",
-    "total": 1,
-    "hasMore": false,
-    "suggestions": [
-      {
-        "description": "This is a file",
-        "end": 10,
-        "start": 1,
-        "text": "src/foo/bar.java",
-        "tokenType": "",
-        "selectUrl": "http://github.com/elastic/elasticsearch/src/foo/bar.java"
-      }
-    ]
-  },
-  "repository": {
-    "type": "repository",
-    "total": 2,
-    "hasMore": true,
-    "suggestions": [
-      {
-        "description": "",
-        "end": 10,
-        "start": 1,
-        "text": "elastic/kibana",
-        "tokenType": "",
-        "selectUrl": "http://github.com/elastic/kibana"
-      },
-      {
-        "description": "",
-        "end": 10,
-        "start": 1,
-        "text": "elastic/elasticsearch",
-        "tokenType": "",
-        "selectUrl": "http://github.com/elastic/elasticsearch"
-      }
-    ]
-  },
-  "symbol": {
-    "type": "symbol",
-    "total": 1,
-    "hasMore": false,
-    "suggestions": [
-      {
-        "description": "elastic/elasticsearch > src/foo/bar.java",
-        "end": 10,
-        "start": 1,
-        "text": "java.lang.String",
-        "tokenType": "tokenClass",
-        "selectUrl": "http://github.com/elastic/elasticsearch/src/foo/bar.java"
-      }
-    ]
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/__snapshots__/query_bar.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/query_bar/components/__snapshots__/query_bar.test.tsx.snap
deleted file mode 100644
index 2b049ba6273e39..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/__snapshots__/query_bar.test.tsx.snap
+++ /dev/null
@@ -1,1347 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`render correctly with empty query string 1`] = `
-<CodeQueryBar
-  appName="mockapp"
-  defaultRepoOptions={Array []}
-  disableAutoFocus={false}
-  enableSubmitWhenOptionsChanged={false}
-  onSearchScopeChanged={[Function]}
-  onSelect={[Function]}
-  onSubmit={[Function]}
-  query=""
-  repoSearchResults={Array []}
-  repositorySearch={[Function]}
-  saveSearchOptions={[Function]}
-  searchLoading={false}
-  searchOptions={
-    Object {
-      "defaultRepoScopeOn": false,
-      "repoScope": Array [],
-    }
-  }
-  searchScope="default"
-  suggestionProviders={Array []}
->
-  <EuiFlexGroup
-    gutterSize="none"
-    responsive={false}
-  >
-    <div
-      className="euiFlexGroup euiFlexGroup--directionRow"
-    >
-      <EuiFlexItem
-        className="codeQueryBar__scope"
-        grow={false}
-      >
-        <div
-          className="euiFlexItem euiFlexItem--flexGrowZero codeQueryBar__scope"
-        >
-          <ScopeSelector
-            onScopeChanged={[Function]}
-            scope="default"
-          >
-            <EuiSuperSelect
-              compressed={false}
-              fullWidth={false}
-              hasDividers={false}
-              isInvalid={false}
-              onChange={[Function]}
-              options={
-                Array [
-                  Object {
-                    "inputDisplay": <div>
-                      <EuiText
-                        size="s"
-                      >
-                        <EuiIcon
-                          type="bullseye"
-                        />
-                         
-                        Search Everything
-                      </EuiText>
-                    </div>,
-                    "value": "default",
-                  },
-                  Object {
-                    "inputDisplay": <EuiText
-                      size="s"
-                    >
-                      <EuiIcon
-                        type="crosshairs"
-                      />
-                       
-                      Search Symbols
-                    </EuiText>,
-                    "value": "symbol",
-                  },
-                  Object {
-                    "inputDisplay": <EuiText
-                      size="s"
-                    >
-                      <EuiIcon
-                        type="branch"
-                      />
-                       
-                      Search Repositories
-                    </EuiText>,
-                    "value": "repository",
-                  },
-                  Object {
-                    "inputDisplay": <EuiText
-                      size="s"
-                    >
-                      <EuiIcon
-                        type="document"
-                      />
-                       
-                      Search Files
-                    </EuiText>,
-                    "value": "file",
-                  },
-                ]
-              }
-              valueOfSelected="default"
-            >
-              <EuiPopover
-                anchorPosition="downCenter"
-                button={
-                  <EuiSuperSelectControl
-                    className=""
-                    compressed={false}
-                    fullWidth={false}
-                    isInvalid={false}
-                    isLoading={false}
-                    onClick={[Function]}
-                    onKeyDown={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "inputDisplay": <div>
-                            <EuiText
-                              size="s"
-                            >
-                              <EuiIcon
-                                type="bullseye"
-                              />
-                               
-                              Search Everything
-                            </EuiText>
-                          </div>,
-                          "value": "default",
-                        },
-                        Object {
-                          "inputDisplay": <EuiText
-                            size="s"
-                          >
-                            <EuiIcon
-                              type="crosshairs"
-                            />
-                             
-                            Search Symbols
-                          </EuiText>,
-                          "value": "symbol",
-                        },
-                        Object {
-                          "inputDisplay": <EuiText
-                            size="s"
-                          >
-                            <EuiIcon
-                              type="branch"
-                            />
-                             
-                            Search Repositories
-                          </EuiText>,
-                          "value": "repository",
-                        },
-                        Object {
-                          "inputDisplay": <EuiText
-                            size="s"
-                          >
-                            <EuiIcon
-                              type="document"
-                            />
-                             
-                            Search Files
-                          </EuiText>,
-                          "value": "file",
-                        },
-                      ]
-                    }
-                    value="default"
-                  />
-                }
-                className="euiSuperSelect"
-                closePopover={[Function]}
-                display="block"
-                hasArrow={false}
-                isOpen={false}
-                ownFocus={false}
-                panelClassName="euiSuperSelect__popoverPanel"
-                panelPaddingSize="none"
-                popoverRef={[Function]}
-              >
-                <EuiOutsideClickDetector
-                  isDisabled={true}
-                  onOutsideClick={[Function]}
-                >
-                  <div
-                    className="euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock euiSuperSelect"
-                    onKeyDown={[Function]}
-                    onMouseDown={[Function]}
-                    onMouseUp={[Function]}
-                    onTouchEnd={[Function]}
-                    onTouchStart={[Function]}
-                  >
-                    <div
-                      className="euiPopover__anchor"
-                    >
-                      <EuiSuperSelectControl
-                        className=""
-                        compressed={false}
-                        fullWidth={false}
-                        isInvalid={false}
-                        isLoading={false}
-                        onClick={[Function]}
-                        onKeyDown={[Function]}
-                        options={
-                          Array [
-                            Object {
-                              "inputDisplay": <div>
-                                <EuiText
-                                  size="s"
-                                >
-                                  <EuiIcon
-                                    type="bullseye"
-                                  />
-                                   
-                                  Search Everything
-                                </EuiText>
-                              </div>,
-                              "value": "default",
-                            },
-                            Object {
-                              "inputDisplay": <EuiText
-                                size="s"
-                              >
-                                <EuiIcon
-                                  type="crosshairs"
-                                />
-                                 
-                                Search Symbols
-                              </EuiText>,
-                              "value": "symbol",
-                            },
-                            Object {
-                              "inputDisplay": <EuiText
-                                size="s"
-                              >
-                                <EuiIcon
-                                  type="branch"
-                                />
-                                 
-                                Search Repositories
-                              </EuiText>,
-                              "value": "repository",
-                            },
-                            Object {
-                              "inputDisplay": <EuiText
-                                size="s"
-                              >
-                                <EuiIcon
-                                  type="document"
-                                />
-                                 
-                                Search Files
-                              </EuiText>,
-                              "value": "file",
-                            },
-                          ]
-                        }
-                        value="default"
-                      >
-                        <input
-                          type="hidden"
-                          value="default"
-                        />
-                        <EuiFormControlLayout
-                          compressed={false}
-                          fullWidth={false}
-                          icon={
-                            Object {
-                              "side": "right",
-                              "type": "arrowDown",
-                            }
-                          }
-                          isLoading={false}
-                        >
-                          <div
-                            className="euiFormControlLayout"
-                          >
-                            <div
-                              className="euiFormControlLayout__childrenWrapper"
-                            >
-                              <EuiScreenReaderOnly>
-                                <span
-                                  className="euiScreenReaderOnly"
-                                  id="0.i"
-                                >
-                                  <EuiI18n
-                                    default="Select an option: {selectedValue}, is selected"
-                                    token="euiSuperSelectControl.selectAnOption"
-                                    values={
-                                      Object {
-                                        "selectedValue": <div>
-                                          <EuiText
-                                            size="s"
-                                          >
-                                            <EuiIcon
-                                              type="bullseye"
-                                            />
-                                             
-                                            Search Everything
-                                          </EuiText>
-                                        </div>,
-                                      }
-                                    }
-                                  >
-                                    <Component
-                                      selectedValue={
-                                        <div>
-                                          <EuiText
-                                            size="s"
-                                          >
-                                            <EuiIcon
-                                              type="bullseye"
-                                            />
-                                             
-                                            Search Everything
-                                          </EuiText>
-                                        </div>
-                                      }
-                                    >
-                                      Select an option: 
-                                      <div
-                                        key="1"
-                                      >
-                                        <EuiText
-                                          size="s"
-                                        >
-                                          <div
-                                            className="euiText euiText--small"
-                                          >
-                                            <EuiIcon
-                                              type="bullseye"
-                                            >
-                                              <EuiIconEmpty
-                                                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                                focusable="false"
-                                                style={null}
-                                              >
-                                                <svg
-                                                  className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                                  focusable="false"
-                                                  height={16}
-                                                  style={null}
-                                                  viewBox="0 0 16 16"
-                                                  width={16}
-                                                  xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
-                                            </EuiIcon>
-                                             
-                                            Search Everything
-                                          </div>
-                                        </EuiText>
-                                      </div>
-                                      , is selected
-                                    </Component>
-                                  </EuiI18n>
-                                </span>
-                              </EuiScreenReaderOnly>
-                              <button
-                                aria-haspopup="true"
-                                aria-labelledby="undefined 0.i"
-                                aria-selected={true}
-                                className="euiSuperSelectControl"
-                                onClick={[Function]}
-                                onKeyDown={[Function]}
-                                role="option"
-                                type="button"
-                              >
-                                <div>
-                                  <EuiText
-                                    size="s"
-                                  >
-                                    <div
-                                      className="euiText euiText--small"
-                                    >
-                                      <EuiIcon
-                                        type="bullseye"
-                                      >
-                                        <EuiIconEmpty
-                                          className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                          focusable="false"
-                                          style={null}
-                                        >
-                                          <svg
-                                            className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                            focusable="false"
-                                            height={16}
-                                            style={null}
-                                            viewBox="0 0 16 16"
-                                            width={16}
-                                            xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
-                                      </EuiIcon>
-                                       
-                                      Search Everything
-                                    </div>
-                                  </EuiText>
-                                </div>
-                              </button>
-                              <EuiFormControlLayoutIcons
-                                icon={
-                                  Object {
-                                    "side": "right",
-                                    "type": "arrowDown",
-                                  }
-                                }
-                                isLoading={false}
-                              >
-                                <div
-                                  className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                                >
-                                  <EuiFormControlLayoutCustomIcon
-                                    type="arrowDown"
-                                  >
-                                    <span
-                                      className="euiFormControlLayoutCustomIcon"
-                                    >
-                                      <EuiIcon
-                                        aria-hidden="true"
-                                        className="euiFormControlLayoutCustomIcon__icon"
-                                        type="arrowDown"
-                                      >
-                                        <EuiIconEmpty
-                                          aria-hidden="true"
-                                          className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                                          focusable="false"
-                                          style={null}
-                                        >
-                                          <svg
-                                            aria-hidden="true"
-                                            className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                                            focusable="false"
-                                            height={16}
-                                            style={null}
-                                            viewBox="0 0 16 16"
-                                            width={16}
-                                            xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
-                                      </EuiIcon>
-                                    </span>
-                                  </EuiFormControlLayoutCustomIcon>
-                                </div>
-                              </EuiFormControlLayoutIcons>
-                            </div>
-                          </div>
-                        </EuiFormControlLayout>
-                      </EuiSuperSelectControl>
-                    </div>
-                  </div>
-                </EuiOutsideClickDetector>
-              </EuiPopover>
-            </EuiSuperSelect>
-          </ScopeSelector>
-        </div>
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <div
-          className="euiFlexItem"
-        >
-          <EuiOutsideClickDetector
-            onOutsideClick={[Function]}
-          >
-            <div
-              aria-controls="typeahead-items"
-              aria-expanded={false}
-              aria-haspopup="true"
-              aria-owns="typeahead-items"
-              onMouseDown={[Function]}
-              onMouseUp={[Function]}
-              onTouchEnd={[Function]}
-              onTouchStart={[Function]}
-              role="combobox"
-              style={
-                Object {
-                  "position": "relative",
-                }
-              }
-            >
-              <form
-                name="queryBarForm"
-              >
-                <div
-                  className="kuiLocalSearch"
-                  role="search"
-                >
-                  <div
-                    className="kuiLocalSearchAssistedInput"
-                  >
-                    <EuiFieldText
-                      aria-activedescendant=""
-                      aria-autocomplete="list"
-                      aria-controls="typeahead-items"
-                      aria-label="Search input"
-                      autoComplete="off"
-                      autoFocus={true}
-                      className="kuiLocalSearchAssistedInput__input codeQueryBar__input"
-                      compressed={false}
-                      data-test-subj="queryInput"
-                      fullWidth={true}
-                      inputRef={[Function]}
-                      isLoading={false}
-                      onChange={[Function]}
-                      onClick={[Function]}
-                      onKeyDown={[Function]}
-                      onKeyUp={[Function]}
-                      placeholder="Type to find anything"
-                      role="textbox"
-                      spellCheck={false}
-                      type="text"
-                      value=""
-                    >
-                      <EuiFormControlLayout
-                        compressed={false}
-                        fullWidth={true}
-                        isLoading={false}
-                      >
-                        <div
-                          className="euiFormControlLayout euiFormControlLayout--fullWidth"
-                        >
-                          <div
-                            className="euiFormControlLayout__childrenWrapper"
-                          >
-                            <EuiValidatableControl>
-                              <input
-                                aria-activedescendant=""
-                                aria-autocomplete="list"
-                                aria-controls="typeahead-items"
-                                aria-label="Search input"
-                                autoComplete="off"
-                                autoFocus={true}
-                                className="euiFieldText kuiLocalSearchAssistedInput__input codeQueryBar__input euiFieldText--fullWidth"
-                                data-test-subj="queryInput"
-                                onChange={[Function]}
-                                onClick={[Function]}
-                                onKeyDown={[Function]}
-                                onKeyUp={[Function]}
-                                placeholder="Type to find anything"
-                                role="textbox"
-                                spellCheck={false}
-                                type="text"
-                                value=""
-                              />
-                            </EuiValidatableControl>
-                            <EuiFormControlLayoutIcons
-                              isLoading={false}
-                            />
-                          </div>
-                        </div>
-                      </EuiFormControlLayout>
-                    </EuiFieldText>
-                    <SearchOptions
-                      defaultRepoOptions={Array []}
-                      repoSearchResults={Array []}
-                      repositorySearch={[Function]}
-                      saveSearchOptions={[Function]}
-                      searchLoading={false}
-                      searchOptions={
-                        Object {
-                          "defaultRepoScopeOn": false,
-                          "repoScope": Array [],
-                        }
-                      }
-                    >
-                      <div>
-                        <div
-                          className="kuiLocalSearchAssistedInput__assistance"
-                        >
-                          <EuiButtonEmpty
-                            onClick={[Function]}
-                            size="xs"
-                          >
-                            <button
-                              className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
-                              onClick={[Function]}
-                              type="button"
-                            >
-                              <span
-                                className="euiButtonEmpty__content"
-                              >
-                                <span
-                                  className="euiButtonEmpty__text"
-                                >
-                                  <EuiNotificationBadge
-                                    className="codeQueryBar__filter-badge"
-                                    size="m"
-                                  >
-                                    <span
-                                      className="euiNotificationBadge euiNotificationBadge--medium codeQueryBar__filter-badge"
-                                    >
-                                      0
-                                    </span>
-                                  </EuiNotificationBadge>
-                                  <EuiTextColor
-                                    color="secondary"
-                                  >
-                                    <span
-                                      className="euiTextColor euiTextColor--secondary"
-                                    >
-                                      <FormattedMessage
-                                        defaultMessage="{filterCount, plural, one {Advanced Filter} other {Advanced Filters}}"
-                                        id="xpack.code.searchBar.searchFilterTitle"
-                                        values={
-                                          Object {
-                                            "filterCount": 0,
-                                          }
-                                        }
-                                      >
-                                        <span>
-                                          Advanced Filters
-                                        </span>
-                                      </FormattedMessage>
-                                    </span>
-                                  </EuiTextColor>
-                                </span>
-                              </span>
-                            </button>
-                          </EuiButtonEmpty>
-                        </div>
-                      </div>
-                    </SearchOptions>
-                  </div>
-                </div>
-              </form>
-              <SuggestionsComponent
-                groupIndex={null}
-                itemIndex={null}
-                loadMore={[Function]}
-                onClick={[Function]}
-                onMouseEnter={[Function]}
-                query=""
-                show={false}
-                suggestionGroups={Array []}
-              />
-            </div>
-          </EuiOutsideClickDetector>
-        </div>
-      </EuiFlexItem>
-    </div>
-  </EuiFlexGroup>
-</CodeQueryBar>
-`;
-
-exports[`render correctly with input query string changed 1`] = `
-<MemoryRouter
-  initialEntries={
-    Array [
-      Object {
-        "key": "testKey",
-        "pathname": "/",
-      },
-    ]
-  }
->
-  <Router
-    history={
-      Object {
-        "action": "POP",
-        "block": [Function],
-        "canGo": [Function],
-        "createHref": [Function],
-        "entries": Array [
-          Object {
-            "hash": "",
-            "key": "testKey",
-            "pathname": "/",
-            "search": "",
-          },
-        ],
-        "go": [Function],
-        "goBack": [Function],
-        "goForward": [Function],
-        "index": 0,
-        "length": 1,
-        "listen": [Function],
-        "location": Object {
-          "hash": "",
-          "key": "testKey",
-          "pathname": "/",
-          "search": "",
-        },
-        "push": [Function],
-        "replace": [Function],
-      }
-    }
-  >
-    <CodeQueryBar
-      appName="mockapp"
-      defaultRepoOptions={Array []}
-      disableAutoFocus={false}
-      enableSubmitWhenOptionsChanged={false}
-      onSearchScopeChanged={[Function]}
-      onSelect={[Function]}
-      onSubmit={[Function]}
-      query="mockquery"
-      repoSearchResults={Array []}
-      repositorySearch={[Function]}
-      saveSearchOptions={[Function]}
-      searchLoading={false}
-      searchOptions={
-        Object {
-          "defaultRepoScopeOn": false,
-          "repoScope": Array [],
-        }
-      }
-      searchScope="default"
-      suggestionProviders={
-        Array [
-          Object {
-            "getSuggestions": [Function],
-          },
-          Object {
-            "getSuggestions": [Function],
-          },
-          Object {
-            "getSuggestions": [Function],
-          },
-        ]
-      }
-    >
-      <EuiFlexGroup
-        gutterSize="none"
-        responsive={false}
-      >
-        <div
-          className="euiFlexGroup euiFlexGroup--directionRow"
-        >
-          <EuiFlexItem
-            className="codeQueryBar__scope"
-            grow={false}
-          >
-            <div
-              className="euiFlexItem euiFlexItem--flexGrowZero codeQueryBar__scope"
-            >
-              <ScopeSelector
-                onScopeChanged={[Function]}
-                scope="default"
-              >
-                <EuiSuperSelect
-                  compressed={false}
-                  fullWidth={false}
-                  hasDividers={false}
-                  isInvalid={false}
-                  onChange={[Function]}
-                  options={
-                    Array [
-                      Object {
-                        "inputDisplay": <div>
-                          <EuiText
-                            size="s"
-                          >
-                            <EuiIcon
-                              type="bullseye"
-                            />
-                             
-                            Search Everything
-                          </EuiText>
-                        </div>,
-                        "value": "default",
-                      },
-                      Object {
-                        "inputDisplay": <EuiText
-                          size="s"
-                        >
-                          <EuiIcon
-                            type="crosshairs"
-                          />
-                           
-                          Search Symbols
-                        </EuiText>,
-                        "value": "symbol",
-                      },
-                      Object {
-                        "inputDisplay": <EuiText
-                          size="s"
-                        >
-                          <EuiIcon
-                            type="branch"
-                          />
-                           
-                          Search Repositories
-                        </EuiText>,
-                        "value": "repository",
-                      },
-                      Object {
-                        "inputDisplay": <EuiText
-                          size="s"
-                        >
-                          <EuiIcon
-                            type="document"
-                          />
-                           
-                          Search Files
-                        </EuiText>,
-                        "value": "file",
-                      },
-                    ]
-                  }
-                  valueOfSelected="default"
-                >
-                  <EuiPopover
-                    anchorPosition="downCenter"
-                    button={
-                      <EuiSuperSelectControl
-                        className=""
-                        compressed={false}
-                        fullWidth={false}
-                        isInvalid={false}
-                        isLoading={false}
-                        onClick={[Function]}
-                        onKeyDown={[Function]}
-                        options={
-                          Array [
-                            Object {
-                              "inputDisplay": <div>
-                                <EuiText
-                                  size="s"
-                                >
-                                  <EuiIcon
-                                    type="bullseye"
-                                  />
-                                   
-                                  Search Everything
-                                </EuiText>
-                              </div>,
-                              "value": "default",
-                            },
-                            Object {
-                              "inputDisplay": <EuiText
-                                size="s"
-                              >
-                                <EuiIcon
-                                  type="crosshairs"
-                                />
-                                 
-                                Search Symbols
-                              </EuiText>,
-                              "value": "symbol",
-                            },
-                            Object {
-                              "inputDisplay": <EuiText
-                                size="s"
-                              >
-                                <EuiIcon
-                                  type="branch"
-                                />
-                                 
-                                Search Repositories
-                              </EuiText>,
-                              "value": "repository",
-                            },
-                            Object {
-                              "inputDisplay": <EuiText
-                                size="s"
-                              >
-                                <EuiIcon
-                                  type="document"
-                                />
-                                 
-                                Search Files
-                              </EuiText>,
-                              "value": "file",
-                            },
-                          ]
-                        }
-                        value="default"
-                      />
-                    }
-                    className="euiSuperSelect"
-                    closePopover={[Function]}
-                    display="block"
-                    hasArrow={false}
-                    isOpen={false}
-                    ownFocus={false}
-                    panelClassName="euiSuperSelect__popoverPanel"
-                    panelPaddingSize="none"
-                    popoverRef={[Function]}
-                  >
-                    <EuiOutsideClickDetector
-                      isDisabled={true}
-                      onOutsideClick={[Function]}
-                    >
-                      <div
-                        className="euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock euiSuperSelect"
-                        onKeyDown={[Function]}
-                        onMouseDown={[Function]}
-                        onMouseUp={[Function]}
-                        onTouchEnd={[Function]}
-                        onTouchStart={[Function]}
-                      >
-                        <div
-                          className="euiPopover__anchor"
-                        >
-                          <EuiSuperSelectControl
-                            className=""
-                            compressed={false}
-                            fullWidth={false}
-                            isInvalid={false}
-                            isLoading={false}
-                            onClick={[Function]}
-                            onKeyDown={[Function]}
-                            options={
-                              Array [
-                                Object {
-                                  "inputDisplay": <div>
-                                    <EuiText
-                                      size="s"
-                                    >
-                                      <EuiIcon
-                                        type="bullseye"
-                                      />
-                                       
-                                      Search Everything
-                                    </EuiText>
-                                  </div>,
-                                  "value": "default",
-                                },
-                                Object {
-                                  "inputDisplay": <EuiText
-                                    size="s"
-                                  >
-                                    <EuiIcon
-                                      type="crosshairs"
-                                    />
-                                     
-                                    Search Symbols
-                                  </EuiText>,
-                                  "value": "symbol",
-                                },
-                                Object {
-                                  "inputDisplay": <EuiText
-                                    size="s"
-                                  >
-                                    <EuiIcon
-                                      type="branch"
-                                    />
-                                     
-                                    Search Repositories
-                                  </EuiText>,
-                                  "value": "repository",
-                                },
-                                Object {
-                                  "inputDisplay": <EuiText
-                                    size="s"
-                                  >
-                                    <EuiIcon
-                                      type="document"
-                                    />
-                                     
-                                    Search Files
-                                  </EuiText>,
-                                  "value": "file",
-                                },
-                              ]
-                            }
-                            value="default"
-                          >
-                            <input
-                              type="hidden"
-                              value="default"
-                            />
-                            <EuiFormControlLayout
-                              compressed={false}
-                              fullWidth={false}
-                              icon={
-                                Object {
-                                  "side": "right",
-                                  "type": "arrowDown",
-                                }
-                              }
-                              isLoading={false}
-                            >
-                              <div
-                                className="euiFormControlLayout"
-                              >
-                                <div
-                                  className="euiFormControlLayout__childrenWrapper"
-                                >
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                      id="0.i"
-                                    >
-                                      <EuiI18n
-                                        default="Select an option: {selectedValue}, is selected"
-                                        token="euiSuperSelectControl.selectAnOption"
-                                        values={
-                                          Object {
-                                            "selectedValue": <div>
-                                              <EuiText
-                                                size="s"
-                                              >
-                                                <EuiIcon
-                                                  type="bullseye"
-                                                />
-                                                 
-                                                Search Everything
-                                              </EuiText>
-                                            </div>,
-                                          }
-                                        }
-                                      >
-                                        <Component
-                                          selectedValue={
-                                            <div>
-                                              <EuiText
-                                                size="s"
-                                              >
-                                                <EuiIcon
-                                                  type="bullseye"
-                                                />
-                                                 
-                                                Search Everything
-                                              </EuiText>
-                                            </div>
-                                          }
-                                        >
-                                          Select an option: 
-                                          <div
-                                            key="1"
-                                          >
-                                            <EuiText
-                                              size="s"
-                                            >
-                                              <div
-                                                className="euiText euiText--small"
-                                              >
-                                                <EuiIcon
-                                                  type="bullseye"
-                                                >
-                                                  <EuiIconEmpty
-                                                    className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                                    focusable="false"
-                                                    style={null}
-                                                  >
-                                                    <svg
-                                                      className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                                      focusable="false"
-                                                      height={16}
-                                                      style={null}
-                                                      viewBox="0 0 16 16"
-                                                      width={16}
-                                                      xmlns="http://www.w3.org/2000/svg"
-                                                    />
-                                                  </EuiIconEmpty>
-                                                </EuiIcon>
-                                                 
-                                                Search Everything
-                                              </div>
-                                            </EuiText>
-                                          </div>
-                                          , is selected
-                                        </Component>
-                                      </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                  <button
-                                    aria-haspopup="true"
-                                    aria-labelledby="undefined 0.i"
-                                    aria-selected={true}
-                                    className="euiSuperSelectControl"
-                                    onClick={[Function]}
-                                    onKeyDown={[Function]}
-                                    role="option"
-                                    type="button"
-                                  >
-                                    <div>
-                                      <EuiText
-                                        size="s"
-                                      >
-                                        <div
-                                          className="euiText euiText--small"
-                                        >
-                                          <EuiIcon
-                                            type="bullseye"
-                                          >
-                                            <EuiIconEmpty
-                                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                              focusable="false"
-                                              style={null}
-                                            >
-                                              <svg
-                                                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                                focusable="false"
-                                                height={16}
-                                                style={null}
-                                                viewBox="0 0 16 16"
-                                                width={16}
-                                                xmlns="http://www.w3.org/2000/svg"
-                                              />
-                                            </EuiIconEmpty>
-                                          </EuiIcon>
-                                           
-                                          Search Everything
-                                        </div>
-                                      </EuiText>
-                                    </div>
-                                  </button>
-                                  <EuiFormControlLayoutIcons
-                                    icon={
-                                      Object {
-                                        "side": "right",
-                                        "type": "arrowDown",
-                                      }
-                                    }
-                                    isLoading={false}
-                                  >
-                                    <div
-                                      className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                                    >
-                                      <EuiFormControlLayoutCustomIcon
-                                        type="arrowDown"
-                                      >
-                                        <span
-                                          className="euiFormControlLayoutCustomIcon"
-                                        >
-                                          <EuiIcon
-                                            aria-hidden="true"
-                                            className="euiFormControlLayoutCustomIcon__icon"
-                                            type="arrowDown"
-                                          >
-                                            <EuiIconEmpty
-                                              aria-hidden="true"
-                                              className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                                              focusable="false"
-                                              style={null}
-                                            >
-                                              <svg
-                                                aria-hidden="true"
-                                                className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                                                focusable="false"
-                                                height={16}
-                                                style={null}
-                                                viewBox="0 0 16 16"
-                                                width={16}
-                                                xmlns="http://www.w3.org/2000/svg"
-                                              />
-                                            </EuiIconEmpty>
-                                          </EuiIcon>
-                                        </span>
-                                      </EuiFormControlLayoutCustomIcon>
-                                    </div>
-                                  </EuiFormControlLayoutIcons>
-                                </div>
-                              </div>
-                            </EuiFormControlLayout>
-                          </EuiSuperSelectControl>
-                        </div>
-                      </div>
-                    </EuiOutsideClickDetector>
-                  </EuiPopover>
-                </EuiSuperSelect>
-              </ScopeSelector>
-            </div>
-          </EuiFlexItem>
-          <EuiFlexItem>
-            <div
-              className="euiFlexItem"
-            >
-              <EuiOutsideClickDetector
-                onOutsideClick={[Function]}
-              >
-                <div
-                  aria-controls="typeahead-items"
-                  aria-expanded={true}
-                  aria-haspopup="true"
-                  aria-owns="typeahead-items"
-                  onMouseDown={[Function]}
-                  onMouseUp={[Function]}
-                  onTouchEnd={[Function]}
-                  onTouchStart={[Function]}
-                  role="combobox"
-                  style={
-                    Object {
-                      "position": "relative",
-                    }
-                  }
-                >
-                  <form
-                    name="queryBarForm"
-                  >
-                    <div
-                      className="kuiLocalSearch"
-                      role="search"
-                    >
-                      <div
-                        className="kuiLocalSearchAssistedInput"
-                      >
-                        <EuiFieldText
-                          aria-activedescendant="suggestion-null-null"
-                          aria-autocomplete="list"
-                          aria-controls="typeahead-items"
-                          aria-label="Search input"
-                          autoComplete="off"
-                          autoFocus={true}
-                          className="kuiLocalSearchAssistedInput__input codeQueryBar__input"
-                          compressed={false}
-                          data-test-subj="queryInput"
-                          fullWidth={true}
-                          inputRef={[Function]}
-                          isLoading={false}
-                          onChange={[Function]}
-                          onClick={[Function]}
-                          onKeyDown={[Function]}
-                          onKeyUp={[Function]}
-                          placeholder="Type to find anything"
-                          role="textbox"
-                          spellCheck={false}
-                          type="text"
-                          value="mockquery"
-                        >
-                          <EuiFormControlLayout
-                            compressed={false}
-                            fullWidth={true}
-                            isLoading={false}
-                          >
-                            <div
-                              className="euiFormControlLayout euiFormControlLayout--fullWidth"
-                            >
-                              <div
-                                className="euiFormControlLayout__childrenWrapper"
-                              >
-                                <EuiValidatableControl>
-                                  <input
-                                    aria-activedescendant="suggestion-null-null"
-                                    aria-autocomplete="list"
-                                    aria-controls="typeahead-items"
-                                    aria-label="Search input"
-                                    autoComplete="off"
-                                    autoFocus={true}
-                                    className="euiFieldText kuiLocalSearchAssistedInput__input codeQueryBar__input euiFieldText--fullWidth"
-                                    data-test-subj="queryInput"
-                                    onChange={[Function]}
-                                    onClick={[Function]}
-                                    onKeyDown={[Function]}
-                                    onKeyUp={[Function]}
-                                    placeholder="Type to find anything"
-                                    role="textbox"
-                                    spellCheck={false}
-                                    type="text"
-                                    value="mockquery"
-                                  />
-                                </EuiValidatableControl>
-                                <EuiFormControlLayoutIcons
-                                  isLoading={false}
-                                />
-                              </div>
-                            </div>
-                          </EuiFormControlLayout>
-                        </EuiFieldText>
-                        <SearchOptions
-                          defaultRepoOptions={Array []}
-                          repoSearchResults={Array []}
-                          repositorySearch={[Function]}
-                          saveSearchOptions={[Function]}
-                          searchLoading={false}
-                          searchOptions={
-                            Object {
-                              "defaultRepoScopeOn": false,
-                              "repoScope": Array [],
-                            }
-                          }
-                        >
-                          <div>
-                            <div
-                              className="kuiLocalSearchAssistedInput__assistance"
-                            >
-                              <EuiButtonEmpty
-                                onClick={[Function]}
-                                size="xs"
-                              >
-                                <button
-                                  className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
-                                  onClick={[Function]}
-                                  type="button"
-                                >
-                                  <span
-                                    className="euiButtonEmpty__content"
-                                  >
-                                    <span
-                                      className="euiButtonEmpty__text"
-                                    >
-                                      <EuiNotificationBadge
-                                        className="codeQueryBar__filter-badge"
-                                        size="m"
-                                      >
-                                        <span
-                                          className="euiNotificationBadge euiNotificationBadge--medium codeQueryBar__filter-badge"
-                                        >
-                                          0
-                                        </span>
-                                      </EuiNotificationBadge>
-                                      <EuiTextColor
-                                        color="secondary"
-                                      >
-                                        <span
-                                          className="euiTextColor euiTextColor--secondary"
-                                        >
-                                          <FormattedMessage
-                                            defaultMessage="{filterCount, plural, one {Advanced Filter} other {Advanced Filters}}"
-                                            id="xpack.code.searchBar.searchFilterTitle"
-                                            values={
-                                              Object {
-                                                "filterCount": 0,
-                                              }
-                                            }
-                                          >
-                                            <span>
-                                              Advanced Filters
-                                            </span>
-                                          </FormattedMessage>
-                                        </span>
-                                      </EuiTextColor>
-                                    </span>
-                                  </span>
-                                </button>
-                              </EuiButtonEmpty>
-                            </div>
-                          </div>
-                        </SearchOptions>
-                      </div>
-                    </div>
-                  </form>
-                  <SuggestionsComponent
-                    groupIndex={null}
-                    itemIndex={null}
-                    loadMore={[Function]}
-                    onClick={[Function]}
-                    onMouseEnter={[Function]}
-                    query="mockquery"
-                    show={true}
-                    suggestionGroups={Array []}
-                  />
-                </div>
-              </EuiOutsideClickDetector>
-            </div>
-          </EuiFlexItem>
-        </div>
-      </EuiFlexGroup>
-    </CodeQueryBar>
-  </Router>
-</MemoryRouter>
-`;
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/index.ts b/x-pack/legacy/plugins/code/public/components/query_bar/components/index.ts
deleted file mode 100644
index 0c6b5535c34e3b..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { QueryBar } from './query_bar';
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/options.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/options.tsx
deleted file mode 100644
index aa0fa04b726b24..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/options.tsx
+++ /dev/null
@@ -1,254 +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,
-  EuiComboBox,
-  EuiFlexGroup,
-  EuiFlyout,
-  EuiFlyoutBody,
-  EuiFlyoutHeader,
-  EuiPanel,
-  EuiSpacer,
-  EuiText,
-  EuiTextColor,
-  EuiTitle,
-  EuiNotificationBadge,
-} from '@elastic/eui';
-import { EuiIcon } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import { unique } from 'lodash';
-import React, { Component } from 'react';
-import { SearchOptions as ISearchOptions, Repository } from '../../../../model';
-
-interface State {
-  isFlyoutOpen: boolean;
-  repoScope: Repository[];
-  query: string;
-  defaultRepoScopeOn: boolean;
-}
-
-interface Props {
-  repositorySearch: (p: { query: string }) => void;
-  saveSearchOptions: (searchOptions: ISearchOptions) => void;
-  repoSearchResults: any[];
-  searchLoading: boolean;
-  searchOptions: ISearchOptions;
-  defaultRepoOptions: Repository[];
-  defaultSearchScope?: Repository;
-}
-
-export class SearchOptions extends Component<Props, State> {
-  public state: State = {
-    query: '',
-    isFlyoutOpen: false,
-    repoScope: this.props.searchOptions.repoScope,
-    defaultRepoScopeOn: this.props.searchOptions.defaultRepoScopeOn,
-  };
-
-  componentDidUpdate(prevProps: Props) {
-    if (
-      this.props.searchOptions.defaultRepoScopeOn !== prevProps.searchOptions.defaultRepoScopeOn
-    ) {
-      this.setState({ defaultRepoScopeOn: this.props.searchOptions.defaultRepoScopeOn });
-    }
-  }
-
-  public applyAndClose = () => {
-    if (this.state.defaultRepoScopeOn && this.props.defaultSearchScope) {
-      this.props.saveSearchOptions({
-        repoScope: unique([...this.state.repoScope, this.props.defaultSearchScope], r => r.uri),
-        defaultRepoScopeOn: this.state.defaultRepoScopeOn,
-      });
-    } else {
-      this.props.saveSearchOptions({
-        repoScope: this.state.repoScope,
-        defaultRepoScopeOn: this.state.defaultRepoScopeOn,
-      });
-    }
-    this.setState({ isFlyoutOpen: false });
-  };
-
-  public removeRepoScope = (r: string) => () => {
-    this.setState(prevState => {
-      const nextState: any = {
-        repoScope: prevState.repoScope.filter(rs => rs.uri !== r),
-      };
-      if (this.props.defaultSearchScope && r === this.props.defaultSearchScope.uri) {
-        nextState.defaultRepoScopeOn = false;
-      }
-      return nextState;
-    });
-  };
-
-  public render() {
-    let optionsFlyout;
-    const repoScope =
-      this.state.defaultRepoScopeOn && this.props.defaultSearchScope
-        ? unique([...this.state.repoScope, this.props.defaultSearchScope], (r: Repository) => r.uri)
-        : this.state.repoScope;
-    if (this.state.isFlyoutOpen) {
-      const selectedRepos = repoScope.map(r => {
-        return (
-          <div key={r.uri}>
-            <EuiPanel paddingSize="s">
-              <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween" alignItems="center">
-                <div className="codeQueryBar">
-                  <EuiText>
-                    <EuiTextColor color="subdued">{r.org}/</EuiTextColor>
-                    <b>{r.name}</b>
-                  </EuiText>
-                </div>
-                <EuiIcon
-                  className="codeUtility__cursor--pointer"
-                  type="cross"
-                  onClick={this.removeRepoScope(r.uri)}
-                />
-              </EuiFlexGroup>
-            </EuiPanel>
-            <EuiSpacer size="s" />
-          </div>
-        );
-      });
-
-      const repoCandidates = this.state.query
-        ? this.props.repoSearchResults.map(repo => ({
-            label: repo.name,
-          }))
-        : this.props.defaultRepoOptions.map(repo => ({
-            label: repo.name,
-          }));
-
-      optionsFlyout = (
-        <EuiFlyout
-          onClose={this.closeOptionsFlyout}
-          size="s"
-          aria-labelledby="flyoutSmallTitle"
-          className="codeSearchSettings__flyout"
-        >
-          <EuiFlyoutHeader>
-            <EuiTitle size="s">
-              <EuiFlexGroup id="flyoutSmallTitle" alignItems="center" gutterSize="none">
-                <EuiNotificationBadge size="m" className="codeQueryBar__filter-badge">
-                  {repoScope.length}
-                </EuiNotificationBadge>
-                <EuiTextColor color="secondary">
-                  <FormattedMessage
-                    id="xpack.code.searchBar.searchFilterTitle"
-                    defaultMessage="{filterCount, plural, one {Advanced Filter} other {Advanced Filters}}"
-                    values={{ filterCount: repoScope.length }}
-                  />
-                </EuiTextColor>
-              </EuiFlexGroup>
-            </EuiTitle>
-          </EuiFlyoutHeader>
-          <EuiFlyoutBody>
-            <EuiTitle size="xs">
-              <h3>
-                <FormattedMessage
-                  id="xpack.code.searchBar.searchScopeTitle"
-                  defaultMessage="Search Scope"
-                />
-              </h3>
-            </EuiTitle>
-            <EuiText size="xs">
-              <FormattedMessage
-                id="xpack.code.searchBar.addToScopeDescription"
-                defaultMessage="Add indexed repos to your search scope"
-              />
-            </EuiText>
-            <EuiSpacer size="m" />
-            <EuiComboBox
-              noSuggestions={repoCandidates.length === 0}
-              placeholder={i18n.translate('xpack.code.searchBar.addRepoPlaceholder', {
-                defaultMessage: 'Search to add repos',
-              })}
-              async={true}
-              options={repoCandidates}
-              selectedOptions={[]}
-              isLoading={this.props.searchLoading}
-              onChange={this.onRepoChange}
-              onSearchChange={this.onRepoSearchChange}
-              isClearable={true}
-            />
-            <EuiSpacer size="m" />
-            {selectedRepos}
-            <EuiSpacer size="s" />
-            <EuiFlexGroup justifyContent="flexEnd" gutterSize="none">
-              <EuiButton onClick={this.applyAndClose} fill={true} iconSide="right">
-                <FormattedMessage
-                  id="xpack.code.searchBar.applyAndCloseButtonLabel"
-                  defaultMessage="Apply and Close"
-                />
-              </EuiButton>
-            </EuiFlexGroup>
-          </EuiFlyoutBody>
-        </EuiFlyout>
-      );
-    }
-
-    return (
-      <div>
-        <div className="kuiLocalSearchAssistedInput__assistance">
-          <EuiButtonEmpty size="xs" onClick={this.toggleOptionsFlyout}>
-            <EuiNotificationBadge size="m" className="codeQueryBar__filter-badge">
-              {repoScope.length}
-            </EuiNotificationBadge>
-            <EuiTextColor color="secondary">
-              <FormattedMessage
-                id="xpack.code.searchBar.searchFilterTitle"
-                defaultMessage="{filterCount, plural, one {Advanced Filter} other {Advanced Filters}}"
-                values={{ filterCount: repoScope.length }}
-              />
-            </EuiTextColor>
-          </EuiButtonEmpty>
-        </div>
-        {optionsFlyout}
-      </div>
-    );
-  }
-
-  private onRepoSearchChange = (searchValue: string) => {
-    this.setState({ query: searchValue });
-    if (searchValue) {
-      this.props.repositorySearch({
-        query: searchValue,
-      });
-    }
-  };
-
-  private onRepoChange = (repos: any) => {
-    this.setState(prevState => ({
-      repoScope: unique(
-        [
-          ...prevState.repoScope,
-          ...repos.map((r: any) =>
-            [...this.props.repoSearchResults, ...this.props.defaultRepoOptions].find(
-              rs => rs.name === r.label
-            )
-          ),
-        ],
-        (r: Repository) => r.uri
-      ),
-    }));
-  };
-
-  private toggleOptionsFlyout = () => {
-    this.setState({
-      isFlyoutOpen: !this.state.isFlyoutOpen,
-    });
-  };
-
-  private closeOptionsFlyout = () => {
-    this.setState({
-      isFlyoutOpen: false,
-      repoScope: this.props.searchOptions.repoScope,
-      defaultRepoScopeOn: this.props.searchOptions.defaultRepoScopeOn,
-    });
-  };
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.test.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.test.tsx
deleted file mode 100644
index 0d521883af87b3..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.test.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import React from 'react';
-import { MemoryRouter } from 'react-router-dom';
-import sinon from 'sinon';
-
-import { SearchScope } from '../../../../model';
-import { AutocompleteSuggestionType } from '../suggestions';
-import props from './__fixtures__/props.json';
-import { CodeQueryBar } from './query_bar';
-
-// Injest a mock random function to fixiate the output for generating component id.
-const mockMath = Object.create(global.Math);
-mockMath.random = () => 0.5;
-global.Math = mockMath;
-
-test('render correctly with empty query string', () => {
-  const emptyFn = () => {
-    return;
-  };
-  const queryBarComp = mount(
-    <CodeQueryBar
-      repositorySearch={emptyFn}
-      saveSearchOptions={emptyFn}
-      repoSearchResults={[]}
-      searchLoading={false}
-      searchOptions={{ repoScope: [], defaultRepoScopeOn: false }}
-      query=""
-      disableAutoFocus={false}
-      appName="mockapp"
-      suggestionProviders={[]}
-      enableSubmitWhenOptionsChanged={false}
-      onSubmit={emptyFn}
-      onSelect={emptyFn}
-      onSearchScopeChanged={emptyFn}
-      searchScope={SearchScope.DEFAULT}
-      defaultRepoOptions={[]}
-    />
-  );
-  expect(toJson(queryBarComp)).toMatchSnapshot();
-});
-
-test('render correctly with input query string changed', done => {
-  const emptyFn = () => {
-    return;
-  };
-
-  const fileSuggestionsSpy = sinon.fake.returns(
-    Promise.resolve(props[AutocompleteSuggestionType.FILE])
-  );
-  const symbolSuggestionsSpy = sinon.fake.returns(
-    Promise.resolve(props[AutocompleteSuggestionType.SYMBOL])
-  );
-  const repoSuggestionsSpy = sinon.fake.returns(
-    Promise.resolve(props[AutocompleteSuggestionType.REPOSITORY])
-  );
-
-  const mockFileSuggestionsProvider = { getSuggestions: fileSuggestionsSpy };
-  const mockSymbolSuggestionsProvider = { getSuggestions: symbolSuggestionsSpy };
-  const mockRepositorySuggestionsProvider = { getSuggestions: repoSuggestionsSpy };
-  const submitSpy = sinon.spy();
-
-  const queryBarComp = mount(
-    <MemoryRouter initialEntries={[{ pathname: '/', key: 'testKey' }]}>
-      <CodeQueryBar
-        repositorySearch={emptyFn}
-        saveSearchOptions={emptyFn}
-        repoSearchResults={[]}
-        searchLoading={false}
-        searchOptions={{ repoScope: [], defaultRepoScopeOn: false }}
-        query="mockquery"
-        disableAutoFocus={false}
-        appName="mockapp"
-        suggestionProviders={[
-          mockFileSuggestionsProvider,
-          mockSymbolSuggestionsProvider,
-          mockRepositorySuggestionsProvider,
-        ]}
-        enableSubmitWhenOptionsChanged={false}
-        onSubmit={submitSpy}
-        onSelect={emptyFn}
-        onSearchScopeChanged={emptyFn}
-        searchScope={SearchScope.DEFAULT}
-        defaultRepoOptions={[]}
-      />
-    </MemoryRouter>
-  );
-
-  // Input 'mockquery' in the query bar.
-  queryBarComp
-    .find('input[type="text"]')
-    .at(0)
-    .simulate('change', { target: { value: 'mockquery' } });
-
-  // Wait for 101ms to make sure the getSuggestions has been triggered.
-  setTimeout(() => {
-    expect(toJson(queryBarComp)).toMatchSnapshot();
-    expect(fileSuggestionsSpy.calledOnce).toBeTruthy();
-    expect(symbolSuggestionsSpy.calledOnce).toBeTruthy();
-    expect(repoSuggestionsSpy.calledOnce).toBeTruthy();
-
-    // Hit enter
-    queryBarComp
-      .find('input[type="text"]')
-      .at(0)
-      .simulate('keyDown', { keyCode: 13, key: 'Enter', metaKey: true });
-    expect(submitSpy.calledOnce).toBeTruthy();
-
-    done();
-  }, 1000);
-});
-
-test('invokes onSearchScopeChanged and gets new suggestions when the scope is changed', async () => {
-  const noOp = () => {};
-  const wait = (ms = 0) => new Promise(resolve => setTimeout(resolve, ms));
-
-  const fileSuggestionsSpy = jest.fn(() => Promise.resolve(props[AutocompleteSuggestionType.FILE]));
-  const symbolSuggestionsSpy = jest.fn(() =>
-    Promise.resolve(props[AutocompleteSuggestionType.SYMBOL])
-  );
-  const repoSuggestionsSpy = jest.fn(() =>
-    Promise.resolve(props[AutocompleteSuggestionType.REPOSITORY])
-  );
-  const suggestionsProviderSpies = [
-    { getSuggestions: fileSuggestionsSpy },
-    { getSuggestions: symbolSuggestionsSpy },
-    { getSuggestions: repoSuggestionsSpy },
-  ];
-  const onSearchScopeChangedSpy = jest.fn();
-
-  const wrapper = mount(
-    <CodeQueryBar
-      repositorySearch={noOp}
-      saveSearchOptions={noOp}
-      repoSearchResults={[]}
-      searchLoading={false}
-      searchOptions={{ repoScope: [], defaultRepoScopeOn: false }}
-      query="testQuery"
-      appName="testAppName"
-      suggestionProviders={suggestionsProviderSpies}
-      enableSubmitWhenOptionsChanged={false}
-      onSubmit={noOp}
-      onSelect={noOp}
-      onSearchScopeChanged={onSearchScopeChangedSpy}
-      searchScope={SearchScope.DEFAULT}
-      defaultRepoOptions={[]}
-    />
-  );
-
-  wrapper
-    .find('ScopeSelector')
-    .find('button')
-    .simulate('click');
-  wrapper
-    .find('ScopeSelector')
-    .find('EuiContextMenuItem')
-    .at(1)
-    .simulate('click');
-  await wait(200); // wait for getSuggestions' debounce
-
-  expect(onSearchScopeChangedSpy).toHaveBeenCalledWith(AutocompleteSuggestionType.SYMBOL);
-  expect(symbolSuggestionsSpy).toHaveBeenCalledWith('testQuery', SearchScope.DEFAULT, []);
-});
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.tsx
deleted file mode 100644
index 5bb08f56af42b4..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.tsx
+++ /dev/null
@@ -1,532 +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 { debounce, isEqual } from 'lodash';
-import React, { Component } from 'react';
-
-import { EuiFieldText, EuiFlexGroup, EuiFlexItem, EuiOutsideClickDetector } from '@elastic/eui';
-import { connect } from 'react-redux';
-import { saveSearchOptions, searchReposForScope, suggestionSearch } from '../../../actions';
-import { matchPairs } from '../lib/match_pairs';
-import { SuggestionsComponent } from './typeahead/suggestions_component';
-
-import { SearchOptions as ISearchOptions, SearchScope, Repository } from '../../../../model';
-import { SearchScopePlaceholderText } from '../../../common/types';
-import { RootState } from '../../../reducers';
-import {
-  AutocompleteSuggestion,
-  AutocompleteSuggestionGroup,
-  SuggestionsProvider,
-} from '../suggestions';
-import { SearchOptions } from './options';
-import { ScopeSelector } from './scope_selector';
-
-const KEY_CODES = {
-  LEFT: 37,
-  UP: 38,
-  RIGHT: 39,
-  DOWN: 40,
-  ENTER: 13,
-  ESC: 27,
-  TAB: 9,
-  HOME: 36,
-  END: 35,
-};
-
-interface Props {
-  query: string;
-  onSubmit: (query: string) => void;
-  onSelect: (item: AutocompleteSuggestion, query: string) => void;
-  onSuggestionQuerySubmitted?: (query: string) => void;
-  disableAutoFocus?: boolean;
-  appName: string;
-  suggestionProviders: SuggestionsProvider[];
-  repositorySearch: (p: { query: string }) => void;
-  saveSearchOptions: (searchOptions: ISearchOptions) => void;
-  enableSubmitWhenOptionsChanged: boolean;
-  onSearchScopeChanged: (s: SearchScope) => void;
-  repoSearchResults: any[];
-  searchLoading: boolean;
-  searchScope: SearchScope;
-  searchOptions: ISearchOptions;
-  defaultRepoOptions: Repository[];
-  currentRepository?: Repository;
-}
-
-interface State {
-  query: string;
-  inputIsPristine: boolean;
-  isSuggestionsVisible: boolean;
-  groupIndex: number | null;
-  itemIndex: number | null;
-  suggestionGroups: AutocompleteSuggestionGroup[];
-  showOptions: boolean;
-  currentProps?: Props;
-}
-
-export class CodeQueryBar extends Component<Props, State> {
-  public static getDerivedStateFromProps(nextProps: Props, prevState: State) {
-    if (isEqual(prevState.currentProps, nextProps)) {
-      return null;
-    }
-
-    const nextState: any = {
-      currentProps: nextProps,
-    };
-    if (nextProps.query !== prevState.query) {
-      nextState.query = nextProps.query;
-    }
-    return nextState;
-  }
-
-  /*
-   Keep the "draft" value in local state until the user actually submits the query. There are a couple advantages:
-
-    1. Each app doesn't have to maintain its own "draft" value if it wants to put off updating the query in app state
-    until the user manually submits their changes. Most apps have watches on the query value in app state so we don't
-    want to trigger those on every keypress. Also, some apps (e.g. dashboard) already juggle multiple query values,
-    each with slightly different semantics and I'd rather not add yet another variable to the mix.
-
-    2. Changes to the local component state won't trigger an Angular digest cycle. Triggering digest cycles on every
-    keypress has been a major source of performance issues for us in previous implementations of the query bar.
-    See https://github.com/elastic/kibana/issues/14086
-  */
-  public state: State = {
-    query: this.props.query,
-    inputIsPristine: true,
-    isSuggestionsVisible: false,
-    groupIndex: null,
-    itemIndex: null,
-    suggestionGroups: [],
-    showOptions: false,
-  };
-
-  public updateSuggestions = debounce(async () => {
-    const suggestionGroups = (await this.getSuggestions()) || [];
-    if (!this.componentIsUnmounting) {
-      this.setState({ suggestionGroups });
-    }
-  }, 100);
-
-  public inputRef: HTMLInputElement | null = null;
-
-  public optionFlyout: any | null = null;
-
-  private componentIsUnmounting = false;
-
-  public isDirty = () => {
-    return this.state.query !== this.props.query;
-  };
-
-  public loadMore = () => {
-    // TODO(mengwei): Add action for load more.
-  };
-
-  public incrementIndex = (currGroupIndex: number, currItemIndex: number) => {
-    let nextItemIndex = currItemIndex + 1;
-
-    if (currGroupIndex === null) {
-      currGroupIndex = 0;
-    }
-    let nextGroupIndex = currGroupIndex;
-
-    const group: AutocompleteSuggestionGroup = this.state.suggestionGroups[currGroupIndex];
-    if (currItemIndex === null || nextItemIndex >= group.suggestions.length) {
-      nextItemIndex = 0;
-      nextGroupIndex = currGroupIndex + 1;
-      if (nextGroupIndex >= this.state.suggestionGroups.length) {
-        nextGroupIndex = 0;
-      }
-    }
-
-    this.setState({
-      groupIndex: nextGroupIndex,
-      itemIndex: nextItemIndex,
-    });
-  };
-
-  public decrementIndex = (currGroupIndex: number, currItemIndex: number) => {
-    let prevItemIndex = currItemIndex - 1;
-
-    if (currGroupIndex === null) {
-      currGroupIndex = this.state.suggestionGroups.length - 1;
-    }
-    let prevGroupIndex = currGroupIndex;
-
-    if (currItemIndex === null || prevItemIndex < 0) {
-      prevGroupIndex = currGroupIndex - 1;
-      if (prevGroupIndex < 0) {
-        prevGroupIndex = this.state.suggestionGroups.length - 1;
-      }
-      const group: AutocompleteSuggestionGroup = this.state.suggestionGroups[prevGroupIndex];
-      prevItemIndex = group.suggestions.length - 1;
-    }
-
-    this.setState({
-      groupIndex: prevGroupIndex,
-      itemIndex: prevItemIndex,
-    });
-  };
-
-  public getSuggestions = async () => {
-    if (!this.inputRef) {
-      return;
-    }
-
-    const { query } = this.state;
-    if (query.length === 0) {
-      return [];
-    }
-
-    if (!this.props.suggestionProviders || this.props.suggestionProviders.length === 0) {
-      return [];
-    }
-
-    const { selectionStart, selectionEnd } = this.inputRef;
-    if (selectionStart === null || selectionEnd === null) {
-      return;
-    }
-
-    if (this.props.onSuggestionQuerySubmitted) {
-      this.props.onSuggestionQuerySubmitted(query);
-    }
-
-    const res = await Promise.all(
-      this.props.suggestionProviders.map((provider: SuggestionsProvider) => {
-        // Merge the default repository scope if necessary.
-        const repoScopes = this.props.searchOptions.repoScope.map(repo => repo.uri);
-        if (
-          this.props.searchOptions.defaultRepoScopeOn &&
-          this.props.searchOptions.defaultRepoScope
-        ) {
-          repoScopes.push(this.props.searchOptions.defaultRepoScope.uri);
-        }
-        return provider.getSuggestions(query, this.props.searchScope, repoScopes);
-      })
-    );
-
-    return res.filter((group: AutocompleteSuggestionGroup) => group.suggestions.length > 0);
-  };
-
-  public selectSuggestion = (item: AutocompleteSuggestion) => {
-    if (!this.inputRef) {
-      return;
-    }
-
-    const { selectionStart, selectionEnd } = this.inputRef;
-    if (selectionStart === null || selectionEnd === null) {
-      return;
-    }
-    this.setState(
-      {
-        query: this.state.query,
-        groupIndex: null,
-        itemIndex: null,
-        isSuggestionsVisible: false,
-      },
-      () => {
-        if (item) {
-          this.props.onSelect(item, this.state.query);
-        }
-      }
-    );
-  };
-
-  public onOutsideClick = () => {
-    this.setState({ isSuggestionsVisible: false, groupIndex: null, itemIndex: null });
-  };
-
-  public onClickInput = (event: React.MouseEvent<HTMLInputElement>) => {
-    if (event.target instanceof HTMLInputElement) {
-      this.onInputChange(event.target.value);
-    }
-  };
-
-  public onClickSubmitButton = (event: React.MouseEvent<HTMLButtonElement>) => {
-    this.onSubmit(() => event.preventDefault());
-  };
-
-  public onClickSuggestion = (suggestion: AutocompleteSuggestion) => {
-    if (!this.inputRef) {
-      return;
-    }
-    this.selectSuggestion(suggestion);
-    this.inputRef.focus();
-  };
-
-  public onMouseEnterSuggestion = (groupIndex: number, itemIndex: number) => {
-    this.setState({ groupIndex, itemIndex });
-  };
-
-  public onInputChange = (value: string) => {
-    const hasValue = Boolean(value.trim());
-
-    this.setState({
-      query: value,
-      inputIsPristine: false,
-      isSuggestionsVisible: hasValue,
-      groupIndex: null,
-      itemIndex: null,
-    });
-  };
-
-  public onChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    this.updateSuggestions();
-    this.onInputChange(event.target.value);
-  };
-
-  public onScopeChange = (scope: SearchScope) => {
-    const { onSearchScopeChanged } = this.props;
-
-    if (onSearchScopeChanged) {
-      onSearchScopeChanged(scope);
-    }
-
-    this.updateSuggestions();
-  };
-
-  public onKeyUp = (event: React.KeyboardEvent<HTMLInputElement>) => {
-    if ([KEY_CODES.LEFT, KEY_CODES.RIGHT, KEY_CODES.HOME, KEY_CODES.END].includes(event.keyCode)) {
-      this.setState({ isSuggestionsVisible: true });
-      if (event.target instanceof HTMLInputElement) {
-        this.onInputChange(event.target.value);
-      }
-    }
-  };
-
-  public onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
-    if (event.target instanceof HTMLInputElement) {
-      const { isSuggestionsVisible, groupIndex, itemIndex } = this.state;
-      const preventDefault = event.preventDefault.bind(event);
-      const { target, key, metaKey } = event;
-      const { value, selectionStart, selectionEnd } = target;
-      const updateQuery = (query: string, newSelectionStart: number, newSelectionEnd: number) => {
-        this.setState(
-          {
-            query,
-          },
-          () => {
-            target.setSelectionRange(newSelectionStart, newSelectionEnd);
-          }
-        );
-      };
-
-      switch (event.keyCode) {
-        case KEY_CODES.DOWN:
-          event.preventDefault();
-          if (isSuggestionsVisible && groupIndex !== null && itemIndex !== null) {
-            this.incrementIndex(groupIndex, itemIndex);
-          } else {
-            this.setState({ isSuggestionsVisible: true, groupIndex: 0, itemIndex: 0 });
-          }
-          break;
-        case KEY_CODES.UP:
-          event.preventDefault();
-          if (isSuggestionsVisible && groupIndex !== null && itemIndex !== null) {
-            this.decrementIndex(groupIndex, itemIndex);
-          } else {
-            const lastGroupIndex = this.state.suggestionGroups.length - 1;
-            const group: AutocompleteSuggestionGroup = this.state.suggestionGroups[lastGroupIndex];
-            if (group !== null) {
-              const lastItemIndex = group.suggestions.length - 1;
-              this.setState({
-                isSuggestionsVisible: true,
-                groupIndex: lastGroupIndex,
-                itemIndex: lastItemIndex,
-              });
-            }
-          }
-          break;
-        case KEY_CODES.ENTER:
-          event.preventDefault();
-          if (
-            isSuggestionsVisible &&
-            groupIndex !== null &&
-            itemIndex !== null &&
-            this.state.suggestionGroups[groupIndex]
-          ) {
-            const group: AutocompleteSuggestionGroup = this.state.suggestionGroups[groupIndex];
-            this.selectSuggestion(group.suggestions[itemIndex]);
-          } else {
-            this.onSubmit(() => event.preventDefault());
-          }
-          break;
-        case KEY_CODES.ESC:
-          event.preventDefault();
-          this.setState({ isSuggestionsVisible: false, groupIndex: null, itemIndex: null });
-          break;
-        case KEY_CODES.TAB:
-          this.setState({ isSuggestionsVisible: false, groupIndex: null, itemIndex: null });
-          break;
-        default:
-          if (selectionStart !== null && selectionEnd !== null) {
-            matchPairs({
-              value,
-              selectionStart,
-              selectionEnd,
-              key,
-              metaKey,
-              updateQuery,
-              preventDefault,
-            });
-          }
-
-          break;
-      }
-    }
-  };
-
-  public onSubmit = (preventDefault?: () => void) => {
-    if (preventDefault) {
-      preventDefault();
-    }
-
-    this.props.onSubmit(this.state.query);
-    this.setState({ isSuggestionsVisible: false });
-  };
-
-  public componentDidMount() {
-    this.updateSuggestions();
-  }
-
-  public componentDidUpdate(prevProps: Props) {
-    if (prevProps.query !== this.props.query) {
-      this.updateSuggestions();
-    }
-
-    // When search options (e.g. repository scopes) change,
-    // submit the search query again to refresh the search result.
-    if (
-      this.props.enableSubmitWhenOptionsChanged &&
-      !_.isEqual(prevProps.searchOptions, this.props.searchOptions)
-    ) {
-      this.onSubmit();
-    }
-  }
-
-  public componentWillUnmount() {
-    this.updateSuggestions.cancel();
-    this.componentIsUnmounting = true;
-  }
-
-  public focusInput() {
-    if (this.inputRef) {
-      this.inputRef.focus();
-    }
-  }
-
-  public toggleOptionsFlyout() {
-    if (this.optionFlyout) {
-      this.optionFlyout.toggleOptionsFlyout();
-    }
-  }
-
-  public render() {
-    const inputRef = (node: HTMLInputElement | null) => {
-      if (node) {
-        this.inputRef = node;
-      }
-    };
-    const activeDescendant = this.state.isSuggestionsVisible
-      ? `suggestion-${this.state.groupIndex}-${this.state.itemIndex}`
-      : '';
-    return (
-      <EuiFlexGroup responsive={false} gutterSize="none">
-        <EuiFlexItem className="codeQueryBar__scope" grow={false}>
-          <ScopeSelector scope={this.props.searchScope} onScopeChanged={this.onScopeChange} />
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiOutsideClickDetector onOutsideClick={this.onOutsideClick}>
-            <div
-              style={{
-                // position:relative required on container so the suggestions appear under the query bar
-                position: 'relative',
-              }}
-              role="combobox"
-              aria-haspopup="true"
-              aria-expanded={this.state.isSuggestionsVisible}
-              aria-owns="typeahead-items"
-              aria-controls="typeahead-items"
-            >
-              <form name="queryBarForm">
-                <div className="kuiLocalSearch" role="search">
-                  <div className="kuiLocalSearchAssistedInput">
-                    <EuiFieldText
-                      className="kuiLocalSearchAssistedInput__input codeQueryBar__input"
-                      placeholder={SearchScopePlaceholderText[this.props.searchScope]}
-                      value={this.state.query}
-                      onKeyDown={this.onKeyDown}
-                      onKeyUp={this.onKeyUp}
-                      onChange={this.onChange}
-                      onClick={this.onClickInput}
-                      fullWidth={true}
-                      autoFocus={!this.props.disableAutoFocus}
-                      inputRef={inputRef}
-                      autoComplete="off"
-                      spellCheck={false}
-                      aria-label="Search input"
-                      type="text"
-                      data-test-subj="queryInput"
-                      aria-autocomplete="list"
-                      aria-controls="typeahead-items"
-                      aria-activedescendant={activeDescendant}
-                      role="textbox"
-                    />
-                    <SearchOptions
-                      defaultRepoOptions={this.props.defaultRepoOptions}
-                      defaultSearchScope={
-                        this.props.currentRepository || this.props.searchOptions.defaultRepoScope
-                      }
-                      repositorySearch={this.props.repositorySearch}
-                      saveSearchOptions={this.props.saveSearchOptions}
-                      repoSearchResults={this.props.repoSearchResults}
-                      searchLoading={this.props.searchLoading}
-                      searchOptions={this.props.searchOptions}
-                      ref={element => (this.optionFlyout = element)}
-                    />
-                  </div>
-                </div>
-              </form>
-
-              <SuggestionsComponent
-                query={this.state.query}
-                show={this.state.isSuggestionsVisible}
-                suggestionGroups={this.state.suggestionGroups}
-                groupIndex={this.state.groupIndex}
-                itemIndex={this.state.itemIndex}
-                onClick={this.onClickSuggestion}
-                onMouseEnter={this.onMouseEnterSuggestion}
-                loadMore={this.loadMore}
-              />
-            </div>
-          </EuiOutsideClickDetector>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    );
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  repoSearchResults: state.search.scopeSearchResults.repositories,
-  searchLoading: state.search.isScopeSearchLoading,
-  searchScope: state.search.scope,
-  searchOptions: state.search.searchOptions,
-  defaultRepoOptions: state.repositoryManagement.repositories.slice(0, 5),
-  currentRepository: state.repository.repository,
-});
-
-const mapDispatchToProps = {
-  repositorySearch: searchReposForScope,
-  saveSearchOptions,
-  onSuggestionQuerySubmitted: suggestionSearch,
-};
-
-export const QueryBar = connect(
-  mapStateToProps,
-  mapDispatchToProps,
-  null,
-  { withRef: true }
-)(CodeQueryBar);
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/scope_selector.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/scope_selector.tsx
deleted file mode 100644
index 26114ced284f5d..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/scope_selector.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiIcon, EuiSuperSelect, EuiText } from '@elastic/eui';
-import React, { Component } from 'react';
-
-import { SearchScope } from '../../../../model';
-import { SearchScopeText } from '../../../common/types';
-
-interface Props {
-  scope: SearchScope;
-  onScopeChanged: (s: SearchScope) => void;
-}
-
-export class ScopeSelector extends Component<Props> {
-  public scopeOptions = [
-    {
-      value: SearchScope.DEFAULT,
-      inputDisplay: (
-        <div>
-          <EuiText size="s">
-            <EuiIcon type="bullseye" /> {SearchScopeText[SearchScope.DEFAULT]}
-          </EuiText>
-        </div>
-      ),
-    },
-    {
-      value: SearchScope.SYMBOL,
-      inputDisplay: (
-        <EuiText size="s">
-          <EuiIcon type="crosshairs" /> {SearchScopeText[SearchScope.SYMBOL]}
-        </EuiText>
-      ),
-    },
-    {
-      value: SearchScope.REPOSITORY,
-      inputDisplay: (
-        <EuiText size="s">
-          <EuiIcon type="branch" /> {SearchScopeText[SearchScope.REPOSITORY]}
-        </EuiText>
-      ),
-    },
-    {
-      value: SearchScope.FILE,
-      inputDisplay: (
-        <EuiText size="s">
-          <EuiIcon type="document" /> {SearchScopeText[SearchScope.FILE]}
-        </EuiText>
-      ),
-    },
-  ];
-
-  public render() {
-    return (
-      <EuiSuperSelect
-        options={this.scopeOptions}
-        valueOfSelected={this.props.scope}
-        onChange={this.props.onScopeChanged}
-      />
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestion_component.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestion_component.test.tsx.snap
deleted file mode 100644
index 711476e92b4c65..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestion_component.test.tsx.snap
+++ /dev/null
@@ -1,196 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`render file item 1`] = `
-<SuggestionComponent
-  ariaId="suggestion-1-1"
-  innerRef={[Function]}
-  onClick={[Function]}
-  onMouseEnter={[Function]}
-  query="bar"
-  selected={false}
-  suggestion={
-    Object {
-      "description": "This is a file",
-      "end": 10,
-      "selectUrl": "http://github.com/elastic/elasticsearch/src/foo/bar.java",
-      "start": 1,
-      "text": "src/foo/bar.java",
-      "tokenType": "",
-    }
-  }
->
-  <div
-    aria-selected={false}
-    className="codeSearch__suggestion-item "
-    id="suggestion-1-1"
-    onClick={[Function]}
-    onMouseEnter={[Function]}
-    role="option"
-  >
-    <div
-      className="codeSearch-suggestion--inner"
-    >
-      <div
-        className="codeSearch__suggestionTextContainer"
-      >
-        <div
-          className="codeSearch__suggestion-text"
-          data-test-subj="codeTypeaheadItem"
-        >
-          <span>
-            src/foo/
-            <strong>
-              bar
-            </strong>
-            .java
-          </span>
-        </div>
-        <div
-          className="codeSearch-suggestion__description"
-        >
-          This is a file
-        </div>
-      </div>
-    </div>
-  </div>
-</SuggestionComponent>
-`;
-
-exports[`render repository item 1`] = `
-<SuggestionComponent
-  ariaId="suggestion-1-1"
-  innerRef={[Function]}
-  onClick={[Function]}
-  onMouseEnter={[Function]}
-  query="kibana"
-  selected={false}
-  suggestion={
-    Object {
-      "description": "",
-      "end": 10,
-      "selectUrl": "http://github.com/elastic/kibana",
-      "start": 1,
-      "text": "elastic/kibana",
-      "tokenType": "",
-    }
-  }
->
-  <div
-    aria-selected={false}
-    className="codeSearch__suggestion-item "
-    id="suggestion-1-1"
-    onClick={[Function]}
-    onMouseEnter={[Function]}
-    role="option"
-  >
-    <div
-      className="codeSearch-suggestion--inner"
-    >
-      <div
-        className="codeSearch__suggestionTextContainer"
-      >
-        <div
-          className="codeSearch__suggestion-text"
-          data-test-subj="codeTypeaheadItem"
-        >
-          <span>
-            elastic/
-            <strong>
-              kibana
-            </strong>
-          </span>
-        </div>
-        <div
-          className="codeSearch-suggestion__description"
-        />
-      </div>
-    </div>
-  </div>
-</SuggestionComponent>
-`;
-
-exports[`render symbol item 1`] = `
-<SuggestionComponent
-  ariaId="suggestion-1-1"
-  innerRef={[Function]}
-  onClick={[Function]}
-  onMouseEnter={[Function]}
-  query="string"
-  selected={false}
-  suggestion={
-    Object {
-      "description": "elastic/elasticsearch > src/foo/bar.java",
-      "end": 10,
-      "selectUrl": "http://github.com/elastic/elasticsearch/src/foo/bar.java",
-      "start": 1,
-      "text": "java.lang.String",
-      "tokenType": "tokenClass",
-    }
-  }
->
-  <div
-    aria-selected={false}
-    className="codeSearch__suggestion-item "
-    id="suggestion-1-1"
-    onClick={[Function]}
-    onMouseEnter={[Function]}
-    role="option"
-  >
-    <div
-      className="codeSearch-suggestion--inner"
-    >
-      <div
-        className="codeSearch-suggestion__token"
-      >
-        <EuiToken
-          iconType="tokenClass"
-        >
-          <div
-            className="euiToken euiToken--tokenTint01 euiToken--circle euiToken--small"
-          >
-            <EuiIcon
-              type="tokenClass"
-            >
-              <EuiIconEmpty
-                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                focusable="false"
-                style={null}
-              >
-                <svg
-                  className="euiIcon euiIcon--medium euiIcon-isLoading"
-                  focusable="false"
-                  height={16}
-                  style={null}
-                  viewBox="0 0 16 16"
-                  width={16}
-                  xmlns="http://www.w3.org/2000/svg"
-                />
-              </EuiIconEmpty>
-            </EuiIcon>
-          </div>
-        </EuiToken>
-      </div>
-      <div
-        className="codeSearch__suggestionTextContainer"
-      >
-        <div
-          className="codeSearch__suggestion-text"
-          data-test-subj="codeTypeaheadItem"
-        >
-          <span>
-            java.lang.
-            <strong>
-              String
-            </strong>
-          </span>
-        </div>
-        <div
-          className="codeSearch-suggestion__description"
-        >
-          elastic/elasticsearch &gt; src/foo/bar.java
-        </div>
-      </div>
-    </div>
-  </div>
-</SuggestionComponent>
-`;
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestions_component.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestions_component.test.tsx.snap
deleted file mode 100644
index 323e169c064881..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestions_component.test.tsx.snap
+++ /dev/null
@@ -1,654 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`render empty suggestions component 1`] = `
-<SuggestionsComponent
-  groupIndex={0}
-  itemIndex={0}
-  loadMore={[Function]}
-  onClick={[Function]}
-  onMouseEnter={[Function]}
-  query="string"
-  show={true}
-  suggestionGroups={Array []}
-/>
-`;
-
-exports[`render full suggestions component 1`] = `
-<MemoryRouter
-  initialEntries={
-    Array [
-      Object {
-        "key": "testKey",
-        "pathname": "/",
-      },
-    ]
-  }
->
-  <Router
-    history={
-      Object {
-        "action": "POP",
-        "block": [Function],
-        "canGo": [Function],
-        "createHref": [Function],
-        "entries": Array [
-          Object {
-            "hash": "",
-            "key": "testKey",
-            "pathname": "/",
-            "search": "",
-          },
-        ],
-        "go": [Function],
-        "goBack": [Function],
-        "goForward": [Function],
-        "index": 0,
-        "length": 1,
-        "listen": [Function],
-        "location": Object {
-          "hash": "",
-          "key": "testKey",
-          "pathname": "/",
-          "search": "",
-        },
-        "push": [Function],
-        "replace": [Function],
-      }
-    }
-  >
-    <SuggestionsComponent
-      groupIndex={0}
-      itemIndex={0}
-      loadMore={[Function]}
-      onClick={[Function]}
-      onMouseEnter={[Function]}
-      query="string"
-      show={true}
-      suggestionGroups={
-        Array [
-          Object {
-            "hasMore": false,
-            "suggestions": Array [
-              Object {
-                "description": "elastic/elasticsearch > src/foo/bar.java",
-                "end": 10,
-                "selectUrl": "http://github.com/elastic/elasticsearch/src/foo/bar.java",
-                "start": 1,
-                "text": "java.lang.String",
-                "tokenType": "tokenClass",
-              },
-            ],
-            "total": 1,
-            "type": "symbol",
-          },
-          Object {
-            "hasMore": false,
-            "suggestions": Array [
-              Object {
-                "description": "This is a file",
-                "end": 10,
-                "selectUrl": "http://github.com/elastic/elasticsearch/src/foo/bar.java",
-                "start": 1,
-                "text": "src/foo/bar.java",
-                "tokenType": "",
-              },
-            ],
-            "total": 1,
-            "type": "file",
-          },
-          Object {
-            "hasMore": true,
-            "suggestions": Array [
-              Object {
-                "description": "",
-                "end": 10,
-                "selectUrl": "http://github.com/elastic/kibana",
-                "start": 1,
-                "text": "elastic/kibana",
-                "tokenType": "",
-              },
-              Object {
-                "description": "",
-                "end": 10,
-                "selectUrl": "http://github.com/elastic/elasticsearch",
-                "start": 1,
-                "text": "elastic/elasticsearch",
-                "tokenType": "",
-              },
-            ],
-            "total": 2,
-            "type": "repository",
-          },
-        ]
-      }
-    >
-      <div
-        className="reactSuggestionTypeahead"
-      >
-        <div
-          className="kbnTypeahead"
-        >
-          <div
-            className="kbnTypeahead__popover"
-          >
-            <div
-              className="kbnTypeahead__items codeSearch-suggestion__group"
-              data-test-subj="codeTypeaheadList-symbol"
-              id="kbnTypeahead__items"
-              key="symbol-suggestions"
-              onScroll={[Function]}
-              role="listbox"
-            >
-              <EuiFlexGroup
-                className="codeSearch-suggestion__group-header"
-                justifyContent="spaceBetween"
-              >
-                <div
-                  className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive codeSearch-suggestion__group-header"
-                >
-                  <EuiFlexGroup
-                    alignItems="center"
-                    direction="row"
-                    gutterSize="none"
-                  >
-                    <div
-                      className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiToken
-                        iconType="tokenSymbol"
-                      >
-                        <div
-                          className="euiToken euiToken--tokenTint07 euiToken--rectangle euiToken--small euiToken--fill"
-                        >
-                          <EuiIcon
-                            type="tokenSymbol"
-                          >
-                            <EuiIconEmpty
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              style={null}
-                            >
-                              <svg
-                                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                focusable="false"
-                                height={16}
-                                style={null}
-                                viewBox="0 0 16 16"
-                                width={16}
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </EuiIconEmpty>
-                          </EuiIcon>
-                        </div>
-                      </EuiToken>
-                      <EuiText
-                        className="codeSearch-suggestion__group-title"
-                      >
-                        <div
-                          className="euiText euiText--medium codeSearch-suggestion__group-title"
-                        >
-                          Symbols
-                        </div>
-                      </EuiText>
-                    </div>
-                  </EuiFlexGroup>
-                  <div
-                    className="codeSearch-suggestion__group-result"
-                  >
-                    <FormattedMessage
-                      defaultMessage="{total} {total, plural, one {Result} other {Results}}"
-                      id="xpack.code.searchBar.resultCountText"
-                      values={
-                        Object {
-                          "total": 1,
-                        }
-                      }
-                    >
-                      <span>
-                        1 Result
-                      </span>
-                    </FormattedMessage>
-                  </div>
-                </div>
-              </EuiFlexGroup>
-              <SuggestionComponent
-                ariaId="suggestion-0-0"
-                innerRef={[Function]}
-                key="tokenClass - 0-0 - java.lang.String"
-                onClick={[Function]}
-                onMouseEnter={[Function]}
-                query="string"
-                selected={true}
-                suggestion={
-                  Object {
-                    "description": "elastic/elasticsearch > src/foo/bar.java",
-                    "end": 10,
-                    "selectUrl": "http://github.com/elastic/elasticsearch/src/foo/bar.java",
-                    "start": 1,
-                    "text": "java.lang.String",
-                    "tokenType": "tokenClass",
-                  }
-                }
-              >
-                <div
-                  aria-selected={true}
-                  className="codeSearch__suggestion-item codeSearch__suggestion-item--active"
-                  id="suggestion-0-0"
-                  onClick={[Function]}
-                  onMouseEnter={[Function]}
-                  role="option"
-                >
-                  <div
-                    className="codeSearch-suggestion--inner"
-                  >
-                    <div
-                      className="codeSearch-suggestion__token"
-                    >
-                      <EuiToken
-                        iconType="tokenClass"
-                      >
-                        <div
-                          className="euiToken euiToken--tokenTint01 euiToken--circle euiToken--small"
-                        >
-                          <EuiIcon
-                            type="tokenClass"
-                          >
-                            <EuiIconEmpty
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              style={null}
-                            >
-                              <svg
-                                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                focusable="false"
-                                height={16}
-                                style={null}
-                                viewBox="0 0 16 16"
-                                width={16}
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </EuiIconEmpty>
-                          </EuiIcon>
-                        </div>
-                      </EuiToken>
-                    </div>
-                    <div
-                      className="codeSearch__suggestionTextContainer"
-                    >
-                      <div
-                        className="codeSearch__suggestion-text"
-                        data-test-subj="codeTypeaheadItem"
-                      >
-                        <span>
-                          java.lang.
-                          <strong>
-                            String
-                          </strong>
-                        </span>
-                      </div>
-                      <div
-                        className="codeSearch-suggestion__description"
-                      >
-                        elastic/elasticsearch &gt; src/foo/bar.java
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </SuggestionComponent>
-            </div>
-            <div
-              className="kbnTypeahead__items codeSearch-suggestion__group"
-              data-test-subj="codeTypeaheadList-file"
-              id="kbnTypeahead__items"
-              key="file-suggestions"
-              onScroll={[Function]}
-              role="listbox"
-            >
-              <EuiFlexGroup
-                className="codeSearch-suggestion__group-header"
-                justifyContent="spaceBetween"
-              >
-                <div
-                  className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive codeSearch-suggestion__group-header"
-                >
-                  <EuiFlexGroup
-                    alignItems="center"
-                    direction="row"
-                    gutterSize="none"
-                  >
-                    <div
-                      className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiToken
-                        iconType="tokenFile"
-                      >
-                        <div
-                          className="euiToken euiToken--tokenTint12 euiToken--rectangle euiToken--small euiToken--fill"
-                        >
-                          <EuiIcon
-                            type="tokenFile"
-                          >
-                            <EuiIconEmpty
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              style={null}
-                            >
-                              <svg
-                                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                focusable="false"
-                                height={16}
-                                style={null}
-                                viewBox="0 0 16 16"
-                                width={16}
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </EuiIconEmpty>
-                          </EuiIcon>
-                        </div>
-                      </EuiToken>
-                      <EuiText
-                        className="codeSearch-suggestion__group-title"
-                      >
-                        <div
-                          className="euiText euiText--medium codeSearch-suggestion__group-title"
-                        >
-                          Files
-                        </div>
-                      </EuiText>
-                    </div>
-                  </EuiFlexGroup>
-                  <div
-                    className="codeSearch-suggestion__group-result"
-                  >
-                    <FormattedMessage
-                      defaultMessage="{total} {total, plural, one {Result} other {Results}}"
-                      id="xpack.code.searchBar.resultCountText"
-                      values={
-                        Object {
-                          "total": 1,
-                        }
-                      }
-                    >
-                      <span>
-                        1 Result
-                      </span>
-                    </FormattedMessage>
-                  </div>
-                </div>
-              </EuiFlexGroup>
-              <SuggestionComponent
-                ariaId="suggestion-1-0"
-                innerRef={[Function]}
-                key=" - 1-0 - src/foo/bar.java"
-                onClick={[Function]}
-                onMouseEnter={[Function]}
-                query="string"
-                selected={false}
-                suggestion={
-                  Object {
-                    "description": "This is a file",
-                    "end": 10,
-                    "selectUrl": "http://github.com/elastic/elasticsearch/src/foo/bar.java",
-                    "start": 1,
-                    "text": "src/foo/bar.java",
-                    "tokenType": "",
-                  }
-                }
-              >
-                <div
-                  aria-selected={false}
-                  className="codeSearch__suggestion-item "
-                  id="suggestion-1-0"
-                  onClick={[Function]}
-                  onMouseEnter={[Function]}
-                  role="option"
-                >
-                  <div
-                    className="codeSearch-suggestion--inner"
-                  >
-                    <div
-                      className="codeSearch__suggestionTextContainer"
-                    >
-                      <div
-                        className="codeSearch__suggestion-text"
-                        data-test-subj="codeTypeaheadItem"
-                      >
-                        src/foo/bar.java
-                      </div>
-                      <div
-                        className="codeSearch-suggestion__description"
-                      >
-                        This is a file
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </SuggestionComponent>
-            </div>
-            <div
-              className="kbnTypeahead__items codeSearch-suggestion__group"
-              data-test-subj="codeTypeaheadList-repository"
-              id="kbnTypeahead__items"
-              key="repository-suggestions"
-              onScroll={[Function]}
-              role="listbox"
-            >
-              <EuiFlexGroup
-                className="codeSearch-suggestion__group-header"
-                justifyContent="spaceBetween"
-              >
-                <div
-                  className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive codeSearch-suggestion__group-header"
-                >
-                  <EuiFlexGroup
-                    alignItems="center"
-                    direction="row"
-                    gutterSize="none"
-                  >
-                    <div
-                      className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiToken
-                        iconType="tokenRepo"
-                      >
-                        <div
-                          className="euiToken euiToken--tokenTint05 euiToken--rectangle euiToken--small euiToken--fill"
-                        >
-                          <EuiIcon
-                            type="tokenRepo"
-                          >
-                            <EuiIconEmpty
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              style={null}
-                            >
-                              <svg
-                                className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                focusable="false"
-                                height={16}
-                                style={null}
-                                viewBox="0 0 16 16"
-                                width={16}
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </EuiIconEmpty>
-                          </EuiIcon>
-                        </div>
-                      </EuiToken>
-                      <EuiText
-                        className="codeSearch-suggestion__group-title"
-                      >
-                        <div
-                          className="euiText euiText--medium codeSearch-suggestion__group-title"
-                        >
-                          Repos
-                        </div>
-                      </EuiText>
-                    </div>
-                  </EuiFlexGroup>
-                  <div
-                    className="codeSearch-suggestion__group-result"
-                  >
-                    <FormattedMessage
-                      defaultMessage="{total} {total, plural, one {Result} other {Results}}"
-                      id="xpack.code.searchBar.resultCountText"
-                      values={
-                        Object {
-                          "total": 2,
-                        }
-                      }
-                    >
-                      <span>
-                        2 Results
-                      </span>
-                    </FormattedMessage>
-                  </div>
-                </div>
-              </EuiFlexGroup>
-              <SuggestionComponent
-                ariaId="suggestion-2-0"
-                innerRef={[Function]}
-                key=" - 2-0 - elastic/kibana"
-                onClick={[Function]}
-                onMouseEnter={[Function]}
-                query="string"
-                selected={false}
-                suggestion={
-                  Object {
-                    "description": "",
-                    "end": 10,
-                    "selectUrl": "http://github.com/elastic/kibana",
-                    "start": 1,
-                    "text": "elastic/kibana",
-                    "tokenType": "",
-                  }
-                }
-              >
-                <div
-                  aria-selected={false}
-                  className="codeSearch__suggestion-item "
-                  id="suggestion-2-0"
-                  onClick={[Function]}
-                  onMouseEnter={[Function]}
-                  role="option"
-                >
-                  <div
-                    className="codeSearch-suggestion--inner"
-                  >
-                    <div
-                      className="codeSearch__suggestionTextContainer"
-                    >
-                      <div
-                        className="codeSearch__suggestion-text"
-                        data-test-subj="codeTypeaheadItem"
-                      >
-                        elastic/kibana
-                      </div>
-                      <div
-                        className="codeSearch-suggestion__description"
-                      />
-                    </div>
-                  </div>
-                </div>
-              </SuggestionComponent>
-              <SuggestionComponent
-                ariaId="suggestion-2-1"
-                innerRef={[Function]}
-                key=" - 2-1 - elastic/elasticsearch"
-                onClick={[Function]}
-                onMouseEnter={[Function]}
-                query="string"
-                selected={false}
-                suggestion={
-                  Object {
-                    "description": "",
-                    "end": 10,
-                    "selectUrl": "http://github.com/elastic/elasticsearch",
-                    "start": 1,
-                    "text": "elastic/elasticsearch",
-                    "tokenType": "",
-                  }
-                }
-              >
-                <div
-                  aria-selected={false}
-                  className="codeSearch__suggestion-item "
-                  id="suggestion-2-1"
-                  onClick={[Function]}
-                  onMouseEnter={[Function]}
-                  role="option"
-                >
-                  <div
-                    className="codeSearch-suggestion--inner"
-                  >
-                    <div
-                      className="codeSearch__suggestionTextContainer"
-                    >
-                      <div
-                        className="codeSearch__suggestion-text"
-                        data-test-subj="codeTypeaheadItem"
-                      >
-                        elastic/elasticsearch
-                      </div>
-                      <div
-                        className="codeSearch-suggestion__description"
-                      />
-                    </div>
-                  </div>
-                </div>
-              </SuggestionComponent>
-              <div
-                className="codeSearch-suggestion__link"
-              >
-                <Link
-                  replace={false}
-                  to="/search?q=string"
-                >
-                  <a
-                    href="/search?q=string"
-                    onClick={[Function]}
-                  >
-                     
-                    <FormattedMessage
-                      defaultMessage="View More"
-                      id="xpack.code.searchBar.viewMoreLinkText"
-                      values={Object {}}
-                    >
-                      <span>
-                        View More
-                      </span>
-                    </FormattedMessage>
-                  </a>
-                </Link>
-              </div>
-            </div>
-            <Link
-              replace={false}
-              to="/search?q=string"
-            >
-              <a
-                href="/search?q=string"
-                onClick={[Function]}
-              >
-                <div
-                  className="codeSearch__full-text-button"
-                >
-                  <FormattedMessage
-                    defaultMessage="Press ⮐ Return for Full Text Search"
-                    id="xpack.code.searchBar.viewFullSearchLinkText"
-                    values={Object {}}
-                  >
-                    <span>
-                      Press ⮐ Return for Full Text Search
-                    </span>
-                  </FormattedMessage>
-                </div>
-              </a>
-            </Link>
-          </div>
-        </div>
-      </div>
-    </SuggestionsComponent>
-  </Router>
-</MemoryRouter>
-`;
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.test.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.test.tsx
deleted file mode 100644
index d0e9a24849503a..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.test.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import React from 'react';
-import sinon from 'sinon';
-
-import props from '../__fixtures__/props.json';
-import { SuggestionComponent } from './suggestion_component';
-
-test('render file item', () => {
-  const emptyFn = () => {
-    return;
-  };
-  const suggestionItem = mount(
-    <SuggestionComponent
-      query="bar"
-      innerRef={sinon.spy()}
-      selected={false}
-      suggestion={props.file.suggestions[0]}
-      onClick={emptyFn}
-      onMouseEnter={emptyFn}
-      ariaId={`suggestion-1-1`}
-      key={`file-1-1`}
-    />
-  );
-  expect(toJson(suggestionItem)).toMatchSnapshot();
-});
-
-test('render symbol item', () => {
-  const emptyFn = () => {
-    return;
-  };
-  const suggestionItem = mount(
-    <SuggestionComponent
-      query="string"
-      innerRef={sinon.spy()}
-      selected={false}
-      suggestion={props.symbol.suggestions[0]}
-      onClick={emptyFn}
-      onMouseEnter={emptyFn}
-      ariaId={`suggestion-1-1`}
-      key={`symbol-1-1`}
-    />
-  );
-  expect(toJson(suggestionItem)).toMatchSnapshot();
-});
-
-test('render repository item', () => {
-  const emptyFn = () => {
-    return;
-  };
-  const suggestionItem = mount(
-    <SuggestionComponent
-      query="kibana"
-      innerRef={sinon.spy()}
-      selected={false}
-      suggestion={props.repository.suggestions[0]}
-      onClick={emptyFn}
-      onMouseEnter={emptyFn}
-      ariaId={`suggestion-1-1`}
-      key={`file-1-1`}
-    />
-  );
-  expect(toJson(suggestionItem)).toMatchSnapshot();
-});
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.tsx
deleted file mode 100644
index 5a30dda32ff895..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiToken, IconType } from '@elastic/eui';
-import React, { SFC } from 'react';
-import { AutocompleteSuggestion } from '../..';
-
-interface Props {
-  query: string;
-  onClick: (suggestion: AutocompleteSuggestion) => void;
-  onMouseEnter: () => void;
-  selected: boolean;
-  suggestion: AutocompleteSuggestion;
-  innerRef: (node: HTMLDivElement) => void;
-  ariaId: string;
-}
-
-export const SuggestionComponent: SFC<Props> = props => {
-  const click = () => props.onClick(props.suggestion);
-
-  // An util function to help highlight the substring which matches the query.
-  const renderMatchingText = (text: string) => {
-    if (!text) {
-      return text;
-    }
-    // Match the text with query in case sensitive mode first.
-    let index = text.indexOf(props.query);
-    if (index < 0) {
-      // Fall back with case insensitive mode first.
-      index = text.toLowerCase().indexOf(props.query.toLowerCase());
-    }
-    if (index >= 0) {
-      const prefix = text.substring(0, index);
-      const highlight = text.substring(index, index + props.query.length);
-      const surfix = text.substring(index + props.query.length);
-      return (
-        <span>
-          {prefix}
-          <strong>{highlight}</strong>
-          {surfix}
-        </span>
-      );
-    } else {
-      return text;
-    }
-  };
-
-  const icon = props.suggestion.tokenType ? (
-    <div className="codeSearch-suggestion__token">
-      <EuiToken iconType={props.suggestion.tokenType as IconType} />
-    </div>
-  ) : null;
-
-  return (
-    // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/interactive-supports-focus
-    <div
-      className={
-        'codeSearch__suggestion-item ' +
-        (props.selected ? 'codeSearch__suggestion-item--active' : '')
-      }
-      role="option"
-      onClick={click}
-      // active={props.selected}
-      onMouseEnter={props.onMouseEnter}
-      ref={props.innerRef}
-      id={props.ariaId}
-      aria-selected={props.selected}
-    >
-      <div className="codeSearch-suggestion--inner">
-        {icon}
-        <div className="codeSearch__suggestionTextContainer">
-          <div className="codeSearch__suggestion-text" data-test-subj={`codeTypeaheadItem`}>
-            {renderMatchingText(props.suggestion.text)}
-          </div>
-          <div className="codeSearch-suggestion__description">{props.suggestion.description}</div>
-        </div>
-      </div>
-    </div>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestions_component.test.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestions_component.test.tsx
deleted file mode 100644
index 04de9a244f0cbb..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestions_component.test.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import React from 'react';
-import { MemoryRouter } from 'react-router-dom';
-
-import props from '../__fixtures__/props.json';
-import { SuggestionsComponent } from './suggestions_component';
-
-test('render empty suggestions component', () => {
-  const emptyFn = () => {
-    return;
-  };
-  const suggestionItem = mount(
-    <SuggestionsComponent
-      query="string"
-      show={true}
-      suggestionGroups={[]}
-      groupIndex={0}
-      itemIndex={0}
-      onClick={emptyFn}
-      onMouseEnter={emptyFn}
-      loadMore={emptyFn}
-    />
-  );
-  expect(toJson(suggestionItem)).toMatchSnapshot();
-});
-
-test('render full suggestions component', () => {
-  const emptyFn = () => {
-    return;
-  };
-  const suggestionItem = mount(
-    <MemoryRouter initialEntries={[{ pathname: '/', key: 'testKey' }]}>
-      <SuggestionsComponent
-        query="string"
-        show={true}
-        suggestionGroups={[props.symbol, props.file, props.repository]}
-        groupIndex={0}
-        itemIndex={0}
-        onClick={emptyFn}
-        onMouseEnter={emptyFn}
-        loadMore={emptyFn}
-      />
-    </MemoryRouter>
-  );
-  expect(toJson(suggestionItem)).toMatchSnapshot();
-});
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestions_component.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestions_component.tsx
deleted file mode 100644
index eed549b1654643..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestions_component.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiFlexGroup, EuiText, EuiToken, IconType } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-
-import { isEmpty } from 'lodash';
-import React, { Component } from 'react';
-import { Link } from 'react-router-dom';
-import url from 'url';
-
-import {
-  AutocompleteSuggestion,
-  AutocompleteSuggestionGroup,
-  AutocompleteSuggestionType,
-} from '../..';
-import { SuggestionComponent } from './suggestion_component';
-
-interface Props {
-  query: string;
-  groupIndex: number | null;
-  itemIndex: number | null;
-  onClick: (suggestion: AutocompleteSuggestion) => void;
-  onMouseEnter: (groupIndex: number, itemIndex: number) => void;
-  show: boolean;
-  suggestionGroups: AutocompleteSuggestionGroup[];
-  loadMore: () => void;
-}
-
-export class SuggestionsComponent extends Component<Props> {
-  private childNodes: HTMLDivElement[] = [];
-  private parentNode: HTMLDivElement | null = null;
-
-  private viewMoreUrl() {
-    return url.format({
-      pathname: '/search',
-      query: {
-        q: this.props.query,
-      },
-    });
-  }
-
-  public render() {
-    if (!this.props.show || isEmpty(this.props.suggestionGroups)) {
-      return null;
-    }
-
-    return (
-      <div className="reactSuggestionTypeahead">
-        <div className="kbnTypeahead">
-          <div className="kbnTypeahead__popover">
-            {this.renderSuggestionGroups()}
-            <Link to={this.viewMoreUrl()}>
-              <div className="codeSearch__full-text-button">
-                <FormattedMessage
-                  id="xpack.code.searchBar.viewFullSearchLinkText"
-                  defaultMessage="Press ⮐ Return for Full Text Search"
-                />
-              </div>
-            </Link>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  public componentDidUpdate(prevProps: Props) {
-    if (
-      prevProps.groupIndex !== this.props.groupIndex ||
-      prevProps.itemIndex !== this.props.itemIndex
-    ) {
-      this.scrollIntoView();
-    }
-  }
-
-  private renderSuggestionGroups() {
-    return this.props.suggestionGroups
-      .filter((group: AutocompleteSuggestionGroup) => group.suggestions.length > 0)
-      .map((group: AutocompleteSuggestionGroup, groupIndex: number) => {
-        const { suggestions, total, type, hasMore } = group;
-        const suggestionComps = suggestions.map(
-          (suggestion: AutocompleteSuggestion, itemIndex: number) => {
-            const innerRef = (node: any) => (this.childNodes[itemIndex] = node);
-            const mouseEnter = () => this.props.onMouseEnter(groupIndex, itemIndex);
-            const isSelected =
-              groupIndex === this.props.groupIndex && itemIndex === this.props.itemIndex;
-            return (
-              <SuggestionComponent
-                query={this.props.query}
-                innerRef={innerRef}
-                selected={isSelected}
-                suggestion={suggestion}
-                onClick={this.props.onClick}
-                onMouseEnter={mouseEnter}
-                ariaId={`suggestion-${groupIndex}-${itemIndex}`}
-                key={`${suggestion.tokenType} - ${groupIndex}-${itemIndex} - ${suggestion.text}`}
-              />
-            );
-          }
-        );
-
-        const groupHeader = (
-          <EuiFlexGroup
-            justifyContent="spaceBetween"
-            className="codeSearch-suggestion__group-header"
-          >
-            <EuiFlexGroup direction="row" gutterSize="none" alignItems="center">
-              <EuiToken iconType={this.getGroupTokenType(group.type) as IconType} />
-              <EuiText className="codeSearch-suggestion__group-title">
-                {this.getGroupTitle(group.type)}
-              </EuiText>
-            </EuiFlexGroup>
-            <div className="codeSearch-suggestion__group-result">
-              <FormattedMessage
-                id="xpack.code.searchBar.resultCountText"
-                defaultMessage="{total} {total, plural, one {Result} other {Results}}"
-                values={{ total }}
-              />
-            </div>
-          </EuiFlexGroup>
-        );
-
-        const viewMore = (
-          <div className="codeSearch-suggestion__link">
-            <Link to={this.viewMoreUrl()}>
-              {' '}
-              <FormattedMessage
-                id="xpack.code.searchBar.viewMoreLinkText"
-                defaultMessage="View More"
-              />
-            </Link>
-          </div>
-        );
-
-        return (
-          <div
-            id="kbnTypeahead__items"
-            className="kbnTypeahead__items codeSearch-suggestion__group"
-            role="listbox"
-            data-test-subj={`codeTypeaheadList-${type}`}
-            ref={node => (this.parentNode = node)}
-            onScroll={this.handleScroll}
-            key={`${type}-suggestions`}
-          >
-            {groupHeader}
-            {suggestionComps}
-            {hasMore ? viewMore : null}
-          </div>
-        );
-      });
-  }
-
-  private getGroupTokenType(type: AutocompleteSuggestionType): string {
-    switch (type) {
-      case AutocompleteSuggestionType.FILE:
-        return 'tokenFile';
-      case AutocompleteSuggestionType.REPOSITORY:
-        return 'tokenRepo';
-      case AutocompleteSuggestionType.SYMBOL:
-        return 'tokenSymbol';
-    }
-  }
-
-  private getGroupTitle(type: AutocompleteSuggestionType): string {
-    switch (type) {
-      case AutocompleteSuggestionType.FILE:
-        return i18n.translate('xpack.code.searchBar.fileGroupTitle', {
-          defaultMessage: 'Files',
-        });
-      case AutocompleteSuggestionType.REPOSITORY:
-        return i18n.translate('xpack.code.searchBar.repositorylGroupTitle', {
-          defaultMessage: 'Repos',
-        });
-      case AutocompleteSuggestionType.SYMBOL:
-        return i18n.translate('xpack.code.searchBar.symbolGroupTitle', {
-          defaultMessage: 'Symbols',
-        });
-    }
-  }
-
-  private scrollIntoView = () => {
-    if (this.props.groupIndex === null || this.props.itemIndex === null) {
-      return;
-    }
-    const parent = this.parentNode;
-    const child = this.childNodes[this.props.itemIndex];
-
-    if (this.props.groupIndex == null || this.props.itemIndex === null || !parent || !child) {
-      return;
-    }
-
-    const scrollTop = Math.max(
-      Math.min(parent.scrollTop, child.offsetTop),
-      child.offsetTop + child.offsetHeight - parent.offsetHeight
-    );
-
-    parent.scrollTop = scrollTop;
-  };
-
-  private handleScroll = () => {
-    if (!this.props.loadMore || !this.parentNode) {
-      return;
-    }
-
-    const position = this.parentNode.scrollTop + this.parentNode.offsetHeight;
-    const height = this.parentNode.scrollHeight;
-    const remaining = height - position;
-    const margin = 50;
-
-    if (!height || !position) {
-      return;
-    }
-    if (remaining <= margin) {
-      this.props.loadMore();
-    }
-  };
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/index.ts b/x-pack/legacy/plugins/code/public/components/query_bar/index.ts
deleted file mode 100644
index 8cd9383123677f..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/*
- * This QueryBar component is forked from the QueryBar implemented in kibana/ui/public/query_bar
- * with simplifications to fulfill Code's feature request.
- *
- * The styles has been migrated to styled-components instead of css for any new components brought
- * by Code. For shared components/styles, you can find the classes in the scss files in
- * kibana/ui/public/query_bar
- */
-
-export * from './components';
-export * from './suggestions';
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/lib/match_pairs.ts b/x-pack/legacy/plugins/code/public/components/query_bar/lib/match_pairs.ts
deleted file mode 100644
index 8919f97dd5a285..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/lib/match_pairs.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/**
- * This helper automatically handles matching pairs.
- * Specifically, it does the following:
- *
- * 1. If the key is a closer, and the character in front of the cursor is the
- *    same, simply move the cursor forward.
- * 2. If the key is an opener, insert the opener at the beginning of the
- *    selection, and the closer at the end of the selection, and move the
- *    selection forward.
- * 3. If the backspace is hit, and the characters before and after the cursor
- *    are a pair, remove both characters and move the cursor backward.
- */
-
-const pairs = ['()', '[]', '{}', `''`, '""'];
-const openers = pairs.map(pair => pair[0]);
-const closers = pairs.map(pair => pair[1]);
-
-interface MatchPairsOptions {
-  value: string;
-  selectionStart: number;
-  selectionEnd: number;
-  key: string;
-  metaKey: boolean;
-  updateQuery: (query: string, selectionStart: number, selectionEnd: number) => void;
-  preventDefault: () => void;
-}
-
-export function matchPairs({
-  value,
-  selectionStart,
-  selectionEnd,
-  key,
-  metaKey,
-  updateQuery,
-  preventDefault,
-}: MatchPairsOptions) {
-  if (shouldMoveCursorForward(key, value, selectionStart, selectionEnd)) {
-    preventDefault();
-    updateQuery(value, selectionStart + 1, selectionEnd + 1);
-  } else if (shouldInsertMatchingCloser(key, value, selectionStart, selectionEnd)) {
-    preventDefault();
-    const newValue =
-      value.substr(0, selectionStart) +
-      key +
-      value.substring(selectionStart, selectionEnd) +
-      closers[openers.indexOf(key)] +
-      value.substr(selectionEnd);
-    updateQuery(newValue, selectionStart + 1, selectionEnd + 1);
-  } else if (shouldRemovePair(key, metaKey, value, selectionStart, selectionEnd)) {
-    preventDefault();
-    const newValue = value.substr(0, selectionEnd - 1) + value.substr(selectionEnd + 1);
-    updateQuery(newValue, selectionStart - 1, selectionEnd - 1);
-  }
-}
-
-function shouldMoveCursorForward(
-  key: string,
-  value: string,
-  selectionStart: number,
-  selectionEnd: number
-) {
-  if (!closers.includes(key)) {
-    return false;
-  }
-
-  // Never move selection forward for multi-character selections
-  if (selectionStart !== selectionEnd) {
-    return false;
-  }
-
-  // Move selection forward if the key is the same as the closer in front of the selection
-  return value.charAt(selectionEnd) === key;
-}
-
-function shouldInsertMatchingCloser(
-  key: string,
-  value: string,
-  selectionStart: number,
-  selectionEnd: number
-) {
-  if (!openers.includes(key)) {
-    return false;
-  }
-
-  // Always insert for multi-character selections
-  if (selectionStart !== selectionEnd) {
-    return true;
-  }
-
-  const precedingCharacter = value.charAt(selectionStart - 1);
-  const followingCharacter = value.charAt(selectionStart + 1);
-
-  // Don't insert if the preceding character is a backslash
-  if (precedingCharacter === '\\') {
-    return false;
-  }
-
-  // Don't insert if it's a quote and the either of the preceding/following characters is alphanumeric
-  return !(
-    ['"', `'`].includes(key) &&
-    (isAlphanumeric(precedingCharacter) || isAlphanumeric(followingCharacter))
-  );
-}
-
-function shouldRemovePair(
-  key: string,
-  metaKey: boolean,
-  value: string,
-  selectionStart: number,
-  selectionEnd: number
-) {
-  if (key !== 'Backspace' || metaKey) {
-    return false;
-  }
-
-  // Never remove for multi-character selections
-  if (selectionStart !== selectionEnd) {
-    return false;
-  }
-
-  // Remove if the preceding/following characters are a pair
-  return pairs.includes(value.substr(selectionEnd - 1, 2));
-}
-
-function isAlphanumeric(value = '') {
-  return value.match(/[a-zA-Z0-9_]/);
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/file_suggestions_provider.ts b/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/file_suggestions_provider.ts
deleted file mode 100644
index d03bd6cdd18637..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/file_suggestions_provider.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { npStart } from 'ui/new_platform';
-
-import {
-  AbstractSuggestionsProvider,
-  AutocompleteSuggestionGroup,
-  AutocompleteSuggestionType,
-} from '.';
-import { toRepoNameWithOrg } from '../../../../common/uri_util';
-import { SearchResultItem, SearchScope } from '../../../../model';
-
-export class FileSuggestionsProvider extends AbstractSuggestionsProvider {
-  protected matchSearchScope(scope: SearchScope): boolean {
-    return scope === SearchScope.DEFAULT || scope === SearchScope.FILE;
-  }
-
-  protected async fetchSuggestions(
-    query: string,
-    repoScope?: string[]
-  ): Promise<AutocompleteSuggestionGroup> {
-    try {
-      const queryParams: { q: string; repoScope?: string[] } = { q: query, repoScope };
-      // actually, query accepts string[] as value's  type
-      // @ts-ignore
-      const res = await npStart.core.http.get(`/api/code/suggestions/doc`, {
-        query: queryParams,
-      });
-      const suggestions = Array.from(res.results as SearchResultItem[])
-        .slice(0, this.MAX_SUGGESTIONS_PER_GROUP)
-        .map((doc: SearchResultItem) => {
-          return {
-            description: toRepoNameWithOrg(doc.uri),
-            end: 10,
-            start: 1,
-            text: doc.filePath,
-            tokenType: '',
-            selectUrl: `/${doc.uri}/blob/HEAD/${doc.filePath}`,
-          };
-        });
-      return {
-        type: AutocompleteSuggestionType.FILE,
-        total: res.total,
-        hasMore: res.total > this.MAX_SUGGESTIONS_PER_GROUP,
-        suggestions,
-      };
-    } catch (error) {
-      return {
-        type: AutocompleteSuggestionType.FILE,
-        total: 0,
-        hasMore: false,
-        suggestions: [],
-      };
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/index.ts b/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/index.ts
deleted file mode 100644
index 85d172aca5d79f..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/index.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './suggestions_provider';
-export * from './symbol_suggestions_provider';
-export * from './file_suggestions_provider';
-export * from './repository_suggestions_provider';
-
-export enum AutocompleteSuggestionType {
-  SYMBOL = 'symbol',
-  FILE = 'file',
-  REPOSITORY = 'repository',
-}
-
-export interface AutocompleteSuggestion {
-  description?: string;
-  end: number;
-  start: number;
-  text: string;
-  tokenType: string;
-  selectUrl: string;
-}
-
-export interface AutocompleteSuggestionGroup {
-  type: AutocompleteSuggestionType;
-  total: number;
-  hasMore: boolean;
-  suggestions: AutocompleteSuggestion[];
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/repository_suggestions_provider.ts b/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/repository_suggestions_provider.ts
deleted file mode 100644
index 4696c11e1b90c3..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/repository_suggestions_provider.ts
+++ /dev/null
@@ -1,61 +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 { npStart } from 'ui/new_platform';
-
-import {
-  AbstractSuggestionsProvider,
-  AutocompleteSuggestionGroup,
-  AutocompleteSuggestionType,
-} from '.';
-import { toRepoNameWithOrg } from '../../../../common/uri_util';
-import { Repository, SearchScope } from '../../../../model';
-
-export class RepositorySuggestionsProvider extends AbstractSuggestionsProvider {
-  protected matchSearchScope(scope: SearchScope): boolean {
-    return scope === SearchScope.DEFAULT || scope === SearchScope.REPOSITORY;
-  }
-
-  protected async fetchSuggestions(
-    query: string,
-    repoScope?: string[]
-  ): Promise<AutocompleteSuggestionGroup> {
-    try {
-      const queryParams: { q: string; repoScope?: string } = { q: query };
-      if (repoScope && repoScope.length > 0) {
-        queryParams.repoScope = repoScope.join(',');
-      }
-      const res = await npStart.core.http.get(`/api/code/suggestions/repo`, {
-        query: queryParams,
-      });
-      const suggestions = Array.from(res.repositories as Repository[])
-        .slice(0, this.MAX_SUGGESTIONS_PER_GROUP)
-        .map((repo: Repository) => {
-          return {
-            description: repo.url,
-            end: 10,
-            start: 1,
-            text: toRepoNameWithOrg(repo.uri),
-            tokenType: '',
-            selectUrl: `/${repo.uri}`,
-          };
-        });
-      return {
-        type: AutocompleteSuggestionType.REPOSITORY,
-        total: res.total,
-        hasMore: res.total > this.MAX_SUGGESTIONS_PER_GROUP,
-        suggestions,
-      };
-    } catch (error) {
-      return {
-        type: AutocompleteSuggestionType.REPOSITORY,
-        total: 0,
-        hasMore: false,
-        suggestions: [],
-      };
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/suggestions_provider.ts b/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/suggestions_provider.ts
deleted file mode 100644
index ef9846bd4aed9f..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/suggestions_provider.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { AutocompleteSuggestionGroup, AutocompleteSuggestionType } from '.';
-import { SearchScope } from '../../../../model';
-
-export interface SuggestionsProvider {
-  getSuggestions(
-    query: string,
-    scope: SearchScope,
-    repoScope?: string[]
-  ): Promise<AutocompleteSuggestionGroup>;
-}
-
-export abstract class AbstractSuggestionsProvider implements SuggestionsProvider {
-  protected MAX_SUGGESTIONS_PER_GROUP = 5;
-
-  public async getSuggestions(
-    query: string,
-    scope: SearchScope,
-    repoScope?: string[]
-  ): Promise<AutocompleteSuggestionGroup> {
-    if (this.matchSearchScope(scope)) {
-      return await this.fetchSuggestions(query, repoScope);
-    } else {
-      // This is an abstract class. Do nothing here. You should override this.
-      return new Promise<AutocompleteSuggestionGroup>((resolve, reject) => {
-        resolve({
-          type: AutocompleteSuggestionType.SYMBOL,
-          total: 0,
-          hasMore: false,
-          suggestions: [],
-        });
-      });
-    }
-  }
-
-  protected async fetchSuggestions(
-    query: string,
-    repoScope?: string[]
-  ): Promise<AutocompleteSuggestionGroup> {
-    // This is an abstract class. Do nothing here. You should override this.
-    return new Promise<AutocompleteSuggestionGroup>((resolve, reject) => {
-      resolve({
-        type: AutocompleteSuggestionType.SYMBOL,
-        total: 0,
-        hasMore: false,
-        suggestions: [],
-      });
-    });
-  }
-
-  protected matchSearchScope(scope: SearchScope): boolean {
-    return true;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/symbol_suggestions_provider.ts b/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/symbol_suggestions_provider.ts
deleted file mode 100644
index 0e321d6cf1ec7f..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/query_bar/suggestions/symbol_suggestions_provider.ts
+++ /dev/null
@@ -1,142 +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 { DetailSymbolInformation } from '@elastic/lsp-extension';
-import { npStart } from 'ui/new_platform';
-import { Location } from 'vscode-languageserver';
-
-import {
-  AbstractSuggestionsProvider,
-  AutocompleteSuggestion,
-  AutocompleteSuggestionGroup,
-  AutocompleteSuggestionType,
-} from '.';
-import { RepositoryUtils } from '../../../../common/repository_utils';
-import { parseLspUrl, toRepoNameWithOrg } from '../../../../common/uri_util';
-import { SearchScope } from '../../../../model';
-
-export class SymbolSuggestionsProvider extends AbstractSuggestionsProvider {
-  protected matchSearchScope(scope: SearchScope): boolean {
-    return scope === SearchScope.DEFAULT || scope === SearchScope.SYMBOL;
-  }
-
-  protected async fetchSuggestions(
-    query: string,
-    repoScope?: string[]
-  ): Promise<AutocompleteSuggestionGroup> {
-    try {
-      const queryParams: { q: string; repoScope?: string } = { q: query };
-      if (repoScope && repoScope.length > 0) {
-        queryParams.repoScope = repoScope.join(',');
-      }
-      const res = await npStart.core.http.get(`/api/code/suggestions/symbol`, {
-        query: queryParams,
-      });
-      const suggestions = Array.from(res.symbols as DetailSymbolInformation[])
-        .slice(0, this.MAX_SUGGESTIONS_PER_GROUP)
-        .map((symbol: DetailSymbolInformation) => {
-          return {
-            description: this.getSymbolDescription(symbol.symbolInformation.location),
-            end: 10,
-            start: 1,
-            text: symbol.qname ? symbol.qname : symbol.symbolInformation.name,
-            tokenType: this.symbolKindToTokenClass(symbol.symbolInformation.kind),
-            selectUrl: this.getSymbolLinkUrl(symbol.symbolInformation.location),
-          };
-        });
-      return {
-        type: AutocompleteSuggestionType.SYMBOL,
-        total: res.total,
-        hasMore: res.total > this.MAX_SUGGESTIONS_PER_GROUP,
-        suggestions: suggestions as AutocompleteSuggestion[],
-      };
-    } catch (error) {
-      return {
-        type: AutocompleteSuggestionType.SYMBOL,
-        total: 0,
-        hasMore: false,
-        suggestions: [],
-      };
-    }
-  }
-
-  private getSymbolDescription(location: Location) {
-    try {
-      const { repoUri, file } = parseLspUrl(location.uri);
-      const repoName = toRepoNameWithOrg(repoUri);
-      return `${repoName} > ${file}`;
-    } catch (error) {
-      return '';
-    }
-  }
-
-  private getSymbolLinkUrl(location: Location) {
-    try {
-      return RepositoryUtils.locationToUrl(location);
-    } catch (error) {
-      return '';
-    }
-  }
-
-  private symbolKindToTokenClass(kind: number): string {
-    switch (kind) {
-      case 1: // File
-        return 'tokenFile';
-      case 2: // Module
-        return 'tokenModule';
-      case 3: // Namespace
-        return 'tokenNamespace';
-      case 4: // Package
-        return 'tokenPackage';
-      case 5: // Class
-        return 'tokenClass';
-      case 6: // Method
-        return 'tokenMethod';
-      case 7: // Property
-        return 'tokenProperty';
-      case 8: // Field
-        return 'tokenField';
-      case 9: // Constructor
-        return 'tokenConstant';
-      case 10: // Enum
-        return 'tokenEnum';
-      case 11: // Interface
-        return 'tokenInterface';
-      case 12: // Function
-        return 'tokenFunction';
-      case 13: // Variable
-        return 'tokenVariable';
-      case 14: // Constant
-        return 'tokenConstant';
-      case 15: // String
-        return 'tokenString';
-      case 16: // Number
-        return 'tokenNumber';
-      case 17: // Bollean
-        return 'tokenBoolean';
-      case 18: // Array
-        return 'tokenArray';
-      case 19: // Object
-        return 'tokenObject';
-      case 20: // Key
-        return 'tokenKey';
-      case 21: // Null
-        return 'tokenNull';
-      case 22: // EnumMember
-        return 'tokenEnumMember';
-      case 23: // Struct
-        return 'tokenStruct';
-      case 24: // Event
-        return 'tokenEvent';
-      case 25: // Operator
-        return 'tokenOperator';
-      case 26: // TypeParameter
-        return 'tokenParameter';
-      default:
-        return 'tokenElement';
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/route.ts b/x-pack/legacy/plugins/code/public/components/route.ts
deleted file mode 100644
index 826330d3f2d859..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/route.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { connect } from 'react-redux';
-import { Route as ReactRoute, RouteProps } from 'react-router-dom';
-import { Match, routeChange } from '../actions';
-
-interface Props extends RouteProps {
-  routeChange: (match: Match) => void;
-  computedMatch?: any;
-}
-class CSRoute extends ReactRoute<Props> {
-  constructor(props: Props, context: any) {
-    super(props, context);
-    props.routeChange({ ...props.computedMatch, location: props.location });
-  }
-
-  public componentDidUpdate() {
-    this.props.routeChange({ ...this.state.match, location: this.props.location });
-  }
-}
-
-export const Route = connect(
-  null,
-  { routeChange }
-)(CSRoute);
diff --git a/x-pack/legacy/plugins/code/public/components/routes.ts b/x-pack/legacy/plugins/code/public/components/routes.ts
deleted file mode 100644
index d741ca18968503..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/routes.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { PathTypes } from '../common/types';
-
-export const ROOT = '/';
-export const SETUP = '/setup-guide';
-const pathTypes = `:pathType(${PathTypes.blob}|${PathTypes.tree}|${PathTypes.blame}|${PathTypes.commits})`;
-export const MAIN = `/:resource/:org/:repo/${pathTypes}/:revision/:path*:goto(!.*)?`;
-export const DIFF = '/:resource/:org/:repo/commit/:commitId';
-export const REPO = `/:resource/:org/:repo`;
-export const MAIN_ROOT = `/:resource/:org/:repo/${pathTypes}/:revision`;
-export const ADMIN = '/admin';
-export const SEARCH = '/search';
-export const INTEGRATIONS = '/integrations';
diff --git a/x-pack/legacy/plugins/code/public/components/search_bar/index.ts b/x-pack/legacy/plugins/code/public/components/search_bar/index.ts
deleted file mode 100644
index 84cf220123ffd6..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/search_bar/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './search_bar';
diff --git a/x-pack/legacy/plugins/code/public/components/search_bar/search_bar.tsx b/x-pack/legacy/plugins/code/public/components/search_bar/search_bar.tsx
deleted file mode 100644
index 1841d09ba0d3d8..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/search_bar/search_bar.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import querystring from 'querystring';
-import React from 'react';
-import url from 'url';
-
-import { SearchOptions, SearchScope } from '../../../model';
-import { SearchScopeText } from '../../common/types';
-import { history } from '../../utils/url';
-import { ShortcutsProvider, Shortcut } from '../shortcuts';
-
-import {
-  AutocompleteSuggestion,
-  FileSuggestionsProvider,
-  QueryBar,
-  RepositorySuggestionsProvider,
-  SymbolSuggestionsProvider,
-} from '../query_bar';
-
-interface Props {
-  query: string;
-  onSearchScopeChanged: (s: SearchScope) => void;
-  searchOptions: SearchOptions;
-  enableSubmitWhenOptionsChanged: boolean;
-}
-
-export class SearchBar extends React.PureComponent<Props> {
-  public queryBar: any = null;
-
-  public onSearchChanged = (query: string) => {
-    // Merge the default repository scope if necessary.
-    const repoScopes = this.props.searchOptions.repoScope.map(repo => repo.uri);
-    if (this.props.searchOptions.defaultRepoScopeOn && this.props.searchOptions.defaultRepoScope) {
-      repoScopes.push(this.props.searchOptions.defaultRepoScope.uri);
-    }
-
-    // Update the url and push to history as well.
-    const previousQueries = querystring.parse(history.location.search.replace('?', ''));
-    const queries: any = {
-      ...previousQueries,
-      repoScope: repoScopes,
-      q: query,
-    };
-    if (repoScopes.length === 0) {
-      delete queries.repoScope;
-    }
-    history.push(
-      url.format({
-        pathname: '/search',
-        query: queries,
-      })
-    );
-  };
-
-  public toggleOptionsFlyout() {
-    if (this.queryBar) {
-      this.queryBar.toggleOptionsFlyout();
-    }
-  }
-
-  public onSubmit = (q: string) => {
-    // ignore empty query
-    if (q.trim().length > 0) {
-      this.onSearchChanged(q);
-    }
-  };
-
-  public onSelect = (item: AutocompleteSuggestion) => {
-    history.push(item.selectUrl);
-  };
-
-  public suggestionProviders = [
-    new SymbolSuggestionsProvider(),
-    new FileSuggestionsProvider(),
-    new RepositorySuggestionsProvider(),
-  ];
-
-  public render() {
-    return (
-      <div className="codeSearchbar__container">
-        <ShortcutsProvider />
-        <Shortcut
-          keyCode="p"
-          help={SearchScopeText[SearchScope.REPOSITORY]}
-          onPress={() => {
-            this.props.onSearchScopeChanged(SearchScope.REPOSITORY);
-            if (this.queryBar) {
-              this.queryBar.focusInput();
-            }
-          }}
-        />
-        <Shortcut
-          keyCode="y"
-          help={SearchScopeText[SearchScope.SYMBOL]}
-          onPress={() => {
-            this.props.onSearchScopeChanged(SearchScope.SYMBOL);
-            if (this.queryBar) {
-              this.queryBar.focusInput();
-            }
-          }}
-        />
-        <Shortcut
-          keyCode="s"
-          help={SearchScopeText[SearchScope.DEFAULT]}
-          onPress={() => {
-            this.props.onSearchScopeChanged(SearchScope.DEFAULT);
-            if (this.queryBar) {
-              this.queryBar.focusInput();
-            }
-          }}
-        />
-        <QueryBar
-          query={this.props.query}
-          onSubmit={this.onSubmit}
-          onSelect={this.onSelect}
-          appName="code"
-          suggestionProviders={this.suggestionProviders}
-          onSearchScopeChanged={this.props.onSearchScopeChanged}
-          enableSubmitWhenOptionsChanged={this.props.enableSubmitWhenOptionsChanged}
-          ref={instance => {
-            if (instance) {
-              // @ts-ignore
-              this.queryBar = instance.getWrappedInstance();
-            }
-          }}
-        />
-      </div>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/search_page/code_result.tsx b/x-pack/legacy/plugins/code/public/components/search_page/code_result.tsx
deleted file mode 100644
index 022388f141b656..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/search_page/code_result.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 { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
-import { Link } from 'react-router-dom';
-
-import { RepositoryUtils } from '../../../common/repository_utils';
-import { history } from '../../utils/url';
-import { CodeBlockPanel, Position } from '../code_block';
-
-interface Props {
-  query: string;
-  results: any[];
-}
-
-export class CodeResult extends React.PureComponent<Props> {
-  public render() {
-    const { results, query } = this.props;
-
-    return results.map(item => {
-      const { compositeContent, filePath, hits, language, uri } = item;
-      const { content, lineMapping, ranges } = compositeContent;
-      const key = `${uri}-${filePath}-${query}`;
-      const repoLinkUrl = `/${uri}/tree/HEAD/`;
-      const fileLinkUrl = `/${uri}/blob/HEAD/${filePath}`; // TODO(rylnd) move these to link helpers
-      const lines = content.split('\n');
-
-      return (
-        <div key={`resultitem${key}`} data-test-subj="codeSearchResultList">
-          <div style={{ marginBottom: '.5rem' }}>
-            <Link to={repoLinkUrl}>
-              <EuiFlexGroup
-                direction="row"
-                alignItems="center"
-                justifyContent="flexStart"
-                gutterSize="none"
-              >
-                <EuiFlexItem grow={false}>
-                  <EuiText size="s" color="subdued">
-                    {RepositoryUtils.orgNameFromUri(uri)}/
-                  </EuiText>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiText size="s" color="default">
-                    <strong>{RepositoryUtils.repoNameFromUri(uri)}</strong>
-                  </EuiText>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </Link>
-          </div>
-          <EuiFlexGroup
-            alignItems="center"
-            justifyContent="flexStart"
-            gutterSize="xs"
-            style={{ marginBottom: '1rem' }}
-          >
-            <EuiFlexItem grow={false}>
-              <EuiBadge color="default">{hits}</EuiBadge>
-            </EuiFlexItem>
-            <EuiText size="s">
-              <FormattedMessage
-                id="xpack.code.searchPage.hitsCountText"
-                defaultMessage=" hits from "
-              />
-              <Link to={fileLinkUrl} data-test-subj="codeSearchResultFileItem">
-                {filePath}
-              </Link>
-            </EuiText>
-          </EuiFlexGroup>
-          <CodeBlockPanel
-            key={`code${key}`}
-            className="codeResult__code-block"
-            lines={lines}
-            language={language}
-            highlightRanges={ranges}
-            lineNumber={i => lineMapping[i]}
-            onClick={this.onCodeClick(fileLinkUrl)}
-          />
-        </div>
-      );
-    });
-  }
-
-  private onCodeClick = (url: string) => (position: Position) => {
-    const lineNumber = parseInt(position.lineNumber, 10);
-
-    if (!isNaN(lineNumber)) {
-      history.push(`${url}!L${lineNumber}:0`);
-    }
-  };
-}
diff --git a/x-pack/legacy/plugins/code/public/components/search_page/empty_placeholder.tsx b/x-pack/legacy/plugins/code/public/components/search_page/empty_placeholder.tsx
deleted file mode 100644
index f5117d97471f8f..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/search_page/empty_placeholder.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiButton, EuiSpacer, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
-
-export const EmptyPlaceholder = (props: any) => {
-  return (
-    <div>
-      <EuiSpacer size="xxl" />
-      <EuiSpacer size="xxl" />
-      <EuiText
-        textAlign="center"
-        className="eui-textTruncate"
-        style={{ fontSize: '24px', color: '#98A2B3' }}
-      >
-        "
-        <span className="eui-textTruncate eui-displayInlineBlock" style={{ maxWidth: '90%' }}>
-          {props.query}
-        </span>
-        "
-      </EuiText>
-      <EuiSpacer size="xl" />
-      <EuiText textAlign="center" style={{ fontSize: '28px', color: '#1A1A1A' }}>
-        <FormattedMessage
-          id="xpack.code.searchPage.emptyTitle"
-          defaultMessage="Hmmm... we looked for that, but couldn’t find anything."
-        />
-      </EuiText>
-      <EuiSpacer size="xl" />
-      <EuiText textAlign="center" color="subdued">
-        <FormattedMessage
-          id="xpack.code.searchPage.emptyText"
-          defaultMessage="You can search for something else or modify your search settings."
-        />
-      </EuiText>
-      <EuiSpacer size="l" />
-      <EuiText textAlign="center">
-        <EuiButton
-          fill={true}
-          onClick={() => {
-            if (props.toggleOptionsFlyout) {
-              props.toggleOptionsFlyout();
-            }
-          }}
-        >
-          <FormattedMessage
-            id="xpack.code.searchPage.modifySearchSettingButtonLabel"
-            defaultMessage="Modify your search settings"
-          />
-        </EuiButton>
-      </EuiText>
-    </div>
-  );
-};
diff --git a/x-pack/legacy/plugins/code/public/components/search_page/pagination.tsx b/x-pack/legacy/plugins/code/public/components/search_page/pagination.tsx
deleted file mode 100644
index bc3ee4384b9b95..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/search_page/pagination.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiPagination } from '@elastic/eui';
-import querystring from 'querystring';
-import React from 'react';
-import url from 'url';
-
-import { history } from '../../utils/url';
-
-interface Props {
-  query: string;
-  totalPage: number;
-  currentPage: number;
-}
-
-export class Pagination extends React.PureComponent<Props> {
-  public onPageClicked = (page: number) => {
-    const { query } = this.props;
-    const queries = querystring.parse(history.location.search.replace('?', ''));
-    history.push(
-      url.format({
-        pathname: '/search',
-        query: {
-          ...queries,
-          q: query,
-          p: page + 1,
-        },
-      })
-    );
-  };
-
-  public render() {
-    return (
-      <EuiFlexGroup gutterSize="l">
-        <EuiFlexItem grow={false}>
-          <EuiPagination
-            pageCount={this.props.totalPage}
-            activePage={this.props.currentPage}
-            onPageClick={this.onPageClicked}
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/search_page/search.scss b/x-pack/legacy/plugins/code/public/components/search_page/search.scss
deleted file mode 100644
index febad588af3c6e..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/search_page/search.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.codeResult__code-block {
-  margin-bottom: $euiSizeXL;
-}
diff --git a/x-pack/legacy/plugins/code/public/components/search_page/search.tsx b/x-pack/legacy/plugins/code/public/components/search_page/search.tsx
deleted file mode 100644
index 8ccc46d09502f8..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/search_page/search.tsx
+++ /dev/null
@@ -1,269 +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 { EuiFlexItem, EuiLoadingSpinner, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import querystring from 'querystring';
-import React from 'react';
-import { connect } from 'react-redux';
-import url from 'url';
-import { npStart } from 'ui/new_platform';
-
-import { APP_TITLE } from '../../../common/constants';
-import { DocumentSearchResult, SearchOptions, SearchScope } from '../../../model';
-import { changeSearchScope } from '../../actions';
-import { RootState } from '../../reducers';
-import { history } from '../../utils/url';
-import { ProjectItem } from '../admin_page/project_item';
-import { SearchBar } from '../search_bar';
-import { CodeResult } from './code_result';
-import { EmptyPlaceholder } from './empty_placeholder';
-import { Pagination } from './pagination';
-import { SideBar } from './side_bar';
-import { trackCodeUiMetric, METRIC_TYPE } from '../../services/ui_metric';
-import { CodeUIUsageMetrics } from '../../../model/usage_telemetry_metrics';
-
-interface Props {
-  searchOptions: SearchOptions;
-  query: string;
-  scope: SearchScope;
-  page?: number;
-  languages?: Set<string>;
-  repositories?: Set<string>;
-  isLoading: boolean;
-  error?: Error;
-  documentSearchResults?: DocumentSearchResult;
-  repositorySearchResults?: any;
-  onSearchScopeChanged: (s: SearchScope) => void;
-}
-
-interface State {
-  uri: string;
-}
-
-class SearchPage extends React.PureComponent<Props, State> {
-  public state = {
-    uri: '',
-  };
-
-  public searchBar: any = null;
-
-  public componentDidMount() {
-    // track search page load count
-    trackCodeUiMetric(METRIC_TYPE.LOADED, CodeUIUsageMetrics.SEARCH_PAGE_LOAD_COUNT);
-    npStart.core.chrome.setBreadcrumbs([
-      { text: APP_TITLE, href: '#/' },
-      {
-        text: 'Search',
-      },
-    ]);
-  }
-
-  public componentWillUnmount() {
-    npStart.core.chrome.setBreadcrumbs([{ text: APP_TITLE, href: '#/' }]);
-  }
-
-  public onLanguageFilterToggled = (lang: string) => {
-    const { languages, repositories, query, page } = this.props;
-    let tempLangs: Set<string> = new Set();
-    if (languages && languages.has(lang)) {
-      // Remove this language filter
-      tempLangs = new Set(languages);
-      tempLangs.delete(lang);
-    } else {
-      // Add this language filter
-      tempLangs = languages ? new Set(languages) : new Set();
-      tempLangs.add(lang);
-    }
-    const queries = querystring.parse(history.location.search.replace('?', ''));
-    return () => {
-      history.push(
-        url.format({
-          pathname: '/search',
-          query: {
-            ...queries,
-            q: query,
-            p: page,
-            langs: Array.from(tempLangs).join(','),
-            repos: repositories ? Array.from(repositories).join(',') : undefined,
-          },
-        })
-      );
-    };
-  };
-
-  public onRepositoryFilterToggled = (repo: string) => {
-    const { languages, repositories, query } = this.props;
-    let tempRepos: Set<string> = new Set();
-    if (repositories && repositories.has(repo)) {
-      // Remove this repository filter
-      tempRepos = new Set(repositories);
-      tempRepos.delete(repo);
-    } else {
-      // Add this language filter
-      tempRepos = repositories ? new Set(repositories) : new Set();
-      tempRepos.add(repo);
-    }
-    const queries = querystring.parse(history.location.search.replace('?', ''));
-    return () => {
-      history.push(
-        url.format({
-          pathname: '/search',
-          query: {
-            ...queries,
-            q: query,
-            p: 1,
-            langs: languages ? Array.from(languages).join(',') : undefined,
-            repos: Array.from(tempRepos).join(','),
-          },
-        })
-      );
-    };
-  };
-
-  public render() {
-    const {
-      query,
-      scope,
-      documentSearchResults,
-      languages,
-      isLoading,
-      repositories,
-      repositorySearchResults,
-    } = this.props;
-
-    let mainComp = isLoading ? (
-      <div>
-        <EuiSpacer size="xl" />
-        <EuiSpacer size="xl" />
-        <EuiText textAlign="center">Loading...</EuiText>
-        <EuiSpacer size="m" />
-        <EuiText textAlign="center">
-          <EuiLoadingSpinner size="xl" />
-        </EuiText>
-      </div>
-    ) : (
-      <EmptyPlaceholder
-        query={query}
-        toggleOptionsFlyout={() => {
-          this.searchBar.toggleOptionsFlyout();
-        }}
-      />
-    );
-    let repoStats: any[] = [];
-    let languageStats: any[] = [];
-    if (
-      scope === SearchScope.REPOSITORY &&
-      repositorySearchResults &&
-      repositorySearchResults.total > 0
-    ) {
-      const { repositories: repos, from, total } = repositorySearchResults;
-      const resultComps =
-        repos &&
-        repos.map((repo: any) => (
-          <EuiFlexItem key={repo.uri}>
-            <ProjectItem
-              key={repo.uri}
-              project={repo}
-              showStatus={false}
-              enableManagement={false}
-            />
-          </EuiFlexItem>
-        ));
-      const to = from + repos.length;
-      const statsComp = (
-        <EuiTitle size="m">
-          <h1>
-            <FormattedMessage
-              id="xpack.code.searchPage.showingResultsTitle"
-              defaultMessage="Showing {from} - {to} of {total} {total, plural,
-                one {result}
-                other {results}
-              }."
-              values={{ from: from + 1, to, total }}
-            />
-          </h1>
-        </EuiTitle>
-      );
-      mainComp = (
-        <div className="codeContainer__search--inner">
-          {statsComp}
-          <EuiSpacer />
-          <div className="codeContainer__search--results">{resultComps}</div>
-        </div>
-      );
-    } else if (scope === SearchScope.DEFAULT && documentSearchResults) {
-      const { stats, results } = documentSearchResults!;
-      const { total, from, to, page, totalPage } = stats!;
-      languageStats = stats!.languageStats;
-      repoStats = stats!.repoStats;
-      if (documentSearchResults.total > 0) {
-        const statsComp = (
-          <EuiTitle size="m">
-            <h1>
-              <FormattedMessage
-                id="xpack.code.searchPage.showingResultsTitle"
-                defaultMessage="Showing {from} - {to} of {total} {total, plural,
-                  one {result}
-                  other {results}
-                }."
-                values={{ from: from + 1, to, total }}
-              />
-            </h1>
-          </EuiTitle>
-        );
-        mainComp = (
-          <div className="codeContainer__search--inner">
-            {statsComp}
-            <EuiSpacer />
-            <div className="codeContainer__search--results">
-              <CodeResult results={results!} query={this.props.query} />
-            </div>
-            <Pagination query={this.props.query} totalPage={totalPage} currentPage={page - 1} />
-          </div>
-        );
-      }
-    }
-
-    return (
-      <div className="codeContainer__root">
-        <SearchBar
-          searchOptions={this.props.searchOptions}
-          query={this.props.query}
-          onSearchScopeChanged={this.props.onSearchScopeChanged}
-          enableSubmitWhenOptionsChanged={true}
-          ref={(element: any) => (this.searchBar = element)}
-        />
-        <div className="codeContainer__rootInner">
-          <SideBar
-            query={this.props.query}
-            scope={scope}
-            repositories={repositories}
-            languages={languages}
-            repoFacets={repoStats}
-            langFacets={languageStats}
-            onLanguageFilterToggled={this.onLanguageFilterToggled}
-            onRepositoryFilterToggled={this.onRepositoryFilterToggled}
-          />
-          <div className="codeContainer__search--main">{mainComp}</div>
-        </div>
-      </div>
-    );
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  ...state.search,
-});
-
-const mapDispatchToProps = {
-  onSearchScopeChanged: changeSearchScope,
-};
-
-export const Search = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(SearchPage);
diff --git a/x-pack/legacy/plugins/code/public/components/search_page/side_bar.tsx b/x-pack/legacy/plugins/code/public/components/search_page/side_bar.tsx
deleted file mode 100644
index 3bcc6f9dce3b25..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/search_page/side_bar.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EuiFacetButton,
-  EuiFacetGroup,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiTitle,
-  EuiToken,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
-
-import { RepositoryUtils } from '../../../common/repository_utils';
-import { SearchScope } from '../../../model';
-
-interface Props {
-  query: string;
-  scope: SearchScope;
-  languages?: Set<string>;
-  repositories?: Set<string>;
-  langFacets: any[];
-  repoFacets: any[];
-  onLanguageFilterToggled: (lang: string) => any;
-  onRepositoryFilterToggled: (repo: string) => any;
-}
-
-export class SideBar extends React.PureComponent<Props> {
-  voidFunc = () => void 0;
-
-  renderLangFacets = () => {
-    return this.props.langFacets.map((item, index) => {
-      const isSelected = this.props.languages && this.props.languages.has(item.name);
-      return (
-        <EuiFacetButton
-          className="codeFilter__item"
-          key={`langstats${index}`}
-          onClick={this.props.onLanguageFilterToggled(item.name)}
-          quantity={item.value}
-          isSelected={isSelected}
-          data-test-subj="codeSearchLanguageFilterItem"
-          buttonRef={this.voidFunc}
-        >
-          {item.name}
-        </EuiFacetButton>
-      );
-    });
-  };
-
-  renderRepoFacets = () => {
-    return this.props.repoFacets.map((item, index) => {
-      const isSelected = !!this.props.repositories && this.props.repositories.has(item.name);
-      return (
-        <EuiFacetButton
-          className="codeFilter__item"
-          key={`repostats${index}`}
-          onClick={this.props.onRepositoryFilterToggled(item.name)}
-          quantity={item.value}
-          isSelected={isSelected}
-          buttonRef={this.voidFunc}
-        >
-          {RepositoryUtils.repoNameFromUri(item.name)}
-        </EuiFacetButton>
-      );
-    });
-  };
-
-  public render() {
-    return (
-      <div className="codeSidebar__container">
-        <div className="codeFilter__groups">
-          <EuiFlexGroup className="codeFilter__group" gutterSize="none" alignItems="center">
-            <EuiFlexItem grow={false} className="codeFilter__group-icon">
-              <EuiToken iconType="tokenRepo" />
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiTitle size="xxs">
-                <h3>
-                  <FormattedMessage
-                    id="xpack.code.searchPage.sideBar.repositoriesTitle"
-                    defaultMessage="Repositories"
-                  />
-                </h3>
-              </EuiTitle>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiFacetGroup className="codeFilter__group">{this.renderRepoFacets()}</EuiFacetGroup>
-          <EuiFlexGroup className="codeFilter__group" gutterSize="none" alignItems="center">
-            <EuiFlexItem grow={false} className="codeFilter__group-icon">
-              <EuiToken
-                iconType="tokenElement"
-                displayOptions={{ color: 'tokenTint07', shape: 'rectangle', fill: true }}
-              />
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiTitle size="xxs">
-                <h3>
-                  <FormattedMessage
-                    id="xpack.code.searchPage.sideBar.languagesTitle"
-                    defaultMessage="Languages"
-                  />
-                </h3>
-              </EuiTitle>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiFacetGroup
-            className="codeFilter__group"
-            data-test-subj="codeSearchLanguageFilterList"
-          >
-            {this.renderLangFacets()}
-          </EuiFacetGroup>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/shared/icons.tsx b/x-pack/legacy/plugins/code/public/components/shared/icons.tsx
deleted file mode 100644
index 1ee9c2faaf8de6..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/shared/icons.tsx
+++ /dev/null
@@ -1,344 +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';
-
-export const TypeScriptIcon = () => (
-  <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-    <g fill="none" fillRule="evenodd">
-      <rect width="32" height="32" />
-      <path
-        className="codeIcon__language"
-        fillRule="nonzero"
-        d="M0,0 L26,0 L26,26 L0,26 L0,0 Z M15.47,21.4644444 C16.1922222,22.88 17.6511111,23.9633333 19.9333333,23.9633333 C22.2444444,23.9633333 23.9777778,22.7644444 23.9777778,20.5544444 C23.9777778,18.5177778 22.8077778,17.6077778 20.7277778,16.7122222 L20.1211111,16.4522222 C19.0666667,16.0044444 18.6188889,15.7011111 18.6188889,14.9788889 C18.6188889,14.3866667 19.0666667,13.9244444 19.7888889,13.9244444 C20.4822222,13.9244444 20.9444444,14.2277778 21.3633333,14.9788889 L23.2555556,13.7222222 C22.4611111,12.3355556 21.3344444,11.8011111 19.7888889,11.8011111 C17.6077778,11.8011111 16.2066667,13.1877778 16.2066667,15.0222222 C16.2066667,17.0155556 17.3766667,17.9544444 19.1388889,18.7055556 L19.7455556,18.9655556 C20.8722222,19.4566667 21.5366667,19.76 21.5366667,20.5977778 C21.5366667,21.2911111 20.8866667,21.7966667 19.8755556,21.7966667 C18.6766667,21.7966667 17.9833333,21.1755556 17.4633333,20.3088889 L15.47,21.4644444 Z M14.4444444,11.9166667 L7.22222222,11.9166667 L7.22222222,14.0833333 L9.38888889,14.0833333 L9.38888889,24.5555556 L11.9166667,24.5555556 L11.9166667,14.0833333 L14.4444444,14.0833333 L14.4444444,11.9166667 Z"
-        transform="translate(3 3)"
-      />
-    </g>
-  </svg>
-);
-
-export const JavaIcon = () => (
-  <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-    <g fill="none" fillRule="evenodd">
-      <rect width="32" height="32" />
-      <path
-        className="codeIcon__language"
-        fillRule="nonzero"
-        d="M6.65133715,21.6542239 C6.65133715,21.6542239 5.58131391,22.276089 7.41206217,22.4873705 C9.63052249,22.7400382 10.7653474,22.7040978 13.2103357,22.2412384 C13.2103357,22.2412384 13.8528947,22.6441999 14.7513857,22.993794 C9.27003527,25.3429432 2.34619439,22.8576593 6.65133715,21.6542239 Z M5.98100805,18.5884578 C5.98100805,18.5884578 4.78083873,19.4771497 6.61376494,19.6666484 C8.98360848,19.9106042 10.8557408,19.9312956 14.0946721,19.3072526 C14.0946721,19.3072526 14.5422842,19.7613986 15.2469215,20.0097103 C8.61985433,21.9471879 1.23805487,20.1621821 5.98100805,18.5884578 Z M11.6279005,13.3886342 C12.9780624,14.9441037 11.272859,16.3427706 11.272859,16.3427706 C11.272859,16.3427706 14.7023792,14.5730104 13.1275651,12.3556391 C11.6562155,10.2885616 10.5290152,9.26155543 16.6355009,5.71986139 C16.6355009,5.71986139 7.04947126,8.1140008 11.6279005,13.3886342 Z M18.8768322,23.9211483 C18.8768322,23.9211483 19.6685944,24.5740554 18.0044758,25.0782993 C14.8406918,26.0366907 4.83638239,26.3263869 2.05704474,25.116416 C1.05835647,24.6818733 2.93157744,24.0785217 3.52077129,23.9521871 C4.1350139,23.8193202 4.48678723,23.8432794 4.48678723,23.8432794 C3.37592402,23.0602291 -2.69462129,25.3799734 1.403595,26.0443144 C12.5797564,27.8565471 21.7759674,25.2291355 18.8768322,23.9211483 Z M7.16538513,15.4132383 C7.16538513,15.4132383 2.07555902,16.6215754 5.36240912,17.0604756 C6.7499004,17.2467081 9.51616908,17.2042339 12.0940268,16.9885964 C14.2003117,16.8110757 16.31531,16.4331632 16.31531,16.4331632 C16.31531,16.4331632 15.572556,16.7511761 15.0356379,17.1181955 C9.86794281,18.4773705 -0.114585395,17.844614 2.75950241,16.454946 C5.19033408,15.2798257 7.16538513,15.4132383 7.16538513,15.4132383 Z M16.2946169,20.515044 C21.5483503,17.7858026 19.1186085,15.1622028 17.4239969,15.5150664 C17.0079677,15.6011047 16.8228233,15.6762517 16.8228233,15.6762517 C16.8228233,15.6762517 16.977473,15.4344754 17.2715251,15.3299236 C20.6248112,14.1504474 23.2048469,18.807363 16.1889787,20.6522667 C16.1889787,20.6522667 16.2706611,20.5792994 16.2946169,20.515044 Z M13.1259313,0 C13.1259313,0 16.0354154,2.9100278 10.3667418,7.38506722 C5.8209126,10.9746821 9.32993567,13.022158 10.3645638,15.3604166 C7.71155918,12.9666144 5.76427996,10.8592405 7.07008922,8.89780294 C8.98796272,6.018269 14.2999635,4.62315446 13.1259313,0 Z M7.68160939,27.9120908 C12.7240596,28.234458 20.466892,27.7334819 20.6498568,25.3473024 C20.6498568,25.3473024 20.2969949,26.2523282 16.4830275,26.9700348 C12.1789745,27.7803104 6.87078643,27.6855619 3.72333956,27.166069 C3.72333914,27.166069 4.36753154,27.6997194 7.68160939,27.9120908 Z"
-        transform="translate(6 2)"
-      />
-    </g>
-  </svg>
-);
-
-export const GoIcon = () => (
-  <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="none" viewBox="0 0 32 32">
-    <rect width="32" height="32" fill="white" />
-    <path
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M19.2504 14.4856C18.8097 14.5975 18.4468 14.6939 18.0773 14.792C17.7827 14.8702 17.4839 14.9496 17.138 15.0389L17.1172 15.0444C16.9482 15.0898 16.9306 15.0945 16.7734 14.9131C16.5848 14.6994 16.4465 14.5611 16.1824 14.4353C15.3903 14.0455 14.6233 14.1587 13.9066 14.6239C13.0516 15.1772 12.6115 15.9945 12.6241 17.0129C12.6366 18.0188 13.3282 18.8487 14.3215 18.987C15.1765 19.1002 15.8932 18.7984 16.459 18.1571C16.543 18.0545 16.62 17.9451 16.7055 17.8235C16.7352 17.7812 16.7661 17.7373 16.7985 17.6919H14.3718C14.1078 17.6919 14.0449 17.5284 14.1329 17.3147C14.2964 16.9249 14.5981 16.2711 14.7742 15.9442C14.8119 15.8687 14.8999 15.743 15.0885 15.743H19.1349C19.3166 15.1672 19.6115 14.6232 20.0048 14.1084C20.9226 12.9014 22.0291 12.2727 23.5254 12.0086C24.8079 11.7823 26.015 11.908 27.1089 12.6499C28.1022 13.3289 28.7183 14.2467 28.8818 15.4538C29.0955 17.1513 28.6052 18.5344 27.4358 19.7163C26.6059 20.5587 25.5875 21.0868 24.4181 21.3257C24.1951 21.367 23.972 21.3866 23.7525 21.4059C23.638 21.416 23.5243 21.4259 23.4122 21.4389C22.268 21.4137 21.2244 21.0868 20.3443 20.3324C19.7252 19.7973 19.2988 19.1397 19.0869 18.3741C18.9399 18.671 18.7641 18.9554 18.5589 19.2259C17.6535 20.4204 16.4716 21.1622 14.9753 21.3634C13.7431 21.5269 12.5989 21.288 11.593 20.5336C10.6626 19.8294 10.1345 18.899 9.99617 17.7422C9.83271 16.3717 10.2351 15.1394 11.0649 14.0581C11.9577 12.8888 13.1396 12.1469 14.5856 11.8829C15.7675 11.6691 16.8991 11.8074 17.9176 12.499C18.584 12.939 19.0618 13.5426 19.3761 14.2719C19.4516 14.385 19.4013 14.4479 19.2504 14.4856ZM26.4048 16.3591C26.4011 16.3114 26.3985 16.2669 26.396 16.2246C26.39 16.1222 26.3848 16.0332 26.367 15.9442C26.1407 14.6994 24.9965 13.9953 23.802 14.2719C22.6327 14.5359 21.8782 15.2778 21.6016 16.4597C21.3753 17.4404 21.8531 18.4338 22.7584 18.8361C23.45 19.1379 24.1415 19.1002 24.8079 18.7607C25.8012 18.2452 26.3419 17.4404 26.4048 16.3591Z"
-      fill="black"
-    />
-    <path
-      d="M5.01697 14.6491C4.99182 14.6868 5.00439 14.7119 5.05469 14.7119L9.60636 14.7245C9.64408 14.7245 9.70695 14.6868 9.73209 14.6491L9.94584 14.3221C9.97099 14.2844 9.95842 14.2467 9.90812 14.2467H5.41933C5.36903 14.2467 5.30616 14.2719 5.28101 14.3096L5.01697 14.6491Z"
-      fill="black"
-    />
-    <path
-      d="M3.11829 15.8058C3.09314 15.8435 3.10571 15.8687 3.15601 15.8687L9.10336 15.8561C9.15365 15.8561 9.20395 15.8309 9.21652 15.7807L9.31711 15.4789C9.32968 15.4412 9.30453 15.4034 9.25424 15.4034H3.52064C3.47035 15.4034 3.40748 15.4286 3.38233 15.4663L3.11829 15.8058Z"
-      fill="black"
-    />
-    <path
-      d="M6.19885 17.0255C6.14856 17.0255 6.13599 16.9878 6.16113 16.9501L6.33717 16.6357C6.36231 16.598 6.41261 16.5603 6.4629 16.5603H8.97764C9.02793 16.5603 9.05308 16.598 9.05308 16.6483L9.02793 16.9501C9.02793 17.0004 8.97764 17.0381 8.93992 17.0381L6.19885 17.0255Z"
-      fill="black"
-    />
-  </svg>
-);
-
-export const CtagsIcon = () => (
-  <svg width="32" height="32" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path
-      className="codeIcon__language"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M9.38147 22.4545L1.49428 14.5673C1.02148 14.0945 0.899259 13.8738 0.818851 13.6085C0.738443 13.3433 0.738443 13.072 0.818851 12.8067C0.899259 12.5414 1.02148 12.3207 1.49428 11.8479L11.1446 2.19753C11.4185 1.92366 11.5232 1.83884 11.6524 1.75804C11.7816 1.67724 11.913 1.62282 12.0615 1.58859C12.21 1.55437 12.3439 1.54034 12.7312 1.54034H20.4903C21.1579 1.54034 21.3999 1.60967 21.6441 1.73994C21.8883 1.87022 22.0801 2.06144 22.2111 2.30524C22.342 2.54903 22.4121 2.79091 22.414 3.45844L22.4365 11.1838C22.4376 11.5721 22.4239 11.7065 22.3898 11.8556C22.3558 12.0046 22.3014 12.1365 22.2205 12.2662C22.1395 12.3958 22.0545 12.5009 21.7799 12.7754L12.1009 22.4545C11.6281 22.9273 11.4074 23.0495 11.1421 23.1299C10.8768 23.2103 10.6055 23.2103 10.3402 23.1299C10.0749 23.0495 9.85427 22.9273 9.38147 22.4545ZM11.0402 21.3938L20.7193 11.7148C20.8576 11.5765 20.9085 11.5228 20.9317 11.4943C20.9353 11.4577 20.9371 11.3837 20.9365 11.1882L20.914 3.4628C20.9132 3.1916 20.9096 3.09541 20.9017 3.05144C20.8577 3.04366 20.7615 3.04035 20.4903 3.04035H12.7312C12.5359 3.04035 12.4621 3.0423 12.4255 3.04601C12.397 3.06924 12.3434 3.12009 12.2053 3.2582L2.55494 12.9086C2.36296 13.1005 2.29722 13.171 2.2716 13.2076C2.29722 13.2442 2.36296 13.3147 2.55494 13.5067L10.4421 21.3938C10.6341 21.5858 10.7045 21.6516 10.7412 21.6772C10.7778 21.6516 10.8482 21.5858 11.0402 21.3938ZM17.4379 6.54402C16.8521 5.95824 15.9023 5.95824 15.3166 6.54402C14.7308 7.12981 14.7308 8.07956 15.3166 8.66534C15.9023 9.25113 16.8521 9.25113 17.4379 8.66534C18.0237 8.07956 18.0237 7.12981 17.4379 6.54402ZM10.1443 16.8534L7.10054 13.8096C7.07478 13.7898 7.05001 13.7681 7.02642 13.7445C6.81172 13.5298 6.7544 13.2173 6.85448 12.9504C6.89078 12.8508 6.94891 12.7572 7.02886 12.6773C7.04481 12.6613 7.0613 12.6462 7.07828 12.632L10.6477 9.06256C10.9406 8.76967 11.4155 8.76967 11.7084 9.06256C12.0013 9.35546 12.0013 9.83033 11.7084 10.1232L8.62194 13.2097L10.7433 15.331L13.8299 12.2444C14.1228 11.9516 14.5976 11.9516 14.8905 12.2444C15.1834 12.5373 15.1834 13.0122 14.8905 13.3051L11.2692 16.9264C10.9763 17.2193 10.5014 17.2193 10.2085 16.9264C10.1853 16.9032 10.1639 16.8787 10.1443 16.8534Z"
-    />
-  </svg>
-);
-
-export const BinaryFileIcon = () => (
-  <svg
-    width="320"
-    height="160"
-    viewBox="0 0 320 160"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path d="M209.96 64.84H122.33V132.75H209.96V64.84Z" fill="#E6EBF2" />
-    <path d="M181.14 91.16H150.44V106.69H181.14V91.16Z" fill="white" />
-    <path d="M175.15 96.29H156.47V101.99H175.15V96.29Z" fill="#DAE3ED" />
-    <path d="M90.98 102.07L122.33 124.62V91.55L90.98 69.01V102.07Z" fill="#E6EBF2" />
-    <path
-      d="M91 48.22C90.18 69.52 90.25 90.87 90.45 112.22C90.4525 112.443 90.5415 112.656 90.6982 112.815C90.855 112.973 91.0671 113.065 91.29 113.07C94.87 113.07 98.43 112.93 102 112.84C102.164 112.84 102.322 112.775 102.438 112.658C102.555 112.542 102.62 112.384 102.62 112.22C102.62 112.056 102.555 111.898 102.438 111.782C102.322 111.665 102.164 111.6 102 111.6C99.17 111.53 94.83 110.54 92.18 111.39C90.98 111.77 92.18 112.58 92.18 111.72C92.18 110.86 92.18 110.22 92.18 109.47C92.25 102.37 92.18 95.27 92.18 88.16C92.18 74.86 92.08 61.55 91.57 48.26C91.5573 48.1911 91.5208 48.1288 91.4669 48.0839C91.413 48.0391 91.3451 48.0145 91.275 48.0145C91.2049 48.0145 91.137 48.0391 91.0831 48.0839C91.0292 48.1288 90.9927 48.1911 90.98 48.26L91 48.22Z"
-      fill="#E6EBF2"
-    />
-    <path
-      d="M122.22 65.78C121.77 88.12 121.66 110.46 121.54 132.78C121.543 133.013 121.636 133.235 121.801 133.399C121.965 133.564 122.187 133.657 122.42 133.66C147.89 133.78 173.36 133.87 198.83 133.59C202.55 133.54 206.28 133.46 210 133.46C210.164 133.46 210.322 133.395 210.438 133.278C210.555 133.162 210.62 133.004 210.62 132.84C210.62 132.676 210.555 132.518 210.438 132.402C210.322 132.285 210.164 132.22 210 132.22C187.51 132.22 165 131.89 142.52 131.89H127.34C126.34 131.89 124.34 131.49 123.34 131.89C121.97 132.46 123.27 132.36 123.34 132.29C124.34 129.29 123.34 124.1 123.34 120.96C123.34 113.89 123.34 106.82 123.28 99.76C123.22 88.4267 123.083 77.0933 122.87 65.76C122.87 65.6831 122.839 65.6093 122.785 65.5549C122.731 65.5006 122.657 65.47 122.58 65.47C122.503 65.47 122.429 65.5006 122.375 65.5549C122.321 65.6093 122.29 65.6831 122.29 65.76L122.22 65.78Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M161.67 47.11C138.52 46.47 115.39 47.02 92.24 47.11C92.1153 47.11 91.9958 47.1595 91.9077 47.2477C91.8195 47.3358 91.77 47.4553 91.77 47.58C91.77 47.7046 91.8195 47.8242 91.9077 47.9123C91.9958 48.0005 92.1153 48.05 92.24 48.05C115.39 47.97 138.53 48.36 161.67 47.57C161.728 47.57 161.784 47.5468 161.826 47.5056C161.867 47.4643 161.89 47.4083 161.89 47.35C161.89 47.2916 161.867 47.2357 161.826 47.1944C161.784 47.1532 161.728 47.13 161.67 47.13V47.11Z"
-      fill="#E6EBF2"
-    />
-    <path
-      d="M92.08 102.73C101.74 110.73 112.14 117.6 122.25 124.93C122.77 125.3 123.25 124.44 122.75 124.07C112.67 116.76 102.89 109.07 92.36 102.36C92.14 102.22 91.87 102.55 92.08 102.73Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M176.45 48.61C175.72 53.4851 175.569 58.4294 176 63.34C176.016 63.4516 176.072 63.5536 176.158 63.6273C176.243 63.7011 176.352 63.7416 176.465 63.7416C176.578 63.7416 176.687 63.7011 176.772 63.6273C176.858 63.5536 176.914 63.4516 176.93 63.34C177.475 58.4433 177.445 53.4996 176.84 48.61C176.84 48.4 176.45 48.4 176.41 48.61H176.45Z"
-      fill="#E6EBF2"
-    />
-    <path
-      d="M149.59 92.76C149.36 97.43 149.25 102.1 149.2 106.76C149.205 106.92 149.271 107.072 149.384 107.186C149.498 107.299 149.65 107.365 149.81 107.37C159.81 107.47 169.73 107.23 179.68 107.23C179.792 107.214 179.894 107.158 179.967 107.072C180.041 106.987 180.082 106.878 180.082 106.765C180.082 106.652 180.041 106.543 179.967 106.458C179.894 106.372 179.792 106.316 179.68 106.3C171.47 106.3 163.26 106.04 155.05 106.1C153.53 106.1 151.99 106.21 150.48 106.1C149.57 106.1 150.15 106.1 150.42 106.63C150.316 106.048 150.316 105.452 150.42 104.87C150.72 100.87 150.25 96.69 150.05 92.69C150.05 92.6317 150.027 92.5757 149.986 92.5344C149.944 92.4932 149.888 92.47 149.83 92.47C149.772 92.47 149.716 92.4932 149.674 92.5344C149.633 92.5757 149.61 92.6317 149.61 92.69L149.59 92.76Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M175.45 101.6C175.61 99.82 175.76 98.05 175.79 96.27C175.79 96.1205 175.731 95.9771 175.627 95.8704C175.522 95.7638 175.379 95.7026 175.23 95.7C169.23 95.58 163.16 95.45 157.14 95.8C157.028 95.8164 156.926 95.8724 156.853 95.9578C156.779 96.0432 156.738 96.1522 156.738 96.265C156.738 96.3778 156.779 96.4868 156.853 96.5722C156.926 96.6576 157.028 96.7136 157.14 96.73C161.42 96.98 165.71 96.98 170 96.93C171.53 96.93 173.63 96.48 175.14 96.83C174.49 96.68 174.78 96.04 174.69 96.83C174.672 97.4045 174.698 97.9796 174.77 98.55C174.83 99.55 174.92 100.55 175.01 101.55C175.01 101.608 175.033 101.664 175.074 101.706C175.116 101.747 175.172 101.77 175.23 101.77C175.288 101.77 175.344 101.747 175.386 101.706C175.427 101.664 175.45 101.608 175.45 101.55V101.6Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M187.16 38.83C187.001 38.8332 186.847 38.7763 186.728 38.6706C186.609 38.5649 186.535 38.4182 186.52 38.26C186.5 38.089 186.549 37.9171 186.656 37.7821C186.763 37.6471 186.919 37.5601 187.09 37.54C187.63 37.48 188.23 37.41 188.95 37.31C189.121 37.2861 189.295 37.3312 189.432 37.4353C189.57 37.5394 189.661 37.6939 189.685 37.865C189.709 38.0361 189.664 38.2096 189.56 38.3474C189.456 38.4853 189.301 38.5761 189.13 38.6L187.23 38.83H187.16ZM182.67 38.83H182.59L180.4 38.52C180.244 38.4809 180.109 38.3856 180.019 38.2525C179.93 38.1195 179.893 37.958 179.915 37.7991C179.937 37.6403 180.018 37.4953 180.14 37.3921C180.263 37.2889 180.42 37.2347 180.58 37.24C181.44 37.37 182.14 37.47 182.75 37.54C182.908 37.5671 183.05 37.6515 183.15 37.7772C183.249 37.9029 183.299 38.0609 183.289 38.2209C183.279 38.3809 183.21 38.5316 183.096 38.644C182.982 38.7564 182.83 38.8227 182.67 38.83Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M107 75.31C106.872 75.31 106.746 75.272 106.639 75.2008C106.533 75.1297 106.449 75.0285 106.4 74.91C106.109 74.2104 105.865 73.4921 105.67 72.76C105.646 72.6779 105.638 72.5918 105.648 72.5068C105.657 72.4217 105.684 72.3395 105.726 72.2649C105.768 72.1903 105.824 72.1249 105.892 72.0725C105.96 72.0202 106.037 71.9819 106.12 71.96C106.286 71.9138 106.463 71.9353 106.613 72.0197C106.763 72.104 106.873 72.2444 106.92 72.41C107.102 73.0911 107.329 73.7592 107.6 74.41C107.666 74.5691 107.667 74.7481 107.601 74.9075C107.535 75.0669 107.409 75.1937 107.25 75.26C107.17 75.2912 107.086 75.3081 107 75.31ZM105.68 68.77C105.51 68.77 105.347 68.7026 105.227 68.5825C105.107 68.4625 105.04 68.2997 105.04 68.13C105.039 67.3742 105.09 66.6191 105.19 65.87C105.191 65.7783 105.212 65.6879 105.251 65.6049C105.29 65.5218 105.346 65.4479 105.416 65.388C105.485 65.3281 105.566 65.2836 105.654 65.2574C105.742 65.2312 105.835 65.2239 105.925 65.236C106.016 65.2481 106.104 65.2792 106.182 65.3275C106.26 65.3757 106.327 65.4399 106.378 65.5158C106.43 65.5918 106.464 65.6777 106.48 65.7681C106.496 65.8584 106.493 65.9511 106.47 66.04C106.378 66.7329 106.331 67.431 106.33 68.13C106.325 68.2998 106.254 68.4612 106.133 68.5804C106.012 68.6996 105.85 68.7675 105.68 68.77ZM107.05 62.27C106.942 62.2673 106.837 62.2382 106.743 62.1853C106.649 62.1324 106.569 62.0573 106.511 61.9665C106.453 61.8757 106.418 61.7721 106.409 61.6646C106.4 61.5571 106.417 61.4491 106.46 61.35C106.778 60.6597 107.142 59.9915 107.55 59.35C107.596 59.2776 107.655 59.2149 107.726 59.1656C107.796 59.1163 107.875 59.0814 107.958 59.0628C108.042 59.0442 108.129 59.0424 108.213 59.0573C108.297 59.0723 108.378 59.1038 108.45 59.15C108.521 59.1956 108.583 59.255 108.631 59.3245C108.679 59.3941 108.713 59.4726 108.731 59.5553C108.748 59.6381 108.75 59.7236 108.734 59.8068C108.718 59.8899 108.686 59.9692 108.64 60.04C108.264 60.6325 107.93 61.2507 107.64 61.89C107.586 62.0017 107.503 62.0963 107.399 62.1634C107.295 62.2305 107.174 62.2674 107.05 62.27ZM111.05 56.96C110.955 56.9592 110.861 56.9384 110.775 56.8987C110.689 56.8591 110.612 56.8015 110.55 56.73C110.44 56.5966 110.387 56.4257 110.402 56.2537C110.417 56.0817 110.499 55.9224 110.63 55.81C111.217 55.3209 111.835 54.87 112.48 54.46C112.626 54.3782 112.797 54.3555 112.959 54.3967C113.121 54.4379 113.26 54.5397 113.349 54.6812C113.438 54.8226 113.469 54.9928 113.435 55.1564C113.402 55.3201 113.307 55.4646 113.17 55.56C112.575 55.9333 112.007 56.3477 111.47 56.8C111.364 56.9172 111.217 56.9889 111.06 57L111.05 56.96ZM144.05 54.71H143.56C143.388 54.71 143.222 54.6415 143.1 54.5196C142.978 54.3977 142.91 54.2324 142.91 54.06C142.91 53.8876 142.978 53.7223 143.1 53.6004C143.222 53.4785 143.388 53.41 143.56 53.41H144H145.7C145.785 53.4059 145.87 53.4192 145.95 53.4491C146.03 53.4789 146.103 53.5247 146.165 53.5836C146.227 53.6425 146.276 53.7133 146.309 53.7918C146.343 53.8702 146.36 53.9547 146.36 54.04C146.363 54.2107 146.298 54.3756 146.18 54.4991C146.062 54.6226 145.901 54.6948 145.73 54.7C145.2 54.71 144.62 54.71 144 54.71H144.05ZM139.05 54.55H139C138.28 54.55 137.54 54.45 136.79 54.38C136.706 54.3725 136.624 54.3484 136.549 54.309C136.474 54.2697 136.408 54.2159 136.354 54.1509C136.3 54.0858 136.26 54.0107 136.235 53.9298C136.21 53.849 136.202 53.7641 136.21 53.68C136.225 53.5092 136.307 53.3514 136.439 53.2409C136.57 53.1303 136.739 53.0761 136.91 53.09C137.65 53.16 138.37 53.21 139.09 53.26C139.259 53.2728 139.416 53.3511 139.528 53.4781C139.64 53.6051 139.698 53.7708 139.69 53.94C139.682 54.1045 139.611 54.2597 139.492 54.3733C139.373 54.4869 139.215 54.5502 139.05 54.55ZM150.25 54.43C150.088 54.4285 149.933 54.3675 149.813 54.2587C149.693 54.15 149.617 54.0009 149.6 53.84C149.586 53.6691 149.64 53.4996 149.751 53.3685C149.861 53.2374 150.019 53.1553 150.19 53.14C150.93 53.0667 151.65 52.9867 152.35 52.9C152.434 52.8873 152.52 52.8915 152.603 52.9124C152.685 52.9333 152.763 52.9705 152.831 53.0217C152.898 53.0729 152.956 53.1372 152.998 53.2107C153.041 53.2843 153.069 53.3656 153.08 53.45C153.091 53.5347 153.086 53.6208 153.064 53.7034C153.042 53.7859 153.003 53.8633 152.951 53.9311C152.899 53.9989 152.834 54.0558 152.76 54.0985C152.686 54.1412 152.605 54.1689 152.52 54.18C151.8 54.28 151.06 54.36 150.31 54.43H150.25ZM132.37 53.88H132.29L130.09 53.56C129.922 53.5305 129.771 53.4369 129.671 53.2989C129.57 53.1609 129.527 52.9893 129.55 52.82C129.562 52.7355 129.591 52.6543 129.635 52.5812C129.679 52.508 129.737 52.4444 129.806 52.3941C129.875 52.3438 129.954 52.3078 130.037 52.2882C130.12 52.2686 130.206 52.2658 130.29 52.28C131.02 52.39 131.75 52.5 132.46 52.59C132.629 52.6148 132.782 52.7053 132.885 52.842C132.988 52.9787 133.033 53.1504 133.01 53.32C132.99 53.4755 132.914 53.6184 132.796 53.7217C132.678 53.8249 132.527 53.8812 132.37 53.88ZM116.92 53.8C116.781 53.7997 116.646 53.7548 116.534 53.672C116.423 53.5892 116.341 53.4729 116.3 53.34C116.253 53.1756 116.271 52.9992 116.351 52.8481C116.432 52.697 116.567 52.583 116.73 52.53C117.453 52.3091 118.188 52.1256 118.93 51.98C119.014 51.9641 119.1 51.9649 119.184 51.9825C119.268 52 119.347 52.0339 119.418 52.0822C119.489 52.1305 119.549 52.1923 119.596 52.264C119.642 52.3357 119.674 52.4159 119.69 52.5C119.707 52.5829 119.708 52.6684 119.691 52.7514C119.675 52.8345 119.642 52.9133 119.594 52.9833C119.547 53.0533 119.486 53.113 119.414 53.1589C119.343 53.2047 119.263 53.2357 119.18 53.25C118.481 53.3855 117.79 53.5591 117.11 53.77C117.049 53.7897 116.984 53.7998 116.92 53.8ZM156.92 53.4C156.774 53.4013 156.631 53.3523 156.517 53.2613C156.402 53.1703 156.322 53.0428 156.29 52.9C156.271 52.8166 156.268 52.7302 156.282 52.6458C156.297 52.5614 156.327 52.4807 156.373 52.4082C156.419 52.3357 156.478 52.273 156.548 52.2235C156.618 52.1741 156.697 52.1389 156.78 52.12C157.5 51.96 158.2 51.78 158.88 51.59C158.963 51.5673 159.049 51.5613 159.134 51.5721C159.219 51.583 159.301 51.6106 159.376 51.6534C159.45 51.6962 159.515 51.7532 159.568 51.8213C159.62 51.8894 159.658 51.9671 159.68 52.05C159.703 52.1314 159.709 52.2165 159.699 52.3004C159.688 52.3843 159.662 52.4653 159.62 52.5388C159.578 52.6122 159.522 52.6767 159.455 52.7284C159.388 52.7801 159.312 52.818 159.23 52.84C158.53 53.04 157.8 53.22 157.06 53.39L156.92 53.4ZM125.73 53C125.01 53 124.29 52.92 123.58 52.92C123.408 52.92 123.242 52.8515 123.12 52.7296C122.998 52.6077 122.93 52.4424 122.93 52.27C122.933 52.0984 123.002 51.9346 123.123 51.8132C123.245 51.6919 123.408 51.6226 123.58 51.62C124.32 51.62 125.08 51.62 125.83 51.71C126.002 51.71 126.168 51.7785 126.29 51.9004C126.412 52.0223 126.48 52.1876 126.48 52.36C126.48 52.5324 126.412 52.6977 126.29 52.8196C126.168 52.9415 126.002 53.01 125.83 53.01L125.73 53ZM163.27 51.47C163.141 51.4692 163.014 51.4297 162.907 51.3567C162.8 51.2836 162.718 51.1803 162.67 51.06C162.637 50.9819 162.621 50.8981 162.62 50.8135C162.62 50.7289 162.637 50.6451 162.67 50.567C162.702 50.4888 162.75 50.4179 162.81 50.3584C162.87 50.2988 162.942 50.2518 163.02 50.22C163.7 49.94 164.36 49.64 165.02 49.33C165.097 49.2812 165.184 49.2492 165.274 49.236C165.364 49.2228 165.456 49.2288 165.544 49.2536C165.632 49.2784 165.714 49.3214 165.784 49.3797C165.854 49.4381 165.911 49.5107 165.951 49.5925C165.991 49.6744 166.014 49.7639 166.017 49.8551C166.021 49.9463 166.005 50.0371 165.971 50.1218C165.937 50.2065 165.885 50.283 165.82 50.3464C165.754 50.4099 165.676 50.4588 165.59 50.49C164.94 50.82 164.25 51.13 163.54 51.42C163.451 51.4378 163.359 51.4378 163.27 51.42V51.47ZM169.14 48.26C169.037 48.2581 168.936 48.2328 168.844 48.186C168.752 48.1392 168.672 48.0722 168.61 47.99C168.56 47.9205 168.524 47.8418 168.504 47.7583C168.485 47.6749 168.482 47.5884 168.496 47.5038C168.51 47.4192 168.54 47.3382 168.585 47.2655C168.631 47.1928 168.69 47.1297 168.76 47.08C169.34 46.6663 169.897 46.2223 170.43 45.75C170.563 45.636 170.735 45.5793 170.91 45.5924C171.084 45.6055 171.246 45.6874 171.36 45.82C171.474 45.9526 171.531 46.1251 171.518 46.2995C171.504 46.4739 171.423 46.636 171.29 46.75C170.73 47.23 170.14 47.75 169.52 48.15C169.403 48.2098 169.27 48.2308 169.14 48.21V48.26ZM173.88 43.56C173.747 43.56 173.618 43.518 173.51 43.44C173.44 43.392 173.38 43.3304 173.334 43.2589C173.287 43.1874 173.256 43.1074 173.241 43.0236C173.226 42.9398 173.228 42.8539 173.247 42.7708C173.265 42.6878 173.301 42.6093 173.35 42.54C173.603 42.18 173.833 41.82 174.04 41.46C174.19 41.22 174.33 40.97 174.48 40.72C174.522 40.6465 174.578 40.5819 174.645 40.5301C174.712 40.4782 174.789 40.44 174.87 40.4177C174.952 40.3955 175.037 40.3895 175.121 40.4002C175.205 40.4108 175.286 40.438 175.36 40.48C175.434 40.522 175.498 40.5781 175.55 40.6451C175.602 40.712 175.64 40.7886 175.662 40.8703C175.685 40.952 175.691 41.0373 175.68 41.1213C175.669 41.2054 175.642 41.2865 175.6 41.36C175.46 41.62 175.31 41.87 175.16 42.12C175.01 42.37 174.68 42.9 174.41 43.28C174.345 43.356 174.263 43.4162 174.172 43.4561C174.08 43.4959 173.98 43.5144 173.88 43.51V43.56ZM177.12 37.69C177.027 37.6893 176.935 37.6688 176.85 37.63C176.772 37.5955 176.701 37.5456 176.642 37.4834C176.584 37.4211 176.538 37.3478 176.508 37.2676C176.479 37.1874 176.465 37.1021 176.469 37.0166C176.473 36.9311 176.493 36.8473 176.53 36.77C176.84 36.09 177.12 35.42 177.36 34.77C177.423 34.6096 177.546 34.48 177.703 34.409C177.86 34.338 178.038 34.3312 178.2 34.39C178.36 34.4525 178.489 34.5761 178.559 34.7335C178.628 34.891 178.632 35.0695 178.57 35.23C178.32 35.9 178.03 36.59 177.71 37.3C177.653 37.4057 177.567 37.4934 177.463 37.5534C177.359 37.6135 177.24 37.6434 177.12 37.64V37.69ZM173.35 37.21H173.15C172.42 36.97 171.71 36.7 171.04 36.42C170.962 36.3882 170.89 36.3412 170.83 36.2816C170.77 36.2221 170.722 36.1512 170.69 36.073C170.657 35.9949 170.64 35.9111 170.64 35.8265C170.641 35.7419 170.657 35.6581 170.69 35.58C170.756 35.4209 170.883 35.2946 171.043 35.229C171.202 35.1633 171.381 35.1637 171.54 35.23C172.18 35.5 172.85 35.75 173.54 35.97C173.689 36.0167 173.815 36.1152 173.897 36.2476C173.979 36.3799 174.011 36.5373 173.987 36.6911C173.963 36.8449 173.884 36.9849 173.765 37.0857C173.647 37.1864 173.496 37.2412 173.34 37.24L173.35 37.21ZM167.35 34.28C167.212 34.2816 167.078 34.2357 166.97 34.15C166.344 33.7016 165.759 33.1997 165.22 32.65C165.118 32.5247 165.066 32.3659 165.075 32.2045C165.083 32.0432 165.152 31.8908 165.267 31.7771C165.382 31.6635 165.535 31.5967 165.696 31.5898C165.858 31.583 166.016 31.6365 166.14 31.74C166.635 32.2358 167.166 32.6938 167.73 33.11C167.799 33.1596 167.857 33.2223 167.901 33.2945C167.946 33.3667 167.975 33.447 167.988 33.5307C168.001 33.6145 167.997 33.6999 167.977 33.7822C167.957 33.8645 167.92 33.9419 167.87 34.01C167.807 34.0852 167.727 34.1444 167.636 34.1826C167.546 34.2209 167.448 34.2371 167.35 34.23V34.28ZM179.12 31.28H179C178.916 31.269 178.834 31.2412 178.761 31.1984C178.687 31.1556 178.623 31.0985 178.572 31.0305C178.52 30.9625 178.483 30.885 178.462 30.8025C178.442 30.72 178.437 30.6342 178.45 30.55C178.528 30.0001 178.568 29.4454 178.57 28.89C178.57 28.75 178.57 28.61 178.57 28.47C178.565 28.3848 178.577 28.2994 178.605 28.2189C178.634 28.1385 178.678 28.0647 178.736 28.002C178.794 27.9394 178.864 27.8892 178.942 27.8544C179.02 27.8197 179.105 27.8012 179.19 27.8C179.276 27.7898 179.364 27.7984 179.446 27.8253C179.529 27.8521 179.604 27.8965 179.668 27.9555C179.732 28.0144 179.782 28.0865 179.815 28.1667C179.848 28.2469 179.863 28.3333 179.86 28.42C179.86 28.57 179.86 28.73 179.86 28.89C179.86 29.5056 179.817 30.1205 179.73 30.73C179.703 30.8742 179.628 31.0051 179.517 31.1013C179.407 31.1975 179.267 31.2535 179.12 31.26V31.28ZM163.24 29.07C163.105 29.0704 162.973 29.0281 162.864 28.9491C162.754 28.87 162.672 28.7583 162.63 28.63C162.409 27.9859 162.291 27.3109 162.28 26.63C162.28 26.5 162.28 26.38 162.28 26.26C162.298 26.0903 162.378 25.9334 162.506 25.8204C162.634 25.7074 162.799 25.6466 162.97 25.65C163.055 25.6551 163.139 25.677 163.216 25.7145C163.293 25.7519 163.362 25.8042 163.418 25.8683C163.475 25.9324 163.518 26.0071 163.546 26.088C163.574 26.169 163.585 26.2546 163.58 26.34C163.575 26.4366 163.575 26.5334 163.58 26.63C163.584 27.185 163.678 27.7356 163.86 28.26C163.914 28.4231 163.901 28.6009 163.824 28.7546C163.747 28.9082 163.613 29.0252 163.45 29.08C163.379 29.0799 163.308 29.0698 163.24 29.05V29.07ZM178 24.79C177.889 24.7903 177.781 24.7619 177.684 24.7075C177.588 24.6532 177.507 24.5748 177.45 24.48C177.089 23.9034 176.656 23.3758 176.16 22.91C176.043 22.7856 175.977 22.6211 175.977 22.45C175.977 22.2789 176.043 22.1144 176.16 21.99C176.22 21.9295 176.292 21.8816 176.371 21.8488C176.45 21.8161 176.535 21.7992 176.62 21.7992C176.705 21.7992 176.79 21.8161 176.869 21.8488C176.948 21.8816 177.02 21.9295 177.08 21.99C177.656 22.5308 178.157 23.1463 178.57 23.82C178.659 23.9661 178.687 24.1415 178.648 24.3082C178.609 24.4748 178.505 24.6192 178.36 24.71C178.251 24.7732 178.125 24.8011 178 24.79ZM164.86 22.88C164.707 22.8786 164.559 22.8258 164.44 22.73C164.31 22.6193 164.228 22.4618 164.213 22.2914C164.198 22.1211 164.251 21.9517 164.36 21.82C164.859 21.2064 165.433 20.6587 166.07 20.19C166.203 20.1357 166.349 20.1266 166.487 20.1643C166.626 20.2019 166.747 20.2841 166.834 20.3981C166.921 20.5121 166.967 20.6516 166.967 20.7947C166.966 20.9379 166.918 21.0769 166.83 21.19C166.283 21.5962 165.789 22.0699 165.36 22.6C165.302 22.682 165.225 22.7498 165.137 22.7982C165.049 22.8467 164.951 22.8747 164.85 22.88H164.86ZM172.86 20.7C172.784 20.7143 172.706 20.7143 172.63 20.7C171.989 20.4473 171.316 20.2857 170.63 20.22C170.545 20.2125 170.461 20.1881 170.385 20.1483C170.309 20.1084 170.242 20.0539 170.187 19.9879C170.132 19.9219 170.091 19.8457 170.066 19.7637C170.04 19.6816 170.032 19.5954 170.04 19.51C170.06 19.3402 170.145 19.1848 170.278 19.0766C170.41 18.9684 170.58 18.9159 170.75 18.93C171.539 19.0106 172.313 19.1991 173.05 19.49C173.21 19.5527 173.34 19.6757 173.411 19.8326C173.482 19.9896 173.489 20.1681 173.43 20.33C173.374 20.4452 173.285 20.5416 173.175 20.6073C173.065 20.673 172.938 20.7052 172.81 20.7H172.86Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M196.393 38.162C197.964 37.6365 198.909 36.2255 198.502 35.0103C198.096 33.7952 196.493 33.2361 194.922 33.7615C193.35 34.287 192.406 35.698 192.812 36.9132C193.219 38.1283 194.822 38.6874 196.393 38.162Z"
-      fill="#C3CBD9"
-    />
-    <path
-      opacity="0.46"
-      d="M188.66 29.42C188.4 31.07 192.91 33.57 192.91 33.57L193.91 33.05C193.91 33.05 194.59 27.95 193.12 27.17C192.03 26.59 190.44 27.43 190.44 27.43C190.44 27.43 188.85 28.2 188.66 29.42Z"
-      fill="url(#paint0_linear)"
-    />
-    <path
-      opacity="0.46"
-      d="M192.18 27.15C191.18 28.52 194.18 32.74 194.18 32.74H195.33C195.33 32.74 198.18 28.45 197.2 27.11C196.47 26.11 194.67 26.17 194.67 26.17C194.21 26.1559 193.752 26.2354 193.324 26.4039C192.896 26.5724 192.507 26.8262 192.18 27.15Z"
-      fill="url(#paint1_linear)"
-    />
-    <path
-      opacity="0.46"
-      d="M202.51 42.14C202.77 40.5 198.27 38 198.27 38L197.27 38.52C197.27 38.52 196.58 43.62 198.05 44.4C198.491 44.5411 198.957 44.5899 199.418 44.5435C199.879 44.4971 200.326 44.3563 200.73 44.13C200.73 44.13 202.32 43.37 202.51 42.14Z"
-      fill="url(#paint2_linear)"
-    />
-    <path
-      opacity="0.46"
-      d="M199 44.42C199.95 43.05 197 38.83 197 38.83H195.84C195.84 38.83 193 43.14 194 44.48C194.334 44.7995 194.73 45.0469 195.163 45.2069C195.597 45.3669 196.059 45.436 196.52 45.41C196.52 45.41 198.29 45.43 199 44.42Z"
-      fill="url(#paint3_linear)"
-    />
-    <path
-      d="M112.27 90.65C109.79 88.6 107.09 86.86 104.51 84.95C102.27 83.29 99.33 80.19 96.51 79.63C96.4258 79.6102 96.3376 79.6151 96.256 79.6441C96.1745 79.6731 96.1031 79.7251 96.0503 79.7937C95.9975 79.8623 95.9656 79.9446 95.9585 80.0309C95.9513 80.1172 95.9692 80.2036 96.01 80.28C97.47 82.63 101.15 84.22 103.4 85.65C106.25 87.46 108.96 89.49 111.9 91.16C112.21 91.33 112.58 90.89 112.29 90.65H112.27Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M111.6 96.36C106.76 92.77 102.09 88.23 96.6 85.65C96.16 85.44 95.68 85.97 96.06 86.35C100.39 90.64 106.29 93.48 111.34 96.79C111.62 96.97 111.85 96.55 111.6 96.36Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M112 103.45C109.49 101.45 107 99.45 104.41 97.45C102.11 95.68 99.33 92.71 96.48 91.91C96.3995 91.8907 96.3151 91.895 96.237 91.9225C96.1589 91.95 96.0903 91.9994 96.0397 92.0649C95.989 92.1304 95.9583 92.2091 95.9512 92.2916C95.9442 92.3741 95.9611 92.4569 96 92.53C97.59 94.89 101 96.53 103.34 98.08C106.13 100 108.97 101.85 111.81 103.7C111.95 103.79 112.13 103.57 112 103.46V103.45Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M111.7 109.45C109.12 107.15 106.44 104.99 103.7 102.82C101.78 101.29 98.9 98.03 96.34 97.82C96.2838 97.8193 96.2283 97.8319 96.1778 97.8565C96.1273 97.8812 96.0833 97.9173 96.0493 97.962C96.0153 98.0067 95.9922 98.0587 95.9819 98.114C95.9716 98.1692 95.9744 98.226 95.99 98.28C96.99 100.66 100.9 102.53 102.89 103.91C105.73 105.91 108.57 107.86 111.51 109.68C111.63 109.75 111.76 109.58 111.66 109.49L111.7 109.45Z"
-      fill="#C3CBD9"
-    />
-    <defs>
-      <linearGradient
-        id="paint0_linear"
-        x1="193.259"
-        y1="33.4596"
-        x2="190.308"
-        y2="27.5787"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#EBEBEB" />
-        <stop offset="1" stop-color="#C0C8D6" />
-      </linearGradient>
-      <linearGradient
-        id="paint1_linear"
-        x1="8037.85"
-        y1="10661.7"
-        x2="8037.41"
-        y2="10626"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#EBEBEB" />
-        <stop offset="1" stop-color="#C0C8D6" />
-      </linearGradient>
-      <linearGradient
-        id="paint2_linear"
-        x1="3252.3"
-        y1="-2111.48"
-        x2="3268.28"
-        y2="-2079.65"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#EBEBEB" />
-        <stop offset="1" stop-color="#C0C8D6" />
-      </linearGradient>
-      <linearGradient
-        id="paint3_linear"
-        x1="6824.43"
-        y1="-2667.92"
-        x2="6824.87"
-        y2="-2632.38"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#EBEBEB" />
-        <stop offset="1" stop-color="#C0C8D6" />
-      </linearGradient>
-    </defs>
-  </svg>
-);
-
-export const ErrorIcon = () => (
-  <svg
-    width="320"
-    height="160"
-    viewBox="0 0 320 160"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path d="M209.96 64.84H122.33V132.75H209.96V64.84Z" fill="#E6EBF2" />
-    <path d="M181.14 91.16H150.44V106.69H181.14V91.16Z" fill="white" />
-    <path d="M175.15 96.29H156.47V101.99H175.15V96.29Z" fill="#DAE3ED" />
-    <path d="M90.98 102.07L122.33 124.62V91.55L90.98 69.01V102.07Z" fill="#E6EBF2" />
-    <path
-      d="M90.9999 48.22C90.1799 69.52 90.2499 90.87 90.4499 112.22C90.4525 112.443 90.5415 112.656 90.6982 112.815C90.8549 112.973 91.0671 113.065 91.2899 113.07C94.8699 113.07 98.4299 112.93 102 112.84C102.164 112.84 102.322 112.775 102.438 112.658C102.555 112.542 102.62 112.384 102.62 112.22C102.62 112.056 102.555 111.898 102.438 111.782C102.322 111.665 102.164 111.6 102 111.6C99.1699 111.53 94.8299 110.54 92.1799 111.39C90.9799 111.77 92.1799 112.58 92.1799 111.72C92.1799 110.86 92.1799 110.22 92.1799 109.47C92.2499 102.37 92.1799 95.27 92.1799 88.16C92.1799 74.86 92.0799 61.55 91.5699 48.26C91.5572 48.1911 91.5207 48.1288 91.4668 48.0839C91.4129 48.0391 91.345 48.0145 91.2749 48.0145C91.2048 48.0145 91.137 48.0391 91.0831 48.0839C91.0292 48.1288 90.9927 48.1911 90.9799 48.26L90.9999 48.22Z"
-      fill="#E6EBF2"
-    />
-    <path
-      d="M122.22 65.78C121.77 88.12 121.66 110.46 121.54 132.78C121.543 133.013 121.636 133.235 121.801 133.399C121.965 133.564 122.187 133.657 122.42 133.66C147.89 133.78 173.36 133.87 198.83 133.59C202.55 133.54 206.28 133.46 210 133.46C210.164 133.46 210.322 133.395 210.438 133.278C210.555 133.162 210.62 133.004 210.62 132.84C210.62 132.676 210.555 132.518 210.438 132.402C210.322 132.285 210.164 132.22 210 132.22C187.51 132.22 165 131.89 142.52 131.89H127.34C126.34 131.89 124.34 131.49 123.34 131.89C121.97 132.46 123.27 132.36 123.34 132.29C124.34 129.29 123.34 124.1 123.34 120.96C123.34 113.89 123.34 106.82 123.28 99.76C123.22 88.4267 123.083 77.0933 122.87 65.76C122.87 65.6831 122.839 65.6093 122.785 65.5549C122.731 65.5006 122.657 65.47 122.58 65.47C122.503 65.47 122.429 65.5006 122.375 65.5549C122.321 65.6093 122.29 65.6831 122.29 65.76L122.22 65.78Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M161.67 47.11C138.52 46.47 115.39 47.02 92.24 47.11C92.1154 47.11 91.9958 47.1595 91.9077 47.2477C91.8195 47.3358 91.77 47.4553 91.77 47.58C91.77 47.7046 91.8195 47.8242 91.9077 47.9123C91.9958 48.0005 92.1154 48.05 92.24 48.05C115.39 47.97 138.53 48.36 161.67 47.57C161.728 47.57 161.784 47.5468 161.826 47.5056C161.867 47.4643 161.89 47.4083 161.89 47.35C161.89 47.2916 161.867 47.2357 161.826 47.1944C161.784 47.1532 161.728 47.13 161.67 47.13V47.11Z"
-      fill="#E6EBF2"
-    />
-    <path
-      d="M92.08 102.73C101.74 110.73 112.14 117.6 122.25 124.93C122.77 125.3 123.25 124.44 122.75 124.07C112.67 116.76 102.89 109.07 92.36 102.36C92.14 102.22 91.87 102.55 92.08 102.73Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M176.45 48.61C175.72 53.4851 175.569 58.4294 176 63.34C176.016 63.4516 176.072 63.5536 176.158 63.6273C176.243 63.7011 176.352 63.7416 176.465 63.7416C176.578 63.7416 176.687 63.7011 176.772 63.6273C176.858 63.5536 176.914 63.4516 176.93 63.34C177.475 58.4433 177.445 53.4996 176.84 48.61C176.84 48.4 176.45 48.4 176.41 48.61H176.45Z"
-      fill="#E6EBF2"
-    />
-    <path
-      d="M149.59 92.76C149.36 97.43 149.25 102.1 149.2 106.76C149.205 106.92 149.271 107.072 149.384 107.186C149.497 107.299 149.65 107.365 149.81 107.37C159.81 107.47 169.73 107.23 179.68 107.23C179.792 107.214 179.894 107.158 179.967 107.072C180.041 106.987 180.082 106.878 180.082 106.765C180.082 106.652 180.041 106.543 179.967 106.458C179.894 106.372 179.792 106.316 179.68 106.3C171.47 106.3 163.26 106.04 155.05 106.1C153.53 106.1 151.99 106.21 150.48 106.1C149.57 106.1 150.15 106.1 150.42 106.63C150.316 106.048 150.316 105.452 150.42 104.87C150.72 100.87 150.25 96.69 150.05 92.69C150.05 92.6317 150.027 92.5757 149.986 92.5344C149.944 92.4932 149.888 92.47 149.83 92.47C149.772 92.47 149.716 92.4932 149.674 92.5344C149.633 92.5757 149.61 92.6317 149.61 92.69L149.59 92.76Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M175.45 101.6C175.61 99.82 175.76 98.05 175.79 96.27C175.79 96.1205 175.731 95.9771 175.627 95.8704C175.522 95.7638 175.379 95.7026 175.23 95.7C169.23 95.58 163.16 95.45 157.14 95.8C157.028 95.8164 156.926 95.8724 156.853 95.9578C156.779 96.0432 156.738 96.1522 156.738 96.265C156.738 96.3778 156.779 96.4868 156.853 96.5722C156.926 96.6576 157.028 96.7136 157.14 96.73C161.42 96.98 165.71 96.98 170 96.93C171.53 96.93 173.63 96.48 175.14 96.83C174.49 96.68 174.78 96.04 174.69 96.83C174.672 97.4045 174.698 97.9796 174.77 98.55C174.83 99.55 174.92 100.55 175.01 101.55C175.01 101.608 175.033 101.664 175.074 101.706C175.116 101.747 175.172 101.77 175.23 101.77C175.288 101.77 175.344 101.747 175.386 101.706C175.427 101.664 175.45 101.608 175.45 101.55V101.6Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M187.16 38.83C187.001 38.8332 186.847 38.7763 186.728 38.6706C186.609 38.5649 186.535 38.4182 186.52 38.26C186.5 38.089 186.549 37.9171 186.656 37.7821C186.763 37.6471 186.919 37.5601 187.09 37.54C187.63 37.48 188.23 37.41 188.95 37.31C189.121 37.2861 189.295 37.3312 189.432 37.4353C189.57 37.5394 189.661 37.6939 189.685 37.865C189.709 38.0361 189.664 38.2096 189.56 38.3474C189.456 38.4853 189.301 38.5761 189.13 38.6L187.23 38.83H187.16ZM182.67 38.83H182.59L180.4 38.52C180.244 38.4809 180.109 38.3856 180.019 38.2525C179.93 38.1195 179.893 37.958 179.915 37.7991C179.937 37.6403 180.018 37.4953 180.14 37.3921C180.263 37.2889 180.42 37.2347 180.58 37.24C181.44 37.37 182.14 37.47 182.75 37.54C182.908 37.5671 183.05 37.6515 183.15 37.7772C183.249 37.9029 183.299 38.0609 183.289 38.2209C183.279 38.3809 183.21 38.5316 183.096 38.644C182.982 38.7564 182.83 38.8227 182.67 38.83Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M107 75.31C106.872 75.31 106.746 75.272 106.639 75.2008C106.533 75.1297 106.449 75.0285 106.4 74.91C106.109 74.2104 105.865 73.4921 105.67 72.76C105.646 72.6779 105.638 72.5918 105.648 72.5068C105.657 72.4217 105.684 72.3395 105.726 72.2649C105.768 72.1903 105.824 72.1249 105.892 72.0725C105.96 72.0202 106.037 71.9819 106.12 71.96C106.286 71.9138 106.463 71.9353 106.613 72.0197C106.763 72.104 106.873 72.2444 106.92 72.41C107.102 73.0911 107.329 73.7592 107.6 74.41C107.666 74.5691 107.667 74.7481 107.601 74.9075C107.535 75.0669 107.409 75.1937 107.25 75.26C107.17 75.2912 107.086 75.3081 107 75.31ZM105.68 68.77C105.51 68.77 105.348 68.7026 105.227 68.5825C105.107 68.4625 105.04 68.2997 105.04 68.13C105.04 67.3742 105.09 66.6191 105.19 65.87C105.192 65.7783 105.212 65.6879 105.251 65.6049C105.29 65.5218 105.346 65.4479 105.416 65.388C105.485 65.3281 105.566 65.2836 105.654 65.2574C105.742 65.2312 105.835 65.2239 105.926 65.236C106.016 65.2481 106.104 65.2792 106.182 65.3275C106.26 65.3757 106.327 65.4399 106.378 65.5158C106.43 65.5918 106.464 65.6777 106.48 65.7681C106.496 65.8584 106.493 65.9511 106.47 66.04C106.378 66.7329 106.332 67.431 106.33 68.13C106.325 68.2998 106.254 68.4612 106.133 68.5804C106.012 68.6996 105.85 68.7675 105.68 68.77ZM107.05 62.27C106.942 62.2673 106.837 62.2382 106.743 62.1853C106.649 62.1324 106.569 62.0573 106.511 61.9665C106.453 61.8757 106.418 61.7721 106.409 61.6646C106.4 61.5571 106.418 61.4491 106.46 61.35C106.778 60.6597 107.142 59.9915 107.55 59.35C107.596 59.2776 107.655 59.2149 107.726 59.1656C107.796 59.1163 107.875 59.0814 107.958 59.0628C108.042 59.0442 108.129 59.0424 108.213 59.0573C108.297 59.0723 108.378 59.1038 108.45 59.15C108.521 59.1956 108.583 59.255 108.631 59.3245C108.679 59.3941 108.713 59.4726 108.731 59.5553C108.748 59.6381 108.75 59.7236 108.734 59.8068C108.718 59.8899 108.686 59.9692 108.64 60.04C108.264 60.6325 107.93 61.2507 107.64 61.89C107.586 62.0017 107.503 62.0963 107.399 62.1634C107.295 62.2305 107.174 62.2674 107.05 62.27ZM111.05 56.96C110.955 56.9592 110.862 56.9384 110.775 56.8987C110.689 56.8591 110.612 56.8015 110.55 56.73C110.44 56.5966 110.387 56.4257 110.402 56.2537C110.417 56.0817 110.499 55.9224 110.63 55.81C111.217 55.3209 111.835 54.87 112.48 54.46C112.626 54.3782 112.797 54.3555 112.959 54.3967C113.121 54.4379 113.26 54.5397 113.349 54.6812C113.438 54.8226 113.469 54.9928 113.435 55.1564C113.402 55.3201 113.307 55.4646 113.17 55.56C112.575 55.9333 112.007 56.3477 111.47 56.8C111.364 56.9172 111.217 56.9889 111.06 57L111.05 56.96ZM144.05 54.71H143.56C143.388 54.71 143.222 54.6415 143.1 54.5196C142.979 54.3977 142.91 54.2324 142.91 54.06C142.91 53.8876 142.979 53.7223 143.1 53.6004C143.222 53.4785 143.388 53.41 143.56 53.41H144H145.7C145.785 53.4059 145.87 53.4192 145.95 53.4491C146.03 53.4789 146.103 53.5247 146.165 53.5836C146.227 53.6425 146.276 53.7133 146.309 53.7918C146.343 53.8702 146.36 53.9547 146.36 54.04C146.363 54.2107 146.298 54.3756 146.18 54.4991C146.062 54.6226 145.901 54.6948 145.73 54.7C145.2 54.71 144.62 54.71 144 54.71H144.05ZM139.05 54.55H139C138.28 54.55 137.54 54.45 136.79 54.38C136.706 54.3725 136.624 54.3484 136.549 54.309C136.474 54.2697 136.408 54.2159 136.354 54.1509C136.3 54.0858 136.26 54.0107 136.235 53.9298C136.21 53.849 136.202 53.7641 136.21 53.68C136.225 53.5092 136.307 53.3514 136.439 53.2409C136.57 53.1303 136.739 53.0761 136.91 53.09C137.65 53.16 138.37 53.21 139.09 53.26C139.259 53.2728 139.416 53.3511 139.528 53.4781C139.64 53.6051 139.698 53.7708 139.69 53.94C139.682 54.1045 139.612 54.2597 139.492 54.3733C139.373 54.4869 139.215 54.5502 139.05 54.55ZM150.25 54.43C150.088 54.4285 149.933 54.3675 149.813 54.2587C149.693 54.15 149.617 54.0009 149.6 53.84C149.586 53.6691 149.64 53.4996 149.751 53.3685C149.861 53.2374 150.019 53.1553 150.19 53.14C150.93 53.0667 151.65 52.9867 152.35 52.9C152.434 52.8873 152.52 52.8915 152.603 52.9124C152.685 52.9333 152.763 52.9705 152.831 53.0217C152.899 53.0729 152.956 53.1372 152.998 53.2107C153.041 53.2843 153.069 53.3656 153.08 53.45C153.091 53.5347 153.086 53.6208 153.064 53.7034C153.042 53.7859 153.003 53.8633 152.951 53.9311C152.899 53.9989 152.835 54.0558 152.761 54.0985C152.686 54.1412 152.605 54.1689 152.52 54.18C151.8 54.28 151.06 54.36 150.31 54.43H150.25ZM132.37 53.88H132.29L130.09 53.56C129.922 53.5305 129.771 53.4369 129.671 53.2989C129.57 53.1609 129.527 52.9893 129.55 52.82C129.562 52.7355 129.591 52.6543 129.635 52.5812C129.679 52.508 129.737 52.4444 129.806 52.3941C129.875 52.3438 129.954 52.3078 130.037 52.2882C130.12 52.2686 130.206 52.2658 130.29 52.28C131.02 52.39 131.75 52.5 132.46 52.59C132.629 52.6148 132.782 52.7053 132.885 52.842C132.988 52.9787 133.033 53.1504 133.01 53.32C132.99 53.4755 132.914 53.6184 132.797 53.7217C132.679 53.8249 132.527 53.8812 132.37 53.88ZM116.92 53.8C116.781 53.7997 116.646 53.7548 116.534 53.672C116.423 53.5892 116.341 53.4729 116.3 53.34C116.253 53.1756 116.271 52.9992 116.351 52.8481C116.432 52.697 116.567 52.583 116.73 52.53C117.453 52.3091 118.188 52.1256 118.93 51.98C119.014 51.9641 119.1 51.9649 119.184 51.9825C119.268 52 119.347 52.0339 119.418 52.0822C119.489 52.1305 119.549 52.1923 119.596 52.264C119.642 52.3357 119.674 52.4159 119.69 52.5C119.707 52.5829 119.708 52.6684 119.691 52.7514C119.675 52.8345 119.642 52.9133 119.594 52.9833C119.547 53.0533 119.486 53.113 119.414 53.1589C119.343 53.2047 119.263 53.2357 119.18 53.25C118.481 53.3855 117.79 53.5591 117.11 53.77C117.049 53.7897 116.985 53.7998 116.92 53.8ZM156.92 53.4C156.774 53.4013 156.631 53.3523 156.517 53.2613C156.402 53.1703 156.322 53.0428 156.29 52.9C156.271 52.8166 156.268 52.7302 156.282 52.6458C156.297 52.5614 156.327 52.4807 156.373 52.4082C156.419 52.3357 156.478 52.273 156.548 52.2235C156.618 52.1741 156.697 52.1389 156.78 52.12C157.5 51.96 158.2 51.78 158.88 51.59C158.963 51.5673 159.049 51.5613 159.134 51.5721C159.219 51.583 159.301 51.6106 159.376 51.6534C159.45 51.6962 159.515 51.7532 159.568 51.8213C159.62 51.8894 159.658 51.9671 159.68 52.05C159.703 52.1314 159.709 52.2165 159.699 52.3004C159.688 52.3843 159.662 52.4653 159.62 52.5388C159.578 52.6122 159.522 52.6767 159.455 52.7284C159.388 52.7801 159.312 52.818 159.23 52.84C158.53 53.04 157.8 53.22 157.06 53.39L156.92 53.4ZM125.73 53C125.01 53 124.29 52.92 123.58 52.92C123.408 52.92 123.242 52.8515 123.12 52.7296C122.999 52.6077 122.93 52.4424 122.93 52.27C122.933 52.0984 123.002 51.9346 123.123 51.8132C123.245 51.6919 123.408 51.6226 123.58 51.62C124.32 51.62 125.08 51.62 125.83 51.71C126.002 51.71 126.168 51.7785 126.29 51.9004C126.412 52.0223 126.48 52.1876 126.48 52.36C126.48 52.5324 126.412 52.6977 126.29 52.8196C126.168 52.9415 126.002 53.01 125.83 53.01L125.73 53ZM163.27 51.47C163.141 51.4692 163.014 51.4297 162.907 51.3567C162.8 51.2836 162.718 51.1803 162.67 51.06C162.637 50.9819 162.621 50.8981 162.621 50.8135C162.62 50.7289 162.637 50.6451 162.67 50.567C162.702 50.4888 162.75 50.4179 162.81 50.3584C162.87 50.2988 162.942 50.2518 163.02 50.22C163.7 49.94 164.36 49.64 165.02 49.33C165.097 49.2812 165.184 49.2492 165.274 49.236C165.364 49.2228 165.456 49.2288 165.544 49.2536C165.632 49.2784 165.714 49.3214 165.784 49.3797C165.854 49.4381 165.911 49.5107 165.951 49.5925C165.991 49.6744 166.014 49.7639 166.017 49.8551C166.021 49.9463 166.005 50.0371 165.971 50.1218C165.937 50.2065 165.885 50.283 165.82 50.3464C165.754 50.4099 165.676 50.4588 165.59 50.49C164.94 50.82 164.25 51.13 163.54 51.42C163.451 51.4378 163.359 51.4378 163.27 51.42V51.47ZM169.14 48.26C169.037 48.2581 168.936 48.2328 168.844 48.186C168.752 48.1392 168.672 48.0722 168.61 47.99C168.56 47.9205 168.524 47.8418 168.504 47.7583C168.485 47.6749 168.482 47.5884 168.496 47.5038C168.51 47.4192 168.54 47.3382 168.586 47.2655C168.631 47.1928 168.69 47.1297 168.76 47.08C169.34 46.6663 169.897 46.2223 170.43 45.75C170.563 45.636 170.735 45.5793 170.91 45.5924C171.084 45.6055 171.246 45.6874 171.36 45.82C171.474 45.9526 171.531 46.1251 171.518 46.2995C171.505 46.4739 171.423 46.636 171.29 46.75C170.73 47.23 170.14 47.75 169.52 48.15C169.403 48.2098 169.27 48.2308 169.14 48.21V48.26ZM173.88 43.56C173.747 43.56 173.618 43.518 173.51 43.44C173.44 43.392 173.38 43.3304 173.334 43.2589C173.287 43.1874 173.256 43.1074 173.241 43.0236C173.226 42.9398 173.228 42.8539 173.247 42.7708C173.266 42.6878 173.301 42.6093 173.35 42.54C173.603 42.18 173.833 41.82 174.04 41.46C174.19 41.22 174.33 40.97 174.48 40.72C174.522 40.6465 174.578 40.5819 174.645 40.5301C174.712 40.4782 174.789 40.44 174.87 40.4177C174.952 40.3955 175.037 40.3895 175.121 40.4002C175.205 40.4108 175.286 40.438 175.36 40.48C175.434 40.522 175.498 40.5781 175.55 40.6451C175.602 40.712 175.64 40.7886 175.662 40.8703C175.685 40.952 175.691 41.0373 175.68 41.1213C175.669 41.2054 175.642 41.2865 175.6 41.36C175.46 41.62 175.31 41.87 175.16 42.12C175.01 42.37 174.68 42.9 174.41 43.28C174.345 43.356 174.263 43.4162 174.172 43.4561C174.08 43.4959 173.98 43.5144 173.88 43.51V43.56ZM177.12 37.69C177.027 37.6893 176.935 37.6688 176.85 37.63C176.772 37.5955 176.701 37.5456 176.643 37.4834C176.584 37.4211 176.538 37.3478 176.508 37.2676C176.479 37.1874 176.465 37.1021 176.469 37.0166C176.473 36.9311 176.493 36.8473 176.53 36.77C176.84 36.09 177.12 35.42 177.36 34.77C177.423 34.6096 177.546 34.48 177.703 34.409C177.86 34.338 178.038 34.3312 178.2 34.39C178.36 34.4525 178.489 34.5761 178.559 34.7335C178.628 34.891 178.632 35.0695 178.57 35.23C178.32 35.9 178.03 36.59 177.71 37.3C177.653 37.4057 177.567 37.4934 177.463 37.5534C177.359 37.6135 177.24 37.6434 177.12 37.64V37.69ZM173.35 37.21H173.15C172.42 36.97 171.71 36.7 171.04 36.42C170.962 36.3882 170.89 36.3412 170.83 36.2816C170.77 36.2221 170.722 36.1512 170.69 36.073C170.657 35.9949 170.64 35.9111 170.64 35.8265C170.641 35.7419 170.657 35.6581 170.69 35.58C170.756 35.4209 170.883 35.2946 171.043 35.229C171.202 35.1633 171.381 35.1637 171.54 35.23C172.18 35.5 172.85 35.75 173.54 35.97C173.689 36.0167 173.815 36.1152 173.897 36.2476C173.979 36.3799 174.011 36.5373 173.987 36.6911C173.963 36.8449 173.884 36.9849 173.765 37.0857C173.647 37.1864 173.496 37.2412 173.34 37.24L173.35 37.21ZM167.35 34.28C167.212 34.2816 167.078 34.2357 166.97 34.15C166.344 33.7016 165.759 33.1997 165.22 32.65C165.118 32.5247 165.066 32.3659 165.075 32.2045C165.083 32.0432 165.152 31.8908 165.267 31.7771C165.382 31.6635 165.535 31.5967 165.696 31.5898C165.858 31.583 166.016 31.6365 166.14 31.74C166.635 32.2358 167.167 32.6938 167.73 33.11C167.799 33.1596 167.857 33.2223 167.901 33.2945C167.946 33.3667 167.975 33.447 167.988 33.5307C168.001 33.6145 167.997 33.6999 167.977 33.7822C167.957 33.8645 167.92 33.9419 167.87 34.01C167.807 34.0852 167.727 34.1444 167.637 34.1826C167.546 34.2209 167.448 34.2371 167.35 34.23V34.28ZM179.12 31.28H179C178.916 31.269 178.834 31.2412 178.761 31.1984C178.687 31.1556 178.623 31.0985 178.572 31.0305C178.521 30.9625 178.483 30.885 178.462 30.8025C178.442 30.72 178.437 30.6342 178.45 30.55C178.528 30.0001 178.569 29.4454 178.57 28.89C178.57 28.75 178.57 28.61 178.57 28.47C178.565 28.3848 178.577 28.2994 178.605 28.2189C178.634 28.1385 178.678 28.0647 178.736 28.002C178.794 27.9394 178.864 27.8892 178.942 27.8544C179.02 27.8197 179.105 27.8012 179.19 27.8C179.276 27.7898 179.364 27.7984 179.446 27.8253C179.529 27.8521 179.604 27.8965 179.668 27.9555C179.732 28.0144 179.782 28.0865 179.815 28.1667C179.848 28.2469 179.864 28.3333 179.86 28.42C179.86 28.57 179.86 28.73 179.86 28.89C179.86 29.5056 179.817 30.1205 179.73 30.73C179.703 30.8742 179.628 31.0051 179.517 31.1013C179.407 31.1975 179.267 31.2535 179.12 31.26V31.28ZM163.24 29.07C163.105 29.0704 162.973 29.0281 162.864 28.9491C162.754 28.87 162.672 28.7583 162.63 28.63C162.409 27.9859 162.291 27.3109 162.28 26.63C162.28 26.5 162.28 26.38 162.28 26.26C162.298 26.0903 162.378 25.9334 162.506 25.8204C162.634 25.7074 162.799 25.6466 162.97 25.65C163.055 25.6551 163.139 25.677 163.216 25.7145C163.293 25.7519 163.362 25.8042 163.418 25.8683C163.475 25.9324 163.518 26.0071 163.546 26.088C163.574 26.169 163.585 26.2546 163.58 26.34C163.575 26.4366 163.575 26.5334 163.58 26.63C163.584 27.185 163.678 27.7356 163.86 28.26C163.914 28.4231 163.901 28.6009 163.824 28.7546C163.747 28.9082 163.613 29.0252 163.45 29.08C163.379 29.0799 163.308 29.0698 163.24 29.05V29.07ZM178 24.79C177.889 24.7903 177.781 24.7619 177.684 24.7075C177.588 24.6532 177.507 24.5748 177.45 24.48C177.089 23.9034 176.656 23.3758 176.16 22.91C176.043 22.7856 175.977 22.6211 175.977 22.45C175.977 22.2789 176.043 22.1144 176.16 21.99C176.22 21.9295 176.292 21.8816 176.371 21.8488C176.45 21.8161 176.535 21.7992 176.62 21.7992C176.705 21.7992 176.79 21.8161 176.869 21.8488C176.948 21.8816 177.02 21.9295 177.08 21.99C177.656 22.5308 178.157 23.1463 178.57 23.82C178.659 23.9661 178.687 24.1415 178.648 24.3082C178.609 24.4748 178.505 24.6192 178.36 24.71C178.251 24.7732 178.125 24.8011 178 24.79ZM164.86 22.88C164.707 22.8786 164.559 22.8258 164.44 22.73C164.31 22.6193 164.228 22.4618 164.213 22.2914C164.198 22.1211 164.251 21.9517 164.36 21.82C164.859 21.2064 165.433 20.6587 166.07 20.19C166.203 20.1357 166.349 20.1266 166.487 20.1643C166.626 20.2019 166.747 20.2841 166.834 20.3981C166.921 20.5121 166.967 20.6516 166.967 20.7947C166.966 20.9379 166.918 21.0769 166.83 21.19C166.283 21.5962 165.789 22.0699 165.36 22.6C165.302 22.682 165.225 22.7498 165.137 22.7982C165.049 22.8467 164.951 22.8747 164.85 22.88H164.86ZM172.86 20.7C172.784 20.7143 172.706 20.7143 172.63 20.7C171.989 20.4473 171.316 20.2857 170.63 20.22C170.545 20.2125 170.461 20.1881 170.385 20.1483C170.309 20.1084 170.242 20.0539 170.187 19.9879C170.132 19.9219 170.091 19.8457 170.066 19.7637C170.041 19.6816 170.032 19.5954 170.04 19.51C170.06 19.3402 170.145 19.1848 170.278 19.0766C170.41 18.9684 170.58 18.9159 170.75 18.93C171.539 19.0106 172.313 19.1991 173.05 19.49C173.21 19.5527 173.34 19.6757 173.411 19.8326C173.482 19.9896 173.489 20.1681 173.43 20.33C173.374 20.4452 173.285 20.5416 173.175 20.6073C173.065 20.673 172.938 20.7052 172.81 20.7H172.86Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M196.393 38.162C197.964 37.6365 198.909 36.2255 198.502 35.0103C198.096 33.7952 196.493 33.2361 194.922 33.7615C193.35 34.287 192.406 35.698 192.812 36.9132C193.219 38.1283 194.822 38.6874 196.393 38.162Z"
-      fill="#C3CBD9"
-    />
-    <path
-      opacity="0.46"
-      d="M188.66 29.42C188.4 31.07 192.91 33.57 192.91 33.57L193.91 33.05C193.91 33.05 194.59 27.95 193.12 27.17C192.03 26.59 190.44 27.43 190.44 27.43C190.44 27.43 188.85 28.2 188.66 29.42Z"
-      fill="url(#paint0_linear)"
-    />
-    <path
-      opacity="0.46"
-      d="M192.18 27.15C191.18 28.52 194.18 32.74 194.18 32.74H195.33C195.33 32.74 198.18 28.45 197.2 27.11C196.47 26.11 194.67 26.17 194.67 26.17C194.21 26.1559 193.752 26.2354 193.324 26.4039C192.896 26.5724 192.507 26.8262 192.18 27.15Z"
-      fill="url(#paint1_linear)"
-    />
-    <path
-      opacity="0.46"
-      d="M202.51 42.14C202.77 40.5 198.27 38 198.27 38L197.27 38.52C197.27 38.52 196.58 43.62 198.05 44.4C198.491 44.5411 198.957 44.5899 199.418 44.5435C199.879 44.4971 200.326 44.3563 200.73 44.13C200.73 44.13 202.32 43.37 202.51 42.14Z"
-      fill="url(#paint2_linear)"
-    />
-    <path
-      opacity="0.46"
-      d="M199 44.42C199.95 43.05 197 38.83 197 38.83H195.84C195.84 38.83 193 43.14 194 44.48C194.334 44.7995 194.73 45.0469 195.163 45.2069C195.597 45.3669 196.059 45.436 196.52 45.41C196.52 45.41 198.29 45.43 199 44.42Z"
-      fill="url(#paint3_linear)"
-    />
-    <path
-      d="M112.27 90.65C109.79 88.6 107.09 86.86 104.51 84.95C102.27 83.29 99.33 80.19 96.51 79.63C96.4257 79.6102 96.3375 79.6151 96.256 79.6441C96.1744 79.6731 96.103 79.7251 96.0502 79.7937C95.9975 79.8623 95.9656 79.9446 95.9584 80.0309C95.9513 80.1172 95.9692 80.2036 96.01 80.28C97.47 82.63 101.15 84.22 103.4 85.65C106.25 87.46 108.96 89.49 111.9 91.16C112.21 91.33 112.58 90.89 112.29 90.65H112.27Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M111.6 96.36C106.76 92.77 102.09 88.23 96.6 85.65C96.16 85.44 95.68 85.97 96.06 86.35C100.39 90.64 106.29 93.48 111.34 96.79C111.62 96.97 111.85 96.55 111.6 96.36Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M112 103.45C109.49 101.45 107 99.45 104.41 97.45C102.11 95.68 99.33 92.71 96.48 91.91C96.3995 91.8907 96.3151 91.895 96.237 91.9225C96.1589 91.95 96.0904 91.9994 96.0397 92.0649C95.989 92.1304 95.9583 92.2091 95.9513 92.2916C95.9442 92.3741 95.9612 92.4569 96 92.53C97.59 94.89 101 96.53 103.34 98.08C106.13 100 108.97 101.85 111.81 103.7C111.95 103.79 112.13 103.57 112 103.46V103.45Z"
-      fill="#C3CBD9"
-    />
-    <path
-      d="M111.7 109.45C109.12 107.15 106.44 104.99 103.7 102.82C101.78 101.29 98.9 98.03 96.34 97.82C96.2838 97.8193 96.2283 97.8319 96.1778 97.8565C96.1273 97.8812 96.0833 97.9173 96.0493 97.962C96.0153 98.0067 95.9922 98.0587 95.9819 98.114C95.9716 98.1692 95.9744 98.226 95.99 98.28C96.99 100.66 100.9 102.53 102.89 103.91C105.73 105.91 108.57 107.86 111.51 109.68C111.63 109.75 111.76 109.58 111.66 109.49L111.7 109.45Z"
-      fill="#C3CBD9"
-    />
-    <defs>
-      <linearGradient
-        id="paint0_linear"
-        x1="193.259"
-        y1="33.4596"
-        x2="190.308"
-        y2="27.5787"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#EBEBEB" />
-        <stop offset="1" stop-color="#C0C8D6" />
-      </linearGradient>
-      <linearGradient
-        id="paint1_linear"
-        x1="8037.85"
-        y1="10661.7"
-        x2="8037.41"
-        y2="10626"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#EBEBEB" />
-        <stop offset="1" stop-color="#C0C8D6" />
-      </linearGradient>
-      <linearGradient
-        id="paint2_linear"
-        x1="3252.3"
-        y1="-2111.48"
-        x2="3268.28"
-        y2="-2079.65"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#EBEBEB" />
-        <stop offset="1" stop-color="#C0C8D6" />
-      </linearGradient>
-      <linearGradient
-        id="paint3_linear"
-        x1="6824.43"
-        y1="-2667.92"
-        x2="6824.87"
-        y2="-2632.38"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop stop-color="#EBEBEB" />
-        <stop offset="1" stop-color="#C0C8D6" />
-      </linearGradient>
-    </defs>
-  </svg>
-);
diff --git a/x-pack/legacy/plugins/code/public/components/shared/resize_checker.tsx b/x-pack/legacy/plugins/code/public/components/shared/resize_checker.tsx
deleted file mode 100644
index 9693f4870c5b89..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/shared/resize_checker.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/**
- * Copied from `ui/resize_checker` because of NP migration.
- */
-
-import { EventEmitter } from 'events';
-import $ from 'jquery';
-import { isEqual } from 'lodash';
-import ResizeObserver from 'resize-observer-polyfill';
-
-function validateElArg(el: HTMLElement) {
-  // the ResizeChecker historically accepted jquery elements,
-  // so we wrap in jQuery then extract the element
-  const $el = $(el);
-
-  if ($el.length !== 1) {
-    throw new TypeError('ResizeChecker must be constructed with a single DOM element.');
-  }
-
-  return $el.get(0);
-}
-
-function getSize(el: HTMLElement): [number, number] {
-  return [el.clientWidth, el.clientHeight];
-}
-
-/**
- *  ResizeChecker receives an element and emits a "resize" event every time it changes size.
- */
-export class ResizeChecker extends EventEmitter {
-  private destroyed: boolean = false;
-  private el: HTMLElement | null;
-  private observer: ResizeObserver | null;
-  private expectedSize: [number, number] | null = null;
-
-  constructor(el: HTMLElement, args: { disabled?: boolean } = {}) {
-    super();
-
-    this.el = validateElArg(el);
-
-    this.observer = new ResizeObserver(() => {
-      if (this.expectedSize) {
-        const sameSize = isEqual(getSize(el), this.expectedSize);
-        this.expectedSize = null;
-
-        if (sameSize) {
-          // don't trigger resize notification if the size is what we expect
-          return;
-        }
-      }
-
-      this.emit('resize');
-    });
-
-    // Only enable the checker immediately if args.disabled wasn't set to true
-    if (!args.disabled) {
-      this.enable();
-    }
-  }
-
-  public enable() {
-    if (this.destroyed) {
-      // Don't allow enabling an already destroyed resize checker
-      return;
-    }
-    // the width and height of the element that we expect to see
-    // on the next resize notification. If it matches the size at
-    // the time of starting observing then it we will be ignored.
-    // We know that observer and el are not null since we are not yet destroyed.
-    this.expectedSize = getSize(this.el!);
-    this.observer!.observe(this.el!);
-  }
-
-  /**
-   *  Run a function and ignore all resizes that occur
-   *  while it's running.
-   */
-  public modifySizeWithoutTriggeringResize(block: () => void): void {
-    try {
-      block();
-    } finally {
-      if (this.el) {
-        this.expectedSize = getSize(this.el);
-      }
-    }
-  }
-
-  /**
-   * Tell the ResizeChecker to shutdown, stop listenings, and never
-   * emit another resize event.
-   *
-   * Cleans up it's listeners and timers.
-   */
-  public destroy(): void {
-    if (this.destroyed) {
-      return;
-    }
-    this.destroyed = true;
-
-    this.observer!.disconnect();
-    this.observer = null;
-    this.expectedSize = null;
-    this.el = null;
-    this.removeAllListeners();
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/shortcuts/index.tsx b/x-pack/legacy/plugins/code/public/components/shortcuts/index.tsx
deleted file mode 100644
index a56629a10c415c..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/shortcuts/index.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { Shortcut, OS, HotKey, Modifier } from './shortcut';
-export { ShortcutsProvider } from './shortcuts_provider';
diff --git a/x-pack/legacy/plugins/code/public/components/shortcuts/shortcut.tsx b/x-pack/legacy/plugins/code/public/components/shortcuts/shortcut.tsx
deleted file mode 100644
index 7e5afc8b25e47d..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/shortcuts/shortcut.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { connect } from 'react-redux';
-import { registerShortcut, unregisterShortcut } from '../../actions';
-
-export enum OS {
-  win,
-  mac,
-  linux,
-}
-
-export enum Modifier {
-  ctrl,
-  meta,
-  alt,
-  shift,
-}
-
-export interface HotKey {
-  key: string;
-  modifier: Map<OS, Modifier[]>;
-  help: string;
-  onPress?: (dispatch: any) => void;
-}
-
-interface Props {
-  keyCode: string;
-  help: string;
-  onPress?: (dispatch: any) => void;
-  winModifier?: Modifier[];
-  macModifier?: Modifier[];
-  linuxModifier?: Modifier[];
-  registerShortcut(hotKey: HotKey): void;
-  unregisterShortcut(hotKey: HotKey): void;
-}
-
-class ShortcutsComponent extends React.Component<Props> {
-  private readonly hotKey: HotKey;
-  constructor(props: Props, context: any) {
-    super(props, context);
-    this.hotKey = {
-      key: props.keyCode,
-      help: props.help,
-      onPress: props.onPress,
-      modifier: new Map(),
-    };
-    if (props.winModifier) {
-      this.hotKey.modifier.set(OS.win, props.winModifier);
-    }
-    if (props.macModifier) {
-      this.hotKey.modifier.set(OS.mac, props.macModifier);
-    }
-    if (props.linuxModifier) {
-      this.hotKey.modifier.set(OS.linux, props.linuxModifier);
-    }
-  }
-
-  public componentDidMount(): void {
-    this.props.registerShortcut(this.hotKey);
-  }
-
-  public componentWillUnmount(): void {
-    this.props.unregisterShortcut(this.hotKey);
-  }
-
-  public render(): React.ReactNode {
-    return null;
-  }
-}
-
-const mapDispatchToProps = {
-  registerShortcut,
-  unregisterShortcut,
-};
-
-export const Shortcut = connect(
-  null,
-  mapDispatchToProps
-)(ShortcutsComponent);
diff --git a/x-pack/legacy/plugins/code/public/components/shortcuts/shortcuts_provider.tsx b/x-pack/legacy/plugins/code/public/components/shortcuts/shortcuts_provider.tsx
deleted file mode 100644
index 229e0a50dda350..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/shortcuts/shortcuts_provider.tsx
+++ /dev/null
@@ -1,203 +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,
-  EuiModal,
-  EuiModalBody,
-  EuiModalFooter,
-  EuiModalHeader,
-  EuiModalHeaderTitle,
-  EuiOverlayMask,
-} from '@elastic/eui';
-import React from 'react';
-import { connect } from 'react-redux';
-import { toggleHelp } from '../../actions';
-import { RootState } from '../../reducers';
-import { HotKey, Modifier, OS } from './shortcut';
-
-interface Props {
-  showHelp: boolean;
-  shortcuts: HotKey[];
-  dispatch(action: any): void;
-}
-
-class ShortcutsComponent extends React.Component<Props> {
-  private readonly os: OS;
-
-  constructor(props: Props) {
-    super(props);
-
-    if (navigator.appVersion.indexOf('Win') !== -1) {
-      this.os = OS.win;
-    } else if (navigator.appVersion.indexOf('Mac') !== -1) {
-      this.os = OS.mac;
-    } else {
-      this.os = OS.linux;
-    }
-  }
-
-  public componentDidMount(): void {
-    document.addEventListener('keydown', this.handleKeydown);
-    document.addEventListener('keypress', this.handleKeyPress);
-  }
-
-  public componentWillUnmount(): void {
-    document.removeEventListener('keydown', this.handleKeydown);
-    document.removeEventListener('keypress', this.handleKeyPress);
-  }
-
-  public render(): React.ReactNode {
-    return (
-      <React.Fragment>
-        {this.props.showHelp && (
-          <EuiOverlayMask>
-            <EuiModal onClose={this.closeModal}>
-              <EuiModalHeader>
-                <EuiModalHeaderTitle>Keyboard Shortcuts</EuiModalHeaderTitle>
-              </EuiModalHeader>
-
-              <EuiModalBody>{this.renderShortcuts()}</EuiModalBody>
-              <EuiModalFooter>
-                <EuiButton onClick={this.closeModal} fill>
-                  Close
-                </EuiButton>
-              </EuiModalFooter>
-            </EuiModal>
-          </EuiOverlayMask>
-        )}
-      </React.Fragment>
-    );
-  }
-
-  private handleKeydown = (event: KeyboardEvent) => {
-    const target = event.target;
-    const key = event.key;
-    // @ts-ignore
-    if (target && target.tagName === 'INPUT') {
-      if (key === 'Escape') {
-        // @ts-ignore
-        target.blur();
-      }
-    }
-  };
-
-  private handleKeyPress = (event: KeyboardEvent) => {
-    const target = event.target;
-    const key = event.key;
-    // @ts-ignore
-    if (target && target.tagName === 'INPUT') {
-      return;
-    }
-
-    const isPressed = (s: HotKey) => {
-      if (s.modifier) {
-        const mods = s.modifier.get(this.os) || [];
-        for (const mod of mods) {
-          switch (mod) {
-            case Modifier.alt:
-              if (!event.altKey) {
-                return false;
-              }
-              break;
-            case Modifier.ctrl:
-              if (!event.ctrlKey) {
-                return false;
-              }
-              break;
-            case Modifier.meta:
-              if (!event.metaKey) {
-                return false;
-              }
-              break;
-            case Modifier.shift:
-              if (!event.shiftKey) {
-                return false;
-              }
-              break;
-          }
-        }
-      }
-      return key === s.key;
-    };
-
-    let isTriggered = false;
-    for (const shortcut of this.props.shortcuts) {
-      if (isPressed(shortcut) && shortcut.onPress) {
-        shortcut.onPress(this.props.dispatch);
-        isTriggered = true;
-      }
-    }
-    if (isTriggered) {
-      // Discard this input since it's been triggered already.
-      event.preventDefault();
-    }
-  };
-
-  private closeModal = () => {
-    this.props.dispatch(toggleHelp(false));
-  };
-
-  private showModifier(mod: Modifier): string {
-    switch (mod) {
-      case Modifier.meta:
-        if (this.os === OS.mac) {
-          return '⌘';
-        } else if (this.os === OS.win) {
-          return '⊞ Win';
-        } else {
-          return 'meta';
-        }
-
-      case Modifier.shift:
-        if (this.os === OS.mac) {
-          return '⇧';
-        } else {
-          return 'shift';
-        }
-      case Modifier.ctrl:
-        if (this.os === OS.mac) {
-          return '⌃';
-        } else {
-          return 'ctrl';
-        }
-      case Modifier.alt:
-        if (this.os === OS.mac) {
-          return '⌥';
-        } else {
-          return 'alt';
-        }
-    }
-  }
-
-  private renderShortcuts() {
-    return this.props.shortcuts.map((s, idx) => {
-      return (
-        <div key={'shortcuts_' + idx}>
-          {this.renderModifier(s)}
-          <span className="codeShortcuts__key">{s.key}</span>
-          <span className="codeShortcuts__helpText">{s.help}</span>
-        </div>
-      );
-    });
-  }
-
-  private renderModifier(hotKey: HotKey) {
-    if (hotKey.modifier) {
-      const modifiers = hotKey.modifier.get(this.os) || [];
-      return modifiers.map(m => <div className="codeShortcuts__key">{this.showModifier(m)}</div>);
-    } else {
-      return null;
-    }
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  shortcuts: state.shortcuts.shortcuts,
-  showHelp: state.shortcuts.showHelp,
-});
-
-export const ShortcutsProvider = connect(mapStateToProps)(ShortcutsComponent);
diff --git a/x-pack/legacy/plugins/code/public/components/status_indicator/alert.svg b/x-pack/legacy/plugins/code/public/components/status_indicator/alert.svg
deleted file mode 100644
index d84e1220a39dc0..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/status_indicator/alert.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="13" viewBox="0 0 16 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.58956 9.05857L7.34995 4.18143H8.64995L8.40014 9.05857H7.58956ZM7.98423 10.96C7.80995 10.96 7.66066 10.8979 7.53638 10.7736C7.41209 10.6493 7.34995 10.5014 7.34995 10.33C7.34995 10.1557 7.41209 10.0071 7.53638 9.88429C7.66066 9.76143 7.80995 9.7 7.98423 9.7C8.15281 9.7 8.29923 9.76071 8.42352 9.88214C8.54781 10.0036 8.60995 10.1529 8.60995 10.33C8.60995 10.5043 8.54709 10.6529 8.42138 10.7757C8.29566 10.8986 8.14995 10.96 7.98423 10.96ZM1.99995 13C1.24089 13 0.758575 12.1875 1.12205 11.5211L7.12205 0.521148C7.50107 -0.173716 8.49883 -0.173716 8.87784 0.521148L14.8778 11.5211C15.2413 12.1875 14.759 13 13.9999 13H1.99995ZM1.99995 12H13.9999L7.99995 1L1.99995 12Z" fill="#F5A700"/>
-</svg>
diff --git a/x-pack/legacy/plugins/code/public/components/status_indicator/blank.svg b/x-pack/legacy/plugins/code/public/components/status_indicator/blank.svg
deleted file mode 100644
index 3465aea3d970e8..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/status_indicator/blank.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="16" height="16" fill="#C4C4C4"/>
-</svg>
diff --git a/x-pack/legacy/plugins/code/public/components/status_indicator/error.svg b/x-pack/legacy/plugins/code/public/components/status_indicator/error.svg
deleted file mode 100644
index 3d2f47ceac51a0..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/status_indicator/error.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.74572 8L11.8456 4.90016C12.0515 4.69424 12.0515 4.36037 11.8456 4.15444C11.6396 3.94852 11.3058 3.94852 11.0998 4.15444L8 7.25428L4.90016 4.15444C4.69424 3.94852 4.36037 3.94852 4.15444 4.15444C3.94852 4.36037 3.94852 4.69424 4.15444 4.90016L7.25428 8L4.15444 11.0998C3.94852 11.3058 3.94852 11.6396 4.15444 11.8456C4.36037 12.0515 4.69424 12.0515 4.90016 11.8456L8 8.74572L11.0998 11.8456C11.3058 12.0515 11.6396 12.0515 11.8456 11.8456C12.0515 11.6396 12.0515 11.3058 11.8456 11.0998L8.74572 8ZM8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16Z" fill="#BD271E"/>
-</svg>
diff --git a/x-pack/legacy/plugins/code/public/components/status_indicator/info.svg b/x-pack/legacy/plugins/code/public/components/status_indicator/info.svg
deleted file mode 100644
index 787282c8a9e773..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/status_indicator/info.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.31121 13.8239L8.26929 9H6.59375V7.625H9.89506L9.93699 12.4489H11.475V13.8239H8.31121ZM7.96875 5.29603C7.96875 4.97768 8.06342 4.71334 8.25275 4.503C8.44208 4.29267 8.71275 4.1875 9.06475 4.1875C9.41675 4.1875 9.68875 4.29267 9.88075 4.503C10.0728 4.71334 10.1688 4.97768 10.1688 5.29603C10.1688 5.60869 10.0728 5.86877 9.88075 6.07626C9.68875 6.28375 9.41675 6.3875 9.06475 6.3875C8.71275 6.3875 8.44208 6.28375 8.25275 6.07626C8.06342 5.86877 7.96875 5.60869 7.96875 5.29603ZM9 15.875C12.797 15.875 15.875 12.797 15.875 9C15.875 5.20304 12.797 2.125 9 2.125C5.20304 2.125 2.125 5.20304 2.125 9C2.125 12.797 5.20304 15.875 9 15.875ZM9 17.25C4.44365 17.25 0.75 13.5563 0.75 9C0.75 4.44365 4.44365 0.75 9 0.75C13.5563 0.75 17.25 4.44365 17.25 9C17.25 13.5563 13.5563 17.25 9 17.25Z" fill="#006BB4"/>
-</svg>
diff --git a/x-pack/legacy/plugins/code/public/components/status_indicator/status_indicator.tsx b/x-pack/legacy/plugins/code/public/components/status_indicator/status_indicator.tsx
deleted file mode 100644
index 4c4454c2003eae..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/status_indicator/status_indicator.tsx
+++ /dev/null
@@ -1,147 +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 { EuiButtonIcon, EuiPopover, EuiText } from '@elastic/eui';
-import { connect } from 'react-redux';
-import { Link } from 'react-router-dom';
-import ErrorSvg from './error.svg';
-import InfoSvg from './info.svg';
-import AlertSvg from './alert.svg';
-import BlankSvg from './blank.svg';
-import {
-  CTA,
-  LangServerType,
-  REPO_FILE_STATUS_SEVERITY,
-  RepoFileStatus,
-  RepoFileStatusText as StatusText,
-  Severity,
-  StatusReport,
-} from '../../../common/repo_file_status';
-import { RootState } from '../../reducers';
-import { FetchFilePayload } from '../../actions';
-
-interface Props {
-  statusReport?: StatusReport;
-  currentStatusPath?: FetchFilePayload;
-  pathType: string;
-}
-
-interface State {
-  isPopoverOpen: boolean;
-}
-
-const svgs = {
-  [Severity.NOTICE]: InfoSvg,
-  [Severity.WARNING]: AlertSvg,
-  [Severity.ERROR]: ErrorSvg,
-  [Severity.NONE]: BlankSvg,
-};
-
-export class StatusIndicatorComponent extends React.Component<Props, State> {
-  constructor(props: Readonly<Props>) {
-    super(props);
-    this.state = {
-      isPopoverOpen: false,
-    };
-  }
-
-  closePopover() {
-    this.setState({
-      isPopoverOpen: false,
-    });
-  }
-  openPopover() {
-    this.setState({
-      isPopoverOpen: true,
-    });
-  }
-
-  render() {
-    const { statusReport } = this.props;
-    let severity = Severity.NONE;
-    const children: any[] = [];
-    const addError = (error: RepoFileStatus | LangServerType) => {
-      // @ts-ignore
-      const s: any = REPO_FILE_STATUS_SEVERITY[error];
-      if (s) {
-        if (s.severity > severity) {
-          severity = s.severity;
-        }
-        const fix = s.fix;
-        if (fix !== undefined) {
-          const fixUrl = this.fixUrl(fix);
-          children.push(
-            <p key={`${error}_key`}>
-              {error} You can {fixUrl}.
-            </p>
-          );
-        } else {
-          children.push(<p key={`${error}_key`}>{StatusText[error]}</p>);
-        }
-      }
-    };
-    if (statusReport) {
-      if (statusReport.repoStatus) {
-        addError(statusReport.repoStatus);
-      }
-      if (statusReport.fileStatus) {
-        addError(statusReport.fileStatus);
-      }
-      if (statusReport.langServerType === LangServerType.GENERIC) {
-        addError(statusReport.langServerType);
-      }
-      if (statusReport.langServerStatus) {
-        addError(statusReport.langServerStatus);
-      }
-    }
-    const svg = svgs[severity];
-    const icon = (
-      <EuiButtonIcon
-        aria-label="status_indicator"
-        iconType={svg}
-        onClick={this.openPopover.bind(this)}
-      />
-    );
-    if (children.length === 0) {
-      return <div />;
-    }
-
-    return (
-      <EuiPopover
-        id="trapFocus"
-        isOpen={this.state.isPopoverOpen}
-        closePopover={this.closePopover.bind(this)}
-        ownFocus
-        button={icon}
-      >
-        <EuiText size="xs">{children}</EuiText>
-      </EuiPopover>
-    );
-  }
-
-  private fixUrl(fix: CTA) {
-    switch (fix) {
-      case CTA.GOTO_LANG_MANAGE_PAGE:
-        return <Link to="/admin?tab=LanguageServers">install it here</Link>;
-      case CTA.SWITCH_TO_HEAD:
-        const { uri, path } = this.props.currentStatusPath!;
-        const headUrl = path
-          ? `/${uri}/${this.props.pathType}/HEAD/${path}`
-          : `/${uri}/${this.props.pathType}/HEAD/`;
-
-        return <Link to={headUrl}>switch to HEAD</Link>;
-    }
-  }
-}
-
-const mapStateToProps = (state: RootState) => ({
-  statusReport: state.status.repoFileStatus,
-  currentStatusPath: state.status.currentStatusPath,
-  pathType: state.route.match.params.pathType,
-});
-
-export const StatusIndicator = connect(mapStateToProps)(StatusIndicatorComponent);
diff --git a/x-pack/legacy/plugins/code/public/components/symbol_tree/__test__/__fixtures__/props.ts b/x-pack/legacy/plugins/code/public/components/symbol_tree/__test__/__fixtures__/props.ts
deleted file mode 100644
index 165957553d5dd5..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/symbol_tree/__test__/__fixtures__/props.ts
+++ /dev/null
@@ -1,119 +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 { SymbolKind } from 'vscode-languageserver-types';
-import { SymbolWithMembers } from '../../../../actions/structure';
-
-export const props: { structureTree: SymbolWithMembers[]; uri: string } = {
-  uri:
-    'git://github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts',
-  structureTree: [
-    {
-      name: '"stack-control"',
-      kind: SymbolKind.Module,
-      range: { start: { line: 0, character: 0 }, end: { line: 27, character: 0 } },
-      selectionRange: { start: { line: 0, character: 0 }, end: { line: 27, character: 0 } },
-      path: '"stack-control"',
-      members: [
-        {
-          name: 'EventEmitter',
-          kind: SymbolKind.Variable,
-          range: { start: { line: 9, character: 9 }, end: { line: 9, character: 21 } },
-          selectionRange: { start: { line: 9, character: 9 }, end: { line: 9, character: 21 } },
-          path: '"stack-control"/EventEmitter',
-        },
-        {
-          name: 'ClrStackView',
-          kind: SymbolKind.Variable,
-          range: { start: { line: 10, character: 9 }, end: { line: 10, character: 21 } },
-          selectionRange: { start: { line: 10, character: 9 }, end: { line: 10, character: 21 } },
-          path: '"stack-control"/ClrStackView',
-        },
-        {
-          name: 'StackControl',
-          kind: SymbolKind.Class,
-          range: { start: { line: 12, character: 0 }, end: { line: 26, character: 1 } },
-          selectionRange: { start: { line: 12, character: 0 }, end: { line: 26, character: 1 } },
-          path: '"stack-control"/StackControl',
-          members: [
-            {
-              name: 'model',
-              kind: SymbolKind.Property,
-              range: { start: { line: 13, character: 2 }, end: { line: 13, character: 13 } },
-              selectionRange: {
-                start: { line: 13, character: 2 },
-                end: { line: 13, character: 13 },
-              },
-              path: '"stack-control"/StackControl/model',
-            },
-            {
-              name: 'modelChange',
-              kind: SymbolKind.Property,
-              range: { start: { line: 14, character: 2 }, end: { line: 14, character: 64 } },
-              selectionRange: {
-                start: { line: 14, character: 2 },
-                end: { line: 14, character: 64 },
-              },
-              path: '"stack-control"/StackControl/modelChange',
-            },
-            {
-              name: 'stackView',
-              kind: SymbolKind.Property,
-              range: { start: { line: 16, character: 14 }, end: { line: 16, character: 47 } },
-              selectionRange: {
-                start: { line: 16, character: 14 },
-                end: { line: 16, character: 47 },
-              },
-              path: '"stack-control"/StackControl/stackView',
-            },
-            {
-              name: 'HashMap<K, V>',
-              kind: SymbolKind.Class,
-              range: { start: { line: 136, character: 13 }, end: { line: 136, character: 20 } },
-              selectionRange: {
-                start: { line: 136, character: 13 },
-                end: { line: 136, character: 20 },
-              },
-              path: 'HashMap<K, V>',
-              members: [
-                {
-                  name: 'serialVersionUID',
-                  kind: SymbolKind.Field,
-                  range: { start: { line: 139, character: 30 }, end: { line: 139, character: 46 } },
-                  selectionRange: {
-                    start: { line: 139, character: 30 },
-                    end: { line: 139, character: 46 },
-                  },
-                  path: 'HashMap<K, V>/serialVersionUID',
-                },
-              ],
-            },
-            {
-              name: 'Unit',
-              kind: SymbolKind.Variable,
-              range: { start: { line: 20, character: 0 }, end: { line: 20, character: 66 } },
-              selectionRange: {
-                start: { line: 20, character: 0 },
-                end: { line: 20, character: 66 },
-              },
-              path: 'Unit',
-            },
-            {
-              name: 'datemath',
-              kind: SymbolKind.Constant,
-              range: { start: { line: 22, character: 14 }, end: { line: 47, character: 1 } },
-              selectionRange: {
-                start: { line: 22, character: 14 },
-                end: { line: 47, character: 1 },
-              },
-              path: 'datemath',
-            },
-          ],
-        },
-      ],
-    },
-  ],
-};
diff --git a/x-pack/legacy/plugins/code/public/components/symbol_tree/__test__/__snapshots__/symbol_tree.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/symbol_tree/__test__/__snapshots__/symbol_tree.test.tsx.snap
deleted file mode 100644
index 975e1df6777d81..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/symbol_tree/__test__/__snapshots__/symbol_tree.test.tsx.snap
+++ /dev/null
@@ -1,553 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`render symbol tree correctly 1`] = `
-<div
-  className="codeContainer__sideTabTree"
->
-  <nav
-    className="euiSideNav"
-  >
-    <button
-      className="euiSideNav__mobileToggle euiLink"
-      type="button"
-    >
-      <span
-        className="euiSideNav__mobileWrap"
-      >
-        <span
-          className="euiSideNav__mobileTitle"
-        />
-        <svg
-          aria-hidden="true"
-          className="euiIcon euiIcon--medium euiIcon-isLoading euiSideNav__mobileIcon"
-          focusable="false"
-          height={16}
-          style={null}
-          viewBox="0 0 16 16"
-          width={16}
-          xmlns="http://www.w3.org/2000/svg"
-        />
-      </span>
-    </button>
-    <div
-      className="euiSideNav__content"
-      role="menubar"
-    >
-      <div
-        className="euiSideNavItem euiSideNavItem--root euiSideNavItem--hasChildItems"
-      >
-        <div
-          aria-label={
-            <span
-              className="euiSideNavItemButton__content"
-            >
-              <span
-                className="euiSideNavItemButton__label"
-              >
-                
-              </span>
-            </span>
-          }
-          className="euiSideNavItemButton"
-        >
-          <span
-            className="euiSideNavItemButton__content"
-          >
-            <span
-              className="euiSideNavItemButton__label"
-            >
-              
-            </span>
-          </span>
-        </div>
-        <div
-          className="euiSideNavItem__items"
-        >
-          <div
-            className="euiSideNavItem euiSideNavItem--trunk euiSideNavItem--hasChildItems"
-          >
-            <div
-              className="code-symbol-container"
-            >
-              <a
-                className="code-symbol-link codeFileTree__node--link"
-                data-test-subj="codeStructureTreeNode-\\"stack-control\\""
-                href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L1:0?sideTab=structure"
-                onClick={[Function]}
-              />
-              <div
-                className="codeSymbol"
-              >
-                <svg
-                  className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading codeStructureTree--icon"
-                  focusable="false"
-                  height={16}
-                  onClick={[Function]}
-                  style={null}
-                  viewBox="0 0 16 16"
-                  width={16}
-                  xmlns="http://www.w3.org/2000/svg"
-                />
-                <div
-                  className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                >
-                  <div
-                    className="euiToken euiToken--tokenTint09 euiToken--square euiToken--small"
-                  >
-                    <svg
-                      className="euiIcon euiIcon--medium euiIcon-isLoading"
-                      focusable="false"
-                      height={16}
-                      style={null}
-                      viewBox="0 0 16 16"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </div>
-                  <div
-                    className="euiText euiText--small"
-                  >
-                    "stack-control"
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              className="euiSideNavItem__items"
-            >
-              <div
-                className="euiSideNavItem euiSideNavItem--branch"
-              >
-                <div
-                  className="code-symbol-container"
-                >
-                  <a
-                    className="code-symbol-link codeFileTree__node--link"
-                    data-test-subj="codeStructureTreeNode-EventEmitter"
-                    href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L10:9?sideTab=structure"
-                    onClick={[Function]}
-                  />
-                  <div
-                    className="codeSymbol codeSymbol--nested"
-                  >
-                    <div
-                      className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                    >
-                      <div
-                        className="euiToken euiToken--tokenTint04 euiToken--circle euiToken--small"
-                      >
-                        <svg
-                          className="euiIcon euiIcon--medium euiIcon-isLoading"
-                          focusable="false"
-                          height={16}
-                          style={null}
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
-                      </div>
-                      <div
-                        className="euiText euiText--small"
-                      >
-                        EventEmitter
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="euiSideNavItem euiSideNavItem--branch"
-              >
-                <div
-                  className="code-symbol-container"
-                >
-                  <a
-                    className="code-symbol-link codeFileTree__node--link"
-                    data-test-subj="codeStructureTreeNode-ClrStackView"
-                    href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L11:9?sideTab=structure"
-                    onClick={[Function]}
-                  />
-                  <div
-                    className="codeSymbol codeSymbol--nested"
-                  >
-                    <div
-                      className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                    >
-                      <div
-                        className="euiToken euiToken--tokenTint04 euiToken--circle euiToken--small"
-                      >
-                        <svg
-                          className="euiIcon euiIcon--medium euiIcon-isLoading"
-                          focusable="false"
-                          height={16}
-                          style={null}
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
-                      </div>
-                      <div
-                        className="euiText euiText--small"
-                      >
-                        ClrStackView
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="euiSideNavItem euiSideNavItem--branch euiSideNavItem--hasChildItems"
-              >
-                <div
-                  className="code-symbol-container"
-                >
-                  <a
-                    className="code-symbol-link codeFileTree__node--link"
-                    data-test-subj="codeStructureTreeNode-StackControl"
-                    href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L13:0?sideTab=structure"
-                    onClick={[Function]}
-                  />
-                  <div
-                    className="codeSymbol"
-                  >
-                    <svg
-                      className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading codeStructureTree--icon"
-                      focusable="false"
-                      height={16}
-                      onClick={[Function]}
-                      style={null}
-                      viewBox="0 0 16 16"
-                      width={16}
-                      xmlns="http://www.w3.org/2000/svg"
-                    />
-                    <div
-                      className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                    >
-                      <div
-                        className="euiToken euiToken--tokenTint01 euiToken--circle euiToken--small"
-                      >
-                        <svg
-                          className="euiIcon euiIcon--medium euiIcon-isLoading"
-                          focusable="false"
-                          height={16}
-                          style={null}
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
-                      </div>
-                      <div
-                        className="euiText euiText--small"
-                      >
-                        StackControl
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  className="euiSideNavItem__items"
-                >
-                  <div
-                    className="euiSideNavItem euiSideNavItem--branch"
-                  >
-                    <div
-                      className="code-symbol-container"
-                    >
-                      <a
-                        className="code-symbol-link codeFileTree__node--link"
-                        data-test-subj="codeStructureTreeNode-model"
-                        href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L14:2?sideTab=structure"
-                        onClick={[Function]}
-                      />
-                      <div
-                        className="codeSymbol codeSymbol--nested"
-                      >
-                        <div
-                          className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                        >
-                          <div
-                            className="euiToken euiToken--tokenTint02 euiToken--circle euiToken--small"
-                          >
-                            <svg
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              height={16}
-                              style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </div>
-                          <div
-                            className="euiText euiText--small"
-                          >
-                            model
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    className="euiSideNavItem euiSideNavItem--branch"
-                  >
-                    <div
-                      className="code-symbol-container"
-                    >
-                      <a
-                        className="code-symbol-link codeFileTree__node--link"
-                        data-test-subj="codeStructureTreeNode-modelChange"
-                        href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L15:2?sideTab=structure"
-                        onClick={[Function]}
-                      />
-                      <div
-                        className="codeSymbol codeSymbol--nested"
-                      >
-                        <div
-                          className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                        >
-                          <div
-                            className="euiToken euiToken--tokenTint02 euiToken--circle euiToken--small"
-                          >
-                            <svg
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              height={16}
-                              style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </div>
-                          <div
-                            className="euiText euiText--small"
-                          >
-                            modelChange
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    className="euiSideNavItem euiSideNavItem--branch"
-                  >
-                    <div
-                      className="code-symbol-container"
-                    >
-                      <a
-                        className="code-symbol-link codeFileTree__node--link"
-                        data-test-subj="codeStructureTreeNode-stackView"
-                        href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L17:14?sideTab=structure"
-                        onClick={[Function]}
-                      />
-                      <div
-                        className="codeSymbol codeSymbol--nested"
-                      >
-                        <div
-                          className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                        >
-                          <div
-                            className="euiToken euiToken--tokenTint02 euiToken--circle euiToken--small"
-                          >
-                            <svg
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              height={16}
-                              style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </div>
-                          <div
-                            className="euiText euiText--small"
-                          >
-                            stackView
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    className="euiSideNavItem euiSideNavItem--branch euiSideNavItem--hasChildItems"
-                  >
-                    <div
-                      className="code-symbol-container"
-                    >
-                      <a
-                        className="code-symbol-link codeFileTree__node--link"
-                        data-test-subj="codeStructureTreeNode-HashMap<K, V>"
-                        href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L137:13?sideTab=structure"
-                        onClick={[Function]}
-                      />
-                      <div
-                        className="codeSymbol"
-                      >
-                        <svg
-                          className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading codeStructureTree--icon"
-                          focusable="false"
-                          height={16}
-                          onClick={[Function]}
-                          style={null}
-                          viewBox="0 0 16 16"
-                          width={16}
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
-                        <div
-                          className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                        >
-                          <div
-                            className="euiToken euiToken--tokenTint01 euiToken--circle euiToken--small"
-                          >
-                            <svg
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              height={16}
-                              style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </div>
-                          <div
-                            className="euiText euiText--small"
-                          >
-                            HashMap&lt;K, V&gt;
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      className="euiSideNavItem__items"
-                    >
-                      <div
-                        className="euiSideNavItem euiSideNavItem--branch"
-                      >
-                        <div
-                          className="code-symbol-container"
-                        >
-                          <a
-                            className="code-symbol-link codeFileTree__node--link"
-                            data-test-subj="codeStructureTreeNode-serialVersionUID"
-                            href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L140:30?sideTab=structure"
-                            onClick={[Function]}
-                          />
-                          <div
-                            className="codeSymbol codeSymbol--nested"
-                          >
-                            <div
-                              className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                            >
-                              <div
-                                className="euiToken euiToken--tokenTint10 euiToken--circle euiToken--small"
-                              >
-                                <svg
-                                  className="euiIcon euiIcon--medium euiIcon-isLoading"
-                                  focusable="false"
-                                  height={16}
-                                  style={null}
-                                  viewBox="0 0 16 16"
-                                  width={16}
-                                  xmlns="http://www.w3.org/2000/svg"
-                                />
-                              </div>
-                              <div
-                                className="euiText euiText--small"
-                              >
-                                serialVersionUID
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    className="euiSideNavItem euiSideNavItem--branch"
-                  >
-                    <div
-                      className="code-symbol-container"
-                    >
-                      <a
-                        className="code-symbol-link codeFileTree__node--link"
-                        data-test-subj="codeStructureTreeNode-Unit"
-                        href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L21:0?sideTab=structure"
-                        onClick={[Function]}
-                      />
-                      <div
-                        className="codeSymbol codeSymbol--nested"
-                      >
-                        <div
-                          className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                        >
-                          <div
-                            className="euiToken euiToken--tokenTint04 euiToken--circle euiToken--small"
-                          >
-                            <svg
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              height={16}
-                              style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </div>
-                          <div
-                            className="euiText euiText--small"
-                          >
-                            Unit
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    className="euiSideNavItem euiSideNavItem--branch"
-                  >
-                    <div
-                      className="code-symbol-container"
-                    >
-                      <a
-                        className="code-symbol-link codeFileTree__node--link"
-                        data-test-subj="codeStructureTreeNode-datemath"
-                        href="/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts!L23:14?sideTab=structure"
-                        onClick={[Function]}
-                      />
-                      <div
-                        className="codeSymbol codeSymbol--nested"
-                      >
-                        <div
-                          className="euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive code-structure-node"
-                        >
-                          <div
-                            className="euiToken euiToken--tokenTint07 euiToken--circle euiToken--small"
-                          >
-                            <svg
-                              className="euiIcon euiIcon--medium euiIcon-isLoading"
-                              focusable="false"
-                              height={16}
-                              style={null}
-                              viewBox="0 0 16 16"
-                              width={16}
-                              xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </div>
-                          <div
-                            className="euiText euiText--small"
-                          >
-                            datemath
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </nav>
-</div>
-`;
diff --git a/x-pack/legacy/plugins/code/public/components/symbol_tree/__test__/symbol_tree.test.tsx b/x-pack/legacy/plugins/code/public/components/symbol_tree/__test__/symbol_tree.test.tsx
deleted file mode 100644
index 47a265512bfbde..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/symbol_tree/__test__/symbol_tree.test.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { MemoryRouter, match } from 'react-router-dom';
-import renderer from 'react-test-renderer';
-import {
-  mockFunction,
-  createLocation,
-  createMatch,
-  createHistory,
-} from '../../../utils/test_utils';
-import { CodeSymbolTree } from '../code_symbol_tree';
-import { props } from './__fixtures__/props';
-import { MainRouteParams, PathTypes } from '../../../common/types';
-import { History, Location } from 'history';
-
-const location: Location = createLocation({
-  pathname:
-    '/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts',
-});
-
-const m: match<MainRouteParams> = createMatch({
-  path: '/:resource/:org/:repo/:pathType(blob|tree)/:revision/:path*:goto(!.*)?',
-  url: '/github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts',
-  isExact: true,
-  params: {
-    resource: 'github.com',
-    org: 'google',
-    repo: 'vmware',
-    pathType: PathTypes.blob,
-    revision: 'master',
-    path: 'src/clr-angular/data/stack-view/stack-control.ts',
-  },
-});
-
-const history: History = createHistory({ location, length: 8, action: 'POP' });
-
-test('render symbol tree correctly', () => {
-  const tree = renderer
-    .create(
-      <MemoryRouter>
-        <CodeSymbolTree
-          location={location}
-          history={history}
-          match={m}
-          structureTree={props.structureTree}
-          closedPaths={[]}
-          openSymbolPath={mockFunction}
-          closeSymbolPath={mockFunction}
-          uri="git://github.com/vmware/clarity/blob/master/src/clr-angular/data/stack-view/stack-control.ts"
-        />
-      </MemoryRouter>
-    )
-    .toJSON();
-  expect(tree).toMatchSnapshot();
-});
diff --git a/x-pack/legacy/plugins/code/public/components/symbol_tree/code_symbol_tree.tsx b/x-pack/legacy/plugins/code/public/components/symbol_tree/code_symbol_tree.tsx
deleted file mode 100644
index 58038c2d59008c..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/symbol_tree/code_symbol_tree.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiFlexGroup, EuiIcon, EuiSideNav, EuiText, EuiToken } from '@elastic/eui';
-import { IconType } from '@elastic/eui';
-import React from 'react';
-import { Link, RouteComponentProps } from 'react-router-dom';
-import url from 'url';
-import { Range, SymbolKind } from 'vscode-languageserver-types';
-import { isEqual } from 'lodash';
-
-import { RepositoryUtils } from '../../../common/repository_utils';
-import { EuiSideNavItem, MainRouteParams } from '../../common/types';
-import { SymbolWithMembers } from '../../actions/structure';
-import { trackCodeUiMetric, METRIC_TYPE } from '../../services/ui_metric';
-import { CodeUIUsageMetrics } from '../../../model/usage_telemetry_metrics';
-
-interface Props extends RouteComponentProps<MainRouteParams> {
-  structureTree: SymbolWithMembers[];
-  closedPaths: string[];
-  openSymbolPath: (p: string) => void;
-  closeSymbolPath: (p: string) => void;
-  uri: string;
-}
-
-interface ActiveSymbol {
-  name: string;
-  range: Range;
-}
-
-export class CodeSymbolTree extends React.PureComponent<Props, { activeSymbol?: ActiveSymbol }> {
-  public state: { activeSymbol?: ActiveSymbol } = {};
-
-  public componentDidUpdate(prevProps: Props) {
-    if (this.props.uri && prevProps.uri !== this.props.uri && this.props.structureTree.length > 0) {
-      // track lsp data available  page view count
-      trackCodeUiMetric(METRIC_TYPE.COUNT, CodeUIUsageMetrics.LSP_DATA_AVAILABLE_PAGE_VIEW_COUNT);
-    }
-  }
-
-  public getClickHandler = (symbol: ActiveSymbol) => () => {
-    this.setState({ activeSymbol: symbol });
-    // track structure tree click count
-    trackCodeUiMetric(METRIC_TYPE.COUNT, CodeUIUsageMetrics.STRUCTURE_TREE_CLICK_COUNT);
-  };
-
-  public getStructureTreeItemRenderer = (
-    range: Range,
-    name: string,
-    kind: SymbolKind,
-    isContainer: boolean = false,
-    forceOpen: boolean = false,
-    path: string = ''
-  ) => () => {
-    let tokenType = 'tokenFile';
-
-    // @ts-ignore
-    tokenType = `token${Object.keys(SymbolKind).find(k => SymbolKind[k] === kind)}`;
-    let bg = null;
-    if (
-      this.state.activeSymbol &&
-      this.state.activeSymbol.name === name &&
-      isEqual(this.state.activeSymbol.range, range)
-    ) {
-      bg = <div className="code-full-width-node" />;
-    }
-    const queries = url.parse(this.props.location.search, true).query;
-    return (
-      <div className="code-symbol-container">
-        {bg}
-        <Link
-          data-test-subj={`codeStructureTreeNode-${name}`}
-          to={url.format({
-            pathname: RepositoryUtils.locationToUrl({ uri: this.props.uri, range }),
-            query: { sideTab: 'structure', ...queries },
-          })}
-          className="code-symbol-link codeFileTree__node--link"
-          onClick={this.getClickHandler({ name, range })}
-        ></Link>
-        <div className={isContainer ? 'codeSymbol' : 'codeSymbol codeSymbol--nested'}>
-          {isContainer &&
-            (forceOpen ? (
-              <EuiIcon
-                type="arrowDown"
-                size="s"
-                color="subdued"
-                className="codeStructureTree--icon"
-                onClick={() => this.props.closeSymbolPath(path)}
-              />
-            ) : (
-              <EuiIcon
-                type="arrowRight"
-                size="s"
-                color="subdued"
-                className="codeStructureTree--icon"
-                onClick={() => this.props.openSymbolPath(path)}
-              />
-            ))}
-          <EuiFlexGroup gutterSize="none" alignItems="center" className="code-structure-node">
-            <EuiToken iconType={tokenType as IconType} />
-            <EuiText size="s">{name}</EuiText>
-          </EuiFlexGroup>
-        </div>
-      </div>
-    );
-  };
-
-  public symbolsToSideNavItems = (symbolsWithMembers: SymbolWithMembers[]): EuiSideNavItem[] => {
-    return symbolsWithMembers.map((s: SymbolWithMembers, index: number) => {
-      const item: EuiSideNavItem = {
-        name: s.name,
-        id: `${s.name}_${index}`,
-        onClick: () => void 0,
-      };
-      if (s.members) {
-        item.forceOpen = !this.props.closedPaths.includes(s.path!);
-        if (item.forceOpen) {
-          item.items = this.symbolsToSideNavItems(s.members);
-        }
-        item.renderItem = this.getStructureTreeItemRenderer(
-          s.selectionRange,
-          s.name,
-          s.kind,
-          s.members.length > 0,
-          item.forceOpen,
-          s.path
-        );
-      } else {
-        item.renderItem = this.getStructureTreeItemRenderer(
-          s.selectionRange,
-          s.name,
-          s.kind,
-          false,
-          false,
-          s.path
-        );
-      }
-      return item;
-    });
-  };
-
-  public render() {
-    const items = [
-      { name: '', id: '', items: this.symbolsToSideNavItems(this.props.structureTree) },
-    ];
-    return (
-      <div className="codeContainer__sideTabTree">
-        <EuiSideNav items={items} />
-      </div>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/components/symbol_tree/symbol_tree.tsx b/x-pack/legacy/plugins/code/public/components/symbol_tree/symbol_tree.tsx
deleted file mode 100644
index 82f8252724f410..00000000000000
--- a/x-pack/legacy/plugins/code/public/components/symbol_tree/symbol_tree.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
-import { closeSymbolPath, openSymbolPath } from '../../actions';
-import { RootState } from '../../reducers';
-import { structureSelector } from '../../selectors';
-import { CodeSymbolTree } from './code_symbol_tree';
-
-const mapStateToProps = (state: RootState) => ({
-  structureTree: structureSelector(state),
-  closedPaths: state.symbol.closedPaths,
-});
-
-const mapDispatchToProps = {
-  openSymbolPath,
-  closeSymbolPath,
-};
-
-export const SymbolTree = withRouter(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-  )(CodeSymbolTree)
-);
diff --git a/x-pack/legacy/plugins/code/public/hacks/toggle_app_link_in_nav.ts b/x-pack/legacy/plugins/code/public/hacks/toggle_app_link_in_nav.ts
deleted file mode 100644
index 0e648d03c519d2..00000000000000
--- a/x-pack/legacy/plugins/code/public/hacks/toggle_app_link_in_nav.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { npStart } from 'ui/new_platform';
-
-const codeUiEnabled = npStart.core.injectedMetadata.getInjectedVar('codeUiEnabled');
-if (codeUiEnabled === false) {
-  npStart.core.chrome.navLinks.update('code', { hidden: true });
-}
diff --git a/x-pack/legacy/plugins/code/public/index.scss b/x-pack/legacy/plugins/code/public/index.scss
deleted file mode 100644
index 43768f7758ea11..00000000000000
--- a/x-pack/legacy/plugins/code/public/index.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@import 'src/legacy/ui/public/styles/_styling_constants';
-
-@import "./components/editor/references_panel.scss";
-@import "./monaco/override_monaco_styles.scss";
-@import "./components/diff_page/diff.scss";
-@import "./components/main/main.scss";
-@import "./components/search_page/search.scss";
-@import "./components/integrations/integrations.scss";
-
-// TODO: Cleanup everything above this line
-
-@import "./style/variables";
-@import "./style/utilities";
-@import "./style/buttons";
-@import "./style/layout";
-@import "./style/sidebar";
-@import "./style/markdown";
-@import "./style/shortcuts";
-@import "./style/monaco";
-@import "./style/filetree";
-@import "./style/query_bar";
-@import "./style/commits";
-@import "./style/filters";
diff --git a/x-pack/legacy/plugins/code/public/index.ts b/x-pack/legacy/plugins/code/public/index.ts
deleted file mode 100644
index ea760c670cec44..00000000000000
--- a/x-pack/legacy/plugins/code/public/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { PluginInitializerContext } from 'src/core/public';
-import { npStart } from 'ui/new_platform';
-import { Plugin } from './plugin';
-
-export function plugin(initializerContext: PluginInitializerContext) {
-  return new Plugin(initializerContext);
-}
-
-export * from './shared';
-
-// This is the shim to legacy platform
-const p = plugin({} as PluginInitializerContext);
-p.start(npStart.core);
diff --git a/x-pack/legacy/plugins/code/public/lib/documentation_links.ts b/x-pack/legacy/plugins/code/public/lib/documentation_links.ts
deleted file mode 100644
index 32561b0d198336..00000000000000
--- a/x-pack/legacy/plugins/code/public/lib/documentation_links.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 { npStart } from 'ui/new_platform';
-
-// TODO make sure document links are right
-export const documentationLinks = {
-  code: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/code.html`,
-  codeIntelligence: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/code.html`,
-  gitFormat: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/code.html`,
-  codeInstallLangServer: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/code-install-lang-server.html`,
-  codeGettingStarted: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/code-import-first-repo.html`,
-  codeRepoManagement: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/code-repo-management.html`,
-  codeSearch: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/code-search.html`,
-  codeOtherFeatures: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/code-basic-nav.html`,
-  semanticNavigation: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/code-semantic-nav.html`,
-  kibanaRoleManagement: `${npStart.core.docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${npStart.core.docLinks.DOC_LINK_VERSION}/kibana-role-management.html`,
-};
diff --git a/x-pack/legacy/plugins/code/public/lib/usage_collector.ts b/x-pack/legacy/plugins/code/public/lib/usage_collector.ts
deleted file mode 100644
index 5b63227ee46551..00000000000000
--- a/x-pack/legacy/plugins/code/public/lib/usage_collector.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  createUiStatsReporter,
-  METRIC_TYPE,
-} from '../../../../../../src/legacy/core_plugins/ui_metric/public';
-import { APP_USAGE_TYPE } from '../../common/constants';
-
-export const trackUiAction = createUiStatsReporter(APP_USAGE_TYPE);
-export { METRIC_TYPE };
diff --git a/x-pack/legacy/plugins/code/public/monaco/blame/blame_widget.ts b/x-pack/legacy/plugins/code/public/monaco/blame/blame_widget.ts
deleted file mode 100644
index 3ef2afad643701..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/blame/blame_widget.ts
+++ /dev/null
@@ -1,75 +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 { editor as Editor } from 'monaco-editor';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { GitBlame } from '../../../common/git_blame';
-import { Blame } from '../../components/main/blame';
-
-export class BlameWidget implements Editor.IContentWidget {
-  public allowEditorOverflow = true;
-
-  public suppressMouseDown = false;
-  private domNode: HTMLDivElement;
-  private containerNode: HTMLDivElement;
-
-  constructor(
-    public readonly blame: GitBlame,
-    public readonly isFirstLine: boolean,
-    public readonly editor: Editor.IStandaloneCodeEditor
-  ) {
-    this.containerNode = document.createElement('div');
-    this.domNode = document.createElement('div');
-    this.containerNode.appendChild(this.domNode);
-    this.editor.onDidLayoutChange(() => this.update());
-    // this.editor.onDidScrollChange(e => this.update());
-    this.update();
-    // @ts-ignore
-    this.editor.addContentWidget(this);
-    this.editor.layoutContentWidget(this);
-  }
-
-  public destroy() {
-    this.editor.removeContentWidget(this);
-  }
-
-  public getDomNode(): HTMLElement {
-    return this.containerNode;
-  }
-
-  public getId(): string {
-    return 'blame_' + this.blame.startLine;
-  }
-
-  public getPosition(): Editor.IContentWidgetPosition {
-    return {
-      position: {
-        column: 0,
-        lineNumber: this.blame.startLine,
-      },
-      preference: [0],
-    };
-  }
-
-  private update() {
-    this.containerNode.style.width = '0px';
-    const { fontSize, lineHeight } = this.editor.getConfiguration().fontInfo;
-    this.domNode.style.position = 'relative';
-    this.domNode.style.left = '-332px';
-    this.domNode.style.marginLeft = '16px';
-    this.domNode.style.width = '300px';
-    this.domNode.style.fontSize = `${fontSize}px`;
-    this.domNode.style.lineHeight = `${lineHeight}px`;
-    const element = React.createElement(
-      Blame,
-      { blame: this.blame, isFirstLine: this.isFirstLine },
-      null
-    );
-    // @ts-ignore
-    ReactDOM.render(element, this.domNode);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/computer.ts b/x-pack/legacy/plugins/code/public/monaco/computer.ts
deleted file mode 100644
index ef26b16849ba6a..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/computer.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export interface AsyncTask<T> {
-  promise(): Promise<T>;
-  cancel(): void;
-}
-export interface Computer<T> {
-  compute(): AsyncTask<T>;
-  loadingMessage(): T;
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/content_widget.ts b/x-pack/legacy/plugins/code/public/monaco/content_widget.ts
deleted file mode 100644
index baa75de956a61c..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/content_widget.ts
+++ /dev/null
@@ -1,140 +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 { editor as Editor } from 'monaco-editor';
-// @ts-ignore
-import { DomScrollableElement } from 'monaco-editor/esm/vs/base/browser/ui/scrollbar/scrollableElement';
-import { Disposable } from './disposable';
-import { monaco } from './monaco';
-
-export function toggleClass(node: HTMLElement, clazzName: string, toggle: boolean) {
-  node.classList.toggle(clazzName, toggle);
-}
-
-export abstract class ContentWidget extends Disposable implements Editor.IContentWidget {
-  protected get isVisible(): boolean {
-    return this.visible;
-  }
-
-  protected set isVisible(value: boolean) {
-    this.visible = value;
-    toggleClass(this.containerDomNode, 'hidden', !this.visible);
-  }
-  protected readonly containerDomNode: HTMLElement;
-  protected domNode: HTMLElement;
-  private readonly extraNode: HTMLDivElement;
-  private scrollbar: any;
-  private showAtPosition: Position | null;
-  private stoleFocus: boolean = false;
-  private visible: boolean;
-
-  protected constructor(public readonly id: string, public readonly editor: Editor.ICodeEditor) {
-    super();
-    this.containerDomNode = document.createElement('div');
-    this.domNode = document.createElement('div');
-    this.extraNode = document.createElement('div');
-    this.scrollbar = new DomScrollableElement(this.domNode, {});
-    this.disposables.push(this.scrollbar);
-    this.containerDomNode.appendChild(this.scrollbar.getDomNode());
-    this.containerDomNode.appendChild(this.extraNode);
-
-    this.visible = false;
-    this.editor.onDidLayoutChange(e => this.updateMaxHeight());
-    this.editor.onDidChangeModel(() => this.hide());
-    this.updateMaxHeight();
-    this.showAtPosition = null;
-    // @ts-ignore
-    this.editor.addContentWidget(this);
-  }
-
-  public getId(): string {
-    return this.id;
-  }
-
-  public getDomNode(): HTMLElement {
-    return this.containerDomNode;
-  }
-
-  public showAt(position: any, focus: boolean): void {
-    this.showAtPosition = position;
-    // @ts-ignore
-    this.editor.layoutContentWidget(this);
-    this.isVisible = true;
-    this.editor.render();
-    this.stoleFocus = focus;
-    if (focus) {
-      this.containerDomNode.focus();
-    }
-  }
-
-  public hide(): void {
-    if (!this.isVisible) {
-      return;
-    }
-
-    this.isVisible = false;
-    // @ts-ignore
-    this.editor.layoutContentWidget(this);
-    if (this.stoleFocus) {
-      this.editor.focus();
-    }
-  }
-
-  // @ts-ignore
-  public getPosition() {
-    const { ContentWidgetPositionPreference } = monaco.editor;
-    if (this.isVisible) {
-      return {
-        position: this.showAtPosition!,
-        preference: [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW],
-      };
-    }
-    return null;
-  }
-
-  public dispose(): void {
-    // @ts-ignore
-    this.editor.removeContentWidget(this);
-    this.disposables.forEach(d => d.dispose());
-  }
-
-  protected updateContents(node: Node, extra?: Node): void {
-    this.domNode.textContent = '';
-    this.domNode.appendChild(node);
-    this.extraNode.innerHTML = '';
-    if (extra) {
-      this.extraNode.appendChild(extra);
-    }
-    this.updateFont();
-    // @ts-ignore
-    this.editor.layoutContentWidget(this);
-    this.onContentsChange();
-  }
-
-  protected onContentsChange(): void {
-    this.scrollbar.scanDomNode();
-  }
-
-  private updateMaxHeight() {
-    const height = Math.max(this.editor.getLayoutInfo().height / 4, 250);
-    const { fontSize, lineHeight } = this.editor.getConfiguration().fontInfo;
-
-    this.domNode.style.fontSize = `${fontSize}px`;
-    this.domNode.style.lineHeight = `${lineHeight}px`;
-    this.domNode.style.maxHeight = `${height}px`;
-  }
-
-  private updateFont(): void {
-    const codeTags: HTMLElement[] = Array.prototype.slice.call(
-      this.domNode.getElementsByTagName('code')
-    );
-    const codeClasses: HTMLElement[] = Array.prototype.slice.call(
-      this.domNode.getElementsByClassName('code')
-    );
-
-    [...codeTags, ...codeClasses].forEach(node => this.editor.applyFontInfo(node));
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/definition/definition_provider.ts b/x-pack/legacy/plugins/code/public/monaco/definition/definition_provider.ts
deleted file mode 100644
index 929e9d0737af3f..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/definition/definition_provider.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import url from 'url';
-import queryString from 'querystring';
-import { DetailSymbolInformation } from '@elastic/lsp-extension';
-
-import { npStart } from 'ui/new_platform';
-import { Location } from 'vscode-languageserver-types';
-import { monaco } from '../monaco';
-import { LspRestClient, TextDocumentMethods } from '../../../common/lsp_client';
-import { parseSchema } from '../../../common/uri_util';
-import { history } from '../../utils/url';
-
-export const definitionProvider: monaco.languages.DefinitionProvider = {
-  async provideDefinition(
-    model: monaco.editor.ITextModel,
-    position: monaco.Position,
-    token: monaco.CancellationToken
-  ): Promise<monaco.languages.Location[]> {
-    const lspClient = new LspRestClient('/api/code/lsp');
-    const lspMethods = new TextDocumentMethods(lspClient);
-    function handleLocation(location: Location): monaco.languages.Location {
-      return {
-        uri: monaco.Uri.parse(location.uri),
-        range: {
-          startLineNumber: location.range.start.line + 1,
-          startColumn: location.range.start.character + 1,
-          endLineNumber: location.range.end.line + 1,
-          endColumn: location.range.end.character + 1,
-        },
-      };
-    }
-
-    async function handleQname(qname: string): Promise<monaco.languages.Location[]> {
-      const res = await npStart.core.http.get(`/api/code/lsp/symbol/${qname}`);
-      if (res.symbols) {
-        return res.symbols.map((s: DetailSymbolInformation) =>
-          handleLocation(s.symbolInformation.location)
-        );
-      }
-      return [];
-    }
-
-    function openDefinitionsPanel() {
-      if (model && position) {
-        const { uri } = parseSchema(model.uri.toString());
-        const refUrl = `git:/${uri}!L${position.lineNumber - 1}:${position.column - 1}`;
-        const queries = url.parse(history.location.search, true).query;
-        const query = queryString.stringify({
-          ...queries,
-          tab: 'definitions',
-          refUrl,
-        });
-        history.push(`${uri}?${query}`);
-      }
-    }
-
-    const result = await lspMethods.edefinition.send({
-      position: {
-        line: position.lineNumber - 1,
-        character: position.column - 1,
-      },
-      textDocument: {
-        uri: model.uri.toString(),
-      },
-    });
-
-    if (result) {
-      if (result.length > 1) {
-        openDefinitionsPanel();
-        return result.filter(l => l.location !== undefined).map(l => handleLocation(l.location!));
-      } else {
-        const l = result[0];
-        const location = l.location;
-        if (location) {
-          return [handleLocation(location)];
-        } else if (l.qname) {
-          return await handleQname(l.qname);
-        }
-      }
-    }
-    return [];
-  },
-};
diff --git a/x-pack/legacy/plugins/code/public/monaco/disposable.ts b/x-pack/legacy/plugins/code/public/monaco/disposable.ts
deleted file mode 100644
index d89048357234e6..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/disposable.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { IDisposable } from 'monaco-editor';
-
-export abstract class Disposable implements IDisposable {
-  protected disposables: IDisposable[];
-
-  constructor() {
-    this.disposables = [];
-  }
-
-  public dispose(): void {
-    this.disposables.forEach(d => d.dispose());
-    this.disposables = [];
-  }
-
-  protected _register<T extends IDisposable>(t: T): T {
-    this.disposables.push(t);
-    return t;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/editor_service.ts b/x-pack/legacy/plugins/code/public/monaco/editor_service.ts
deleted file mode 100644
index 2b3b5513a39a40..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/editor_service.ts
+++ /dev/null
@@ -1,75 +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 { editor, IRange, Uri } from 'monaco-editor';
-// @ts-ignore
-import { StandaloneCodeEditorServiceImpl } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneCodeServiceImpl.js';
-import { npStart } from 'ui/new_platform';
-import { parseSchema } from '../../common/uri_util';
-import { SymbolSearchResult } from '../../model';
-import { history } from '../utils/url';
-import { MonacoHelper } from './monaco_helper';
-import { ResponseError } from '../../common/jsonrpc';
-interface IResourceInput {
-  resource: Uri;
-  options?: { selection?: IRange };
-}
-
-export class EditorService extends StandaloneCodeEditorServiceImpl {
-  constructor(private readonly getUrlQuery: () => string) {
-    super();
-  }
-  public static async handleSymbolUri(qname: string, getUrlQuery: () => string) {
-    const result = await EditorService.findSymbolByQname(qname);
-    if (result.symbols.length > 0) {
-      const symbol = result.symbols[0].symbolInformation;
-      const { schema, uri } = parseSchema(symbol.location.uri);
-      if (schema === 'git:') {
-        const { line, character } = symbol.location.range.start;
-        const url = uri + `!L${line + 1}:${character + 1}`;
-        history.push(`${url}${getUrlQuery()}`);
-      }
-    }
-  }
-
-  public static async findSymbolByQname(qname: string) {
-    try {
-      const response = await npStart.core.http.get(`/api/code/lsp/symbol/${qname}`);
-      return response as SymbolSearchResult;
-    } catch (e) {
-      const error = e.body;
-      throw new ResponseError(error.code, error.message, error.data);
-    }
-  }
-  private helper?: MonacoHelper;
-  public async openCodeEditor(
-    input: IResourceInput,
-    source: editor.ICodeEditor,
-    sideBySide?: boolean
-  ) {
-    const { scheme, authority, path } = input.resource;
-    if (scheme === 'symbol') {
-      await EditorService.handleSymbolUri(authority, this.getUrlQuery);
-    } else {
-      const uri = `/${authority}${path}`;
-      if (input.options && input.options.selection) {
-        const { startColumn, startLineNumber } = input.options.selection;
-        const url = uri + `!L${startLineNumber}:${startColumn}`;
-        const currentPath = window.location.hash.substring(1);
-        if (currentPath === url) {
-          this.helper!.revealPosition(startLineNumber, startColumn);
-        } else {
-          history.push(`${url}${this.getUrlQuery()}`);
-        }
-      }
-    }
-    return source;
-  }
-
-  public setMonacoHelper(helper: MonacoHelper) {
-    this.helper = helper;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/hover/content_hover_widget.tsx b/x-pack/legacy/plugins/code/public/monaco/hover/content_hover_widget.tsx
deleted file mode 100644
index 99556fa1d2b778..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/hover/content_hover_widget.tsx
+++ /dev/null
@@ -1,218 +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 { I18nProvider } from '@kbn/i18n/react';
-import { editor as Editor, languages, Range as EditorRange } from 'monaco-editor';
-// @ts-ignore
-import { createCancelablePromise } from 'monaco-editor/esm/vs/base/common/async';
-// @ts-ignore
-import { getOccurrencesAtPosition } from 'monaco-editor/esm/vs/editor/contrib/wordHighlighter/wordHighlighter';
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { Hover, MarkedString, Range } from 'vscode-languageserver-types';
-import { ServerNotInitialized } from '../../../common/lsp_error_codes';
-import { HoverButtons } from '../../components/hover/hover_buttons';
-import { HoverState, HoverWidget, HoverWidgetProps } from '../../components/hover/hover_widget';
-import { ContentWidget } from '../content_widget';
-import { monaco } from '../monaco';
-import { Operation } from '../operation';
-import { HoverComputer } from './hover_computer';
-
-export class ContentHoverWidget extends ContentWidget {
-  public static ID = 'editor.contrib.contentHoverWidget';
-  private static readonly DECORATION_OPTIONS = {
-    className: 'wordHighlightStrong', //  hoverHighlight wordHighlightStrong
-  };
-  private hoverOperation: Operation<Hover>;
-  private readonly computer: HoverComputer;
-  private lastRange: EditorRange | null = null;
-  private shouldFocus: boolean = false;
-  private hoverResultAction?: (hover: Hover) => void = undefined;
-  private highlightDecorations: string[] = [];
-  private hoverState: HoverState = HoverState.LOADING;
-
-  constructor(editor: Editor.ICodeEditor) {
-    super(ContentHoverWidget.ID, editor);
-    this.containerDomNode.className = 'monaco-editor-hover hidden';
-    this.containerDomNode.tabIndex = 0;
-    this.domNode.className = 'monaco-editor-hover-content';
-    this.computer = new HoverComputer();
-    this.hoverOperation = new Operation(
-      this.computer,
-      result => this.result(result),
-      error => {
-        // @ts-ignore
-        if (error.code === ServerNotInitialized) {
-          this.hoverState = HoverState.INITIALIZING;
-          this.render(this.lastRange!);
-        }
-      },
-      () => {
-        this.hoverState = HoverState.LOADING;
-        this.render(this.lastRange!);
-      }
-    );
-  }
-
-  public startShowingAt(range: any, focus: boolean) {
-    if (this.isVisible && this.lastRange && this.lastRange.containsRange(range)) {
-      return;
-    }
-    this.hoverOperation.cancel();
-    const url = this.editor.getModel()!.uri.toString();
-    if (this.isVisible) {
-      this.hide();
-    }
-    this.computer.setParams(url, range);
-    this.hoverOperation.start();
-    this.lastRange = range;
-    this.shouldFocus = focus;
-  }
-
-  public setHoverResultAction(hoverResultAction: (hover: Hover) => void) {
-    this.hoverResultAction = hoverResultAction;
-  }
-
-  public hide(): void {
-    super.hide();
-    this.highlightDecorations = this.editor.deltaDecorations(this.highlightDecorations, []);
-  }
-
-  private result(result: Hover) {
-    if (this.hoverResultAction) {
-      // pass the result to redux
-      this.hoverResultAction(result);
-    }
-    if (this.lastRange && result && result.contents) {
-      this.render(this.lastRange, result);
-    } else {
-      this.hide();
-    }
-  }
-
-  private render(renderRange: EditorRange, result?: Hover) {
-    const fragment = document.createDocumentFragment();
-    let props: HoverWidgetProps = {
-      state: this.hoverState,
-      gotoDefinition: this.gotoDefinition.bind(this),
-      findReferences: this.findReferences.bind(this),
-    };
-    let startColumn = renderRange.startColumn;
-    if (result) {
-      let contents: MarkedString[] = [];
-      if (Array.isArray(result.contents)) {
-        contents = result.contents;
-      } else {
-        contents = [result.contents as MarkedString];
-      }
-      contents = contents.filter(v => {
-        if (typeof v === 'string') {
-          return !!v;
-        } else {
-          return !!v.value;
-        }
-      });
-      if (contents.length === 0) {
-        this.hide();
-        return;
-      }
-      props = {
-        ...props,
-        state: HoverState.READY,
-        contents,
-      };
-      if (result.range) {
-        this.lastRange = this.toMonacoRange(result.range);
-        this.highlightOccurrences(this.lastRange);
-      }
-      startColumn = Math.min(
-        renderRange.startColumn,
-        result.range ? result.range.start.character + 1 : Number.MAX_VALUE
-      );
-    }
-
-    this.showAt(new monaco.Position(renderRange.startLineNumber, startColumn), this.shouldFocus);
-
-    const element = (
-      <I18nProvider>
-        <HoverWidget {...props} />
-      </I18nProvider>
-    );
-    // @ts-ignore
-    ReactDOM.render(element, fragment);
-    const buttonFragment = document.createDocumentFragment();
-    const buttons = (
-      <I18nProvider>
-        <HoverButtons {...props} />
-      </I18nProvider>
-    );
-    // @ts-ignore
-    ReactDOM.render(buttons, buttonFragment);
-    this.updateContents(fragment, buttonFragment);
-  }
-
-  private toMonacoRange(r: Range): EditorRange {
-    return new monaco.Range(
-      r.start.line + 1,
-      r.start.character + 1,
-      r.end.line + 1,
-      r.end.character + 1
-    );
-  }
-
-  private gotoDefinition() {
-    if (this.lastRange) {
-      this.editor.setPosition({
-        lineNumber: this.lastRange.startLineNumber,
-        column: this.lastRange.startColumn,
-      });
-      const action = this.editor.getAction('editor.action.revealDefinition');
-      action.run().then(() => this.hide());
-    }
-  }
-
-  private findReferences() {
-    if (this.lastRange) {
-      this.editor.setPosition({
-        lineNumber: this.lastRange.startLineNumber,
-        column: this.lastRange.startColumn,
-      });
-      const action = this.editor.getAction('editor.action.referenceSearch.trigger');
-      action.run().then(() => this.hide());
-    }
-  }
-
-  private highlightOccurrences(range: EditorRange) {
-    const pos = new monaco.Position(range.startLineNumber, range.startColumn);
-    return createCancelablePromise((token: any) =>
-      getOccurrencesAtPosition(this.editor.getModel(), pos, token).then(
-        (data: languages.DocumentHighlight[]) => {
-          if (data) {
-            if (this.isVisible) {
-              const decorations = data.map(h => ({
-                range: h.range,
-                options: ContentHoverWidget.DECORATION_OPTIONS,
-              }));
-
-              this.highlightDecorations = this.editor.deltaDecorations(
-                this.highlightDecorations,
-                decorations
-              );
-            }
-          } else {
-            this.highlightDecorations = this.editor.deltaDecorations(this.highlightDecorations, [
-              {
-                range,
-                options: ContentHoverWidget.DECORATION_OPTIONS,
-              },
-            ]);
-          }
-        }
-      )
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/hover/hover_computer.ts b/x-pack/legacy/plugins/code/public/monaco/hover/hover_computer.ts
deleted file mode 100644
index 7e49b5f0274114..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/hover/hover_computer.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Hover } from 'vscode-languageserver-types';
-import { LspRestClient, TextDocumentMethods } from '../../../common/lsp_client';
-import { AsyncTask, Computer } from '../computer';
-import { store } from '../../stores/index';
-import { statusSelector } from '../../selectors';
-import { LangServerType, RepoFileStatus } from '../../../common/repo_file_status';
-import { ServerNotInitialized } from '../../../common/lsp_error_codes';
-
-export const LOADING = 'loading';
-
-export class HoverComputer implements Computer<Hover> {
-  private lspMethods: TextDocumentMethods;
-  private range: any = null;
-  private uri: string | null = null;
-
-  constructor() {
-    const lspClient = new LspRestClient('/api/code/lsp');
-    this.lspMethods = new TextDocumentMethods(lspClient);
-  }
-
-  public setParams(uri: string, range: any) {
-    this.range = range;
-    this.uri = uri;
-  }
-
-  public compute(): AsyncTask<Hover> {
-    const status = statusSelector(store.getState());
-    if (
-      status &&
-      status.langServerType !== LangServerType.NONE &&
-      status.fileStatus !== RepoFileStatus.FILE_NOT_SUPPORTED &&
-      status.fileStatus !== RepoFileStatus.FILE_IS_TOO_BIG
-    ) {
-      if (status.langServerStatus === RepoFileStatus.LANG_SERVER_IS_INITIALIZING) {
-        return this.initializing();
-      }
-
-      return this.lspMethods.hover.asyncTask({
-        position: {
-          line: this.range!.startLineNumber - 1,
-          character: this.range!.startColumn - 1,
-        },
-        textDocument: {
-          uri: this.uri!,
-        },
-      });
-    }
-    return this.empty();
-  }
-
-  private empty(): AsyncTask<Hover> {
-    const empty = {
-      range: this.lspRange(),
-      contents: [],
-    };
-    return {
-      cancel(): void {},
-      promise(): Promise<Hover> {
-        return Promise.resolve(empty);
-      },
-    };
-  }
-
-  private initializing(): AsyncTask<Hover> {
-    return {
-      cancel(): void {},
-      promise(): Promise<Hover> {
-        return Promise.reject({ code: ServerNotInitialized });
-      },
-    };
-  }
-
-  private lspRange() {
-    return {
-      start: {
-        line: this.range.startLineNumber - 1,
-        character: this.range.startColumn - 1,
-      },
-      end: {
-        line: this.range.endLineNumber - 1,
-        character: this.range.endColumn - 1,
-      },
-    };
-  }
-
-  public loadingMessage(): Hover {
-    return {
-      range: this.lspRange(),
-      contents: LOADING,
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/hover/hover_controller.ts b/x-pack/legacy/plugins/code/public/monaco/hover/hover_controller.ts
deleted file mode 100644
index 81382774791acf..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/hover/hover_controller.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { editor as Editor, IDisposable, IKeyboardEvent } from 'monaco-editor';
-import { EditorActions } from '../../components/editor/editor';
-import { monaco } from '../monaco';
-import { ContentHoverWidget } from './content_hover_widget';
-
-export class HoverController implements Editor.IEditorContribution {
-  public static ID = 'code.editor.contrib.hover';
-  public static get(editor: any): HoverController {
-    return editor.getContribution(HoverController.ID);
-  }
-  private contentWidget: ContentHoverWidget;
-  private disposables: IDisposable[];
-
-  constructor(public readonly editor: Editor.ICodeEditor) {
-    this.disposables = [
-      this.editor.onMouseMove((e: Editor.IEditorMouseEvent) => this.onEditorMouseMove(e)),
-      this.editor.onKeyDown((e: IKeyboardEvent) => this.onKeyDown(e)),
-    ];
-    this.contentWidget = new ContentHoverWidget(editor);
-  }
-
-  public dispose(): void {
-    this.disposables.forEach(d => d.dispose());
-  }
-
-  public getId(): string {
-    return HoverController.ID;
-  }
-
-  public setReduxActions(actions: EditorActions) {
-    this.contentWidget.setHoverResultAction(actions.hoverResult);
-  }
-
-  private onEditorMouseMove(mouseEvent: Editor.IEditorMouseEvent) {
-    const targetType = mouseEvent.target.type;
-    const { MouseTargetType } = monaco.editor;
-
-    if (
-      targetType === MouseTargetType.CONTENT_WIDGET &&
-      mouseEvent.target.detail === ContentHoverWidget.ID
-    ) {
-      return;
-    }
-
-    if (targetType === MouseTargetType.CONTENT_TEXT) {
-      this.contentWidget.startShowingAt(mouseEvent.target.range, false);
-    } else {
-      this.contentWidget.hide();
-    }
-  }
-
-  private onKeyDown(e: IKeyboardEvent): void {
-    if (e.keyCode === monaco.KeyCode.Escape) {
-      // Do not hide hover when Ctrl/Meta is pressed
-      this.contentWidget.hide();
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/immortal_reference.ts b/x-pack/legacy/plugins/code/public/monaco/immortal_reference.ts
deleted file mode 100644
index b1ec674c1ee9c0..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/immortal_reference.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { IReference } from './textmodel_resolver';
-
-export class ImmortalReference<T> implements IReference<T> {
-  constructor(public object: T) {}
-  public dispose(): void {
-    /* noop */
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/monaco.ts b/x-pack/legacy/plugins/code/public/monaco/monaco.ts
deleted file mode 100644
index 06b55e4d74c57e..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/monaco.ts
+++ /dev/null
@@ -1,217 +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.
- */
-// (1) Desired editor features:
-import 'monaco-editor/esm/vs/editor/browser/controller/coreCommands.js';
-import 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js';
-import 'monaco-editor/esm/vs/editor/browser/widget/diffEditorWidget.js';
-// import 'monaco-editor/esm/vs/editor/browser/widget/diffNavigator.js';
-// import 'monaco-editor/esm/vs/editor/contrib/bracketMatching/bracketMatching.js';
-// import 'monaco-editor/esm/vs/editor/contrib/caretOperations/caretOperations.js';
-// import 'monaco-editor/esm/vs/editor/contrib/caretOperations/transpose.js';
-import 'monaco-editor/esm/vs/editor/contrib/clipboard/clipboard.js';
-// import 'monaco-editor/esm/vs/editor/contrib/codelens/codelensController.js';
-// import 'monaco-editor/esm/vs/editor/contrib/colorPicker/colorDetector.js';
-// import 'monaco-editor/esm/vs/editor/contrib/comment/comment.js';
-// import 'monaco-editor/esm/vs/editor/contrib/contextmenu/contextmenu.js';
-// import 'monaco-editor/esm/vs/editor/contrib/cursorUndo/cursorUndo.js';
-// import 'monaco-editor/esm/vs/editor/contrib/dnd/dnd.js';
-import 'monaco-editor/esm/vs/editor/contrib/find/findController.js';
-import 'monaco-editor/esm/vs/editor/contrib/folding/folding.js';
-// import 'monaco-editor/esm/vs/editor/contrib/format/formatActions.js';
-import 'monaco-editor/esm/vs/editor/contrib/goToDefinition/goToDefinitionCommands';
-import 'monaco-editor/esm/vs/editor/contrib/goToDefinition/goToDefinitionMouse';
-// import 'monaco-editor/esm/vs/editor/contrib/gotoError/gotoError.js';
-// import 'monaco-editor/esm/vs/editor/contrib/hover/hover.js';
-// import 'monaco-editor/esm/vs/editor/contrib/inPlaceReplace/inPlaceReplace.js';
-// import 'monaco-editor/esm/vs/editor/contrib/linesOperations/linesOperations.js';
-// import 'monaco-editor/esm/vs/editor/contrib/links/links.js';
-// import 'monaco-editor/esm/vs/editor/contrib/multicursor/multicursor.js';
-// import 'monaco-editor/esm/vs/editor/contrib/parameterHints/parameterHints.js';
-// import 'monaco-editor/esm/vs/editor/contrib/quickFix/quickFixCommands.js';
-// import 'monaco-editor/esm/vs/editor/contrib/referenceSearch/referenceSearch.js';
-// import 'monaco-editor/esm/vs/editor/contrib/rename/rename.js';
-// import 'monaco-editor/esm/vs/editor/contrib/smartSelect/smartSelect.js';
-// import 'monaco-editor/esm/vs/editor/contrib/snippet/snippetController2.js';
-// import 'monaco-editor/esm/vs/editor/contrib/suggest/suggestController.js';
-// import 'monaco-editor/esm/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.js';
-// import 'monaco-editor/esm/vs/editor/contrib/wordHighlighter/wordHighlighter.js';
-// import 'monaco-editor/esm/vs/editor/contrib/wordOperations/wordOperations.js';
-// import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.js';
-// import 'monaco-editor/esm/vs/editor/standalone/browser/inspectTokens/inspectTokens.js';
-// import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js';
-// import 'monaco-editor/esm/vs/editor/standalone/browser/quickOpen/quickOutline.js';
-// import 'monaco-editor/esm/vs/editor/standalone/browser/quickOpen/gotoLine.js';
-// import 'monaco-editor/esm/vs/editor/standalone/browser/quickOpen/quickCommand.js';
-// import 'monaco-editor/esm/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.js';
-import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
-
-import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
-import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
-// (2) Desired languages:
-// import 'monaco-editor/esm/vs/language/typescript/monaco.contribution';
-// import 'monaco-editor/esm/vs/language/css/monaco.contribution';
-// import 'monaco-editor/esm/vs/language/json/monaco.contribution';
-// import 'monaco-editor/esm/vs/language/html/monaco.contribution';
-// import 'monaco-editor/esm/vs/basic-languages/bat/bat.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/coffee/coffee.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/cpp/cpp.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/csharp/csharp.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/csp/csp.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/css/css.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/dockerfile/dockerfile.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/fsharp/fsharp.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/go/go.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/handlebars/handlebars.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/html/html.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/ini/ini.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/java/java.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/r/r.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/razor/razor.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/redis/redis.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/redshift/redshift.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/ruby/ruby.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/sb/sb.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/scss/scss.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/solidity/solidity.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/sql/sql.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/swift/swift.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/vb/vb.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/xml/xml.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution';
-import 'monaco-editor/esm/vs/basic-languages/less/less.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/lua/lua.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/markdown/markdown.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/msdax/msdax.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/mysql/mysql.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/objective-c/objective-c.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/pgsql/pgsql.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/php/php.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/postiats/postiats.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/powershell/powershell.contribution.js';
-// import 'monaco-editor/esm/vs/basic-languages/pug/pug.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/python/python.contribution.js';
-import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution';
-import chrome from 'ui/chrome';
-import { npStart } from 'ui/new_platform';
-
-import { CTAGS_SUPPORT_LANGS } from '../../common/language_server';
-import { definitionProvider } from './definition/definition_provider';
-
-const IS_DARK_THEME = npStart.core.uiSettings.get('theme:darkMode');
-
-const themeName = IS_DARK_THEME ? darkTheme : lightTheme;
-
-const syntaxTheme = {
-  keyword: themeName.euiColorAccent,
-  comment: themeName.euiColorDarkShade,
-  delimiter: themeName.euiColorSecondary,
-  string: themeName.euiColorPrimary,
-  number: themeName.euiColorWarning,
-  regexp: themeName.euiColorPrimary,
-  types: `${IS_DARK_THEME ? themeName.euiColorVis5 : themeName.euiColorVis9}`,
-  annotation: themeName.euiColorLightShade,
-  tag: themeName.euiColorAccent,
-  symbol: themeName.euiColorDanger,
-  foreground: themeName.euiColorDarkestShade,
-  editorBackground: themeName.euiColorEmptyShade,
-  lineNumbers: themeName.euiColorDarkShade,
-  editorIndentGuide: themeName.euiColorLightShade,
-  selectionBackground: `${IS_DARK_THEME ? '#343551' : '#E3E4ED'}`,
-  editorWidgetBackground: themeName.euiColorLightestShade,
-  editorWidgetBorder: themeName.euiColorLightShade,
-  findMatchBackground: themeName.euiColorWarning,
-  findMatchHighlightBackground: themeName.euiColorWarning,
-};
-
-monaco.editor.defineTheme('euiColors', {
-  base: 'vs',
-  inherit: true,
-  rules: [
-    {
-      token: '',
-      foreground: themeName.euiColorDarkestShade,
-      background: themeName.euiColorEmptyShade,
-    },
-    { token: 'invalid', foreground: themeName.euiColorAccent },
-    { token: 'emphasis', fontStyle: 'italic' },
-    { token: 'strong', fontStyle: 'bold' },
-
-    { token: 'variable', foreground: themeName.euiColorPrimary },
-    { token: 'variable.predefined', foreground: themeName.euiColorSecondary },
-    { token: 'constant', foreground: themeName.euiColorAccent },
-    { token: 'comment', foreground: themeName.euiColorMediumShade },
-    { token: 'number', foreground: themeName.euiColorWarning },
-    { token: 'number.hex', foreground: themeName.euiColorPrimary },
-    { token: 'regexp', foreground: themeName.euiColorDanger },
-    { token: 'annotation', foreground: themeName.euiColorMediumShade },
-    { token: 'type', foreground: themeName.euiColorVis0 },
-
-    { token: 'delimiter', foreground: themeName.euiColorDarkestShade },
-    { token: 'delimiter.html', foreground: themeName.euiColorDarkShade },
-    { token: 'delimiter.xml', foreground: themeName.euiColorPrimary },
-
-    { token: 'tag', foreground: themeName.euiColorDanger },
-    { token: 'tag.id.jade', foreground: themeName.euiColorPrimary },
-    { token: 'tag.class.jade', foreground: themeName.euiColorPrimary },
-    { token: 'meta.scss', foreground: themeName.euiColorAccent },
-    { token: 'metatag', foreground: themeName.euiColorSecondary },
-    { token: 'metatag.content.html', foreground: themeName.euiColorDanger },
-    { token: 'metatag.html', foreground: themeName.euiColorMediumShade },
-    { token: 'metatag.xml', foreground: themeName.euiColorMediumShade },
-    { token: 'metatag.php', fontStyle: 'bold' },
-
-    { token: 'key', foreground: themeName.euiColorWarning },
-    { token: 'string.key.json', foreground: themeName.euiColorDanger },
-    { token: 'string.value.json', foreground: themeName.euiColorPrimary },
-
-    { token: 'attribute.name', foreground: themeName.euiColorDanger },
-    { token: 'attribute.name.css', foreground: themeName.euiColorSecondary },
-    { token: 'attribute.value', foreground: themeName.euiColorPrimary },
-    { token: 'attribute.value.number', foreground: themeName.euiColorWarning },
-    { token: 'attribute.value.unit', foreground: themeName.euiColorWarning },
-    { token: 'attribute.value.html', foreground: themeName.euiColorPrimary },
-    { token: 'attribute.value.xml', foreground: themeName.euiColorPrimary },
-
-    { token: 'string', foreground: themeName.euiColorLightestShade },
-    { token: 'string.html', foreground: themeName.euiColorPrimary },
-    { token: 'string.sql', foreground: themeName.euiColorDanger },
-    { token: 'string.yaml', foreground: themeName.euiColorPrimary },
-
-    { token: 'keyword', foreground: themeName.euiColorPrimary },
-    { token: 'keyword.json', foreground: themeName.euiColorPrimary },
-    { token: 'keyword.flow', foreground: themeName.euiColorWarning },
-    { token: 'keyword.flow.scss', foreground: themeName.euiColorPrimary },
-
-    { token: 'operator.scss', foreground: themeName.euiColorDarkShade },
-    { token: 'operator.sql', foreground: themeName.euiColorMediumShade },
-    { token: 'operator.swift', foreground: themeName.euiColorMediumShade },
-    { token: 'predefined.sql', foreground: themeName.euiColorMediumShade },
-  ],
-  colors: {
-    'editor.foreground': syntaxTheme.foreground,
-    'editor.background': syntaxTheme.editorBackground,
-    'editorLineNumber.foreground': syntaxTheme.lineNumbers,
-    'editorLineNumber.activeForeground': syntaxTheme.lineNumbers,
-    'editorIndentGuide.background': syntaxTheme.editorIndentGuide,
-    'editor.selectionBackground': syntaxTheme.selectionBackground,
-    'editorWidget.border': syntaxTheme.editorWidgetBorder,
-    'editorWidget.background': syntaxTheme.editorWidgetBackground,
-  },
-});
-monaco.editor.setTheme('euiColors');
-
-monaco.languages.registerDefinitionProvider('java', definitionProvider);
-monaco.languages.registerDefinitionProvider('typescript', definitionProvider);
-monaco.languages.registerDefinitionProvider('javascript', definitionProvider);
-if (chrome.getInjected('enableLangserversDeveloping', false) === true) {
-  monaco.languages.registerDefinitionProvider('go', definitionProvider);
-}
-CTAGS_SUPPORT_LANGS.forEach(language =>
-  monaco.languages.registerDefinitionProvider(language, definitionProvider)
-);
-
-export { monaco };
diff --git a/x-pack/legacy/plugins/code/public/monaco/monaco_diff_editor.ts b/x-pack/legacy/plugins/code/public/monaco/monaco_diff_editor.ts
deleted file mode 100644
index bd0daa5e5684c0..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/monaco_diff_editor.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ResizeChecker } from '../components/shared/resize_checker';
-import { monaco } from './monaco';
-export class MonacoDiffEditor {
-  public diffEditor: monaco.editor.IStandaloneDiffEditor | null = null;
-  private resizeChecker: ResizeChecker | null = null;
-  constructor(
-    private readonly container: HTMLElement,
-    private readonly originCode: string,
-    private readonly modifiedCode: string,
-    private readonly language: string,
-    private readonly renderSideBySide: boolean
-  ) {}
-
-  public init() {
-    return new Promise(resolve => {
-      const originalModel = monaco.editor.createModel(this.originCode, this.language);
-      const modifiedModel = monaco.editor.createModel(this.modifiedCode, this.language);
-
-      const diffEditor = monaco.editor.createDiffEditor(this.container, {
-        enableSplitViewResizing: false,
-        renderSideBySide: this.renderSideBySide,
-        scrollBeyondLastLine: false,
-        readOnly: true,
-        minimap: {
-          enabled: false,
-        },
-        hover: {
-          enabled: false, // disable default hover;
-        },
-        occurrencesHighlight: false,
-        selectionHighlight: false,
-        renderLineHighlight: 'none',
-        contextmenu: false,
-        folding: true,
-        renderIndentGuides: false,
-        automaticLayout: false,
-        lineDecorationsWidth: 16,
-        overviewRulerBorder: false,
-      });
-      this.resizeChecker = new ResizeChecker(this.container);
-      this.resizeChecker.on('resize', () => {
-        setTimeout(() => {
-          this.diffEditor!.layout();
-        });
-      });
-      diffEditor.setModel({
-        original: originalModel,
-        modified: modifiedModel,
-      });
-      this.diffEditor = diffEditor;
-      const navi = monaco.editor.createDiffNavigator(diffEditor, {
-        followsCaret: true,
-        ignoreCharChanges: true,
-      });
-      diffEditor.focus();
-      navi.next();
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/monaco_helper.ts b/x-pack/legacy/plugins/code/public/monaco/monaco_helper.ts
deleted file mode 100644
index 79e11419457082..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/monaco_helper.ts
+++ /dev/null
@@ -1,164 +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 { editor } from 'monaco-editor';
-
-import { ResizeChecker } from '../components/shared/resize_checker';
-import { EditorActions } from '../components/editor/editor';
-
-import { toCanonicalUrl } from '../../common/uri_util';
-import { EditorService } from './editor_service';
-import { HoverController } from './hover/hover_controller';
-import { monaco } from './monaco';
-import { registerReferencesAction } from './references/references_action';
-import { registerEditor } from './single_selection_helper';
-import { TextModelResolverService } from './textmodel_resolver';
-
-export class MonacoHelper {
-  public get initialized() {
-    return this.monaco !== null;
-  }
-  public decorations: string[] = [];
-  public editor: editor.IStandaloneCodeEditor | null = null;
-  private monaco: any | null = null;
-  private resizeChecker: ResizeChecker | null = null;
-
-  constructor(
-    public readonly container: HTMLElement,
-    private readonly editorActions: EditorActions,
-    private urlQuery: string
-  ) {
-    this.handleCopy = this.handleCopy.bind(this);
-  }
-  public init() {
-    return new Promise(resolve => {
-      this.monaco = monaco;
-      const codeEditorService = new EditorService(this.getUrlQuery);
-      codeEditorService.setMonacoHelper(this);
-      this.editor = monaco.editor.create(
-        this.container!,
-        {
-          readOnly: true,
-          minimap: {
-            enabled: false,
-          },
-          hover: {
-            enabled: false, // disable default hover;
-          },
-          occurrencesHighlight: false,
-          selectionHighlight: false,
-          renderLineHighlight: 'none',
-          contextmenu: false,
-          folding: true,
-          scrollBeyondLastLine: false,
-          renderIndentGuides: false,
-          automaticLayout: false,
-          lineDecorationsWidth: 16,
-        },
-        {
-          textModelService: new TextModelResolverService(monaco),
-          codeEditorService,
-        }
-      );
-      registerEditor(this.editor);
-      this.resizeChecker = new ResizeChecker(this.container);
-      this.resizeChecker.on('resize', () => {
-        setTimeout(() => {
-          this.editor!.layout();
-        });
-      });
-      registerReferencesAction(this.editor, this.getUrlQuery);
-      const hoverController: HoverController = new HoverController(this.editor);
-      hoverController.setReduxActions(this.editorActions);
-      document.addEventListener('copy', this.handleCopy);
-      document.addEventListener('cut', this.handleCopy);
-      resolve(this.editor);
-    });
-  }
-
-  updateUrlQuery = (q: string) => {
-    this.urlQuery = q;
-  };
-
-  getUrlQuery = () => {
-    return this.urlQuery;
-  };
-
-  public destroy = () => {
-    this.monaco = null;
-    document.removeEventListener('copy', this.handleCopy);
-    document.removeEventListener('cut', this.handleCopy);
-
-    if (this.resizeChecker) {
-      this.resizeChecker!.destroy();
-    }
-  };
-
-  public async loadFile(
-    repoUri: string,
-    file: string,
-    text: string,
-    lang: string,
-    revision: string = 'master'
-  ) {
-    if (!this.initialized) {
-      await this.init();
-    }
-    const ed = this.editor!;
-    const oldModel = ed.getModel();
-    if (oldModel) {
-      oldModel.dispose();
-    }
-    ed.setModel(null);
-    const uri = this.monaco!.Uri.parse(
-      toCanonicalUrl({ schema: 'git:', repoUri, file, revision, pathType: 'blob' })
-    );
-    let newModel = this.monaco!.editor.getModel(uri);
-    if (!newModel) {
-      newModel = this.monaco!.editor.createModel(text, lang, uri);
-    } else {
-      newModel.setValue(text);
-    }
-    ed.setModel(newModel);
-    return ed;
-  }
-
-  public revealPosition(line: number, pos: number) {
-    const position = {
-      lineNumber: line,
-      column: pos,
-    };
-    this.decorations = this.editor!.deltaDecorations(this.decorations, [
-      {
-        range: new this.monaco!.Range(line, 0, line, 0),
-        options: {
-          isWholeLine: true,
-          className: 'codeBlock__line--highlighted',
-          linesDecorationsClassName: 'codeBlock__line--highlighted',
-        },
-      },
-    ]);
-    this.editor!.setPosition(position);
-    this.editor!.revealLineInCenterIfOutsideViewport(line);
-  }
-
-  public clearLineSelection() {
-    if (this.editor) {
-      this.decorations = this.editor.deltaDecorations(this.decorations, []);
-    }
-  }
-
-  private handleCopy(e: any) {
-    if (this.editor && this.editor.hasTextFocus() && this.editor.hasWidgetFocus()) {
-      const selection = this.editor.getSelection();
-      if (selection && !selection.isEmpty()) {
-        const text = this.editor.getModel()!.getValueInRange(selection);
-        e.clipboardData.setData('text/plain', text);
-        e.preventDefault();
-      }
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/operation.ts b/x-pack/legacy/plugins/code/public/monaco/operation.ts
deleted file mode 100644
index 1f0be75a5ea91e..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/operation.ts
+++ /dev/null
@@ -1,90 +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 { AsyncTask, Computer } from './computer';
-
-enum OperationState {
-  IDLE,
-  DELAYED,
-  RUNNING,
-}
-
-export class Operation<T> {
-  public static DEFAULT_DELAY_TIME = 300;
-  private task: AsyncTask<T> | null = null;
-  private state: OperationState = OperationState.IDLE;
-  private delay: number = Operation.DEFAULT_DELAY_TIME;
-  private timeout: any;
-
-  constructor(
-    public readonly computer: Computer<T>,
-    public readonly successCallback: (result: T) => void,
-    public readonly errorCallback: (error: Error) => void,
-    public readonly progressCallback: (progress: any) => void
-  ) {}
-
-  public setDelay(delay: number) {
-    this.delay = delay;
-  }
-
-  public start() {
-    if (this.state === OperationState.IDLE) {
-      this.task = this.computer.compute();
-      this.triggerDelay();
-    }
-  }
-
-  public triggerDelay() {
-    this.cancelDelay();
-    this.timeout = setTimeout(this.triggerAsyncTask.bind(this), this.delay);
-    this.state = OperationState.DELAYED;
-  }
-
-  public cancel() {
-    if (this.state === OperationState.RUNNING) {
-      if (this.task) {
-        this.task.cancel();
-        this.task = null;
-      }
-    } else if (this.state === OperationState.DELAYED) {
-      this.cancelDelay();
-    }
-    this.state = OperationState.IDLE;
-  }
-
-  private cancelDelay() {
-    if (this.timeout) {
-      clearTimeout(this.timeout);
-      this.timeout = null;
-    }
-  }
-
-  private showLoading() {
-    this.progressCallback(this.computer.loadingMessage());
-  }
-
-  private triggerAsyncTask() {
-    if (this.task) {
-      this.state = OperationState.RUNNING;
-      const loadingDelay = setTimeout(this.showLoading.bind(this), this.delay);
-
-      const task = this.task;
-      task.promise().then(
-        result => {
-          clearTimeout(loadingDelay);
-          if (task === this.task) {
-            this.successCallback(result);
-          }
-        },
-        error => {
-          clearTimeout(loadingDelay);
-          if (task === this.task) {
-            this.errorCallback(error);
-          }
-        }
-      );
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/override_monaco_styles.scss b/x-pack/legacy/plugins/code/public/monaco/override_monaco_styles.scss
deleted file mode 100644
index 394f24bce37af5..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/override_monaco_styles.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-.codeContainer__monaco {
-  .monaco-diff-editor .cursors-layer > .cursor,
-  .monaco-editor .cursors-layer > .cursor {
-    display: none !important;
-  }
-
-  textarea.inputarea {
-    display: none !important;
-  }
-
-  .monaco-diff-editor.mac .margin-view-overlays .line-numbers,
-  .monaco-editor.mac .margin-view-overlays .line-numbers {
-    cursor: pointer;
-    color: $euiColorMediumShade;
-    background-color: $euiColorLightestShade;
-  }
-
-  .cldr.code-line-decoration + .cldr.folding {
-    left: -124px !important;
-    opacity: 1;
-  }
-
-  span.mtk6 {
-    color: $euiColorSecondary;
-  }
-
-  span.mtk29 {
-    color: $euiColorAccent;
-  }
-
-  .diagonal-fill {
-    background: none;
-  }
-
-  .monaco-diff-editor .line-insert,
-  .monaco-diff-editor .char-insert {
-    background-color: scale($euiColorVis0, -0.9);
-  }
-
-  .monaco-diff-editor .line-delete,
-  .monaco-diff-editor .char-delete {
-    background-color: scale($euiColorDanger, -93%);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/references/references_action.ts b/x-pack/legacy/plugins/code/public/monaco/references/references_action.ts
deleted file mode 100644
index 8ee3a3abf09c7b..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/references/references_action.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { editor } from 'monaco-editor';
-import queryString from 'querystring';
-import url from 'url';
-import { parseSchema } from '../../../common/uri_util';
-import { history } from '../../utils/url';
-
-export function registerReferencesAction(
-  e: editor.IStandaloneCodeEditor,
-  getUrlQuery: () => string
-) {
-  e.addAction({
-    id: 'editor.action.referenceSearch.trigger',
-    label: 'Find All References',
-    contextMenuGroupId: 'navigation',
-    contextMenuOrder: 1.5,
-    run(ed: editor.ICodeEditor) {
-      const position = ed.getPosition();
-      const model = ed.getModel();
-      if (model && position) {
-        const { uri } = parseSchema(model.uri.toString());
-        const refUrl = `git:/${uri}!L${position.lineNumber - 1}:${position.column - 1}`;
-        const queries = url.parse(getUrlQuery(), true).query;
-        const query = queryString.stringify({
-          ...queries,
-          tab: 'references',
-          refUrl,
-        });
-        history.push(`${uri}?${query}`);
-      }
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/single_selection_helper.ts b/x-pack/legacy/plugins/code/public/monaco/single_selection_helper.ts
deleted file mode 100644
index 73c177f4634e67..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/single_selection_helper.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { editor } from 'monaco-editor';
-
-const editors = new Set<editor.IStandaloneCodeEditor>();
-
-function clearSelection(ed: editor.IStandaloneCodeEditor) {
-  const sel = ed.getSelection();
-  if (sel && !sel.isEmpty()) {
-    ed.setSelection({
-      selectionStartLineNumber: sel.selectionStartLineNumber,
-      selectionStartColumn: sel.selectionStartColumn,
-      positionLineNumber: sel.selectionStartLineNumber,
-      positionColumn: sel.selectionStartColumn,
-    });
-  }
-}
-
-export function registerEditor(ed: editor.IStandaloneCodeEditor) {
-  editors.add(ed);
-  ed.onDidChangeCursorSelection(() => {
-    editors.forEach(e => {
-      if (e !== ed) {
-        clearSelection(e);
-      }
-    });
-  });
-  ed.onDidDispose(() => editors.delete(ed));
-}
diff --git a/x-pack/legacy/plugins/code/public/monaco/textmodel_resolver.ts b/x-pack/legacy/plugins/code/public/monaco/textmodel_resolver.ts
deleted file mode 100644
index 06fae9b59154ac..00000000000000
--- a/x-pack/legacy/plugins/code/public/monaco/textmodel_resolver.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { editor, IDisposable, Uri } from 'monaco-editor';
-import { npStart } from 'ui/new_platform';
-
-import { ImmortalReference } from './immortal_reference';
-
-export interface IReference<T> extends IDisposable {
-  readonly object: T;
-}
-
-export interface ITextModelService {
-  /**
-   * Provided a resource URI, it will return a model reference
-   * which should be disposed once not needed anymore.
-   */
-  createModelReference(resource: Uri): Promise<IReference<editor.ITextModel>>;
-
-  /**
-   * Registers a specific `scheme` content provider.
-   */
-  registerTextModelContentProvider(scheme: string, provider: any): IDisposable;
-}
-
-export class TextModelResolverService implements ITextModelService {
-  constructor(private readonly monaco: any) {}
-
-  public async createModelReference(resource: Uri): Promise<IReference<any>> {
-    let model = this.monaco.editor.getModel(resource);
-    if (!model) {
-      const result = await this.fetchText(resource);
-      if (!result) {
-        return new ImmortalReference(null);
-      } else {
-        model = this.monaco.editor.createModel(result.text, result.lang, resource);
-      }
-    }
-    return new ImmortalReference({ textEditorModel: model });
-  }
-
-  public registerTextModelContentProvider(scheme: string, provider: any): IDisposable {
-    return {
-      dispose() {
-        /* no op */
-      },
-    };
-  }
-
-  private async fetchText(resource: Uri) {
-    const repo = `${resource.authority}${resource.path}`;
-    const revision = resource.query;
-    const file = resource.fragment;
-    const response = await fetch(
-      npStart.core.http.basePath.prepend(`/api/code/repo/${repo}/blob/${revision}/${file}`)
-    );
-    if (response.status === 200) {
-      const contentType = response.headers.get('Content-Type');
-
-      if (contentType && contentType.startsWith('text/')) {
-        const lang = response.headers.get('lang');
-        const text = await response.text();
-        return { text, lang };
-      }
-    } else {
-      return null;
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/plugin.ts b/x-pack/legacy/plugins/code/public/plugin.ts
deleted file mode 100644
index 48b295ef67d9e1..00000000000000
--- a/x-pack/legacy/plugins/code/public/plugin.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { PluginInitializerContext, CoreSetup, CoreStart } from 'src/core/public';
-import { startApp } from './app';
-
-export class Plugin {
-  constructor(initializerContext: PluginInitializerContext) {}
-
-  public setup(core: CoreSetup) {
-    // called when plugin is setting up
-  }
-
-  public start(core: CoreStart) {
-    // called after all plugins are set up
-    startApp(core);
-  }
-
-  public stop() {
-    // called when plugin is torn down, aka window.onbeforeunload
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/reducers/blame.ts b/x-pack/legacy/plugins/code/public/reducers/blame.ts
deleted file mode 100644
index 65c9c1fce86d66..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/blame.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import produce from 'immer';
-import { Action, handleActions } from 'redux-actions';
-
-import { GitBlame } from '../../common/git_blame';
-import { loadBlame, loadBlameFailed, loadBlameSuccess } from '../actions/blame';
-import { routePathChange, repoChange, revisionChange, filePathChange } from '../actions/route';
-
-export interface BlameState {
-  blames: GitBlame[];
-  loading: boolean;
-  error?: Error;
-}
-
-const initialState: BlameState = {
-  blames: [],
-  loading: false,
-};
-
-const clearState = (state: BlameState) =>
-  produce<BlameState>(state, draft => {
-    draft.blames = initialState.blames;
-    draft.loading = initialState.loading;
-    draft.error = undefined;
-  });
-
-type BlameStatePayload = GitBlame[] & Error;
-
-export const blame = handleActions<BlameState, BlameStatePayload>(
-  {
-    [String(loadBlame)]: state =>
-      produce<BlameState>(state, draft => {
-        draft.loading = true;
-      }),
-    [String(loadBlameSuccess)]: (state, action: Action<GitBlame[]>) =>
-      produce<BlameState>(state, draft => {
-        draft.blames = action.payload!;
-        draft.loading = false;
-      }),
-    [String(loadBlameFailed)]: (state, action: Action<Error>) =>
-      produce<BlameState>(state, draft => {
-        draft.loading = false;
-        draft.error = action.payload;
-        draft.blames = [];
-      }),
-    [String(routePathChange)]: clearState,
-    [String(repoChange)]: clearState,
-    [String(revisionChange)]: clearState,
-    [String(filePathChange)]: clearState,
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/commit.ts b/x-pack/legacy/plugins/code/public/reducers/commit.ts
deleted file mode 100644
index 1c613f31e4d726..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/commit.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import produce from 'immer';
-import { Action, handleActions } from 'redux-actions';
-
-import { CommitDiff } from '../../common/git_diff';
-import { loadCommit, loadCommitFailed, loadCommitSuccess } from '../actions/commit';
-
-export interface CommitState {
-  commit: CommitDiff | null;
-  loading: boolean;
-}
-
-const initialState: CommitState = {
-  commit: null,
-  loading: false,
-};
-
-type CommitPayload = CommitDiff & Error;
-
-export const commit = handleActions<CommitState, CommitPayload>(
-  {
-    [String(loadCommit)]: state =>
-      produce<CommitState>(state, draft => {
-        draft.loading = true;
-      }),
-    [String(loadCommitSuccess)]: (state, action: Action<CommitDiff>) =>
-      produce<CommitState>(state, draft => {
-        draft.commit = action.payload!;
-        draft.loading = false;
-      }),
-    [String(loadCommitFailed)]: state =>
-      produce<CommitState>(state, draft => {
-        draft.commit = null;
-        draft.loading = false;
-      }),
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/editor.ts b/x-pack/legacy/plugins/code/public/reducers/editor.ts
deleted file mode 100644
index ed7dc780b4407e..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/editor.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 produce from 'immer';
-import { handleActions, Action } from 'redux-actions';
-import { Hover, TextDocumentPositionParams } from 'vscode-languageserver';
-import {
-  closePanel,
-  findReferences,
-  findReferencesFailed,
-  findReferencesSuccess,
-  GroupedRepoResults,
-  hoverResult,
-  revealPosition,
-  PanelResults,
-  findDefinitions,
-  findDefinitionsSuccess,
-  findDefinitionsFailed,
-} from '../actions';
-
-export interface EditorState {
-  loading: boolean;
-  panelShowing: 'references' | 'definitions' | undefined;
-  panelContents: GroupedRepoResults[];
-  hover?: Hover;
-  currentHover?: Hover;
-  refPayload?: TextDocumentPositionParams;
-  revealPosition?: Position;
-  panelTitle: string;
-}
-const initialState: EditorState = {
-  loading: false,
-  panelShowing: undefined,
-  panelContents: [],
-  panelTitle: '',
-};
-
-type EditorPayload = PanelResults & Hover & TextDocumentPositionParams & Position & string;
-
-function panelInit(draft: EditorState, action: Action<TextDocumentPositionParams>) {
-  draft.refPayload = action.payload!;
-  draft.loading = true;
-  draft.panelContents = initialState.panelContents;
-  draft.panelTitle = initialState.panelTitle;
-}
-
-function panelSuccess(draft: EditorState, action: Action<PanelResults>) {
-  const { title, repos } = action.payload!;
-  draft.panelContents = repos;
-  draft.panelTitle = title;
-  draft.loading = false;
-}
-function panelFailed(draft: EditorState) {
-  draft.panelContents = [];
-  draft.loading = false;
-  delete draft.refPayload;
-}
-
-export const editor = handleActions<EditorState, EditorPayload>(
-  {
-    [String(findReferences)]: (state, action: Action<TextDocumentPositionParams>) =>
-      produce<EditorState>(state, (draft: EditorState) => {
-        panelInit(draft, action);
-        draft.panelShowing = 'references';
-      }),
-    [String(findReferencesSuccess)]: (state, action: Action<PanelResults>) =>
-      produce<EditorState>(state, (draft: EditorState) => {
-        panelSuccess(draft, action);
-      }),
-    [String(findReferencesFailed)]: state =>
-      produce<EditorState>(state, (draft: EditorState) => {
-        panelFailed(draft);
-      }),
-    [String(findDefinitions)]: (state, action: Action<TextDocumentPositionParams>) =>
-      produce<EditorState>(state, (draft: EditorState) => {
-        panelInit(draft, action);
-        draft.panelShowing = 'definitions';
-      }),
-    [String(findDefinitionsSuccess)]: (state, action: Action<PanelResults>) =>
-      produce<EditorState>(state, (draft: EditorState) => {
-        panelSuccess(draft, action);
-      }),
-    [String(findDefinitionsFailed)]: state =>
-      produce<EditorState>(state, (draft: EditorState) => {
-        panelFailed(draft);
-      }),
-    [String(closePanel)]: state =>
-      produce<EditorState>(state, (draft: EditorState) => {
-        draft.panelShowing = undefined;
-        draft.loading = false;
-        delete draft.refPayload;
-        draft.panelContents = [];
-        draft.panelTitle = '';
-      }),
-    [String(hoverResult)]: (state, action: Action<Hover>) =>
-      produce<EditorState>(state, (draft: EditorState) => {
-        draft.currentHover = action.payload!;
-      }),
-    [String(revealPosition)]: (state, action: Action<Position>) =>
-      produce<EditorState>(state, (draft: EditorState) => {
-        draft.revealPosition = action.payload!;
-      }),
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/file.ts b/x-pack/legacy/plugins/code/public/reducers/file.ts
deleted file mode 100644
index 59bdaee2881229..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/file.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import produce from 'immer';
-import { handleActions, Action } from 'redux-actions';
-import {
-  fetchFileFailed,
-  FetchFileResponse,
-  fetchFileSuccess,
-  routeChange,
-  setNotFound,
-  fetchFile,
-  FetchFilePayload,
-} from '../actions';
-import { routePathChange, repoChange, revisionChange, filePathChange } from '../actions/route';
-
-export interface FileState {
-  file?: FetchFileResponse;
-  isNotFound: boolean;
-  loading: boolean;
-}
-
-const initialState: FileState = {
-  isNotFound: false,
-  loading: false,
-};
-
-const clearState = (state: FileState) =>
-  produce<FileState>(state, draft => {
-    draft.file = undefined;
-    draft.isNotFound = initialState.isNotFound;
-    draft.loading = initialState.loading;
-  });
-
-type FilePayload = FetchFileResponse & boolean & FetchFilePayload;
-
-export const file = handleActions<FileState, FilePayload>(
-  {
-    [String(fetchFile)]: (state, action: Action<FetchFilePayload>) =>
-      produce<FileState>(state, draft => {
-        draft.loading = true;
-      }),
-    [String(fetchFileSuccess)]: (state, action: Action<FetchFileResponse>) =>
-      produce<FileState>(state, draft => {
-        draft.file = action.payload;
-        draft.isNotFound = false;
-        draft.loading = false;
-      }),
-    [String(fetchFileFailed)]: state =>
-      produce<FileState>(state, draft => {
-        draft.file = undefined;
-        draft.loading = false;
-      }),
-    [String(setNotFound)]: (state, action: Action<boolean>) =>
-      produce<FileState>(state, draft => {
-        draft.isNotFound = action.payload!;
-        draft.loading = false;
-      }),
-    [String(routeChange)]: state =>
-      produce<FileState>(state, draft => {
-        draft.isNotFound = false;
-      }),
-    [String(routePathChange)]: clearState,
-    [String(repoChange)]: clearState,
-    [String(revisionChange)]: clearState,
-    [String(filePathChange)]: clearState,
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/file_tree.ts b/x-pack/legacy/plugins/code/public/reducers/file_tree.ts
deleted file mode 100644
index 6c9d69d646703e..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/file_tree.ts
+++ /dev/null
@@ -1,154 +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 produce from 'immer';
-import { Action, handleActions } from 'redux-actions';
-import { FileTree, FileTreeItemType, sortFileTree } from '../../model';
-import {
-  fetchRepoTree,
-  fetchRepoTreeFailed,
-  fetchRepoTreeSuccess,
-  RepoTreePayload,
-  fetchRootRepoTreeSuccess,
-  fetchRootRepoTreeFailed,
-  dirNotFound,
-  FetchRepoTreePayload,
-} from '../actions';
-import { routePathChange, repoChange, revisionChange } from '../actions/route';
-
-function mergeNode(a: FileTree, b: FileTree): FileTree {
-  const childrenMap: { [name: string]: FileTree } = {};
-  if (a.children) {
-    a.children.forEach(child => {
-      childrenMap[child.name] = child;
-    });
-  }
-  if (b.children) {
-    b.children.forEach(childB => {
-      const childA = childrenMap[childB.name];
-      if (childA) {
-        childrenMap[childB.name] = mergeNode(childA, childB);
-      } else {
-        childrenMap[childB.name] = childB;
-      }
-    });
-  }
-  return {
-    ...a,
-    ...b,
-    children: Object.values(childrenMap).sort(sortFileTree),
-  };
-}
-
-export function getPathOfTree(tree: FileTree, paths: string[]) {
-  let child: FileTree | undefined = tree;
-  for (const p of paths) {
-    if (child && child.children) {
-      child = child.children.find(c => c.name === p);
-    } else {
-      return null;
-    }
-  }
-  return child;
-}
-
-export interface FileTreeState {
-  tree: FileTree;
-  fileTreeLoadingPaths: string[];
-  // store not found directory as an array to calculate `notFound` flag by finding whether path is in this array
-  notFoundDirs: string[];
-  revision: string;
-}
-
-const initialState: FileTreeState = {
-  tree: {
-    name: '',
-    path: '',
-    type: FileTreeItemType.Directory,
-  },
-  fileTreeLoadingPaths: [''],
-  notFoundDirs: [],
-  revision: '',
-};
-
-const clearState = (state: FileTreeState) =>
-  produce<FileTreeState>(state, draft => {
-    draft.tree = initialState.tree;
-    draft.fileTreeLoadingPaths = initialState.fileTreeLoadingPaths;
-    draft.notFoundDirs = initialState.notFoundDirs;
-    draft.revision = initialState.revision;
-  });
-
-type FileTreePayload = FetchRepoTreePayload & RepoTreePayload & FileTree & string;
-
-export const fileTree = handleActions<FileTreeState, FileTreePayload>(
-  {
-    [String(fetchRepoTree)]: (state, action: Action<FetchRepoTreePayload>) =>
-      produce(state, draft => {
-        draft.fileTreeLoadingPaths.push(action.payload!.path);
-      }),
-    [String(fetchRepoTreeSuccess)]: (state, action: Action<RepoTreePayload>) =>
-      produce<FileTreeState>(state, draft => {
-        draft.revision = action.payload!.revision;
-        draft.notFoundDirs = draft.notFoundDirs.filter(dir => dir !== action.payload!.path);
-        draft.fileTreeLoadingPaths = draft.fileTreeLoadingPaths.filter(
-          p => p !== action.payload!.path && p !== ''
-        );
-        const { tree, path, withParents } = action.payload!;
-        let sortedTree: FileTree | undefined = tree;
-        while (sortedTree && sortedTree.children && sortedTree.children.length > 0) {
-          sortedTree.children = sortedTree.children.sort(sortFileTree);
-          // each time the tree should only have one child that has children
-          sortedTree = sortedTree.children.find(
-            child => child.children && child.children.length > 0
-          );
-        }
-        if (withParents || path === '/' || path === '') {
-          draft.tree = mergeNode(draft.tree, tree);
-        } else {
-          const parentsPath = path.split('/');
-          const lastPath = parentsPath.pop();
-          const parent = getPathOfTree(draft.tree, parentsPath);
-          if (parent) {
-            parent.children = parent.children || [];
-            const idx = parent.children.findIndex(c => c.name === lastPath);
-            if (idx >= 0) {
-              parent.children[idx] = tree;
-            } else {
-              parent.children.push(tree);
-            }
-          }
-        }
-      }),
-    [String(fetchRootRepoTreeSuccess)]: (
-      state,
-      action: Action<{ revision: string; tree: FileTree }>
-    ) =>
-      produce<FileTreeState>(state, draft => {
-        draft.fileTreeLoadingPaths = draft.fileTreeLoadingPaths.filter(p => p !== '/' && p !== '');
-        draft.tree = mergeNode(draft.tree, action.payload!.tree);
-        draft.revision = action.payload!.revision;
-      }),
-    [String(fetchRootRepoTreeFailed)]: state =>
-      produce<FileTreeState>(state, draft => {
-        draft.fileTreeLoadingPaths = draft.fileTreeLoadingPaths.filter(p => p !== '/' && p !== '');
-      }),
-    [String(dirNotFound)]: (state, action: Action<string>) =>
-      produce<FileTreeState>(state, draft => {
-        draft.notFoundDirs.push(action.payload!);
-      }),
-    [String(fetchRepoTreeFailed)]: (state, action: Action<FileTree>) =>
-      produce(state, draft => {
-        draft.fileTreeLoadingPaths = draft.fileTreeLoadingPaths.filter(
-          p => p !== action.payload!.path && p !== ''
-        );
-      }),
-    [String(routePathChange)]: clearState,
-    [String(repoChange)]: clearState,
-    [String(revisionChange)]: clearState,
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/index.ts b/x-pack/legacy/plugins/code/public/reducers/index.ts
deleted file mode 100644
index 4ae539b1b3f973..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/index.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { combineReducers, ReducersMapObject } from 'redux';
-
-import { blame, BlameState } from './blame';
-import { commit, CommitState } from './commit';
-import { editor, EditorState } from './editor';
-import { file, FileState } from './file';
-import { languageServer, LanguageServerState } from './language_server';
-import { repositoryManagement, RepositoryManagementState } from './repository_management';
-import { route, RouteState } from './route';
-import { search, SearchState } from './search';
-import { setup, SetupState } from './setup';
-import { shortcuts, ShortcutsState } from './shortcuts';
-import { status, StatusState } from './status';
-import { symbol, SymbolState } from './symbol';
-import { RevisionState, revision } from './revision';
-import { RepositoryState, repository } from './repository';
-import { fileTree, FileTreeState } from './file_tree';
-
-export interface RootState {
-  blame: BlameState;
-  commit: CommitState;
-  editor: EditorState;
-  file: FileState;
-  fileTree: FileTreeState;
-  languageServer: LanguageServerState;
-  repository: RepositoryState;
-  repositoryManagement: RepositoryManagementState;
-  revision: RevisionState;
-  route: RouteState;
-  search: SearchState;
-  setup: SetupState;
-  shortcuts: ShortcutsState;
-  status: StatusState;
-  symbol: SymbolState;
-}
-
-const reducers = {
-  blame,
-  commit,
-  editor,
-  file,
-  fileTree,
-  languageServer,
-  repository,
-  repositoryManagement,
-  revision,
-  route,
-  search,
-  setup,
-  shortcuts,
-  status,
-  symbol,
-};
-
-export const rootReducer = combineReducers<RootState>(reducers as ReducersMapObject);
diff --git a/x-pack/legacy/plugins/code/public/reducers/language_server.ts b/x-pack/legacy/plugins/code/public/reducers/language_server.ts
deleted file mode 100644
index d4755e249f3b4c..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/language_server.ts
+++ /dev/null
@@ -1,66 +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 produce from 'immer';
-import { Action, handleActions } from 'redux-actions';
-
-import { LanguageServer, LanguageServerStatus } from '../../common/language_server';
-import {
-  loadLanguageServers,
-  loadLanguageServersFailed,
-  loadLanguageServersSuccess,
-  requestInstallLanguageServer,
-  requestInstallLanguageServerSuccess,
-} from '../actions/language_server';
-
-export interface LanguageServerState {
-  languageServers: LanguageServer[];
-  loading: boolean;
-  installServerLoading: { [ls: string]: boolean };
-}
-
-const initialState: LanguageServerState = {
-  languageServers: [],
-  loading: false,
-  installServerLoading: {},
-};
-
-type LanguageServerPayload = string & LanguageServer[];
-
-export const languageServer = handleActions<LanguageServerState, LanguageServerPayload>(
-  {
-    [String(loadLanguageServers)]: state =>
-      produce<LanguageServerState>(state, draft => {
-        draft.loading = true;
-      }),
-    [String(loadLanguageServersSuccess)]: (
-      state: LanguageServerState,
-      action: Action<LanguageServer[]>
-    ) =>
-      produce<LanguageServerState>(state, draft => {
-        draft.languageServers = action.payload!;
-        draft.loading = false;
-      }),
-    [String(loadLanguageServersFailed)]: state =>
-      produce<LanguageServerState>(state, draft => {
-        draft.languageServers = [];
-        draft.loading = false;
-      }),
-    [String(requestInstallLanguageServer)]: (state, action: Action<string>) =>
-      produce<LanguageServerState>(state, draft => {
-        draft.installServerLoading[action.payload!] = true;
-      }),
-    [String(requestInstallLanguageServerSuccess)]: (
-      state: LanguageServerState,
-      action: Action<string>
-    ) =>
-      produce<LanguageServerState>(state, draft => {
-        draft.installServerLoading[action.payload!] = false;
-        draft.languageServers.find(ls => ls.name === action.payload)!.status =
-          LanguageServerStatus.READY;
-      }),
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/repository.ts b/x-pack/legacy/plugins/code/public/reducers/repository.ts
deleted file mode 100644
index 2ef4e4c09fbabf..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/repository.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import produce from 'immer';
-import { Action, handleActions } from 'redux-actions';
-
-import { Repository } from '../../model';
-
-import { loadRepo, loadRepoSuccess, loadRepoFailed } from '../actions';
-import { routePathChange, repoChange } from '../actions/route';
-
-export interface RepositoryState {
-  repository?: Repository;
-  repoNotFound: boolean;
-}
-
-const initialState: RepositoryState = {
-  repoNotFound: false,
-};
-
-const clearState = (state: RepositoryState) =>
-  produce<RepositoryState>(state, draft => {
-    draft.repository = undefined;
-    draft.repoNotFound = initialState.repoNotFound;
-  });
-
-export const repository = handleActions<RepositoryState, Repository>(
-  {
-    [String(loadRepo)]: state =>
-      produce<RepositoryState>(state, draft => {
-        draft.repository = undefined;
-        draft.repoNotFound = false;
-      }),
-    [String(loadRepoSuccess)]: (state, action: Action<Repository>) =>
-      produce<RepositoryState>(state, draft => {
-        draft.repository = action.payload;
-        draft.repoNotFound = false;
-      }),
-    [String(loadRepoFailed)]: state =>
-      produce<RepositoryState>(state, draft => {
-        draft.repository = undefined;
-        draft.repoNotFound = true;
-      }),
-    [String(routePathChange)]: clearState,
-    [String(repoChange)]: clearState,
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/repository_management.ts b/x-pack/legacy/plugins/code/public/reducers/repository_management.ts
deleted file mode 100644
index 217aead14f48f7..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/repository_management.ts
+++ /dev/null
@@ -1,143 +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 produce from 'immer';
-import { Action, handleActions } from 'redux-actions';
-
-import { i18n } from '@kbn/i18n';
-import { Repository, RepoConfigs, RepositoryConfig } from '../../model';
-
-import {
-  closeToast,
-  deleteRepoFinished,
-  fetchRepos,
-  fetchReposFailed,
-  fetchReposSuccess,
-  importRepo,
-  importRepoFailed,
-  importRepoSuccess,
-  fetchRepoConfigSuccess,
-  loadConfigsSuccess,
-  RepoLangserverConfigs,
-} from '../actions';
-
-export enum ToastType {
-  danger = 'danger',
-  success = 'success',
-  warning = 'warning',
-}
-
-export interface RepositoryManagementState {
-  repoConfigs?: RepoConfigs;
-  repoLangseverConfigs: { [key: string]: RepositoryConfig };
-  repositories: Repository[];
-  error?: Error;
-  loading: boolean;
-  importLoading: boolean;
-  showToast: boolean;
-  toastMessage?: string;
-  toastType?: ToastType;
-}
-
-const initialState: RepositoryManagementState = {
-  repositories: [],
-  repoLangseverConfigs: {},
-  loading: false,
-  importLoading: false,
-  showToast: false,
-};
-
-type RepositoryManagementStatePayload = RepoConfigs &
-  RepoLangserverConfigs &
-  Repository &
-  RepositoryConfig &
-  Repository[] &
-  Error &
-  string;
-
-export const repositoryManagement = handleActions<
-  RepositoryManagementState,
-  RepositoryManagementStatePayload
->(
-  {
-    [String(fetchRepos)]: state =>
-      produce<RepositoryManagementState>(state, draft => {
-        draft.loading = true;
-      }),
-    [String(fetchReposSuccess)]: (state, action: Action<Repository[]>) =>
-      produce<RepositoryManagementState>(state, draft => {
-        draft.loading = false;
-        draft.repositories = action.payload || [];
-      }),
-    [String(fetchReposFailed)]: (state, action: Action<Error>) => {
-      if (action.payload) {
-        return produce<RepositoryManagementState>(state, draft => {
-          draft.error = action.payload;
-          draft.loading = false;
-        });
-      } else {
-        return state;
-      }
-    },
-    [String(deleteRepoFinished)]: (state, action: Action<string>) =>
-      produce<RepositoryManagementState>(state, draft => {
-        draft.repositories = state.repositories.filter(repo => repo.uri !== action.payload);
-      }),
-    [String(importRepo)]: state =>
-      produce<RepositoryManagementState>(state, draft => {
-        draft.importLoading = true;
-      }),
-    [String(importRepoSuccess)]: (state, action: Action<Repository>) =>
-      // TODO is it possible and how to deal with action.payload === undefined?
-      produce<RepositoryManagementState>(state, draft => {
-        draft.importLoading = false;
-        draft.showToast = true;
-        draft.toastType = ToastType.success;
-        draft.toastMessage = i18n.translate(
-          'xpack.code.repositoryManagement.repoSubmittedMessage',
-          {
-            defaultMessage: '{name} has been successfully submitted!',
-            values: { name: action.payload!.name },
-          }
-        );
-        draft.repositories = [...state.repositories, action.payload!];
-      }),
-    [String(importRepoFailed)]: (state, action: Action<any>) =>
-      produce<RepositoryManagementState>(state, draft => {
-        if (action.payload) {
-          if (action.payload.response && action.payload.response.status === 304) {
-            draft.toastMessage = i18n.translate(
-              'xpack.code.repositoryManagement.repoImportedMessage',
-              {
-                defaultMessage: 'This Repository has already been imported!',
-              }
-            );
-            draft.showToast = true;
-            draft.toastType = ToastType.warning;
-            draft.importLoading = false;
-          } else {
-            // TODO add localication for those messages
-            draft.toastMessage = action.payload.body.message;
-            draft.showToast = true;
-            draft.toastType = ToastType.danger;
-            draft.importLoading = false;
-          }
-        }
-      }),
-    [String(closeToast)]: state =>
-      produce<RepositoryManagementState>(state, draft => {
-        draft.showToast = false;
-      }),
-    [String(fetchRepoConfigSuccess)]: (state, action: Action<RepoConfigs>) =>
-      produce<RepositoryManagementState>(state, draft => {
-        draft.repoConfigs = action.payload;
-      }),
-    [String(loadConfigsSuccess)]: (state, action: Action<RepoLangserverConfigs>) =>
-      produce<RepositoryManagementState>(state, draft => {
-        draft.repoLangseverConfigs = action.payload!;
-      }),
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/revision.ts b/x-pack/legacy/plugins/code/public/reducers/revision.ts
deleted file mode 100644
index 3c4839ec9aa4b8..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/revision.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import produce from 'immer';
-import { handleActions, Action } from 'redux-actions';
-import { CommitInfo, ReferenceInfo, ReferenceType } from '../../model/commit';
-import {
-  fetchMoreCommits,
-  fetchRepoBranchesSuccess,
-  fetchRepoCommitsSuccess,
-  fetchTreeCommits,
-  fetchTreeCommitsFailed,
-  fetchTreeCommitsSuccess,
-  TreeCommitPayload,
-} from '../actions';
-import { routePathChange, repoChange } from '../actions/route';
-
-export interface RevisionState {
-  branches: ReferenceInfo[];
-  tags: ReferenceInfo[];
-  treeCommits: { [path: string]: CommitInfo[] };
-  loadingCommits: boolean;
-  commitsFullyLoaded: { [path: string]: boolean };
-}
-
-const initialState: RevisionState = {
-  branches: [],
-  tags: [],
-  treeCommits: {},
-  loadingCommits: false,
-  commitsFullyLoaded: {},
-};
-
-const clearState = (state: RevisionState) =>
-  produce<RevisionState>(state, draft => {
-    draft.branches = initialState.branches;
-    draft.tags = initialState.tags;
-    draft.treeCommits = initialState.treeCommits;
-    draft.loadingCommits = initialState.loadingCommits;
-    draft.commitsFullyLoaded = initialState.commitsFullyLoaded;
-  });
-
-type RevisionPayload = ReferenceInfo[] & CommitInfo[] & TreeCommitPayload;
-
-export const revision = handleActions<RevisionState, RevisionPayload>(
-  {
-    [String(fetchRepoCommitsSuccess)]: (state, action: Action<CommitInfo[]>) =>
-      produce<RevisionState>(state, draft => {
-        draft.treeCommits[''] = action.payload!;
-        draft.loadingCommits = false;
-      }),
-    [String(fetchMoreCommits)]: state =>
-      produce<RevisionState>(state, draft => {
-        draft.loadingCommits = true;
-      }),
-    [String(fetchRepoBranchesSuccess)]: (state, action: Action<ReferenceInfo[]>) =>
-      produce<RevisionState>(state, draft => {
-        const references = action.payload!;
-        draft.tags = references.filter(r => r.type === ReferenceType.TAG);
-        draft.branches = references.filter(r => r.type !== ReferenceType.TAG);
-      }),
-    [String(fetchTreeCommits)]: state =>
-      produce<RevisionState>(state, draft => {
-        draft.loadingCommits = true;
-      }),
-    [String(fetchTreeCommitsFailed)]: state =>
-      produce<RevisionState>(state, draft => {
-        draft.loadingCommits = false;
-      }),
-    [String(fetchTreeCommitsSuccess)]: (state, action: Action<TreeCommitPayload>) =>
-      produce<RevisionState>(state, draft => {
-        const { path, commits, append } = action.payload!;
-        if (commits.length === 0) {
-          draft.commitsFullyLoaded[path] = true;
-        } else if (append) {
-          draft.treeCommits[path] = draft.treeCommits[path].concat(commits);
-        } else {
-          draft.treeCommits[path] = commits;
-        }
-        draft.loadingCommits = false;
-      }),
-    [String(routePathChange)]: clearState,
-    [String(repoChange)]: clearState,
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/route.ts b/x-pack/legacy/plugins/code/public/reducers/route.ts
deleted file mode 100644
index c6d9e50dc6d83f..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/route.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import produce from 'immer';
-import { Action, handleActions } from 'redux-actions';
-
-import { routeChange } from '../actions';
-
-export interface RouteState {
-  match: any;
-  previousMatch?: any;
-}
-
-const initialState: RouteState = {
-  match: {},
-};
-
-export const route = handleActions(
-  {
-    [String(routeChange)]: (state: RouteState, action: Action<any>) =>
-      produce<RouteState>(state, draft => {
-        draft.previousMatch = state.match;
-        draft.match = action.payload;
-      }),
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/search.ts b/x-pack/legacy/plugins/code/public/reducers/search.ts
deleted file mode 100644
index 391f6ac76640ed..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/search.ts
+++ /dev/null
@@ -1,243 +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 produce from 'immer';
-import querystring from 'querystring';
-import { Action, handleActions } from 'redux-actions';
-import { history } from '../utils/url';
-
-import {
-  DocumentSearchResult,
-  RepositoryUri,
-  SearchOptions,
-  SearchScope,
-  RepositorySearchResult,
-  Repository,
-} from '../../model';
-import {
-  changeSearchScope,
-  documentSearch as documentSearchQuery,
-  documentSearchFailed,
-  DocumentSearchPayload,
-  documentSearchSuccess,
-  repositorySearch as repositorySearchAction,
-  repositorySearchFailed,
-  RepositorySearchPayload,
-  repositorySearchSuccess,
-  saveSearchOptions,
-  searchReposForScope,
-  searchReposForScopeSuccess,
-  suggestionSearch,
-  turnOffDefaultRepoScope,
-  turnOnDefaultRepoScope,
-} from '../actions';
-import { RepositoryUtils } from '../../common/repository_utils';
-
-export interface SearchState {
-  scope: SearchScope;
-  query: string;
-  page?: number;
-  languages?: Set<string>;
-  repositories?: Set<RepositoryUri>;
-  isLoading: boolean;
-  isScopeSearchLoading: boolean;
-  error?: Error;
-  documentSearchResults?: DocumentSearchResult;
-  repositorySearchResults?: any;
-  searchOptions: SearchOptions;
-  scopeSearchResults: RepositorySearchResult;
-}
-
-const repositories: Repository[] = [];
-
-const getRepoScopeFromUrl = () => {
-  const { repoScope } = querystring.parse(history.location.search.replace('?', ''));
-  if (repoScope) {
-    return String(repoScope)
-      .split(',')
-      .map(r => ({
-        uri: r,
-        org: RepositoryUtils.orgNameFromUri(r),
-        name: RepositoryUtils.repoNameFromUri(r),
-      })) as Repository[];
-  } else {
-    return [];
-  }
-};
-
-const initialState: SearchState = {
-  query: '',
-  isLoading: false,
-  isScopeSearchLoading: false,
-  scope: SearchScope.DEFAULT,
-  searchOptions: {
-    repoScope: getRepoScopeFromUrl(),
-    defaultRepoScopeOn: false,
-  },
-  scopeSearchResults: { repositories, total: 0, took: 0 },
-};
-
-type SearchPayload = DocumentSearchPayload &
-  DocumentSearchResult &
-  Error &
-  string &
-  SearchScope &
-  SearchOptions &
-  Repository &
-  RepositorySearchResult;
-
-export const search = handleActions<SearchState, SearchPayload>(
-  {
-    [String(changeSearchScope)]: (state: SearchState, action: Action<SearchScope>) =>
-      produce<SearchState>(state, draft => {
-        if (action.payload && Object.values(SearchScope).includes(action.payload)) {
-          draft.scope = action.payload!;
-        } else {
-          draft.scope = SearchScope.DEFAULT;
-        }
-        draft.isLoading = false;
-      }),
-    [String(documentSearchQuery)]: (state: SearchState, action: Action<DocumentSearchPayload>) =>
-      produce<SearchState>(state, draft => {
-        if (action.payload) {
-          draft.query = action.payload.query;
-          draft.page = parseInt(action.payload.page as string, 10);
-          if (action.payload.languages) {
-            draft.languages = new Set(decodeURIComponent(action.payload.languages).split(','));
-          } else {
-            draft.languages = new Set();
-          }
-          if (action.payload.repositories) {
-            draft.repositories = new Set(
-              decodeURIComponent(action.payload.repositories).split(',')
-            );
-          } else {
-            draft.repositories = new Set();
-          }
-          draft.isLoading = true;
-          delete draft.error;
-        }
-      }),
-    [String(documentSearchSuccess)]: (state: SearchState, action: Action<DocumentSearchResult>) =>
-      produce<SearchState>(state, (draft: SearchState) => {
-        const {
-          from,
-          page,
-          totalPage,
-          results,
-          total,
-          repoAggregations,
-          langAggregations,
-          took,
-        } = action.payload!;
-        draft.isLoading = false;
-
-        const repoStats = repoAggregations!.map(agg => {
-          return {
-            name: agg.key,
-            value: agg.doc_count,
-          };
-        });
-
-        const languageStats = langAggregations!.map(agg => {
-          return {
-            name: agg.key,
-            value: agg.doc_count,
-          };
-        });
-
-        draft.documentSearchResults = {
-          ...draft.documentSearchResults,
-          query: state.query,
-          total,
-          took,
-          stats: {
-            total,
-            from: from as number,
-            to: from! + results!.length,
-            page: page!,
-            totalPage: totalPage!,
-            repoStats,
-            languageStats,
-          },
-          results,
-        };
-      }),
-    [String(documentSearchFailed)]: (state: SearchState, action: Action<Error>) => {
-      if (action.payload) {
-        return produce<SearchState>(state, draft => {
-          draft.isLoading = false;
-          draft.error = action.payload!;
-        });
-      } else {
-        return state;
-      }
-    },
-    [String(suggestionSearch)]: (state: SearchState, action: Action<string>) =>
-      produce<SearchState>(state, draft => {
-        if (action.payload) {
-          draft.query = action.payload;
-        }
-      }),
-    [String(repositorySearchAction)]: (
-      state: SearchState,
-      action: Action<RepositorySearchPayload>
-    ) =>
-      produce<SearchState>(state, draft => {
-        if (action.payload) {
-          draft.query = action.payload.query;
-          draft.isLoading = true;
-          delete draft.error;
-          delete draft.repositorySearchResults;
-        }
-      }),
-    [String(repositorySearchSuccess)]: (
-      state: SearchState,
-      action: Action<RepositorySearchResult>
-    ) =>
-      produce<SearchState>(state, draft => {
-        draft.repositorySearchResults = action.payload;
-        draft.isLoading = false;
-      }),
-    [String(repositorySearchFailed)]: (state: SearchState, action: Action<Error>) => {
-      if (action.payload) {
-        return produce<SearchState>(state, draft => {
-          draft.isLoading = false;
-          draft.error = action.payload;
-        });
-      } else {
-        return state;
-      }
-    },
-    [String(saveSearchOptions)]: (state: SearchState, action: Action<SearchOptions>) =>
-      produce<SearchState>(state, draft => {
-        draft.searchOptions = action.payload!;
-      }),
-    [String(searchReposForScope)]: (state: SearchState, action: Action<RepositorySearchPayload>) =>
-      produce<SearchState>(state, draft => {
-        draft.isScopeSearchLoading = true;
-      }),
-    [String(searchReposForScopeSuccess)]: (
-      state: SearchState,
-      action: Action<RepositorySearchResult>
-    ) =>
-      produce<SearchState>(state, draft => {
-        draft.scopeSearchResults = action.payload!;
-        draft.isScopeSearchLoading = false;
-      }),
-    [String(turnOnDefaultRepoScope)]: (state: SearchState, action: Action<Repository>) =>
-      produce<SearchState>(state, draft => {
-        draft.searchOptions.defaultRepoScope = action.payload;
-        draft.searchOptions.defaultRepoScopeOn = true;
-      }),
-    [String(turnOffDefaultRepoScope)]: (state: SearchState) =>
-      produce<SearchState>(state, draft => {
-        delete draft.searchOptions.defaultRepoScope;
-        draft.searchOptions.defaultRepoScopeOn = false;
-      }),
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/setup.ts b/x-pack/legacy/plugins/code/public/reducers/setup.ts
deleted file mode 100644
index c7850f527828f3..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/setup.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import produce from 'immer';
-import { handleActions } from 'redux-actions';
-
-import { checkSetupFailed, checkSetupSuccess } from '../actions';
-
-export interface SetupState {
-  ok?: boolean;
-}
-
-const initialState: SetupState = {};
-
-export const setup = handleActions<SetupState>(
-  {
-    [String(checkSetupFailed)]: state =>
-      produce<SetupState>(state, draft => {
-        draft.ok = false;
-      }),
-    [String(checkSetupSuccess)]: state =>
-      produce<SetupState>(state, draft => {
-        draft.ok = true;
-      }),
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/shortcuts.ts b/x-pack/legacy/plugins/code/public/reducers/shortcuts.ts
deleted file mode 100644
index 655a3fecee72a8..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/shortcuts.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import produce from 'immer';
-import { Action, handleActions } from 'redux-actions';
-
-import { registerShortcut, toggleHelp, unregisterShortcut } from '../actions';
-import { HotKey } from '../components/shortcuts';
-
-export interface ShortcutsState {
-  showHelp: boolean;
-  shortcuts: HotKey[];
-}
-
-const helpShortcut: HotKey = {
-  key: '?',
-  help: 'Display this page',
-  modifier: new Map(),
-  onPress: dispatch => {
-    dispatch(toggleHelp(null));
-  },
-};
-
-const initialState: ShortcutsState = {
-  showHelp: false,
-  shortcuts: [helpShortcut],
-};
-
-type ShortcutPayload = boolean & null & HotKey;
-
-export const shortcuts = handleActions<ShortcutsState, ShortcutPayload>(
-  {
-    [String(toggleHelp)]: (state, action: Action<boolean | null>) =>
-      produce<ShortcutsState>(state, draft => {
-        if (action.payload === null) {
-          draft.showHelp = !state.showHelp;
-        } else {
-          draft.showHelp = action.payload!;
-        }
-      }),
-    [String(registerShortcut)]: (state, action: Action<HotKey>) =>
-      produce<ShortcutsState>(state, draft => {
-        const hotKey = action.payload as HotKey;
-        draft.shortcuts.push(hotKey);
-      }),
-    [String(unregisterShortcut)]: (state, action: Action<HotKey>) =>
-      produce<ShortcutsState>(state, draft => {
-        const hotKey = action.payload as HotKey;
-        const idx = state.shortcuts.indexOf(hotKey);
-        if (idx >= 0) {
-          draft.shortcuts.splice(idx, 1);
-        }
-      }),
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/status.ts b/x-pack/legacy/plugins/code/public/reducers/status.ts
deleted file mode 100644
index 4e57d5e7e7565c..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/status.ts
+++ /dev/null
@@ -1,236 +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 produce from 'immer';
-import { Action, handleActions } from 'redux-actions';
-
-import {
-  RepositoryUri,
-  WorkerProgress,
-  WorkerReservedProgress,
-  IndexWorkerProgress,
-  CloneWorkerProgress,
-  RepoState,
-} from '../../model';
-import {
-  deleteRepoFinished,
-  FetchFilePayload,
-  FetchRepoFileStatusSuccess,
-  loadStatus,
-  loadStatusFailed,
-  loadStatusSuccess,
-  updateCloneProgress,
-  updateDeleteProgress,
-  updateIndexProgress,
-  StatusSuccessPayload,
-  RepoStatus,
-  FetchRepoFileStatus,
-} from '../actions';
-import { StatusReport } from '../../common/repo_file_status';
-
-export interface StatusState {
-  status: { [key: string]: RepoStatus };
-  loading: boolean;
-  error?: Error;
-  currentStatusPath?: FetchFilePayload;
-  repoFileStatus?: StatusReport;
-}
-
-const initialState: StatusState = {
-  status: {},
-  loading: false,
-};
-
-type StatusPayload = RepoStatus & Error & StatusSuccessPayload & string;
-
-const getIndexState = (indexStatus: IndexWorkerProgress) => {
-  const progress = indexStatus.progress;
-  if (
-    progress === WorkerReservedProgress.ERROR ||
-    progress === WorkerReservedProgress.TIMEOUT ||
-    progress < WorkerReservedProgress.INIT
-  ) {
-    return RepoState.INDEX_ERROR;
-  } else if (progress < WorkerReservedProgress.COMPLETED) {
-    return RepoState.INDEXING;
-  } else if (progress === WorkerReservedProgress.COMPLETED) {
-    return RepoState.READY;
-  }
-  return RepoState.UNKNOWN;
-};
-
-const getGitState = (gitStatus: CloneWorkerProgress) => {
-  const progress = gitStatus.progress;
-  if (
-    progress === WorkerReservedProgress.ERROR ||
-    progress === WorkerReservedProgress.TIMEOUT ||
-    progress < WorkerReservedProgress.INIT
-  ) {
-    return RepoState.CLONE_ERROR;
-  } else if (progress < WorkerReservedProgress.COMPLETED) {
-    if (gitStatus.cloneProgress && gitStatus.cloneProgress.isCloned) {
-      return RepoState.UPDATING;
-    }
-    return RepoState.CLONING;
-  } else if (progress === WorkerReservedProgress.COMPLETED) {
-    return RepoState.READY;
-  }
-  return RepoState.UNKNOWN;
-};
-
-const getDeleteState = (deleteStatus: WorkerProgress) => {
-  const progress = deleteStatus.progress;
-  if (
-    progress === WorkerReservedProgress.ERROR ||
-    progress === WorkerReservedProgress.TIMEOUT ||
-    progress < WorkerReservedProgress.INIT
-  ) {
-    return RepoState.DELETE_ERROR;
-  } else if (progress < WorkerReservedProgress.COMPLETED) {
-    return RepoState.DELETING;
-  } else {
-    return RepoState.UNKNOWN;
-  }
-};
-
-export const status = handleActions<StatusState, StatusPayload>(
-  {
-    [String(loadStatus)]: state =>
-      produce<StatusState>(state, draft => {
-        draft.loading = true;
-      }),
-    [String(loadStatusSuccess)]: (state, action: Action<StatusSuccessPayload>) =>
-      produce<StatusState>(state, draft => {
-        draft.loading = false;
-        Object.keys(action.payload!).forEach((repoUri: RepositoryUri) => {
-          const statuses = action.payload![repoUri]!;
-          if (statuses.deleteStatus) {
-            // 1. Look into delete status first
-            const deleteState = getDeleteState(statuses.deleteStatus);
-            draft.status[repoUri] = {
-              ...statuses.deleteStatus,
-              state: deleteState,
-            };
-            return;
-          } else {
-            // 2. Then take the index state and git clone state into
-            // account in the meantime.
-            let indexState = RepoState.UNKNOWN;
-            if (statuses.indexStatus) {
-              indexState = getIndexState(statuses.indexStatus);
-            }
-            let gitState = RepoState.UNKNOWN;
-            if (statuses.gitStatus) {
-              gitState = getGitState(statuses.gitStatus);
-            }
-
-            if (statuses.gitStatus) {
-              // Git state has higher priority over index state
-              if (gitState === RepoState.CLONING || gitState === RepoState.CLONE_ERROR) {
-                draft.status[repoUri] = {
-                  ...statuses.gitStatus,
-                  state: gitState,
-                };
-                return;
-              } else if (gitState === RepoState.READY && !statuses.indexStatus) {
-                // If git state is ready and index status is not there, then return
-                // the git status
-                draft.status[repoUri] = {
-                  ...statuses.gitStatus,
-                  state: gitState,
-                };
-                return;
-              }
-            }
-
-            if (statuses.indexStatus) {
-              draft.status[repoUri] = {
-                ...statuses.indexStatus,
-                state: indexState,
-              };
-              return;
-            }
-
-            // If non of delete/git/index status exists, then do nothing here.
-          }
-        });
-      }),
-    [String(loadStatusFailed)]: (state, action: Action<Error>) =>
-      produce<StatusState>(state, draft => {
-        draft.loading = false;
-        draft.error = action.payload;
-      }),
-    [String(updateCloneProgress)]: (state, action: Action<RepoStatus>) =>
-      produce<StatusState>(state, draft => {
-        const progress = action.payload!.progress;
-        let s = RepoState.CLONING;
-        if (
-          progress === WorkerReservedProgress.ERROR ||
-          progress === WorkerReservedProgress.TIMEOUT
-        ) {
-          s = RepoState.CLONE_ERROR;
-        } else if (progress === WorkerReservedProgress.COMPLETED) {
-          s = RepoState.READY;
-        }
-        draft.status[action.payload!.uri] = {
-          ...action.payload!,
-          state: s,
-        };
-      }),
-    [String(updateIndexProgress)]: (state, action: Action<RepoStatus>) =>
-      produce<StatusState>(state, draft => {
-        const progress = action.payload!.progress;
-        let s = RepoState.INDEXING;
-        if (
-          progress === WorkerReservedProgress.ERROR ||
-          progress === WorkerReservedProgress.TIMEOUT
-        ) {
-          s = RepoState.INDEX_ERROR;
-        } else if (progress === WorkerReservedProgress.COMPLETED) {
-          s = RepoState.READY;
-        }
-        draft.status[action.payload!.uri] = {
-          ...action.payload!,
-          state: s,
-        };
-      }),
-    [String(updateDeleteProgress)]: (state, action: Action<RepoStatus>) =>
-      produce<StatusState>(state, draft => {
-        const progress = action.payload!.progress;
-        if (progress === WorkerReservedProgress.COMPLETED) {
-          delete draft.status[action.payload!.uri];
-        } else {
-          let s = RepoState.DELETING;
-          if (
-            progress === WorkerReservedProgress.ERROR ||
-            progress === WorkerReservedProgress.TIMEOUT
-          ) {
-            s = RepoState.DELETE_ERROR;
-          }
-
-          draft.status[action.payload!.uri] = {
-            ...action.payload!,
-            state: s,
-          };
-        }
-      }),
-    [String(deleteRepoFinished)]: (state, action: Action<string>) =>
-      produce<StatusState>(state, draft => {
-        delete draft.status[action.payload!];
-      }),
-    [String(FetchRepoFileStatusSuccess)]: (state: StatusState, action: Action<any>) =>
-      produce<StatusState>(state, (draft: StatusState) => {
-        const { path, statusReport } = action.payload;
-        draft.repoFileStatus = statusReport;
-        draft.currentStatusPath = path;
-      }),
-    [String(FetchRepoFileStatus)]: (state: StatusState, action: Action<any>) =>
-      produce<StatusState>(state, (draft: StatusState) => {
-        draft.currentStatusPath = action.payload;
-      }),
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/reducers/symbol.ts b/x-pack/legacy/plugins/code/public/reducers/symbol.ts
deleted file mode 100644
index 33d92953c69a74..00000000000000
--- a/x-pack/legacy/plugins/code/public/reducers/symbol.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import produce from 'immer';
-import _ from 'lodash';
-import { Action, handleActions } from 'redux-actions';
-
-import { DocumentSymbol } from 'vscode-languageserver-types';
-import {
-  closeSymbolPath,
-  loadStructure,
-  loadStructureFailed,
-  loadStructureSuccess,
-  openSymbolPath,
-  SymbolsPayload,
-  SymbolWithMembers,
-} from '../actions';
-import { languageServerInitializing } from '../actions/language_server';
-import { routePathChange, repoChange, revisionChange, filePathChange } from '../actions/route';
-
-export interface SymbolState {
-  symbols: { [key: string]: DocumentSymbol[] };
-  structureTree: { [key: string]: SymbolWithMembers[] };
-  error?: Error;
-  loading: boolean;
-  lastRequestPath?: string;
-  closedPaths: string[];
-  languageServerInitializing: boolean;
-}
-
-const initialState: SymbolState = {
-  symbols: {},
-  loading: false,
-  structureTree: {},
-  closedPaths: [],
-  languageServerInitializing: false,
-};
-
-const clearState = (state: SymbolState) =>
-  produce<SymbolState>(state, draft => {
-    draft.symbols = initialState.symbols;
-    draft.loading = initialState.loading;
-    draft.structureTree = initialState.structureTree;
-    draft.closedPaths = initialState.closedPaths;
-    draft.languageServerInitializing = initialState.languageServerInitializing;
-    draft.error = undefined;
-    draft.lastRequestPath = undefined;
-  });
-
-type SymbolPayload = string & SymbolsPayload & Error;
-
-export const symbol = handleActions<SymbolState, SymbolPayload>(
-  {
-    [String(loadStructure)]: (state, action: Action<string>) =>
-      produce<SymbolState>(state, draft => {
-        draft.loading = true;
-        draft.lastRequestPath = action.payload || '';
-      }),
-    [String(loadStructureSuccess)]: (state, action: Action<SymbolsPayload>) =>
-      produce<SymbolState>(state, draft => {
-        draft.loading = false;
-        const { path, data, structureTree } = action.payload!;
-        draft.structureTree[path] = structureTree;
-        draft.symbols = {
-          ...state.symbols,
-          [path]: data,
-        };
-        draft.languageServerInitializing = false;
-        draft.error = undefined;
-      }),
-    [String(loadStructureFailed)]: (state, action: Action<Error>) =>
-      produce<SymbolState>(state, draft => {
-        if (action.payload) {
-          draft.loading = false;
-          draft.error = action.payload;
-        }
-        draft.languageServerInitializing = false;
-      }),
-    [String(closeSymbolPath)]: (state, action: Action<string>) =>
-      produce<SymbolState>(state, draft => {
-        const path = action.payload!;
-        if (!state.closedPaths.includes(path)) {
-          draft.closedPaths.push(path);
-        }
-      }),
-    [String(openSymbolPath)]: (state, action: Action<string>) =>
-      produce<SymbolState>(state, draft => {
-        const idx = state.closedPaths.indexOf(action.payload!);
-        if (idx >= 0) {
-          draft.closedPaths.splice(idx, 1);
-        }
-      }),
-    [String(languageServerInitializing)]: state =>
-      produce<SymbolState>(state, draft => {
-        draft.languageServerInitializing = true;
-      }),
-    [String(routePathChange)]: clearState,
-    [String(repoChange)]: clearState,
-    [String(revisionChange)]: clearState,
-    [String(filePathChange)]: clearState,
-  },
-  initialState
-);
diff --git a/x-pack/legacy/plugins/code/public/sagas/blame.ts b/x-pack/legacy/plugins/code/public/sagas/blame.ts
deleted file mode 100644
index c5a39d49311377..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/blame.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Action } from 'redux-actions';
-import { npStart } from 'ui/new_platform';
-import { call, put, takeEvery } from 'redux-saga/effects';
-import { Match } from '../actions';
-import { loadBlame, loadBlameFailed, LoadBlamePayload, loadBlameSuccess } from '../actions/blame';
-import { blamePattern } from './patterns';
-
-export function requestBlame(repoUri: string, revision: string, path: string) {
-  return npStart.core.http.get(
-    `/api/code/repo/${repoUri}/blame/${encodeURIComponent(revision)}/${path}`
-  );
-}
-
-function* handleFetchBlame(action: Action<LoadBlamePayload>) {
-  try {
-    const { repoUri, revision, path } = action.payload!;
-    const blame = yield call(requestBlame, repoUri, revision, path);
-    yield put(loadBlameSuccess(blame));
-  } catch (err) {
-    yield put(loadBlameFailed(err));
-  }
-}
-
-export function* watchLoadBlame() {
-  yield takeEvery(String(loadBlame), handleFetchBlame);
-}
-
-function* handleBlame(action: Action<Match>) {
-  const { resource, org, repo, revision, path } = action.payload!.params;
-  const repoUri = `${resource}/${org}/${repo}`;
-  yield put(loadBlame({ repoUri, revision, path }));
-}
-
-export function* watchBlame() {
-  yield takeEvery(blamePattern, handleBlame);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/commit.ts b/x-pack/legacy/plugins/code/public/sagas/commit.ts
deleted file mode 100644
index 93a5c74e19c4af..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/commit.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { Action } from 'redux-actions';
-import { npStart } from 'ui/new_platform';
-import { call, put, takeEvery } from 'redux-saga/effects';
-import { loadCommit, loadCommitFailed, loadCommitSuccess, Match } from '../actions';
-import { commitRoutePattern } from './patterns';
-
-function requestCommit(repo: string, commitId: string) {
-  return npStart.core.http.get(`/api/code/repo/${repo}/diff/${commitId}`);
-}
-
-function* handleLoadCommit(action: Action<Match>) {
-  try {
-    const { commitId, resource, org, repo } = action.payload!.params;
-    yield put(loadCommit(commitId));
-    const repoUri = `${resource}/${org}/${repo}`;
-    const commit = yield call(requestCommit, repoUri, commitId);
-    yield put(loadCommitSuccess(commit));
-  } catch (err) {
-    yield put(loadCommitFailed(err));
-  }
-}
-
-export function* watchLoadCommit() {
-  yield takeEvery(commitRoutePattern, handleLoadCommit);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/editor.ts b/x-pack/legacy/plugins/code/public/sagas/editor.ts
deleted file mode 100644
index e00710d241260b..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/editor.ts
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import queryString from 'querystring';
-import { Action } from 'redux-actions';
-import { npStart } from 'ui/new_platform';
-import { TextDocumentPositionParams } from 'vscode-languageserver';
-import Url from 'url';
-import { call, put, select, takeEvery, takeLatest } from 'redux-saga/effects';
-import { parseGoto, parseLspUrl, toCanonicalUrl } from '../../common/uri_util';
-import { FileTree } from '../../model';
-import {
-  fetchFile,
-  FetchFileResponse,
-  fetchRepoTree,
-  fetchTreeCommits,
-  findReferences,
-  findReferencesFailed,
-  findReferencesSuccess,
-  loadStructure,
-  Match,
-  revealPosition,
-  fetchRepos,
-  turnOnDefaultRepoScope,
-  findDefinitions,
-  findDefinitionsSuccess,
-  findDefinitionsFailed,
-  closePanel,
-} from '../actions';
-import { loadRepo, loadRepoFailed, loadRepoSuccess } from '../actions/status';
-import { PathTypes } from '../common/types';
-import { RootState } from '../reducers';
-import { getPathOfTree } from '../reducers/file_tree';
-import {
-  fileSelector,
-  getTree,
-  lastRequestPathSelector,
-  refUrlSelector,
-  repoScopeSelector,
-  urlQueryStringSelector,
-  createTreeSelector,
-  reposSelector,
-} from '../selectors';
-import { history } from '../utils/url';
-import { mainRoutePattern } from './patterns';
-
-function* handleReferences(action: Action<TextDocumentPositionParams>) {
-  try {
-    const params: TextDocumentPositionParams = action.payload!;
-    const { title, files } = yield call(requestFindReferences, params);
-    const repos = Object.keys(files).map((repo: string) => ({ repo, files: files[repo] }));
-    yield put(findReferencesSuccess({ title, repos }));
-  } catch (error) {
-    yield put(findReferencesFailed(error));
-  }
-}
-
-function* handleDefinitions(action: Action<TextDocumentPositionParams>) {
-  try {
-    const params: TextDocumentPositionParams = action.payload!;
-    const { title, files } = yield call(requestFindDefinitions, params);
-    const repos = Object.keys(files).map((repo: string) => ({ repo, files: files[repo] }));
-    yield put(findDefinitionsSuccess({ title, repos }));
-  } catch (error) {
-    yield put(findDefinitionsFailed(error));
-  }
-}
-
-function requestFindReferences(params: TextDocumentPositionParams) {
-  return npStart.core.http.post(`/api/code/lsp/findReferences`, {
-    body: JSON.stringify(params),
-  });
-}
-
-function requestFindDefinitions(params: TextDocumentPositionParams) {
-  return npStart.core.http.post(`/api/code/lsp/findDefinitions`, {
-    body: JSON.stringify(params),
-  });
-}
-
-export function* watchLspMethods() {
-  yield takeLatest(String(findReferences), handleReferences);
-  yield takeLatest(String(findDefinitions), handleDefinitions);
-}
-
-function* handleClosePanel(action: Action<boolean>) {
-  if (action.payload) {
-    const search = yield select(urlQueryStringSelector);
-    const { pathname } = history.location;
-    const queryParams = Url.parse(search, true).query;
-    if (queryParams.tab) {
-      delete queryParams.tab;
-    }
-    if (queryParams.refUrl) {
-      delete queryParams.refUrl;
-    }
-    const query = queryString.stringify(queryParams);
-    if (query) {
-      history.push(`${pathname}?${query}`);
-    } else {
-      history.push(pathname);
-    }
-  }
-}
-
-export function* watchCloseReference() {
-  yield takeLatest(String(closePanel), handleClosePanel);
-}
-
-function* handleReference(url: string) {
-  const refUrl = yield select(refUrlSelector);
-  if (refUrl === url) {
-    return;
-  }
-  const { uri, position, schema, repoUri, file, revision } = parseLspUrl(url);
-  if (uri && position) {
-    yield put(
-      findReferences({
-        textDocument: {
-          uri: toCanonicalUrl({ revision, schema, repoUri, file }),
-        },
-        position,
-      })
-    );
-  }
-}
-
-function* openDefinitions(url: string) {
-  const refUrl = yield select(refUrlSelector);
-  if (refUrl === url) {
-    return;
-  }
-  const { uri, position, schema, repoUri, file, revision } = parseLspUrl(url);
-  if (uri && position) {
-    yield put(
-      findDefinitions({
-        textDocument: {
-          uri: toCanonicalUrl({ revision, schema, repoUri, file }),
-        },
-        position,
-      })
-    );
-  }
-}
-
-function* handleFile(repoUri: string, file: string, revision: string) {
-  const response: FetchFileResponse = yield select(fileSelector);
-  const payload = response && response.payload;
-  if (
-    payload &&
-    payload.path === file &&
-    payload.revision === revision &&
-    payload.uri === repoUri
-  ) {
-    return;
-  }
-  yield put(
-    fetchFile({
-      uri: repoUri,
-      path: file,
-      revision,
-    })
-  );
-}
-
-function fetchRepo(repoUri: string) {
-  return npStart.core.http.get(`/api/code/repo/${repoUri}`);
-}
-
-function* loadRepoSaga(action: any) {
-  try {
-    const repo = yield call(fetchRepo, action.payload);
-    yield put(loadRepoSuccess(repo));
-
-    // turn on defaultRepoScope if there's no repo scope specified when enter a source view page
-    const repoScope = yield select(repoScopeSelector);
-    if (repoScope.length === 0) {
-      yield put(turnOnDefaultRepoScope(repo));
-    }
-  } catch (e) {
-    yield put(loadRepoFailed(e));
-  }
-}
-
-export function* watchLoadRepo() {
-  yield takeEvery(String(loadRepo), loadRepoSaga);
-}
-
-function* handleMainRouteChange(action: Action<Match>) {
-  const repos = yield select(reposSelector);
-  if (repos.length === 0) {
-    // in source view page, we need repos as default repo scope options when no query input
-    yield put(fetchRepos());
-  }
-  const { location } = action.payload!;
-  const search = location.search.startsWith('?') ? location.search.substring(1) : location.search;
-  const queryParams = queryString.parse(search);
-  const { resource, org, repo, path: file, pathType, revision, goto } = action.payload!.params;
-  const repoUri = `${resource}/${org}/${repo}`;
-  let position;
-  if (goto) {
-    position = parseGoto(goto);
-  }
-  if (file) {
-    if ([PathTypes.blob, PathTypes.blame].includes(pathType as PathTypes)) {
-      yield put(revealPosition(position));
-      const { tab, refUrl } = queryParams;
-      if (tab === 'references' && refUrl) {
-        yield call(handleReference, decodeURIComponent(refUrl as string));
-      } else if (tab === 'definitions' && refUrl) {
-        yield call(openDefinitions, decodeURIComponent(refUrl as string));
-      } else {
-        yield put(closePanel(false));
-      }
-      yield call(handleFile, repoUri, file, revision);
-    } else {
-      const commits = yield select((state: RootState) => state.revision.treeCommits[file]);
-      if (commits === undefined) {
-        yield put(fetchTreeCommits({ revision, uri: repoUri, path: file }));
-      }
-    }
-  }
-  const lastRequestPath = yield select(lastRequestPathSelector);
-  const tree = yield select(getTree);
-  const isDir = pathType === PathTypes.tree;
-  function isTreeLoaded(isDirectory: boolean, targetTree: FileTree | null) {
-    if (!isDirectory) {
-      return !!targetTree;
-    } else if (!targetTree) {
-      return false;
-    } else {
-      return targetTree.children && targetTree.children.length > 0;
-    }
-  }
-  const targetTree: FileTree | null = yield select(createTreeSelector(file || ''));
-  if (!isTreeLoaded(isDir, targetTree)) {
-    yield put(
-      fetchRepoTree({
-        uri: repoUri,
-        revision,
-        path: file || '',
-        parents: getPathOfTree(tree, (file || '').split('/')) === null,
-        isDir,
-      })
-    );
-  }
-  const uri = toCanonicalUrl({
-    repoUri,
-    file,
-    revision,
-  });
-  if (file && pathType === PathTypes.blob) {
-    if (lastRequestPath !== uri) {
-      yield put(loadStructure(uri!));
-    }
-  }
-}
-
-export function* watchMainRouteChange() {
-  yield takeLatest(mainRoutePattern, handleMainRouteChange);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/file.ts b/x-pack/legacy/plugins/code/public/sagas/file.ts
deleted file mode 100644
index 42bb44d2663063..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/file.ts
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Action } from 'redux-actions';
-import { npStart } from 'ui/new_platform';
-import Url from 'url';
-import { call, put, select, takeEvery, takeLatest, cancel } from 'redux-saga/effects';
-
-import {
-  fetchDirectory,
-  fetchDirectoryFailed,
-  fetchDirectorySuccess,
-  fetchFile,
-  fetchFileFailed,
-  FetchFilePayload,
-  FetchFileResponse,
-  fetchFileSuccess,
-  fetchMoreCommits,
-  fetchRepoBranches,
-  fetchRepoBranchesFailed,
-  fetchRepoBranchesSuccess,
-  fetchRepoCommits,
-  fetchRepoCommitsFailed,
-  fetchRepoCommitsSuccess,
-  FetchRepoPayload,
-  FetchRepoPayloadWithRevision,
-  fetchRepoTree,
-  fetchRepoTreeFailed,
-  FetchRepoTreePayload,
-  fetchRepoTreeSuccess,
-  fetchTreeCommits,
-  fetchTreeCommitsFailed,
-  fetchTreeCommitsSuccess,
-  gotoRepo,
-  Match,
-  setNotFound,
-  fetchRootRepoTree,
-  fetchRootRepoTreeSuccess,
-  fetchRootRepoTreeFailed,
-  dirNotFound,
-} from '../actions';
-import { treeCommitsSelector, currentPathSelector } from '../selectors';
-import { repoRoutePattern } from './patterns';
-import { FileTree } from '../../model';
-import { singletonRequestSaga } from '../utils/saga_utils';
-
-function* handleFetchRepoTree(action: Action<FetchRepoTreePayload>) {
-  try {
-    const tree = yield call(requestRepoTree, action.payload!);
-    (tree.children || []).sort((a: FileTree, b: FileTree) => {
-      const typeDiff = a.type - b.type;
-      if (typeDiff === 0) {
-        return a.name > b.name ? 1 : -1;
-      } else {
-        return -typeDiff;
-      }
-    });
-    tree.repoUri = action.payload!.uri;
-    yield put(
-      fetchRepoTreeSuccess({
-        revision: action.payload!.revision,
-        tree,
-        path: action.payload!.path,
-        withParents: action.payload!.parents,
-      })
-    );
-  } catch (err) {
-    if (action.payload!.isDir && err.body && err.body.statusCode === 404) {
-      yield put(dirNotFound(action.payload!.path));
-    }
-    yield put(fetchRepoTreeFailed({ ...err, path: action.payload!.path }));
-  }
-}
-
-interface FileTreeQuery {
-  parents?: boolean;
-  limit: number;
-  flatten: boolean;
-  [key: string]: string | number | boolean | undefined;
-}
-
-function requestRepoTree({
-  uri,
-  revision,
-  path,
-  limit = 1000,
-  parents = false,
-}: FetchRepoTreePayload) {
-  const query: FileTreeQuery = { limit, flatten: true };
-  if (parents) {
-    query.parents = true;
-  }
-  return npStart.core.http.get(
-    `/api/code/repo/${uri}/tree/${encodeURIComponent(revision)}/${path}`,
-    {
-      query,
-    }
-  );
-}
-
-export function* watchFetchRepoTree() {
-  yield takeEvery(String(fetchRepoTree), handleFetchRepoTree);
-}
-
-function* handleFetchRootRepoTree(action: Action<FetchRepoPayloadWithRevision>) {
-  try {
-    const { uri, revision } = action.payload!;
-    const tree = yield call(requestRepoTree, { uri, revision, path: '', isDir: true });
-    yield put(fetchRootRepoTreeSuccess({ tree, revision }));
-  } catch (err) {
-    yield put(fetchRootRepoTreeFailed(err));
-  }
-}
-
-export function* watchFetchRootRepoTree() {
-  yield takeEvery(String(fetchRootRepoTree), handleFetchRootRepoTree);
-}
-
-function* handleFetchBranches(action: Action<FetchRepoPayload>) {
-  try {
-    const results = yield call(requestBranches, action.payload!);
-    yield put(fetchRepoBranchesSuccess(results));
-  } catch (err) {
-    yield put(fetchRepoBranchesFailed(err));
-  }
-}
-
-function requestBranches({ uri }: FetchRepoPayload) {
-  return npStart.core.http.get(`/api/code/repo/${uri}/references`);
-}
-
-function* handleFetchCommits(action: Action<FetchRepoPayloadWithRevision>) {
-  try {
-    const results = yield call(requestCommits, action.payload!);
-    yield put(fetchRepoCommitsSuccess(results));
-  } catch (err) {
-    yield put(fetchRepoCommitsFailed(err));
-  }
-}
-
-function* handleFetchMoreCommits(action: Action<string>) {
-  try {
-    const path = yield select(currentPathSelector);
-    const commits = yield select(treeCommitsSelector);
-    const revision = commits.length > 0 ? commits[commits.length - 1].id : 'head';
-    const uri = action.payload;
-    // @ts-ignore
-    const newCommits = yield call(requestCommits, { uri, revision }, path, true);
-    yield put(fetchTreeCommitsSuccess({ path, commits: newCommits, append: true }));
-  } catch (err) {
-    yield put(fetchTreeCommitsFailed(err));
-  }
-}
-
-function* handleFetchTreeCommits(action: Action<FetchFilePayload>, signal: AbortSignal, task: any) {
-  try {
-    const path = action.payload!.path;
-    const commits = yield call(requestCommits, action.payload!, path, undefined, undefined, signal);
-    yield put(fetchTreeCommitsSuccess({ path, commits }));
-  } catch (err) {
-    yield put(fetchTreeCommitsFailed(err));
-  } finally {
-    yield cancel(task);
-  }
-}
-
-export function requestCommits(
-  { uri, revision }: FetchRepoPayloadWithRevision,
-  path?: string,
-  loadMore?: boolean,
-  count?: number,
-  signal?: AbortSignal
-) {
-  const pathStr = path ? `/${path}` : '';
-  let query: any = {};
-  if (loadMore) {
-    query = { after: 1 };
-  }
-  if (count) {
-    query = { count };
-  }
-  return npStart.core.http.get(
-    `/api/code/repo/${uri}/history/${encodeURIComponent(revision)}${pathStr}`,
-    {
-      query,
-      signal,
-    }
-  );
-}
-
-export async function requestFile(
-  payload: FetchFilePayload,
-  line?: string,
-  signal?: AbortSignal
-): Promise<FetchFileResponse> {
-  const { uri, revision, path } = payload;
-  const url = `/api/code/repo/${uri}/blob/${encodeURIComponent(revision)}/${path}`;
-  const query: any = {};
-  if (line) {
-    query.line = line;
-  }
-  const response: Response = await fetch(
-    npStart.core.http.basePath.prepend(Url.format({ pathname: url, query })),
-    { signal }
-  );
-
-  if (response.status >= 200 && response.status < 300) {
-    const contentType = response.headers.get('Content-Type');
-
-    if (contentType && contentType.startsWith('text/')) {
-      const lang = response.headers.get('lang') || undefined;
-      if (lang === 'big') {
-        return {
-          payload,
-          content: '',
-          isOversize: true,
-        };
-      }
-      return {
-        payload,
-        lang,
-        content: await response.text(),
-        isUnsupported: false,
-      };
-    } else if (contentType && contentType.startsWith('image/')) {
-      return {
-        payload,
-        isImage: true,
-        content: '',
-        url,
-        isUnsupported: false,
-      };
-    } else {
-      return {
-        payload,
-        isImage: false,
-        content: '',
-        url,
-        isUnsupported: true,
-      };
-    }
-  } else if (response.status === 404) {
-    return {
-      payload,
-      isNotFound: true,
-    };
-  }
-  throw new Error('invalid file type');
-}
-
-function* handleFetchFile(action: Action<FetchFilePayload>, signal: AbortSignal, task: any) {
-  try {
-    const results = yield call(requestFile, action.payload!, undefined, signal);
-    if (results.isNotFound) {
-      yield put(setNotFound(true));
-      yield put(fetchFileFailed(new Error('file not found')));
-    } else {
-      const path = yield select(currentPathSelector);
-      if (path === action.payload!.path) {
-        yield put(fetchFileSuccess(results));
-      }
-    }
-  } catch (err) {
-    yield put(fetchFileFailed(err));
-  } finally {
-    yield cancel(task);
-  }
-}
-
-function* handleFetchDirs(action: Action<FetchRepoTreePayload>) {
-  try {
-    const dir = yield call(requestRepoTree, action.payload!);
-    yield put(fetchDirectorySuccess(dir));
-  } catch (err) {
-    yield fetchDirectoryFailed(err);
-  }
-}
-
-export function* watchFetchBranchesAndCommits() {
-  yield takeEvery(String(fetchRepoBranches), handleFetchBranches);
-  yield takeEvery(String(fetchRepoCommits), handleFetchCommits);
-  yield takeLatest(String(fetchFile), singletonRequestSaga(handleFetchFile));
-  yield takeEvery(String(fetchDirectory), handleFetchDirs);
-  yield takeLatest(String(fetchTreeCommits), singletonRequestSaga(handleFetchTreeCommits));
-  yield takeLatest(String(fetchMoreCommits), handleFetchMoreCommits);
-}
-
-function* handleRepoRouteChange(action: Action<Match>) {
-  const { repo, org, resource } = action.payload!.params;
-  const uri = `${resource}/${org}/${repo}`;
-  yield put(gotoRepo(uri));
-}
-
-export function* watchRepoRouteChange() {
-  yield takeEvery(repoRoutePattern, handleRepoRouteChange);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/index.ts b/x-pack/legacy/plugins/code/public/sagas/index.ts
deleted file mode 100644
index 0b6e33de064f82..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/index.ts
+++ /dev/null
@@ -1,100 +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 { fork } from 'redux-saga/effects';
-
-import { watchBlame, watchLoadBlame } from './blame';
-import { watchLoadCommit } from './commit';
-import {
-  watchCloseReference,
-  watchLoadRepo,
-  watchLspMethods,
-  watchMainRouteChange,
-} from './editor';
-import {
-  watchFetchBranchesAndCommits,
-  watchFetchRepoTree,
-  watchRepoRouteChange,
-  watchFetchRootRepoTree,
-} from './file';
-import { watchInstallLanguageServer, watchLoadLanguageServers } from './language_server';
-import {
-  watchLoadRepoListStatus,
-  watchLoadRepoStatus,
-  watchPollingRepoStatus,
-  watchRepoCloneStatusPolling,
-  watchRepoDeleteStatusPolling,
-  watchRepoIndexStatusPolling,
-  watchResetPollingStatus,
-} from './project_status';
-import {
-  watchAdminRouteChange,
-  watchDeleteRepo,
-  watchFetchRepoConfigs,
-  watchFetchRepos,
-  watchGotoRepo,
-  watchImportRepo,
-  watchIndexRepo,
-  watchInitRepoCmd,
-} from './repository';
-import {
-  watchDocumentSearch,
-  watchRepoScopeSearch,
-  watchRepositorySearch,
-  watchSearchRouteChange,
-} from './search';
-import { watchRootRoute } from './setup';
-import { watchRepoCloneSuccess, watchRepoDeleteFinished, watchStatusChange } from './status';
-import { watchLoadStructure } from './structure';
-import { watchRoute, watchRepoChange, watchRepoOrRevisionChange } from './route';
-
-export function* rootSaga() {
-  yield fork(watchRepoChange);
-  yield fork(watchRepoOrRevisionChange);
-  yield fork(watchRoute);
-  yield fork(watchRootRoute);
-  yield fork(watchLoadCommit);
-  yield fork(watchFetchRepos);
-  yield fork(watchDeleteRepo);
-  yield fork(watchIndexRepo);
-  yield fork(watchImportRepo);
-  yield fork(watchFetchRepoTree);
-  yield fork(watchFetchRootRepoTree);
-  yield fork(watchFetchBranchesAndCommits);
-  yield fork(watchDocumentSearch);
-  yield fork(watchRepositorySearch);
-  yield fork(watchLoadStructure);
-  yield fork(watchLspMethods);
-  yield fork(watchCloseReference);
-  yield fork(watchFetchRepoConfigs);
-  yield fork(watchInitRepoCmd);
-  yield fork(watchGotoRepo);
-  yield fork(watchLoadRepo);
-  yield fork(watchSearchRouteChange);
-  yield fork(watchAdminRouteChange);
-  yield fork(watchMainRouteChange);
-  yield fork(watchLoadRepo);
-  yield fork(watchRepoRouteChange);
-  yield fork(watchLoadBlame);
-  yield fork(watchBlame);
-  yield fork(watchRepoCloneSuccess);
-  yield fork(watchRepoDeleteFinished);
-  yield fork(watchLoadLanguageServers);
-  yield fork(watchInstallLanguageServer);
-  yield fork(watchLoadRepoListStatus);
-  yield fork(watchLoadRepoStatus);
-  yield fork(watchStatusChange);
-
-  // Repository status polling sagas begin
-  yield fork(watchPollingRepoStatus);
-  yield fork(watchResetPollingStatus);
-  yield fork(watchRepoDeleteStatusPolling);
-  yield fork(watchRepoIndexStatusPolling);
-  yield fork(watchRepoCloneStatusPolling);
-  // Repository status polling sagas end
-
-  yield fork(watchRepoScopeSearch);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/language_server.ts b/x-pack/legacy/plugins/code/public/sagas/language_server.ts
deleted file mode 100644
index c9e452201aa401..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/language_server.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Action } from 'redux-actions';
-import { npStart } from 'ui/new_platform';
-import { call, put, takeEvery } from 'redux-saga/effects';
-import {
-  loadLanguageServers,
-  loadLanguageServersFailed,
-  loadLanguageServersSuccess,
-  requestInstallLanguageServer,
-  requestInstallLanguageServerFailed,
-  requestInstallLanguageServerSuccess,
-} from '../actions/language_server';
-
-function fetchLangServers() {
-  return npStart.core.http.get('/api/code/install');
-}
-
-function installLanguageServer(languageServer: string) {
-  return npStart.core.http.post(`/api/code/install/${languageServer}`);
-}
-
-function* handleInstallLanguageServer(action: Action<string>) {
-  try {
-    yield call(installLanguageServer, action.payload!);
-    yield put(requestInstallLanguageServerSuccess(action.payload!));
-  } catch (err) {
-    yield put(requestInstallLanguageServerFailed(err));
-  }
-}
-
-function* handleLoadLanguageServer() {
-  try {
-    const langServers = yield call(fetchLangServers);
-    yield put(loadLanguageServersSuccess(langServers));
-  } catch (err) {
-    yield put(loadLanguageServersFailed(err));
-  }
-}
-
-export function* watchLoadLanguageServers() {
-  yield takeEvery(String(loadLanguageServers), handleLoadLanguageServer);
-}
-
-export function* watchInstallLanguageServer() {
-  yield takeEvery(String(requestInstallLanguageServer), handleInstallLanguageServer);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/patterns.ts b/x-pack/legacy/plugins/code/public/sagas/patterns.ts
deleted file mode 100644
index a2f1cac8212a85..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/patterns.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 { Action } from 'redux-actions';
-
-import { Match, routeChange } from '../actions';
-import { PathTypes } from '../common/types';
-import * as ROUTES from '../components/routes';
-
-export const generatePattern = (path: string) => (action: Action<Match>) =>
-  action.type === String(routeChange) && action.payload!.path === path;
-export const rootRoutePattern = generatePattern(ROUTES.ROOT);
-export const setupRoutePattern = generatePattern(ROUTES.SETUP);
-export const adminRoutePattern = generatePattern(ROUTES.ADMIN);
-export const repoRoutePattern = generatePattern(ROUTES.REPO);
-export const mainRoutePattern = (action: Action<Match>) =>
-  action.type === String(routeChange) &&
-  (ROUTES.MAIN === action.payload!.path || ROUTES.MAIN_ROOT === action.payload!.path);
-export const searchRoutePattern = generatePattern(ROUTES.SEARCH);
-export const commitRoutePattern = generatePattern(ROUTES.DIFF);
-
-export const sourceFilePattern = (action: Action<Match>) =>
-  mainRoutePattern(action) && action.payload!.params.pathType === PathTypes.blob;
-
-export const blamePattern = (action: Action<Match>) =>
-  mainRoutePattern(action) && action.payload!.params.pathType === PathTypes.blame;
diff --git a/x-pack/legacy/plugins/code/public/sagas/project_config.ts b/x-pack/legacy/plugins/code/public/sagas/project_config.ts
deleted file mode 100644
index c417912f9da586..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/project_config.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Action } from 'redux-actions';
-import { npStart } from 'ui/new_platform';
-import { all, call, put, takeEvery } from 'redux-saga/effects';
-import { Repository, RepositoryConfig } from '../../model';
-import {
-  fetchReposSuccess,
-  RepoConfigPayload,
-  switchLanguageServer,
-  switchLanguageServerFailed,
-  switchLanguageServerSuccess,
-} from '../actions';
-import { loadConfigsFailed, loadConfigsSuccess } from '../actions/project_config';
-
-function putProjectConfig(repoUri: string, config: RepositoryConfig) {
-  return npStart.core.http.put(`/api/code/repo/config/${repoUri}`, {
-    body: JSON.stringify(config),
-  });
-}
-
-function* switchProjectLanguageServer(action: Action<RepoConfigPayload>) {
-  try {
-    const { repoUri, config } = action.payload!;
-    yield call(putProjectConfig, repoUri, config);
-    yield put(switchLanguageServerSuccess());
-  } catch (err) {
-    yield put(switchLanguageServerFailed(err));
-  }
-}
-
-export function* watchSwitchProjectLanguageServer() {
-  yield takeEvery(String(switchLanguageServer), switchProjectLanguageServer);
-}
-
-function fetchConfigs(repoUri: string) {
-  return npStart.core.http.get(`/api/code/repo/config/${repoUri}`);
-}
-
-function* loadConfigs(action: Action<Repository[]>) {
-  try {
-    const repositories = action.payload!;
-    const promises = repositories.map(repo => call(fetchConfigs, repo.uri));
-    const configs = yield all(promises);
-    yield put(
-      loadConfigsSuccess(
-        configs.reduce((acc: { [k: string]: RepositoryConfig }, config: RepositoryConfig) => {
-          acc[config.uri] = config;
-          return acc;
-        }, {})
-      )
-    );
-  } catch (err) {
-    yield put(loadConfigsFailed(err));
-  }
-}
-
-export function* watchLoadConfigs() {
-  yield takeEvery(String(fetchReposSuccess), loadConfigs);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/project_status.ts b/x-pack/legacy/plugins/code/public/sagas/project_status.ts
deleted file mode 100644
index ed4b95d612182b..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/project_status.ts
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import moment from 'moment';
-import { Action } from 'redux-actions';
-import { delay } from 'redux-saga';
-import { npStart } from 'ui/new_platform';
-import {
-  all,
-  call,
-  cancel,
-  cancelled,
-  fork,
-  put,
-  select,
-  take,
-  takeEvery,
-  takeLatest,
-} from 'redux-saga/effects';
-
-import { Repository, RepositoryUri, WorkerReservedProgress, RepoState } from '../../model';
-import * as ROUTES from '../components/routes';
-import { allStatusSelector, repoUriSelector, routeSelector } from '../selectors';
-import {
-  deleteRepo,
-  fetchReposSuccess,
-  indexRepo,
-  loadRepoSuccess,
-  loadStatusFailed,
-  loadStatusSuccess,
-  pollRepoCloneStatusStart,
-  pollRepoDeleteStatusStart,
-  pollRepoIndexStatusStart,
-  routeChange,
-  updateCloneProgress,
-  updateDeleteProgress,
-  updateIndexProgress,
-  pollRepoCloneStatusStop,
-  pollRepoDeleteStatusStop,
-  pollRepoIndexStatusStop,
-  importRepoSuccess,
-} from '../actions';
-import {
-  cloneCompletedPattern,
-  cloneRepoStatusPollingStopPattern,
-  deleteRepoStatusPollingStopPattern,
-  indexRepoStatusPollingStopPattern,
-} from './status';
-
-const REPO_STATUS_POLLING_FREQ_MS = 1000;
-
-function fetchStatus(repoUri: string) {
-  return npStart.core.http.get(`/api/code/repo/status/${repoUri}`);
-}
-
-function* loadRepoListStatus(repos: Repository[]) {
-  try {
-    const promises = repos.map(repo => call(fetchStatus, repo.uri));
-    const statuses = yield all(promises);
-    yield put(
-      loadStatusSuccess(
-        statuses.reduce((acc: { [k: string]: any }, status: any) => {
-          acc[status.gitStatus.uri] = status;
-          return acc;
-        }, {})
-      )
-    );
-  } catch (err) {
-    yield put(loadStatusFailed(err));
-  }
-}
-
-function* loadRepoStatus(repo: Repository) {
-  try {
-    const repoStatus = yield call(fetchStatus, repo.uri);
-    yield put(
-      loadStatusSuccess({
-        [repo.uri]: repoStatus,
-      })
-    );
-  } catch (err) {
-    yield put(loadStatusFailed(err));
-  }
-}
-
-function* handleRepoStatus(action: Action<any>) {
-  const repository: Repository = action.payload!;
-  yield call(loadRepoStatus, repository);
-}
-
-function* handleRepoListStatus(action: Action<Repository[]>) {
-  const route = yield select(routeSelector);
-  if (route.path === ROUTES.ADMIN) {
-    // Only load repository list status in admin page, because in source view
-    // page, we also need to load all repositories but not their status.
-    const repos: Repository[] = action.payload!;
-    yield call(loadRepoListStatus, repos);
-  }
-}
-
-function isInProgress(progress: number): boolean {
-  return progress < WorkerReservedProgress.COMPLETED && progress >= WorkerReservedProgress.INIT;
-}
-
-// Try to trigger the repository status polling based on its current state.
-function* triggerPollRepoStatus(state: RepoState, repoUri: RepositoryUri) {
-  switch (state) {
-    case RepoState.CLONING:
-      yield put(pollRepoCloneStatusStart(repoUri));
-      break;
-    case RepoState.INDEXING:
-      yield put(pollRepoIndexStatusStart(repoUri));
-      break;
-    case RepoState.DELETING:
-      yield put(pollRepoDeleteStatusStart(repoUri));
-      break;
-    default:
-      break;
-  }
-}
-
-function* handleReposStatusLoaded(action: Action<any>) {
-  const route = yield select(routeSelector);
-  const allStatuses = yield select(allStatusSelector);
-  if (route.path === ROUTES.ADMIN) {
-    // Load all repository status on admin page
-    for (const repoUri of Object.keys(allStatuses)) {
-      const status = allStatuses[repoUri];
-      yield triggerPollRepoStatus(status.state, repoUri);
-    }
-  } else if (route.path === ROUTES.MAIN || route.path === ROUTES.MAIN_ROOT) {
-    // Load current repository status on main page
-    const currentUri = yield select(repoUriSelector);
-    const status = allStatuses[currentUri];
-    if (status) {
-      yield triggerPollRepoStatus(status.state, currentUri);
-    }
-  }
-}
-
-export function* watchLoadRepoListStatus() {
-  // After all the repositories have been loaded, we should start load
-  // their status.
-  yield takeEvery(String(fetchReposSuccess), handleRepoListStatus);
-}
-
-export function* watchLoadRepoStatus() {
-  // `loadRepoSuccess` is issued by the main source view page.
-  yield takeLatest(String(loadRepoSuccess), handleRepoStatus);
-}
-
-export function* watchPollingRepoStatus() {
-  // After the status of the repos or a given repo has been loaded, check
-  // if we need to start polling the status.
-  yield takeEvery(String(loadStatusSuccess), handleReposStatusLoaded);
-}
-
-function* handleResetPollingStatus(action: Action<any>) {
-  const statuses = yield select(allStatusSelector);
-  for (const repoUri of Object.keys(statuses)) {
-    yield put(pollRepoCloneStatusStop(repoUri));
-    yield put(pollRepoIndexStatusStop(repoUri));
-    yield put(pollRepoDeleteStatusStop(repoUri));
-  }
-}
-
-export function* watchResetPollingStatus() {
-  // Stop all the repository status polling runners when route changes.
-  yield takeEvery(routeChange, handleResetPollingStatus);
-}
-
-const parseCloneStatusPollingRequest = (action: Action<any>) => {
-  if (action.type === String(importRepoSuccess)) {
-    return action.payload.uri;
-  } else if (action.type === String(pollRepoCloneStatusStart)) {
-    return action.payload;
-  }
-};
-
-const handleRepoCloneStatusProcess = function*(status: any, repoUri: RepositoryUri) {
-  if (
-    // Repository has been deleted during the clone
-    (!status.gitStatus && !status.indexStatus && !status.deleteStatus) ||
-    // Repository is in delete during the clone
-    status.deleteStatus
-  ) {
-    // Stop polling git progress
-    return false;
-  }
-
-  if (status.gitStatus) {
-    const { progress, cloneProgress, errorMessage, timestamp } = status.gitStatus;
-    yield put(
-      updateCloneProgress({
-        progress,
-        timestamp: moment(timestamp).toDate(),
-        uri: repoUri,
-        errorMessage,
-        cloneProgress,
-      })
-    );
-    // Keep polling if the progress is not 100% yet.
-    return isInProgress(progress);
-  } else {
-    // Keep polling if the indexStatus has not been persisted yet.
-    return true;
-  }
-};
-
-export function* watchRepoCloneStatusPolling() {
-  // The repository clone status polling will be triggered by:
-  // * user click import repository
-  // * repository status has been loaded and it's in cloning
-  yield takeEvery(
-    [String(importRepoSuccess), String(pollRepoCloneStatusStart)],
-    pollRepoCloneStatusRunner
-  );
-}
-
-const parseIndexStatusPollingRequest = (action: Action<any>) => {
-  if (action.type === String(indexRepo) || action.type === String(pollRepoIndexStatusStart)) {
-    return action.payload;
-  } else if (action.type === String(updateCloneProgress)) {
-    return action.payload.uri;
-  }
-};
-
-const handleRepoIndexStatusProcess = function*(status: any, repoUri: RepositoryUri) {
-  if (
-    // Repository has been deleted during the index
-    (!status.gitStatus && !status.indexStatus && !status.deleteStatus) ||
-    // Repository is in delete during the index
-    status.deleteStatus
-  ) {
-    // Stop polling index progress
-    return false;
-  }
-
-  if (status.indexStatus) {
-    yield put(
-      updateIndexProgress({
-        progress: status.indexStatus.progress,
-        timestamp: moment(status.indexStatus.timestamp).toDate(),
-        uri: repoUri,
-      })
-    );
-    // Keep polling if the progress is not 100% yet.
-    return isInProgress(status.indexStatus.progress);
-  } else {
-    // Keep polling if the indexStatus has not been persisted yet.
-    return true;
-  }
-};
-
-export function* watchRepoIndexStatusPolling() {
-  // The repository index status polling will be triggered by:
-  // * user click index repository
-  // * clone is done
-  // * repository status has been loaded and it's in indexing
-  yield takeEvery(
-    [String(indexRepo), cloneCompletedPattern, String(pollRepoIndexStatusStart)],
-    pollRepoIndexStatusRunner
-  );
-}
-
-const parseDeleteStatusPollingRequest = (action: Action<any>) => {
-  return action.payload;
-};
-
-const handleRepoDeleteStatusProcess = function*(status: any, repoUri: RepositoryUri) {
-  if (!status.gitStatus && !status.indexStatus && !status.deleteStatus) {
-    // If all the statuses cannot be found, this indicates the the repository has been successfully
-    // removed.
-    yield put(
-      updateDeleteProgress({
-        progress: WorkerReservedProgress.COMPLETED,
-        uri: repoUri,
-      })
-    );
-    return false;
-  }
-
-  if (status.deleteStatus) {
-    yield put(
-      updateDeleteProgress({
-        progress: status.deleteStatus.progress,
-        timestamp: moment(status.deleteStatus.timestamp).toDate(),
-        uri: repoUri,
-      })
-    );
-    return isInProgress(status.deleteStatus.progress);
-  } else {
-    // Keep polling if the deleteStatus has not been persisted yet.
-    return true;
-  }
-};
-
-export function* watchRepoDeleteStatusPolling() {
-  // The repository delete status polling will be triggered by:
-  // * user click delete repository
-  // * repository status has been loaded and it's in deleting
-  yield takeEvery(
-    [String(deleteRepo), String(pollRepoDeleteStatusStart)],
-    pollRepoDeleteStatusRunner
-  );
-}
-
-function createRepoStatusPollingRun(handleStatus: any, pollingStopActionFunction: any) {
-  return function*(repoUri: RepositoryUri) {
-    try {
-      while (true) {
-        // Delay at the beginning to allow some time for the server to consume the
-        // queue task.
-        yield call(delay, REPO_STATUS_POLLING_FREQ_MS);
-
-        const repoStatus = yield call(fetchStatus, repoUri);
-        const keepPolling = yield handleStatus(repoStatus, repoUri);
-        if (!keepPolling) {
-          yield put(pollingStopActionFunction(repoUri));
-        }
-      }
-    } finally {
-      if (yield cancelled()) {
-        // Do nothing here now.
-      }
-    }
-  };
-}
-
-function createRepoStatusPollingRunner(
-  parseRepoUri: (_: Action<any>) => RepositoryUri,
-  pollStatusRun: any,
-  pollingStopActionFunction: any,
-  pollingStopActionFunctionPattern: any
-) {
-  return function*(action: Action<any>) {
-    const repoUri = parseRepoUri(action);
-
-    // Cancel existing runner to deduplicate the polling
-    yield put(pollingStopActionFunction(repoUri));
-
-    // Make a fork to run the repo index status polling
-    const task = yield fork(pollStatusRun, repoUri);
-
-    // Wait for the cancellation task
-    yield take(pollingStopActionFunctionPattern(repoUri));
-
-    // Cancel the task
-    yield cancel(task);
-  };
-}
-
-const runPollRepoCloneStatus = createRepoStatusPollingRun(
-  handleRepoCloneStatusProcess,
-  pollRepoCloneStatusStop
-);
-
-const runPollRepoIndexStatus = createRepoStatusPollingRun(
-  handleRepoIndexStatusProcess,
-  pollRepoIndexStatusStop
-);
-
-const runPollRepoDeleteStatus = createRepoStatusPollingRun(
-  handleRepoDeleteStatusProcess,
-  pollRepoDeleteStatusStop
-);
-
-const pollRepoCloneStatusRunner = createRepoStatusPollingRunner(
-  parseCloneStatusPollingRequest,
-  runPollRepoCloneStatus,
-  pollRepoCloneStatusStop,
-  cloneRepoStatusPollingStopPattern
-);
-
-const pollRepoIndexStatusRunner = createRepoStatusPollingRunner(
-  parseIndexStatusPollingRequest,
-  runPollRepoIndexStatus,
-  pollRepoIndexStatusStop,
-  indexRepoStatusPollingStopPattern
-);
-
-const pollRepoDeleteStatusRunner = createRepoStatusPollingRunner(
-  parseDeleteStatusPollingRequest,
-  runPollRepoDeleteStatus,
-  pollRepoDeleteStatusStop,
-  deleteRepoStatusPollingStopPattern
-);
diff --git a/x-pack/legacy/plugins/code/public/sagas/repository.ts b/x-pack/legacy/plugins/code/public/sagas/repository.ts
deleted file mode 100644
index c8f5ce9a67557a..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/repository.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { npStart } from 'ui/new_platform';
-
-import { Action } from 'redux-actions';
-import { call, put, takeEvery, takeLatest, take } from 'redux-saga/effects';
-import {
-  deleteRepo,
-  deleteRepoFailed,
-  deleteRepoSuccess,
-  fetchRepoConfigFailed,
-  fetchRepoConfigs,
-  fetchRepoConfigSuccess,
-  fetchRepos,
-  fetchReposFailed,
-  fetchReposSuccess,
-  gotoRepo,
-  importRepo,
-  importRepoFailed,
-  importRepoSuccess,
-  indexRepo,
-  indexRepoFailed,
-  indexRepoSuccess,
-  initRepoCommand,
-  updateDeleteProgress,
-  updateIndexProgress,
-  gotoRepoFailed,
-  loadRepo,
-  loadRepoSuccess,
-  loadRepoFailed,
-} from '../actions';
-import { loadLanguageServers } from '../actions/language_server';
-import { history } from '../utils/url';
-import { adminRoutePattern } from './patterns';
-
-function requestRepos(): any {
-  return npStart.core.http.get('/api/code/repos');
-}
-
-function* handleFetchRepos() {
-  try {
-    const repos = yield call(requestRepos);
-    yield put(fetchReposSuccess(repos));
-  } catch (err) {
-    yield put(fetchReposFailed(err));
-  }
-}
-
-function requestDeleteRepo(uri: string) {
-  return npStart.core.http.delete(`/api/code/repo/${uri}`);
-}
-
-function requestIndexRepo(uri: string) {
-  return npStart.core.http.post(`/api/code/repo/index/${uri}`, {
-    body: JSON.stringify({ reindex: true }),
-  });
-}
-
-function* handleDeleteRepo(action: Action<string>) {
-  try {
-    yield call(requestDeleteRepo, action.payload || '');
-    yield put(deleteRepoSuccess(action.payload || ''));
-    yield put(
-      updateDeleteProgress({
-        uri: action.payload!,
-        progress: 0,
-      })
-    );
-  } catch (err) {
-    yield put(deleteRepoFailed(err));
-  }
-}
-
-function* handleIndexRepo(action: Action<string>) {
-  try {
-    yield call(requestIndexRepo, action.payload || '');
-    yield put(indexRepoSuccess(action.payload || ''));
-    yield put(
-      updateIndexProgress({
-        uri: action.payload!,
-        progress: 0,
-      })
-    );
-  } catch (err) {
-    yield put(indexRepoFailed(err));
-  }
-}
-
-function requestImportRepo(uri: string) {
-  return npStart.core.http.post('/api/code/repo', {
-    body: JSON.stringify({ url: uri }),
-  });
-}
-
-function* handleImportRepo(action: Action<string>) {
-  try {
-    const data = yield call(requestImportRepo, action.payload || '');
-    yield put(importRepoSuccess(data));
-  } catch (err) {
-    yield put(importRepoFailed(err));
-  }
-}
-function* handleFetchRepoConfigs() {
-  try {
-    const configs = yield call(requestRepoConfigs);
-    yield put(fetchRepoConfigSuccess(configs));
-  } catch (e) {
-    yield put(fetchRepoConfigFailed(e));
-  }
-}
-
-function requestRepoConfigs() {
-  return npStart.core.http.get('/api/code/workspace');
-}
-
-function* handleInitCmd(action: Action<string>) {
-  const repoUri = action.payload as string;
-  yield call(requestRepoInitCmd, repoUri);
-}
-
-function requestRepoInitCmd(repoUri: string) {
-  return npStart.core.http.post(`/api/code/workspace/${repoUri}/master`, {
-    query: { force: true },
-  });
-}
-function* handleGotoRepo(action: Action<string>) {
-  try {
-    const repoUri = action.payload as string;
-    yield put(loadRepo(repoUri));
-    const loadRepoDoneAction = yield take([String(loadRepoSuccess), String(loadRepoFailed)]);
-    if (loadRepoDoneAction.type === String(loadRepoSuccess)) {
-      history.replace(`/${repoUri}/tree/${loadRepoDoneAction.payload.defaultBranch || 'master'}`);
-    } else {
-      // redirect to root project path if repo not found to show 404 page
-      history.replace(`/${action.payload}/tree/master`);
-    }
-  } catch (e) {
-    history.replace(`/${action.payload}/tree/master`);
-    yield put(gotoRepoFailed(e));
-  }
-}
-
-export function* watchImportRepo() {
-  yield takeEvery(String(importRepo), handleImportRepo);
-}
-
-export function* watchDeleteRepo() {
-  yield takeEvery(String(deleteRepo), handleDeleteRepo);
-}
-
-export function* watchIndexRepo() {
-  yield takeEvery(String(indexRepo), handleIndexRepo);
-}
-
-export function* watchFetchRepos() {
-  yield takeEvery(String(fetchRepos), handleFetchRepos);
-}
-
-export function* watchFetchRepoConfigs() {
-  yield takeEvery(String(fetchRepoConfigs), handleFetchRepoConfigs);
-}
-
-export function* watchInitRepoCmd() {
-  yield takeEvery(String(initRepoCommand), handleInitCmd);
-}
-
-export function* watchGotoRepo() {
-  yield takeLatest(String(gotoRepo), handleGotoRepo);
-}
-
-function* handleAdminRouteChange() {
-  yield put(fetchRepos());
-  yield put(fetchRepoConfigs());
-  yield put(loadLanguageServers());
-}
-
-export function* watchAdminRouteChange() {
-  yield takeLatest(adminRoutePattern, handleAdminRouteChange);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/route.ts b/x-pack/legacy/plugins/code/public/sagas/route.ts
deleted file mode 100644
index bafb0f5326f319..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/route.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { put, takeEvery, select, takeLatest } from 'redux-saga/effects';
-import { Action } from 'redux-actions';
-import {
-  routeChange,
-  Match,
-  loadRepo,
-  fetchRepoBranches,
-  fetchRepoCommits,
-  fetchRootRepoTree,
-} from '../actions';
-import { previousMatchSelector, repoUriSelector, revisionSelector } from '../selectors';
-import { routePathChange, repoChange, revisionChange, filePathChange } from '../actions/route';
-import * as ROUTES from '../components/routes';
-
-const MAIN_ROUTES = [ROUTES.MAIN, ROUTES.MAIN_ROOT];
-
-function* handleRepoOrRevisionChange() {
-  const repoUri = yield select(repoUriSelector);
-  const revision = yield select(revisionSelector);
-  yield put(fetchRepoCommits({ uri: repoUri, revision }));
-  yield put(fetchRootRepoTree({ uri: repoUri, revision }));
-}
-
-export function* watchRepoOrRevisionChange() {
-  yield takeLatest([String(repoChange), String(revisionChange)], handleRepoOrRevisionChange);
-}
-
-const getRepoFromMatch = (match: Match) =>
-  `${match.params.resource}/${match.params.org}/${match.params.repo}`;
-
-function* handleRoute(action: Action<any>) {
-  const currentMatch = action.payload;
-  const previousMatch = yield select(previousMatchSelector);
-  if (MAIN_ROUTES.includes(currentMatch.path)) {
-    if (MAIN_ROUTES.includes(previousMatch.path)) {
-      const currentRepo = getRepoFromMatch(currentMatch);
-      const previousRepo = getRepoFromMatch(previousMatch);
-      const currentRevision = currentMatch.params.revision;
-      const previousRevision = previousMatch.params.revision;
-      const currentFilePath = currentMatch.params.path;
-      const previousFilePath = previousMatch.params.path;
-      if (currentRepo !== previousRepo) {
-        yield put(repoChange(currentRepo));
-      }
-      if (currentRevision !== previousRevision) {
-        yield put(revisionChange());
-      }
-      if (currentFilePath !== previousFilePath) {
-        yield put(filePathChange());
-      }
-    } else {
-      yield put(routePathChange());
-      const currentRepo = getRepoFromMatch(currentMatch);
-      yield put(repoChange(currentRepo));
-      yield put(revisionChange());
-      yield put(filePathChange());
-    }
-  } else if (currentMatch.path !== previousMatch.path) {
-    yield put(routePathChange());
-  }
-}
-
-export function* watchRoute() {
-  yield takeEvery(String(routeChange), handleRoute);
-}
-
-export function* handleRepoChange(action: Action<string>) {
-  yield put(loadRepo(action.payload!));
-  yield put(fetchRepoBranches({ uri: action.payload! }));
-}
-
-export function* watchRepoChange() {
-  yield takeEvery(String(repoChange), handleRepoChange);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/search.ts b/x-pack/legacy/plugins/code/public/sagas/search.ts
deleted file mode 100644
index a9e8205d3b7641..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/search.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import queryString from 'querystring';
-import { npStart } from 'ui/new_platform';
-
-import { Action } from 'redux-actions';
-import { call, put, takeEvery, takeLatest } from 'redux-saga/effects';
-
-import { SearchScope } from '../../model';
-import {
-  changeSearchScope,
-  documentSearch,
-  documentSearchFailed,
-  DocumentSearchPayload,
-  documentSearchSuccess,
-  Match,
-  repositorySearch,
-  repositorySearchFailed,
-  RepositorySearchPayload,
-  repositorySearchQueryChanged,
-  repositorySearchSuccess,
-  searchReposForScope,
-  searchReposForScopeFailed,
-  searchReposForScopeSuccess,
-  turnOffDefaultRepoScope,
-} from '../actions';
-import { adminRoutePattern, searchRoutePattern } from './patterns';
-
-function requestDocumentSearch(payload: DocumentSearchPayload) {
-  const { query, page, languages, repositories, repoScope } = payload;
-  const queryParams: { [key: string]: string | number | boolean } = {
-    q: query,
-  };
-
-  if (page) {
-    queryParams.p = page;
-  }
-
-  if (languages) {
-    queryParams.langs = languages;
-  }
-
-  if (repositories) {
-    queryParams.repos = repositories;
-  }
-
-  if (repoScope) {
-    queryParams.repoScope = repoScope;
-  }
-
-  if (query && query.length > 0) {
-    return npStart.core.http.get(`/api/code/search/doc`, {
-      query: queryParams,
-    });
-  } else {
-    return {
-      documents: [],
-      took: 0,
-      total: 0,
-    };
-  }
-}
-
-function* handleDocumentSearch(action: Action<DocumentSearchPayload>) {
-  try {
-    const data = yield call(requestDocumentSearch, action.payload!);
-    yield put(documentSearchSuccess(data));
-  } catch (err) {
-    yield put(documentSearchFailed(err));
-  }
-}
-
-function requestRepositorySearch(q: string) {
-  return npStart.core.http.get(`/api/code/search/repo`, {
-    query: { q },
-  });
-}
-
-export function* watchDocumentSearch() {
-  yield takeLatest(String(documentSearch), handleDocumentSearch);
-}
-
-function* handleRepositorySearch(action: Action<RepositorySearchPayload>) {
-  try {
-    const data = yield call(requestRepositorySearch, action.payload!.query);
-    yield put(repositorySearchSuccess(data));
-  } catch (err) {
-    yield put(repositorySearchFailed(err));
-  }
-}
-
-export function* watchRepositorySearch() {
-  yield takeLatest(
-    [String(repositorySearch), String(repositorySearchQueryChanged)],
-    handleRepositorySearch
-  );
-}
-
-function* handleSearchRouteChange(action: Action<Match>) {
-  const { location } = action.payload!;
-  const rawSearchStr = location.search.length > 0 ? location.search.substring(1) : '';
-  const queryParams = queryString.parse(rawSearchStr);
-  const { q, p, langs, repos, scope, repoScope } = queryParams;
-  yield put(changeSearchScope(scope as SearchScope));
-  if (scope === SearchScope.REPOSITORY) {
-    yield put(repositorySearch({ query: q as string }));
-  } else {
-    yield put(
-      documentSearch({
-        query: q as string,
-        page: p as string,
-        languages: langs as string,
-        repositories: repos as string,
-        repoScope: repoScope as string,
-      })
-    );
-  }
-}
-
-function* resetDefaultRepoScope() {
-  yield put(turnOffDefaultRepoScope());
-}
-
-export function* watchSearchRouteChange() {
-  yield takeLatest(searchRoutePattern, handleSearchRouteChange);
-  // Reset the default search scope if enters the admin page.
-  yield takeLatest(adminRoutePattern, resetDefaultRepoScope);
-}
-
-function* handleReposSearchForScope(action: Action<RepositorySearchPayload>) {
-  try {
-    const data = yield call(requestRepositorySearch, action.payload!.query);
-    yield put(searchReposForScopeSuccess(data));
-  } catch (err) {
-    yield put(searchReposForScopeFailed(err));
-  }
-}
-
-export function* watchRepoScopeSearch() {
-  yield takeEvery(searchReposForScope, handleReposSearchForScope);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/setup.ts b/x-pack/legacy/plugins/code/public/sagas/setup.ts
deleted file mode 100644
index 7c7910b695d986..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/setup.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 { npStart } from 'ui/new_platform';
-import { call, put, takeEvery } from 'redux-saga/effects';
-import { checkSetupFailed, checkSetupSuccess } from '../actions';
-import { rootRoutePattern, setupRoutePattern } from './patterns';
-
-function* handleRootRoute() {
-  try {
-    yield call(requestSetup);
-    yield put(checkSetupSuccess());
-  } catch (e) {
-    yield put(checkSetupFailed());
-  }
-}
-
-function requestSetup() {
-  return npStart.core.http.head(`/api/code/setup`);
-}
-
-export function* watchRootRoute() {
-  yield takeEvery(rootRoutePattern, handleRootRoute);
-  yield takeEvery(setupRoutePattern, handleRootRoute);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/status.ts b/x-pack/legacy/plugins/code/public/sagas/status.ts
deleted file mode 100644
index 1a1507153ba050..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/status.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Action } from 'redux-actions';
-import { call, put, select, takeEvery, takeLatest } from 'redux-saga/effects';
-import { npStart } from 'ui/new_platform';
-import { isEqual } from 'lodash';
-import { delay } from 'redux-saga';
-
-import { RepositoryUri, WorkerReservedProgress } from '../../model';
-import {
-  deleteRepoFinished,
-  FetchFilePayload,
-  FetchRepoFileStatus,
-  FetchRepoFileStatusFailed,
-  FetchRepoFileStatusSuccess,
-  Match,
-  pollRepoCloneStatusStop,
-  pollRepoDeleteStatusStop,
-  pollRepoIndexStatusStop,
-  routeChange,
-  StatusChanged,
-  updateCloneProgress,
-  updateDeleteProgress,
-} from '../actions';
-import * as ROUTES from '../components/routes';
-import { RootState } from '../reducers';
-import { adminRoutePattern, mainRoutePattern } from './patterns';
-import { RepoFileStatus, StatusReport } from '../../common/repo_file_status';
-import { statusSelector } from '../selectors';
-
-const matchSelector = (state: RootState) => state.route.match;
-
-export const cloneCompletedPattern = (action: Action<any>) =>
-  action.type === String(updateCloneProgress) &&
-  action.payload.progress === WorkerReservedProgress.COMPLETED;
-
-const deleteCompletedPattern = (action: Action<any>) =>
-  action.type === String(updateDeleteProgress) &&
-  action.payload.progress === WorkerReservedProgress.COMPLETED;
-
-export const cloneRepoStatusPollingStopPattern = (repoUri: RepositoryUri) => {
-  return (action: Action<any>) => {
-    return action.type === String(pollRepoCloneStatusStop) && action.payload === repoUri;
-  };
-};
-
-export const indexRepoStatusPollingStopPattern = (repoUri: RepositoryUri) => {
-  return (action: Action<any>) => {
-    return action.type === String(pollRepoIndexStatusStop) && action.payload === repoUri;
-  };
-};
-
-export const deleteRepoStatusPollingStopPattern = (repoUri: RepositoryUri) => {
-  return (action: Action<any>) => {
-    return action.type === String(pollRepoDeleteStatusStop) && action.payload === repoUri;
-  };
-};
-
-function* handleRepoCloneSuccess() {
-  const match: Match = yield select(matchSelector);
-  if (match.path === ROUTES.MAIN || match.path === ROUTES.MAIN_ROOT) {
-    yield put(routeChange(match));
-  }
-}
-
-export function* watchRepoCloneSuccess() {
-  yield takeEvery(cloneCompletedPattern, handleRepoCloneSuccess);
-}
-
-function* handleRepoDeleteFinished(action: any) {
-  yield put(deleteRepoFinished(action.payload.uri));
-}
-
-export function* watchRepoDeleteFinished() {
-  yield takeEvery(deleteCompletedPattern, handleRepoDeleteFinished);
-}
-
-function* handleMainRouteChange(action: Action<Match>) {
-  // in source view page, we need repos as default repo scope options when no query input
-  const { resource, org, repo, path, revision } = action.payload!.params;
-  const uri = `${resource}/${org}/${repo}`;
-  const newStatusPath: FetchFilePayload = { uri, revision, path };
-  const currentStatusPath = yield select((state: RootState) => state.status.currentStatusPath);
-  if (!isEqual(newStatusPath, currentStatusPath)) {
-    yield call(startPollingStatus, newStatusPath);
-  }
-}
-const STATUS_POLLING_FREQ_HIGH_MS = 3000;
-const STATUS_POLLING_FREQ_LOW_MS = 10000;
-
-let polling: boolean = false;
-
-function stopPollingStatus() {
-  polling = false;
-}
-function* startPollingStatus(location: FetchFilePayload) {
-  yield put(FetchRepoFileStatus(location));
-  polling = true;
-  let currentStatusPath = yield select((state: RootState) => state.status.currentStatusPath);
-  while (polling && isEqual(location, currentStatusPath)) {
-    const previousStatus: StatusReport = yield select(statusSelector);
-    const newStatus: StatusReport = yield call(fetchStatus, location);
-    let delayMs = STATUS_POLLING_FREQ_LOW_MS;
-    if (newStatus) {
-      yield call(compareStatus, previousStatus, newStatus);
-      if (newStatus.langServerStatus === RepoFileStatus.LANG_SERVER_IS_INITIALIZING) {
-        delayMs = STATUS_POLLING_FREQ_HIGH_MS;
-      }
-      currentStatusPath = yield select((state: RootState) => state.status.currentStatusPath);
-    }
-    yield call(delay, delayMs);
-  }
-}
-
-function* compareStatus(prevStatus: StatusReport, currentStatus: StatusReport) {
-  if (!isEqual(prevStatus, currentStatus)) {
-    yield put(StatusChanged({ prevStatus, currentStatus }));
-  }
-}
-
-function* fetchStatus(location: FetchFilePayload) {
-  yield put(FetchRepoFileStatus(location));
-  try {
-    const newStatus: StatusReport = yield call(requestStatus, location);
-    yield put(
-      FetchRepoFileStatusSuccess({
-        statusReport: newStatus,
-        path: location,
-      })
-    );
-    return newStatus;
-  } catch (e) {
-    yield put(FetchRepoFileStatusFailed(e));
-  }
-}
-
-function requestStatus(location: FetchFilePayload) {
-  const { uri, revision, path } = location;
-  const pathname = path
-    ? `/api/code/repo/${uri}/status/${revision}/${path}`
-    : `/api/code/repo/${uri}/status/${revision}`;
-
-  return npStart.core.http.get(pathname);
-}
-
-export function* watchStatusChange() {
-  yield takeLatest(mainRoutePattern, handleMainRouteChange);
-  yield takeLatest(adminRoutePattern, stopPollingStatus);
-}
diff --git a/x-pack/legacy/plugins/code/public/sagas/structure.ts b/x-pack/legacy/plugins/code/public/sagas/structure.ts
deleted file mode 100644
index 010d6776530e09..00000000000000
--- a/x-pack/legacy/plugins/code/public/sagas/structure.ts
+++ /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 { Action } from 'redux-actions';
-import { call, put, select, takeEvery } from 'redux-saga/effects';
-import { DocumentSymbol } from 'vscode-languageserver-types';
-import { LspRestClient, TextDocumentMethods } from '../../common/lsp_client';
-import {
-  loadStructure,
-  loadStructureFailed,
-  loadStructureSuccess,
-  StatusChanged,
-} from '../actions';
-import { SymbolWithMembers } from '../actions/structure';
-import { RepoFileStatus, StatusReport } from '../../common/repo_file_status';
-import { RootState } from '../reducers';
-import { toCanonicalUrl } from '../../common/uri_util';
-
-const sortSymbol = (a: SymbolWithMembers, b: SymbolWithMembers) => {
-  const lineDiff = a.range.start.line - b.range.start.line;
-  if (lineDiff === 0) {
-    return a.range.start.character - b.range.start.character;
-  } else {
-    return lineDiff;
-  }
-};
-
-const generateStructureTree: (documentSymbol: DocumentSymbol, path: string) => SymbolWithMembers = (
-  documentSymbol,
-  path
-) => {
-  const currentPath = path ? `${path}/${documentSymbol.name}` : documentSymbol.name;
-  const structureTree: SymbolWithMembers = {
-    name: documentSymbol.name,
-    kind: documentSymbol.kind,
-    path: currentPath,
-    range: documentSymbol.range,
-    selectionRange: documentSymbol.selectionRange,
-  };
-  if (documentSymbol.children) {
-    structureTree.members = documentSymbol.children
-      .sort(sortSymbol)
-      .map(ds => generateStructureTree(ds, currentPath));
-  }
-  return structureTree;
-};
-
-function requestStructure(uri?: string) {
-  const lspClient = new LspRestClient('/api/code/lsp');
-  const lspMethods = new TextDocumentMethods(lspClient);
-  return lspMethods.documentSymbol.send({
-    textDocument: {
-      uri: uri || '',
-    },
-  });
-}
-
-function* statusChanged(action: Action<any>) {
-  const {
-    prevStatus,
-    currentStatus,
-  }: { prevStatus: StatusReport; currentStatus: StatusReport } = action.payload;
-  if (
-    prevStatus &&
-    prevStatus.langServerStatus === RepoFileStatus.LANG_SERVER_IS_INITIALIZING &&
-    currentStatus.langServerStatus !== RepoFileStatus.LANG_SERVER_IS_INITIALIZING
-  ) {
-    const { revision, uri, path } = yield select(
-      (state: RootState) => state.status.currentStatusPath
-    );
-    const u = toCanonicalUrl({
-      repoUri: uri,
-      file: path,
-      revision,
-    });
-    yield call(fetchSymbols, loadStructure(u));
-  }
-}
-
-export function* watchLoadStructure() {
-  yield takeEvery(String(loadStructure), fetchSymbols);
-  yield takeEvery(String(StatusChanged), statusChanged);
-}
-
-function* fetchSymbols(action: Action<string>) {
-  try {
-    const data: DocumentSymbol[] = yield call(requestStructure, `git:/${action.payload}`);
-    const structureTree = data.sort(sortSymbol).map(ds => generateStructureTree(ds, ''));
-    yield put(loadStructureSuccess({ path: action.payload!, data, structureTree }));
-  } catch (e) {
-    yield put(loadStructureFailed(e));
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/selectors/index.ts b/x-pack/legacy/plugins/code/public/selectors/index.ts
deleted file mode 100644
index 870cf1cee3e817..00000000000000
--- a/x-pack/legacy/plugins/code/public/selectors/index.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 { FileTree, RepositoryUri } from '../../model';
-import { RootState } from '../reducers';
-
-export const getTree = (state: RootState) => state.fileTree.tree;
-export const getTreeRevision = (state: RootState) => state.fileTree.revision;
-
-export const lastRequestPathSelector: (state: RootState) => string = (state: RootState) =>
-  state.symbol.lastRequestPath || '';
-
-export const structureSelector = (state: RootState) => {
-  const pathname = lastRequestPathSelector(state);
-  const symbols = state.symbol.structureTree[pathname];
-  return symbols || [];
-};
-
-export const refUrlSelector = (state: RootState) => {
-  const payload = state.editor.refPayload;
-  if (payload) {
-    const { line, character } = payload.position;
-    return `${payload.textDocument.uri}!L${line}:${character}`;
-  }
-  return undefined;
-};
-
-export const fileSelector = (state: RootState) => state.file.file;
-
-export const searchScopeSelector = (state: RootState) => state.search.scope;
-
-export const repoUriSelector = (state: RootState) => {
-  const { resource, org, repo } = state.route.match.params;
-  return `${resource}/${org}/${repo}`;
-};
-export const revisionSelector = (state: RootState) => state.route.match.params.revision;
-
-export const routeSelector = (state: RootState) => state.route.match;
-
-export const repoStatusSelector = (state: RootState, repoUri: RepositoryUri) => {
-  return state.status.status[repoUri];
-};
-
-export const allStatusSelector = (state: RootState) => state.status.status;
-
-export const currentPathSelector = (state: RootState) => state.route.match.params.path || '';
-
-export const treeCommitsSelector = (state: RootState) => {
-  const path = currentPathSelector(state);
-  return state.revision.treeCommits[path] || [];
-};
-
-export const hasMoreCommitsSelector = (state: RootState) => {
-  const path = currentPathSelector(state);
-  const isLoading = state.revision.loadingCommits;
-  if (isLoading) {
-    return false;
-  }
-  if (state.revision.commitsFullyLoaded[path]) {
-    return false;
-  }
-  const commits = state.revision.treeCommits[path];
-  if (!commits) {
-    // To avoid infinite loops in component `InfiniteScroll`,
-    // here we set hasMore to false before we receive the first batch.
-    return false;
-  }
-  return true;
-};
-
-function find(tree: FileTree, paths: string[]): FileTree | null {
-  if (paths.length === 0) {
-    return tree;
-  }
-  const [p, ...rest] = paths;
-  if (tree.children) {
-    const child = tree.children.find((c: FileTree) => c.name === p);
-    if (child) {
-      return find(child, rest);
-    }
-  }
-  return null;
-}
-
-export const currentTreeSelector = (state: RootState) => {
-  const tree = getTree(state);
-  const path = currentPathSelector(state) || '';
-  return find(tree, path.split('/'));
-};
-
-export const createTreeSelector = (path: string) => (state: RootState) => {
-  const tree = getTree(state);
-  return find(tree, path.split('/'));
-};
-
-export const currentRepoSelector = (state: RootState) => state.repository.repository;
-
-export const repoScopeSelector = (state: RootState) => state.search.searchOptions.repoScope;
-
-export const urlQueryStringSelector = (state: RootState) => state.route.match.location.search;
-
-export const previousMatchSelector = (state: RootState) => state.route.previousMatch;
-
-export const statusSelector = (state: RootState) => state.status.repoFileStatus;
-export const reposSelector = (state: RootState) => state.repositoryManagement.repositories;
diff --git a/x-pack/legacy/plugins/code/public/services/ui_metric.ts b/x-pack/legacy/plugins/code/public/services/ui_metric.ts
deleted file mode 100644
index 245ca14e77aa75..00000000000000
--- a/x-pack/legacy/plugins/code/public/services/ui_metric.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import {
-  createUiStatsReporter,
-  METRIC_TYPE,
-} from '../../../../../../src/legacy/core_plugins/ui_metric/public';
-import { APP_USAGE_TYPE } from '../../common/constants';
-
-export const trackCodeUiMetric = createUiStatsReporter(APP_USAGE_TYPE);
-export { METRIC_TYPE };
diff --git a/x-pack/legacy/plugins/code/public/shared.ts b/x-pack/legacy/plugins/code/public/shared.ts
deleted file mode 100644
index 8147ed8d439870..00000000000000
--- a/x-pack/legacy/plugins/code/public/shared.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './components/code_block';
-export {
-  CodeIntegrator,
-  Props as CodeIntegratorProps,
-} from './components/integrations/code_integrator';
diff --git a/x-pack/legacy/plugins/code/public/stores/index.ts b/x-pack/legacy/plugins/code/public/stores/index.ts
deleted file mode 100644
index b502ba97aa676e..00000000000000
--- a/x-pack/legacy/plugins/code/public/stores/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { applyMiddleware, compose, createStore } from 'redux';
-import createSagaMiddleware from 'redux-saga';
-
-import { rootReducer } from '../reducers';
-import { rootSaga } from '../sagas';
-
-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
-
-const sagaMW = createSagaMiddleware();
-
-export const store = createStore(rootReducer, composeEnhancers(applyMiddleware(sagaMW)));
-
-sagaMW.run(rootSaga);
diff --git a/x-pack/legacy/plugins/code/public/style/_buttons.scss b/x-pack/legacy/plugins/code/public/style/_buttons.scss
deleted file mode 100644
index 1f9dc1ff84e73f..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_buttons.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.codeButton__project {
-  border-radius: $euiBorderRadius;
-  height: 4rem;
-  padding: $euiSizeS;
-  width: 4rem;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  cursor: pointer;
-  transition: background-color $euiAnimSpeedFast $euiAnimSlightResistance;
-  padding: $euiSizeM 0;
-  &:hover {
-    background-color: $euiColorLightestShade;
-  }
-}
-
-.codeButton__projectImport {
-  margin-top: $euiSizeL;
-}
-
-.codeButtonGroup {
-  margin-left: $euiSizeS;
-  .euiButton {
-    font-size: $euiFontSizeS;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_commits.scss b/x-pack/legacy/plugins/code/public/style/_commits.scss
deleted file mode 100644
index edf212fe03224b..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_commits.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-.commit__actions {
-  flex-shrink: 0;
-  margin-left: $euiSizeXL;
-}
-
-.commit__metadata {
-  margin-bottom: $euiSizeXS;
-}
-
-.commit__inline-separator {
-  margin: 0 $euiSizeS;
-}
-
-.commit__diff-link {
-  @include euiCodeFont;
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_filetree.scss b/x-pack/legacy/plugins/code/public/style/_filetree.scss
deleted file mode 100644
index fb476e39cc3bbc..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_filetree.scss
+++ /dev/null
@@ -1,66 +0,0 @@
-%extendCodeNode__item {
-  padding: $euiSizeXS $euiSizeXS $euiSizeXS $euiSize;
-  cursor: pointer;
-  white-space: nowrap;
-  margin-left: $euiSizeS;
-  z-index: 2;
-}
-
-.codeFileTree__container .euiSideNavItem--branch {
-  padding-left: $euiSize;
-}
-
-.codeFileTree__node {
-  display: flex;
-  flex-direction: row;
-}
-
-.codeFileTree__item {
-  @extend %extendCodeNode__item;
-}
-
-.codeFileTree__file {
-  margin-left: calc(28rem / 16);
-}
-
-.codeFileTree__directory {
-  margin-left: $euiSizeS;
-  vertical-align: middle;
-}
-
-.codeFileTree__node--link {
-  position: absolute;
-  width: 100%;
-  left: 0;
-  height: 1.665rem;
-  opacity: 0;
-  z-index: $euiZLevel1;
-}
-
-.codeFileTree__node--fullWidth {
-  cursor: pointer;
-  position: absolute;
-  width: 100%;
-  background: $euiColorLightShade;
-  left: 0;
-  height: 1.665rem;
-  // Use box shadows instead of tricky absolute positioning to set the active state
-  box-shadow: -10rem 0 0 $euiColorLightShade, 10rem 0 0 $euiColorLightShade;
-}
-
-.codeFileTree__container {
-  .euiSideNavItem__items {
-    margin: 0;
-  }
-}
-
-@include euiBreakpoint('xs', 's') {
-  .codeFileTree__container {
-    margin-left: -$euiSizeXL;
-    margin-top: -$euiSizeL;
-
-    .euiSideNav__mobileToggle {
-      display: none;
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_filters.scss b/x-pack/legacy/plugins/code/public/style/_filters.scss
deleted file mode 100644
index 5519efa6a722e5..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_filters.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.codeFilter__groups {
-  padding: $euiSize;
-}
-
-.codeFilter__group {
-  margin-bottom: $euiSizeS;
-}
-
-.codeFilter__group-icon {
-  width: $codeSideBarIndent;
-}
-
-.codeFilter__item {
-  margin-left: $codeSideBarIndent;
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_layout.scss b/x-pack/legacy/plugins/code/public/style/_layout.scss
deleted file mode 100644
index 792cb0944cf3ed..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_layout.scss
+++ /dev/null
@@ -1,207 +0,0 @@
-.codeContainer__adminWrapper {
-  width: 100%;
-  flex-grow: 1;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-.codeContainer__adminMain {
-  overflow: auto;
-  padding: $euiSize $euiSizeXL;
-}
-
-.codeContainer__root {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
-.codeContainer__rootInner {
-  display: flex;
-  flex-direction: row;
-  flex-grow: 1;
-  height: 100%;
-}
-
-.codeContainer__main {
-  width: calc(100% - 16rem);
-  flex-grow: 1;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-.codeContainer__import {
-  max-width: 56rem;
-  margin: auto;
-}
-
-.codeContainer__setup {
-  width: 56rem;
-  margin: 0 auto;
-  padding: 0 0 $euiSizeXXL 0;
-
-  .codeContainer__setup--step {
-    margin-top: $euiSizeXXL;
-    width: 100%;
-  }
-}
-
-.codeContainer__editor {
-  overflow: hidden;
-  flex-grow: 1;
-}
-
-.codeContainer__blame {
-  position: relative;
-  overflow: hidden;
-  flex-grow: 1;
-}
-
-.codeContainer__directoryView,
-.codeContainer__history {
-  flex-grow: 1;
-  overflow: auto;
-}
-
-.codeContainer__select {
-  margin-right: $euiSizeS;
-  width: 12rem;
-  flex-grow: 0;
-  flex-shrink: 0;
-}
-
-.codeContainer__search--inner {
-  overflow-y: scroll;
-  padding: 1rem;
-}
-
-.codeContainer__search {
-  position: absolute;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  width: 100%;
-}
-
-.codeContainer__search--main {
-  overflow: hidden;
-  width: 100%;
-  flex-grow: 1;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-
-.codeContainer__sideTabTree {
-  position: relative;
-  display: inline-block;
-  min-width: 100%;
-}
-
-.codeContainer__search--results {
-  margin-top: $euiSize;
-}
-
-.codeViewer {
-  flex-grow: 1;
-}
-
-.codeSidebar__container {
-  background-color: $euiColorLightestShade;
-  border-right: solid 1px $euiBorderColor;
-  flex-grow: 1;
-  flex-shrink: 1;
-  overflow: auto;
-  max-width: $codeSideBarWidth;
-  min-width: $codeSideBarWidth;
-}
-
-.codeSearchbar__container {
-  height: 3.5rem;
-  padding: $codeSearchBarPadding;
-  border-bottom: $euiBorderWidthThin solid $euiBorderColor;
-}
-
-.codeSearchSettings__flyout {
-  max-width: 28rem;
-}
-
-.codeFooter--error {
-  color: $euiColorDanger;
-}
-
-.codePanel__project {
-  position: relative;
-  margin-bottom: $euiSizeS;
-}
-
-.codePanel__project--error {
-  border: 2px solid $euiColorDanger;
-}
-
-.codeSettingsPanel__icon {
-  display: inline-block;
-  position: relative;
-  top: $euiSizeS;
-}
-
-.codeText__blameMessage {
-  max-width: 10rem;
-}
-
-.codeAvatar {
-  margin: auto $euiSizeS auto 0;
-}
-
-.codeContainer__progress {
-  width: 40rem;
-  padding: $euiSizeXS;
-  border: $euiBorderThin;
-}
-
-.codeContainer__commitMessages {
-  overflow: auto;
-  flex: 1;
-  padding: $euiSizeM;
-
-  .codeHeader__commit {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-  }
-}
-
-.codeContainer__directoryList {
-  padding: $euiSizeL;
-  &:first-child {
-    padding-bottom: 0;
-  }
-  &:not(:first-child) {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-}
-
-.codePanel__error {
-  width: 31rem;
-  margin: auto;
-}
-
-.codeLoader {
-  padding: 1.5rem;
-  text-align: center;
-}
-
-.code-symbol-container {
-  white-space: nowrap;
-}
-
-.codeBreadcrumbs {
-  .euiPopover__anchor {
-    margin-top: $euiSizeXS;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_markdown.scss b/x-pack/legacy/plugins/code/public/style/_markdown.scss
deleted file mode 100644
index 01ceb042f0348f..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_markdown.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.markdown-body {
-  color: $euiColorDarkestShade;
-  a, a:visited {
-    color: $euiColorPrimary;
-    text-decoration: underline;
-  }
-}
-
-.markdown-body .highlight pre, .markdown-body pre {
-  background-color: $euiColorLightestShade;;
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_monaco.scss b/x-pack/legacy/plugins/code/public/style/_monaco.scss
deleted file mode 100644
index b04721251a09d0..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_monaco.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-.codeSearch__highlight {
-  background-color: $euiColorVis5;
-  color: black !important;
-  padding: $euiSizeXS / 2;
-  border-radius: $euiSizeXS / 2;
-  font-weight: bold;
-  font-style: oblique;
-  cursor: pointer;
-}
-
-.codeBlock__line--highlighted {
-  background-color: $euiColorLightShade;
-}
-
-.monaco-diff-editor .margin-view-overlays .line-numbers,
-.monaco-editor .margin-view-overlays .line-numbers {
-  text-align: center;
-  border-right: $euiBorderThin;
-}
-
-.monaco-diff-editor-hover,
-.monaco-editor-hover {
-  min-width: 350px;
-  border: $euiBorderThin;
-  border-bottom: 0;
-  cursor: default;
-  position: absolute;
-  overflow-y: auto;
-  z-index: 5;
-  -webkit-user-select: text;
-  -ms-user-select: text;
-  -moz-user-select: text;
-  -o-user-select: text;
-  user-select: text;
-  box-sizing: initial;
-  animation: fadein 0.1s linear;
-  line-height: 1.5em;
-  background: $euiColorLightestShade;
-  border-radius: 4px 4px 4px 4px;
-  @include euiBottomShadow;
-}
-
-.monaco-diff-editor-hover .hover-row,
-.monaco-editor-hover .hover-row {
-  padding: 4px 5px;
-}
-
-.monaco-diff-editor-hover .button-group,
-.monaco-editor-hover .button-group {
-  background: linear-gradient(-180deg, $euiColorLightestShade 0%, $euiColorEmptyShade 100%);
-  border-radius: 0 0 4px 4px;
-  box-shadow: 0 -1px 0 0 $euiBorderColor;
-  height: 33px;
-}
-
-.monaco-diff-editor-hover .button-group button:not(:first-child),
-.monaco-editor-hover .button-group button:not(:first-child) {
-  border-left: 1px solid $euiBorderColor;
-}
-
-.monaco-diff-editor-hover .button-group button,
-.monaco-editor-hover .button-group button {
-  font-size: 13px;
-  font-weight: normal;
-  border: 0;
-  border-radius: 0;
-  flex: 1;
-}
-
-.monaco-diff-editor .scroll-decoration,
-.monaco-editor .scroll-decoration {
-  display: none;
-}
-
-.text-placeholder {
-  width: 100%;
-  height: 18px;
-  margin: 4px 0 4px 0;
-}
-
-.gradient {
-  animation-duration: 1.8s;
-  animation-fill-mode: forwards;
-  animation-iteration-count: infinite;
-  animation-name: placeHolderShimmer;
-  animation-timing-function: linear;
-  background: $euiColorLightestShade;
-  background: linear-gradient(
-    to right,
-    $euiColorLightShade 8%,
-    $euiColorLightestShade 38%,
-    $euiColorLightShade 54%
-  );
-  background-size: 1000px 640px;
-
-  position: relative;
-}
-
-@keyframes placeHolderShimmer {
-  0% {
-    background-position: -468px 0;
-  }
-  100% {
-    background-position: 468px 0;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_query_bar.scss b/x-pack/legacy/plugins/code/public/style/_query_bar.scss
deleted file mode 100644
index 7459a8cd41e3a2..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_query_bar.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.codeQueryBar {
-  max-width: 90%;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.codeQueryBar__input {
-  padding-right: 10rem;
-}
-
-.codeQueryBar__scope {
-  width: calc(#{$codeSideBarWidth} - #{$codeSearchBarPadding});
-}
-
-.codeQueryBar__filter-badge {
-  margin-right: $euiSizeS;
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_shortcuts.scss b/x-pack/legacy/plugins/code/public/style/_shortcuts.scss
deleted file mode 100644
index 2cf519b7f2562d..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_shortcuts.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-.codeShortcuts__key {
-  background: $euiColorEmptyShade;
-  border: $euiBorderThin;
-  box-sizing: border-box;
-  box-shadow: 0px 2px 0px $euiColorLightestShade;
-  border-radius: $euiSizeXS;
-  width: $euiSizeL;
-  min-width: $euiSizeL;
-  height: $euiSizeL;
-  display: inline-block;
-  text-align: center;
-  margin: $euiSizeXS;
-  line-height: $euiSizeL;
-  text-transform: uppercase;
-  font-size: $euiFontSizeS;
-}
-
-.codeShortcuts__helpText {
-  line-height: $euiSizeL;
-  font-size: $euiFontSizeS;
-  margin-left: $euiSizeL / 2;
-  color: $euiColorDarkestShade;
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_sidebar.scss b/x-pack/legacy/plugins/code/public/style/_sidebar.scss
deleted file mode 100644
index ae58df8303ca48..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_sidebar.scss
+++ /dev/null
@@ -1,96 +0,0 @@
-.codeSidebar {
-  box-shadow: inset -1px 0 0 $euiColorLightShade;
-  padding: $euiSizeS;
-  flex-basis: 18rem;
-  flex-grow: 0;
-
-  .codeSidebar__heading {
-    margin: $euiSizeM $euiSizeM 0 $euiSizeM;
-  }
-
-  .code-sidebar__link {
-    background-color: transparent;
-    border-radius: $euiBorderRadius;
-    box-sizing: border-box;
-    padding-right: $euiSizeS;
-    width: 100%;
-    transition: all $euiAnimSpeedFast $euiAnimSlightResistance;
-    &:hover {
-      background-color: $euiColorLightestShade;
-    }
-    .euiFlexGroup--gutterLarge {
-      margin: 0;
-    }
-  }
-}
-
-.codeTab__projects {
-  .codeTab__projects--emptyHeader {
-    text-align: center;
-  }
-}
-
-.codeSymbol {
-  cursor: pointer;
-  display: flex;
-  flex-shrink: 0;
-  align-items: center;
-  height: 1.5rem;
-  margin-left: 0.75rem;
-  background: transparent;
-  position: relative;
-
-  .euiToken {
-    margin-right: $euiSizeS;
-  }
-
-  > .euiIcon {
-    margin-right: $euiSizeXS;
-  }
-}
-
-.codeSymbol--nested {
-  margin-left: 2rem;
-}
-
-.code-structure-node {
-  padding: $euiSizeXS;
-}
-
-.code-full-width-node {
-  position: absolute;
-  // guess there's an element has a margin 1rem affect this, can't find it sby far
-  width: calc(100% + 1rem);
-  background: $euiColorLightShade;
-  left: 0;
-  height: 1.5rem;
-}
-
-.euiSideNavItem__items {
-  position: static;
-}
-
-.codeStructureTree--icon {
-  margin: auto 0.25rem;
-  z-index: $euiZLevel2;
-}
-
-.code-symbol-link {
-  &:focus {
-    animation: none !important;
-  }
-}
-
-// EUI Overrides
-// TODO: Add 'code' prefixed classnames
-.euiSideNavItem--root + .euiSideNavItem--root {
-  margin-top: 1rem;
-}
-
-.euiSideNavItem__items:after {
-  width: 0;
-}
-
-.euiSideNavItem--trunk > .euiSideNavItem__items {
-  margin-left: $euiSize;
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_utilities.scss b/x-pack/legacy/plugins/code/public/style/_utilities.scss
deleted file mode 100644
index 6d0f814670e255..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_utilities.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.codeUtility__cursor--pointer {
-  cursor: pointer;
-}
-
-.codeMargin__title {
-  margin: $euiSizeXS 0 $euiSize $euiSizeM;
-}
diff --git a/x-pack/legacy/plugins/code/public/style/_variables.scss b/x-pack/legacy/plugins/code/public/style/_variables.scss
deleted file mode 100644
index c838f8d8e33095..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/_variables.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-$codeSideBarWidth: calc(#{$euiSize} * 16);
-$codeSideBarIndent: $euiSizeXL;
-$codeSearchBarPadding: $euiSizeS;
diff --git a/x-pack/legacy/plugins/code/public/style/variables.ts b/x-pack/legacy/plugins/code/public/style/variables.ts
deleted file mode 100644
index eeeba1000f575d..00000000000000
--- a/x-pack/legacy/plugins/code/public/style/variables.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const rem = 14;
-
-export function px(value: number): string {
-  return `${value}px`;
-}
-
-export function percent(value: number): string {
-  return `${value}%`;
-}
-
-export function pxToRem(value: number): string {
-  return `${value / rem}rem`;
-}
-
-export const colors = {
-  textBlue: '#0079A5',
-  borderGrey: '#D9D9D9',
-  white: '#fff',
-  textGrey: '#3F3F3F',
-};
-
-export const fontSizes = {
-  small: '10px',
-  normal: '1rem',
-  large: '18px',
-  xlarge: '2rem',
-};
-
-export const fontFamily = 'SFProText-Regular';
diff --git a/x-pack/legacy/plugins/code/public/utils/query_string.ts b/x-pack/legacy/plugins/code/public/utils/query_string.ts
deleted file mode 100644
index 6fc98f3dd44376..00000000000000
--- a/x-pack/legacy/plugins/code/public/utils/query_string.ts
+++ /dev/null
@@ -1,119 +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.
- */
-
-/**
- * Copied from `ui/utils/query_string` because of NP migration.
- */
-
-function encodeQueryComponent(val: string, pctEncodeSpaces = false) {
-  return encodeURIComponent(val)
-    .replace(/%40/gi, '@')
-    .replace(/%3A/gi, ':')
-    .replace(/%24/g, '$')
-    .replace(/%2C/gi, ',')
-    .replace(/%20/g, pctEncodeSpaces ? '%20' : '+');
-}
-
-function tryDecodeURIComponent(value: string) {
-  try {
-    return decodeURIComponent(value);
-  } catch (e) {} // eslint-disable-line no-empty
-}
-
-/**
- * Parses an escaped url query string into key-value pairs.
- * @returns {Object.<string,boolean|Array>}
- */
-const decode = (keyValue: any) => {
-  const obj: { [s: string]: any } = {};
-  let keyValueParts;
-  let key;
-
-  (keyValue || '').split('&').forEach((keyVal: any) => {
-    if (keyVal) {
-      keyValueParts = keyVal.split('=');
-      key = tryDecodeURIComponent(keyValueParts[0]);
-      if (key !== void 0) {
-        const val = keyValueParts[1] !== void 0 ? tryDecodeURIComponent(keyValueParts[1]) : true;
-        if (!obj[key]) {
-          obj[key] = val;
-        } else if (Array.isArray(obj[key])) {
-          obj[key].push(val);
-        } else {
-          obj[key] = [obj[key], val];
-        }
-      }
-    }
-  });
-  return obj;
-};
-
-/**
- * Creates a queryString out of an object
- * @param  {Object} obj
- * @return {String}
- */
-const encode = (obj: any) => {
-  const parts: any[] = [];
-  const keys = Object.keys(obj).sort();
-  keys.forEach((key: any) => {
-    const value = obj[key];
-    if (Array.isArray(value)) {
-      value.forEach((arrayValue: any) => {
-        parts.push(param(key, arrayValue));
-      });
-    } else {
-      parts.push(param(key, value));
-    }
-  });
-  return parts.length ? parts.join('&') : '';
-};
-
-const param = (key: string, val: any) => {
-  return (
-    encodeQueryComponent(key, true) + (val === true ? '' : '=' + encodeQueryComponent(val, true))
-  );
-};
-
-/**
- * Extracts the query string from a url
- * @param  {String} url
- * @return {Object} - returns an object describing the start/end index of the url in the string. The indices will be
- *                    the same if the url does not have a query string
- */
-const findInUrl = (url: string) => {
-  let qsStart = url.indexOf('?');
-  let hashStart = url.lastIndexOf('#');
-
-  if (hashStart === -1) {
-    // out of bounds
-    hashStart = url.length;
-  }
-
-  if (qsStart === -1) {
-    qsStart = hashStart;
-  }
-
-  return {
-    start: qsStart,
-    end: hashStart,
-  };
-};
-
-export const replaceParamInUrl = (url: string, p: string, newVal: any) => {
-  const loc = findInUrl(url);
-  const parsed = decode(url.substring(loc.start + 1, loc.end));
-
-  if (newVal != null) {
-    parsed[p] = newVal;
-  } else {
-    delete parsed[p];
-  }
-
-  const chars = url.split('');
-  chars.splice(loc.start, loc.end - loc.start, '?' + encode(parsed));
-  return chars.join('');
-};
diff --git a/x-pack/legacy/plugins/code/public/utils/saga_utils.ts b/x-pack/legacy/plugins/code/public/utils/saga_utils.ts
deleted file mode 100644
index d9de73a68dddc3..00000000000000
--- a/x-pack/legacy/plugins/code/public/utils/saga_utils.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { take, spawn } from 'redux-saga/effects';
-import { Action } from 'redux-actions';
-
-function* cancelRequest(action: Action<any>, abortController: AbortController) {
-  yield take(action.type);
-  abortController.abort();
-}
-
-export const singletonRequestSaga = (saga: any) =>
-  function*(action: Action<any>) {
-    const abortController = new AbortController();
-    const task = yield spawn(cancelRequest, action, abortController);
-    yield spawn(saga, action, abortController.signal, task);
-  };
diff --git a/x-pack/legacy/plugins/code/public/utils/test_utils.ts b/x-pack/legacy/plugins/code/public/utils/test_utils.ts
deleted file mode 100644
index e88dbafb614142..00000000000000
--- a/x-pack/legacy/plugins/code/public/utils/test_utils.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Action, History, Location } from 'history';
-import { match } from 'react-router-dom';
-
-interface LocationParam {
-  pathname?: string;
-  search?: string;
-  hash?: string;
-  state?: string;
-}
-
-export function createLocation(location: LocationParam): Location {
-  return {
-    pathname: '',
-    search: '',
-    hash: '',
-    state: '',
-    ...location,
-  };
-}
-
-interface MatchParam<Params> {
-  path?: string;
-  url?: string;
-  isExact?: boolean;
-  params: Params;
-}
-
-export function createMatch<Params>(m: MatchParam<Params>): match<Params> {
-  return {
-    path: '',
-    url: '',
-    isExact: true,
-    ...m,
-  };
-}
-
-interface HParam {
-  length?: number;
-  action: Action;
-  location: Location;
-}
-
-export const mockFunction = jest.fn();
-
-export function createHistory(h: HParam): History {
-  return {
-    length: 0,
-    push: mockFunction,
-    replace: mockFunction,
-    go: mockFunction,
-    goBack: mockFunction,
-    goForward: mockFunction,
-    listen: () => mockFunction,
-    block: () => mockFunction,
-    createHref: mockFunction,
-    ...h,
-  };
-}
diff --git a/x-pack/legacy/plugins/code/public/utils/url.ts b/x-pack/legacy/plugins/code/public/utils/url.ts
deleted file mode 100644
index 39c0a2a7f05409..00000000000000
--- a/x-pack/legacy/plugins/code/public/utils/url.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createHashHistory } from 'history';
-
-export const history = createHashHistory();
-
-export const isImportRepositoryURLInvalid = (url: string) => url.trim() === '';
diff --git a/x-pack/legacy/plugins/code/scripts/_helpers.js b/x-pack/legacy/plugins/code/scripts/_helpers.js
deleted file mode 100644
index 5b99a422986715..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/_helpers.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-const { resolve } = require('path');
-
-exports.runGulpTask = function (name) {
-  process.chdir(resolve(__dirname, '../../../..'));
-  process.argv.splice(1, 1, require.resolve('gulp/bin/gulp'), name);
-  require('gulp/bin/gulp'); // eslint-disable-line import/no-extraneous-dependencies
-};
-
-exports.runKibanaScript = function (name, args = []) {
-  process.chdir(resolve(__dirname, '../../../../..'));
-  process.argv.splice(2, 0, ...args);
-  require('../../../../../scripts/' + name); // eslint-disable-line import/no-dynamic-require
-};
-
-exports.runXPackScript = function (name, args = []) {
-  process.chdir(resolve(__dirname, '../../../..'));
-  process.argv.splice(2, 0, ...args);
-  require('../../../../scripts/' + name); // eslint-disable-line import/no-dynamic-require
-};
diff --git a/x-pack/legacy/plugins/code/scripts/all_test.js b/x-pack/legacy/plugins/code/scripts/all_test.js
deleted file mode 100644
index 11f91ad75cabdb..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/all_test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-const execa = require('execa'); // eslint-disable-line import/no-extraneous-dependencies
-
-execa.sync('node', [require.resolve('./jest')], { stdio: 'inherit' });
-execa.sync('node', [require.resolve('./mocha')], { stdio: 'inherit' });
-execa.sync('node', [require.resolve('./functional_test')], { stdio: 'inherit' });
-execa.sync('node', [require.resolve('./api_integration_test')], { stdio: 'inherit' });
diff --git a/x-pack/legacy/plugins/code/scripts/api_integration_test.js b/x-pack/legacy/plugins/code/scripts/api_integration_test.js
deleted file mode 100644
index e0bbb7e796d894..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/api_integration_test.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-require('./_helpers').runXPackScript('functional_tests', ['--config', 'test/api_integration/config.js', '--grep=^apis Code .*']);
diff --git a/x-pack/legacy/plugins/code/scripts/check.js b/x-pack/legacy/plugins/code/scripts/check.js
deleted file mode 100644
index 9c758babcb0423..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/check.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-const execa = require('execa'); // eslint-disable-line import/no-extraneous-dependencies
-
-execa.sync('node', [require.resolve('./lint')], { stdio: 'inherit' });
-execa.sync('node', [require.resolve('./type_check')], { stdio: 'inherit' });
diff --git a/x-pack/legacy/plugins/code/scripts/functional_test.js b/x-pack/legacy/plugins/code/scripts/functional_test.js
deleted file mode 100644
index 978b4323404729..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/functional_test.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-require('./_helpers').runXPackScript('functional_tests', ['--config', 'test/functional/config.js', '--grep=^Code .*']);
diff --git a/x-pack/legacy/plugins/code/scripts/jest.js b/x-pack/legacy/plugins/code/scripts/jest.js
deleted file mode 100644
index fbd4e3f971815c..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/jest.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-require('./_helpers').runXPackScript('jest', ['legacy/plugins/code']);
diff --git a/x-pack/legacy/plugins/code/scripts/lint.js b/x-pack/legacy/plugins/code/scripts/lint.js
deleted file mode 100644
index 393b9088b15e21..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/lint.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-require('./_helpers').runKibanaScript('eslint', ['x-pack/legacy/plugins/code/**/*.{js,jsx,ts,tsx}', '--fix']);
diff --git a/x-pack/legacy/plugins/code/scripts/mocha.js b/x-pack/legacy/plugins/code/scripts/mocha.js
deleted file mode 100644
index dd543f32e5d404..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/mocha.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-require('./_helpers').runKibanaScript('mocha', ['x-pack/legacy/plugins/code/server/__tests__/*.{ts,tsx}']);
diff --git a/x-pack/legacy/plugins/code/scripts/test.js b/x-pack/legacy/plugins/code/scripts/test.js
deleted file mode 100644
index 6eed94bd2f9123..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-const execa = require('execa'); // eslint-disable-line import/no-extraneous-dependencies
-
-execa.sync('node', [require.resolve('./jest')], { stdio: 'inherit' });
-execa.sync('node', [require.resolve('./mocha')], { stdio: 'inherit' });
diff --git a/x-pack/legacy/plugins/code/scripts/type_check.js b/x-pack/legacy/plugins/code/scripts/type_check.js
deleted file mode 100644
index 974978810e1d8c..00000000000000
--- a/x-pack/legacy/plugins/code/scripts/type_check.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-require('./_helpers').runKibanaScript('type_check', ['--project', 'x-pack/tsconfig.json']);
diff --git a/x-pack/legacy/plugins/code/server/__tests__/clone_worker.ts b/x-pack/legacy/plugins/code/server/__tests__/clone_worker.ts
deleted file mode 100644
index 09a039636bb4e3..00000000000000
--- a/x-pack/legacy/plugins/code/server/__tests__/clone_worker.ts
+++ /dev/null
@@ -1,478 +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 assert from 'assert';
-import { delay } from 'bluebird';
-import path from 'path';
-import rimraf from 'rimraf';
-import sinon from 'sinon';
-import { prepareProjectByCloning as prepareProject } from '../test_utils';
-import { CloneWorkerResult, Repository } from '../../model';
-import { DiskWatermarkService } from '../disk_watermark';
-import { GitOperations } from '../git_operations';
-import { EsClient, Esqueue } from '../lib/esqueue';
-import { Logger } from '../log';
-import { CloneWorker, IndexWorker } from '../queue';
-import { CancellationReason, CancellationSerivce } from '../queue/cancellation_service';
-import { RepositoryServiceFactory } from '../repository_service_factory';
-import { createTestServerOption, emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esQueue = {};
-
-const serverOptions = createTestServerOption();
-const gitOps = new GitOperations(serverOptions.repoPath);
-
-function cleanWorkspace() {
-  return new Promise(resolve => {
-    rimraf(serverOptions.workspacePath, resolve);
-  });
-}
-
-describe('clone_worker_tests', () => {
-  // @ts-ignore
-  before(async () => {
-    return new Promise(resolve => {
-      rimraf(serverOptions.repoPath, resolve);
-    });
-  });
-
-  beforeEach(async function() {
-    // @ts-ignore
-    this.timeout(200000);
-    await prepareProject(
-      'https://github.com/Microsoft/TypeScript-Node-Starter.git',
-      path.join(serverOptions.repoPath, 'github.com/Microsoft/TypeScript-Node-Starter')
-    );
-  });
-  // @ts-ignore
-  after(() => {
-    return cleanWorkspace();
-  });
-
-  afterEach(() => {
-    sinon.restore();
-  });
-
-  it('Execute clone job', async () => {
-    // Setup RepositoryService
-    const cloneSpy = sinon.spy();
-    const repoService = {
-      clone: emptyAsyncFunc,
-    };
-    repoService.clone = cloneSpy;
-    const repoServiceFactory = {
-      newInstance: (): void => {
-        return;
-      },
-    };
-    const newInstanceSpy = sinon.fake.returns(repoService);
-    repoServiceFactory.newInstance = newInstanceSpy;
-
-    // Setup CancellationService
-    const cancelCloneJobSpy = sinon.spy();
-    const registerCancelableCloneJobSpy = sinon.spy();
-    const cancellationService: any = {
-      cancelCloneJob: emptyAsyncFunc,
-      registerCancelableCloneJob: emptyAsyncFunc,
-    };
-    cancellationService.cancelCloneJob = cancelCloneJobSpy;
-    cancellationService.registerCancelableCloneJob = registerCancelableCloneJobSpy;
-
-    // Setup DiskWatermarkService
-    const isLowWatermarkSpy = sinon.stub().resolves(false);
-    const diskWatermarkService: any = {
-      isLowWatermark: isLowWatermarkSpy,
-    };
-
-    const cloneWorker = new CloneWorker(
-      esQueue as Esqueue,
-      log,
-      {} as EsClient,
-      serverOptions,
-      gitOps,
-      {} as IndexWorker,
-      (repoServiceFactory as any) as RepositoryServiceFactory,
-      cancellationService as CancellationSerivce,
-      diskWatermarkService as DiskWatermarkService
-    );
-
-    await cloneWorker.executeJob({
-      payload: {
-        url: 'https://github.com/Microsoft/TypeScript-Node-Starter.git',
-      },
-      options: {},
-      timestamp: 0,
-    });
-
-    assert.ok(isLowWatermarkSpy.calledOnce);
-    assert.ok(newInstanceSpy.calledOnce);
-    assert.ok(cloneSpy.calledOnce);
-  });
-
-  it('On clone job completed.', async () => {
-    // Setup IndexWorker
-    const enqueueJobSpy = sinon.spy();
-    const indexWorker = {
-      enqueueJob: emptyAsyncFunc,
-    };
-    indexWorker.enqueueJob = enqueueJobSpy;
-
-    // Setup EsClient
-    const updateSpy = sinon.spy();
-    const esClient = {
-      update: emptyAsyncFunc,
-    };
-    esClient.update = updateSpy;
-
-    // Setup CancellationService
-    const cancelCloneJobSpy = sinon.spy();
-    const registerCancelableCloneJobSpy = sinon.spy();
-    const cancellationService: any = {
-      cancelCloneJob: emptyAsyncFunc,
-      registerCancelableCloneJob: emptyAsyncFunc,
-    };
-    cancellationService.cancelCloneJob = cancelCloneJobSpy;
-    cancellationService.registerCancelableCloneJob = registerCancelableCloneJobSpy;
-
-    // Setup DiskWatermarkService
-    const isLowWatermarkSpy = sinon.stub().resolves(false);
-    const diskWatermarkService: any = {
-      isLowWatermark: isLowWatermarkSpy,
-    };
-
-    const cloneWorker = new CloneWorker(
-      esQueue as Esqueue,
-      log,
-      esClient as EsClient,
-      serverOptions,
-      gitOps,
-      (indexWorker as any) as IndexWorker,
-      {} as RepositoryServiceFactory,
-      cancellationService as CancellationSerivce,
-      diskWatermarkService as DiskWatermarkService
-    );
-
-    await cloneWorker.onJobCompleted(
-      {
-        payload: {
-          url: 'https://github.com/Microsoft/TypeScript-Node-Starter.git',
-        },
-        options: {},
-        timestamp: 0,
-      },
-      {
-        uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-        repo: ({
-          uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-        } as any) as Repository,
-      }
-    );
-
-    // EsClient update got called 3 times:
-    // * update default branch and revision of a repository object
-    // * update the revision in the git clone status
-    // * update the clone progress
-    assert.ok(updateSpy.calledThrice);
-
-    // Index request is issued after a 1s delay.
-    await delay(1000);
-    assert.ok(enqueueJobSpy.calledOnce);
-
-    assert.ok(isLowWatermarkSpy.notCalled);
-  });
-
-  it('On clone job completed because of cancellation', async () => {
-    // Setup IndexWorker
-    const enqueueJobSpy = sinon.spy();
-    const indexWorker = {
-      enqueueJob: emptyAsyncFunc,
-    };
-    indexWorker.enqueueJob = enqueueJobSpy;
-
-    // Setup EsClient
-    const updateSpy = sinon.spy();
-    const esClient = {
-      update: emptyAsyncFunc,
-    };
-    esClient.update = updateSpy;
-
-    // Setup CancellationService
-    const cancelCloneJobSpy = sinon.spy();
-    const registerCancelableCloneJobSpy = sinon.spy();
-    const cancellationService: any = {
-      cancelCloneJob: emptyAsyncFunc,
-      registerCancelableCloneJob: emptyAsyncFunc,
-    };
-    cancellationService.cancelCloneJob = cancelCloneJobSpy;
-    cancellationService.registerCancelableCloneJob = registerCancelableCloneJobSpy;
-
-    // Setup DiskWatermarkService
-    const isLowWatermarkSpy = sinon.stub().resolves(false);
-    const diskWatermarkService: any = {
-      isLowWatermark: isLowWatermarkSpy,
-    };
-
-    const cloneWorker = new CloneWorker(
-      esQueue as Esqueue,
-      log,
-      esClient as EsClient,
-      serverOptions,
-      gitOps,
-      (indexWorker as any) as IndexWorker,
-      {} as RepositoryServiceFactory,
-      cancellationService as CancellationSerivce,
-      diskWatermarkService as DiskWatermarkService
-    );
-
-    await cloneWorker.onJobCompleted(
-      {
-        payload: {
-          url: 'https://github.com/Microsoft/TypeScript-Node-Starter.git',
-        },
-        options: {},
-        timestamp: 0,
-      },
-      {
-        uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-        repo: ({
-          uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-        } as any) as Repository,
-        cancelled: true,
-      }
-    );
-
-    // EsClient update should not be called for the sake of clone
-    // cancellation.
-    assert.ok(updateSpy.notCalled);
-
-    // Index request should not be issued after clone request is done.
-    await delay(1000);
-    assert.ok(enqueueJobSpy.notCalled);
-
-    assert.ok(isLowWatermarkSpy.notCalled);
-  });
-
-  it('On clone job enqueued.', async () => {
-    // Setup EsClient
-    const indexSpy = sinon.spy();
-    const esClient = {
-      index: emptyAsyncFunc,
-    };
-    esClient.index = indexSpy;
-
-    // Setup CancellationService
-    const cancelCloneJobSpy = sinon.spy();
-    const registerCancelableCloneJobSpy = sinon.spy();
-    const cancellationService: any = {
-      cancelCloneJob: emptyAsyncFunc,
-      registerCancelableCloneJob: emptyAsyncFunc,
-    };
-    cancellationService.cancelCloneJob = cancelCloneJobSpy;
-    cancellationService.registerCancelableCloneJob = registerCancelableCloneJobSpy;
-
-    // Setup DiskWatermarkService
-    const isLowWatermarkSpy = sinon.stub().resolves(false);
-    const diskWatermarkService: any = {
-      isLowWatermark: isLowWatermarkSpy,
-    };
-
-    const cloneWorker = new CloneWorker(
-      esQueue as Esqueue,
-      log,
-      (esClient as any) as EsClient,
-      serverOptions,
-      gitOps,
-      {} as IndexWorker,
-      {} as RepositoryServiceFactory,
-      cancellationService as CancellationSerivce,
-      diskWatermarkService as DiskWatermarkService
-    );
-
-    await cloneWorker.onJobEnqueued({
-      payload: {
-        url: 'https://github.com/Microsoft/TypeScript-Node-Starter.git',
-      },
-      options: {},
-      timestamp: 0,
-    });
-
-    // Expect EsClient index to be called to update the progress to 0.
-    assert.ok(indexSpy.calledOnce);
-  });
-
-  it('Skip clone job for invalid git url', async () => {
-    // Setup RepositoryService
-    const cloneSpy = sinon.spy();
-    const repoService = {
-      clone: emptyAsyncFunc,
-    };
-    repoService.clone = cloneSpy;
-    const repoServiceFactory = {
-      newInstance: (): void => {
-        return;
-      },
-    };
-    const newInstanceSpy = sinon.fake.returns(repoService);
-    repoServiceFactory.newInstance = newInstanceSpy;
-
-    // Setup CancellationService
-    const cancelCloneJobSpy = sinon.spy();
-    const registerCancelableCloneJobSpy = sinon.spy();
-    const cancellationService: any = {
-      cancelCloneJob: emptyAsyncFunc,
-      registerCancelableCloneJob: emptyAsyncFunc,
-    };
-    cancellationService.cancelCloneJob = cancelCloneJobSpy;
-    cancellationService.registerCancelableCloneJob = registerCancelableCloneJobSpy;
-
-    // Setup DiskWatermarkService
-    const isLowWatermarkSpy = sinon.stub().resolves(false);
-    const diskWatermarkService: any = {
-      isLowWatermark: isLowWatermarkSpy,
-    };
-
-    const cloneWorker = new CloneWorker(
-      esQueue as Esqueue,
-      log,
-      {} as EsClient,
-      serverOptions,
-      gitOps,
-      {} as IndexWorker,
-      (repoServiceFactory as any) as RepositoryServiceFactory,
-      cancellationService as CancellationSerivce,
-      diskWatermarkService as DiskWatermarkService
-    );
-
-    const result1 = (await cloneWorker.executeJob({
-      payload: {
-        url: 'file:///foo/bar.git',
-      },
-      options: {},
-      timestamp: 0,
-    })) as CloneWorkerResult;
-
-    assert.ok(!result1.repo);
-    assert.ok(newInstanceSpy.notCalled);
-    assert.ok(cloneSpy.notCalled);
-    assert.ok(isLowWatermarkSpy.calledOnce);
-
-    const result2 = (await cloneWorker.executeJob({
-      payload: {
-        url: '/foo/bar.git',
-      },
-      options: {},
-      timestamp: 0,
-    })) as CloneWorkerResult;
-
-    assert.ok(!result2.repo);
-    assert.ok(newInstanceSpy.notCalled);
-    assert.ok(cloneSpy.notCalled);
-    assert.ok(isLowWatermarkSpy.calledTwice);
-  });
-
-  it('Execute clone job failed because of low available disk space', async () => {
-    // Setup RepositoryService
-    const cloneSpy = sinon.spy();
-    const repoService = {
-      clone: emptyAsyncFunc,
-    };
-    repoService.clone = cloneSpy;
-    const repoServiceFactory = {
-      newInstance: (): void => {
-        return;
-      },
-    };
-    const newInstanceSpy = sinon.fake.returns(repoService);
-    repoServiceFactory.newInstance = newInstanceSpy;
-
-    // Setup CancellationService
-    const cancelCloneJobSpy = sinon.spy();
-    const registerCancelableCloneJobSpy = sinon.spy();
-    const cancellationService: any = {
-      cancelCloneJob: emptyAsyncFunc,
-      registerCancelableCloneJob: emptyAsyncFunc,
-    };
-    cancellationService.cancelCloneJob = cancelCloneJobSpy;
-    cancellationService.registerCancelableCloneJob = registerCancelableCloneJobSpy;
-
-    // Setup DiskWatermarkService
-    const isLowWatermarkSpy = sinon.stub().resolves(true);
-    const diskWatermarkService: any = {
-      isLowWatermark: isLowWatermarkSpy,
-      diskWatermarkViolationMessage: sinon.stub().returns('No enough disk space'),
-    };
-
-    // Setup EsClient
-    const updateSpy = sinon.spy();
-    const esClient = {
-      update: emptyAsyncFunc,
-    };
-    esClient.update = updateSpy;
-
-    // Setup IndexWorker
-    const enqueueJobSpy = sinon.spy();
-    const indexWorker = {
-      enqueueJob: emptyAsyncFunc,
-    };
-    indexWorker.enqueueJob = enqueueJobSpy;
-
-    const cloneWorker = new CloneWorker(
-      esQueue as Esqueue,
-      log,
-      esClient as EsClient,
-      serverOptions,
-      gitOps,
-      (indexWorker as any) as IndexWorker,
-      (repoServiceFactory as any) as RepositoryServiceFactory,
-      cancellationService as CancellationSerivce,
-      diskWatermarkService as DiskWatermarkService
-    );
-
-    let res: CloneWorkerResult = { uri: 'github.com/Microsoft/TypeScript-Node-Starter' };
-    try {
-      res = (await cloneWorker.executeJob({
-        payload: {
-          url: 'https://github.com/Microsoft/TypeScript-Node-Starter.git',
-        },
-        options: {},
-        timestamp: 0,
-      })) as CloneWorkerResult;
-      // This step should not be touched.
-      assert.ok(false);
-    } catch (error) {
-      assert.ok(isLowWatermarkSpy.calledOnce);
-      assert.ok(newInstanceSpy.notCalled);
-      assert.ok(cloneSpy.notCalled);
-    }
-
-    assert.ok(res.cancelled);
-    assert.ok(res.cancelledReason === CancellationReason.LOW_DISK_SPACE);
-
-    const onJobExecutionErrorSpy = sinon.spy();
-    cloneWorker.onJobExecutionError = onJobExecutionErrorSpy;
-
-    await cloneWorker.onJobCompleted(
-      {
-        payload: {
-          url: 'https://github.com/Microsoft/TypeScript-Node-Starter.git',
-        },
-        options: {},
-        timestamp: 0,
-      },
-      res
-    );
-
-    assert.ok(onJobExecutionErrorSpy.calledOnce);
-    // Non of the follow up steps of a normal complete job should not be called
-    // because the job is going to be forwarded as execution error.
-    assert.ok(updateSpy.notCalled);
-    await delay(1000);
-    assert.ok(enqueueJobSpy.notCalled);
-  });
-});
diff --git a/x-pack/legacy/plugins/code/server/__tests__/commit_indexer.ts b/x-pack/legacy/plugins/code/server/__tests__/commit_indexer.ts
deleted file mode 100644
index c8fd117ec8a975..00000000000000
--- a/x-pack/legacy/plugins/code/server/__tests__/commit_indexer.ts
+++ /dev/null
@@ -1,198 +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 assert from 'assert';
-import path from 'path';
-import rimraf from 'rimraf';
-import sinon from 'sinon';
-import { prepareProjectByCloning as prepareProject } from '../test_utils';
-import { GitOperations } from '../git_operations';
-import { CommitIndexRequest, WorkerReservedProgress } from '../../model';
-import { CommitIndexer } from '../indexer/commit_indexer';
-import { RepositoryGitStatusReservedField } from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { createTestServerOption, emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esClient = {
-  bulk: emptyAsyncFunc,
-  get: emptyAsyncFunc,
-  deleteByQuery: emptyAsyncFunc,
-  indices: {
-    existsAlias: emptyAsyncFunc,
-    create: emptyAsyncFunc,
-    putAlias: emptyAsyncFunc,
-  },
-};
-
-const repoUri = 'github.com/elastic/TypeScript-Node-Starter';
-
-const serverOptions = createTestServerOption();
-const gitOps = new GitOperations(serverOptions.repoPath);
-
-function cleanWorkspace() {
-  return new Promise(resolve => {
-    rimraf(serverOptions.workspacePath, resolve);
-  });
-}
-
-function setupEsClientSpy() {
-  // Mock a git status of the repo indicating the the repo is fully cloned already.
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryGitStatusReservedField]: {
-          uri: repoUri,
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          cloneProgress: {
-            isCloned: true,
-          },
-        },
-      },
-    })
-  );
-  const existsAliasSpy = sinon.fake.returns(false);
-  const createSpy = sinon.spy();
-  const putAliasSpy = sinon.spy();
-  const deleteByQuerySpy = sinon.spy();
-  const bulkSpy = sinon.spy();
-  esClient.bulk = bulkSpy;
-  esClient.indices.existsAlias = existsAliasSpy;
-  esClient.indices.create = createSpy;
-  esClient.indices.putAlias = putAliasSpy;
-  esClient.get = getSpy;
-  esClient.deleteByQuery = deleteByQuerySpy;
-  return {
-    getSpy,
-    existsAliasSpy,
-    createSpy,
-    putAliasSpy,
-    deleteByQuerySpy,
-    bulkSpy,
-  };
-}
-
-describe('Commit indexer unit tests', function(this: any) {
-  this.timeout(20000);
-
-  // @ts-ignore
-  before(async () => {
-    return new Promise(resolve => {
-      rimraf(serverOptions.repoPath, resolve);
-    });
-  });
-
-  beforeEach(async function() {
-    // @ts-ignore
-    this.timeout(200000);
-    return await prepareProject(
-      `https://${repoUri}.git`,
-      path.join(serverOptions.repoPath, repoUri)
-    );
-  });
-  // @ts-ignore
-  after(() => {
-    return cleanWorkspace();
-  });
-
-  afterEach(() => {
-    sinon.restore();
-  });
-
-  it('Normal COMMIT index process.', async () => {
-    // Setup the esClient spies
-    const {
-      existsAliasSpy,
-      createSpy,
-      putAliasSpy,
-      deleteByQuerySpy,
-      bulkSpy,
-    } = setupEsClientSpy();
-
-    const indexer = new CommitIndexer(repoUri, 'master', gitOps, esClient as EsClient, log);
-    await indexer.start();
-
-    assert.strictEqual(deleteByQuerySpy.callCount, 1);
-    assert.strictEqual(existsAliasSpy.callCount, 1);
-    assert.strictEqual(createSpy.callCount, 1);
-    assert.strictEqual(putAliasSpy.callCount, 1);
-
-    assert.strictEqual(bulkSpy.callCount, 1);
-    let total = 0;
-    for (let i = 0; i < bulkSpy.callCount; i++) {
-      total += bulkSpy.getCall(i).args[0].body.length;
-    }
-    assert.strictEqual(total, 147 * 2);
-    // @ts-ignore
-  }).timeout(20000);
-
-  it('Cancel COMMIT index process.', async () => {
-    // Setup the esClient spies
-    const {
-      existsAliasSpy,
-      createSpy,
-      putAliasSpy,
-      deleteByQuerySpy,
-      bulkSpy,
-    } = setupEsClientSpy();
-
-    const indexer = new CommitIndexer(repoUri, 'master', gitOps, esClient as EsClient, log);
-    // Cancel the indexer before start.
-    indexer.cancel();
-    await indexer.start();
-
-    assert.strictEqual(deleteByQuerySpy.callCount, 1);
-    assert.strictEqual(existsAliasSpy.callCount, 1);
-    assert.strictEqual(createSpy.callCount, 1);
-    assert.strictEqual(putAliasSpy.callCount, 1);
-
-    // Because the indexer is cancelled already in the begining. 0 doc should be
-    // indexed and thus bulk won't be called.
-    assert.ok(bulkSpy.notCalled);
-  });
-
-  it('Index continues from a checkpoint', async () => {
-    // Setup the esClient spies
-    const {
-      existsAliasSpy,
-      createSpy,
-      putAliasSpy,
-      deleteByQuerySpy,
-      bulkSpy,
-    } = setupEsClientSpy();
-
-    const indexer = new CommitIndexer(repoUri, 'master', gitOps, esClient as EsClient, log);
-    // Apply a checkpoint in here.
-    await indexer.start(undefined, ({
-      repoUri: '',
-      revision: 'master',
-      commit: {
-        // The direct parent of the HEAD
-        id: '46971a8454761f1a11d8fde4d96ff8d29bc4e754',
-      },
-    } as any) as CommitIndexRequest);
-
-    // Expect EsClient deleteByQuery called 0 times for repository cleaning while
-    // dealing with repository checkpoint.
-    assert.strictEqual(deleteByQuerySpy.callCount, 0);
-
-    // Ditto for index and alias creation
-    assert.strictEqual(existsAliasSpy.callCount, 0);
-    assert.strictEqual(createSpy.callCount, 0);
-    assert.strictEqual(putAliasSpy.callCount, 0);
-    assert.strictEqual(bulkSpy.callCount, 1);
-    let total = 0;
-    for (let i = 0; i < bulkSpy.callCount; i++) {
-      total += bulkSpy.getCall(i).args[0].body.length;
-    }
-    assert.strictEqual(total, 146 * 2);
-    // @ts-ignore
-  }).timeout(20000);
-});
diff --git a/x-pack/legacy/plugins/code/server/__tests__/git_operations.ts b/x-pack/legacy/plugins/code/server/__tests__/git_operations.ts
deleted file mode 100644
index 9391a8aafc1313..00000000000000
--- a/x-pack/legacy/plugins/code/server/__tests__/git_operations.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-// @ts-ignore
-import assert from 'assert';
-import { execSync } from 'child_process';
-import fs from 'fs';
-import path from 'path';
-import rimraf from 'rimraf';
-import { GitOperations } from '../git_operations';
-import { createTestServerOption } from '../test_utils';
-import { prepareProjectByCloning as cloneProject, prepareProjectByInit } from '../test_utils';
-
-describe('git_operations', () => {
-  it('get default branch from a non master repo', async () => {
-    const repoUri = 'github.com/foo/bar';
-    const repoDir = path.join(serverOptions.repoPath, repoUri);
-    fs.mkdirSync(repoDir, { recursive: true });
-
-    // create a non-master using git commands
-    const shell = `
-    git init
-    git add 'run.sh'
-    git commit -m 'init commit'
-    git branch -m trunk
-  `;
-    fs.writeFileSync(path.join(repoDir, 'run.sh'), shell, 'utf-8');
-    execSync('sh ./run.sh', {
-      cwd: repoDir,
-    });
-
-    try {
-      const g = new GitOperations(serverOptions.repoPath);
-      const defaultBranch = await g.getDefaultBranch(repoUri);
-      assert.strictEqual(defaultBranch, 'trunk');
-      const headRevision = await g.getHeadRevision(repoUri);
-      const headCommit = await g.getCommitInfo(repoUri, 'HEAD');
-      assert.strictEqual(headRevision, headCommit!.id);
-    } finally {
-      rimraf.sync(repoDir);
-    }
-  });
-
-  async function prepareProject(repoPath: string) {
-    fs.mkdirSync(repoPath, { recursive: true });
-    const workDir = path.join(serverOptions.workspacePath, repoUri);
-    const { git, commits } = await prepareProjectByInit(workDir, {
-      'commit for test': {
-        '1': '',
-        'src/2': '',
-        'src/3': '',
-      },
-    });
-    // eslint-disable-next-line no-console
-    console.log(`created commit ${commits[0]}`);
-    await git.clone(workDir, repoPath, ['--bare']);
-  }
-
-  // @ts-ignore
-  before(async function() {
-    // @ts-ignore
-    this.timeout(200000);
-    await prepareProject(path.join(serverOptions.repoPath, repoUri));
-    await cloneProject(
-      'https://github.com/elastic/TypeScript-Node-Starter.git',
-      path.join(serverOptions.repoPath, 'github.com/elastic/TypeScript-Node-Starter')
-    );
-  });
-  const repoUri = 'github.com/test/test_repo';
-
-  const serverOptions = createTestServerOption();
-
-  it('can iterate a repo', async () => {
-    const g = new GitOperations(serverOptions.repoPath);
-    let count = 0;
-    const iterator = await g.iterateRepo(repoUri, 'HEAD');
-    for await (const value of iterator) {
-      if (count === 0) {
-        assert.strictEqual('1', value.path);
-      } else if (count === 1) {
-        assert.strictEqual('src/2', value.path);
-      } else if (count === 2) {
-        assert.strictEqual('src/3', value.path);
-      } else {
-        assert.fail('this repo should contains exactly 3 files');
-      }
-      count++;
-    }
-    const totalFiles = await g.countRepoFiles(repoUri, 'HEAD');
-    assert.strictEqual(count, 3, 'this repo should contains exactly 3 files');
-    assert.strictEqual(totalFiles, 3, 'this repo should contains exactly 3 files');
-  });
-
-  it('can resolve branches', async () => {
-    const g = new GitOperations(serverOptions.repoPath);
-    const c = await g.getCommitOr404('github.com/elastic/TypeScript-Node-Starter', 'master');
-    assert.strictEqual(c.id, '261557d657fdfddf78119d15d38b1f6a7be005ed');
-    const c1 = await g.getCommitOr404('github.com/elastic/TypeScript-Node-Starter', 'VS');
-    assert.strictEqual(c1.id, 'ba73782df210e0a7744ac9b623d58081a1801738');
-    // @ts-ignore
-  }).timeout(100000);
-
-  it('get diff between arbitrary 2 revisions', async () => {
-    const g = new GitOperations(serverOptions.repoPath);
-    const d = await g.getDiff('github.com/elastic/TypeScript-Node-Starter', '6206f643', '4779cb7e');
-    assert.equal(d.additions, 2);
-    assert.equal(d.deletions, 4);
-    assert.equal(d.files.length, 3);
-    // @ts-ignore
-  }).timeout(100000);
-});
diff --git a/x-pack/legacy/plugins/code/server/__tests__/lsp_incremental_indexer.ts b/x-pack/legacy/plugins/code/server/__tests__/lsp_incremental_indexer.ts
deleted file mode 100644
index aafdf8ebce85b9..00000000000000
--- a/x-pack/legacy/plugins/code/server/__tests__/lsp_incremental_indexer.ts
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import assert from 'assert';
-import path from 'path';
-import rimraf from 'rimraf';
-import sinon from 'sinon';
-
-import { DiffKind } from '../../common/git_diff';
-import { WorkerReservedProgress } from '../../model';
-import { GitOperations } from '../git_operations';
-import { LspIncrementalIndexer } from '../indexer/lsp_incremental_indexer';
-import { RepositoryGitStatusReservedField } from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { InstallManager } from '../lsp/install_manager';
-import { LspService } from '../lsp/lsp_service';
-import { RepositoryConfigController } from '../repository_config_controller';
-import { createTestServerOption, emptyAsyncFunc, createTestHapiServer } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { prepareProjectByCloning as prepareProject } from '../test_utils';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esClient = {
-  bulk: emptyAsyncFunc,
-  get: emptyAsyncFunc,
-  deleteByQuery: emptyAsyncFunc,
-  indices: {
-    existsAlias: emptyAsyncFunc,
-    create: emptyAsyncFunc,
-    putAlias: emptyAsyncFunc,
-  },
-};
-
-const repoUri = 'github.com/elastic/TypeScript-Node-Starter';
-
-const serverOptions = createTestServerOption();
-const server = createTestHapiServer();
-const gitOps = new GitOperations(serverOptions.repoPath);
-
-function cleanWorkspace() {
-  return new Promise(resolve => {
-    rimraf(serverOptions.workspacePath, resolve);
-  });
-}
-
-function setupEsClientSpy() {
-  // Mock a git status of the repo indicating the the repo is fully cloned already.
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryGitStatusReservedField]: {
-          uri: 'github.com/elastic/TypeScript-Node-Starter',
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          cloneProgress: {
-            isCloned: true,
-          },
-        },
-      },
-    })
-  );
-  const existsAliasSpy = sinon.fake.returns(false);
-  const createSpy = sinon.spy();
-  const putAliasSpy = sinon.spy();
-  const deleteByQuerySpy = sinon.spy();
-  const bulkSpy = sinon.spy();
-  esClient.bulk = bulkSpy;
-  esClient.indices.existsAlias = existsAliasSpy;
-  esClient.indices.create = createSpy;
-  esClient.indices.putAlias = putAliasSpy;
-  esClient.get = getSpy;
-  esClient.deleteByQuery = deleteByQuerySpy;
-  return {
-    getSpy,
-    existsAliasSpy,
-    createSpy,
-    putAliasSpy,
-    deleteByQuerySpy,
-    bulkSpy,
-  };
-}
-
-function setupLsServiceSendRequestSpy(): sinon.SinonSpy {
-  return sinon.fake.returns(
-    Promise.resolve({
-      result: [
-        {
-          // 1 mock symbol for each file
-          symbols: [
-            {
-              symbolInformation: {
-                name: 'mocksymbolname',
-              },
-            },
-          ],
-          // 1 mock reference for each file
-          references: [{}],
-        },
-      ],
-    })
-  );
-}
-
-describe('LSP incremental indexer unit tests', () => {
-  // @ts-ignore
-  before(async () => {
-    return new Promise(resolve => {
-      rimraf(serverOptions.repoPath, resolve);
-    });
-  });
-
-  beforeEach(async function() {
-    // @ts-ignore
-    this.timeout(200000);
-    return await prepareProject(
-      'https://github.com/elastic/TypeScript-Node-Starter.git',
-      path.join(serverOptions.repoPath, repoUri)
-    );
-  });
-  // @ts-ignore
-  after(() => {
-    return cleanWorkspace();
-  });
-
-  afterEach(() => {
-    sinon.restore();
-  });
-
-  it('Normal LSP index process.', async () => {
-    // Setup the esClient spies
-    const {
-      existsAliasSpy,
-      createSpy,
-      putAliasSpy,
-      deleteByQuerySpy,
-      bulkSpy,
-    } = setupEsClientSpy();
-
-    const lspservice = new LspService(
-      '127.0.0.1',
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      new InstallManager(server, serverOptions),
-      new ConsoleLoggerFactory(),
-      new RepositoryConfigController(esClient as EsClient)
-    );
-
-    lspservice.sendRequest = setupLsServiceSendRequestSpy();
-
-    const indexer = new LspIncrementalIndexer(
-      'github.com/elastic/TypeScript-Node-Starter',
-      'HEAD',
-      '67002808',
-      lspservice,
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      log
-    );
-    await indexer.start();
-
-    // Index and alias creation are not necessary for incremental indexing
-    assert.strictEqual(existsAliasSpy.callCount, 0);
-    assert.strictEqual(createSpy.callCount, 0);
-    assert.strictEqual(putAliasSpy.callCount, 0);
-
-    // DeletebyQuery is called 10 times (1 file + 1 symbol reuqests per diff item)
-    // for 5 MODIFIED items
-    assert.strictEqual(deleteByQuerySpy.callCount, 5);
-
-    // There are 5 MODIFIED items and 1 ADDED item. Only 1 file is in supported
-    // language. Each file with supported language has 1 file + 1 symbol + 1 reference.
-    // Total doc indexed should be 6 * 2 + 4 = 16,
-    // which can be fitted into a single batch index.
-    assert.strictEqual(bulkSpy.callCount, 2);
-    let total = 0;
-    for (let i = 0; i < bulkSpy.callCount; i++) {
-      total += bulkSpy.getCall(i).args[0].body.length;
-    }
-    assert.strictEqual(total, 8);
-
-    // @ts-ignore
-  }).timeout(20000);
-
-  it('Cancel LSP index process.', async () => {
-    // Setup the esClient spies
-    const {
-      existsAliasSpy,
-      createSpy,
-      putAliasSpy,
-      deleteByQuerySpy,
-      bulkSpy,
-    } = setupEsClientSpy();
-
-    const lspservice = new LspService(
-      '127.0.0.1',
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      new InstallManager(server, serverOptions),
-      new ConsoleLoggerFactory(),
-      new RepositoryConfigController(esClient as EsClient)
-    );
-
-    lspservice.sendRequest = setupLsServiceSendRequestSpy();
-
-    const indexer = new LspIncrementalIndexer(
-      'github.com/elastic/TypeScript-Node-Starter',
-      'HEAD',
-      '67002808',
-      lspservice,
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      log
-    );
-    // Cancel the indexer before start.
-    indexer.cancel();
-    await indexer.start();
-
-    // Index and alias creation are not necessary for incremental indexing.
-    assert.strictEqual(existsAliasSpy.callCount, 0);
-    assert.strictEqual(createSpy.callCount, 0);
-    assert.strictEqual(putAliasSpy.callCount, 0);
-
-    // Because the indexer is cancelled already in the begining. 0 doc should be
-    // indexed and thus bulk and deleteByQuery won't be called.
-    assert.ok(bulkSpy.notCalled);
-    assert.ok(deleteByQuerySpy.notCalled);
-  });
-
-  it('Index continues from a checkpoint', async () => {
-    // Setup the esClient spies
-    const {
-      existsAliasSpy,
-      createSpy,
-      putAliasSpy,
-      deleteByQuerySpy,
-      bulkSpy,
-    } = setupEsClientSpy();
-
-    const lspservice = new LspService(
-      '127.0.0.1',
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      new InstallManager(server, serverOptions),
-      new ConsoleLoggerFactory(),
-      new RepositoryConfigController(esClient as EsClient)
-    );
-
-    lspservice.sendRequest = setupLsServiceSendRequestSpy();
-
-    const indexer = new LspIncrementalIndexer(
-      'github.com/elastic/TypeScript-Node-Starter',
-      'HEAD',
-      '67002808',
-      lspservice,
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      log
-    );
-
-    // Apply a checkpoint in here.
-    await indexer.start(undefined, {
-      repoUri: '',
-      filePath: 'package.json',
-      revision: 'HEAD',
-      originRevision: '67002808',
-      kind: DiffKind.MODIFIED,
-    });
-
-    // Index and alias creation are not necessary for incremental indexing.
-    assert.strictEqual(existsAliasSpy.callCount, 0);
-    assert.strictEqual(createSpy.callCount, 0);
-    assert.strictEqual(putAliasSpy.callCount, 0);
-
-    // There are 2 items after the checkpoint. No items is in supported language.
-    // Total doc indexed should be 3 * 1 = 3, which can be fitted into a single batch index.
-    assert.strictEqual(bulkSpy.callCount, 2);
-    let total = 0;
-    for (let i = 0; i < bulkSpy.callCount; i++) {
-      total += bulkSpy.getCall(i).args[0].body.length;
-    }
-    assert.strictEqual(total, 4 * 2);
-    assert.strictEqual(deleteByQuerySpy.callCount, 1);
-    // @ts-ignore
-  }).timeout(20000);
-  // @ts-ignore
-}).timeout(20000);
diff --git a/x-pack/legacy/plugins/code/server/__tests__/lsp_indexer.ts b/x-pack/legacy/plugins/code/server/__tests__/lsp_indexer.ts
deleted file mode 100644
index ec7e539d1912ef..00000000000000
--- a/x-pack/legacy/plugins/code/server/__tests__/lsp_indexer.ts
+++ /dev/null
@@ -1,320 +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 assert from 'assert';
-import path from 'path';
-import rimraf from 'rimraf';
-import sinon from 'sinon';
-import { prepareProjectByCloning as prepareProject } from '../test_utils';
-
-import { GitOperations } from '../git_operations';
-import { WorkerReservedProgress } from '../../model';
-import { LspIndexer } from '../indexer/lsp_indexer';
-import { RepositoryGitStatusReservedField } from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { InstallManager } from '../lsp/install_manager';
-import { LspService } from '../lsp/lsp_service';
-import { RepositoryConfigController } from '../repository_config_controller';
-import { createTestHapiServer, createTestServerOption, emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esClient = {
-  bulk: emptyAsyncFunc,
-  get: emptyAsyncFunc,
-  deleteByQuery: emptyAsyncFunc,
-  indices: {
-    existsAlias: emptyAsyncFunc,
-    create: emptyAsyncFunc,
-    putAlias: emptyAsyncFunc,
-  },
-};
-
-const repoUri = 'github.com/elastic/TypeScript-Node-Starter';
-
-const serverOptions = createTestServerOption();
-const server = createTestHapiServer();
-const gitOps = new GitOperations(serverOptions.repoPath);
-
-function cleanWorkspace() {
-  return new Promise(resolve => {
-    rimraf(serverOptions.workspacePath, resolve);
-  });
-}
-
-function setupEsClientSpy() {
-  // Mock a git status of the repo indicating the the repo is fully cloned already.
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryGitStatusReservedField]: {
-          uri: repoUri,
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          cloneProgress: {
-            isCloned: true,
-          },
-        },
-      },
-    })
-  );
-  const existsAliasSpy = sinon.fake.returns(false);
-  const createSpy = sinon.spy();
-  const putAliasSpy = sinon.spy();
-  const deleteByQuerySpy = sinon.spy();
-  const bulkSpy = sinon.spy();
-  esClient.bulk = bulkSpy;
-  esClient.indices.existsAlias = existsAliasSpy;
-  esClient.indices.create = createSpy;
-  esClient.indices.putAlias = putAliasSpy;
-  esClient.get = getSpy;
-  esClient.deleteByQuery = deleteByQuerySpy;
-  return {
-    getSpy,
-    existsAliasSpy,
-    createSpy,
-    putAliasSpy,
-    deleteByQuerySpy,
-    bulkSpy,
-  };
-}
-
-function setupLsServiceSendRequestSpy(): sinon.SinonSpy {
-  return sinon.fake.returns(
-    Promise.resolve({
-      result: [
-        {
-          // 1 mock symbol for each file
-          symbols: [
-            {
-              symbolInformation: {
-                name: 'mocksymbolname',
-              },
-            },
-          ],
-          // 1 mock reference for each file
-          references: [{}],
-        },
-      ],
-    })
-  );
-}
-
-describe('LSP indexer unit tests', function(this: any) {
-  this.timeout(20000);
-
-  // @ts-ignore
-  before(async () => {
-    return new Promise(resolve => {
-      rimraf(serverOptions.repoPath, resolve);
-    });
-  });
-
-  beforeEach(async function() {
-    // @ts-ignore
-    this.timeout(200000);
-    return await prepareProject(
-      `https://${repoUri}.git`,
-      path.join(serverOptions.repoPath, repoUri)
-    );
-  });
-  // @ts-ignore
-  after(() => {
-    return cleanWorkspace();
-  });
-
-  afterEach(() => {
-    sinon.restore();
-  });
-
-  it('Normal LSP index process.', async () => {
-    // Setup the esClient spies
-    const {
-      existsAliasSpy,
-      createSpy,
-      putAliasSpy,
-      deleteByQuerySpy,
-      bulkSpy,
-    } = setupEsClientSpy();
-
-    const lspservice = new LspService(
-      '127.0.0.1',
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      new InstallManager(server, serverOptions),
-      new ConsoleLoggerFactory(),
-      new RepositoryConfigController(esClient as EsClient)
-    );
-
-    const lspSendRequestSpy = setupLsServiceSendRequestSpy();
-    lspservice.sendRequest = lspSendRequestSpy;
-    const supportLanguageSpy = sinon.stub();
-
-    // Setup supported languages, so that unsupported source files won't be
-    // sent for lsp requests.
-    supportLanguageSpy.withArgs('javascript').returns(true);
-    supportLanguageSpy.withArgs('typescript').returns(true);
-    lspservice.supportLanguage = supportLanguageSpy;
-
-    const indexer = new LspIndexer(
-      repoUri,
-      'master',
-      lspservice,
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      log
-    );
-    await indexer.start();
-
-    // Expect EsClient deleteByQuery called 3 times for repository cleaning before
-    // the index for document, symbol and reference, respectively.
-    assert.strictEqual(deleteByQuerySpy.callCount, 3);
-
-    // Ditto for index and alias creation
-    assert.strictEqual(existsAliasSpy.callCount, 3);
-    assert.strictEqual(createSpy.callCount, 3);
-    assert.strictEqual(putAliasSpy.callCount, 3);
-
-    // There are 22 files which are written in supported languages in the repo. 1 file + 1 symbol + 1 reference = 3 objects to
-    // index for each file. Total doc indexed for these files should be 3 * 22 = 66.
-    // The rest 158 files will only be indexed for document.
-    // There are also 10 binary files to be excluded.
-    // So the total number of index requests will be 66 + 158 - 10 = 214.
-    assert.strictEqual(bulkSpy.callCount, 5);
-    assert.strictEqual(lspSendRequestSpy.callCount, 22);
-    let total = 0;
-    for (let i = 0; i < bulkSpy.callCount; i++) {
-      total += bulkSpy.getCall(i).args[0].body.length;
-    }
-    assert.strictEqual(total, 214 * 2);
-    // @ts-ignore
-  }).timeout(20000);
-
-  it('Cancel LSP index process.', async () => {
-    // Setup the esClient spies
-    const {
-      existsAliasSpy,
-      createSpy,
-      putAliasSpy,
-      deleteByQuerySpy,
-      bulkSpy,
-    } = setupEsClientSpy();
-
-    const lspservice = new LspService(
-      '127.0.0.1',
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      new InstallManager(server, serverOptions),
-      new ConsoleLoggerFactory(),
-      new RepositoryConfigController(esClient as EsClient)
-    );
-
-    lspservice.sendRequest = setupLsServiceSendRequestSpy();
-
-    const indexer = new LspIndexer(
-      repoUri,
-      'master',
-      lspservice,
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      log
-    );
-    // Cancel the indexer before start.
-    indexer.cancel();
-    await indexer.start();
-
-    // Expect EsClient deleteByQuery called 3 times for repository cleaning before
-    // the index for document, symbol and reference, respectively.
-    assert.strictEqual(deleteByQuerySpy.callCount, 3);
-
-    // Ditto for index and alias creation
-    assert.strictEqual(existsAliasSpy.callCount, 3);
-    assert.strictEqual(createSpy.callCount, 3);
-    assert.strictEqual(putAliasSpy.callCount, 3);
-
-    // Because the indexer is cancelled already in the begining. 0 doc should be
-    // indexed and thus bulk won't be called.
-    assert.ok(bulkSpy.notCalled);
-  });
-
-  it('Index continues from a checkpoint', async () => {
-    // Setup the esClient spies
-    const {
-      existsAliasSpy,
-      createSpy,
-      putAliasSpy,
-      deleteByQuerySpy,
-      bulkSpy,
-    } = setupEsClientSpy();
-
-    const lspservice = new LspService(
-      '127.0.0.1',
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      new InstallManager(server, serverOptions),
-      new ConsoleLoggerFactory(),
-      new RepositoryConfigController(esClient as EsClient)
-    );
-
-    const lspSendRequestSpy = setupLsServiceSendRequestSpy();
-    lspservice.sendRequest = lspSendRequestSpy;
-    const supportLanguageSpy = sinon.stub();
-
-    // Setup supported languages, so that unsupported source files won't be
-    // sent for lsp requests.
-    supportLanguageSpy.withArgs('javascript').returns(true);
-    supportLanguageSpy.withArgs('typescript').returns(true);
-    lspservice.supportLanguage = supportLanguageSpy;
-
-    const indexer = new LspIndexer(
-      repoUri,
-      'HEAD',
-      lspservice,
-      serverOptions,
-      gitOps,
-      esClient as EsClient,
-      log
-    );
-
-    // Apply a checkpoint in here.
-    await indexer.start(undefined, {
-      repoUri: '',
-      filePath: 'src/public/js/main.ts',
-      revision: 'HEAD',
-    });
-
-    // Expect EsClient deleteByQuery called 0 times for repository cleaning while
-    // dealing with repository checkpoint.
-    assert.strictEqual(deleteByQuerySpy.callCount, 0);
-
-    // Ditto for index and alias creation
-    assert.strictEqual(existsAliasSpy.callCount, 0);
-    assert.strictEqual(createSpy.callCount, 0);
-    assert.strictEqual(putAliasSpy.callCount, 0);
-
-    // There are 22 files with supported language in the repo, but only 11
-    // files after the checkpoint. 1 file + 1 symbol + 1 reference = 3 objects
-    // to index for each file. Total doc indexed for these files should be
-    // 3 * 11 = 33. Also there are 15 files without supported language. Only one
-    // document will be index for these files. So total index requests would be
-    // 33 + 15 = 48.
-    assert.strictEqual(bulkSpy.callCount, 2);
-    assert.strictEqual(lspSendRequestSpy.callCount, 11);
-    let total = 0;
-    for (let i = 0; i < bulkSpy.callCount; i++) {
-      total += bulkSpy.getCall(i).args[0].body.length;
-    }
-    assert.strictEqual(total, 48 * 2);
-    // @ts-ignore
-  }).timeout(20000);
-});
diff --git a/x-pack/legacy/plugins/code/server/__tests__/lsp_service.ts b/x-pack/legacy/plugins/code/server/__tests__/lsp_service.ts
deleted file mode 100644
index 6480402db98276..00000000000000
--- a/x-pack/legacy/plugins/code/server/__tests__/lsp_service.ts
+++ /dev/null
@@ -1,252 +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 fs from 'fs';
-import path from 'path';
-import sinon from 'sinon';
-
-import assert from 'assert';
-
-import { simplegit } from '@elastic/simple-git/dist';
-import { GitOperations } from '../git_operations';
-import { RepositoryConfigReservedField, RepositoryGitStatusReservedField } from '../indexer/schema';
-import { InstallManager } from '../lsp/install_manager';
-import { LspService } from '../lsp/lsp_service';
-import { RepositoryConfigController } from '../repository_config_controller';
-import {
-  createTestHapiServer,
-  createTestServerOption,
-  prepareProjectByCloning,
-  prepareProjectByInit,
-} from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-
-const filename = 'hello.ts';
-const packagejson = `
-{
-  "name": "master",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "dependencies": {},
-  "devDependencies": {
-      "typescript": "~3.3.3333"
-  },
-  "scripts": {
-    "test": "echo \\"Error: no test specified\\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
-}
-`;
-describe('lsp_service tests', () => {
-  let firstCommitSha = '';
-  let secondCommitSha = '';
-  async function prepareProject(repoPath: string) {
-    const { commits } = await prepareProjectByInit(repoPath, {
-      'commit for test': {
-        [filename]: "console.log('hello world');",
-      },
-      'commit2 for test': {
-        'package.json': packagejson,
-      },
-    });
-
-    firstCommitSha = commits[0];
-    secondCommitSha = commits[1];
-  }
-
-  const serverOptions = createTestServerOption();
-  const server = createTestHapiServer();
-  const installManager = new InstallManager(server, serverOptions);
-  const gitOps = new GitOperations(serverOptions.repoPath);
-
-  function mockEsClient(): any {
-    const api = {
-      get(params: any) {
-        return {
-          _source: {
-            [RepositoryGitStatusReservedField]: {
-              cloneProgress: {
-                isCloned: true,
-              },
-            },
-            [RepositoryConfigReservedField]: {
-              disableTypescript: false,
-            },
-          },
-        };
-      },
-    };
-    return api;
-  }
-
-  const repoUri = 'github.com/test/test_repo';
-  const mockRndPath = '__random';
-
-  // @ts-ignore
-  before(async () => {
-    const tmpRepo = path.join(serverOptions.repoPath, 'tmp');
-    await prepareProject(tmpRepo);
-    await prepareProjectByCloning(`file://${tmpRepo}`, path.join(serverOptions.repoPath, repoUri));
-  });
-
-  function comparePath(pathA: string, pathB: string) {
-    const pa = fs.realpathSync(pathA);
-    const pb = fs.realpathSync(pathB);
-    return path.resolve(pa) === path.resolve(pb);
-  }
-
-  function mockLspService() {
-    const esClient = mockEsClient();
-    const service = new LspService(
-      '127.0.0.1',
-      serverOptions,
-      gitOps,
-      esClient,
-      installManager,
-      new ConsoleLoggerFactory(),
-      new RepositoryConfigController(esClient)
-    );
-    // @ts-ignore
-    service.workspaceHandler.randomPath = () => 'random';
-    return service;
-  }
-
-  async function sendHoverRequest(lspservice: LspService, revision: string) {
-    const method = 'textDocument/hover';
-
-    const params = {
-      textDocument: {
-        uri: `git://${repoUri}/blob/${revision}/${filename}`,
-      },
-      position: {
-        line: 0,
-        character: 1,
-      },
-    };
-    return await lspservice.sendRequest(method, params);
-  }
-
-  it('process a hover request', async () => {
-    const lspservice = mockLspService();
-    try {
-      const workspaceHandler = lspservice.workspaceHandler;
-      const wsSpy = sinon.spy(workspaceHandler, 'handleRequest');
-      const controller = lspservice.controller;
-      const ctrlSpy = sinon.spy(controller, 'handleRequest');
-
-      const revision = 'master';
-
-      const response = await sendHoverRequest(lspservice, revision);
-      assert.ok(response);
-      assert.ok(response.result.contents);
-
-      wsSpy.restore();
-      ctrlSpy.restore();
-
-      const workspaceFolderExists = fs.existsSync(
-        path.join(serverOptions.workspacePath, repoUri, mockRndPath, revision)
-      );
-      // workspace is opened
-      assert.ok(workspaceFolderExists);
-
-      const workspacePath = fs.realpathSync(
-        path.resolve(serverOptions.workspacePath, repoUri, mockRndPath, revision)
-      );
-      // workspace handler is working, filled workspacePath
-      sinon.assert.calledWith(
-        ctrlSpy,
-        sinon.match.has('workspacePath', sinon.match(value => comparePath(value, workspacePath)))
-      );
-      // uri is changed by workspace handler
-      sinon.assert.calledWith(
-        ctrlSpy,
-        sinon.match.hasNested('params.textDocument.uri', `file://${workspacePath}/${filename}`)
-      );
-      return;
-    } finally {
-      await lspservice.shutdown();
-    }
-    // @ts-ignore
-  }).timeout(30000);
-
-  it('unload a workspace', async () => {
-    const lspservice = mockLspService();
-    try {
-      const revision = 'master';
-      // send a dummy request to open a workspace;
-      const response = await sendHoverRequest(lspservice, revision);
-      assert.ok(response);
-      const workspacePath = path.resolve(
-        serverOptions.workspacePath,
-        repoUri,
-        mockRndPath,
-        revision
-      );
-      const workspaceFolderExists = fs.existsSync(workspacePath);
-      // workspace is opened
-      assert.ok(workspaceFolderExists);
-      const controller = lspservice.controller;
-      // @ts-ignore
-      const languageServer = controller.languageServerMap.typescript[0];
-      const realWorkspacePath = fs.realpathSync(workspacePath);
-
-      // @ts-ignore
-      const handler = await languageServer.languageServerHandlers[realWorkspacePath];
-      const exitSpy = sinon.spy(handler, 'exit');
-      const unloadSpy = sinon.spy(handler, 'unloadWorkspace');
-
-      await lspservice.deleteWorkspace(repoUri);
-
-      unloadSpy.restore();
-      exitSpy.restore();
-
-      sinon.assert.calledWith(unloadSpy, realWorkspacePath);
-      // typescript language server for this workspace should be closed
-      sinon.assert.calledOnce(exitSpy);
-      // the workspace folder should be deleted
-      const exists = fs.existsSync(realWorkspacePath);
-      assert.strictEqual(exists, false);
-      return;
-    } finally {
-      await lspservice.shutdown();
-    }
-    // @ts-ignore
-  }).timeout(30000);
-
-  it('should update if a worktree is not the newest', async () => {
-    const lspservice = mockLspService();
-    try {
-      const revision = 'master';
-      // send a dummy request to open a workspace;
-      const response = await sendHoverRequest(lspservice, revision);
-      assert.ok(response);
-      const workspacePath = path.resolve(
-        serverOptions.workspacePath,
-        repoUri,
-        mockRndPath,
-        revision
-      );
-      const git = simplegit(workspacePath);
-      const workspaceCommit = await git.revparse(['HEAD']);
-      // workspace is newest now
-      assert.strictEqual(workspaceCommit, secondCommitSha);
-      // reset workspace to an older one
-      await git.reset([firstCommitSha, '--hard']);
-      assert.strictEqual(await git.revparse(['HEAD']), firstCommitSha);
-
-      // send a request again;
-      await sendHoverRequest(lspservice, revision);
-      // workspace_handler should update workspace to the newest one
-      assert.strictEqual(await git.revparse(['HEAD']), secondCommitSha);
-      return;
-    } finally {
-      await lspservice.shutdown();
-    }
-    // @ts-ignore
-  }).timeout(30000);
-});
diff --git a/x-pack/legacy/plugins/code/server/__tests__/multi_node.ts b/x-pack/legacy/plugins/code/server/__tests__/multi_node.ts
deleted file mode 100644
index 0b4a9c576eb4f4..00000000000000
--- a/x-pack/legacy/plugins/code/server/__tests__/multi_node.ts
+++ /dev/null
@@ -1,166 +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 getPort from 'get-port';
-import { resolve } from 'path';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Root } from 'src/core/server/root';
-
-import {
-  createRootWithCorePlugins,
-  request,
-  createTestServers,
-} from '../../../../../../src/test_utils/kbn_server';
-
-const xpackOption = {
-  upgrade_assistant: {
-    enabled: false,
-  },
-  security: {
-    enabled: false,
-  },
-  ccr: {
-    enabled: false,
-  },
-  monitoring: {
-    enabled: false,
-  },
-  beats: {
-    enabled: false,
-  },
-  ilm: {
-    enabled: false,
-  },
-  logstash: {
-    enabled: false,
-  },
-  rollup: {
-    enabled: false,
-  },
-  watcher: {
-    enabled: false,
-  },
-  remote_clusters: {
-    enabled: false,
-  },
-  reporting: {
-    enabled: false,
-  },
-  task_manager: {
-    enabled: false,
-  },
-  maps: {
-    enabled: false,
-  },
-  oss_telemetry: {
-    enabled: false,
-  },
-  xpack_main: {
-    enabled: true,
-  },
-};
-
-// FLAKY: https://github.com/elastic/kibana/issues/43960
-describe.skip('code in multiple nodes', () => {
-  const codeNodeUuid = 'c4add484-0cba-4e05-86fe-4baa112d9e53';
-  const nonodeNodeUuid = '22b75e04-0e50-4647-9643-6b1b1d88beaf';
-  let codePort: number;
-  let nonCodePort: number;
-  let nonCodeNode: Root;
-
-  let kbnRootServer: any;
-  let kbn: any;
-  let esServer: any;
-  const pluginPaths = resolve(__dirname, '../../../../../');
-
-  async function startServers() {
-    const servers = createTestServers({
-      adjustTimeout: t => {
-        // @ts-ignore
-        this.timeout(t);
-      },
-      settings: {
-        kbn: {
-          server: {
-            uuid: codeNodeUuid,
-            port: codePort,
-          },
-          plugins: { paths: [pluginPaths] },
-          xpack: { ...xpackOption, code: { codeNodeUrl: `http://localhost:${codePort}` } },
-          logging: { silent: false },
-        },
-      },
-    });
-
-    esServer = await servers.startES();
-    kbn = await servers.startKibana();
-    kbnRootServer = kbn.root;
-  }
-
-  async function startNonCodeNodeKibana() {
-    const setting = {
-      server: {
-        port: nonCodePort,
-        uuid: nonodeNodeUuid,
-      },
-      plugins: { paths: [pluginPaths] },
-      xpack: {
-        ...xpackOption,
-        code: { codeNodeUrl: `http://localhost:${codePort}` },
-      },
-      logging: { silent: true },
-    };
-    nonCodeNode = createRootWithCorePlugins(setting);
-    await nonCodeNode.setup();
-    await nonCodeNode.start();
-  }
-
-  // @ts-ignore
-  before(async function() {
-    nonCodePort = await getPort();
-    codePort = await getPort();
-
-    // @ts-ignore
-    await startServers.bind(this)();
-    await startNonCodeNodeKibana();
-  });
-
-  // @ts-ignore
-  after(async function() {
-    await nonCodeNode.shutdown();
-    await kbn.stop();
-    await esServer.stop();
-  });
-
-  function delay(ms: number) {
-    return new Promise(resolve1 => {
-      setTimeout(resolve1, ms);
-    });
-  }
-
-  it('Code node setup should be ok', async () => {
-    await delay(6000);
-    await request.get(kbnRootServer, '/api/code/setup').expect(200);
-    // @ts-ignore
-  }).timeout(20000);
-
-  it('Non-code node setup should be ok', async () => {
-    await delay(1000);
-    await request.get(nonCodeNode, '/api/code/setup').expect(200);
-    // @ts-ignore
-  }).timeout(5000);
-
-  it('Non-code node setup should fail if code node is shutdown', async () => {
-    await kbn.stop();
-    await request.get(nonCodeNode, '/api/code/setup').expect(502);
-
-    // TODO restart root clearly is hard to do during platform migration
-    // A clear way is to createEsCluster individually and not reuse the
-    // same root
-
-    // @ts-ignore
-  }).timeout(20000);
-});
diff --git a/x-pack/legacy/plugins/code/server/__tests__/repository_service.ts b/x-pack/legacy/plugins/code/server/__tests__/repository_service.ts
deleted file mode 100644
index b28b9650e2adf6..00000000000000
--- a/x-pack/legacy/plugins/code/server/__tests__/repository_service.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import assert from 'assert';
-// import { generateKeyPairSync } from 'crypto';
-import fs from 'fs';
-import * as os from 'os';
-import path from 'path';
-import rimraf from 'rimraf';
-import { RepositoryUtils } from '../../common/repository_utils';
-import { RepositoryService } from '../repository_service';
-import { ConsoleLogger } from '../utils/console_logger';
-
-describe('repository service test', () => {
-  const log = new ConsoleLogger();
-  const baseDir = fs.mkdtempSync(path.join(os.tmpdir(), 'code_test'));
-  const repoDir = path.join(baseDir, 'repo');
-  const credsDir = path.join(baseDir, 'credentials');
-  // @ts-ignore
-  before(() => {
-    fs.mkdirSync(credsDir);
-    fs.mkdirSync(repoDir);
-  });
-  // @ts-ignore
-  after(() => {
-    return rimraf.sync(baseDir);
-  });
-  const service = new RepositoryService(repoDir, credsDir, log);
-
-  it('can not clone a repo by ssh without a key', async () => {
-    const repo = RepositoryUtils.buildRepository(
-      'git@github.com:elastic/TypeScript-Node-Starter.git'
-    );
-    await assert.rejects(service.clone(repo));
-    // @ts-ignore
-  }).timeout(60000);
-
-  /* it('can clone a repo by ssh with a key', async () => {
-
-    const repo = RepositoryUtils.buildRepository('git@github.com:elastic/code.git');
-     const { publicKey, privateKey } = generateKeyPairSync('rsa', {
-      modulusLength: 4096,
-      publicKeyEncoding: {
-        type: 'pkcs1',
-        format: 'pem',
-      },
-      privateKeyEncoding: {
-        type: 'pkcs1',
-        format: 'pem',
-      },
-    });
-    fs.writeFileSync(path.join(credsDir, 'id_rsa.pub'), publicKey);
-    fs.writeFileSync(path.join(credsDir, 'id_rsa'), privateKey);
-    const result = await service.clone(repo);
-    assert.ok(fs.existsSync(path.join(repoDir, result.repo.uri)));
-  }).timeout(60000); */
-});
diff --git a/x-pack/legacy/plugins/code/server/__tests__/workspace_handler.ts b/x-pack/legacy/plugins/code/server/__tests__/workspace_handler.ts
deleted file mode 100644
index 0f1245b135076e..00000000000000
--- a/x-pack/legacy/plugins/code/server/__tests__/workspace_handler.ts
+++ /dev/null
@@ -1,168 +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 fs from 'fs';
-import path from 'path';
-
-import assert from 'assert';
-import * as os from 'os';
-import rimraf from 'rimraf';
-import { ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-
-import { LspRequest } from '../../model';
-import { GitOperations } from '../git_operations';
-import { WorkspaceHandler } from '../lsp/workspace_handler';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { prepareProjectByInit } from '../test_utils';
-
-const baseDir = fs.mkdtempSync(path.join(os.tmpdir(), 'code_test'));
-const workspaceDir = path.join(baseDir, 'workspace');
-const repoDir = path.join(baseDir, 'repo');
-const gitOps = new GitOperations(repoDir);
-
-describe('workspace_handler tests', () => {
-  function handleResponseUri(wh: WorkspaceHandler, uri: string) {
-    const dummyRequest: LspRequest = {
-      method: 'textDocument/edefinition',
-      params: [],
-    };
-    const dummyResponse: ResponseMessage = {
-      id: null,
-      jsonrpc: '',
-      result: [
-        {
-          location: {
-            uri,
-          },
-        },
-      ],
-    };
-    wh.handleResponse(dummyRequest, dummyResponse);
-    return dummyResponse.result[0].location.uri;
-  }
-
-  function makeAFile(
-    workspacePath: string = workspaceDir,
-    repo = 'github.com/Microsoft/TypeScript-Node-Starter',
-    revision = 'master',
-    file = 'src/controllers/user.ts'
-  ) {
-    const fullPath = path.join(workspacePath, repo, '__randomString', revision, file);
-    fs.mkdirSync(path.dirname(fullPath), { recursive: true });
-    fs.writeFileSync(fullPath, '');
-    const strInUrl = fullPath
-      .split(path.sep)
-      .map(value => encodeURIComponent(value))
-      .join('/');
-    const uri = `file:///${strInUrl}`;
-    return { repo, revision, file, uri };
-  }
-
-  it('file system url should be converted', async () => {
-    const workspaceHandler = new WorkspaceHandler(
-      gitOps,
-      workspaceDir,
-      // @ts-ignore
-      null,
-      new ConsoleLoggerFactory()
-    );
-    const { repo, revision, file, uri } = makeAFile(workspaceDir);
-    const converted = handleResponseUri(workspaceHandler, uri);
-    assert.strictEqual(converted, `git://${repo}/blob/${revision}/${file}`);
-  });
-
-  it('should support symbol link', async () => {
-    const symlinkToWorkspace = path.join(baseDir, 'linkWorkspace');
-    fs.symlinkSync(workspaceDir, symlinkToWorkspace, 'dir');
-    // @ts-ignore
-    const workspaceHandler = new WorkspaceHandler(
-      gitOps,
-      symlinkToWorkspace,
-      // @ts-ignore
-      null,
-      new ConsoleLoggerFactory()
-    );
-
-    const { repo, revision, file, uri } = makeAFile(workspaceDir);
-    const converted = handleResponseUri(workspaceHandler, uri);
-    assert.strictEqual(converted, `git://${repo}/blob/${revision}/${file}`);
-  });
-
-  it('should support spaces in workspace dir', async () => {
-    const workspaceHasSpaces = path.join(baseDir, 'work  space');
-    const workspaceHandler = new WorkspaceHandler(
-      gitOps,
-      workspaceHasSpaces,
-      // @ts-ignore
-      null,
-      new ConsoleLoggerFactory()
-    );
-    const { repo, revision, file, uri } = makeAFile(workspaceHasSpaces);
-    const converted = handleResponseUri(workspaceHandler, uri);
-    assert.strictEqual(converted, `git://${repo}/blob/${revision}/${file}`);
-  });
-
-  it('should throw a error if url is invalid', async () => {
-    const workspaceHandler = new WorkspaceHandler(
-      gitOps,
-      workspaceDir,
-      // @ts-ignore
-      null,
-      new ConsoleLoggerFactory()
-    );
-    const invalidDir = path.join(baseDir, 'invalid_dir');
-    const { uri } = makeAFile(invalidDir);
-    assert.throws(() => handleResponseUri(workspaceHandler, uri));
-  });
-
-  async function prepareProject(repoPath: string) {
-    fs.mkdirSync(repoPath, { recursive: true });
-    await prepareProjectByInit(repoPath, {
-      'commit for test': {
-        'src/app.ts': 'console.log("test")',
-      },
-    });
-  }
-
-  it('should throw a error if file path is external', async () => {
-    const workspaceHandler = new WorkspaceHandler(
-      gitOps,
-      workspaceDir,
-      // @ts-ignore
-      null,
-      new ConsoleLoggerFactory()
-    );
-    const repoUri = 'github.com/microsoft/typescript-node-starter';
-    await prepareProject(path.join(repoDir, repoUri));
-    const externalFile = 'node_modules/abbrev/abbrev.js';
-    const request: LspRequest = {
-      method: 'textDocument/hover',
-      params: {
-        position: {
-          line: 8,
-          character: 23,
-        },
-        textDocument: {
-          uri: `git://${repoUri}/blob/master/${externalFile}`,
-        },
-      },
-    };
-    assert.rejects(
-      workspaceHandler.handleRequest(request),
-      new Error('invalid file path in requests.')
-    );
-  });
-
-  // @ts-ignore
-  before(() => {
-    fs.mkdirSync(workspaceDir, { recursive: true });
-    fs.mkdirSync(repoDir, { recursive: true });
-  });
-
-  // @ts-ignore
-  after(() => {
-    rimraf.sync(baseDir);
-  });
-});
diff --git a/x-pack/legacy/plugins/code/server/disk_watermark.test.ts b/x-pack/legacy/plugins/code/server/disk_watermark.test.ts
deleted file mode 100644
index f3f5040250c1f7..00000000000000
--- a/x-pack/legacy/plugins/code/server/disk_watermark.test.ts
+++ /dev/null
@@ -1,193 +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 sinon from 'sinon';
-
-import { DiskWatermarkService } from './disk_watermark';
-import { Logger } from './log';
-import { ServerOptions } from './server_options';
-import { ConsoleLoggerFactory } from './utils/console_logger_factory';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Disk watermark check in percentage mode', async () => {
-  const diskCheckerStub = sinon.stub();
-  diskCheckerStub
-    .onFirstCall()
-    .resolves({
-      free: 5,
-      size: 10,
-    })
-    .onSecondCall()
-    .returns({
-      free: 1,
-      size: 10,
-    });
-  const diskWatermarkService = new DiskWatermarkService(
-    diskCheckerStub,
-    {
-      disk: {
-        thresholdEnabled: true,
-        watermarkLow: '80%',
-      },
-      repoPath: '/',
-    } as ServerOptions,
-    log
-  );
-
-  expect(await diskWatermarkService.isLowWatermark()).toBeFalsy(); // 50% usage
-  expect(await diskWatermarkService.isLowWatermark()).toBeTruthy(); // 90% usage
-});
-
-test('Disk watermark check in absolute mode in kb', async () => {
-  const diskCheckerStub = sinon.stub();
-  diskCheckerStub
-    .onFirstCall()
-    .resolves({
-      free: 8 * Math.pow(1024, 1),
-      size: 10000,
-    })
-    .onSecondCall()
-    .returns({
-      free: 2 * Math.pow(1024, 1),
-      size: 10000,
-    });
-  const diskWatermarkService = new DiskWatermarkService(
-    diskCheckerStub,
-    {
-      disk: {
-        thresholdEnabled: true,
-        watermarkLow: '4kb',
-      },
-      repoPath: '/',
-    } as ServerOptions,
-    log
-  );
-
-  expect(await diskWatermarkService.isLowWatermark()).toBeFalsy(); // 8kb available
-  expect(await diskWatermarkService.isLowWatermark()).toBeTruthy(); // 2kb available
-});
-
-test('Disk watermark check in absolute mode in mb', async () => {
-  const diskCheckerStub = sinon.stub();
-  diskCheckerStub
-    .onFirstCall()
-    .resolves({
-      free: 8 * Math.pow(1024, 2),
-      size: 10000,
-    })
-    .onSecondCall()
-    .returns({
-      free: 2 * Math.pow(1024, 2),
-      size: 10000,
-    });
-  const diskWatermarkService = new DiskWatermarkService(
-    diskCheckerStub,
-    {
-      disk: {
-        thresholdEnabled: true,
-        watermarkLow: '4mb',
-      },
-      repoPath: '/',
-    } as ServerOptions,
-    log
-  );
-
-  expect(await diskWatermarkService.isLowWatermark()).toBeFalsy(); // 8mb available
-  expect(await diskWatermarkService.isLowWatermark()).toBeTruthy(); // 2mb available
-});
-
-test('Disk watermark check in absolute mode in gb', async () => {
-  const diskCheckerStub = sinon.stub();
-  diskCheckerStub
-    .onFirstCall()
-    .resolves({
-      free: 8 * Math.pow(1024, 3),
-      size: 10000,
-    })
-    .onSecondCall()
-    .returns({
-      free: 2 * Math.pow(1024, 3),
-      size: 10000,
-    });
-  const diskWatermarkService = new DiskWatermarkService(
-    diskCheckerStub,
-    {
-      disk: {
-        thresholdEnabled: true,
-        watermarkLow: '4gb',
-      },
-      repoPath: '/',
-    } as ServerOptions,
-    log
-  );
-
-  expect(await diskWatermarkService.isLowWatermark()).toBeFalsy(); // 8gb available
-  expect(await diskWatermarkService.isLowWatermark()).toBeTruthy(); // 2gb available
-});
-
-test('Disk watermark check in absolute mode in tb', async () => {
-  const diskCheckerStub = sinon.stub();
-  diskCheckerStub
-    .onFirstCall()
-    .resolves({
-      free: 8 * Math.pow(1024, 4),
-      size: 10000,
-    })
-    .onSecondCall()
-    .returns({
-      free: 2 * Math.pow(1024, 4),
-      size: 10000,
-    });
-  const diskWatermarkService = new DiskWatermarkService(
-    diskCheckerStub,
-    {
-      disk: {
-        thresholdEnabled: true,
-        watermarkLow: '4tb',
-      },
-      repoPath: '/',
-    } as ServerOptions,
-    log
-  );
-
-  expect(await diskWatermarkService.isLowWatermark()).toBeFalsy(); // 8tb available
-  expect(await diskWatermarkService.isLowWatermark()).toBeTruthy(); // 2tb available
-});
-
-test('Disk watermark check in invalid config', async () => {
-  const diskCheckerStub = sinon.stub();
-  diskCheckerStub
-    .onFirstCall()
-    .resolves({
-      free: 50,
-      size: 100,
-    })
-    .onSecondCall()
-    .returns({
-      free: 5,
-      size: 100,
-    });
-  const diskWatermarkService = new DiskWatermarkService(
-    diskCheckerStub,
-    {
-      disk: {
-        thresholdEnabled: true,
-        // invalid config, will fallback with 90% by default
-        watermarkLow: '1234',
-      },
-      repoPath: '/',
-    } as ServerOptions,
-    log
-  );
-
-  expect(await diskWatermarkService.isLowWatermark()).toBeFalsy(); // 50% usage
-  expect(await diskWatermarkService.isLowWatermark()).toBeTruthy(); // 95% usage
-});
diff --git a/x-pack/legacy/plugins/code/server/disk_watermark.ts b/x-pack/legacy/plugins/code/server/disk_watermark.ts
deleted file mode 100644
index 356737fe8e19ad..00000000000000
--- a/x-pack/legacy/plugins/code/server/disk_watermark.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { i18n } from '@kbn/i18n';
-import { CheckDiskSpaceResult } from 'check-disk-space';
-
-import { Logger } from './log';
-import { ServerOptions } from './server_options';
-
-export const DEFAULT_WATERMARK_LOW_PERCENTAGE = 90;
-
-export type DiskCheckResult = CheckDiskSpaceResult;
-export type DiskSpaceChecker = (path: string) => Promise<DiskCheckResult>;
-
-export class DiskWatermarkService {
-  // True for percentage mode (e.g. 90%), false for absolute mode (e.g. 500mb)
-  private percentageMode: boolean = true;
-  private watermark: number = DEFAULT_WATERMARK_LOW_PERCENTAGE;
-  private enabled: boolean = false;
-
-  constructor(
-    private readonly diskSpaceChecker: DiskSpaceChecker,
-    private readonly serverOptions: ServerOptions,
-    private readonly logger: Logger
-  ) {
-    this.enabled = this.serverOptions.disk.thresholdEnabled;
-    if (this.enabled) {
-      this.parseWatermarkConfigString(this.serverOptions.disk.watermarkLow);
-    }
-  }
-
-  public async isLowWatermark(): Promise<boolean> {
-    if (!this.enabled) {
-      return false;
-    }
-
-    try {
-      const res = await this.diskSpaceChecker(this.serverOptions.repoPath);
-      const { free, size } = res;
-      if (this.percentageMode) {
-        const percentage = ((size - free) * 100) / size;
-        return percentage > this.watermark;
-      } else {
-        return free <= this.watermark;
-      }
-    } catch (err) {
-      return true;
-    }
-  }
-
-  public diskWatermarkViolationMessage(): string {
-    if (this.percentageMode) {
-      return i18n.translate('xpack.code.git.diskWatermarkLowPercentageMessage', {
-        defaultMessage: `Disk usage watermark level higher than {watermark}`,
-        values: {
-          watermark: this.serverOptions.disk.watermarkLow,
-        },
-      });
-    } else {
-      return i18n.translate('xpack.code.git.diskWatermarkLowMessage', {
-        defaultMessage: `Available disk space lower than {watermark}`,
-        values: {
-          watermark: this.serverOptions.disk.watermarkLow,
-        },
-      });
-    }
-  }
-
-  private parseWatermarkConfigString(diskWatermarkLow: string) {
-    // Including undefined, null and empty string.
-    if (!diskWatermarkLow) {
-      this.logger.error(
-        `Empty disk watermark config for Code. Fallback with default value (${DEFAULT_WATERMARK_LOW_PERCENTAGE}%)`
-      );
-      return;
-    }
-
-    try {
-      const str = diskWatermarkLow.trim().toLowerCase();
-      if (str.endsWith('%')) {
-        this.percentageMode = true;
-        this.watermark = parseInt(str.substr(0, str.length - 1), 10);
-      } else if (str.endsWith('kb')) {
-        this.percentageMode = false;
-        this.watermark = parseInt(str.substr(0, str.length - 2), 10) * Math.pow(1024, 1);
-      } else if (str.endsWith('mb')) {
-        this.percentageMode = false;
-        this.watermark = parseInt(str.substr(0, str.length - 2), 10) * Math.pow(1024, 2);
-      } else if (str.endsWith('gb')) {
-        this.percentageMode = false;
-        this.watermark = parseInt(str.substr(0, str.length - 2), 10) * Math.pow(1024, 3);
-      } else if (str.endsWith('tb')) {
-        this.percentageMode = false;
-        this.watermark = parseInt(str.substr(0, str.length - 2), 10) * Math.pow(1024, 4);
-      } else {
-        throw new Error('Unrecognized unit for disk size config.');
-      }
-    } catch (error) {
-      this.logger.error(
-        `Invalid disk watermark config for Code. Fallback with default value (${DEFAULT_WATERMARK_LOW_PERCENTAGE}%)`
-      );
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/apis/git_api.ts b/x-pack/legacy/plugins/code/server/distributed/apis/git_api.ts
deleted file mode 100644
index a9a33dca3f96a2..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/apis/git_api.ts
+++ /dev/null
@@ -1,171 +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 fileType from 'file-type';
-import Boom from 'boom';
-import { GitOperations } from '../../git_operations';
-import { FileTree } from '../../../model';
-import { RequestContext, ServiceHandlerFor } from '../service_definition';
-import { extractLines } from '../../utils/buffer';
-import { detectLanguage } from '../../utils/detect_language';
-import { TEXT_FILE_LIMIT } from '../../../common/file';
-import { CommitInfo, ReferenceInfo } from '../../../model/commit';
-import { CommitDiff } from '../../../common/git_diff';
-import { GitBlame } from '../../../common/git_blame';
-
-interface FileLocation {
-  uri: string;
-  path: string;
-  revision: string;
-}
-export const GitServiceDefinitionOption = { routePrefix: '/api/code/internal/git' };
-export const GitServiceDefinition = {
-  fileTree: {
-    request: {} as {
-      uri: string;
-      path: string;
-      revision: string;
-      skip: number;
-      limit: number;
-      withParents: boolean;
-      flatten: boolean;
-    },
-    response: {} as FileTree,
-  },
-  blob: {
-    request: {} as FileLocation & { line?: string },
-    response: {} as {
-      isBinary: boolean;
-      imageType?: string;
-      content?: string;
-      lang?: string;
-    },
-  },
-  raw: {
-    request: {} as FileLocation,
-    response: {} as {
-      isBinary: boolean;
-      content: Buffer;
-    },
-  },
-  history: {
-    request: {} as FileLocation & {
-      count: number;
-      after: boolean;
-    },
-    response: {} as CommitInfo[],
-  },
-  branchesAndTags: {
-    request: {} as { uri: string },
-    response: {} as ReferenceInfo[],
-  },
-  commitDiff: {
-    request: {} as { uri: string; revision: string },
-    response: {} as CommitDiff,
-  },
-  blame: {
-    request: {} as FileLocation,
-    response: {} as GitBlame[],
-  },
-  commit: {
-    request: {} as { uri: string; revision: string },
-    response: {} as CommitInfo,
-  },
-  headRevision: {
-    request: {} as { uri: string },
-    response: {} as string,
-  },
-};
-
-export const getGitServiceHandler = (
-  gitOps: GitOperations
-): ServiceHandlerFor<typeof GitServiceDefinition> => ({
-  async fileTree(
-    { uri, path, revision, skip, limit, withParents, flatten },
-    context: RequestContext
-  ) {
-    return await gitOps.fileTree(uri, path, revision, skip, limit, withParents, flatten);
-  },
-  async blob({ uri, path, revision, line }) {
-    const blob = await gitOps.fileContent(uri, path, revision);
-    const isBinary = blob.isBinary();
-    if (isBinary) {
-      const type = fileType(blob.content());
-      if (type && type.mime && type.mime.startsWith('image/')) {
-        return {
-          isBinary,
-          imageType: type.mime,
-          content: blob.content().toString(),
-        };
-      } else {
-        return {
-          isBinary,
-        };
-      }
-    } else {
-      if (line) {
-        const [from, to] = line.split(',');
-        let fromLine = parseInt(from, 10);
-        let toLine = to === undefined ? fromLine + 1 : parseInt(to, 10);
-        if (fromLine > toLine) {
-          [fromLine, toLine] = [toLine, fromLine];
-        }
-        const lines = extractLines(blob.content(), fromLine, toLine);
-        const lang = await detectLanguage(path, lines);
-        return {
-          isBinary,
-          lang,
-          content: lines,
-        };
-      } else if (blob.rawsize() <= TEXT_FILE_LIMIT) {
-        const lang = await detectLanguage(path, blob.content());
-        return {
-          isBinary,
-          lang,
-          content: blob.content().toString(),
-        };
-      } else {
-        return {
-          isBinary,
-        };
-      }
-    }
-  },
-  async raw({ uri, path, revision }) {
-    const blob = await gitOps.fileContent(uri, path, revision);
-    const isBinary = blob.isBinary();
-    return {
-      isBinary,
-      content: blob.content(),
-    };
-  },
-  async history({ uri, path, revision, count, after }) {
-    const commit = await gitOps.getCommitInfo(uri, revision);
-    if (commit === null) {
-      throw Boom.notFound(`commit ${revision} not found in repo ${uri}`);
-    }
-    let commits = await gitOps.log(uri, commit.id, after ? count + 1 : count, path);
-    if (after && commits.length > 0) {
-      commits = commits.slice(1);
-    }
-    return commits;
-  },
-  async branchesAndTags({ uri }) {
-    return await gitOps.getBranchAndTags(uri);
-  },
-  async commitDiff({ uri, revision }) {
-    return await gitOps.getCommitDiff(uri, revision);
-  },
-  async blame({ uri, path, revision }) {
-    return await gitOps.blame(uri, revision, path);
-  },
-  async commit({ uri, revision }) {
-    return await gitOps.getCommitOr404(uri, revision);
-  },
-  async headRevision({ uri }) {
-    return await gitOps.getHeadRevision(uri);
-  },
-});
diff --git a/x-pack/legacy/plugins/code/server/distributed/apis/index.ts b/x-pack/legacy/plugins/code/server/distributed/apis/index.ts
deleted file mode 100644
index 1a33cc7f220df5..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/apis/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './git_api';
-export * from './lsp_api';
-export * from './workspace_api';
-export * from './setup_api';
-export * from './repository_api';
diff --git a/x-pack/legacy/plugins/code/server/distributed/apis/lsp_api.ts b/x-pack/legacy/plugins/code/server/distributed/apis/lsp_api.ts
deleted file mode 100644
index 222c7ee476098d..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/apis/lsp_api.ts
+++ /dev/null
@@ -1,49 +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 { ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-import { LspService } from '../../lsp/lsp_service';
-import { ServiceHandlerFor } from '../service_definition';
-import { LanguageServerDefinition } from '../../lsp/language_servers';
-import { LanguageServerStatus } from '../../../common/language_server';
-import { WorkspaceStatus } from '../../lsp/request_expander';
-
-export const LspServiceDefinitionOption = { routePrefix: '/api/code/internal/lsp' };
-export const LspServiceDefinition = {
-  sendRequest: {
-    request: {} as { method: string; params: any },
-    response: {} as ResponseMessage,
-  },
-  languageSeverDef: {
-    request: {} as { lang: string },
-    response: {} as LanguageServerDefinition[],
-  },
-  languageServerStatus: {
-    request: {} as { langName: string },
-    response: {} as LanguageServerStatus,
-  },
-  initializeState: {
-    request: {} as { repoUri: string; revision: string },
-    response: {} as { [p: string]: WorkspaceStatus },
-  },
-};
-
-export const getLspServiceHandler = (
-  lspService: LspService
-): ServiceHandlerFor<typeof LspServiceDefinition> => ({
-  async sendRequest({ method, params }) {
-    return await lspService.sendRequest(method, params);
-  },
-  async languageSeverDef({ lang }) {
-    return lspService.getLanguageSeverDef(lang);
-  },
-  async languageServerStatus({ langName }) {
-    return lspService.languageServerStatus(langName);
-  },
-  async initializeState({ repoUri, revision }) {
-    return await lspService.initializeState(repoUri, revision);
-  },
-});
diff --git a/x-pack/legacy/plugins/code/server/distributed/apis/repository_api.ts b/x-pack/legacy/plugins/code/server/distributed/apis/repository_api.ts
deleted file mode 100644
index 384ebc56acca24..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/apis/repository_api.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ServiceHandlerFor } from '../service_definition';
-import { CloneWorker, DeleteWorker, IndexWorker } from '../../queue';
-
-export const RepositoryServiceDefinition = {
-  clone: {
-    request: {} as { url: string },
-    response: {},
-  },
-  delete: {
-    request: {} as { uri: string },
-    response: {},
-  },
-  index: {
-    request: {} as {
-      uri: string;
-      revision: string | undefined;
-      enforceReindex: boolean;
-    },
-    response: {},
-  },
-};
-
-export const getRepositoryHandler = (
-  cloneWorker: CloneWorker,
-  deleteWorker: DeleteWorker,
-  indexWorker: IndexWorker
-): ServiceHandlerFor<typeof RepositoryServiceDefinition> => ({
-  async clone(payload: { url: string }) {
-    await cloneWorker.enqueueJob(payload, {});
-    return {};
-  },
-  async delete(payload: { uri: string }) {
-    await deleteWorker.enqueueJob(payload, {});
-    return {};
-  },
-  async index(payload: { uri: string; revision: string | undefined; enforceReindex: boolean }) {
-    await indexWorker.enqueueJob(payload, {});
-    return {};
-  },
-});
diff --git a/x-pack/legacy/plugins/code/server/distributed/apis/setup_api.ts b/x-pack/legacy/plugins/code/server/distributed/apis/setup_api.ts
deleted file mode 100644
index 229470166568b9..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/apis/setup_api.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ServiceHandlerFor } from '../service_definition';
-
-export const SetupDefinition = {
-  setup: {
-    request: {},
-    response: {} as string,
-  },
-};
-
-export const setupServiceHandler: ServiceHandlerFor<typeof SetupDefinition> = {
-  async setup() {
-    return 'ok';
-  },
-};
diff --git a/x-pack/legacy/plugins/code/server/distributed/apis/workspace_api.ts b/x-pack/legacy/plugins/code/server/distributed/apis/workspace_api.ts
deleted file mode 100644
index e370efe0f37f61..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/apis/workspace_api.ts
+++ /dev/null
@@ -1,45 +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 { ServiceHandlerFor } from '../service_definition';
-import { WorkspaceHandler } from '../../lsp/workspace_handler';
-import { RepoConfig } from '../../../model';
-import { WorkspaceCommand } from '../../lsp/workspace_command';
-import { LoggerFactory as CodeLoggerFactory } from '../../utils/log_factory';
-
-export const WorkspaceDefinition = {
-  initCmd: {
-    request: {} as { repoUri: string; revision: string; repoConfig: RepoConfig; force: boolean },
-    response: {},
-  },
-};
-
-export const getWorkspaceHandler = (
-  loggerFactory: CodeLoggerFactory,
-  workspaceHandler: WorkspaceHandler
-): ServiceHandlerFor<typeof WorkspaceDefinition> => ({
-  async initCmd({ repoUri, revision, repoConfig, force }) {
-    try {
-      const { workspaceDir, workspaceRevision } = await workspaceHandler.openWorkspace(
-        repoUri,
-        revision
-      );
-
-      const workspaceCmd = new WorkspaceCommand(
-        repoConfig,
-        workspaceDir,
-        workspaceRevision,
-        loggerFactory.getLogger(['workspace', repoUri])
-      );
-      await workspaceCmd.runInit(force);
-      return {};
-    } catch (e) {
-      if (e.isBoom) {
-        return e;
-      }
-    }
-  },
-});
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_membership_service.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_membership_service.ts
deleted file mode 100644
index f2f1c82db00701..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_membership_service.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { CodeNode } from './code_nodes';
-
-/**
- * The service is used to manage the membership of the node in the cluster.
- * It may actively add or remove members of the cluster.
- *
- * Migration Plan:
- *
- */
-export interface ClusterMembershipService {
-  // the information of the local node
-  readonly localNode: CodeNode;
-
-  start(): Promise<void>;
-
-  stop(): Promise<void>;
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_meta.test.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_meta.test.ts
deleted file mode 100644
index 2ed052d9a838db..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_meta.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ClusterMetadata } from './cluster_meta';
-import { Repository } from '../../../model';
-import { RoutingTable } from './routing_table';
-import { ClusterState } from './cluster_state';
-import { CodeNodes } from './code_nodes';
-
-const repoCmpFunc = (a: Repository, b: Repository): number => {
-  return a.url.localeCompare(b.url);
-};
-
-test('an empty routing table should be well defined', () => {
-  // test an empty table
-  const table = new RoutingTable([]);
-  expect(table.nodeIds().length).toBe(0);
-  expect(table.repositoryURIs().length).toBe(0);
-  expect(table.getRepositoryURIsByNodeId('test').length).toBe(0);
-});
-
-test('basic functions of a simple routing table', () => {
-  // test an empty table
-  const table = new RoutingTable([
-    { nodeId: 'n1', resource: 'r1' },
-    { nodeId: 'n1', resource: 'r2' },
-    { nodeId: 'n2', resource: 'r3' },
-    { nodeId: 'n3', resource: 'r4' },
-  ]);
-  expect(table.nodeIds().length).toBe(3);
-  expect(table.repositoryURIs().length).toBe(4);
-  expect(table.getRepositoryURIsByNodeId('n1')).toEqual(['r1', 'r2']);
-  expect(table.getRepositoryURIsByNodeId('n2')).toEqual(['r3']);
-  expect(table.getRepositoryURIsByNodeId('n3')).toEqual(['r4']);
-  expect(table.getRepositoryURIsByNodeId('n4').length).toBe(0);
-});
-
-test('cluster state functions', () => {
-  const repositories: Repository[] = [
-    { uri: 'github/a/a', url: 'http://github/a/a' },
-    { uri: 'github/b/b', url: 'http://github/b/b' },
-    { uri: 'github/c/c', url: 'http://github/c/c' },
-  ];
-  const state = new ClusterState(
-    new ClusterMetadata(repositories),
-    new RoutingTable([
-      { nodeId: 'n1', resource: 'github/a/a' },
-      { nodeId: 'n1', resource: 'github/b/b' },
-      { nodeId: 'n2', resource: 'github/c/c' },
-      // a non-exist repository
-      { nodeId: 'n2', resource: 'github/d/d' },
-    ]),
-    new CodeNodes([])
-  );
-
-  let repos = state.getNodeRepositories('n0');
-  expect(repos.length).toBe(0);
-
-  repos = state.getNodeRepositories('n1');
-  expect(repos).toBeDefined();
-  expect(repos!.length).toBe(2);
-  repos!.sort(repoCmpFunc);
-  expect(repos![0].uri).toBe('github/a/a');
-  expect(repos![1].uri).toBe('github/b/b');
-
-  repos = state.getNodeRepositories('n2');
-  expect(repos).toBeDefined();
-  expect(repos!.length).toBe(1);
-  expect(repos![0].uri).toBe('github/c/c');
-});
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_meta.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_meta.ts
deleted file mode 100644
index 5d92fc75a7b1cb..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_meta.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 { Repository } from '../../../model';
-
-/**
- * A snapshot of the cluster meta data, which includes:
- * - repository objects
- */
-export class ClusterMetadata {
-  private readonly uri2Repo: Map<string, Repository>;
-
-  constructor(public readonly repositories: Repository[] = []) {
-    this.uri2Repo = repositories.reduce((prev, cur) => {
-      prev.set(cur.uri, cur);
-      return prev;
-    }, new Map<string, Repository>());
-  }
-
-  public getRepository(uri: string): Repository | undefined {
-    return this.uri2Repo.get(uri);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_node_adapter.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_node_adapter.ts
deleted file mode 100644
index 9d168e604c1b3d..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_node_adapter.ts
+++ /dev/null
@@ -1,185 +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, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-import util from 'util';
-import Boom from 'boom';
-import { ServiceHandlerAdapter, ServiceRegisterOptions } from '../service_handler_adapter';
-import { ResourceLocator } from '../resource_locator';
-import {
-  MethodHandler,
-  MethodsFor,
-  ServiceDefinition,
-  ServiceHandlerFor,
-  ServiceMethod,
-  ServiceMethodMap,
-} from '../service_definition';
-import { ServerOptions } from '../../server_options';
-import { ClusterMembershipService } from './cluster_membership_service';
-import { ConfigClusterMembershipService } from './config_cluster_membership_service';
-import { ClusterService } from './cluster_service';
-import { ClusterResourceLocator } from './cluster_resource_locator';
-import { CodeServerRouter } from '../../security';
-import { Logger } from '../../log';
-import { NonCodeNodeAdapter } from '../multinode/non_code_node_adapter';
-import { RequestPayload } from '../multinode/code_node_adapter';
-import { EsClient } from '../../lib/esqueue';
-import { ResourceSchedulerService } from './resource_scheduler_service';
-import { ClusterNodeEndpoint } from './cluster_node_endpoint';
-
-/**
- * Serve requests based on the routing table.
- *
- * For local request:
- * - serve request locally or reroute to the remote node, based on the routing table
- *
- * For remote request:
- * - serve request locally if the requested resource is on the local node, otherwise reject it
- */
-export class ClusterNodeAdapter implements ServiceHandlerAdapter {
-  readonly clusterService: ClusterService;
-  readonly clusterMembershipService: ClusterMembershipService;
-  private readonly schedulerService: ResourceSchedulerService;
-  private readonly handlers: Map<any, any> = new Map<any, any>();
-  // used to forward requests
-  private readonly nonCodeAdapter: NonCodeNodeAdapter = new NonCodeNodeAdapter('', this.log);
-
-  constructor(
-    private readonly router: CodeServerRouter,
-    private readonly log: Logger,
-    serverOptions: ServerOptions,
-    esClient: EsClient
-  ) {
-    this.clusterService = new ClusterService(esClient, log);
-    this.clusterMembershipService = new ConfigClusterMembershipService(
-      serverOptions,
-      this.clusterService,
-      log
-    );
-    this.schedulerService = new ResourceSchedulerService(this.clusterService, log);
-    this.locator = new ClusterResourceLocator(
-      this.clusterService,
-      this.clusterMembershipService,
-      this.schedulerService
-    );
-  }
-
-  locator: ResourceLocator;
-
-  async start(): Promise<void> {
-    await this.clusterService.start();
-    await this.clusterMembershipService.start();
-    await this.schedulerService.start();
-  }
-
-  async stop(): Promise<void> {
-    await this.schedulerService.stop();
-    await this.clusterMembershipService.stop();
-    await this.clusterService.stop();
-  }
-
-  getService<DEF extends ServiceDefinition>(serviceDefinition: DEF): ServiceMethodMap<DEF> {
-    const handler = this.handlers.get(serviceDefinition);
-    if (!handler) {
-      throw new Error(`Handler not exists for ${serviceDefinition}`);
-    }
-    return handler as ServiceMethodMap<DEF>;
-  }
-
-  registerHandler<DEF extends ServiceDefinition>(
-    serviceDefinition: DEF,
-    serviceHandler: ServiceHandlerFor<DEF> | null,
-    options: ServiceRegisterOptions
-  ): ServiceMethodMap<DEF> {
-    if (!serviceHandler) {
-      throw new Error('Service handler cannot be null');
-    }
-    const routableServiceHandler: ServiceMethodMap<DEF> = {} as ServiceMethodMap<DEF>;
-
-    // register a local handler that is able to route the request
-    for (const method in serviceDefinition) {
-      if (serviceDefinition.hasOwnProperty(method)) {
-        const localHandler = serviceHandler[method];
-        const wrappedHandler = this.wrapRoutableHandler(
-          method,
-          serviceDefinition[method],
-          localHandler,
-          options
-        );
-        routableServiceHandler[method] = wrappedHandler;
-
-        const d = serviceDefinition[method];
-        const path = `${options.routePrefix}/${d.routePath || method}`;
-        this.router.route({
-          method: 'post',
-          path,
-          npHandler: async (
-            ctx: RequestHandlerContext,
-            req: KibanaRequest,
-            res: KibanaResponseFactory
-          ) => {
-            const { context, params } = req.body as RequestPayload;
-            this.log.debug(`Receiving RPC call ${req.url.path} ${util.inspect(params)}`);
-            try {
-              const data = await localHandler(params, context);
-              return res.ok({ body: { data } });
-            } catch (e) {
-              if (Boom.isBoom(e)) {
-                throw e;
-              } else {
-                throw Boom.boomify(e, { statusCode: 500 });
-              }
-            }
-          },
-        });
-        this.log.info(`Registered handler for ${path}`);
-      }
-    }
-
-    this.handlers.set(serviceDefinition, routableServiceHandler);
-
-    return routableServiceHandler;
-  }
-
-  private wrapRoutableHandler<
-    SERVICE_DEFINITION extends ServiceDefinition,
-    METHOD extends MethodsFor<SERVICE_DEFINITION>
-  >(
-    method: string,
-    d: { routePath?: string },
-    handler: MethodHandler<SERVICE_DEFINITION, METHOD>,
-    options: ServiceRegisterOptions
-  ): ServiceMethod<SERVICE_DEFINITION, METHOD> {
-    return async (endpoint, params) => {
-      const requestContext = endpoint.toContext();
-      if (endpoint instanceof ClusterNodeEndpoint) {
-        let path = `${options.routePrefix}/${d.routePath || method}`;
-        // if we want to join base url http://localhost:5601/api with path /abc/def to get
-        // http://localhost:5601/api/abc/def, the base url must end with '/', and the path cannot start with '/'
-        // see https://github.com/hapijs/wreck/commit/6fc514c58c5c181327fa3e84d2a95d7d8b93f079
-        if (path.startsWith('/')) {
-          path = path.substr(1);
-        }
-        const payload = {
-          context: requestContext,
-          params,
-        } as RequestPayload;
-        this.log.debug(
-          `Request [${path}] at [${endpoint.codeNode.address}] with [${util.inspect(payload)}]`
-        );
-        const { data } = await this.nonCodeAdapter.requestFn(
-          endpoint.codeNode.address,
-          path,
-          payload,
-          endpoint.httpRequest
-        );
-        return data;
-      } else {
-        return handler(params, requestContext);
-      }
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_node_endpoint.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_node_endpoint.ts
deleted file mode 100644
index e23b5a9027e758..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_node_endpoint.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 { KibanaRequest } from 'src/core/server';
-import { LocalEndpoint } from '../local_endpoint';
-import { CodeNode } from './code_nodes';
-
-export class ClusterNodeEndpoint extends LocalEndpoint {
-  constructor(
-    public readonly httpRequest: KibanaRequest,
-    public readonly resource: string,
-    public readonly codeNode: CodeNode
-  ) {
-    super(httpRequest, resource);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_resource_locator.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_resource_locator.ts
deleted file mode 100644
index 6ac0b830905bbc..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_resource_locator.ts
+++ /dev/null
@@ -1,66 +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';
-import Boom from 'boom';
-import { Endpoint, ResourceLocator } from '../resource_locator';
-import { ClusterService } from './cluster_service';
-import { LocalEndpoint } from '../local_endpoint';
-import { RepositoryUtils } from '../../../common/repository_utils';
-import { ResourceSchedulerService } from './resource_scheduler_service';
-import { ClusterMembershipService } from './cluster_membership_service';
-import { ClusterNodeEndpoint } from './cluster_node_endpoint';
-
-export class ClusterResourceLocator implements ResourceLocator {
-  constructor(
-    private readonly clusterService: ClusterService,
-    private readonly clusterMembershipService: ClusterMembershipService,
-    // @ts-ignore
-    private readonly schedulerService: ResourceSchedulerService
-  ) {}
-
-  protected repositoryUri(url: string): string {
-    return RepositoryUtils.buildRepository(url).uri;
-  }
-
-  async locate(req: KibanaRequest, resource: string): Promise<Endpoint> {
-    // to be compatible with
-    if (resource.trim() === '') {
-      return new LocalEndpoint(req, resource);
-    }
-    const state = this.clusterService.state();
-    const nodeId = state.routingTable.getNodeIdByRepositoryURI(this.repositoryUri(resource));
-    if (!nodeId) {
-      throw Boom.notFound(`resource [${resource}] not exists`);
-    }
-    if (this.clusterMembershipService.localNode.id === nodeId) {
-      return new LocalEndpoint(req, resource);
-    } else {
-      const node = state.nodes.getNodeById(nodeId);
-      if (!node) {
-        throw Boom.notFound(`Node [${nodeId}] not found`);
-      }
-      return new ClusterNodeEndpoint(req, resource, node);
-    }
-  }
-
-  async isResourceLocal(resource: string): Promise<boolean> {
-    const state = this.clusterService.state();
-    return (
-      this.clusterMembershipService.localNode.id ===
-      state.routingTable.getNodeIdByRepositoryURI(this.repositoryUri(resource))
-    );
-  }
-
-  /**
-   * Return undefined to let NodeRepositoriesService enqueue the clone job in cluster mode.
-   */
-  async allocate(req: KibanaRequest, resource: string): Promise<Endpoint | undefined> {
-    // make the cluster service synchronize the meta data and allocate new resources to nodes
-    await this.clusterService.pollClusterState();
-    return undefined;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_service.test.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_service.test.ts
deleted file mode 100644
index 38e6a0b5dda315..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_service.test.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ClusterService } from './cluster_service';
-import { Logger } from '../../log';
-import { ConsoleLoggerFactory } from '../../utils/console_logger_factory';
-import { EsClient } from '../../lib/esqueue';
-import { RepositoryObjectClient } from '../../search';
-import { Repository } from '../../../model';
-import sinon from 'sinon';
-import { ResourceSchedulerService } from './resource_scheduler_service';
-import { ClusterState } from './cluster_state';
-import { ClusterMetadata } from './cluster_meta';
-import { RoutingTable } from './routing_table';
-import { CodeNodes } from './code_nodes';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('test poll cluster state', async () => {
-  const esClient = {} as EsClient;
-  const repoClient = {} as RepositoryObjectClient;
-  repoClient.getAllRepositories = sinon.fake.returns([
-    {
-      uri: 'github/a/a',
-      url: 'http://github/a/a',
-    } as Repository,
-  ]);
-  const clusterService = new ClusterService(esClient, log, repoClient);
-  clusterService.setClusterState(
-    new ClusterState(
-      new ClusterMetadata(),
-      new RoutingTable(),
-      new CodeNodes([{ id: 'test', address: 'localhost' }])
-    )
-  );
-
-  let state = clusterService.state();
-  expect(state).toBeDefined();
-  expect(state.clusterMeta.repositories.length).toBe(0);
-  expect(state.routingTable.nodeIds().length).toBe(0);
-  expect(state.routingTable.repositoryURIs().length).toBe(0);
-
-  await clusterService.pollClusterState();
-  const schedulerService: ResourceSchedulerService = new ResourceSchedulerService(
-    clusterService,
-    log
-  );
-  await schedulerService.allocateUnassigned();
-
-  state = clusterService.state();
-  expect(state).toBeDefined();
-  expect(state.clusterMeta.repositories.length).toBe(1);
-  const repo = state.clusterMeta.getRepository('github/a/a');
-  expect(repo).toBeDefined();
-  expect(repo!.url).toBe('http://github/a/a');
-  expect(state.routingTable.getRepositoryURIsByNodeId('test')).toEqual(['github/a/a']);
-
-  repoClient.getAllRepositories = sinon.fake.returns([]);
-  await clusterService.pollClusterState();
-  state = clusterService.state();
-  expect(state).toBeDefined();
-  expect(state.clusterMeta.repositories.length).toBe(0);
-  expect(state.routingTable.repositoryURIs().length).toBe(0);
-});
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_service.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_service.ts
deleted file mode 100644
index a5ae0a27e128b2..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_service.ts
+++ /dev/null
@@ -1,131 +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 util from 'util';
-import { ClusterMetadata } from './cluster_meta';
-import { EsClient } from '../../lib/esqueue';
-import { RepositoryObjectClient } from '../../search';
-import { Poller } from '../../poller';
-import { Logger } from '../../log';
-import { ClusterState } from './cluster_state';
-import { ClusterStateEvent } from './cluster_state_event';
-
-/**
- * ClusterService synchronizes the core cluster states with the remote, and provides methods to read the current state,
- * and to register listeners to watch the state change.
- */
-export class ClusterService {
-  private readonly clusterStateListeners: ClusterStateListener[] = [];
-  private readonly clusterStatePoller = new Poller<void>({
-    functionToPoll: () => {
-      return this.pollClusterState();
-    },
-    pollFrequencyInMillis: 5000,
-    trailing: true,
-    continuePollingOnError: true,
-  });
-
-  private currentState: ClusterState = ClusterState.empty();
-
-  constructor(
-    public readonly esClient: EsClient,
-    public readonly logger: Logger,
-    private readonly repositoryObjectClient: RepositoryObjectClient = new RepositoryObjectClient(
-      esClient
-    )
-  ) {}
-
-  public async start() {
-    this.clusterStatePoller.start();
-  }
-
-  public async stop() {
-    this.clusterStatePoller.stop();
-  }
-
-  /**
-   * Sync the cluster meta-data with the remote storage.
-   */
-  async pollClusterState(): Promise<void> {
-    const repos = await this.repositoryObjectClient.getAllRepositories();
-    const repoUris = new Set(repos.map(repo => repo.uri));
-    const currentRepoUris = new Set(
-      this.currentState.clusterMeta.repositories.map(repo => repo.uri)
-    );
-    const added = new Set(Array.from(repoUris).filter(uri => !currentRepoUris.has(uri)));
-    const removed = new Set(Array.from(currentRepoUris).filter(uri => !repoUris.has(uri)));
-    if (added.size === 0 && removed.size === 0) {
-      // the cluster state and the routing table is only needed to be updated when repository objects have changed.
-      return;
-    }
-    this.setClusterState(
-      new ClusterState(
-        new ClusterMetadata(repos),
-        this.currentState.routingTable.withoutRepositories(removed),
-        this.currentState.nodes
-      )
-    );
-  }
-
-  public state(): ClusterState {
-    return this.currentState;
-  }
-
-  public addClusterStateListener(applier: ClusterStateListener) {
-    this.clusterStateListeners.push(applier);
-  }
-
-  private async callClusterStateListeners(event: ClusterStateEvent) {
-    for (const applier of this.clusterStateListeners) {
-      try {
-        await applier.onClusterStateChanged(event);
-      } catch (e) {
-        this.logger.error(`Failed to apply cluster state ${util.inspect(event)}`);
-      }
-    }
-  }
-
-  /**
-   * Set the local in memory cluster state, and call cluster state listeners if the state has been changed.
-   *
-   * @param newState is the new cluster state to set.
-   */
-  public setClusterState(newState: ClusterState): ClusterStateEvent | undefined {
-    if (newState === this.currentState) {
-      return undefined;
-    }
-    const event = new ClusterStateEvent(newState, this.currentState);
-    this.currentState = newState;
-    setTimeout(async () => {
-      this.callClusterStateListeners(event);
-    });
-
-    return event;
-  }
-
-  /**
-   * Invoke the updater with the current cluster state as the parameter, and write the result of the updater to remote
-   * as the new cluster state, if the current local cluster state matches the current remote cluster state, otherwise
-   * the updater should be executed again, with the most recent remote cluster state as the input.
-   * It means the method works as a series of CAS operations, until the first success operation.
-   * It also means the updater should be side-effect free.
-   */
-  public async updateClusterState(
-    updater: ClusterStateUpdater
-  ): Promise<ClusterStateEvent | undefined> {
-    const newState = updater(this.currentState);
-    return this.setClusterState(newState);
-  }
-}
-
-/**
- * A cluster applier is a listener of cluster state event.
- */
-export interface ClusterStateListener {
-  onClusterStateChanged(event: ClusterStateEvent): Promise<void>;
-}
-
-export type ClusterStateUpdater = (state: ClusterState) => ClusterState;
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_state.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_state.ts
deleted file mode 100644
index a567a626c96bc7..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_state.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RoutingTable } from './routing_table';
-import { Repository } from '../../../model';
-import { ClusterMetadata } from './cluster_meta';
-import { CodeNodes } from './code_nodes';
-
-/**
- * A snapshot of the meta data and the routing table of the cluster.
- */
-export class ClusterState {
-  constructor(
-    public readonly clusterMeta: ClusterMetadata,
-    public readonly routingTable: RoutingTable,
-    public readonly nodes: CodeNodes
-  ) {}
-
-  static empty(): ClusterState {
-    return new ClusterState(new ClusterMetadata([]), new RoutingTable([]), new CodeNodes([]));
-  }
-
-  /**
-   * Get all repository objects belongs to the given node id according to the routing table.
-   * @param nodeId the id of the node.
-   */
-  public getNodeRepositories(nodeId: string): Repository[] {
-    return this.routingTable
-      .getRepositoryURIsByNodeId(nodeId)
-      .map(uri => {
-        return this.clusterMeta.getRepository(uri);
-      })
-      .filter(repo => {
-        // the repository uri exists in the routing table, but not exists as a meta object
-        // it means the routing table is stale
-        return repo !== undefined;
-      }) as Repository[];
-  }
-
-  /**
-   * find repositories not exists in the routing table, or the node it assigned to doesn't exists in the cluster
-   */
-  public getUnassignedRepositories(): Repository[] {
-    return this.clusterMeta.repositories.filter(repo => {
-      const nodeId = this.routingTable.getNodeIdByRepositoryURI(repo.uri);
-      if (!nodeId) {
-        return true;
-      }
-      return this.nodes.getNodeById(nodeId) === undefined;
-    });
-  }
-
-  public toString(): string {
-    return `{routingTable: ${this.routingTable}}`;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_state_event.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_state_event.ts
deleted file mode 100644
index 7d2eec30c6dc3d..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/cluster_state_event.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ClusterState } from './cluster_state';
-
-/**
- * An object indicates cluster state changes.
- */
-export class ClusterStateEvent {
-  constructor(public readonly current: ClusterState, public readonly prev: ClusterState) {}
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/code_nodes.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/code_nodes.ts
deleted file mode 100644
index 6f07d070df5794..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/code_nodes.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.
- */
-
-export interface CodeNode {
-  id: string;
-  address: string;
-}
-
-export class CodeNodes {
-  private readonly idToNodes: Map<string, CodeNode>;
-
-  constructor(public readonly nodes: CodeNode[]) {
-    this.idToNodes = new Map<string, CodeNode>(
-      nodes.map(node => {
-        return [node.id, node];
-      })
-    );
-  }
-
-  public getNodeById(id: string): CodeNode | undefined {
-    return this.idToNodes.get(id);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/config_cluster_membership_service.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/config_cluster_membership_service.ts
deleted file mode 100644
index f12f132529024f..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/config_cluster_membership_service.ts
+++ /dev/null
@@ -1,49 +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 util from 'util';
-import { ClusterMembershipService } from './cluster_membership_service';
-import { ServerOptions } from '../../server_options';
-import { ClusterService } from './cluster_service';
-import { CodeNode, CodeNodes } from './code_nodes';
-import { ClusterState } from './cluster_state';
-import { Logger } from '../../log';
-
-export class ConfigClusterMembershipService implements ClusterMembershipService {
-  private readonly nodes: CodeNodes;
-
-  public readonly localNode: CodeNode;
-
-  constructor(
-    private readonly options: ServerOptions,
-    private readonly clusterService: ClusterService,
-    private readonly log: Logger
-  ) {
-    this.localNode = {
-      id: options.serverUUID,
-      address: options.localAddress,
-    } as CodeNode;
-
-    // if no nodes are configured, add the local node, to be compatible with the single node mode
-    if (this.options.codeNodes.length > 0) {
-      this.nodes = new CodeNodes(this.options.codeNodes);
-    } else {
-      this.nodes = new CodeNodes([this.localNode]);
-    }
-    this.log.info(
-      `Joined node [${util.inspect(this.localNode)}] to cluster ${util.inspect(this.nodes.nodes)}`
-    );
-  }
-
-  async start(): Promise<void> {
-    const state = this.clusterService.state();
-    this.clusterService.setClusterState(
-      new ClusterState(state.clusterMeta, state.routingTable, this.nodes)
-    );
-  }
-
-  async stop(): Promise<void> {}
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/hash_schedule_policy.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/hash_schedule_policy.ts
deleted file mode 100644
index ee4d475cba0a9e..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/hash_schedule_policy.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import { ResourceSchedulePolicy } from './resource_scheduler';
-import { RoutingTable } from './routing_table';
-import { CodeNode, CodeNodes } from './code_nodes';
-
-/**
- * A policy that assigns resources to nodes based on hash of the resource id. It is easy and stable for a cluster with
- * a static node table.
- */
-export class HashSchedulePolicy implements ResourceSchedulePolicy {
-  canAllocate(resource: string, routingTable: RoutingTable, nodes: CodeNodes): boolean {
-    return !_.isEmpty(nodes.nodes);
-  }
-
-  canAllocateOnNode(
-    resource: string,
-    node: CodeNode,
-    routingTable: RoutingTable,
-    nodes: CodeNodes
-  ): boolean {
-    if (_.isEmpty(nodes.nodes)) {
-      return false;
-    }
-
-    const sortedNodeIds: string[] = nodes.nodes.map(n => n.id).sort();
-
-    const hashCode = this.hash(resource);
-    const targetNodeId = sortedNodeIds[hashCode % sortedNodeIds.length];
-    return targetNodeId === node.id;
-  }
-
-  /**
-   * To calculate the hash code of the string as s[0]*31^(n-1) + s[1]*31^(n-2) + ... + s[n-1],
-   * see code snippets from https://gist.github.com/hyamamoto/fd435505d29ebfa3d9716fd2be8d42f0.
-   */
-  private hash(s: string): number {
-    let hashCode = 0;
-    for (let i = 0; i < s.length; i++) {
-      // eslint-disable-next-line no-bitwise
-      hashCode = (Math.imul(31, hashCode) + s.charCodeAt(i)) | 0;
-    }
-    return Math.abs(hashCode);
-  }
-
-  score(resource: string, node: CodeNode, routingTable: RoutingTable, nodes: CodeNodes): number {
-    return 1;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/node_repositories_service.test.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/node_repositories_service.test.ts
deleted file mode 100644
index 17893e0f6b1bc2..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/node_repositories_service.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import sinon from 'sinon';
-import { Logger } from '../../log';
-import { ConsoleLoggerFactory } from '../../utils/console_logger_factory';
-import { NodeRepositoriesService } from './node_repositories_service';
-import { ClusterService } from './cluster_service';
-import { ClusterMembershipService } from './cluster_membership_service';
-import { CodeNode, CodeNodes } from './code_nodes';
-import { emptyAsyncFunc } from '../../test_utils';
-import { CloneWorker } from '../../queue';
-import { ClusterStateEvent } from './cluster_state_event';
-import { ClusterState } from './cluster_state';
-import { ClusterMetadata } from './cluster_meta';
-import { Repository } from '../../../model';
-import { ResourceAssignment, RoutingTable } from './routing_table';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-afterEach(() => {
-  sinon.restore();
-});
-
-const cloneWorker = ({
-  enqueueJob: emptyAsyncFunc,
-} as any) as CloneWorker;
-
-const clusterService = {} as ClusterService;
-
-const testNodes = [
-  { id: 'node1', address: 'http://node1' } as CodeNode,
-  { id: 'node2', address: 'http://node2' } as CodeNode,
-];
-
-const testRepos = [
-  { uri: 'test1', url: 'http://test1' } as Repository,
-  { uri: 'test2', url: 'http://test2' } as Repository,
-];
-
-test('Enqueue clone job after new repository is added to the local node', async () => {
-  const enqueueJobSpy = sinon.spy(cloneWorker, 'enqueueJob');
-
-  const clusterMembershipService = {
-    localNode: testNodes[0],
-  } as ClusterMembershipService;
-
-  const nodeService = new NodeRepositoriesService(
-    log,
-    clusterService,
-    clusterMembershipService,
-    cloneWorker
-  );
-
-  // event with no new repositories
-  let event = new ClusterStateEvent(ClusterState.empty(), ClusterState.empty());
-  await nodeService.onClusterStateChanged(event);
-  expect(enqueueJobSpy.called).toBeFalsy();
-  expect(nodeService.localRepos.size).toBe(0);
-
-  // event with a new repository
-  event = new ClusterStateEvent(
-    new ClusterState(
-      new ClusterMetadata([testRepos[0]]),
-      new RoutingTable([
-        { nodeId: testNodes[0].id, resource: testRepos[0].uri } as ResourceAssignment,
-      ]),
-      new CodeNodes([testNodes[0]])
-    ),
-    event.current
-  );
-  await nodeService.onClusterStateChanged(event);
-  expect(enqueueJobSpy.calledOnce).toBeTruthy();
-  expect(nodeService.localRepos.size).toBe(1);
-
-  // event with removed repository
-  event = new ClusterStateEvent(ClusterState.empty(), event.current);
-  await nodeService.onClusterStateChanged(event);
-  expect(enqueueJobSpy.calledOnce).toBeTruthy();
-  expect(nodeService.localRepos.size).toBe(0);
-
-  // event with two added repositories
-  event = new ClusterStateEvent(
-    new ClusterState(
-      new ClusterMetadata([testRepos[0], testRepos[1]]),
-      new RoutingTable([
-        { nodeId: testNodes[0].id, resource: testRepos[0].uri } as ResourceAssignment,
-        { nodeId: testNodes[0].id, resource: testRepos[1].uri } as ResourceAssignment,
-      ]),
-      new CodeNodes([testNodes[0]])
-    ),
-    event.current
-  );
-  await nodeService.onClusterStateChanged(event);
-  expect(enqueueJobSpy.callCount).toBe(3);
-  expect(nodeService.localRepos.size).toBe(2);
-
-  // event with removed repository
-  event = new ClusterStateEvent(ClusterState.empty(), event.current);
-  await nodeService.onClusterStateChanged(event);
-  expect(enqueueJobSpy.callCount).toBe(3);
-  expect(nodeService.localRepos.size).toBe(0);
-
-  // event with two added repositories, one for the other node
-  event = new ClusterStateEvent(
-    new ClusterState(
-      new ClusterMetadata([testRepos[0], testRepos[1]]),
-      new RoutingTable([
-        { nodeId: testNodes[0].id, resource: testRepos[0].uri } as ResourceAssignment,
-        { nodeId: testNodes[1].id, resource: testRepos[1].uri } as ResourceAssignment,
-      ]),
-      new CodeNodes([testNodes[0]])
-    ),
-    event.current
-  );
-  await nodeService.onClusterStateChanged(event);
-  expect(enqueueJobSpy.callCount).toBe(4);
-  expect(nodeService.localRepos.size).toBe(1);
-});
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/node_repositories_service.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/node_repositories_service.ts
deleted file mode 100644
index 7d46960af1bab8..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/node_repositories_service.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import util from 'util';
-import { ClusterService, ClusterStateListener } from './cluster_service';
-import { ClusterStateEvent } from './cluster_state_event';
-import { ClusterMembershipService } from './cluster_membership_service';
-import { CloneWorker } from '../../queue';
-import { Repository, RepositoryUri, RepoState } from '../../../model';
-import { Logger } from '../../log';
-
-export class NodeRepositoriesService implements ClusterStateListener {
-  // visible for test
-  readonly localRepos = new Map<RepositoryUri, LocalRepository>();
-  private readonly localNodeId = this.clusterMembershipService.localNode.id;
-
-  constructor(
-    private readonly log: Logger,
-    private readonly clusterService: ClusterService,
-    private readonly clusterMembershipService: ClusterMembershipService,
-    private readonly cloneWorker: CloneWorker
-  ) {}
-
-  public async start() {
-    /**
-     * we can add locally exists repositories to localRepos when the service is started to avoid unnecessarily add clone
-     * tasks for them, but for now it's OK because clone job is idempotent.
-     */
-    this.clusterService.addClusterStateListener(this);
-  }
-
-  public async stop() {}
-
-  async onClusterStateChanged(event: ClusterStateEvent): Promise<void> {
-    // compare repositories in the cluster state with repositories in the local node, and remove
-    const repos = event.current.getNodeRepositories(this.clusterMembershipService.localNode.id);
-    const localNewRepos = repos.filter(repo => !this.localRepos.has(repo.uri));
-    const localRemovedRepos = Array.from(this.localRepos.values()).filter(
-      repo =>
-        event.current.routingTable.getNodeIdByRepositoryURI(repo.metadata.uri) !== this.localNodeId
-    );
-    for (const localNewRepo of localNewRepos) {
-      this.log.info(
-        `Repository added to node [${this.localNodeId}]: ${util.inspect(localNewRepo)}`
-      );
-      await this.cloneWorker.enqueueJob({ url: localNewRepo.url }, {});
-      this.localRepos.set(localNewRepo.uri, {
-        metadata: localNewRepo,
-        currentState: RepoState.CLONING,
-      });
-    }
-    // TODO remove the stale local repo after the Kibana HA is ready
-    for (const localRemovedRepo of localRemovedRepos) {
-      this.log.info(
-        `Repository removed from node [${this.localNodeId}]: ${util.inspect(
-          localRemovedRepo.metadata
-        )}`
-      );
-      this.localRepos.delete(localRemovedRepo.metadata.uri);
-    }
-  }
-}
-
-interface LocalRepository {
-  metadata: Repository;
-  currentState: RepoState;
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/resource_scheduler.test.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/resource_scheduler.test.ts
deleted file mode 100644
index 0b826f60ed8edb..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/resource_scheduler.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { HashSchedulePolicy } from './hash_schedule_policy';
-import { RoutingTable } from './routing_table';
-import { CodeNode, CodeNodes } from './code_nodes';
-import { ResourceScheduler } from './resource_scheduler';
-import { Logger } from '../../log';
-import { ConsoleLoggerFactory } from '../../utils/console_logger_factory';
-import { ClusterState } from './cluster_state';
-import { ClusterMetadata } from './cluster_meta';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-function randStr() {
-  return Math.random()
-    .toString(36)
-    .substr(2, 9);
-}
-
-test('test hash schedule policy', () => {
-  const nodeA = { id: 'na', address: 'http://a' } as CodeNode;
-  const nodeB = { id: 'nb', address: 'http://b' } as CodeNode;
-  const nodeC = { id: 'nc', address: 'http://c' } as CodeNode;
-
-  const policy = new HashSchedulePolicy();
-  const rt = new RoutingTable();
-
-  // can allocate only when any node exists
-  expect(policy.canAllocate('ra', rt, new CodeNodes([]))).toBeFalsy();
-  expect(policy.canAllocate('ra', rt, new CodeNodes([nodeA]))).toBeTruthy();
-
-  // can allocate when the node id matches
-  expect(policy.canAllocateOnNode('ra', nodeB, rt, new CodeNodes([nodeA]))).toBeFalsy();
-  expect(policy.canAllocateOnNode('ra', nodeA, rt, new CodeNodes([nodeA]))).toBeTruthy();
-
-  const nodes1 = new CodeNodes([nodeA, nodeB, nodeC]);
-  const nodes2 = new CodeNodes([nodeB, nodeA, nodeC]);
-  const nodes3 = new CodeNodes([nodeB, nodeC, nodeA]);
-
-  // always can only be allocated on one of the nodes
-  for (let i = 0; i < 100; i++) {
-    const resName = randStr();
-    let target: CodeNode | undefined;
-    for (const nodes of [nodes1, nodes2, nodes3]) {
-      let num = 0;
-      for (const node of nodes.nodes) {
-        if (policy.canAllocateOnNode(resName, node, rt, nodes)) {
-          num++;
-          if (target) {
-            // sequence of the nodes doesn't matter
-            expect(node).toBe(target);
-          } else {
-            target = node;
-          }
-        }
-      }
-      expect(num).toBe(1);
-    }
-  }
-});
-
-test('hash based resource allocation', () => {
-  const scheduler = new ResourceScheduler([new HashSchedulePolicy()], log);
-
-  const rt = new RoutingTable();
-  let state = ClusterState.empty();
-  const resources = ['ra', 'tb'];
-
-  let assignments = scheduler.allocate(resources, state);
-  expect(assignments.length).toBe(0);
-
-  let nodes = new CodeNodes([{ id: 'na', address: 'http://a' }]);
-  state = new ClusterState(new ClusterMetadata(), rt, nodes);
-  assignments = scheduler.allocate(resources, state);
-
-  expect(assignments.length).toBe(resources.length);
-
-  nodes = new CodeNodes([{ id: 'na', address: 'http://a' }, { id: 'nb', address: 'http://b' }]);
-  state = new ClusterState(new ClusterMetadata(), rt, nodes);
-  for (let i = 0; i < 10; i++) {
-    resources.push(randStr());
-    assignments = scheduler.allocate(resources, state);
-    expect(assignments.length).toBe(resources.length);
-  }
-});
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/resource_scheduler.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/resource_scheduler.ts
deleted file mode 100644
index 06aa07dc730c9e..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/resource_scheduler.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import { ResourceAssignment, RoutingTable } from './routing_table';
-import { CodeNode, CodeNodes } from './code_nodes';
-import { ClusterState } from './cluster_state';
-import { Logger } from '../../log';
-
-/**
- * The scheduler decides how to allocate resources to nodes. Allocating resources to nodes basically follows 2 steps:
- * - Filter: find nodes that is applicable for the resource, based on attributes of nodes and restrictions of policies.
- * - Score: score each applicable node for the resource, and return a list of applicable nodes sorted by the score in the
- *   descending order.
- * - Decide: pick the best fit node from the list as the candidate.
- */
-export class ResourceScheduler {
-  constructor(private readonly policies: ResourceSchedulePolicy[], private readonly log: Logger) {}
-
-  public allocate(resources: string[], state: ClusterState): ResourceAssignment[] {
-    if (_.isEmpty(resources)) {
-      return [];
-    }
-    if (_.isEmpty(state.nodes.nodes)) {
-      return [];
-    }
-    // remove repos cannot be allocated
-    const allocatableRepos = resources.filter(repo => {
-      return _.every(this.policies, policy =>
-        policy.canAllocate(repo, state.routingTable, state.nodes)
-      );
-    });
-    if (_.isEmpty(allocatableRepos)) {
-      return [];
-    }
-    const assignments: ResourceAssignment[] = [];
-    let routingTable = state.routingTable;
-    for (const resource of resources) {
-      const assignment = this.allocateResource(resource, state.nodes, routingTable);
-      if (!assignment) {
-        continue;
-      }
-      assignments.push(assignment);
-      routingTable = routingTable.assign([assignment]);
-      this.log.info(`Assigned resource [${resource}] to node [${assignment.nodeId}]`);
-    }
-    return assignments;
-  }
-
-  protected allocateResource(
-    resource: string,
-    nodes: CodeNodes,
-    routingTable: RoutingTable
-  ): ResourceAssignment | undefined {
-    const scoredNodes = nodes.nodes
-      .filter(node => {
-        // remove nodes that the
-        return _.every(this.policies, policy =>
-          policy.canAllocateOnNode(resource, node, routingTable, nodes)
-        );
-      })
-      .map(node => {
-        const score = this.policies.reduce(
-          (prev, policy) => prev * policy.score(resource, node, routingTable, nodes),
-          1
-        );
-        return { node, score };
-      });
-    if (_.isEmpty(scoredNodes)) {
-      return undefined;
-    }
-
-    let bestFit = scoredNodes[0];
-    for (const node of scoredNodes) {
-      if (node.score >= bestFit.score) {
-        // use the node id as the tie-breaker
-        if (node.node.id > bestFit.node.id) {
-          bestFit = node;
-        }
-      }
-    }
-
-    return {
-      nodeId: bestFit.node.id,
-      resource,
-    };
-  }
-}
-
-export interface ResourceSchedulePolicy {
-  /**
-   * Decide whether the resource can be allocated to any node, according to the current cluster state.
-   */
-  canAllocate(resource: string, routingTable: RoutingTable, nodes: CodeNodes): boolean;
-
-  /**
-   * Decide whether the resource can be allocated to the node, according to the current cluster state.
-   */
-  canAllocateOnNode(
-    resource: string,
-    node: CodeNode,
-    routingTable: RoutingTable,
-    nodes: CodeNodes
-  ): boolean;
-
-  /**
-   * Calculate the score of the assignment, the higher the better.
-   */
-  score(resource: string, node: CodeNode, routingTable: RoutingTable, nodes: CodeNodes): number;
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/resource_scheduler_service.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/resource_scheduler_service.ts
deleted file mode 100644
index 3249c8813a4d77..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/resource_scheduler_service.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import { ClusterService, ClusterStateListener } from './cluster_service';
-import { ClusterStateEvent } from './cluster_state_event';
-import { ClusterState } from './cluster_state';
-import { ResourceScheduler } from './resource_scheduler';
-import { Logger } from '../../log';
-import { HashSchedulePolicy } from './hash_schedule_policy';
-
-/**
- * This service watches the change of the cluster state and allocates resources to nodes if needed:
- * - when a new resource is added to the cluster
- * - a resource is unassigned, e.g., due to disk watermark constraints
- * - when a node is removed from the cluster (HA)
- */
-export class ResourceSchedulerService implements ClusterStateListener {
-  private readonly scheduler = new ResourceScheduler([new HashSchedulePolicy()], this.log);
-
-  constructor(private readonly clusterService: ClusterService, private readonly log: Logger) {
-    this.clusterService.addClusterStateListener(this);
-  }
-
-  public async start() {}
-
-  public async stop() {}
-
-  public async allocateUnassigned(state?: ClusterState) {
-    if (!state) {
-      state = this.clusterService.state();
-    }
-    const unassignedRepos = state.getUnassignedRepositories();
-    if (_.isEmpty(unassignedRepos)) {
-      return;
-    }
-    await this.clusterService.updateClusterState(current => {
-      // sort repositories by names to make the allocation result stable
-      const unassigned = current
-        .getUnassignedRepositories()
-        .map(repo => repo.uri)
-        .sort();
-
-      const assignments = this.scheduler.allocate(unassigned, current);
-      if (_.isEmpty(assignments)) {
-        return current;
-      }
-      return new ClusterState(
-        current.clusterMeta,
-        current.routingTable.assign(assignments),
-        current.nodes
-      );
-    });
-  }
-
-  async onClusterStateChanged(event: ClusterStateEvent): Promise<void> {
-    await this.allocateUnassigned(event.current);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/cluster/routing_table.ts b/x-pack/legacy/plugins/code/server/distributed/cluster/routing_table.ts
deleted file mode 100644
index b93b2f2bc344fb..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/cluster/routing_table.ts
+++ /dev/null
@@ -1,76 +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.
- */
-
-/**
- * A snapshot of the routing table, which defines on which node each repository resides.
- *
- * Currently, the relationship between nodes and repositories is one to many.
- */
-export class RoutingTable {
-  private readonly node2Repos: Map<string, string[]>;
-  private readonly repo2Node: Map<string, string>;
-
-  constructor(private readonly assignments: ResourceAssignment[] = []) {
-    this.repo2Node = new Map<string, string>(assignments.map(t => [t.resource, t.nodeId]));
-    this.node2Repos = assignments.reduce(function(map, assignment) {
-      let arr = map.get(assignment.nodeId);
-      if (!arr) {
-        arr = [];
-        map.set(assignment.nodeId, arr);
-      }
-      arr.push(assignment.resource);
-      return map;
-    }, new Map<string, string[]>());
-  }
-
-  public assign(assignments: ResourceAssignment[]): RoutingTable {
-    return new RoutingTable(this.assignments.concat(assignments));
-  }
-
-  /**
-   * return a new routing table without given repositories
-   */
-  public withoutRepositories(repoUris: Set<string>): RoutingTable {
-    return new RoutingTable(
-      this.assignments.filter(assignment => !repoUris.has(assignment.resource))
-    );
-  }
-
-  public nodeIds(): string[] {
-    return Array.from(this.node2Repos.keys());
-  }
-
-  public repositoryURIs(): string[] {
-    return Array.from(this.repo2Node.keys());
-  }
-
-  public getNodeIdByRepositoryURI(repoURI: string): string | undefined {
-    return this.repo2Node.get(repoURI);
-  }
-
-  public getRepositoryURIsByNodeId(nodeId: string): string[] {
-    return this.node2Repos.get(nodeId) || [];
-  }
-
-  public toString(): string {
-    let str: string = '[';
-    let first: boolean = true;
-    this.repo2Node.forEach((v, k, m) => {
-      if (first) {
-        first = false;
-      } else {
-        str += ', ';
-      }
-      str += `${k}: ${v}`;
-    });
-    return str + ']';
-  }
-}
-
-export interface ResourceAssignment {
-  nodeId: string;
-  resource: string;
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/code_services.test.ts b/x-pack/legacy/plugins/code/server/distributed/code_services.test.ts
deleted file mode 100644
index bcc2e7b21e672a..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/code_services.test.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest } from 'src/core/server';
-import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
-import { createTestHapiServer } from '../test_utils';
-import { LocalHandlerAdapter } from './local_handler_adapter';
-import { CodeServerRouter } from '../security';
-import { RequestContext, ServiceHandlerFor } from './service_definition';
-import { CodeNodeAdapter, RequestPayload } from './multinode/code_node_adapter';
-import { DEFAULT_SERVICE_OPTION } from './service_handler_adapter';
-import { NonCodeNodeAdapter } from './multinode/non_code_node_adapter';
-import { CodeServices } from './code_services';
-import { Logger } from '../log';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-let hapiServer = createTestHapiServer();
-
-const routerMock = httpServiceMock.createRouter();
-let router: CodeServerRouter = new CodeServerRouter(routerMock);
-beforeEach(async () => {
-  hapiServer = createTestHapiServer();
-  router = new CodeServerRouter(routerMock);
-});
-const TestDefinition = {
-  test1: {
-    request: {} as { name: string },
-    response: {} as { result: string },
-  },
-  test2: {
-    request: {},
-    response: {} as RequestContext,
-    routePath: 'userDefinedPath',
-  },
-};
-
-export const testServiceHandler: ServiceHandlerFor<typeof TestDefinition> = {
-  async test1({ name }) {
-    return { result: `hello ${name}` };
-  },
-  async test2(_, context: RequestContext) {
-    return context;
-  },
-};
-
-test('local adapter should work', async () => {
-  const services = new CodeServices(new LocalHandlerAdapter());
-  services.registerHandler(TestDefinition, testServiceHandler);
-  const testApi = services.serviceFor(TestDefinition);
-  const endpoint = await services.locate(httpServerMock.createKibanaRequest(), '');
-  const { result } = await testApi.test1(endpoint, { name: 'tester' });
-  expect(result).toBe(`hello tester`);
-});
-
-test.skip('multi-node adapter should register routes', async () => {
-  const services = new CodeServices(new CodeNodeAdapter(router, log));
-  services.registerHandler(TestDefinition, testServiceHandler);
-  const prefix = DEFAULT_SERVICE_OPTION.routePrefix;
-
-  const path1 = `${prefix}/test1`;
-  const response = await hapiServer.inject({
-    method: 'POST',
-    url: path1,
-    payload: { params: { name: 'tester' } },
-  });
-  expect(response.statusCode).toBe(200);
-  const { data } = JSON.parse(response.payload);
-  expect(data.result).toBe(`hello tester`);
-});
-
-test.skip('non-code-node could send request to code-node', async () => {
-  const codeNode = new CodeServices(new CodeNodeAdapter(router, log));
-  const codeNodeUrl = 'http://localhost:5601';
-  const nonCodeNodeAdapter = new NonCodeNodeAdapter(codeNodeUrl, log);
-  const nonCodeNode = new CodeServices(nonCodeNodeAdapter);
-  // replace client request fn to hapi.inject
-  nonCodeNodeAdapter.requestFn = async (
-    baseUrl: string,
-    path: string,
-    payload: RequestPayload,
-    originRequest: KibanaRequest
-  ) => {
-    expect(baseUrl).toBe(codeNodeUrl);
-    const response = await hapiServer.inject({
-      method: 'POST',
-      url: path,
-      headers: originRequest.headers as any,
-      payload,
-    });
-    expect(response.statusCode).toBe(200);
-    return JSON.parse(response.payload);
-  };
-  codeNode.registerHandler(TestDefinition, testServiceHandler);
-  nonCodeNode.registerHandler(TestDefinition, null);
-  const testApi = nonCodeNode.serviceFor(TestDefinition);
-  const fakeRequest = ({
-    route: {
-      path: 'fakePath',
-    },
-    headers: {
-      fakeHeader: 'fakeHeaderValue',
-    },
-  } as unknown) as KibanaRequest;
-  const fakeResource = 'fakeResource';
-  const endpoint = await nonCodeNode.locate(fakeRequest, fakeResource);
-  const { result } = await testApi.test1(endpoint, { name: 'tester' });
-  expect(result).toBe(`hello tester`);
-
-  const context = await testApi.test2(endpoint, {});
-  expect(context.resource).toBe(fakeResource);
-  expect(context.path).toBe(fakeRequest.route.path);
-});
diff --git a/x-pack/legacy/plugins/code/server/distributed/code_services.ts b/x-pack/legacy/plugins/code/server/distributed/code_services.ts
deleted file mode 100644
index a2abe402a8e52b..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/code_services.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest } from 'src/core/server';
-import { ServiceDefinition, ServiceHandlerFor, ServiceMethodMap } from './service_definition';
-import {
-  DEFAULT_SERVICE_OPTION,
-  ServiceHandlerAdapter,
-  ServiceRegisterOptions,
-} from './service_handler_adapter';
-import { Endpoint } from './resource_locator';
-
-export class CodeServices {
-  constructor(private readonly adapter: ServiceHandlerAdapter) {}
-
-  public registerHandler<serviceDefinition extends ServiceDefinition>(
-    serviceDefinition: serviceDefinition,
-    serviceHandler: ServiceHandlerFor<serviceDefinition> | null,
-    options: ServiceRegisterOptions = DEFAULT_SERVICE_OPTION
-  ) {
-    this.adapter.registerHandler(serviceDefinition, serviceHandler, options);
-  }
-
-  public async start() {
-    await this.adapter.start();
-  }
-
-  public async stop() {
-    await this.adapter.stop();
-  }
-
-  public allocate(req: KibanaRequest, resource: string): Promise<Endpoint | undefined> {
-    return this.adapter.locator.allocate(req, resource);
-  }
-
-  public locate(req: KibanaRequest, resource: string): Promise<Endpoint> {
-    return this.adapter.locator.locate(req, resource);
-  }
-
-  public isResourceLocal(resource: string): Promise<boolean> {
-    return this.adapter.locator.isResourceLocal(resource);
-  }
-
-  public serviceFor<def extends ServiceDefinition>(serviceDefinition: def): ServiceMethodMap<def> {
-    return this.adapter.getService(serviceDefinition);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/local_endpoint.ts b/x-pack/legacy/plugins/code/server/distributed/local_endpoint.ts
deleted file mode 100644
index 8897ec8ae3acbb..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/local_endpoint.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest } from 'src/core/server';
-import { Endpoint } from './resource_locator';
-import { RequestContext } from './service_definition';
-
-export class LocalEndpoint implements Endpoint {
-  constructor(public readonly httpRequest: KibanaRequest, public readonly resource: string) {}
-
-  toContext(): RequestContext {
-    return {
-      resource: this.resource,
-      path: this.httpRequest.route.path,
-    } as RequestContext;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/local_handler_adapter.ts b/x-pack/legacy/plugins/code/server/distributed/local_handler_adapter.ts
deleted file mode 100644
index 4f51ee29383663..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/local_handler_adapter.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest } from 'src/core/server';
-import { ServiceHandlerAdapter } from './service_handler_adapter';
-import { ServiceDefinition, ServiceHandlerFor, ServiceMethodMap } from './service_definition';
-import { Endpoint, ResourceLocator } from './resource_locator';
-import { LocalEndpoint } from './local_endpoint';
-
-export class LocalHandlerAdapter implements ServiceHandlerAdapter {
-  handlers: Map<any, any> = new Map<any, any>();
-
-  async start(): Promise<void> {}
-
-  async stop(): Promise<void> {}
-
-  registerHandler<def extends ServiceDefinition>(
-    serviceDefinition: def,
-    serviceHandler: ServiceHandlerFor<def> | null
-  ) {
-    if (!serviceHandler) {
-      throw new Error("Local service handler can't be null!");
-    }
-    const dispatchedHandler: { [key: string]: any } = {};
-    // eslint-disable-next-line guard-for-in
-    for (const method in serviceDefinition) {
-      dispatchedHandler[method] = function(endpoint: Endpoint, params: any) {
-        return serviceHandler[method](params, endpoint.toContext());
-      };
-    }
-    this.handlers.set(serviceDefinition, dispatchedHandler);
-    return dispatchedHandler as ServiceMethodMap<def>;
-  }
-
-  getService<def extends ServiceDefinition>(serviceDefinition: def): ServiceMethodMap<def> {
-    const serviceHandler = this.handlers.get(serviceDefinition);
-    if (serviceHandler) {
-      return serviceHandler as ServiceMethodMap<def>;
-    } else {
-      throw new Error(`handler for ${serviceDefinition} not found`);
-    }
-  }
-
-  locator: ResourceLocator = {
-    async locate(httpRequest: KibanaRequest, resource: string): Promise<Endpoint> {
-      return Promise.resolve(new LocalEndpoint(httpRequest, resource));
-    },
-
-    isResourceLocal(resource: string): Promise<boolean> {
-      return Promise.resolve(true);
-    },
-
-    async allocate(httpRequest: KibanaRequest, resource: string): Promise<Endpoint | undefined> {
-      return Promise.resolve(new LocalEndpoint(httpRequest, resource));
-    },
-  };
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/multinode/code_node_adapter.ts b/x-pack/legacy/plugins/code/server/distributed/multinode/code_node_adapter.ts
deleted file mode 100644
index a7d2edf4b0308e..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/multinode/code_node_adapter.ts
+++ /dev/null
@@ -1,104 +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, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-import util from 'util';
-import Boom from 'boom';
-import {
-  DEFAULT_SERVICE_OPTION,
-  ServiceHandlerAdapter,
-  ServiceRegisterOptions,
-} from '../service_handler_adapter';
-import { Endpoint, ResourceLocator } from '../resource_locator';
-import {
-  RequestContext,
-  ServiceDefinition,
-  ServiceHandlerFor,
-  ServiceMethodMap,
-} from '../service_definition';
-import { CodeServerRouter } from '../../security';
-import { LocalHandlerAdapter } from '../local_handler_adapter';
-import { LocalEndpoint } from '../local_endpoint';
-import { Logger } from '../../log';
-
-export interface RequestPayload {
-  context: RequestContext;
-  params: any;
-}
-
-export class CodeNodeAdapter implements ServiceHandlerAdapter {
-  localAdapter: LocalHandlerAdapter = new LocalHandlerAdapter();
-  constructor(private readonly router: CodeServerRouter, private readonly log: Logger) {}
-
-  locator: ResourceLocator = {
-    async locate(httpRequest: KibanaRequest, resource: string): Promise<Endpoint> {
-      return Promise.resolve(new LocalEndpoint(httpRequest, resource));
-    },
-
-    isResourceLocal(resource: string): Promise<boolean> {
-      return Promise.resolve(false);
-    },
-
-    async allocate(httpRequest: KibanaRequest, resource: string): Promise<Endpoint | undefined> {
-      return Promise.resolve(new LocalEndpoint(httpRequest, resource));
-    },
-  };
-
-  async start(): Promise<void> {}
-
-  async stop(): Promise<void> {}
-
-  getService<def extends ServiceDefinition>(serviceDefinition: def): ServiceMethodMap<def> {
-    // services on code node dispatch to local directly
-    return this.localAdapter.getService(serviceDefinition);
-  }
-
-  registerHandler<def extends ServiceDefinition>(
-    serviceDefinition: def,
-    serviceHandler: ServiceHandlerFor<def> | null,
-    options: ServiceRegisterOptions = DEFAULT_SERVICE_OPTION
-  ) {
-    if (!serviceHandler) {
-      throw new Error("Code node service handler can't be null!");
-    }
-    const serviceMethodMap = this.localAdapter.registerHandler(serviceDefinition, serviceHandler);
-    // eslint-disable-next-line guard-for-in
-    for (const method in serviceDefinition) {
-      const d = serviceDefinition[method];
-      const path = `${options.routePrefix}/${d.routePath || method}`;
-      // register routes, receive requests from non-code node.
-      this.router.route({
-        method: 'post',
-        path,
-        npHandler: async (
-          ctx: RequestHandlerContext,
-          req: KibanaRequest,
-          res: KibanaResponseFactory
-        ) => {
-          // @ts-ignore
-          const { context, params } = req.body as RequestPayload;
-          this.log.debug(`Receiving RPC call ${req.url.path} ${util.inspect(params)}`);
-          const endpoint: Endpoint = {
-            toContext(): RequestContext {
-              return context;
-            },
-          };
-          try {
-            const data = await serviceMethodMap[method](endpoint, params);
-            return res.ok({ body: data });
-          } catch (e) {
-            if (!Boom.isBoom(e)) {
-              throw Boom.boomify(e, { statusCode: 500 });
-            } else {
-              throw e;
-            }
-          }
-        },
-      });
-    }
-    return serviceMethodMap;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/multinode/code_node_endpoint.ts b/x-pack/legacy/plugins/code/server/distributed/multinode/code_node_endpoint.ts
deleted file mode 100644
index 03c4917dfb7322..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/multinode/code_node_endpoint.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest } from 'src/core/server';
-import { LocalEndpoint } from '../local_endpoint';
-
-export class CodeNodeEndpoint extends LocalEndpoint {
-  constructor(
-    public readonly httpRequest: KibanaRequest,
-    public readonly resource: string,
-    public readonly codeNodeUrl: string
-  ) {
-    super(httpRequest, resource);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/multinode/code_node_resource_locator.ts b/x-pack/legacy/plugins/code/server/distributed/multinode/code_node_resource_locator.ts
deleted file mode 100644
index e4b3d21b80ec73..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/multinode/code_node_resource_locator.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest } from 'src/core/server';
-import { Endpoint, ResourceLocator } from '../resource_locator';
-import { CodeNodeEndpoint } from './code_node_endpoint';
-
-export class CodeNodeResourceLocator implements ResourceLocator {
-  constructor(private readonly codeNodeUrl: string) {}
-
-  async locate(httpRequest: KibanaRequest, resource: string): Promise<Endpoint> {
-    return Promise.resolve(new CodeNodeEndpoint(httpRequest, resource, this.codeNodeUrl));
-  }
-
-  isResourceLocal(resource: string): Promise<boolean> {
-    return Promise.resolve(false);
-  }
-
-  allocate(req: KibanaRequest, resource: string): Promise<Endpoint | undefined> {
-    return this.locate(req, resource);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/multinode/non_code_node_adapter.ts b/x-pack/legacy/plugins/code/server/distributed/multinode/non_code_node_adapter.ts
deleted file mode 100644
index 1221651bc51e29..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/multinode/non_code_node_adapter.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import Wreck from '@hapi/wreck';
-import util from 'util';
-import Boom from 'boom';
-import { KibanaRequest } from 'src/core/server';
-import * as http from 'http';
-import {
-  DEFAULT_SERVICE_OPTION,
-  ServiceHandlerAdapter,
-  ServiceRegisterOptions,
-} from '../service_handler_adapter';
-import { ResourceLocator } from '../resource_locator';
-import { ServiceDefinition, ServiceHandlerFor, ServiceMethodMap } from '../service_definition';
-import { CodeNodeResourceLocator } from './code_node_resource_locator';
-import { CodeNodeEndpoint } from './code_node_endpoint';
-import { RequestPayload } from './code_node_adapter';
-import { Logger } from '../../log';
-
-const pickHeaders = ['authorization'];
-
-function filterHeaders(originRequest: KibanaRequest) {
-  const result: { [name: string]: string | string[] | undefined } = {};
-  for (const header of pickHeaders) {
-    if (originRequest.headers[header]) {
-      result[header] = originRequest.headers[header];
-    }
-  }
-  return result;
-}
-
-export class NonCodeNodeAdapter implements ServiceHandlerAdapter {
-  handlers: Map<any, any> = new Map<any, any>();
-
-  constructor(private readonly codeNodeUrl: string, private readonly log: Logger) {}
-
-  locator: ResourceLocator = new CodeNodeResourceLocator(this.codeNodeUrl);
-
-  async start(): Promise<void> {}
-
-  async stop(): Promise<void> {}
-
-  getService<def extends ServiceDefinition>(serviceDefinition: def): ServiceMethodMap<def> {
-    const serviceHandler = this.handlers.get(serviceDefinition);
-    if (!serviceHandler) {
-      // we don't need implement code for service, so we can register here.
-      this.registerHandler(serviceDefinition, null);
-    }
-    return serviceHandler as ServiceMethodMap<def>;
-  }
-
-  registerHandler<def extends ServiceDefinition>(
-    serviceDefinition: def,
-    // serviceHandler will always be null here since it will be overridden by the request forwarding.
-    serviceHandler: ServiceHandlerFor<def> | null,
-    options: ServiceRegisterOptions = DEFAULT_SERVICE_OPTION
-  ) {
-    const dispatchedHandler: { [key: string]: any } = {};
-    // eslint-disable-next-line guard-for-in
-    for (const method in serviceDefinition) {
-      const d = serviceDefinition[method];
-      const path = `${options.routePrefix}/${d.routePath || method}`;
-      dispatchedHandler[method] = async (endpoint: CodeNodeEndpoint, params: any) => {
-        const payload = {
-          context: endpoint.toContext(),
-          params,
-        };
-        const { data } = await this.requestFn(
-          endpoint.codeNodeUrl,
-          path,
-          payload,
-          endpoint.httpRequest
-        );
-        return data;
-      };
-    }
-    this.handlers.set(serviceDefinition, dispatchedHandler);
-    return dispatchedHandler as ServiceMethodMap<def>;
-  }
-
-  async requestFn(
-    baseUrl: string,
-    path: string,
-    payload: RequestPayload,
-    originRequest: KibanaRequest
-  ) {
-    const opt = {
-      baseUrl,
-      payload: JSON.stringify(payload),
-      // redirect all headers to CodeNode
-      headers: { ...filterHeaders(originRequest), 'kbn-xsrf': 'kibana' },
-    };
-    const promise = Wreck.request('POST', path, opt);
-    const res: http.IncomingMessage = await promise;
-    this.log.debug(`sending RPC call to ${baseUrl}${path} ${res.statusCode}`);
-    if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
-      const buffer: Buffer = await Wreck.read(res, {});
-      try {
-        return JSON.parse(buffer.toString(), (key, value) => {
-          return value && value.type === 'Buffer' ? Buffer.from(value.data) : value;
-        });
-      } catch (e) {
-        this.log.error('parse json failed: ' + buffer.toString());
-        throw Boom.boomify(e, { statusCode: 500 });
-      }
-    } else {
-      this.log.error(
-        `received ${res.statusCode} from ${baseUrl}/${path}, params was ${util.inspect(
-          payload.params
-        )}`
-      );
-      const body: Boom.Payload = await Wreck.read(res, { json: true });
-      throw new Boom(body.message, { statusCode: res.statusCode || 500, data: body.error });
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/resource_locator.ts b/x-pack/legacy/plugins/code/server/distributed/resource_locator.ts
deleted file mode 100644
index 287e36982cbfd7..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/resource_locator.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest } from 'src/core/server';
-import { RequestContext } from './service_definition';
-
-export interface Endpoint {
-  toContext(): RequestContext;
-}
-
-export interface ResourceLocator {
-  locate(req: KibanaRequest, resource: string): Promise<Endpoint>;
-
-  /**
-   * Returns whether the resource resides on the local node. This should support both url and uri of the repository.
-   *
-   * @param resource the name of the resource.
-   */
-  isResourceLocal(resource: string): Promise<boolean>;
-
-  /**
-   * Allocates the resource to nodes and returns the endpoint corresponds to the allocated node.
-   * If the resource cannot be allocated to any node, it returns undefined.
-   */
-  allocate(req: KibanaRequest, resource: string): Promise<Endpoint | undefined>;
-}
diff --git a/x-pack/legacy/plugins/code/server/distributed/service_definition.ts b/x-pack/legacy/plugins/code/server/distributed/service_definition.ts
deleted file mode 100644
index a3aa6643c76d00..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/service_definition.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Endpoint } from './resource_locator';
-
-export interface ServiceDefinition {
-  [method: string]: { request: any; response: any; routePath?: string };
-}
-
-export type MethodsFor<serviceDefinition extends ServiceDefinition> = Extract<
-  keyof serviceDefinition,
-  string
->;
-
-export type MethodHandler<
-  serviceDefinition extends ServiceDefinition,
-  method extends MethodsFor<serviceDefinition>
-> = (
-  request: RequestFor<serviceDefinition, method>,
-  context: RequestContext
-) => Promise<ResponseFor<serviceDefinition, method>>;
-
-export type ServiceHandlerFor<serviceDefinition extends ServiceDefinition> = {
-  [method in MethodsFor<serviceDefinition>]: MethodHandler<serviceDefinition, method>;
-};
-
-export type RequestFor<
-  serviceDefinition extends ServiceDefinition,
-  method extends MethodsFor<serviceDefinition>
-> = serviceDefinition[method]['request'];
-
-export type ResponseFor<
-  serviceDefinition extends ServiceDefinition,
-  method extends MethodsFor<serviceDefinition>
-> = serviceDefinition[method]['response'];
-
-export interface RequestContext {
-  path: string;
-  resource: string;
-}
-
-export type ServiceMethodMap<serviceDefinition extends ServiceDefinition> = {
-  [method in MethodsFor<serviceDefinition>]: ServiceMethod<serviceDefinition, method>;
-};
-
-export type ServiceMethod<
-  serviceDefinition extends ServiceDefinition,
-  method extends MethodsFor<serviceDefinition>
-> = (
-  endpoint: Endpoint,
-  request: RequestFor<serviceDefinition, method>
-) => Promise<ResponseFor<serviceDefinition, method>>;
diff --git a/x-pack/legacy/plugins/code/server/distributed/service_handler_adapter.ts b/x-pack/legacy/plugins/code/server/distributed/service_handler_adapter.ts
deleted file mode 100644
index be19d052b39bde..00000000000000
--- a/x-pack/legacy/plugins/code/server/distributed/service_handler_adapter.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 { ServiceDefinition, ServiceHandlerFor, ServiceMethodMap } from './service_definition';
-import { ResourceLocator } from './resource_locator';
-
-export interface ServiceRegisterOptions {
-  routePrefix?: string;
-}
-
-export const DEFAULT_SERVICE_OPTION: ServiceRegisterOptions = {
-  routePrefix: '/api/code/internal',
-};
-
-export interface ServiceHandlerAdapter {
-  locator: ResourceLocator;
-  getService<DEF extends ServiceDefinition>(serviceDefinition: DEF): ServiceMethodMap<DEF>;
-  registerHandler<DEF extends ServiceDefinition>(
-    serviceDefinition: DEF,
-    serviceHandler: ServiceHandlerFor<DEF> | null,
-    options: ServiceRegisterOptions
-  ): ServiceMethodMap<DEF>;
-  start(): Promise<void>;
-  stop(): Promise<void>;
-}
diff --git a/x-pack/legacy/plugins/code/server/git_operations.ts b/x-pack/legacy/plugins/code/server/git_operations.ts
deleted file mode 100644
index f8e9dc5e589a0f..00000000000000
--- a/x-pack/legacy/plugins/code/server/git_operations.ts
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/* eslint-disable @typescript-eslint/camelcase */
-
-import { FileItem, LsTreeSummary, simplegit, SimpleGit } from '@elastic/simple-git/dist';
-import Boom from 'boom';
-import * as Path from 'path';
-import * as fs from 'fs';
-import { isBinaryFileSync } from 'isbinaryfile';
-import { BlameSummary, DiffResultTextFile } from '@elastic/simple-git/dist/response';
-import moment from 'moment';
-import { GitBlame } from '../common/git_blame';
-import { CommitDiff, Diff, DiffKind } from '../common/git_diff';
-import { FileTree, FileTreeItemType, RepositoryUri } from '../model';
-import { CommitInfo, ReferenceInfo, ReferenceType } from '../model/commit';
-import { detectLanguage } from './utils/detect_language';
-import { FormatParser } from './utils/format_parser';
-
-export const HEAD = 'HEAD';
-export const DEFAULT_TREE_CHILDREN_LIMIT = 50;
-
-export interface Blob {
-  isBinary(): boolean;
-  content(): Buffer;
-  rawsize(): number;
-}
-
-function entry2Tree(entry: FileItem, prefixPath: string = ''): FileTree {
-  const type: FileTreeItemType = GitOperations.mode2type(entry.mode);
-  const { path, id } = entry;
-  return {
-    name: path,
-    path: prefixPath ? prefixPath + '/' + path : path,
-    sha1: id,
-    type,
-  };
-}
-
-interface Tree {
-  entries: FileItem[];
-  oid: string;
-}
-export class GitOperations {
-  private repoRoot: string;
-
-  constructor(repoRoot: string) {
-    this.repoRoot = repoRoot;
-  }
-
-  public async fileContent(uri: RepositoryUri, path: string, revision: string = 'master') {
-    const git = await this.openGit(uri);
-    const commit: CommitInfo = await this.getCommitOr404(uri, revision);
-    const p = `${commit.id}:${path}`;
-
-    const type = await git.catFile(['-t', p]);
-    if (type.trim() === 'blob') {
-      const buffer: Buffer = await git.binaryCatFile(['blob', p]);
-      return {
-        content(): Buffer {
-          return buffer;
-        },
-        rawsize(): number {
-          return buffer.length;
-        },
-        isBinary(): boolean {
-          return isBinaryFileSync(buffer);
-        },
-      } as Blob;
-    } else {
-      throw Boom.unsupportedMediaType(`${uri}/${path} is not a file.`);
-    }
-  }
-
-  public async getDefaultBranch(uri: RepositoryUri): Promise<string> {
-    const git = await this.openGit(uri);
-    return (await git.raw(['symbolic-ref', HEAD, '--short'])).trim();
-  }
-
-  public async getHeadRevision(uri: RepositoryUri): Promise<string> {
-    return await this.getRevision(uri, HEAD);
-  }
-
-  public async getRevision(uri: RepositoryUri, ref: string): Promise<string> {
-    const git = await this.openGit(uri);
-    return await git.revparse([ref]);
-  }
-
-  public async blame(uri: RepositoryUri, revision: string, path: string): Promise<GitBlame[]> {
-    const git = await this.openGit(uri);
-    const blameSummary: BlameSummary = await git.blame(revision, path);
-    const results: GitBlame[] = [];
-    for (const blame of blameSummary.blames) {
-      results.push({
-        committer: {
-          name: blame.commit.author!.name,
-          email: blame.commit.author!.email,
-        },
-        startLine: blame.resultLine,
-        lines: blame.lines,
-        commit: {
-          id: blame.commit.id!,
-          message: blame.commit.message!,
-          date: moment
-            .unix(blame.commit.author!.time)
-            .utcOffset(blame.commit.author!.tz)
-            .toISOString(true),
-        },
-      });
-    }
-    return results;
-  }
-
-  public async openGit(uri: RepositoryUri, check: boolean = true): Promise<SimpleGit> {
-    const repoDir = this.repoDir(uri);
-    const git = simplegit(repoDir);
-    if (!check) return git;
-    if (await git.checkIsRepo()) {
-      return git;
-    } else {
-      throw Boom.notFound(`repo ${uri} not found`);
-    }
-  }
-
-  private repoDir(uri: RepositoryUri) {
-    const repoDir = Path.join(this.repoRoot, uri);
-    this.checkPath(repoDir);
-    return repoDir;
-  }
-
-  private checkPath(path: string) {
-    if (!fs.realpathSync(path).startsWith(fs.realpathSync(this.repoRoot))) {
-      throw new Error('invalid path');
-    }
-  }
-
-  public async countRepoFiles(uri: RepositoryUri, revision: string): Promise<number> {
-    const git = await this.openGit(uri);
-    const ls = new LsTreeSummary(git, revision, '.', { recursive: true });
-    return (await ls.allFiles()).length;
-  }
-
-  public async *iterateRepo(uri: RepositoryUri, revision: string) {
-    const git = await this.openGit(uri);
-    const ls = new LsTreeSummary(git, revision, '.', { showSize: true, recursive: true });
-    for await (const file of ls.iterator()) {
-      const type = GitOperations.mode2type(file.mode);
-      if (type === FileTreeItemType.File) {
-        yield file;
-      }
-    }
-  }
-
-  public async readTree(git: SimpleGit, oid: string, path: string = '.'): Promise<Tree> {
-    const lsTree = new LsTreeSummary(git, oid, path, {});
-    const entries = await lsTree.allFiles();
-    return {
-      entries,
-      oid,
-    } as Tree;
-  }
-
-  public static mode2type(mode: string): FileTreeItemType {
-    switch (mode) {
-      case '100755':
-      case '100644':
-        return FileTreeItemType.File;
-      case '120000':
-        return FileTreeItemType.Link;
-      case '40000':
-      case '040000':
-        return FileTreeItemType.Directory;
-      case '160000':
-        return FileTreeItemType.Submodule;
-      default:
-        throw new Error('unknown mode: ' + mode);
-    }
-  }
-
-  /**
-   * Return a fileTree structure by walking the repo file tree.
-   * @param uri the repo uri
-   * @param path the start path
-   * @param revision the revision
-   * @param skip pagination parameter, skip how many nodes in each children.
-   * @param limit pagination parameter, limit the number of node's children.
-   * @param resolveParents whether the return value should always start from root
-   * @param flatten
-   */
-  public async fileTree(
-    uri: RepositoryUri,
-    path: string,
-    revision: string = HEAD,
-    skip: number = 0,
-    limit: number = DEFAULT_TREE_CHILDREN_LIMIT,
-    resolveParents: boolean = false,
-    flatten: boolean = false
-  ): Promise<FileTree> {
-    const commit = await this.getCommitOr404(uri, revision);
-    const git = await this.openGit(uri);
-    if (path.startsWith('/')) {
-      path = path.slice(1);
-    }
-    if (path.endsWith('/')) {
-      path = path.slice(0, -1);
-    }
-
-    function type2item(type: string) {
-      switch (type) {
-        case 'blob':
-          return FileTreeItemType.File;
-        case 'tree':
-          return FileTreeItemType.Directory;
-        case 'commit':
-          return FileTreeItemType.Submodule;
-        default:
-          throw new Error(`unsupported file tree item type ${type}`);
-      }
-    }
-
-    if (resolveParents) {
-      const root: FileTree = {
-        name: '',
-        path: '',
-        type: FileTreeItemType.Directory,
-      };
-      const tree = await this.readTree(git, commit.treeId);
-      await this.fillChildren(git, root, tree, { skip, limit, flatten });
-      if (path) {
-        await this.resolvePath(git, root, tree, path.split('/'), { skip, limit, flatten });
-      }
-      return root;
-    } else {
-      if (path) {
-        const file = (await this.readTree(git, commit.id, path)).entries[0];
-        const result: FileTree = {
-          name: path.split('/').pop() || '',
-          path,
-          type: type2item(file.type!),
-          sha1: file.id,
-        };
-        if (file.type === 'tree') {
-          await this.fillChildren(git, result, await this.readTree(git, file.id), {
-            skip,
-            limit,
-            flatten,
-          });
-        }
-        return result;
-      } else {
-        const root: FileTree = {
-          name: '',
-          path: '',
-          type: FileTreeItemType.Directory,
-        };
-        const tree = await this.readTree(git, commit.id, '.');
-        await this.fillChildren(git, root, tree, { skip, limit, flatten });
-        return root;
-      }
-    }
-  }
-
-  private async fillChildren(
-    git: SimpleGit,
-    result: FileTree,
-    { entries }: Tree,
-    { skip, limit, flatten }: { skip: number; limit: number; flatten: boolean }
-  ) {
-    result.childrenCount = entries.length;
-    result.children = [];
-    for (const e of entries.slice(skip, Math.min(entries.length, skip + limit))) {
-      const child = entry2Tree(e, result.path);
-      result.children.push(child);
-      if (flatten && child.type === FileTreeItemType.Directory) {
-        const tree = await this.readTree(git, e.id);
-        if (tree.entries.length === 1) {
-          await this.fillChildren(git, child, tree, { skip, limit, flatten });
-        }
-      }
-    }
-  }
-
-  private async resolvePath(
-    git: SimpleGit,
-    result: FileTree,
-    tree: Tree,
-    paths: string[],
-    opt: { skip: number; limit: number; flatten: boolean }
-  ) {
-    const [path, ...rest] = paths;
-    for (const entry of tree.entries) {
-      if (entry.path === path) {
-        if (!result.children) {
-          result.children = [];
-        }
-        const child = entry2Tree(entry, result.path);
-        const idx = result.children.findIndex(i => i.sha1 === entry.id);
-        if (idx < 0) {
-          result.children.push(child);
-        } else {
-          result.children[idx] = child;
-        }
-        if (entry.type === 'tree') {
-          const subTree = await this.readTree(git, entry.id);
-          await this.fillChildren(git, child, subTree, opt);
-          if (rest.length > 0) {
-            await this.resolvePath(git, child, subTree, rest, opt);
-          }
-        }
-      }
-    }
-  }
-
-  public async getCommitDiff(uri: string, revision: string): Promise<CommitDiff> {
-    const git = await this.openGit(uri);
-    const commit = await this.getCommitOr404(uri, revision);
-    if (!revision.includes('..')) {
-      revision = `${revision}~1..${revision}`;
-    }
-    const diffs = await git.diffSummary([revision]);
-
-    const commitDiff: CommitDiff = {
-      commit,
-      additions: diffs.insertions,
-      deletions: diffs.deletions,
-      files: [],
-    };
-    for (const d of diffs.files) {
-      if (!d.binary) {
-        const diff = d as DiffResultTextFile;
-        const kind = this.diffKind(diff);
-        switch (kind) {
-          case DiffKind.ADDED:
-            {
-              const path = diff.file;
-              const modifiedCode = await this.getModifiedCode(git, commit, path);
-              const language = await detectLanguage(path, modifiedCode);
-              commitDiff.files.push({
-                language,
-                path,
-                modifiedCode,
-                additions: diff.insertions,
-                deletions: diff.deletions,
-                kind,
-              });
-            }
-            break;
-          case DiffKind.DELETED:
-            {
-              const path = diff.file;
-              const originCode = await this.getOriginCode(git, commit, path);
-              const language = await detectLanguage(path, originCode);
-              commitDiff.files.push({
-                language,
-                path,
-                originCode,
-                kind,
-                additions: diff.insertions,
-                deletions: diff.deletions,
-              });
-            }
-            break;
-          case DiffKind.MODIFIED:
-            {
-              const path = diff.rename || diff.file;
-              const modifiedCode = await this.getModifiedCode(git, commit, path);
-              const originPath = diff.file;
-              const originCode = await this.getOriginCode(git, commit, originPath);
-              const language = await detectLanguage(path, modifiedCode);
-              commitDiff.files.push({
-                language,
-                path,
-                originPath,
-                originCode,
-                modifiedCode,
-                kind,
-                additions: diff.insertions,
-                deletions: diff.deletions,
-              });
-            }
-            break;
-          case DiffKind.RENAMED:
-            {
-              const path = diff.rename || diff.file;
-              commitDiff.files.push({
-                path,
-                originPath: diff.file,
-                kind,
-                additions: diff.insertions,
-                deletions: diff.deletions,
-              });
-            }
-            break;
-        }
-      }
-    }
-    return commitDiff;
-  }
-
-  public async getDiff(uri: string, oldRevision: string, newRevision: string): Promise<Diff> {
-    const git = await this.openGit(uri);
-    const diff = await git.diffSummary([oldRevision, newRevision]);
-    const res: Diff = {
-      additions: diff.insertions,
-      deletions: diff.deletions,
-      files: [],
-    };
-    diff.files.forEach(d => {
-      if (!d.binary) {
-        const td = d as DiffResultTextFile;
-        const kind = this.diffKind(td);
-        res.files.push({
-          path: d.file,
-          additions: td.insertions,
-          deletions: td.deletions,
-          kind,
-        });
-      }
-    });
-
-    return res;
-  }
-
-  private diffKind(diff: DiffResultTextFile) {
-    let kind: DiffKind = DiffKind.MODIFIED;
-    if (diff.changes === diff.insertions) {
-      kind = DiffKind.ADDED;
-    } else if (diff.changes === diff.deletions) {
-      kind = DiffKind.DELETED;
-    } else if (diff.rename) {
-      kind = DiffKind.RENAMED;
-    }
-    return kind;
-  }
-
-  private async getOriginCode(git: SimpleGit, commit: CommitInfo, path: string) {
-    const buffer: Buffer = await git.binaryCatFile(['blob', `${commit.id}~1:${path}`]);
-    return buffer.toString('utf8');
-  }
-
-  private async getModifiedCode(git: SimpleGit, commit: CommitInfo, path: string) {
-    const buffer: Buffer = await git.binaryCatFile(['blob', `${commit.id}:${path}`]);
-    return buffer.toString('utf8');
-  }
-
-  public async getBranchAndTags(repoUri: string): Promise<ReferenceInfo[]> {
-    const format = {
-      name: '%(refname:short)',
-      reference: '%(refname)',
-      type: '%(objecttype)',
-      commit: {
-        updated: '%(*authordate)',
-        message: '%(*contents)',
-        committer: '%(*committername)',
-        author: '%(*authorname)',
-        id: '%(*objectname)',
-        parents: '%(*parent)',
-        treeId: '%(*tree)',
-      },
-    };
-    const parser = new FormatParser(format);
-    const git = await this.openGit(repoUri);
-    const result = await git.raw([
-      'for-each-ref',
-      '--format=' + parser.toFormatStr(),
-      'refs/tags/*',
-      'refs/remotes/origin/*',
-    ]);
-    const results = parser.parseResult(result);
-    return results.map(r => {
-      const ref: ReferenceInfo = {
-        name: r.name.startsWith('origin/') ? r.name.slice(7) : r.name,
-        reference: r.reference,
-        type: r.type === 'tag' ? ReferenceType.TAG : ReferenceType.REMOTE_BRANCH,
-      };
-      if (r.commit && r.commit.id) {
-        const commit = {
-          ...r.commit,
-        };
-        commit.parents = r.commit.parents ? r.commit.parents.split(' ') : [];
-        commit.updated = new Date(r.commit.updated);
-        ref.commit = commit;
-      }
-      return ref;
-    });
-  }
-
-  public async getCommitOr404(repoUri: string, ref: string): Promise<CommitInfo> {
-    const commit = await this.getCommitInfo(repoUri, ref);
-    if (!commit) {
-      throw Boom.notFound(`repo ${repoUri} or ${ref} not found`);
-    }
-    return commit;
-  }
-
-  public async log(
-    repoUri: string,
-    revision: string,
-    count: number,
-    path?: string
-  ): Promise<CommitInfo[]> {
-    const git = await this.openGit(repoUri);
-    const options: any = {
-      n: count,
-      format: {
-        updated: '%aI',
-        message: '%B',
-        author: '%an',
-        authorEmail: '%ae',
-        committer: '%cn',
-        committerEmail: '%ce',
-        id: '%H',
-        parents: '%p',
-        treeId: '%T',
-      },
-      from: revision,
-    };
-    if (path) {
-      options.file = path;
-    }
-    const result = await git.log(options);
-    return (result.all as unknown) as CommitInfo[];
-  }
-
-  public async resolveRef(repoUri: string, ref: string): Promise<string | null> {
-    const git = await this.openGit(repoUri);
-    let oid = '';
-
-    try {
-      // try local branches or tags
-      oid = (await git.revparse(['-q', '--verify', ref])).trim();
-    } catch (e) {
-      // try remote branches
-    }
-    if (!oid) {
-      try {
-        oid = (await git.revparse(['-q', '--verify', `origin/${ref}`])).trim();
-      } catch (e1) {
-        // no match
-      }
-    }
-    return oid || null;
-  }
-
-  public async getCommitInfo(repoUri: string, ref: string): Promise<CommitInfo | null> {
-    const oid = await this.resolveRef(repoUri, ref);
-    if (oid) {
-      const commits = await this.log(repoUri, oid, 1);
-      if (commits.length > 0) {
-        return commits[0];
-      }
-    }
-    return null;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/index.ts b/x-pack/legacy/plugins/code/server/index.ts
deleted file mode 100644
index 61ed0c0c5a58cc..00000000000000
--- a/x-pack/legacy/plugins/code/server/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as constants from '../common/constants';
-import { CodePlugin } from './plugin';
-import { PluginSetupContract } from '../../../../plugins/code/server/index';
-
-export const codePlugin = (initializerContext: PluginSetupContract) =>
-  new CodePlugin(initializerContext);
-
-export { constants };
diff --git a/x-pack/legacy/plugins/code/server/indexer/abstract_indexer.ts b/x-pack/legacy/plugins/code/server/indexer/abstract_indexer.ts
deleted file mode 100644
index 66223b7abb529e..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/abstract_indexer.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import moment from 'moment';
-
-import { Indexer, ProgressReporter } from '.';
-import {
-  IndexProgress,
-  IndexRequest,
-  IndexStats,
-  IndexStatsKey,
-  IndexerType,
-  RepositoryUri,
-} from '../../model';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { aggregateIndexStats } from '../utils/index_stats_aggregator';
-import { IndexCreationRequest } from './index_creation_request';
-import { IndexCreator } from './index_creator';
-
-export abstract class AbstractIndexer implements Indexer {
-  public type: IndexerType = IndexerType.UNKNOWN;
-  protected cancelled: boolean = false;
-  protected indexCreator: IndexCreator;
-  protected INDEXER_PROGRESS_UPDATE_INTERVAL_MS = 1000;
-
-  constructor(
-    protected readonly repoUri: RepositoryUri,
-    protected readonly revision: string,
-    protected readonly client: EsClient,
-    protected log: Logger
-  ) {
-    this.log = log.addTags(['indexer', this.type]);
-    this.indexCreator = new IndexCreator(client);
-  }
-
-  public async start(progressReporter?: ProgressReporter, checkpointReq?: IndexRequest) {
-    this.log.info(
-      `Indexer ${this.type} started for repo ${this.repoUri} with revision ${this.revision}`
-    );
-    const isCheckpointValid = this.validateCheckpoint(checkpointReq);
-
-    if (this.needRefreshIndices(checkpointReq)) {
-      // Prepare the ES index
-      const res = await this.prepareIndex();
-      if (!res) {
-        this.log.error(`Prepare index for ${this.repoUri} error. Skip indexing.`);
-        return new Map<IndexStatsKey, number>();
-      }
-
-      // Clean up the index if necessary
-      await this.cleanIndex();
-    }
-
-    // Prepare all the index requests
-    let totalCount = 0;
-    let prevTimestamp = moment(0);
-    let successCount = 0;
-    let failCount = 0;
-    const statsBuffer: IndexStats[] = [];
-
-    try {
-      totalCount = await this.getIndexRequestCount();
-    } catch (error) {
-      this.log.error(`Get index request count for ${this.repoUri} error.`);
-      this.log.error(error);
-      throw error;
-    }
-
-    let meetCheckpoint = false;
-    const reqsIterator = await this.getIndexRequestIterator();
-    for await (const req of reqsIterator) {
-      if (this.isCancelled()) {
-        this.log.info(`Indexer cancelled. Stop right now.`);
-        break;
-      }
-
-      // If checkpoint is valid and has not been met
-      if (isCheckpointValid && !meetCheckpoint) {
-        meetCheckpoint = meetCheckpoint || this.ifCheckpointMet(req, checkpointReq!);
-        if (!meetCheckpoint) {
-          // If the checkpoint has not been met yet, skip current request.
-          continue;
-        } else {
-          this.log.info(`Checkpoint met. Continue with indexing.`);
-        }
-      }
-
-      try {
-        const stats = await this.processRequest(req);
-        statsBuffer.push(stats);
-        successCount += 1;
-      } catch (error) {
-        this.log.error(`Process index request error. ${error}`);
-        failCount += 1;
-      }
-
-      // Double check if the the indexer is cancelled or not, because the
-      // processRequest process could take fairly long and during this time
-      // the index job might have been cancelled already. In this case,
-      // we shall not update the progress.
-      if (!this.isCancelled() && progressReporter) {
-        this.log.debug(`Update progress for ${this.type} indexer.`);
-        // Update progress if progress reporter has been provided.
-        const progress: IndexProgress = {
-          type: this.type,
-          total: totalCount,
-          success: successCount,
-          fail: failCount,
-          percentage: Math.floor((100 * (successCount + failCount)) / totalCount),
-          checkpoint: req,
-        };
-        if (
-          moment().diff(prevTimestamp) > this.INDEXER_PROGRESS_UPDATE_INTERVAL_MS ||
-          // Ensure that the progress reporter always executed at the end of the job.
-          successCount + failCount === totalCount
-        ) {
-          progressReporter(progress);
-          prevTimestamp = moment();
-        }
-      }
-    }
-    return aggregateIndexStats(statsBuffer);
-  }
-
-  public cancel() {
-    this.cancelled = true;
-  }
-
-  protected isCancelled(): boolean {
-    return this.cancelled;
-  }
-
-  // If the current checkpoint is valid
-  protected validateCheckpoint(checkpointReq?: IndexRequest): boolean {
-    return checkpointReq !== undefined;
-  }
-
-  // If it's necessary to refresh (create and reset) all the related indices
-  protected needRefreshIndices(checkpointReq?: IndexRequest): boolean {
-    return false;
-  }
-
-  protected ifCheckpointMet(req: IndexRequest, checkpointReq: IndexRequest): boolean {
-    // Please override this function
-    return false;
-  }
-
-  protected async cleanIndex(): Promise<void> {
-    // This is the abstract implementation. You should override this.
-    return new Promise<void>((resolve, reject) => {
-      resolve();
-    });
-  }
-
-  protected async *getIndexRequestIterator(): AsyncIterableIterator<IndexRequest> {
-    // This is the abstract implementation. You should override this.
-  }
-
-  protected async getIndexRequestCount(): Promise<number> {
-    // This is the abstract implementation. You should override this.
-    return new Promise<number>((resolve, reject) => {
-      resolve();
-    });
-  }
-
-  protected async processRequest(request: IndexRequest): Promise<IndexStats> {
-    // This is the abstract implementation. You should override this.
-    return new Promise<IndexStats>((resolve, reject) => {
-      resolve();
-    });
-  }
-
-  protected async prepareIndexCreationRequests(): Promise<IndexCreationRequest[]> {
-    // This is the abstract implementation. You should override this.
-    return new Promise<IndexCreationRequest[]>((resolve, reject) => {
-      resolve();
-    });
-  }
-
-  protected async prepareIndex() {
-    const creationReqs = await this.prepareIndexCreationRequests();
-    for (const req of creationReqs) {
-      try {
-        const res = await this.indexCreator.createIndex(req);
-        if (!res) {
-          this.log.info(`Index creation failed for ${req.index}.`);
-          return false;
-        }
-      } catch (error) {
-        this.log.error(`Index creation error.`);
-        this.log.error(error);
-        return false;
-      }
-    }
-    return true;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/batch_index_helper.test.ts b/x-pack/legacy/plugins/code/server/indexer/batch_index_helper.test.ts
deleted file mode 100644
index 9ba3f610126696..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/batch_index_helper.test.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import sinon from 'sinon';
-
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { BatchIndexHelper } from './batch_index_helper';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const BATCH_INDEX_SIZE = 5;
-
-const esClient = {
-  bulk: emptyAsyncFunc,
-};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Execute bulk index.', async () => {
-  // Setup the bulk stub
-  const bulkSpy = sinon.spy();
-  esClient.bulk = bulkSpy;
-
-  const batchIndexHelper = new BatchIndexHelper(esClient as EsClient, log, BATCH_INDEX_SIZE);
-
-  // Submit index requests as many as 2 batches.
-  for (let i = 0; i < BATCH_INDEX_SIZE * 2; i++) {
-    await batchIndexHelper.index('mockindex', {});
-  }
-
-  expect(bulkSpy.calledTwice).toBeTruthy();
-});
-
-test('Do not execute bulk index without enough requests.', async () => {
-  // Setup the bulk stub
-  const bulkSpy = sinon.spy();
-  esClient.bulk = bulkSpy;
-
-  const batchIndexHelper = new BatchIndexHelper(esClient as EsClient, log, BATCH_INDEX_SIZE);
-
-  // Submit index requests less than one batch.
-  for (let i = 0; i < BATCH_INDEX_SIZE - 1; i++) {
-    await batchIndexHelper.index('mockindex', {});
-  }
-
-  expect(bulkSpy.notCalled).toBeTruthy();
-});
-
-test('Skip bulk index if cancelled.', async () => {
-  // Setup the bulk stub
-  const bulkSpy = sinon.spy();
-  esClient.bulk = bulkSpy;
-
-  const batchIndexHelper = new BatchIndexHelper(esClient as EsClient, log, BATCH_INDEX_SIZE);
-  batchIndexHelper.cancel();
-
-  // Submit index requests more than one batch.
-  for (let i = 0; i < BATCH_INDEX_SIZE + 1; i++) {
-    await batchIndexHelper.index('mockindex', {});
-  }
-
-  expect(bulkSpy.notCalled).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/server/indexer/batch_index_helper.ts b/x-pack/legacy/plugins/code/server/indexer/batch_index_helper.ts
deleted file mode 100644
index 807690d4ed7ce5..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/batch_index_helper.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-
-/*
- * This BatchIndexHelper acts as the index request cache for elasticsearch
- * bulk index API.
- */
-export class BatchIndexHelper {
-  public static DEFAULT_BATCH_SIZE = 1000;
-  private batch: any[];
-  private cancelled: boolean = false;
-
-  constructor(
-    protected readonly client: EsClient,
-    protected readonly log: Logger,
-    private batchSize: number = BatchIndexHelper.DEFAULT_BATCH_SIZE
-  ) {
-    this.batch = [];
-  }
-
-  public async index(index: string, body: any) {
-    if (this.isCancelled()) {
-      this.log.debug(`Batch index helper is cancelled. Skip.`);
-      return;
-    }
-    this.batch.push({
-      index: {
-        _index: index,
-      },
-    });
-    this.batch.push(body);
-    if (this.batch.length >= this.batchSize * 2) {
-      return await this.flush();
-    }
-  }
-
-  public async flush() {
-    if (this.batch.length === 0) {
-      this.log.debug(`0 index requests found. Skip.`);
-      return;
-    }
-    if (this.isCancelled()) {
-      this.log.debug(`Batch index helper is cancelled. Skip.`);
-      return;
-    }
-    try {
-      this.log.debug(`Batch indexed ${this.batch.length / 2} documents.`);
-      return await this.client.bulk({ body: this.batch });
-    } catch (error) {
-      // TODO(mengwei): should we throw this exception again?
-      this.log.error(`Batch index ${this.batch.length / 2} documents error. Skip.`);
-      this.log.error(error);
-    } finally {
-      this.batch = [];
-    }
-  }
-
-  public isCancelled() {
-    return this.cancelled;
-  }
-
-  public cancel() {
-    this.cancelled = true;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/commit_indexer.ts b/x-pack/legacy/plugins/code/server/indexer/commit_indexer.ts
deleted file mode 100644
index 3399e5238cb813..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/commit_indexer.ts
+++ /dev/null
@@ -1,161 +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 { ProgressReporter } from '.';
-import {
-  Commit,
-  CommitIndexRequest,
-  IndexStats,
-  IndexStatsKey,
-  IndexerType,
-  RepositoryUri,
-} from '../../model';
-import { GitOperations, HEAD } from '../git_operations';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { AbstractIndexer } from './abstract_indexer';
-import { BatchIndexHelper } from './batch_index_helper';
-import { getCommitIndexCreationRequest } from './index_creation_request';
-import { CommitIndexName } from './schema';
-
-// TODO: implement an incremental commit indexer.
-export class CommitIndexer extends AbstractIndexer {
-  public type: IndexerType = IndexerType.COMMIT;
-  // Batch index helper for commits
-  protected commitBatchIndexHelper: BatchIndexHelper;
-
-  private COMMIT_BATCH_INDEX_SIZE = 1000;
-
-  constructor(
-    protected readonly repoUri: RepositoryUri,
-    protected readonly revision: string,
-    protected readonly gitOps: GitOperations,
-    protected readonly client: EsClient,
-    protected log: Logger
-  ) {
-    super(repoUri, revision, client, log);
-    this.commitBatchIndexHelper = new BatchIndexHelper(client, log, this.COMMIT_BATCH_INDEX_SIZE);
-  }
-
-  public async start(progressReporter?: ProgressReporter, checkpointReq?: CommitIndexRequest) {
-    try {
-      return await super.start(progressReporter, checkpointReq);
-    } finally {
-      if (!this.isCancelled()) {
-        // Flush all the index request still in the cache for bulk index.
-        this.commitBatchIndexHelper.flush();
-      }
-    }
-  }
-
-  public cancel() {
-    this.commitBatchIndexHelper.cancel();
-    super.cancel();
-  }
-
-  // If the current checkpoint is valid
-  protected validateCheckpoint(checkpointReq?: CommitIndexRequest): boolean {
-    // Up to change when integrate with the actual git api.
-    return checkpointReq !== undefined && checkpointReq.revision === this.revision;
-  }
-
-  // If it's necessary to refresh (create and reset) all the related indices
-  protected needRefreshIndices(checkpointReq?: CommitIndexRequest): boolean {
-    // If it's not resumed from a checkpoint, then try to refresh all the indices.
-    return !this.validateCheckpoint(checkpointReq);
-  }
-
-  protected ifCheckpointMet(req: CommitIndexRequest, checkpointReq: CommitIndexRequest): boolean {
-    // Assume for the same revision, the order of the files we iterate the repository is definite
-    // everytime. This is up to change when integrate with the actual git api.
-    return req.commit.id === checkpointReq.commit.id;
-  }
-
-  protected async prepareIndexCreationRequests() {
-    return [getCommitIndexCreationRequest(this.repoUri)];
-  }
-
-  protected async *getIndexRequestIterator(): AsyncIterableIterator<CommitIndexRequest> {
-    if (!this.commits) {
-      return;
-    }
-    try {
-      for await (const commit of this.commits) {
-        const req: CommitIndexRequest = {
-          repoUri: this.repoUri,
-          revision: this.revision,
-          commit,
-        };
-        yield req;
-      }
-    } catch (error) {
-      this.log.error(`Prepare commit indexing requests error.`);
-      this.log.error(error);
-      throw error;
-    }
-  }
-
-  private commits: Commit[] | null = null;
-  protected async getIndexRequestCount(): Promise<number> {
-    try {
-      this.commits = (await this.gitOps.log(this.repoUri, HEAD, Number.MAX_SAFE_INTEGER)).map(c => {
-        const [message, ...body] = c.message.split('\n');
-        return {
-          author: {
-            name: c.author,
-            email: c.authorEmail,
-          },
-          committer: {
-            name: c.committer,
-            email: c.committer,
-          },
-          message,
-          parents: c.parents,
-          date: c.updated,
-          id: c.id,
-          body: body.join('\n'),
-        } as Commit;
-      });
-      return this.commits.length;
-    } catch (error) {
-      if (this.isCancelled()) {
-        this.log.debug(`Indexer ${this.type} got cancelled. Skip get index count error.`);
-        return 1;
-      } else {
-        this.log.error(`Get lsp index requests count error.`);
-        this.log.error(error);
-        throw error;
-      }
-    }
-  }
-
-  protected async cleanIndex() {
-    // Clean up all the commits in the commit index
-    try {
-      await this.client.deleteByQuery({
-        index: CommitIndexName(this.repoUri),
-        body: {
-          query: {
-            match_all: {},
-          },
-        },
-      });
-      this.log.info(`Clean up commits for ${this.repoUri} done.`);
-    } catch (error) {
-      this.log.error(`Clean up commits for ${this.repoUri} error.`);
-      this.log.error(error);
-    }
-  }
-
-  protected async processRequest(request: CommitIndexRequest): Promise<IndexStats> {
-    const stats: IndexStats = new Map<IndexStatsKey, number>().set(IndexStatsKey.Commit, 0);
-    const { repoUri, commit } = request;
-
-    await this.commitBatchIndexHelper.index(CommitIndexName(repoUri), commit);
-    stats.set(IndexStatsKey.Commit, 1);
-    return stats;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/commit_indexer_factory.ts b/x-pack/legacy/plugins/code/server/indexer/commit_indexer_factory.ts
deleted file mode 100644
index 0c63aeec926b28..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/commit_indexer_factory.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Indexer, IndexerFactory, CommitIndexer } from '.';
-import { RepositoryUri } from '../../model';
-import { GitOperations } from '../git_operations';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-
-export class CommitIndexerFactory implements IndexerFactory {
-  constructor(
-    protected readonly gitOps: GitOperations,
-    protected readonly client: EsClient,
-    protected readonly log: Logger
-  ) {}
-
-  public async create(
-    repoUri: RepositoryUri,
-    revision: string,
-    // Apply this param when the incremental indexer has been built.
-    enforcedReindex: boolean = false
-  ): Promise<Indexer | undefined> {
-    this.log.info(`Create indexer to index ${repoUri} commits`);
-    // Create the indexer to index the entire repository.
-    return new CommitIndexer(repoUri, revision, this.gitOps, this.client, this.log);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/es_exception.ts b/x-pack/legacy/plugins/code/server/indexer/es_exception.ts
deleted file mode 100644
index e0c3fdf5015cf3..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/es_exception.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export enum EsException {
-  INDEX_NOT_FOUND_EXCEPTION = 'index_not_found_exception',
-  RESOURCE_ALREADY_EXISTS_EXCEPTION = 'resource_already_exists_exception',
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/index.ts b/x-pack/legacy/plugins/code/server/indexer/index.ts
deleted file mode 100644
index 5b9933760f7cfd..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './commit_indexer';
-export * from './commit_indexer_factory';
-export * from './lsp_incremental_indexer';
-export * from './lsp_indexer';
-export * from './lsp_indexer_factory';
-export * from './indexer';
-export * from './index_creation_request';
-export * from './index_creator';
-export * from './index_migrator';
-export * from './index_version_controller';
-export * from './repository_index_initializer';
-export * from './repository_index_initializer_factory';
diff --git a/x-pack/legacy/plugins/code/server/indexer/index_creation_request.ts b/x-pack/legacy/plugins/code/server/indexer/index_creation_request.ts
deleted file mode 100644
index 032c6e79066932..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/index_creation_request.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RepositoryUri } from '../../model';
-import {
-  CommitIndexName,
-  CommitSchema,
-  DocumentAnalysisSettings,
-  DocumentIndexName,
-  DocumentSchema,
-  ReferenceIndexName,
-  ReferenceSchema,
-  SymbolAnalysisSettings,
-  SymbolIndexName,
-  SymbolSchema,
-} from './schema';
-
-export interface IndexCreationRequest {
-  index: string;
-  settings: any;
-  schema: any;
-}
-
-export const getDocumentIndexCreationRequest = (repoUri: RepositoryUri): IndexCreationRequest => {
-  return {
-    index: DocumentIndexName(repoUri),
-    settings: {
-      ...DocumentAnalysisSettings,
-      number_of_shards: 1,
-      auto_expand_replicas: '0-1',
-    },
-    schema: DocumentSchema,
-  };
-};
-
-export const getSymbolIndexCreationRequest = (repoUri: RepositoryUri): IndexCreationRequest => {
-  return {
-    index: SymbolIndexName(repoUri),
-    settings: {
-      ...SymbolAnalysisSettings,
-      number_of_shards: 1,
-      auto_expand_replicas: '0-1',
-    },
-    schema: SymbolSchema,
-  };
-};
-
-export const getReferenceIndexCreationRequest = (repoUri: RepositoryUri): IndexCreationRequest => {
-  return {
-    index: ReferenceIndexName(repoUri),
-    settings: {
-      number_of_shards: 1,
-      auto_expand_replicas: '0-1',
-    },
-    schema: ReferenceSchema,
-  };
-};
-
-export const getCommitIndexCreationRequest = (repoUri: RepositoryUri): IndexCreationRequest => {
-  return {
-    index: CommitIndexName(repoUri),
-    settings: {
-      number_of_shards: 1,
-      auto_expand_replicas: '0-1',
-    },
-    schema: CommitSchema,
-  };
-};
diff --git a/x-pack/legacy/plugins/code/server/indexer/index_creator.test.ts b/x-pack/legacy/plugins/code/server/indexer/index_creator.test.ts
deleted file mode 100644
index 3f89023e0b6302..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/index_creator.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import sinon from 'sinon';
-
-import { EsClient } from '../lib/esqueue';
-import { emptyAsyncFunc } from '../test_utils';
-import { IndexCreationRequest } from './index_creation_request';
-import { IndexCreator } from './index_creator';
-
-const esClient = {
-  indices: {
-    existsAlias: emptyAsyncFunc,
-    create: emptyAsyncFunc,
-    putAlias: emptyAsyncFunc,
-  },
-};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Create Alias and Index', async () => {
-  // Setup the esClient spies
-  const existsAliasSpy = sinon.fake.returns(false);
-  const createSpy = sinon.spy();
-  const putAliasSpy = sinon.spy();
-  esClient.indices.existsAlias = existsAliasSpy;
-  esClient.indices.create = createSpy;
-  esClient.indices.putAlias = putAliasSpy;
-
-  const indexCreator = new IndexCreator((esClient as any) as EsClient);
-  const req: IndexCreationRequest = {
-    index: 'mockindex',
-    settings: {},
-    schema: {},
-  };
-  await indexCreator.createIndex(req);
-
-  expect(existsAliasSpy.calledOnce).toBeTruthy();
-  expect(createSpy.calledOnce).toBeTruthy();
-  expect(putAliasSpy.calledOnce).toBeTruthy();
-  expect(createSpy.calledAfter(existsAliasSpy)).toBeTruthy();
-  expect(putAliasSpy.calledAfter(createSpy)).toBeTruthy();
-});
-
-test('Skip alias and index creation', async () => {
-  // Setup the esClient spies
-  const existsAliasSpy = sinon.fake.returns(true);
-  const createSpy = sinon.spy();
-  const putAliasSpy = sinon.spy();
-  esClient.indices.existsAlias = existsAliasSpy;
-  esClient.indices.create = createSpy;
-  esClient.indices.putAlias = putAliasSpy;
-
-  const indexCreator = new IndexCreator((esClient as any) as EsClient);
-  const req: IndexCreationRequest = {
-    index: 'mockindex',
-    settings: {},
-    schema: {},
-  };
-  await indexCreator.createIndex(req);
-
-  expect(existsAliasSpy.calledOnce).toBeTruthy();
-  expect(createSpy.notCalled).toBeTruthy();
-  expect(putAliasSpy.notCalled).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/server/indexer/index_creator.ts b/x-pack/legacy/plugins/code/server/indexer/index_creator.ts
deleted file mode 100644
index 917db9b601e6d2..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/index_creator.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EsClient } from '../lib/esqueue';
-import { IndexCreationRequest } from './index_creation_request';
-import pkg from './schema/version.json';
-
-/*
- * This IndexCreator deals with anything with elasticsearch index creation.
- */
-export class IndexCreator {
-  private version: number;
-
-  constructor(private readonly client: EsClient) {
-    this.version = Number(pkg.codeIndexVersion);
-  }
-
-  public async createIndex(request: IndexCreationRequest): Promise<boolean> {
-    const body = {
-      settings: request.settings,
-      mappings: {
-        // Apply the index version in the reserved _meta field of the index.
-        _meta: {
-          version: this.version,
-        },
-        dynamic_templates: [
-          {
-            fieldDefaultNotAnalyzed: {
-              match: '*',
-              mapping: {
-                index: false,
-                norms: false,
-              },
-            },
-          },
-        ],
-        properties: request.schema,
-      },
-    };
-
-    const exists = await this.client.indices.existsAlias({
-      name: request.index,
-    });
-    if (!exists) {
-      // Create the actual index first with the version as the index suffix number.
-      await this.client.indices.create({
-        index: `${request.index}-${this.version}`,
-        body,
-      });
-
-      // Create the alias to point the index just created.
-      await this.client.indices.putAlias({
-        index: `${request.index}-${this.version}`,
-        name: request.index,
-      });
-
-      return true;
-    }
-    return exists;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/index_migrator.test.ts b/x-pack/legacy/plugins/code/server/indexer/index_migrator.test.ts
deleted file mode 100644
index 2cb977b8cb9c01..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/index_migrator.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import sinon from 'sinon';
-
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { IndexCreationRequest } from './index_creation_request';
-import { IndexMigrator } from './index_migrator';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esClient = {
-  reindex: emptyAsyncFunc,
-  indices: {
-    create: emptyAsyncFunc,
-    updateAliases: emptyAsyncFunc,
-    delete: emptyAsyncFunc,
-  },
-};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Normal index migration steps.', async () => {
-  // Setup the esClient spies
-  const updateAliasesSpy = sinon.spy();
-  const createSpy = sinon.spy();
-  const deleteSpy = sinon.spy();
-  const reindexSpy = sinon.spy();
-  esClient.indices.updateAliases = updateAliasesSpy;
-  esClient.indices.create = createSpy;
-  esClient.indices.delete = deleteSpy;
-  esClient.reindex = reindexSpy;
-
-  const migrator = new IndexMigrator(esClient as EsClient, log);
-  const req: IndexCreationRequest = {
-    index: 'mockindex',
-    settings: {},
-    schema: {},
-  };
-  await migrator.migrateIndex('mockoldindex', req);
-
-  expect(createSpy.calledOnce).toBeTruthy();
-  expect(reindexSpy.calledOnce).toBeTruthy();
-  expect(updateAliasesSpy.calledOnce).toBeTruthy();
-  expect(deleteSpy.calledOnce).toBeTruthy();
-  expect(reindexSpy.calledAfter(createSpy)).toBeTruthy();
-  expect(updateAliasesSpy.calledAfter(reindexSpy)).toBeTruthy();
-  expect(deleteSpy.calledAfter(updateAliasesSpy)).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/server/indexer/index_migrator.ts b/x-pack/legacy/plugins/code/server/indexer/index_migrator.ts
deleted file mode 100644
index a3a8c4d5cbd720..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/index_migrator.ts
+++ /dev/null
@@ -1,156 +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 {
-  getDocumentIndexCreationRequest,
-  getReferenceIndexCreationRequest,
-  getSymbolIndexCreationRequest,
-  IndexCreationRequest,
-  IndexVersionController,
-} from '.';
-import { Repository } from '../../model';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { RepositoryObjectClient } from '../search';
-import { EsException } from './es_exception';
-import pkg from './schema/version.json';
-
-export class IndexMigrator {
-  private version: number;
-
-  constructor(private readonly client: EsClient, private readonly log: Logger) {
-    this.version = Number(pkg.codeIndexVersion);
-  }
-
-  public async migrateIndex(oldIndexName: string, request: IndexCreationRequest) {
-    const body = {
-      settings: request.settings,
-      mappings: {
-        // Apply the index version in the reserved _meta field of the index.
-        _meta: {
-          version: this.version,
-        },
-        dynamic_templates: [
-          {
-            fieldDefaultNotAnalyzed: {
-              match: '*',
-              mapping: {
-                index: false,
-                norms: false,
-              },
-            },
-          },
-        ],
-        properties: request.schema,
-      },
-    };
-
-    const newIndexName = `${request.index}-${this.version}`;
-
-    try {
-      try {
-        // Create the new index first with the version as the index suffix number.
-        await this.client.indices.create({
-          index: newIndexName,
-          body,
-        });
-      } catch (error) {
-        if (
-          error.body &&
-          error.body.error &&
-          error.body.error.type === EsException.RESOURCE_ALREADY_EXISTS_EXCEPTION
-        ) {
-          this.log.debug(`The target verion index already exists. Skip index migration`);
-          return;
-        } else {
-          this.log.error(`Create new index ${newIndexName} for index migration error.`);
-          this.log.error(error);
-          throw error;
-        }
-      }
-
-      try {
-        // Issue the reindex request for import the data from the old index.
-        await this.client.reindex({
-          body: {
-            source: {
-              index: oldIndexName,
-            },
-            dest: {
-              index: newIndexName,
-            },
-          },
-        });
-      } catch (error) {
-        this.log.error(
-          `Migrate data from ${oldIndexName} to ${newIndexName} for index migration error.`
-        );
-        this.log.error(error);
-        throw error;
-      }
-
-      try {
-        // Update the alias
-        await this.client.indices.updateAliases({
-          body: {
-            actions: [
-              {
-                remove: {
-                  index: oldIndexName,
-                  alias: request.index,
-                },
-              },
-              {
-                add: {
-                  index: newIndexName,
-                  alias: request.index,
-                },
-              },
-            ],
-          },
-        });
-      } catch (error) {
-        this.log.error(`Update the index alias for ${newIndexName} error.`);
-        this.log.error(error);
-        throw error;
-      }
-
-      try {
-        // Delete the old index
-        await this.client.indices.delete({ index: oldIndexName });
-      } catch (error) {
-        this.log.error(`Clean up the old index ${oldIndexName} error.`);
-        this.log.error(error);
-        // This won't affect serving, so do not throw the error anymore.
-      }
-    } catch (error) {
-      this.log.error(`Index upgrade/migration to version ${this.version} failed.`);
-      this.log.error(error);
-    }
-  }
-}
-
-export const tryMigrateIndices = async (client: EsClient, log: Logger) => {
-  log.info('Check the versions of Code indices...');
-  const repoObjectClient = new RepositoryObjectClient(client);
-  const repos: Repository[] = await repoObjectClient.getAllRepositories();
-
-  const migrationPromises = [];
-  for (const repo of repos) {
-    const docIndexVersionController = new IndexVersionController(client, log);
-    const docCreationReq = getDocumentIndexCreationRequest(repo.uri);
-    migrationPromises.push(docIndexVersionController.tryUpgrade(docCreationReq));
-
-    const symbolIndexVersionController = new IndexVersionController(client, log);
-    const symbolCreationReq = getSymbolIndexCreationRequest(repo.uri);
-    migrationPromises.push(symbolIndexVersionController.tryUpgrade(symbolCreationReq));
-
-    const refIndexVersionController = new IndexVersionController(client, log);
-    const refCreationReq = getReferenceIndexCreationRequest(repo.uri);
-    migrationPromises.push(refIndexVersionController.tryUpgrade(refCreationReq));
-  }
-  return Promise.all(migrationPromises);
-};
diff --git a/x-pack/legacy/plugins/code/server/indexer/index_version_controller.test.ts b/x-pack/legacy/plugins/code/server/indexer/index_version_controller.test.ts
deleted file mode 100644
index 57724d9e47dcba..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/index_version_controller.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import sinon from 'sinon';
-
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { IndexCreationRequest } from './index_creation_request';
-import { IndexVersionController } from './index_version_controller';
-import pkg from './schema/version.json';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esClient = {
-  reindex: emptyAsyncFunc,
-  indices: {
-    getMapping: emptyAsyncFunc,
-    create: emptyAsyncFunc,
-    updateAliases: emptyAsyncFunc,
-    delete: emptyAsyncFunc,
-  },
-};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Index upgrade is triggered.', async () => {
-  // Setup the esClient spies
-  const getMappingSpy = sinon.fake.returns(
-    Promise.resolve({
-      mockindex: {
-        mappings: {
-          _meta: {
-            version: 0,
-          },
-        },
-      },
-    })
-  );
-  const updateAliasesSpy = sinon.spy();
-  const createSpy = sinon.spy();
-  const deleteSpy = sinon.spy();
-  const reindexSpy = sinon.spy();
-  esClient.indices.getMapping = getMappingSpy;
-  esClient.indices.updateAliases = updateAliasesSpy;
-  esClient.indices.create = createSpy;
-  esClient.indices.delete = deleteSpy;
-  esClient.reindex = reindexSpy;
-
-  const versionController = new IndexVersionController(esClient as EsClient, log);
-  const req: IndexCreationRequest = {
-    index: 'mockindex',
-    settings: {},
-    schema: {},
-  };
-  await versionController.tryUpgrade(req);
-
-  expect(getMappingSpy.calledOnce).toBeTruthy();
-  expect(createSpy.calledOnce).toBeTruthy();
-  expect(reindexSpy.calledOnce).toBeTruthy();
-  expect(updateAliasesSpy.calledOnce).toBeTruthy();
-  expect(deleteSpy.calledOnce).toBeTruthy();
-  expect(createSpy.calledAfter(getMappingSpy)).toBeTruthy();
-  expect(reindexSpy.calledAfter(getMappingSpy)).toBeTruthy();
-  expect(updateAliasesSpy.calledAfter(getMappingSpy)).toBeTruthy();
-  expect(deleteSpy.calledAfter(getMappingSpy)).toBeTruthy();
-});
-
-test('Index upgrade is skipped.', async () => {
-  // Setup the esClient spies
-  const getMappingSpy = sinon.fake.returns(
-    Promise.resolve({
-      mockindex: {
-        mappings: {
-          _meta: {
-            version: pkg.codeIndexVersion,
-          },
-        },
-      },
-    })
-  );
-  const updateAliasesSpy = sinon.spy();
-  const createSpy = sinon.spy();
-  const deleteSpy = sinon.spy();
-  const reindexSpy = sinon.spy();
-  esClient.indices.getMapping = getMappingSpy;
-  esClient.indices.updateAliases = updateAliasesSpy;
-  esClient.indices.create = createSpy;
-  esClient.indices.delete = deleteSpy;
-  esClient.reindex = reindexSpy;
-
-  const versionController = new IndexVersionController(esClient as EsClient, log);
-  const req: IndexCreationRequest = {
-    index: 'mockindex',
-    settings: {},
-    schema: {},
-  };
-  await versionController.tryUpgrade(req);
-
-  expect(getMappingSpy.calledOnce).toBeTruthy();
-  expect(createSpy.notCalled).toBeTruthy();
-  expect(reindexSpy.notCalled).toBeTruthy();
-  expect(updateAliasesSpy.notCalled).toBeTruthy();
-  expect(deleteSpy.notCalled).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/server/indexer/index_version_controller.ts b/x-pack/legacy/plugins/code/server/indexer/index_version_controller.ts
deleted file mode 100644
index e753b9f97b1c4d..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/index_version_controller.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-
-import { IndexMigrator } from '.';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { EsException } from './es_exception';
-import { IndexCreationRequest } from './index_creation_request';
-import pkg from './schema/version.json';
-
-export class IndexVersionController {
-  private version: number;
-  private DEFAULT_VERSION = 0;
-
-  constructor(protected readonly client: EsClient, private readonly log: Logger) {
-    this.version = Number(pkg.codeIndexVersion);
-  }
-
-  public async tryUpgrade(request: IndexCreationRequest) {
-    this.log.debug(`Try upgrade index mapping/settings for index ${request.index}.`);
-    try {
-      const esIndexVersion = await this.getIndexVersionFromES(request.index);
-      const needUpgrade = this.needUpgrade(esIndexVersion);
-      if (needUpgrade) {
-        const migrator = new IndexMigrator(this.client, this.log);
-        const oldIndexName = `${request.index}-${esIndexVersion}`;
-        this.log.info(
-          `Migrate index mapping/settings from version ${esIndexVersion} for ${request.index}`
-        );
-        return migrator.migrateIndex(oldIndexName, request);
-      } else {
-        this.log.debug(`Index version is update-to-date for ${request.index}`);
-      }
-    } catch (error) {
-      if (
-        error.body &&
-        error.body.error &&
-        error.body.error.type === EsException.INDEX_NOT_FOUND_EXCEPTION
-      ) {
-        this.log.info(`Skip upgrade index ${request.index} because original index does not exist.`);
-      } else {
-        this.log.error(`Try upgrade index error for ${request.index}.`);
-        this.log.error(error);
-      }
-    }
-  }
-
-  /*
-   * Currently there is a simple rule to decide if we need upgrade the index or not: if the index
-   * version is smaller than current version specified in the package.json file under `codeIndexVersion`.
-   */
-  protected needUpgrade(oldIndexVersion: number): boolean {
-    return oldIndexVersion < this.version;
-  }
-
-  private async getIndexVersionFromES(indexName: string): Promise<number> {
-    const res = await this.client.indices.getMapping({
-      index: indexName,
-    });
-    const esIndexName = Object.keys(res)[0];
-    const version = _.get(res, [esIndexName, 'mappings', '_meta', 'version'], this.DEFAULT_VERSION);
-    if (version === this.DEFAULT_VERSION) {
-      this.log.warn(`Can't find index version field in _meta for ${indexName}.`);
-    }
-    return version;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/indexer.ts b/x-pack/legacy/plugins/code/server/indexer/indexer.ts
deleted file mode 100644
index f235bf9eaee630..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/indexer.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { IndexProgress, IndexRequest, IndexStats, IndexerType, RepositoryUri } from '../../model';
-
-export type ProgressReporter = (progress: IndexProgress) => void;
-
-export interface Indexer {
-  type: IndexerType;
-  start(ProgressReporter?: ProgressReporter, checkpointReq?: IndexRequest): Promise<IndexStats>;
-  cancel(): void;
-}
-
-export interface IndexerFactory {
-  create(
-    repoUri: RepositoryUri,
-    revision: string,
-    enforcedReindex: boolean
-  ): Promise<Indexer | undefined>;
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/lsp_incremental_indexer.ts b/x-pack/legacy/plugins/code/server/indexer/lsp_incremental_indexer.ts
deleted file mode 100644
index 9516150903e8e4..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/lsp_incremental_indexer.ts
+++ /dev/null
@@ -1,261 +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 { ProgressReporter } from '.';
-import { Diff, DiffKind } from '../../common/git_diff';
-import { toCanonicalUrl } from '../../common/uri_util';
-import {
-  Document,
-  IndexStats,
-  IndexStatsKey,
-  IndexerType,
-  LspIncIndexRequest,
-  RepositoryUri,
-} from '../../model';
-import { GitOperations, HEAD } from '../git_operations';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { LspService } from '../lsp/lsp_service';
-import { ServerOptions } from '../server_options';
-import { detectLanguage } from '../utils/detect_language';
-import { LspIndexer } from './lsp_indexer';
-import { DocumentIndexName, SymbolIndexName } from './schema';
-
-export class LspIncrementalIndexer extends LspIndexer {
-  public type = IndexerType.LSP_INC;
-  private diff: Diff | undefined = undefined;
-
-  constructor(
-    protected readonly repoUri: RepositoryUri,
-    // The latest revision to be indexed
-    protected readonly revision: string,
-    // The already indexed revision
-    protected readonly originRevision: string,
-    protected readonly lspService: LspService,
-    protected readonly options: ServerOptions,
-    protected readonly gitOps: GitOperations,
-    protected readonly client: EsClient,
-    protected readonly log: Logger
-  ) {
-    super(repoUri, revision, lspService, options, gitOps, client, log);
-  }
-
-  public async start(progressReporter?: ProgressReporter, checkpointReq?: LspIncIndexRequest) {
-    return await super.start(progressReporter, checkpointReq);
-  }
-
-  // If the current checkpoint is valid. Otherwise, ignore the checkpoint
-  protected validateCheckpoint(checkpointReq?: LspIncIndexRequest): boolean {
-    return (
-      checkpointReq !== undefined &&
-      checkpointReq.revision === this.revision &&
-      checkpointReq.originRevision === this.originRevision
-    );
-  }
-
-  // If it's necessary to refresh (create and reset) all the related indices
-  protected needRefreshIndices(_: LspIncIndexRequest): boolean {
-    return false;
-  }
-
-  protected ifCheckpointMet(req: LspIncIndexRequest, checkpointReq: LspIncIndexRequest): boolean {
-    // Assume for the same revision pair, the order of the files we iterate the diff is definite
-    // everytime.
-    return (
-      req.filePath === checkpointReq.filePath &&
-      req.revision === checkpointReq.revision &&
-      req.originRevision === checkpointReq.originRevision &&
-      req.kind === checkpointReq.kind
-    );
-  }
-
-  protected async prepareIndexCreationRequests() {
-    // We don't need to create new indices for incremental indexing.
-    return [];
-  }
-
-  protected async processRequest(request: LspIncIndexRequest): Promise<IndexStats> {
-    const stats: IndexStats = new Map<IndexStatsKey, number>()
-      .set(IndexStatsKey.Symbol, 0)
-      .set(IndexStatsKey.Reference, 0)
-      .set(IndexStatsKey.File, 0)
-      .set(IndexStatsKey.SymbolDeleted, 0)
-      .set(IndexStatsKey.ReferenceDeleted, 0)
-      .set(IndexStatsKey.FileDeleted, 0);
-    if (this.isCancelled()) {
-      this.log.debug(`Incremental indexer is cancelled. Skip.`);
-      return stats;
-    }
-
-    const { kind } = request;
-
-    this.log.debug(`Index ${kind} request ${JSON.stringify(request, null, 2)}`);
-    switch (kind) {
-      case DiffKind.ADDED: {
-        await this.handleAddedRequest(request, stats);
-        break;
-      }
-      case DiffKind.DELETED: {
-        await this.handleDeletedRequest(request, stats);
-        break;
-      }
-      case DiffKind.MODIFIED: {
-        await this.handleModifiedRequest(request, stats);
-        break;
-      }
-      case DiffKind.RENAMED: {
-        await this.handleRenamedRequest(request, stats);
-        break;
-      }
-      default: {
-        this.log.debug(
-          `Unsupported diff kind ${kind} for incremental indexing. Skip this request.`
-        );
-      }
-    }
-
-    return stats;
-  }
-
-  protected async *getIndexRequestIterator(): AsyncIterableIterator<LspIncIndexRequest> {
-    try {
-      if (this.diff) {
-        await this.prepareWorkspace();
-        for (const f of this.diff.files) {
-          yield {
-            repoUri: this.repoUri,
-            filePath: f.path,
-            originPath: f.originPath,
-            // Always use HEAD for now until we have multi revision.
-            // Also, since the workspace might get updated during the index, we always
-            // want the revision to keep updated so that lsp proxy could pass the revision
-            // check per discussion here: https://github.com/elastic/code/issues/1317#issuecomment-504615833
-            revision: HEAD,
-            kind: f.kind,
-            originRevision: this.originRevision,
-          };
-        }
-      }
-    } catch (error) {
-      this.log.error(`Get lsp incremental index requests count error.`);
-      this.log.error(error);
-      throw error;
-    }
-  }
-
-  protected async getIndexRequestCount(): Promise<number> {
-    try {
-      // cache here to avoid pulling the diff twice.
-      this.diff = await this.gitOps.getDiff(this.repoUri, this.originRevision, this.revision);
-      return this.diff.files.length;
-    } catch (error) {
-      if (this.isCancelled()) {
-        this.log.debug(`Incremental indexer got cancelled. Skip get index count error.`);
-        return 1;
-      } else {
-        this.log.error(`Get lsp incremental index requests count error.`);
-        this.log.error(error);
-        throw error;
-      }
-    }
-  }
-
-  protected async cleanIndex() {
-    this.log.info('Do not need to clean index for incremental indexing.');
-  }
-
-  private async handleAddedRequest(request: LspIncIndexRequest, stats: IndexStats) {
-    const { repoUri, filePath } = request;
-
-    let content = '';
-    try {
-      content = await this.getFileSource(request);
-    } catch (error) {
-      if ((error as Error).message === this.FILE_OVERSIZE_ERROR_MSG) {
-        // Skip this index request if the file is oversized
-        this.log.debug(this.FILE_OVERSIZE_ERROR_MSG);
-        return stats;
-      } else {
-        // Rethrow the issue if for other reasons
-        throw error;
-      }
-    }
-
-    const { symbolNames, symbolsLength, referencesLength } = await this.execLspIndexing(request);
-    stats.set(IndexStatsKey.Symbol, symbolsLength);
-    stats.set(IndexStatsKey.Reference, referencesLength);
-
-    const language = await detectLanguage(filePath, Buffer.from(content));
-    const body: Document = {
-      repoUri,
-      path: filePath,
-      content,
-      language,
-      qnames: Array.from(symbolNames),
-    };
-    await this.docBatchIndexHelper.index(DocumentIndexName(repoUri), body);
-    stats.set(IndexStatsKey.File, 1);
-  }
-
-  private async handleDeletedRequest(request: LspIncIndexRequest, stats: IndexStats) {
-    const { revision, filePath, repoUri } = request;
-
-    // Delete the document with the exact file path. TODO: add stats
-    const docRes = await this.client.deleteByQuery({
-      index: DocumentIndexName(repoUri),
-      body: {
-        query: {
-          term: {
-            'path.hierarchy': filePath,
-          },
-        },
-      },
-    });
-    if (docRes) {
-      stats.set(IndexStatsKey.FileDeleted, docRes.deleted);
-    }
-
-    const lspDocUri = toCanonicalUrl({ repoUri, revision, file: filePath, schema: 'git:' });
-
-    // Delete all symbols within this file
-    const symbolRes = await this.client.deleteByQuery({
-      index: SymbolIndexName(repoUri),
-      body: {
-        query: {
-          term: {
-            'symbolInformation.location.uri': lspDocUri,
-          },
-        },
-      },
-    });
-    if (symbolRes) {
-      stats.set(IndexStatsKey.SymbolDeleted, symbolRes.deleted);
-    }
-
-    // TODO: When references is enabled. Clean up the references as well.
-  }
-
-  private async handleModifiedRequest(request: LspIncIndexRequest, stats: IndexStats) {
-    const { originRevision, originPath } = request;
-
-    // 1. first delete all related indexed data
-    await this.handleDeletedRequest(
-      {
-        ...request,
-        revision: originRevision,
-        filePath: originPath ? originPath : '',
-      },
-      stats
-    );
-    // 2. index data with modified version
-    await this.handleAddedRequest(request, stats);
-  }
-
-  private async handleRenamedRequest(request: LspIncIndexRequest, stats: IndexStats) {
-    // Do the same as modified file
-    await this.handleModifiedRequest(request, stats);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/lsp_indexer.ts b/x-pack/legacy/plugins/code/server/indexer/lsp_indexer.ts
deleted file mode 100644
index f1334664d5907b..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/lsp_indexer.ts
+++ /dev/null
@@ -1,333 +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 { ResponseError } from 'vscode-jsonrpc';
-import fs from 'fs';
-import path from 'path';
-import { promisify } from 'util';
-import { isBinaryFile } from 'isbinaryfile';
-import { ProgressReporter } from '.';
-import { TEXT_FILE_LIMIT } from '../../common/file';
-import {
-  LanguageServerNotInstalled,
-  LanguageServerStartFailed,
-} from '../../common/lsp_error_codes';
-import { toCanonicalUrl } from '../../common/uri_util';
-import {
-  Document,
-  IndexStats,
-  IndexStatsKey,
-  IndexerType,
-  LspIndexRequest,
-  RepositoryUri,
-} from '../../model';
-import { GitOperations, HEAD } from '../git_operations';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { LspService } from '../lsp/lsp_service';
-import { ServerOptions } from '../server_options';
-import { detectLanguage, detectLanguageByFilename } from '../utils/detect_language';
-import { AbstractIndexer } from './abstract_indexer';
-import { BatchIndexHelper } from './batch_index_helper';
-import {
-  getDocumentIndexCreationRequest,
-  getReferenceIndexCreationRequest,
-  getSymbolIndexCreationRequest,
-} from './index_creation_request';
-import { ALL_RESERVED, DocumentIndexName, ReferenceIndexName, SymbolIndexName } from './schema';
-
-const state = promisify(fs.stat);
-const readFile = promisify(fs.readFile);
-
-export class LspIndexer extends AbstractIndexer {
-  public type: IndexerType = IndexerType.LSP;
-  // Batch index helper for symbols/references
-  protected lspBatchIndexHelper: BatchIndexHelper;
-  // Batch index helper for documents
-  protected docBatchIndexHelper: BatchIndexHelper;
-
-  private LSP_BATCH_INDEX_SIZE = 50;
-  private DOC_BATCH_INDEX_SIZE = 50;
-  private workspaceDir: string = '';
-
-  constructor(
-    protected readonly repoUri: RepositoryUri,
-    protected readonly revision: string,
-    protected readonly lspService: LspService,
-    protected readonly options: ServerOptions,
-    protected readonly gitOps: GitOperations,
-    protected readonly client: EsClient,
-    protected log: Logger
-  ) {
-    super(repoUri, revision, client, log);
-    this.lspBatchIndexHelper = new BatchIndexHelper(client, log, this.LSP_BATCH_INDEX_SIZE);
-    this.docBatchIndexHelper = new BatchIndexHelper(client, log, this.DOC_BATCH_INDEX_SIZE);
-  }
-
-  public async start(progressReporter?: ProgressReporter, checkpointReq?: LspIndexRequest) {
-    try {
-      return await super.start(progressReporter, checkpointReq);
-    } finally {
-      if (!this.isCancelled()) {
-        // Flush all the index request still in the cache for bulk index.
-        this.lspBatchIndexHelper.flush();
-        this.docBatchIndexHelper.flush();
-      }
-    }
-  }
-
-  public cancel() {
-    this.lspBatchIndexHelper.cancel();
-    this.docBatchIndexHelper.cancel();
-    super.cancel();
-  }
-
-  // If the current checkpoint is valid
-  protected validateCheckpoint(checkpointReq?: LspIndexRequest): boolean {
-    return checkpointReq !== undefined && checkpointReq.revision === this.revision;
-  }
-
-  // If it's necessary to refresh (create and reset) all the related indices
-  protected needRefreshIndices(checkpointReq?: LspIndexRequest): boolean {
-    // If it's not resumed from a checkpoint, then try to refresh all the indices.
-    return !this.validateCheckpoint(checkpointReq);
-  }
-
-  protected ifCheckpointMet(req: LspIndexRequest, checkpointReq: LspIndexRequest): boolean {
-    // Assume for the same revision, the order of the files we iterate the repository is definite
-    // everytime.
-    return req.filePath === checkpointReq.filePath && req.revision === checkpointReq.revision;
-  }
-
-  protected async prepareIndexCreationRequests() {
-    return [
-      getDocumentIndexCreationRequest(this.repoUri),
-      getReferenceIndexCreationRequest(this.repoUri),
-      getSymbolIndexCreationRequest(this.repoUri),
-    ];
-  }
-
-  protected async *getIndexRequestIterator(): AsyncIterableIterator<LspIndexRequest> {
-    try {
-      await this.prepareWorkspace();
-
-      const fileIterator = await this.gitOps.iterateRepo(this.repoUri, HEAD);
-      for await (const file of fileIterator) {
-        const filePath = file.path!;
-        const req: LspIndexRequest = {
-          repoUri: this.repoUri,
-          filePath,
-          // Always use HEAD for now until we have multi revision.
-          // Also, since the workspace might get updated during the index, we always
-          // want the revision to keep updated so that lsp proxy could pass the revision
-          // check per discussion here: https://github.com/elastic/code/issues/1317#issuecomment-504615833
-          revision: HEAD,
-        };
-        yield req;
-      }
-    } catch (error) {
-      this.log.error(`Prepare ${this.type} indexing requests error.`);
-      this.log.error(error);
-      throw error;
-    }
-  }
-
-  protected async prepareWorkspace() {
-    const { workspaceDir } = await this.lspService.workspaceHandler.openWorkspace(
-      this.repoUri,
-      HEAD
-    );
-    this.workspaceDir = workspaceDir;
-  }
-
-  protected async getIndexRequestCount(): Promise<number> {
-    try {
-      return await this.gitOps.countRepoFiles(this.repoUri, HEAD);
-    } catch (error) {
-      if (this.isCancelled()) {
-        this.log.debug(`Indexer ${this.type} got cancelled. Skip get index count error.`);
-        return 1;
-      } else {
-        this.log.error(`Get ${this.type} index requests count error.`);
-        this.log.error(error);
-        throw error;
-      }
-    }
-  }
-
-  protected async cleanIndex() {
-    // Clean up all the symbol documents in the symbol index
-    try {
-      await this.client.deleteByQuery({
-        index: SymbolIndexName(this.repoUri),
-        body: {
-          query: {
-            match_all: {},
-          },
-        },
-      });
-      this.log.info(`Clean up symbols for ${this.repoUri} done.`);
-    } catch (error) {
-      this.log.error(`Clean up symbols for ${this.repoUri} error.`);
-      this.log.error(error);
-    }
-
-    // Clean up all the reference documents in the reference index
-    try {
-      await this.client.deleteByQuery({
-        index: ReferenceIndexName(this.repoUri),
-        body: {
-          query: {
-            match_all: {},
-          },
-        },
-      });
-      this.log.info(`Clean up references for ${this.repoUri} done.`);
-    } catch (error) {
-      this.log.error(`Clean up references for ${this.repoUri} error.`);
-      this.log.error(error);
-    }
-
-    // Clean up all the document documents in the document index but keep the repository document.
-    try {
-      await this.client.deleteByQuery({
-        index: DocumentIndexName(this.repoUri),
-        body: {
-          query: {
-            bool: {
-              must_not: ALL_RESERVED.map((field: string) => ({
-                exists: {
-                  field,
-                },
-              })),
-            },
-          },
-        },
-      });
-      this.log.info(`Clean up documents for ${this.repoUri} done.`);
-    } catch (error) {
-      this.log.error(`Clean up documents for ${this.repoUri} error.`);
-      this.log.error(error);
-    }
-  }
-
-  protected FILE_OVERSIZE_ERROR_MSG = 'File size exceeds limit. Skip index.';
-  protected BINARY_FILE_ERROR_MSG = 'Binary file detected. Skip index.';
-  protected async getFileSource(request: LspIndexRequest): Promise<string> {
-    const { filePath } = request;
-    const fullPath = path.join(this.workspaceDir, filePath);
-    const fileStat = await state(fullPath);
-    const fileSize = fileStat.size;
-    if (fileSize > TEXT_FILE_LIMIT) {
-      throw new Error(this.FILE_OVERSIZE_ERROR_MSG);
-    }
-    const bin = await isBinaryFile(fullPath);
-    if (bin) {
-      throw new Error(this.BINARY_FILE_ERROR_MSG);
-    }
-    return readFile(fullPath, { encoding: 'utf8' }) as Promise<string>;
-  }
-
-  protected async execLspIndexing(
-    request: LspIndexRequest
-  ): Promise<{
-    symbolNames: Set<string>;
-    symbolsLength: number;
-    referencesLength: number;
-  }> {
-    const { repoUri, revision, filePath } = request;
-    const lspDocUri = toCanonicalUrl({ repoUri, revision, file: filePath, schema: 'git:' });
-    const symbolNames = new Set<string>();
-    let symbolsLength = 0;
-    let referencesLength = 0;
-    try {
-      const lang = detectLanguageByFilename(filePath);
-      // filter file by language
-      if (lang && this.lspService.supportLanguage(lang)) {
-        const response = await this.lspService.sendRequest('textDocument/full', {
-          textDocument: {
-            uri: lspDocUri,
-          },
-          reference: this.options.enableGlobalReference,
-        });
-
-        if (response && response.result && response.result.length > 0 && response.result[0]) {
-          const { symbols, references } = response.result[0];
-          for (const symbol of symbols) {
-            await this.lspBatchIndexHelper.index(SymbolIndexName(repoUri), symbol);
-            symbolNames.add(symbol.symbolInformation.name);
-          }
-          symbolsLength = symbols.length;
-
-          for (const ref of references) {
-            await this.lspBatchIndexHelper.index(ReferenceIndexName(repoUri), ref);
-          }
-          referencesLength = references.length;
-        } else {
-          this.log.debug(`Empty response from lsp server. Skip symbols and references indexing.`);
-        }
-      } else {
-        this.log.debug(`Unsupported language. Skip symbols and references indexing.`);
-      }
-    } catch (error) {
-      if (error instanceof ResponseError && error.code === LanguageServerNotInstalled) {
-        // TODO maybe need to report errors to the index task and warn user later
-        this.log.debug(`Index symbols or references error due to language server not installed`);
-      } else if (error instanceof ResponseError && error.code === LanguageServerStartFailed) {
-        this.log.debug(
-          `Index symbols or references error due to language server can't be started.`
-        );
-      } else {
-        this.log.warn(`Index symbols or references error.`);
-        this.log.warn(error);
-      }
-    }
-
-    return { symbolNames, symbolsLength, referencesLength };
-  }
-
-  protected async processRequest(request: LspIndexRequest): Promise<IndexStats> {
-    const stats: IndexStats = new Map<IndexStatsKey, number>()
-      .set(IndexStatsKey.Symbol, 0)
-      .set(IndexStatsKey.Reference, 0)
-      .set(IndexStatsKey.File, 0);
-    const { repoUri, revision, filePath } = request;
-    this.log.debug(`Indexing ${filePath} at revision ${revision} for ${repoUri}`);
-
-    let content = '';
-    try {
-      content = await this.getFileSource(request);
-    } catch (error) {
-      if ((error as Error).message === this.BINARY_FILE_ERROR_MSG) {
-        this.log.debug(this.BINARY_FILE_ERROR_MSG);
-        return stats;
-      } else if ((error as Error).message === this.FILE_OVERSIZE_ERROR_MSG) {
-        // Skip this index request if the file is oversized
-        this.log.debug(this.FILE_OVERSIZE_ERROR_MSG);
-        return stats;
-      } else {
-        // Rethrow the issue if for other reasons
-        throw error;
-      }
-    }
-
-    const { symbolNames, symbolsLength, referencesLength } = await this.execLspIndexing(request);
-    stats.set(IndexStatsKey.Symbol, symbolsLength);
-    stats.set(IndexStatsKey.Reference, referencesLength);
-
-    const language = await detectLanguage(filePath, Buffer.from(content));
-    const body: Document = {
-      repoUri,
-      path: filePath,
-      content,
-      language,
-      qnames: Array.from(symbolNames),
-    };
-    await this.docBatchIndexHelper.index(DocumentIndexName(repoUri), body);
-    stats.set(IndexStatsKey.File, 1);
-    return stats;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/lsp_indexer_factory.ts b/x-pack/legacy/plugins/code/server/indexer/lsp_indexer_factory.ts
deleted file mode 100644
index d0d5ae4e3e16b3..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/lsp_indexer_factory.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Indexer, IndexerFactory, LspIncrementalIndexer, LspIndexer } from '.';
-import { RepositoryUri } from '../../model';
-import { GitOperations } from '../git_operations';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { LspService } from '../lsp/lsp_service';
-import { RepositoryObjectClient } from '../search';
-import { ServerOptions } from '../server_options';
-
-export class LspIndexerFactory implements IndexerFactory {
-  private objectClient: RepositoryObjectClient;
-
-  constructor(
-    protected readonly lspService: LspService,
-    protected readonly options: ServerOptions,
-    protected readonly gitOps: GitOperations,
-    protected readonly client: EsClient,
-    protected readonly log: Logger
-  ) {
-    this.objectClient = new RepositoryObjectClient(this.client);
-  }
-
-  public async create(
-    repoUri: RepositoryUri,
-    revision: string,
-    enforcedReindex: boolean = false
-  ): Promise<Indexer | undefined> {
-    try {
-      const repo = await this.objectClient.getRepository(repoUri);
-      const indexedRevision = repo.indexedRevision;
-      // Skip incremental indexer if enforced reindex.
-      if (!enforcedReindex && indexedRevision) {
-        this.log.info(`Create indexer to index ${repoUri} from ${indexedRevision} to ${revision}`);
-        // Create the indexer to index only the diff between these 2 revisions.
-        return new LspIncrementalIndexer(
-          repo.uri,
-          revision,
-          indexedRevision,
-          this.lspService,
-          this.options,
-          this.gitOps,
-          this.client,
-          this.log
-        );
-      } else {
-        this.log.info(`Create indexer to index ${repoUri} at ${revision}`);
-        // Create the indexer to index the entire repository.
-        return new LspIndexer(
-          repo.uri,
-          revision,
-          this.lspService,
-          this.options,
-          this.gitOps,
-          this.client,
-          this.log
-        );
-      }
-    } catch (error) {
-      this.log.error(`Create indexer error for ${repoUri}.`);
-      this.log.error(error);
-      return undefined;
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/repository_index_initializer.test.ts b/x-pack/legacy/plugins/code/server/indexer/repository_index_initializer.test.ts
deleted file mode 100644
index 7ef010451caa3a..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/repository_index_initializer.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import sinon from 'sinon';
-
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { RepositoryIndexInitializer } from './repository_index_initializer';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esClient = {
-  indices: {
-    existsAlias: emptyAsyncFunc,
-    create: emptyAsyncFunc,
-    putAlias: emptyAsyncFunc,
-  },
-};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Initialize the repository index', async () => {
-  // Setup the esClient spies
-  const existsAliasSpy = sinon.fake.returns(false);
-  const createSpy = sinon.spy();
-  const putAliasSpy = sinon.spy();
-  esClient.indices.existsAlias = existsAliasSpy;
-  esClient.indices.create = createSpy;
-  esClient.indices.putAlias = putAliasSpy;
-
-  const initializer = new RepositoryIndexInitializer(
-    'mockuri',
-    'mockrevision',
-    esClient as EsClient,
-    log
-  );
-  await initializer.init();
-
-  // Expect these indices functions to be called only once.
-  expect(existsAliasSpy.calledOnce).toBeTruthy();
-  expect(createSpy.calledOnce).toBeTruthy();
-  expect(putAliasSpy.calledOnce).toBeTruthy();
-  expect(createSpy.calledAfter(existsAliasSpy)).toBeTruthy();
-  expect(putAliasSpy.calledAfter(createSpy)).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/server/indexer/repository_index_initializer.ts b/x-pack/legacy/plugins/code/server/indexer/repository_index_initializer.ts
deleted file mode 100644
index 869f26efd8226d..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/repository_index_initializer.ts
+++ /dev/null
@@ -1,47 +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 { IndexerType, RepositoryUri } from '../../model';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { AbstractIndexer } from './abstract_indexer';
-import { IndexCreationRequest } from './index_creation_request';
-import { RepositoryAnalysisSettings, RepositoryIndexName, RepositorySchema } from './schema';
-
-// Inherit AbstractIndexer's index creation logics. This is not an actual indexer.
-export class RepositoryIndexInitializer extends AbstractIndexer {
-  public type: IndexerType = IndexerType.REPOSITORY;
-
-  constructor(
-    protected readonly repoUri: RepositoryUri,
-    protected readonly revision: string,
-    protected readonly client: EsClient,
-    protected readonly log: Logger
-  ) {
-    super(repoUri, revision, client, log);
-  }
-
-  public async prepareIndexCreationRequests() {
-    const creationReq: IndexCreationRequest = {
-      index: RepositoryIndexName(this.repoUri),
-      settings: {
-        ...RepositoryAnalysisSettings,
-        number_of_shards: 1,
-        auto_expand_replicas: '0-1',
-      },
-      schema: RepositorySchema,
-    };
-    return [creationReq];
-  }
-
-  public async init() {
-    const res = await this.prepareIndex();
-    if (!res) {
-      this.log.error(`Initialize repository index failed.`);
-    }
-    return;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/repository_index_initializer_factory.ts b/x-pack/legacy/plugins/code/server/indexer/repository_index_initializer_factory.ts
deleted file mode 100644
index 5797b06b1f79c3..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/repository_index_initializer_factory.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Indexer, IndexerFactory, RepositoryIndexInitializer } from '.';
-import { RepositoryUri } from '../../model';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-
-export class RepositoryIndexInitializerFactory implements IndexerFactory {
-  constructor(protected readonly client: EsClient, protected readonly log: Logger) {}
-
-  public async create(repoUri: RepositoryUri, revision: string): Promise<Indexer | undefined> {
-    return new RepositoryIndexInitializer(repoUri, revision, this.client, this.log);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/indexer/schema/commit.ts b/x-pack/legacy/plugins/code/server/indexer/schema/commit.ts
deleted file mode 100644
index 1bc248787dbf72..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/schema/commit.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RepositoryUtils } from '../../../common/repository_utils';
-import { RepositoryUri } from '../../../model';
-
-export const CommitSchema = {
-  repoUri: {
-    type: 'keyword',
-  },
-  id: {
-    type: 'keyword',
-  },
-  message: {
-    type: 'text',
-  },
-  body: {
-    type: 'text',
-  },
-  date: {
-    type: 'date',
-  },
-  parents: {
-    type: 'keyword',
-  },
-  author: {
-    properties: {
-      name: {
-        type: 'text',
-      },
-      email: {
-        type: 'text',
-      },
-    },
-  },
-  committer: {
-    properties: {
-      name: {
-        type: 'text',
-      },
-      email: {
-        type: 'text',
-      },
-    },
-  },
-};
-
-export const CommitIndexNamePrefix = `.code-commit`;
-export const CommitIndexName = (repoUri: RepositoryUri) => {
-  return `${CommitIndexNamePrefix}-${RepositoryUtils.normalizeRepoUriToIndexName(repoUri)}`;
-};
-export const CommitSearchIndexWithScope = (repoScope: RepositoryUri[]) => {
-  return repoScope.map((repoUri: RepositoryUri) => `${CommitIndexName(repoUri)}*`).join(',');
-};
diff --git a/x-pack/legacy/plugins/code/server/indexer/schema/document.ts b/x-pack/legacy/plugins/code/server/indexer/schema/document.ts
deleted file mode 100644
index c2a2cd1e334d50..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/schema/document.ts
+++ /dev/null
@@ -1,296 +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 { RepositoryUtils } from '../../../common/repository_utils';
-import { RepositoryUri } from '../../../model';
-
-// The field name of repository object nested in the Document index.
-export const RepositoryReservedField = 'repository';
-// The field name of repository git status object nested in the Document index.
-export const RepositoryGitStatusReservedField = 'repository_git_status';
-// The field name of repository delete status object nested in the Document index.
-export const RepositoryDeleteStatusReservedField = 'repository_delete_status';
-// The field name of repository lsp index status object nested in the Document index.
-export const RepositoryIndexStatusReservedField = 'repository_index_status';
-// The field name of repository config object nested in the Document index.
-export const RepositoryConfigReservedField = 'repository_config';
-
-export const ALL_RESERVED = [
-  RepositoryReservedField,
-  RepositoryGitStatusReservedField,
-  RepositoryDeleteStatusReservedField,
-  RepositoryIndexStatusReservedField,
-  RepositoryConfigReservedField,
-];
-
-// Correspond to model/search/Document
-export const DocumentSchema = {
-  repoUri: {
-    type: 'keyword',
-  },
-  path: {
-    type: 'text',
-    analyzer: 'path_analyzer',
-    fields: {
-      hierarchy: {
-        type: 'text',
-        analyzer: 'path_hierarchy_analyzer',
-      },
-      keyword: {
-        type: 'keyword',
-      },
-    },
-  },
-  content: {
-    type: 'text',
-    analyzer: 'content_analyzer',
-  },
-  qnames: {
-    type: 'text',
-    analyzer: 'qname_path_hierarchy_analyzer',
-  },
-  language: {
-    type: 'keyword',
-  },
-  sha1: {
-    type: 'text',
-    index: false,
-    norms: false,
-  },
-  // Repository object resides in this document index.
-  // There is always a single Repository object in this index.
-  [RepositoryReservedField]: {
-    properties: {
-      uri: {
-        type: 'text',
-      },
-      url: {
-        type: 'text',
-        index: false,
-      },
-      name: {
-        type: 'text',
-      },
-      org: {
-        type: 'text',
-      },
-      defaultBranch: {
-        type: 'keyword',
-      },
-      revision: {
-        type: 'keyword',
-      },
-      indexedRevision: {
-        type: 'keyword',
-      },
-    },
-  },
-  [RepositoryConfigReservedField]: {
-    properties: {
-      uri: {
-        type: 'text',
-      },
-      disableGo: {
-        type: 'boolean',
-      },
-      disableJava: {
-        type: 'boolean',
-      },
-      disableTypescript: {
-        type: 'boolean',
-      },
-    },
-  },
-  // A single Repository Git Status object resides in this document index.
-  [RepositoryGitStatusReservedField]: {
-    properties: {
-      uri: {
-        type: 'text',
-      },
-      progress: {
-        type: 'integer',
-      },
-      timestamp: {
-        type: 'date',
-      },
-      revision: {
-        type: 'keyword',
-      },
-      errorMessage: {
-        type: 'text',
-      },
-      cloneProgress: {
-        properties: {
-          isCloned: {
-            type: 'boolean',
-          },
-          receivedObjects: {
-            type: 'integer',
-          },
-          indexedObjects: {
-            type: 'integer',
-          },
-          totalObjects: {
-            type: 'integer',
-          },
-          localObjects: {
-            type: 'integer',
-          },
-          totalDeltas: {
-            type: 'integer',
-          },
-          indexedDeltas: {
-            type: 'integer',
-          },
-          receivedBytes: {
-            type: 'integer',
-          },
-        },
-      },
-    },
-  },
-  // A single Repository Delete Status object resides in this document index.
-  [RepositoryDeleteStatusReservedField]: {
-    properties: {
-      uri: {
-        type: 'text',
-      },
-      progress: {
-        type: 'integer',
-      },
-      timestamp: {
-        type: 'date',
-      },
-      revision: {
-        type: 'keyword',
-      },
-    },
-  },
-  // A single Repository LSP Index Status object resides in this document index.
-  [RepositoryIndexStatusReservedField]: {
-    properties: {
-      uri: {
-        type: 'text',
-      },
-      progress: {
-        type: 'integer',
-      },
-      timestamp: {
-        type: 'date',
-      },
-      revision: {
-        type: 'keyword',
-      },
-      indexProgress: {
-        properties: {
-          type: {
-            type: 'keyword',
-          },
-          total: {
-            type: 'integer',
-          },
-          success: {
-            type: 'integer',
-          },
-          fail: {
-            type: 'integer',
-          },
-          percentage: {
-            type: 'integer',
-          },
-          checkpoint: {
-            type: 'object',
-          },
-        },
-      },
-      commitIndexProgress: {
-        properties: {
-          type: {
-            type: 'keyword',
-          },
-          total: {
-            type: 'integer',
-          },
-          success: {
-            type: 'integer',
-          },
-          fail: {
-            type: 'integer',
-          },
-          percentage: {
-            type: 'integer',
-          },
-          checkpoint: {
-            type: 'object',
-          },
-        },
-      },
-    },
-  },
-};
-
-export const DocumentAnalysisSettings = {
-  analysis: {
-    analyzer: {
-      content_analyzer: {
-        tokenizer: 'standard',
-        char_filter: ['content_char_filter'],
-        filter: ['lowercase'],
-      },
-      lowercase_analyzer: {
-        type: 'custom',
-        filter: ['lowercase'],
-        tokenizer: 'keyword',
-      },
-      path_analyzer: {
-        type: 'custom',
-        filter: ['lowercase'],
-        tokenizer: 'path_tokenizer',
-      },
-      path_hierarchy_analyzer: {
-        type: 'custom',
-        tokenizer: 'path_hierarchy_tokenizer',
-        filter: ['lowercase'],
-      },
-      qname_path_hierarchy_analyzer: {
-        type: 'custom',
-        tokenizer: 'qname_path_hierarchy_tokenizer',
-        filter: ['lowercase'],
-      },
-    },
-    char_filter: {
-      content_char_filter: {
-        type: 'pattern_replace',
-        pattern: '[.]',
-        replacement: ' ',
-      },
-    },
-    tokenizer: {
-      path_tokenizer: {
-        type: 'pattern',
-        pattern: '[\\\\./]',
-      },
-      qname_path_hierarchy_tokenizer: {
-        type: 'path_hierarchy',
-        delimiter: '.',
-        reverse: 'true',
-      },
-      path_hierarchy_tokenizer: {
-        type: 'path_hierarchy',
-        delimiter: '/',
-        reverse: 'true',
-      },
-    },
-  },
-};
-
-export const DocumentIndexNamePrefix = `.code-document`;
-export const DocumentIndexName = (repoUri: RepositoryUri) => {
-  return `${DocumentIndexNamePrefix}-${RepositoryUtils.normalizeRepoUriToIndexName(repoUri)}`;
-};
-export const DocumentSearchIndexWithScope = (repoScope: RepositoryUri[]) => {
-  return repoScope.map((repoUri: RepositoryUri) => `${DocumentIndexName(repoUri)}*`).join(',');
-};
diff --git a/x-pack/legacy/plugins/code/server/indexer/schema/index.ts b/x-pack/legacy/plugins/code/server/indexer/schema/index.ts
deleted file mode 100644
index 4a6f010a0b6d34..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/schema/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './commit';
-export * from './document';
-export * from './reference';
-export * from './repository';
-export * from './symbol';
diff --git a/x-pack/legacy/plugins/code/server/indexer/schema/reference.ts b/x-pack/legacy/plugins/code/server/indexer/schema/reference.ts
deleted file mode 100644
index 6006e3849c7d01..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/schema/reference.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RepositoryUtils } from '../../../common/repository_utils';
-import { RepositoryUri } from '../../../model';
-
-export const ReferenceSchema = {
-  category: {
-    type: 'keyword',
-  },
-  location: {
-    properties: {
-      uri: {
-        type: 'text',
-      },
-    },
-  },
-  symbol: {
-    properties: {
-      name: {
-        type: 'text',
-      },
-      kind: {
-        type: 'keyword',
-      },
-      location: {
-        properties: {
-          uri: {
-            type: 'text',
-          },
-        },
-      },
-    },
-  },
-};
-
-export const ReferenceIndexNamePrefix = `.code-reference`;
-export const ReferenceIndexName = (repoUri: RepositoryUri) => {
-  return `${ReferenceIndexNamePrefix}-${RepositoryUtils.normalizeRepoUriToIndexName(repoUri)}`;
-};
diff --git a/x-pack/legacy/plugins/code/server/indexer/schema/repository.ts b/x-pack/legacy/plugins/code/server/indexer/schema/repository.ts
deleted file mode 100644
index 3024c0ae2693d8..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/schema/repository.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 {
-  DocumentAnalysisSettings,
-  DocumentIndexName,
-  DocumentIndexNamePrefix,
-  DocumentSchema,
-  DocumentSearchIndexWithScope,
-} from './document';
-
-export const RepositorySchema = DocumentSchema;
-export const RepositoryAnalysisSettings = DocumentAnalysisSettings;
-export const RepositoryIndexNamePrefix = DocumentIndexNamePrefix;
-export const RepositoryIndexName = DocumentIndexName;
-export const RepositorySearchIndexWithScope = DocumentSearchIndexWithScope;
diff --git a/x-pack/legacy/plugins/code/server/indexer/schema/symbol.ts b/x-pack/legacy/plugins/code/server/indexer/schema/symbol.ts
deleted file mode 100644
index d318730f466a62..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/schema/symbol.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RepositoryUtils } from '../../../common/repository_utils';
-import { RepositoryUri } from '../../../model';
-
-export const SymbolSchema = {
-  qname: {
-    type: 'text',
-    analyzer: 'qname_path_hierarchy_case_sensitive_analyzer',
-    fields: {
-      // Create a 'lowercased' field to match query in lowercased mode.
-      lowercased: {
-        type: 'text',
-        analyzer: 'qname_path_hierarchy_case_insensitive_analyzer',
-      },
-    },
-  },
-  symbolInformation: {
-    properties: {
-      name: {
-        type: 'text',
-        analyzer: 'qname_path_hierarchy_case_sensitive_analyzer',
-        fields: {
-          // Create a 'lowercased' field to match query in lowercased mode.
-          lowercased: {
-            type: 'text',
-            analyzer: 'qname_path_hierarchy_case_insensitive_analyzer',
-          },
-        },
-      },
-      kind: {
-        type: 'integer',
-        index: false,
-      },
-      location: {
-        properties: {
-          uri: {
-            // Indexed now for symbols batch deleting in incremental indexing
-            type: 'keyword',
-          },
-        },
-      },
-    },
-  },
-};
-
-export const SymbolAnalysisSettings = {
-  analysis: {
-    analyzer: {
-      qname_path_hierarchy_case_sensitive_analyzer: {
-        type: 'custom',
-        tokenizer: 'qname_path_hierarchy_tokenizer',
-      },
-      qname_path_hierarchy_case_insensitive_analyzer: {
-        type: 'custom',
-        tokenizer: 'qname_path_hierarchy_tokenizer',
-        filter: ['lowercase'],
-      },
-    },
-    tokenizer: {
-      qname_path_hierarchy_tokenizer: {
-        type: 'path_hierarchy',
-        delimiter: '.',
-        reverse: 'true',
-      },
-    },
-  },
-};
-
-export const SymbolIndexNamePrefix = `.code-symbol`;
-export const SymbolIndexName = (repoUri: RepositoryUri) => {
-  return `${SymbolIndexNamePrefix}-${RepositoryUtils.normalizeRepoUriToIndexName(repoUri)}`;
-};
-export const SymbolSearchIndexWithScope = (repoScope: RepositoryUri[]) => {
-  return repoScope.map((repoUri: RepositoryUri) => `${SymbolIndexName(repoUri)}*`).join(',');
-};
diff --git a/x-pack/legacy/plugins/code/server/indexer/schema/version.json b/x-pack/legacy/plugins/code/server/indexer/schema/version.json
deleted file mode 100644
index 00198abef978db..00000000000000
--- a/x-pack/legacy/plugins/code/server/indexer/schema/version.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "codeIndexVersion": "1"
-}
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/code/server/init_es.ts b/x-pack/legacy/plugins/code/server/init_es.ts
deleted file mode 100644
index 0b12cddb739833..00000000000000
--- a/x-pack/legacy/plugins/code/server/init_es.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { IClusterClient } from 'src/core/server';
-import { RepositoryIndexInitializerFactory } from './indexer';
-import { RepositoryConfigController } from './repository_config_controller';
-import { EsClientWithInternalRequest } from './utils/esclient_with_internal_request';
-import { EsClient } from './lib/esqueue';
-import { Logger } from './log';
-
-export async function initEs(cluster: IClusterClient, log: Logger) {
-  const esClient: EsClient = new EsClientWithInternalRequest(cluster);
-  const repoConfigController = new RepositoryConfigController(esClient);
-  const repoIndexInitializerFactory = new RepositoryIndexInitializerFactory(esClient, log);
-  return {
-    esClient,
-    repoConfigController,
-    repoIndexInitializerFactory,
-  };
-}
diff --git a/x-pack/legacy/plugins/code/server/init_local.ts b/x-pack/legacy/plugins/code/server/init_local.ts
deleted file mode 100644
index 4e231316411b92..00000000000000
--- a/x-pack/legacy/plugins/code/server/init_local.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Server } from 'hapi';
-
-import { LoggerFactory } from 'src/core/server';
-import { ServerOptions } from './server_options';
-import { CodeServices } from './distributed/code_services';
-import { EsClient } from './lib/esqueue';
-import { RepositoryConfigController } from './repository_config_controller';
-import { GitOperations } from './git_operations';
-import {
-  getGitServiceHandler,
-  getLspServiceHandler,
-  getWorkspaceHandler,
-  GitServiceDefinition,
-  GitServiceDefinitionOption,
-  LspServiceDefinition,
-  LspServiceDefinitionOption,
-  SetupDefinition,
-  setupServiceHandler,
-  WorkspaceDefinition,
-} from './distributed/apis';
-import { InstallManager } from './lsp/install_manager';
-import { LspService } from './lsp/lsp_service';
-import { ServerLoggerFactory } from './utils/server_logger_factory';
-
-export function initLocalService(
-  server: Server,
-  loggerFactory: LoggerFactory,
-  serverOptions: ServerOptions,
-  codeServices: CodeServices,
-  esClient: EsClient,
-  repoConfigController: RepositoryConfigController
-) {
-  // Initialize git operations
-  const gitOps = new GitOperations(serverOptions.repoPath);
-  codeServices.registerHandler(
-    GitServiceDefinition,
-    getGitServiceHandler(gitOps),
-    GitServiceDefinitionOption
-  );
-
-  const serverLoggerFactory = new ServerLoggerFactory(loggerFactory, serverOptions.verbose);
-  const installManager = new InstallManager(server, serverOptions);
-  const lspService = new LspService(
-    '127.0.0.1',
-    serverOptions,
-    gitOps,
-    esClient,
-    installManager,
-    serverLoggerFactory,
-    repoConfigController
-  );
-  server.events.on('stop', async () => {
-    loggerFactory.get().debug('shutdown lsp process');
-    await lspService.shutdown();
-  });
-  codeServices.registerHandler(
-    LspServiceDefinition,
-    getLspServiceHandler(lspService),
-    LspServiceDefinitionOption
-  );
-  codeServices.registerHandler(
-    WorkspaceDefinition,
-    getWorkspaceHandler(serverLoggerFactory, lspService.workspaceHandler)
-  );
-  codeServices.registerHandler(SetupDefinition, setupServiceHandler);
-
-  return { gitOps, lspService, installManager };
-}
diff --git a/x-pack/legacy/plugins/code/server/init_queue.ts b/x-pack/legacy/plugins/code/server/init_queue.ts
deleted file mode 100644
index 12e8eeba15760b..00000000000000
--- a/x-pack/legacy/plugins/code/server/init_queue.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 { EsClient, Esqueue } from './lib/esqueue';
-import { Logger } from './log';
-import { ServerOptions } from './server_options';
-
-export function initQueue(serverOptions: ServerOptions, log: Logger, esClient: EsClient) {
-  const queueIndex: string = serverOptions.queueIndex;
-  const queueTimeoutMs: number = serverOptions.queueTimeoutMs;
-  const queue = new Esqueue(queueIndex, {
-    client: esClient,
-    timeout: queueTimeoutMs,
-  });
-  return queue;
-}
diff --git a/x-pack/legacy/plugins/code/server/init_workers.ts b/x-pack/legacy/plugins/code/server/init_workers.ts
deleted file mode 100644
index f20adf375f9a32..00000000000000
--- a/x-pack/legacy/plugins/code/server/init_workers.ts
+++ /dev/null
@@ -1,105 +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 checkDiskSpace from 'check-disk-space';
-
-import { IndexerType } from '../model';
-import { DiskWatermarkService } from './disk_watermark';
-import { EsClient, Esqueue } from './lib/esqueue';
-import { LspService } from './lsp/lsp_service';
-import { GitOperations } from './git_operations';
-import { ServerOptions } from './server_options';
-import { CodeServices } from './distributed/code_services';
-import { CommitIndexerFactory, IndexerFactory, LspIndexerFactory } from './indexer';
-import { CancellationSerivce, CloneWorker, DeleteWorker, IndexWorker, UpdateWorker } from './queue';
-import { RepositoryServiceFactory } from './repository_service_factory';
-import { getRepositoryHandler, RepositoryServiceDefinition } from './distributed/apis';
-import { CloneScheduler, IndexScheduler, UpdateScheduler } from './scheduler';
-import { Logger } from './log';
-
-export function initWorkers(
-  log: Logger,
-  esClient: EsClient,
-  queue: Esqueue,
-  lspService: LspService,
-  gitOps: GitOperations,
-  serverOptions: ServerOptions,
-  codeServices: CodeServices
-) {
-  // Initialize indexing factories.
-  const lspIndexerFactory = new LspIndexerFactory(lspService, serverOptions, gitOps, esClient, log);
-  const indexerFactoryMap: Map<IndexerType, IndexerFactory> = new Map();
-  indexerFactoryMap.set(IndexerType.LSP, lspIndexerFactory);
-
-  if (serverOptions.enableCommitIndexing) {
-    const commitIndexerFactory = new CommitIndexerFactory(gitOps, esClient, log);
-    indexerFactoryMap.set(IndexerType.COMMIT, commitIndexerFactory);
-  }
-
-  // Initialize queue worker cancellation service.
-  const cancellationService = new CancellationSerivce();
-  const indexWorker = new IndexWorker(
-    queue,
-    log,
-    esClient,
-    indexerFactoryMap,
-    gitOps,
-    cancellationService
-  ).bind(codeServices);
-
-  const repoServiceFactory: RepositoryServiceFactory = new RepositoryServiceFactory();
-
-  const watermarkService = new DiskWatermarkService(checkDiskSpace, serverOptions, log);
-  const cloneWorker = new CloneWorker(
-    queue,
-    log,
-    esClient,
-    serverOptions,
-    gitOps,
-    indexWorker,
-    repoServiceFactory,
-    cancellationService,
-    watermarkService
-  ).bind(codeServices);
-  const deleteWorker = new DeleteWorker(
-    queue,
-    log,
-    esClient,
-    serverOptions,
-    gitOps,
-    cancellationService,
-    lspService,
-    repoServiceFactory
-  ).bind(codeServices);
-  const updateWorker = new UpdateWorker(
-    queue,
-    log,
-    esClient,
-    serverOptions,
-    gitOps,
-    repoServiceFactory,
-    cancellationService,
-    watermarkService
-  ).bind(codeServices);
-  codeServices.registerHandler(
-    RepositoryServiceDefinition,
-    getRepositoryHandler(cloneWorker, deleteWorker, indexWorker)
-  );
-
-  // Initialize schedulers.
-  const updateScheduler = new UpdateScheduler(updateWorker, serverOptions, esClient, log);
-  const indexScheduler = new IndexScheduler(indexWorker, serverOptions, esClient, log);
-  updateScheduler.start();
-  indexScheduler.start();
-  // Check if the repository is local on the file system.
-  // This should be executed once at the startup time of Kibana.
-  // Ignored in cluster mode, leave it to the node level control loop
-  if (!serverOptions.clusterEnabled) {
-    const cloneScheduler = new CloneScheduler(cloneWorker, serverOptions, esClient, log);
-    cloneScheduler.schedule();
-  }
-  return { indexScheduler, updateScheduler, cloneWorker, deleteWorker, indexWorker, updateWorker };
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/default_settings.js b/x-pack/legacy/plugins/code/server/lib/esqueue/constants/default_settings.js
deleted file mode 100644
index 5df580a063dd9f..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/default_settings.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const defaultSettings = {
-  DEFAULT_SETTING_TIMEOUT: 10000,
-  DEFAULT_SETTING_DATE_SEPARATOR: '-',
-  DEFAULT_SETTING_INTERVAL: 'week',
-  DEFAULT_SETTING_INDEX_SETTINGS: {
-    number_of_shards: 1,
-    auto_expand_replicas: '0-1',
-  },
-};
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/events.d.ts b/x-pack/legacy/plugins/code/server/lib/esqueue/constants/events.d.ts
deleted file mode 100644
index e160951d541836..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/events.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-declare class Events {
-  public EVENT_QUEUE_ERROR: 'queue:error';
-  public EVENT_JOB_ERROR: 'job:error';
-  public EVENT_JOB_CREATED: 'job:created';
-  public EVENT_JOB_CREATE_ERROR: 'job:creation error';
-  public EVENT_WORKER_COMPLETE: 'worker:job complete';
-  public EVENT_WORKER_RESET_PROCESSING_JOB_ERROR: 'worker:reset job processing error';
-  public EVENT_WORKER_JOB_CLAIM_ERROR: 'worker:claim job error';
-  public EVENT_WORKER_JOB_SEARCH_ERROR: 'worker:pending jobs error';
-  public EVENT_WORKER_JOB_UPDATE_ERROR: 'worker:update job error';
-  public EVENT_WORKER_JOB_FAIL: 'worker:job failed';
-  public EVENT_WORKER_JOB_FAIL_ERROR: 'worker:failed job update error';
-  public EVENT_WORKER_JOB_EXECUTION_ERROR: 'worker:job execution error';
-  public EVENT_WORKER_JOB_TIMEOUT: 'worker:job timeout';
-}
-
-declare const events: Events;
-
-export { events };
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/events.js b/x-pack/legacy/plugins/code/server/lib/esqueue/constants/events.js
deleted file mode 100644
index 126f0eb51f2c91..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/events.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const events = {
-  EVENT_QUEUE_ERROR: 'queue:error',
-  EVENT_JOB_ERROR: 'job:error',
-  EVENT_JOB_CREATED: 'job:created',
-  EVENT_JOB_CREATE_ERROR: 'job:creation error',
-  EVENT_WORKER_COMPLETE: 'worker:job complete',
-  EVENT_WORKER_RESET_PROCESSING_JOB_ERROR: 'worker:reset job processing error',
-  EVENT_WORKER_JOB_CLAIM_ERROR: 'worker:claim job error',
-  EVENT_WORKER_JOB_SEARCH_ERROR: 'worker:pending jobs error',
-  EVENT_WORKER_JOB_UPDATE_ERROR: 'worker:update job error',
-  EVENT_WORKER_JOB_FAIL: 'worker:job failed',
-  EVENT_WORKER_JOB_FAIL_ERROR: 'worker:failed job update error',
-  EVENT_WORKER_JOB_EXECUTION_ERROR: 'worker:job execution error',
-  EVENT_WORKER_JOB_TIMEOUT: 'worker:job timeout',
-};
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/index.js b/x-pack/legacy/plugins/code/server/lib/esqueue/constants/index.js
deleted file mode 100644
index 5f9efddc82dfdb..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { events } from './events';
-import { statuses } from './statuses';
-import { defaultSettings } from './default_settings';
-
-export const constants = {
-  ...events,
-  ...statuses,
-  ...defaultSettings
-};
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/statuses.d.ts b/x-pack/legacy/plugins/code/server/lib/esqueue/constants/statuses.d.ts
deleted file mode 100644
index 43b96237de27e1..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/statuses.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export type Status = 'pending' | 'processing' | 'completed' | 'failed' | 'cancelled';
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/statuses.js b/x-pack/legacy/plugins/code/server/lib/esqueue/constants/statuses.js
deleted file mode 100644
index 620a567e18fe71..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/constants/statuses.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const statuses = {
-  JOB_STATUS_PENDING: 'pending',
-  JOB_STATUS_PROCESSING: 'processing',
-  JOB_STATUS_COMPLETED: 'completed',
-  JOB_STATUS_FAILED: 'failed',
-  JOB_STATUS_CANCELLED: 'cancelled',
-};
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/esqueue.d.ts b/x-pack/legacy/plugins/code/server/lib/esqueue/esqueue.d.ts
deleted file mode 100644
index 14f7c3da46c68b..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/esqueue.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EventEmitter } from 'events';
-
-import { events } from './constants/events';
-import { Job, JobOptions } from './job';
-import { AnyObject, EsClient, LogFn } from './misc';
-import { Worker, WorkerFn, WorkerOptions, WorkerOutput } from './worker';
-
-export class Esqueue extends EventEmitter {
-  constructor(
-    /**
-     * The base name Esqueue will use for its time-based job indices in Elasticsearch. This
-     * will have a date string appended to it to determine the actual index name.
-     */
-    index: string,
-    options: {
-      /**
-       * The Elasticsearch client EsQueue will use to query ES and manage its queue indices
-       */
-      client: EsClient;
-
-      /**
-       * A function that Esqueue will call with log messages
-       */
-      logger?: LogFn;
-
-      /**
-       * Interval that Esqueue will use when creating its time-based job indices in Elasticsearch
-       */
-      interval?: 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute';
-
-      /**
-       * Default job timeout
-       */
-      timeout?: number;
-
-      /**
-       * The value used to separate the parts of the date in index names created by Esqueue
-       */
-      dateSeparator?: string;
-
-      /**
-       * Arbitrary settings that will be merged with the default index settings EsQueue uses to
-       * create elastcisearch indices
-       */
-      indexSettings?: AnyObject;
-    }
-  );
-
-  public addJob<P, J = Job<P>>(type: string, payload: P, options: JobOptions): J;
-
-  public registerWorker<P, R extends WorkerOutput, W = Worker<P, R>>(
-    this: void,
-    type: string,
-    workerFn: WorkerFn<P, R>,
-    opts?: Pick<WorkerOptions, Exclude<keyof WorkerOptions, 'logger'>>
-  ): W;
-  public destroy(): void;
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/esqueue.js b/x-pack/legacy/plugins/code/server/lib/esqueue/esqueue.js
deleted file mode 100644
index 360a2aebf63051..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/esqueue.js
+++ /dev/null
@@ -1,82 +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.
- */
-
-/*
- * Borrowed from https://github.com/elastic/kibana/tree/master/x-pack/legacy/plugins/reporting/server/lib/esqueue
- * TODO(mengwei): need to abstract this esqueue as a common library when merging into kibana's main repo.
- */
-
-import { EventEmitter } from 'events';
-import { Job } from './job';
-import { Worker } from './worker';
-import { constants } from './constants';
-import { indexTimestamp } from './helpers/index_timestamp';
-
-function omit(obj, keysToOmit) {
-  return Object.keys(obj).reduce((acc, key) => (
-    keysToOmit.includes(key) ? acc : { ...acc, [key]: obj[key] }
-  ), {});
-}
-
-export class Esqueue extends EventEmitter {
-  constructor(index, options = {}) {
-    if (!index) throw new Error('Must specify an index to write to');
-
-    super();
-    this.index = index;
-    this.settings = {
-      interval: constants.DEFAULT_SETTING_INTERVAL,
-      timeout: constants.DEFAULT_SETTING_TIMEOUT,
-      dateSeparator: constants.DEFAULT_SETTING_DATE_SEPARATOR,
-      ...omit(options, ['client'])
-    };
-    this.client = options.client;
-    this._logger = options.logger || function () {};
-    this._workers = [];
-    this._initTasks().catch((err) => this.emit(constants.EVENT_QUEUE_ERROR, err));
-  }
-
-  _initTasks() {
-    const initTasks = [
-      this.client.ping(),
-    ];
-
-    return Promise.all(initTasks).catch((err) => {
-      this._logger(err, ['initTasks', 'error']);
-      throw err;
-    });
-  }
-
-  addJob(type, payload, opts = {}) {
-    const timestamp = indexTimestamp(this.settings.interval, this.settings.dateSeparator);
-    const index = `${this.index}-${timestamp}`;
-    const defaults = {
-      timeout: this.settings.timeout,
-    };
-
-    const options = Object.assign(defaults, opts, {
-      indexSettings: this.settings.indexSettings,
-      logger: this._logger
-    });
-
-    return new Job(this, index, type, payload, options);
-  }
-
-  registerWorker(type, workerFn, opts) {
-    const worker = new Worker(this, type, workerFn, { ...opts, logger: this._logger });
-    this._workers.push(worker);
-    return worker;
-  }
-
-  getWorkers() {
-    return this._workers.map((fn) => fn);
-  }
-
-  destroy() {
-    const workers = this._workers.filter((worker) => worker.destroy());
-    this._workers = workers;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/cancellation_token.d.ts b/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/cancellation_token.d.ts
deleted file mode 100644
index b0452b61022dc5..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/cancellation_token.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export class CancellationToken {
-  public on(callback: (reason: string) => void): void;
-  public cancel(reason: string): void;
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/cancellation_token.js b/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/cancellation_token.js
deleted file mode 100644
index 0996d9725132f6..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/cancellation_token.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export class CancellationToken {
-  constructor() {
-    this.isCancelled = false;
-    this._callbacks = [];
-  }
-
-  on = (callback) => {
-    if (typeof callback !== 'function') {
-      throw new Error('Expected callback to be a function');
-    }
-
-    if (this.isCancelled) {
-      return;
-    }
-
-    this._callbacks.push(callback);
-  };
-
-  cancel = (reason) => {
-    this.isCancelled = true;
-    this._callbacks.forEach(callback => callback(reason));
-  };
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/create_index.js b/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/create_index.js
deleted file mode 100644
index 48af625311bea5..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/create_index.js
+++ /dev/null
@@ -1,90 +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 { constants } from '../constants';
-
-const schema = {
-  meta: {
-    // We are indexing these properties with both text and keyword fields because that's what will be auto generated
-    // when an index already exists. This schema is only used when a reporting index doesn't exist.  This way existing
-    // reporting indexes and new reporting indexes will look the same and the data can be queried in the same
-    // manner.
-    properties: {
-      /**
-       * Type of object that is triggering this report. Should be either search, visualization or dashboard.
-       * Used for phone home stats only.
-       */
-      objectType: {
-        type: 'text',
-        fields: {
-          keyword: {
-            type: 'keyword',
-            ignore_above: 256
-          }
-        }
-      },
-      /**
-       * Can be either preserve_layout, print or none (in the case of csv export).
-       * Used for phone home stats only.
-       */
-      layout: {
-        type: 'text',
-        fields: {
-          keyword: {
-            type: 'keyword',
-            ignore_above: 256
-          }
-        }
-      },
-    }
-  },
-  jobtype: { type: 'keyword' },
-  payload: { type: 'object', enabled: false },
-  priority: { type: 'byte' },
-  timeout: { type: 'long' },
-  process_expiration: { type: 'date' },
-  created_by: { type: 'keyword' },
-  created_at: { type: 'date' },
-  started_at: { type: 'date' },
-  completed_at: { type: 'date' },
-  attempts: { type: 'short' },
-  max_attempts: { type: 'short' },
-  status: { type: 'keyword' },
-  output: {
-    type: 'object',
-    properties: {
-      content_type: { type: 'keyword' },
-      content: { type: 'object', enabled: false }
-    }
-  }
-};
-
-export function createIndex(client, indexName,
-  indexSettings = { }) {
-  const body = {
-    settings: {
-      ...constants.DEFAULT_SETTING_INDEX_SETTINGS,
-      ...indexSettings
-    },
-    mappings: {
-      properties: schema
-    }
-  };
-
-  return client.indices.exists({
-    index: indexName,
-  })
-    .then((exists) => {
-      if (!exists) {
-        return client.indices.create({
-          index: indexName,
-          body: body
-        })
-          .then(() => true);
-      }
-      return exists;
-    });
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/errors.js b/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/errors.js
deleted file mode 100644
index b8be62d5ad4554..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/errors.js
+++ /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.
- */
-
-export function WorkerTimeoutError(message, props = {}) {
-  this.name = 'WorkerTimeoutError';
-  this.message = message;
-  this.timeout = props.timeout;
-  this.jobId = props.jobId;
-
-  if ('captureStackTrace' in Error) Error.captureStackTrace(this, WorkerTimeoutError);
-  else this.stack = (new Error()).stack;
-}
-WorkerTimeoutError.prototype = Object.create(Error.prototype);
-
-export function UnspecifiedWorkerError(message, props = {}) {
-  this.name = 'UnspecifiedWorkerError';
-  this.message = message;
-  this.jobId = props.jobId;
-
-  if ('captureStackTrace' in Error) Error.captureStackTrace(this, UnspecifiedWorkerError);
-  else this.stack = (new Error()).stack;
-}
-UnspecifiedWorkerError.prototype = Object.create(Error.prototype);
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/index_timestamp.js b/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/index_timestamp.js
deleted file mode 100644
index c03be000306503..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/index_timestamp.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import moment from 'moment';
-
-export const intervals = [
-  'year',
-  'month',
-  'week',
-  'day',
-  'hour',
-  'minute'
-];
-
-export function indexTimestamp(intervalStr, separator = '-') {
-  if (separator.match(/[a-z]/i)) throw new Error('Interval separator can not be a letter');
-
-  const index = intervals.indexOf(intervalStr);
-  if (index === -1) throw new Error('Invalid index interval: ', intervalStr);
-
-  const m = moment();
-  m.startOf(intervalStr);
-
-  let dateString;
-  switch (intervalStr) {
-    case 'year':
-      dateString = 'YYYY';
-      break;
-    case 'month':
-      dateString = `YYYY${separator}MM`;
-      break;
-    case 'hour':
-      dateString = `YYYY${separator}MM${separator}DD${separator}HH`;
-      break;
-    case 'minute':
-      dateString = `YYYY${separator}MM${separator}DD${separator}HH${separator}mm`;
-      break;
-    default:
-      dateString = `YYYY${separator}MM${separator}DD`;
-  }
-
-  return m.format(dateString);
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/poller.js b/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/poller.js
deleted file mode 100644
index fd6a878b4e7d63..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/helpers/poller.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/*
- * Borrowed from https://github.com/elastic/kibana/blob/master/x-pack/legacy/common/poller.js
- */
-
-import _ from 'lodash';
-
-export class Poller {
-
-  constructor(options) {
-    this.functionToPoll = options.functionToPoll; // Must return a Promise
-    this.successFunction = options.successFunction || _.noop;
-    this.errorFunction = options.errorFunction || _.noop;
-    this.pollFrequencyInMillis = options.pollFrequencyInMillis;
-    this.trailing = options.trailing || false;
-    this.continuePollingOnError = options.continuePollingOnError || false;
-    this.pollFrequencyErrorMultiplier = options.pollFrequencyErrorMultiplier || 1;
-    this._timeoutId = null;
-    this._isRunning = false;
-  }
-
-  getPollFrequency() {
-    return this.pollFrequencyInMillis;
-  }
-
-  _poll() {
-    return this.functionToPoll()
-      .then(this.successFunction)
-      .then(() => {
-        if (!this._isRunning) {
-          return;
-        }
-
-        this._timeoutId = setTimeout(this._poll.bind(this), this.pollFrequencyInMillis);
-      })
-      .catch(e => {
-        this.errorFunction(e);
-        if (!this._isRunning) {
-          return;
-        }
-
-        if (this.continuePollingOnError) {
-          this._timeoutId = setTimeout(this._poll.bind(this), this.pollFrequencyInMillis * this.pollFrequencyErrorMultiplier);
-        } else {
-          this.stop();
-        }
-      });
-  }
-
-  start() {
-    if (this._isRunning) {
-      return;
-    }
-
-    this._isRunning = true;
-    if (this.trailing) {
-      this._timeoutId = setTimeout(this._poll.bind(this), this.pollFrequencyInMillis);
-    } else {
-      this._poll();
-    }
-  }
-
-  stop() {
-    if (!this._isRunning) {
-      return;
-    }
-
-    this._isRunning = false;
-    clearTimeout(this._timeoutId);
-    this._timeoutId = null;
-  }
-
-  isRunning() {
-    return this._isRunning;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/index.d.ts b/x-pack/legacy/plugins/code/server/lib/esqueue/index.d.ts
deleted file mode 100644
index d276e06b3a139d..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { events } from './constants/events';
-export { CancellationToken } from './helpers/cancellation_token';
-export { Job } from './job';
-export { Worker, WorkerOutput } from './worker';
-export { Esqueue } from './esqueue';
-export { AnyObject, EsClient } from './misc';
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/index.js b/x-pack/legacy/plugins/code/server/lib/esqueue/index.js
deleted file mode 100644
index 54c7502630715d..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { CancellationToken } from './helpers/cancellation_token';
-export { events } from './constants/events';
-export { Esqueue } from './esqueue';
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/job.d.ts b/x-pack/legacy/plugins/code/server/lib/esqueue/job.d.ts
deleted file mode 100644
index 5d8784a9acf571..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/job.d.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EventEmitter } from 'events';
-
-import { events } from './constants/events';
-import { Status } from './constants/statuses';
-import { Esqueue } from './esqueue';
-import { CancellationToken } from './helpers/cancellation_token';
-import { AnyObject, EsClient, LogFn } from './misc';
-
-export interface JobOptions {
-  client?: EsClient;
-  indexSettings?: string;
-  created_by?: string;
-  timeout?: number;
-  max_attempts?: number;
-  priority?: number;
-  headers?: {
-    [key: string]: string;
-  };
-  logger?: LogFn;
-}
-
-type OptionalPropType<T, P> = P extends keyof T ? T[P] : void;
-
-export class Job<P> extends EventEmitter {
-  public queue: Esqueue;
-  public client: EsClient;
-  public id: string;
-  public index: string;
-  public jobtype: string;
-  public payload: P;
-  public created_by: string | false; // tslint:disable-line variable-name
-  public timeout: number;
-  public maxAttempts: number;
-  public priority: number;
-  public indexSettings: AnyObject;
-  public ready: Promise<void>;
-
-  constructor(queue: Esqueue, index: string, type: string, payload: P, options?: JobOptions);
-
-  /**
-   * Read the job document out of elasticsearch, includes its current
-   * status and posisble result.
-   */
-  public get(): Promise<{
-    // merged in get() method
-    index: string;
-    id: string;
-    type: string;
-    version: number;
-
-    // from doc._source
-    jobtype: string;
-    meta: {
-      objectType: OptionalPropType<P, 'type'>;
-      layout: OptionalPropType<P, 'layout'>;
-    };
-    payload: P;
-    priority: number;
-    created_by: string | false;
-    timeout: number;
-    process_expiration: string; // use epoch so the job query works
-    created_at: string;
-    attempts: number;
-    max_attempts: number;
-    status: Status;
-  }>;
-
-  /**
-   * Get a plain JavaScript representation of the Job object
-   */
-  public toJSON(): {
-    id: string;
-    index: string;
-    type: string;
-    jobtype: string;
-    created_by: string | false;
-    payload: P;
-    timeout: number;
-    max_attempts: number;
-    priority: number;
-  };
-
-  public on(
-    name: typeof events['EVENT_JOB_CREATED'],
-    handler: (info: { id: string; type: string; index: string; version: number }) => void
-  ): this;
-  public on(name: typeof events['EVENT_JOB_CREATE_ERROR'], handler: (error: Error) => void): this;
-  public on(name: string, ...args: any[]): this;
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/job.js b/x-pack/legacy/plugins/code/server/lib/esqueue/job.js
deleted file mode 100644
index 4c8f5ee73b2776..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/job.js
+++ /dev/null
@@ -1,134 +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 events from 'events';
-
-import Puid from 'puid';
-
-import { constants } from './constants';
-import { createIndex } from './helpers/create_index';
-
-const puid = new Puid();
-
-export class Job extends events.EventEmitter {
-  constructor(queue, index, type, payload, options = {}) {
-    if (typeof type !== 'string') throw new Error('Type must be a string');
-    if (!payload || typeof payload !== 'object') throw new Error('Payload must be a plain object');
-
-    super();
-
-    this.queue = queue;
-    this.client = options.client || this.queue.client;
-    this.id = puid.generate();
-    this.index = index;
-    this.jobtype = type;
-    this.payload = payload;
-    this.created_by = options.created_by || false;
-    this.timeout = options.timeout || 10000;
-    this.maxAttempts = options.max_attempts || 3;
-    this.priority = Math.max(Math.min(options.priority || 10, 20), -20);
-    this.indexSettings = options.indexSettings || {};
-
-    this.debug = (msg, err) => {
-      const logger = options.logger || function () {};
-      const message = `${this.id} - ${msg}`;
-      const tags = ['job', 'debug'];
-
-      if (err) {
-        logger(`${message}: ${err}`, tags);
-        return;
-      }
-
-      logger(message, tags);
-    };
-
-    const indexParams = {
-      index: this.index,
-      id: this.id,
-      body: {
-        jobtype: this.jobtype,
-        meta: {
-          // We are copying these values out of payload because these fields are indexed and can be aggregated on
-          // for tracking stats, while payload contents are not.
-          objectType: payload.type,
-          layout: payload.layout ? payload.layout.id : 'none',
-        },
-        payload: this.payload,
-        priority: this.priority,
-        created_by: this.created_by,
-        timeout: this.timeout,
-        process_expiration: new Date(0), // use epoch so the job query works
-        created_at: new Date(),
-        attempts: 0,
-        max_attempts: this.maxAttempts,
-        status: constants.JOB_STATUS_PENDING,
-      }
-    };
-
-    if (options.headers) {
-      indexParams.headers = options.headers;
-    }
-
-    this.ready = createIndex(this.client, this.index, this.indexSettings)
-      .then(() => this.client.index(indexParams))
-      .then((doc) => {
-        this.document = {
-          id: doc._id,
-          type: doc._type,
-          index: doc._index,
-          version: doc._version,
-        };
-        this.debug(`Job created in index ${this.index}`);
-
-        return this.client.indices.refresh({
-          index: this.index
-        }).then(() => {
-          this.debug(`Job index refreshed ${this.index}`);
-          this.emit(constants.EVENT_JOB_CREATED, this.document);
-        });
-      })
-      .catch((err) => {
-        this.debug('Job creation failed', err);
-        this.emit(constants.EVENT_JOB_CREATE_ERROR, err);
-      });
-  }
-
-  emit(name, ...args) {
-    super.emit(name, ...args);
-    this.queue.emit(name, ...args);
-  }
-
-  get() {
-    return this.ready
-      .then(() => {
-        return this.client.get({
-          index: this.index,
-          id: this.id
-        });
-      })
-      .then((doc) => {
-        return Object.assign(doc._source, {
-          index: doc._index,
-          id: doc._id,
-          type: doc._type,
-          version: doc._version,
-        });
-      });
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      index: this.index,
-      jobtype: this.jobtype,
-      created_by: this.created_by,
-      payload: this.payload,
-      timeout: this.timeout,
-      max_attempts: this.maxAttempts,
-      priority: this.priority
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/misc.d.ts b/x-pack/legacy/plugins/code/server/lib/esqueue/misc.d.ts
deleted file mode 100644
index f4ade9c72204d9..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/misc.d.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export interface AnyObject {
-  [key: string]: any;
-}
-
-export interface EsClient {
-  indices: {
-    exists(params: AnyObject): Promise<any>;
-    create(params: AnyObject): Promise<any>;
-    refresh(params: AnyObject): Promise<any>;
-    delete(params: AnyObject): Promise<any>;
-
-    existsAlias(params: AnyObject): Promise<any>;
-    getAlias(params: AnyObject): Promise<any>;
-    putAlias(params: AnyObject): Promise<any>;
-    deleteAlias(params: AnyObject): Promise<any>;
-    updateAliases(params: AnyObject): Promise<any>;
-
-    getMapping(params: AnyObject): Promise<any>;
-  };
-
-  ping(): Promise<void>;
-  bulk(params: AnyObject): Promise<any>;
-  index(params: AnyObject): Promise<any>;
-  get(params: AnyObject): Promise<any>;
-  update(params: AnyObject): Promise<any>;
-  reindex(params: AnyObject): Promise<any>;
-  search(params: AnyObject): Promise<any>;
-  delete(params: AnyObject): Promise<any>;
-  deleteByQuery(params: AnyObject): Promise<any>;
-  updateByQuery(params: AnyObject): Promise<any>;
-}
-
-export type LogFn = (msg: string | Error, tags: string[]) => void;
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/worker.d.ts b/x-pack/legacy/plugins/code/server/lib/esqueue/worker.d.ts
deleted file mode 100644
index 7fe6cc630af9f3..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/worker.d.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EventEmitter } from 'events';
-
-import { events } from './constants/events';
-import { Esqueue } from './esqueue';
-import { CancellationToken } from './helpers/cancellation_token';
-import { Job } from './job';
-import { AnyObject, EsClient, LogFn } from './misc';
-
-type Handler<A> = (arg: A) => void;
-
-interface JobInfo {
-  index: string;
-  type: string;
-  id: string;
-}
-
-interface WorkerInfo {
-  id: string;
-  index: string;
-  jobType: string;
-}
-
-interface ErrorInfo {
-  error: Error;
-  worker: WorkerInfo;
-  job: JobInfo;
-}
-
-interface ErrorInfoNoJob {
-  error: Error;
-  worker: WorkerInfo;
-}
-
-type WorkerOutput<T = any> = {
-  content: T;
-  content_type: string;
-  max_size_reached?: any;
-} | void;
-
-export type WorkerFn<P, R extends WorkerOutput> = (
-  payload: P,
-  cancellationToken: CancellationToken
-) => Promise<R>;
-
-export interface WorkerOptions {
-  interval: number;
-  capacity: number;
-  intervalErrorMultiplier: number;
-  client?: EsClient;
-  size?: number;
-  logger?: LogFn;
-}
-
-export class Worker<P, O extends WorkerOutput> extends EventEmitter {
-  public id: string;
-  public queue: Esqueue;
-  public client: EsClient;
-  public jobType: string;
-  public workerFn: WorkerFn<P, O>;
-  public checkSize: number;
-  constructor(queue: Esqueue, type: string, workerFn: WorkerFn<P, O>, opts: WorkerOptions);
-
-  public destroy(): void;
-
-  /**
-   * Get a plain JavaScript object describing this worker
-   */
-  public toJSON(): {
-    id: string;
-    index: string;
-    jobType: string;
-  };
-
-  public on(
-    name: typeof events['EVENT_WORKER_COMPLETE'],
-    h: Handler<{
-      job: {
-        index: string;
-        type: string;
-        id: string;
-      };
-      output: O;
-    }>
-  ): this;
-  public on(name: typeof events['EVENT_WORKER_JOB_CLAIM_ERROR'], h: Handler<ErrorInfo>): this;
-  public on(name: typeof events['EVENT_WORKER_JOB_SEARCH_ERROR'], h: Handler<ErrorInfoNoJob>): this;
-  public on(
-    name: typeof events['EVENT_WORKER_JOB_FAIL'],
-    h: Handler<{ job: JobInfo; worker: WorkerInfo; output: O }>
-  ): this;
-  public on(name: string, ...args: any[]): this;
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/worker.js b/x-pack/legacy/plugins/code/server/lib/esqueue/worker.js
deleted file mode 100644
index 6c8d8442741ba6..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/worker.js
+++ /dev/null
@@ -1,489 +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 events from 'events';
-import Puid from 'puid';
-import moment from 'moment';
-import { constants } from './constants';
-import { WorkerTimeoutError, UnspecifiedWorkerError } from './helpers/errors';
-import { CancellationToken } from './helpers/cancellation_token';
-import { Poller } from './helpers/poller';
-
-const puid = new Puid();
-
-function formatJobObject(job) {
-  return {
-    index: job._index,
-    id: job._id,
-    // Expose the payload of the job even when the job failed/timeout
-    ...job._source.payload,
-  };
-}
-
-export class Worker extends events.EventEmitter {
-  constructor(queue, type, workerFn, opts) {
-    if (typeof type !== 'string') throw new Error('type must be a string');
-    if (typeof workerFn !== 'function') throw new Error('workerFn must be a function');
-    if (typeof opts !== 'object') throw new Error('opts must be an object');
-    if (typeof opts.interval !== 'number') throw new Error('opts.interval must be a number');
-    if (typeof opts.intervalErrorMultiplier !== 'number') throw new Error('opts.intervalErrorMultiplier must be a number');
-
-    super();
-
-    this.id = puid.generate();
-    this.queue = queue;
-    this.client = opts.client || this.queue.client;
-    this.codeServices = opts.codeServices;
-    this.jobtype = type;
-    this.workerFn = workerFn;
-    this.checkSize = opts.size || 10;
-    this.capacity = opts.capacity || 2;
-    this.processingJobCount = 0;
-
-    this.debug = (msg, err) => {
-      const logger = opts.logger || function () {};
-
-      const message = `${this.id} - ${msg}`;
-      const tags = ['worker', 'debug'];
-
-      if (err) {
-        logger(`${message}: ${err.stack  ? err.stack : err }`, tags);
-        return;
-      }
-
-      logger(message, tags);
-    };
-
-    this._running = true;
-    this.debug(`Created worker for job type ${this.jobtype}`);
-
-    this._poller = new Poller({
-      functionToPoll: () => {
-        this._processPendingJobs();
-        // Return an empty promise so that the processing jobs won't block the next poll.
-        return Promise.resolve();
-      },
-      pollFrequencyInMillis: opts.interval,
-      trailing: true,
-      continuePollingOnError: true,
-      pollFrequencyErrorMultiplier: opts.intervalErrorMultiplier,
-    });
-    // Reset all the existing processing jobs of this particular type.
-    this._resetProcessingJobs();
-    this._startJobPolling();
-  }
-
-  destroy() {
-    this._running = false;
-    this._stopJobPolling();
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      index: this.queue.index,
-      jobType: this.jobType,
-    };
-  }
-
-  emit(name, ...args) {
-    super.emit(name, ...args);
-    this.queue.emit(name, ...args);
-  }
-
-  _formatErrorParams(err, job) {
-    const response = {
-      error: err,
-      worker: this.toJSON(),
-    };
-
-    if (job) response.job = formatJobObject(job);
-    return response;
-  }
-
-  _claimJob(job) {
-    const m = moment();
-    const startTime = m.toISOString();
-    const expirationTime = m.add(job._source.timeout).toISOString();
-    const attempts = job._source.attempts + 1;
-
-    if (attempts > job._source.max_attempts) {
-      const msg = (!job._source.output) ? `Max attempts reached (${job._source.max_attempts})` : false;
-      return this._failJob(job, msg)
-        .then(() => false);
-    }
-
-    const doc = {
-      attempts: attempts,
-      started_at: startTime,
-      process_expiration: expirationTime,
-      status: constants.JOB_STATUS_PROCESSING,
-    };
-
-    return this.client.update({
-      index: job._index,
-      id: job._id,
-      if_seq_no: job._seq_no,
-      if_primary_term: job._primary_term,
-      body: { doc }
-    })
-      .then((response) => {
-        const updatedJob = {
-          ...job,
-          ...response
-        };
-        updatedJob._source = {
-          ...job._source,
-          ...doc
-        };
-        return updatedJob;
-      })
-      .catch((err) => {
-        if (err.statusCode === 409) return true;
-        this.debug(`_claimJob failed on job ${job._id}`, err);
-        this.emit(constants.EVENT_WORKER_JOB_CLAIM_ERROR, this._formatErrorParams(err, job));
-        return false;
-      });
-  }
-
-  _failJob(job, output = false) {
-    this.debug(`Failing job ${job._id}`);
-
-    const completedTime = moment().toISOString();
-    const docOutput = this._formatOutput(output);
-    const doc = {
-      status: constants.JOB_STATUS_FAILED,
-      completed_at: completedTime,
-      output: docOutput
-    };
-
-    this.emit(constants.EVENT_WORKER_JOB_FAIL, {
-      job: formatJobObject(job),
-      worker: this.toJSON(),
-      output: docOutput,
-    });
-
-    return this.client.update({
-      index: job._index,
-      id: job._id,
-      if_seq_no: job._seq_no,
-      if_primary_term: job._primary_term,
-      body: { doc }
-    })
-      .then(() => true)
-      .catch((err) => {
-        if (err.statusCode === 409) return true;
-        this.debug(`_failJob failed to update job ${job._id}`, err);
-        this.emit(constants.EVENT_WORKER_FAIL_UPDATE_ERROR, this._formatErrorParams(err, job));
-        return false;
-      });
-  }
-
-  _cancelJob(job) {
-    this.debug(`Cancelling job ${job._id}`);
-
-    const completedTime = moment().toISOString();
-    const doc = {
-      status: constants.JOB_STATUS_CANCELLED,
-      completed_at: completedTime,
-    };
-
-    return this.client.update({
-      index: job._index,
-      id: job._id,
-      version: job._version,
-      body: { doc }
-    })
-      .then(() => true)
-      .catch((err) => {
-        if (err.statusCode === 409) return true;
-        this.debug(`_cancelJob failed to update job ${job._id}`, err);
-        this.emit(constants.EVENT_WORKER_FAIL_UPDATE_ERROR, this._formatErrorParams(err, job));
-        return false;
-      });
-  }
-
-  _formatOutput(output) {
-    const unknownMime = false;
-    const defaultOutput = null;
-    const docOutput = {};
-
-    if (typeof output === 'object' && output.content) {
-      docOutput.content = output.content;
-      docOutput.content_type = output.content_type || unknownMime;
-      docOutput.max_size_reached = output.max_size_reached;
-    } else {
-      docOutput.content = output || defaultOutput;
-      docOutput.content_type = unknownMime;
-    }
-
-    return docOutput;
-  }
-
-  _performJob(job) {
-    this.debug(`Starting job ${job._id}`);
-
-    const workerOutput = new Promise((resolve, reject) => {
-      // run the worker's workerFn
-      let isResolved = false;
-      const cancellationToken = new CancellationToken();
-      cancellationToken.on(() => {
-        this._cancelJob(job);
-      });
-      this.processingJobCount += 1;
-      Promise.resolve(this.workerFn.call(null, job._source.payload, cancellationToken))
-        .then((res) => {
-          isResolved = true;
-          this.processingJobCount -= 1;
-          resolve(res);
-        })
-        .catch((err) => {
-          isResolved = true;
-          this.processingJobCount -= 1;
-          reject(err);
-        });
-
-      // fail if workerFn doesn't finish before timeout
-      setTimeout(() => {
-        if (isResolved) return;
-
-        cancellationToken.cancel();
-        this.processingJobCount -= 1;
-        this.debug(`Timeout processing job ${job._id}`);
-        reject(new WorkerTimeoutError(`Worker timed out, timeout = ${job._source.timeout}`, {
-          timeout: job._source.timeout,
-          jobId: job._id,
-        }));
-      }, job._source.timeout);
-    });
-
-    return workerOutput.then((output) => {
-      // job execution was successful
-      this.debug(`Completed job ${job._id}`);
-
-      const completedTime = moment().toISOString();
-      const docOutput = this._formatOutput(output);
-
-      const doc = {
-        status: constants.JOB_STATUS_COMPLETED,
-        completed_at: completedTime,
-        output: docOutput
-      };
-
-      return this.client.update({
-        index: job._index,
-        id: job._id,
-        if_seq_no: job._seq_no,
-        if_primary_term: job._primary_term,
-        body: { doc }
-      })
-        .then(() => {
-          const eventOutput = {
-            job: formatJobObject(job),
-            output: docOutput,
-          };
-
-          this.emit(constants.EVENT_WORKER_COMPLETE, eventOutput);
-        })
-        .catch((err) => {
-          if (err.statusCode === 409) return false;
-          this.debug(`Failure saving job output ${job._id}`, err);
-          this.emit(constants.EVENT_WORKER_JOB_UPDATE_ERROR, this._formatErrorParams(err, job));
-        });
-    }, (jobErr) => {
-      if (!jobErr) {
-        jobErr = new UnspecifiedWorkerError('Unspecified worker error', {
-          jobId: job._id,
-        });
-      }
-
-      // job execution failed
-      if (jobErr.name === 'WorkerTimeoutError') {
-        this.debug(`Timeout on job ${job._id}`);
-        this.emit(constants.EVENT_WORKER_JOB_TIMEOUT, this._formatErrorParams(jobErr, job));
-        return;
-
-      // append the jobId to the error
-      } else {
-        try {
-          Object.assign(jobErr, { jobId: job._id });
-        } catch (e) {
-          // do nothing if jobId can not be appended
-        }
-      }
-
-      this.debug(`Failure occurred on job ${job._id}`, jobErr);
-      this.emit(constants.EVENT_WORKER_JOB_EXECUTION_ERROR, this._formatErrorParams(jobErr, job));
-      return this._failJob(job, (jobErr.toString) ? jobErr.toString() : false);
-    });
-  }
-
-  _startJobPolling() {
-    if (!this._running) {
-      return;
-    }
-
-    this._poller.start();
-  }
-
-  _stopJobPolling() {
-    this._poller.stop();
-  }
-
-  _processPendingJobs() {
-    return this._getPendingJobs()
-      .then((jobs) => {
-        return this._claimPendingJobs(jobs);
-      });
-  }
-
-  _claimPendingJobs(jobs) {
-    if (!jobs || jobs.length === 0) return;
-
-    let claimed = 0;
-
-    return jobs.reduce((chain, job) => {
-      return chain.then((claimedJobs) => {
-        // Apply capacity control to make sure there won't be more jobs processing than the capacity.
-        if (claimed === (this.capacity - this.processingJobCount)) return claimedJobs;
-
-        return this._claimJob(job)
-          .then((claimResult) => {
-            if (claimResult !== false) {
-              claimed += 1;
-              claimedJobs.push(claimResult);
-              return claimedJobs;
-            }
-          });
-      });
-    }, Promise.resolve([]))
-      .then((claimedJobs) => {
-        if (!claimedJobs || claimedJobs.length === 0) {
-          this.debug(`All ${jobs.length} jobs already claimed`);
-          return;
-        }
-        this.debug(`Claimed ${claimedJobs.size} jobs`);
-        return Promise.all(claimedJobs.map((job) => {
-          return this._performJob(job);
-        }));
-      })
-      .catch((err) => {
-        this.debug('Error claiming jobs', err);
-      });
-  }
-
-  _resetProcessingJobs() {
-    const nowTime = moment().toISOString();
-    const query = {
-      query: {
-        bool: {
-          filter: {
-            bool: {
-              minimum_should_match: 1,
-              must: { term: { jobtype: this.jobtype } },
-              should: [
-                {
-                  bool: {
-                    must: [
-                      // Conditioned on the 'processing' jobs which have not
-                      // expired yet.
-                      { term: { status: 'processing' } },
-                      { range: { process_expiration: { gt: nowTime } } }
-                    ],
-                  },
-                },
-              ],
-            }
-          }
-        }
-      },
-      script: {
-        source: `ctx._source.status = "${constants.JOB_STATUS_PENDING}"`,
-        lang: 'painless',
-      }
-    };
-
-    return this.client.updateByQuery({
-      index: `${this.queue.index}-*`,
-      version: true,
-      body: query
-    })
-      .then((results) => {
-        return results.updated;
-      })
-      .catch((err) => {
-        this.debug('job querying failed', err);
-        this.emit(constants.EVENT_WORKER_RESET_PROCESSING_JOB_ERROR, this._formatErrorParams(err));
-        throw err;
-      });
-  }
-
-  _getPendingJobs() {
-    const nowTime = moment().toISOString();
-    const query = {
-      seq_no_primary_term: true,
-      _source: {
-        excludes: [ 'output.content' ]
-      },
-      query: {
-        bool: {
-          filter: {
-            bool: {
-              minimum_should_match: 1,
-              must: { term: { jobtype: this.jobtype } },
-              should: [
-                { term: { status: 'pending' } },
-                {
-                  bool: {
-                    must: [
-                      { term: { status: 'processing' } },
-                      { range: { process_expiration: { lte: nowTime } } }
-                    ],
-                  },
-                },
-              ],
-            }
-          }
-        }
-      },
-      sort: [
-        { priority: { order: 'asc' } },
-        { created_at: { order: 'asc' } }
-      ],
-      size: this.checkSize
-    };
-
-    return this.client.search({
-      index: `${this.queue.index}-*`,
-      version: true,
-      body: query
-    })
-      .then(async (results) => {
-        const jobs = results.hits.hits;
-        if (jobs.length > 0) {
-          this.debug(`${jobs.length} outstanding jobs returned`);
-        }
-        const filtered = [];
-        for (const job of jobs) {
-          const payload = job._source.payload.payload;
-          const repoUrl = payload.uri || payload.url;
-          const isLocal = await this.codeServices.isResourceLocal(repoUrl);
-          if (isLocal) {
-            filtered.push(job);
-          }
-        }
-        return filtered;
-      })
-      .catch((err) => {
-      // ignore missing indices errors
-        if (err && err.status === 404) return [];
-
-        this.debug('job querying failed', err);
-        this.emit(constants.EVENT_WORKER_JOB_SEARCH_ERROR, this._formatErrorParams(err));
-        throw err;
-      });
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lib/esqueue/yarn.lock b/x-pack/legacy/plugins/code/server/lib/esqueue/yarn.lock
deleted file mode 100644
index 9f8ae5a32aca44..00000000000000
--- a/x-pack/legacy/plugins/code/server/lib/esqueue/yarn.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-moment@^2.20.1:
-  version "2.22.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
-
-puid@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/puid/-/puid-1.0.5.tgz#8d387bf05fb239c5e6f45902c49470084009638c"
-  integrity sha1-jTh78F+yOcXm9FkCxJRwCEAJY4w=
diff --git a/x-pack/legacy/plugins/code/server/log.ts b/x-pack/legacy/plugins/code/server/log.ts
deleted file mode 100644
index cb4a5e89aff3dc..00000000000000
--- a/x-pack/legacy/plugins/code/server/log.ts
+++ /dev/null
@@ -1,109 +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 { inspect } from 'util';
-import { Logger as VsLogger } from 'vscode-jsonrpc';
-
-import { Logger as KibanaLogger, LoggerFactory } from 'src/core/server';
-
-export class Logger implements VsLogger {
-  private logger: KibanaLogger;
-
-  constructor(
-    private readonly loggerFactory: LoggerFactory,
-    private readonly verbose: boolean = false,
-    private readonly baseTags: string[] = []
-  ) {
-    this.logger = this.loggerFactory.get(...this.baseTags);
-  }
-
-  // Return a new logger with new tags
-  public addTags(tags: string[]): Logger {
-    return new Logger(this.loggerFactory, this.verbose, this.baseTags.concat(tags));
-  }
-
-  public info(msg: string | any) {
-    if (typeof msg !== 'string') {
-      msg = inspect(msg, {
-        colors: process.stdout.isTTY,
-      });
-    }
-    this.logger.info(msg);
-  }
-
-  public error(msg: string | any) {
-    if (msg instanceof Error) {
-      msg = msg.stack;
-    }
-
-    if (typeof msg !== 'string') {
-      msg = inspect(msg, {
-        colors: process.stdout.isTTY,
-      });
-    }
-
-    this.logger.error(msg);
-  }
-
-  public log(msg: string): void {
-    this.logger.info(msg);
-  }
-
-  public debug(msg: string | any) {
-    if (typeof msg !== 'string') {
-      msg = inspect(msg, {
-        colors: process.stdout.isTTY,
-      });
-    }
-    if (this.verbose) {
-      this.logger.info(msg);
-    } else {
-      this.logger.debug(msg);
-    }
-  }
-
-  public warn(msg: string | any): void {
-    if (msg instanceof Error) {
-      msg = msg.stack;
-    }
-
-    if (typeof msg !== 'string') {
-      msg = inspect(msg, {
-        colors: process.stdout.isTTY,
-      });
-    }
-
-    this.logger.warn(msg);
-  }
-
-  // Log subprocess stdout
-  public stdout(msg: string | any) {
-    if (typeof msg !== 'string') {
-      msg = inspect(msg, {
-        colors: process.stdout.isTTY,
-      });
-    }
-    if (this.verbose) {
-      this.logger.info(msg);
-    } else {
-      this.logger.debug(msg);
-    }
-  }
-
-  // Log subprocess stderr
-  public stderr(msg: string | any) {
-    if (typeof msg !== 'string') {
-      msg = inspect(msg, {
-        colors: process.stdout.isTTY,
-      });
-    }
-    if (this.verbose) {
-      this.logger.error(msg);
-    } else {
-      this.logger.debug(msg);
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/abstract_launcher.ts b/x-pack/legacy/plugins/code/server/lsp/abstract_launcher.ts
deleted file mode 100644
index 769e3cc2cf45f6..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/abstract_launcher.ts
+++ /dev/null
@@ -1,207 +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 { ResponseError } from 'vscode-jsonrpc';
-import { LanguageServerStartFailed } from '../../common/lsp_error_codes';
-import { Logger } from '../log';
-import { ServerOptions } from '../server_options';
-import { LoggerFactory } from '../utils/log_factory';
-import { ILanguageServerLauncher } from './language_server_launcher';
-import { LanguageServerProxy } from './proxy';
-import { RequestExpander } from './request_expander';
-import { ControlledProgram } from './process/controlled_program';
-
-let seqNo = 1;
-
-export abstract class AbstractLauncher implements ILanguageServerLauncher {
-  running: boolean = false;
-  private currentPid: number = -1;
-  private child: ControlledProgram | null = null;
-  private startTime: number = -1;
-  private proxyConnected: boolean = false;
-  protected readonly log: Logger;
-  private spawnTimes: number = 0;
-  private launchReject?: (reason?: any) => void;
-  launchFailed: boolean = false;
-  protected constructor(
-    public readonly name: string,
-    public readonly targetHost: string,
-    public readonly options: ServerOptions,
-    public readonly loggerFactory: LoggerFactory
-  ) {
-    this.log = this.loggerFactory.getLogger([`${seqNo++}`, `${this.name}`, 'code']);
-  }
-
-  public async launch(builtinWorkspace: boolean, maxWorkspace: number) {
-    const port = await this.getPort();
-    const log: Logger = this.log;
-    const proxy = new LanguageServerProxy(port, this.targetHost, log);
-    if (this.options.lsp.detach) {
-      log.debug('Detach mode, expected language server launch externally');
-      proxy.onConnected(() => {
-        this.running = true;
-        // reset spawn times
-        this.spawnTimes = 0;
-      });
-      proxy.onDisconnected(() => {
-        this.running = false;
-        if (!proxy.isClosed) {
-          log.debug(`${this.name} language server disconnected, reconnecting`);
-          setTimeout(() => this.reconnect(proxy), 1000);
-        }
-      });
-    } else {
-      const child = await this.doSpawnProcess(port, log);
-      this.onProcessExit(child, () => {
-        if (!proxy.isClosed) this.reconnect(proxy);
-      });
-      proxy.onDisconnected(async () => {
-        this.proxyConnected = false;
-        if (!proxy.isClosed) {
-          log.debug('proxy disconnected, reconnecting');
-          setTimeout(async () => {
-            await this.reconnect(proxy, child);
-          }, 1000);
-        } else if (this.child) {
-          log.info('proxy closed, kill process');
-          await this.killProcess(child);
-        }
-      });
-      this.child = child;
-    }
-    proxy.onExit(() => {
-      log.debug('proxy exited, is the program running? ' + this.running);
-      if (this.child && this.running) {
-        const p = this.child!;
-        this.killProcess(p);
-      }
-    });
-    this.startConnect(proxy);
-    await new Promise((resolve, reject) => {
-      proxy.onConnected(() => {
-        this.proxyConnected = true;
-        // reset spawn times
-        this.spawnTimes = 0;
-        resolve();
-      });
-      this.launchReject = err => {
-        log.debug('launch error ' + err);
-        proxy.exit().catch(this.log.debug);
-        reject(err);
-      };
-    });
-
-    return this.createExpander(proxy, builtinWorkspace, maxWorkspace);
-  }
-
-  private onProcessExit(child: ControlledProgram, reconnectFn: () => void) {
-    const pid = child.pid;
-    child.onExit(() => {
-      if (this.currentPid === pid) {
-        this.running = false;
-        // if the process exited before proxy connected, then we reconnect
-        if (!this.proxyConnected) {
-          reconnectFn();
-        }
-      }
-    });
-  }
-
-  /**
-   * proxy should be connected within this timeout, otherwise we reconnect.
-   */
-  protected startupTimeout = 10000;
-
-  protected maxRespawn = 3;
-
-  /**
-   * try reconnect the proxy when disconnected
-   */
-  public async reconnect(proxy: LanguageServerProxy, child?: ControlledProgram) {
-    this.log.debug('reconnecting');
-    if (this.options.lsp.detach) {
-      this.startConnect(proxy);
-    } else {
-      const processExpired = () => Date.now() - this.startTime > this.startupTimeout;
-      if (child && !child.killed() && !processExpired()) {
-        this.startConnect(proxy);
-      } else {
-        if (this.spawnTimes < this.maxRespawn) {
-          if (child && this.running) {
-            this.log.debug('killing the old program.');
-            await this.killProcess(child);
-          }
-          const port = await this.getPort();
-          proxy.changePort(port);
-          this.child = await this.doSpawnProcess(port, this.log);
-          this.onProcessExit(this.child, () => this.reconnect(proxy, child));
-          this.startConnect(proxy);
-        } else {
-          const ServerStartFailed = new ResponseError(
-            LanguageServerStartFailed,
-            'Launch language server failed.'
-          );
-          this.launchReject!(ServerStartFailed);
-          this.launchFailed = true;
-          proxy.setError(ServerStartFailed);
-          this.log.warn(`spawned program ${this.spawnTimes} times, mark this proxy unusable.`);
-        }
-      }
-    }
-  }
-
-  private async doSpawnProcess(port: number, log: Logger): Promise<ControlledProgram> {
-    this.log.debug('start program');
-    const child = await this.spawnProcess(port, log);
-    this.currentPid = child.pid;
-    this.spawnTimes += 1;
-    this.startTime = Date.now();
-    this.running = true;
-    return child;
-  }
-
-  abstract async getPort(): Promise<number>;
-
-  startConnect(proxy: LanguageServerProxy) {
-    proxy.connect();
-  }
-
-  /**
-   * await for proxy connected, create a request expander
-   * @param proxy
-   * @param builtinWorkspace
-   * @param maxWorkspace
-   */
-  abstract createExpander(
-    proxy: LanguageServerProxy,
-    builtinWorkspace: boolean,
-    maxWorkspace: number
-  ): RequestExpander;
-
-  abstract async spawnProcess(port: number, log: Logger): Promise<ControlledProgram>;
-
-  protected killProcess(child: ControlledProgram) {
-    if (!child.killed()) {
-      return new Promise<boolean>((resolve, reject) => {
-        // if not killed within 1s
-        const t = setTimeout(reject, 1000);
-        child.onExit(() => {
-          clearTimeout(t);
-          resolve(true);
-        });
-        child.kill(false);
-      })
-        .catch(() => {
-          // force kill
-          child.kill(true);
-          return child.killed();
-        })
-        .finally(() => {
-          if (this.currentPid === child.pid) this.running = false;
-        });
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/controller.test.ts b/x-pack/legacy/plugins/code/server/lsp/controller.test.ts
deleted file mode 100644
index 212381b36ca6ee..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/controller.test.ts
+++ /dev/null
@@ -1,166 +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 fs from 'fs';
-import * as os from 'os';
-import path from 'path';
-import rimraf from 'rimraf';
-import sinon from 'sinon';
-
-import { LanguageServerStatus } from '../../common/language_server';
-import { LspRequest } from '../../model';
-import { RepositoryConfigController } from '../repository_config_controller';
-import { ServerOptions } from '../server_options';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { LanguageServerController } from './controller';
-import { InstallManager } from './install_manager';
-import { ILanguageServerLauncher } from './language_server_launcher';
-import { JAVA, LanguageServerDefinition, TYPESCRIPT } from './language_servers';
-import { ILanguageServerHandler } from './proxy';
-import { createTestHapiServer } from '../test_utils';
-
-const baseDir = fs.mkdtempSync(path.join(os.tmpdir(), 'code_test'));
-const workspaceDir = path.join(baseDir, 'workspace');
-
-// @ts-ignore
-const options: ServerOptions = sinon.createStubInstance(ServerOptions);
-// @ts-ignore
-options.lsp = {
-  TypeScript: {
-    enabled: true,
-  },
-  Java: {
-    enabled: true,
-  },
-  Go: {
-    enabled: true,
-  },
-  Ctags: {
-    enabled: true,
-  },
-  detach: false,
-};
-// @ts-ignore
-options.maxWorkspace = 2;
-const server = createTestHapiServer();
-const installManager = new InstallManager(server, options);
-// @ts-ignore
-installManager.status = (def: LanguageServerDefinition) => {
-  return LanguageServerStatus.READY;
-};
-
-const repoConfigController = sinon.createStubInstance(RepositoryConfigController);
-// @ts-ignore
-repoConfigController.isLanguageDisabled = (uri: string, lang: string) => {
-  return Promise.resolve(false);
-};
-
-const launcherSpy = sinon.stub();
-
-class LauncherStub implements ILanguageServerLauncher {
-  public get running(): boolean {
-    return launcherSpy.called;
-  }
-
-  public launch(
-    builtinWorkspace: boolean,
-    maxWorkspace: number,
-    installationPath?: string
-  ): Promise<ILanguageServerHandler> {
-    return Promise.resolve(launcherSpy(builtinWorkspace, maxWorkspace, installationPath));
-  }
-
-  launchFailed: boolean = false;
-}
-
-TYPESCRIPT.launcher = LauncherStub;
-JAVA.launcher = LauncherStub;
-
-let controller: typeof LanguageServerController;
-
-beforeAll(() => {
-  fs.mkdirSync(workspaceDir, { recursive: true });
-});
-beforeEach(async () => {
-  sinon.reset();
-  const handler: ILanguageServerHandler = {
-    handleRequest(request: LspRequest): any {
-      return {};
-    },
-    exit(): any {
-      return {};
-    },
-    unloadWorkspace(_: string): any {
-      return {};
-    },
-  };
-  launcherSpy.returns(handler);
-  controller = new LanguageServerController(
-    options,
-    '127.0.0.1',
-    // @ts-ignore
-    installManager,
-    new ConsoleLoggerFactory(),
-    // @ts-ignore
-    repoConfigController
-  );
-});
-afterAll(() => {
-  rimraf.sync(baseDir);
-});
-
-function mockRequest(repo: string, file: string) {
-  const repoPath = path.join(workspaceDir, repo);
-  fs.mkdirSync(repoPath, { recursive: true });
-  return {
-    method: 'request',
-    params: [],
-    workspacePath: repoPath,
-    timeoutForInitializeMs: 100,
-    resolvedFilePath: path.join(repoPath, file),
-  };
-}
-
-test('controller should launch a lang server', async () => {
-  const request = mockRequest('repo1', 'test.ts');
-  // @ts-ignore
-  await controller.handleRequest(request);
-  expect(launcherSpy.calledOnce).toBeTruthy();
-});
-
-test('java-lang-server support should only be launched exactly once', async () => {
-  const request1 = mockRequest('repo1', 'Test.java');
-  const request2 = mockRequest('repo2', 'Test.java');
-  // @ts-ignore
-  const p1 = controller.handleRequest(request1);
-  // @ts-ignore
-  const p2 = controller.handleRequest(request2);
-  await Promise.all([p1, p2]);
-  expect(launcherSpy.calledOnce).toBeTruthy();
-});
-
-test('should launch 2 ts-lang-server for different repo', async () => {
-  const request1 = mockRequest('repo1', 'test.ts');
-  const request2 = mockRequest('repo2', 'test.ts');
-  // @ts-ignore
-  const p1 = controller.handleRequest(request1);
-  // @ts-ignore
-  const p2 = controller.handleRequest(request2);
-  await Promise.all([p1, p2]);
-  expect(launcherSpy.calledTwice).toBeTruthy();
-});
-
-test('should only exactly 1 ts-lang-server for the same repo', async () => {
-  const request1 = mockRequest('repo1', 'test.ts');
-  const request2 = mockRequest('repo1', 'test.ts');
-  // @ts-ignore
-  const p1 = controller.handleRequest(request1);
-  // @ts-ignore
-  const p2 = controller.handleRequest(request2);
-  await Promise.all([p1, p2]);
-  expect(launcherSpy.calledOnce).toBeTruthy();
-  expect(launcherSpy.calledTwice).toBe(false);
-});
diff --git a/x-pack/legacy/plugins/code/server/lsp/controller.ts b/x-pack/legacy/plugins/code/server/lsp/controller.ts
deleted file mode 100644
index 7c2e1acb8daf2c..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/controller.ts
+++ /dev/null
@@ -1,307 +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 fs from 'fs';
-import { ResponseError } from 'vscode-jsonrpc';
-import { ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-import { LanguageServerStatus } from '../../common/language_server';
-import {
-  LanguageDisabled,
-  LanguageServerNotInstalled,
-  UnknownErrorCode,
-  UnknownFileLanguage,
-} from '../../common/lsp_error_codes';
-import { LspRequest } from '../../model';
-import { Logger } from '../log';
-import { RepositoryConfigController } from '../repository_config_controller';
-import { ServerOptions } from '../server_options';
-import { detectLanguage } from '../utils/detect_language';
-import { LoggerFactory } from '../utils/log_factory';
-import { InstallManager } from './install_manager';
-import { ILanguageServerLauncher } from './language_server_launcher';
-import { enabledLanguageServers, LanguageServerDefinition } from './language_servers';
-import { ILanguageServerHandler } from './proxy';
-import { WorkspaceStatus } from './request_expander';
-
-export interface LanguageServerHandlerMap {
-  [workspaceUri: string]: Promise<ILanguageServerHandler>;
-}
-
-interface LanguageServerData {
-  definition: LanguageServerDefinition;
-  builtinWorkspaceFolders: boolean;
-  maxWorkspace: number;
-  languages: string[];
-  launcher: ILanguageServerLauncher;
-  languageServerHandlers?: Promise<ILanguageServerHandler> | LanguageServerHandlerMap;
-}
-
-/**
- * Manage different LSP servers and forward request to different LSP using LanguageServerProxy, currently
- * we just use forward request to all the LSP servers we are running.
- */
-export class LanguageServerController implements ILanguageServerHandler {
-  // a list of support language servers
-  private readonly languageServers: LanguageServerData[];
-  // a { lang -> server } map from above list
-  private readonly languageServerMap: { [lang: string]: LanguageServerData[] };
-  private log: Logger;
-
-  constructor(
-    public readonly options: ServerOptions,
-    public readonly targetHost: string,
-    public readonly installManager: InstallManager,
-    public readonly loggerFactory: LoggerFactory,
-    public readonly repoConfigController: RepositoryConfigController
-  ) {
-    this.log = loggerFactory.getLogger([]);
-    this.languageServers = enabledLanguageServers(options).map(def => ({
-      definition: def,
-      builtinWorkspaceFolders: def.builtinWorkspaceFolders,
-      languages: def.languages,
-      maxWorkspace: options.maxWorkspace,
-      launcher: new def.launcher(
-        this.targetHost,
-        options,
-        loggerFactory,
-        this.installManager.installationPath(def)!
-      ),
-    }));
-    const add2map = (
-      map: { [lang: string]: LanguageServerData[] },
-      lang: string,
-      ls: LanguageServerData
-    ) => {
-      const arr = map[lang] || [];
-      arr.push(ls);
-      map[lang] = arr.sort((a, b) => b.definition.priority - a.definition.priority);
-    };
-    this.languageServerMap = this.languageServers.reduce(
-      (map, ls) => {
-        ls.languages.forEach(lang => add2map(map, lang, ls));
-        map[ls.definition.name] = [ls];
-        return map;
-      },
-      {} as { [lang: string]: LanguageServerData[] }
-    );
-  }
-
-  public async handleRequest(request: LspRequest): Promise<ResponseMessage> {
-    const file = request.resolvedFilePath;
-    if (file) {
-      // #todo add test for this
-      const lang = await detectLanguage(file.replace('file://', ''));
-      if (await this.repoConfigController.isLanguageDisabled(request.documentUri!, lang)) {
-        throw new ResponseError(LanguageDisabled, `language disabled for the file`);
-      }
-      return await this.dispatchRequest(lang, request);
-    } else {
-      throw new ResponseError(UnknownErrorCode, `can't detect language without a file`);
-    }
-  }
-
-  public async dispatchRequest(lang: string, request: LspRequest): Promise<ResponseMessage> {
-    if (lang) {
-      const ls = this.findLanguageServer(lang);
-      if (ls.builtinWorkspaceFolders) {
-        if (!ls.languageServerHandlers && !ls.launcher.running) {
-          ls.languageServerHandlers = ls.launcher.launch(
-            ls.builtinWorkspaceFolders,
-            ls.maxWorkspace
-          );
-        }
-        const handler = await (ls.languageServerHandlers as Promise<ILanguageServerHandler>);
-        return await handler.handleRequest(request);
-      } else {
-        const handler = await this.findOrCreateHandler(ls, request);
-        handler.lastAccess = Date.now();
-        return await handler.handleRequest(request);
-      }
-    } else {
-      throw new ResponseError(
-        UnknownFileLanguage,
-        `can't detect language from file:${request.resolvedFilePath}`
-      );
-    }
-  }
-
-  /**
-   * shutdown all language servers
-   */
-  public async exit() {
-    for (const ls of this.languageServers) {
-      if (ls.languageServerHandlers) {
-        if (ls.builtinWorkspaceFolders) {
-          if (ls.languageServerHandlers) {
-            try {
-              const h = await (ls.languageServerHandlers as Promise<ILanguageServerHandler>);
-              await h.exit();
-            } catch (e) {
-              // expected error because of handler launch failed
-            }
-          }
-        } else {
-          const handlers = ls.languageServerHandlers as LanguageServerHandlerMap;
-          for (const handlerPromise of Object.values(handlers)) {
-            const handler = await handlerPromise;
-            await handler.exit();
-          }
-        }
-      }
-    }
-  }
-
-  public async launchServers() {
-    for (const ls of this.languageServers) {
-      const installed = this.installManager.status(ls.definition) === LanguageServerStatus.READY;
-      // for those language server has builtin workspace support, we can launch them during kibana startup
-      if (installed && ls.builtinWorkspaceFolders) {
-        try {
-          ls.languageServerHandlers = ls.launcher.launch(true, ls.maxWorkspace);
-        } catch (e) {
-          this.log.error(e);
-        }
-      }
-    }
-  }
-
-  public async unloadWorkspace(workspaceDir: string) {
-    for (const languageServer of this.languageServers) {
-      if (languageServer.languageServerHandlers) {
-        if (languageServer.builtinWorkspaceFolders) {
-          try {
-            const handler = await (languageServer.languageServerHandlers as Promise<
-              ILanguageServerHandler
-            >);
-            await handler.unloadWorkspace(workspaceDir);
-          } catch (err) {
-            // expected error because of handler launch failed
-          }
-        } else {
-          const handlers = languageServer.languageServerHandlers as LanguageServerHandlerMap;
-          const realPath = fs.realpathSync(workspaceDir);
-          const handler = handlers[realPath];
-          if (handler) {
-            await (await handler).unloadWorkspace(realPath);
-            delete handlers[realPath];
-          }
-        }
-      }
-    }
-  }
-
-  public status(def: LanguageServerDefinition): LanguageServerStatus {
-    const status = this.installManager.status(def);
-    // installed, but is it running?
-    if (status === LanguageServerStatus.READY) {
-      const ls = this.languageServers.find(d => d.definition === def);
-      if (ls && ls.launcher.launchFailed) {
-        return LanguageServerStatus.LAUNCH_FAILED;
-      }
-      if (ls && ls.launcher.running) {
-        return LanguageServerStatus.RUNNING;
-      }
-    }
-    return status;
-  }
-
-  public getLanguageServerDef(lang: string): LanguageServerDefinition[] {
-    const data = this.languageServerMap[lang];
-    if (data) {
-      return data.map(d => d.definition);
-    }
-    return [];
-  }
-
-  private async findOrCreateHandler(
-    languageServer: LanguageServerData,
-    request: LspRequest
-  ): Promise<ILanguageServerHandler> {
-    let handlers: LanguageServerHandlerMap;
-    if (languageServer.languageServerHandlers) {
-      handlers = languageServer.languageServerHandlers as LanguageServerHandlerMap;
-    } else {
-      handlers = languageServer.languageServerHandlers = {};
-    }
-    if (!request.workspacePath) {
-      throw new ResponseError(UnknownErrorCode, `no workspace in request?`);
-    }
-    const realPath = fs.realpathSync(request.workspacePath);
-    let handler = handlers[realPath];
-    if (handler) {
-      return handler;
-    } else {
-      const maxWorkspace = languageServer.maxWorkspace;
-      const handlerArray = Object.entries(handlers);
-      if (handlerArray.length < maxWorkspace) {
-        handler = languageServer.launcher.launch(
-          languageServer.builtinWorkspaceFolders,
-          maxWorkspace
-        );
-        handlers[realPath] = handler;
-        return handler;
-      } else {
-        let [oldestWorkspace, oldestHandler] = handlerArray[0];
-        for (const e of handlerArray) {
-          const [ws, handlePromise] = e;
-          const h = await handlePromise;
-          const oldestAccess = (await oldestHandler).lastAccess!;
-          if (h.lastAccess! < oldestAccess!) {
-            oldestWorkspace = ws;
-            oldestHandler = handlePromise;
-          }
-        }
-        delete handlers[oldestWorkspace];
-        handlers[request.workspacePath] = oldestHandler;
-        return oldestHandler;
-      }
-    }
-  }
-
-  private findLanguageServer(lang: string) {
-    const lsArr = this.languageServerMap[lang];
-    if (lsArr) {
-      const ls = lsArr.find(
-        d => this.installManager.status(d.definition) !== LanguageServerStatus.NOT_INSTALLED
-      );
-      if (!this.options.lsp.detach && ls === undefined) {
-        throw new ResponseError(
-          LanguageServerNotInstalled,
-          `language server ${lang} not installed`
-        );
-      } else {
-        return ls!;
-      }
-    } else {
-      throw new ResponseError(UnknownFileLanguage, `unsupported language ${lang}`);
-    }
-  }
-
-  public async initializeState(workspacePath: string) {
-    const result: { [lang: string]: WorkspaceStatus } = {};
-    for (const languageServer of this.languageServers) {
-      if (languageServer.languageServerHandlers) {
-        if (languageServer.builtinWorkspaceFolders) {
-          const handler = await (languageServer.languageServerHandlers as Promise<
-            ILanguageServerHandler
-          >);
-          result[languageServer.definition.name] = (await handler.initializeState!(
-            workspacePath
-          )) as WorkspaceStatus;
-        } else {
-          const handlers = languageServer.languageServerHandlers as LanguageServerHandlerMap;
-          const realPath = fs.realpathSync(workspacePath);
-          const handler = handlers[realPath];
-          if (handler) {
-            result[languageServer.definition.name] = (await handler).initializeState!(
-              workspacePath
-            ) as WorkspaceStatus;
-          }
-        }
-      }
-    }
-    return result;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/ctags_launcher.ts b/x-pack/legacy/plugins/code/server/lsp/ctags_launcher.ts
deleted file mode 100644
index 97c4bc79cff719..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/ctags_launcher.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import getPort from 'get-port';
-import { ServerOptions } from '../server_options';
-import { LoggerFactory } from '../utils/log_factory';
-import { LanguageServerProxy } from './proxy';
-import { Logger } from '../log';
-import { RequestExpander } from './request_expander';
-import { AbstractLauncher } from './abstract_launcher';
-import { EmbedCtagServer } from './process/embed_ctag_server';
-
-const CTAGS_LANG_DETACH_PORT = 2092;
-export class CtagsLauncher extends AbstractLauncher {
-  private isRunning: boolean = false;
-  private embed: EmbedCtagServer | null = null;
-  constructor(
-    public readonly targetHost: string,
-    public readonly options: ServerOptions,
-    public readonly loggerFactory: LoggerFactory
-  ) {
-    super('ctags', targetHost, options, loggerFactory);
-  }
-  public get running(): boolean {
-    return this.isRunning;
-  }
-
-  createExpander(
-    proxy: LanguageServerProxy,
-    builtinWorkspace: boolean,
-    maxWorkspace: number
-  ): RequestExpander {
-    return new RequestExpander(proxy, builtinWorkspace, maxWorkspace, this.options, {}, this.log);
-  }
-
-  startConnect(proxy: LanguageServerProxy) {
-    proxy.startServerConnection();
-    if (this.embed) {
-      this.embed.start().catch(err => this.log.error(err));
-    }
-  }
-
-  async getPort(): Promise<number> {
-    if (!this.options.lsp.detach) {
-      return await getPort();
-    }
-    return CTAGS_LANG_DETACH_PORT;
-  }
-
-  async spawnProcess(port: number, log: Logger) {
-    if (!this.embed) {
-      this.embed = new EmbedCtagServer(port, log);
-    }
-    return this.embed;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/go_launcher.ts b/x-pack/legacy/plugins/code/server/lsp/go_launcher.ts
deleted file mode 100644
index 01207e9e603444..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/go_launcher.ts
+++ /dev/null
@@ -1,149 +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 paths from '@elastic/simple-git/dist/util/paths';
-import { spawn } from 'child_process';
-import fs from 'fs';
-import getPort from 'get-port';
-import * as glob from 'glob';
-import { platform as getOsPlatform } from 'os';
-import path from 'path';
-import { MarkupKind } from 'vscode-languageserver-protocol';
-import { Logger } from '../log';
-import { ServerOptions } from '../server_options';
-import { LoggerFactory } from '../utils/log_factory';
-import { AbstractLauncher } from './abstract_launcher';
-import { ExternalProgram } from './process/external_program';
-import { LanguageServerProxy } from './proxy';
-import { InitializeOptions, RequestExpander } from './request_expander';
-
-const GO_LANG_DETACH_PORT = 2091;
-
-export class GoServerLauncher extends AbstractLauncher {
-  constructor(
-    public readonly targetHost: string,
-    public readonly options: ServerOptions,
-    public readonly loggerFactory: LoggerFactory,
-    public readonly installationPath: string
-  ) {
-    super('go', targetHost, options, loggerFactory);
-  }
-
-  createExpander(
-    proxy: LanguageServerProxy,
-    builtinWorkspace: boolean,
-    maxWorkspace: number
-  ): RequestExpander {
-    return new RequestExpander(
-      proxy,
-      builtinWorkspace,
-      maxWorkspace,
-      this.options,
-      {
-        initialOptions: {
-          installGoDependency: this.options.security.installGoDependency,
-        },
-        clientCapabilities: {
-          textDocument: {
-            hover: {
-              contentFormat: [MarkupKind.Markdown, MarkupKind.PlainText],
-            },
-          },
-        },
-      } as InitializeOptions,
-      this.log
-    );
-  }
-
-  async startConnect(proxy: LanguageServerProxy) {
-    await proxy.connect();
-  }
-
-  async getPort() {
-    if (!this.options.lsp.detach) {
-      return await getPort();
-    }
-    return GO_LANG_DETACH_PORT;
-  }
-
-  private async getBundledGoToolchain(installationPath: string, log: Logger) {
-    const GoToolchain = glob.sync('**/go/**', {
-      cwd: installationPath,
-    });
-    if (!GoToolchain.length) {
-      return undefined;
-    }
-    return path.resolve(installationPath, GoToolchain[0]);
-  }
-
-  async spawnProcess(port: number, log: Logger) {
-    const launchersFound = glob.sync(
-      process.platform === 'win32' ? 'go-langserver.exe' : 'go-langserver',
-      {
-        cwd: this.installationPath,
-      }
-    );
-    if (!launchersFound.length) {
-      throw new Error('Cannot find executable go language server');
-    }
-
-    const goToolchain = await this.getBundledGoToolchain(this.installationPath, log);
-    if (!goToolchain) {
-      throw new Error('Cannot find go toolchain in bundle installation');
-    }
-
-    const goRoot = goToolchain;
-    const goHome = path.resolve(goToolchain, 'bin');
-    const goPath = this.options.goPath;
-    if (!fs.existsSync(goPath)) {
-      fs.mkdirSync(goPath);
-    }
-    const goCache = path.resolve(goPath, '.cache');
-
-    const langserverRelatedEnv: { [name: string]: string } = {
-      GOROOT: goRoot,
-      GOPATH: goPath,
-      GOCACHE: goCache,
-      CGO_ENABLED: '0',
-    };
-
-    // Always prefer the bundled git.
-    const platform = getOsPlatform();
-    const git = paths(platform);
-    const gitPath = path.dirname(git.binPath);
-    if (platform !== 'win32') {
-      langserverRelatedEnv.PREFIX = git.nativeDir;
-      if (platform === 'linux') {
-        langserverRelatedEnv.GIT_SSL_CAINFO = path.join(git.nativeDir, 'ssl/cacert.pem');
-      }
-    }
-
-    const params: string[] = ['-port=' + port.toString()];
-    const golsp = path.resolve(this.installationPath, launchersFound[0]);
-    const env = Object.create(process.env);
-    env.PATH = gitPath + path.delimiter + goHome + path.delimiter + env.PATH;
-    const p = spawn(golsp, params, {
-      detached: false,
-      stdio: 'pipe',
-      env: {
-        ...env,
-        CLIENT_HOST: '127.0.0.1',
-        CLIENT_PORT: port.toString(),
-        ...langserverRelatedEnv,
-      },
-    });
-    p.stdout.on('data', data => {
-      log.stdout(data.toString());
-    });
-    p.stderr.on('data', data => {
-      log.stderr(data.toString());
-    });
-    log.info(
-      `Launch Go Language Server at port ${port.toString()}, pid:${p.pid}, GOROOT:${goRoot}`
-    );
-    return new ExternalProgram(p, this.options, log);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/install_manager.test.ts b/x-pack/legacy/plugins/code/server/lsp/install_manager.test.ts
deleted file mode 100644
index 6aa80899a70080..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/install_manager.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-/* eslint-disable no-console */
-
-import fs from 'fs';
-import { Server } from 'hapi';
-import os from 'os';
-import path from 'path';
-import rimraf from 'rimraf';
-
-import { LanguageServers } from './language_servers';
-import { InstallManager } from './install_manager';
-import { ServerOptions } from '../server_options';
-import { LanguageServerStatus } from '../../common/language_server';
-import { InstallationType } from '../../common/installation';
-import { ServerFacade } from '../..';
-
-const LANG_SERVER_NAME = 'Java';
-const langSrvDef = LanguageServers.find(l => l.name === LANG_SERVER_NAME)!;
-
-const fakeTestDir = path.join(os.tmpdir(), 'foo-');
-
-const options: ServerOptions = {} as ServerOptions;
-
-const server: ServerFacade = new Server();
-server.config = () => {
-  return {
-    get(key: string): any {
-      if (key === 'pkg.version') {
-        return '8.0.0';
-      }
-    },
-    has(key: string): boolean {
-      return key === 'pkg.version';
-    },
-  };
-};
-
-const manager = new InstallManager(server, options);
-
-beforeAll(() => {
-  fs.mkdirSync(fakeTestDir);
-});
-
-afterAll(() => {
-  rimraf.sync(fakeTestDir);
-});
-
-test('install language server by plugin', async () => {
-  langSrvDef.installationType = InstallationType.Plugin;
-  expect(manager.status(langSrvDef)).toBe(LanguageServerStatus.NOT_INSTALLED);
-  const testDir = path.join(fakeTestDir, 'test_plugin');
-  fs.mkdirSync(testDir);
-  const pluginName = langSrvDef.installationPluginName as string;
-  // @ts-ignore
-  server.plugins = {
-    [pluginName]: {
-      install: {
-        path: testDir,
-      },
-    },
-  };
-  expect(manager.status(langSrvDef)).toBe(LanguageServerStatus.READY);
-  expect(manager.installationPath(langSrvDef)).toBe(testDir);
-});
diff --git a/x-pack/legacy/plugins/code/server/lsp/install_manager.ts b/x-pack/legacy/plugins/code/server/lsp/install_manager.ts
deleted file mode 100644
index 1f909398999316..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/install_manager.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import fs from 'fs';
-
-import { InstallationType } from '../../common/installation';
-import { LanguageServerStatus } from '../../common/language_server';
-import { ServerOptions } from '../server_options';
-import { LanguageServerDefinition } from './language_servers';
-import { ServerFacade } from '../..';
-
-export class InstallManager {
-  constructor(public readonly server: ServerFacade, public readonly serverOptions: ServerOptions) {}
-
-  public status(def: LanguageServerDefinition): LanguageServerStatus {
-    if (def.installationType === InstallationType.Embed) {
-      return LanguageServerStatus.READY;
-    }
-    // @ts-ignore
-    const plugin = this.server.plugins[def.installationPluginName!];
-    if (plugin) {
-      const pluginPath = plugin.install.path;
-      if (fs.existsSync(pluginPath)) {
-        return LanguageServerStatus.READY;
-      }
-    }
-    return LanguageServerStatus.NOT_INSTALLED;
-  }
-
-  public installationPath(def: LanguageServerDefinition): string | undefined {
-    if (def.installationType === InstallationType.Embed) {
-      return def.embedPath!;
-    }
-    // @ts-ignore
-    const plugin: any = this.server.plugins[def.installationPluginName];
-    if (plugin) {
-      return plugin.install.path;
-    }
-    return undefined;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/java_launcher.ts b/x-pack/legacy/plugins/code/server/lsp/java_launcher.ts
deleted file mode 100644
index ea509a06b07d52..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/java_launcher.ts
+++ /dev/null
@@ -1,280 +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 { execFile, spawn } from 'child_process';
-import { existsSync, mkdirSync } from 'fs';
-import getPort from 'get-port';
-import * as glob from 'glob';
-import { platform as getOsPlatform } from 'os';
-import path from 'path';
-import { Logger } from '../log';
-import { ServerOptions } from '../server_options';
-import { LoggerFactory } from '../utils/log_factory';
-import { AbstractLauncher } from './abstract_launcher';
-import { LanguageServerProxy } from './proxy';
-import { InitializeOptions, RequestExpander } from './request_expander';
-import { ExternalProgram } from './process/external_program';
-
-const JAVA_LANG_DETACH_PORT = 2090;
-
-export class JavaLauncher extends AbstractLauncher {
-  private needModuleArguments: boolean = true;
-  private readonly gradleHomeFolder = '.gradle';
-  constructor(
-    public readonly targetHost: string,
-    public readonly options: ServerOptions,
-    public readonly loggerFactory: LoggerFactory,
-    public readonly installationPath: string
-  ) {
-    super('java', targetHost, options, loggerFactory);
-  }
-
-  createExpander(proxy: LanguageServerProxy, builtinWorkspace: boolean, maxWorkspace: number) {
-    return new RequestExpander(
-      proxy,
-      builtinWorkspace,
-      maxWorkspace,
-      this.options,
-      {
-        initialOptions: {
-          settings: {
-            'java.import.gradle.enabled': this.options.security.enableGradleImport,
-            'java.import.maven.enabled': this.options.security.enableMavenImport,
-            'java.autobuild.enabled': false,
-            'java.import.gradle.home': path.resolve(
-              this.options.jdtWorkspacePath,
-              this.gradleHomeFolder
-            ),
-            'java.configuration.maven.userSettings': path.resolve(
-              this.installationPath,
-              'settings/settings.xml'
-            ),
-          },
-        },
-        clientCapabilities: {
-          textDocument: {
-            documentSymbol: {
-              hierarchicalDocumentSymbolSupport: true,
-            },
-          },
-        },
-      } as InitializeOptions,
-      this.log
-    );
-  }
-
-  startConnect(proxy: LanguageServerProxy) {
-    proxy.startServerConnection();
-  }
-
-  async getPort(): Promise<number> {
-    if (!this.options.lsp.detach) {
-      return await getPort();
-    }
-    return JAVA_LANG_DETACH_PORT;
-  }
-
-  private async getJavaHome(installationPath: string, log: Logger) {
-    function findJDK(platform: string) {
-      const JDKFound = glob.sync(`**/jdks/*${platform}/jdk-*`, {
-        cwd: installationPath,
-      });
-      if (!JDKFound.length) {
-        log.error('Cannot find Java Home in Bundle installation for ' + platform);
-        return undefined;
-      }
-      return path.resolve(installationPath, JDKFound[0]);
-    }
-
-    let bundledJavaHome;
-
-    // detect platform
-    const osPlatform = getOsPlatform();
-    switch (osPlatform) {
-      case 'darwin':
-        bundledJavaHome = `${findJDK('osx')}/Contents/Home`;
-        break;
-      case 'win32':
-        bundledJavaHome = `${findJDK('windows')}`;
-        break;
-      case 'freebsd':
-      case 'linux':
-        bundledJavaHome = `${findJDK('linux')}`;
-        break;
-      default:
-        log.error('No Bundle JDK defined ' + osPlatform);
-    }
-
-    if (this.getSystemJavaHome()) {
-      const javaHomePath = this.getSystemJavaHome();
-      const javaVersion = await this.getJavaVersion(javaHomePath);
-      if (javaVersion > 8) {
-        // for JDK's versiob > 8, we need extra arguments as default
-        return javaHomePath;
-      } else if (javaVersion === 8) {
-        // JDK's version = 8, needn't extra arguments
-        this.needModuleArguments = false;
-        return javaHomePath;
-      } else {
-        // JDK's version < 8, use bundled JDK instead, whose version > 8, so need extra arguments as default
-      }
-    }
-
-    return bundledJavaHome;
-  }
-
-  async spawnProcess(port: number, log: Logger) {
-    const launchersFound = glob.sync('**/plugins/org.eclipse.equinox.launcher_*.jar', {
-      cwd: this.installationPath,
-    });
-    if (!launchersFound.length) {
-      throw new Error('Cannot find language server jar file');
-    }
-
-    const javaHomePath = await this.getJavaHome(this.installationPath, log);
-    if (!javaHomePath) {
-      throw new Error('Cannot find Java Home');
-    }
-
-    const javaPath = path.resolve(
-      javaHomePath,
-      'bin',
-      process.platform === 'win32' ? 'java.exe' : 'java'
-    );
-
-    const configPath =
-      process.platform === 'win32'
-        ? path.resolve(this.installationPath, 'repository/config_win')
-        : this.options.jdtConfigPath;
-
-    const params: string[] = [
-      '-Declipse.application=org.elastic.jdt.ls.core.id1',
-      '-Dosgi.bundles.defaultStartLevel=4',
-      '-Declipse.product=org.elastic.jdt.ls.core.product',
-      '-Dlog.level=ALL',
-      '-Dfile.encoding=utf8',
-      '-noverify',
-      '-Xmx4G',
-      '-jar',
-      path.resolve(this.installationPath, launchersFound[0]),
-      '-configuration',
-      configPath,
-      '-data',
-      this.options.jdtWorkspacePath,
-    ];
-
-    if (this.options.security.enableJavaSecurityManager) {
-      params.unshift(
-        '-Dorg.osgi.framework.security=osgi',
-        `-Djava.security.policy=${path.resolve(this.installationPath, 'all.policy')}`
-      );
-    }
-
-    if (this.needModuleArguments) {
-      params.push(
-        '--add-modules=ALL-SYSTEM',
-        '--add-opens',
-        'java.base/java.util=ALL-UNNAMED',
-        '--add-opens',
-        'java.base/java.lang=ALL-UNNAMED'
-      );
-    }
-
-    // Check if workspace exists before launching
-    if (!existsSync(this.options.jdtWorkspacePath)) {
-      mkdirSync(this.options.jdtWorkspacePath);
-    }
-
-    const p = spawn(javaPath, params, {
-      cwd: this.options.jdtWorkspacePath,
-      detached: false,
-      stdio: 'pipe',
-      env: {
-        ...process.env,
-        CLIENT_HOST: '127.0.0.1',
-        CLIENT_PORT: port.toString(),
-        JAVA_HOME: javaHomePath,
-        EXTRA_WHITELIST_HOST: this.options.security.extraJavaRepositoryWhitelist.join(','),
-      },
-    });
-    p.stdout.on('data', data => {
-      log.stdout(data.toString());
-    });
-    p.stderr.on('data', data => {
-      log.stderr(data.toString());
-    });
-    log.info(
-      `Launch Java Language Server at port ${port.toString()}, pid:${
-        p.pid
-      }, JAVA_HOME:${javaHomePath}`
-    );
-    return new ExternalProgram(p, this.options, log);
-  }
-
-  // TODO(pcxu): run /usr/libexec/java_home to get all java homes for macOS
-  private getSystemJavaHome(): string {
-    let javaHome = process.env.JDK_HOME;
-    if (!javaHome) {
-      javaHome = process.env.JAVA_HOME;
-    }
-    if (javaHome) {
-      javaHome = this.expandHomeDir(javaHome);
-      const JAVAC_FILENAME = 'javac' + (process.platform === 'win32' ? '.exe' : '');
-      if (existsSync(javaHome) && existsSync(path.resolve(javaHome, 'bin', JAVAC_FILENAME))) {
-        return javaHome;
-      }
-    }
-    return '';
-  }
-
-  private getJavaVersion(javaHome: string): Promise<number> {
-    return new Promise((resolve, reject) => {
-      execFile(
-        path.resolve(javaHome, 'bin', process.platform === 'win32' ? 'java.exe' : 'java'),
-        ['-version'],
-        {},
-        (error, stdout, stderr) => {
-          const javaVersion = this.parseMajorVersion(stderr);
-          resolve(javaVersion);
-        }
-      );
-    });
-  }
-
-  private parseMajorVersion(content: string): number {
-    let regexp = /version "(.*)"/g;
-    let match = regexp.exec(content);
-    if (!match) {
-      return 0;
-    }
-    let version = match[1];
-    if (version.startsWith('1.')) {
-      version = version.substring(2);
-    }
-
-    regexp = /\d+/g;
-    match = regexp.exec(version);
-    let javaVersion = 0;
-    if (match) {
-      javaVersion = parseInt(match[0], 10);
-    }
-    return javaVersion;
-  }
-
-  private expandHomeDir(javaHome: string): string {
-    const homeDir = process.env[process.platform === 'win32' ? 'USERPROFILE' : 'HOME'];
-    if (!javaHome) {
-      return javaHome;
-    }
-    if (javaHome === '~') {
-      return homeDir!;
-    }
-    if (javaHome.slice(0, 2) !== '~/') {
-      return javaHome;
-    }
-    return path.join(homeDir!, javaHome.slice(2));
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/language_server_launcher.test.ts b/x-pack/legacy/plugins/code/server/lsp/language_server_launcher.test.ts
deleted file mode 100644
index 28fad5bbea60b9..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/language_server_launcher.test.ts
+++ /dev/null
@@ -1,45 +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 fs from 'fs';
-import { ServerOptions } from '../server_options';
-import { createTestServerOption } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { TYPESCRIPT } from './language_servers';
-import { TypescriptServerLauncher } from './ts_launcher';
-
-jest.setTimeout(15000);
-
-// @ts-ignore
-const options: ServerOptions = createTestServerOption();
-
-beforeAll(async () => {
-  if (!fs.existsSync(options.workspacePath)) {
-    fs.mkdirSync(options.workspacePath, { recursive: true });
-    fs.mkdirSync(options.jdtWorkspacePath, { recursive: true });
-  }
-});
-
-function delay(seconds: number) {
-  return new Promise(resolve => {
-    setTimeout(() => resolve(), seconds * 1000);
-  });
-}
-
-test('typescript language server could be shutdown', async () => {
-  const tsLauncher = new TypescriptServerLauncher(
-    'localhost',
-    options,
-    new ConsoleLoggerFactory(),
-    TYPESCRIPT.embedPath!
-  );
-  const proxy = await tsLauncher.launch(true, 1);
-  expect(tsLauncher.running).toBeTruthy();
-  await proxy.initialize(options.workspacePath);
-  await proxy.exit();
-  await delay(3);
-  expect(tsLauncher.running).toBeFalsy();
-});
diff --git a/x-pack/legacy/plugins/code/server/lsp/language_server_launcher.ts b/x-pack/legacy/plugins/code/server/lsp/language_server_launcher.ts
deleted file mode 100644
index 688f1f66f47d16..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/language_server_launcher.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ServerOptions } from '../server_options';
-import { LoggerFactory } from '../utils/log_factory';
-import { ILanguageServerHandler } from './proxy';
-
-export interface ILanguageServerLauncher {
-  running: boolean;
-  launch(builtinWorkspace: boolean, maxWorkspace: number): Promise<ILanguageServerHandler>;
-  launchFailed: boolean;
-}
-
-export type LauncherConstructor = new (
-  targetHost: string,
-  options: ServerOptions,
-  loggerFactory: LoggerFactory,
-  installationPath: string
-) => ILanguageServerLauncher;
diff --git a/x-pack/legacy/plugins/code/server/lsp/language_servers.ts b/x-pack/legacy/plugins/code/server/lsp/language_servers.ts
deleted file mode 100644
index 40b6a41d68c582..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/language_servers.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { InstallationType } from '../../common/installation';
-import { CTAGS_SUPPORT_LANGS, LanguageServer } from '../../common/language_server';
-import { ServerOptions } from '../server_options';
-import { CtagsLauncher } from './ctags_launcher';
-import { GoServerLauncher } from './go_launcher';
-import { JavaLauncher } from './java_launcher';
-import { LauncherConstructor } from './language_server_launcher';
-import { TypescriptServerLauncher } from './ts_launcher';
-
-export interface LanguageServerDefinition extends LanguageServer {
-  builtinWorkspaceFolders: boolean;
-  launcher: LauncherConstructor;
-  installationFolderName?: string;
-  downloadUrl?: (version: string, devMode?: boolean) => string;
-  embedPath?: string;
-  installationPluginName?: string;
-  priority: number;
-}
-
-export const TYPESCRIPT: LanguageServerDefinition = {
-  name: 'TypeScript',
-  builtinWorkspaceFolders: false,
-  languages: ['typescript', 'javascript'],
-  launcher: TypescriptServerLauncher,
-  installationType: InstallationType.Embed,
-  embedPath: require.resolve('@elastic/javascript-typescript-langserver/lib/language-server.js'),
-  priority: 2,
-};
-export const JAVA: LanguageServerDefinition = {
-  name: 'Java',
-  builtinWorkspaceFolders: true,
-  languages: ['java'],
-  launcher: JavaLauncher,
-  installationType: InstallationType.Plugin,
-  installationPluginName: 'java-langserver',
-  installationFolderName: 'jdt',
-  priority: 2,
-  downloadUrl: (version: string, devMode?: boolean) =>
-    devMode!
-      ? `https://snapshots.elastic.co/downloads/kibana-plugins/java-langserver/java-langserver-${version}-SNAPSHOT-$OS.zip`
-      : `https://artifacts.elastic.co/downloads/kibana-plugins/java-langserver/java-langserver-${version}-$OS.zip`,
-};
-export const GO: LanguageServerDefinition = {
-  name: 'Go',
-  builtinWorkspaceFolders: true,
-  languages: ['go'],
-  launcher: GoServerLauncher,
-  installationType: InstallationType.Plugin,
-  installationPluginName: 'go-langserver',
-  priority: 2,
-  installationFolderName: 'golsp',
-  downloadUrl: (version: string, devMode?: boolean) =>
-    devMode!
-      ? `https://snapshots.elastic.co/downloads/kibana-plugins/go-langserver/go-langserver-${version}-SNAPSHOT-$OS.zip`
-      : `https://artifacts.elastic.co/downloads/kibana-plugins/go-langserver/go-langserver-${version}-$OS.zip`,
-};
-export const CTAGS: LanguageServerDefinition = {
-  name: 'Ctags',
-  builtinWorkspaceFolders: true,
-  languages: CTAGS_SUPPORT_LANGS,
-  launcher: CtagsLauncher,
-  installationType: InstallationType.Embed,
-  embedPath: require.resolve('@elastic/ctags-langserver/lib/cli.js'),
-  priority: 1,
-};
-export const LanguageServers: LanguageServerDefinition[] = [TYPESCRIPT, JAVA, GO, CTAGS];
-export const LanguageServersDeveloping: LanguageServerDefinition[] = [];
-
-export function enabledLanguageServers(serverOptions: ServerOptions) {
-  const devMode: boolean = serverOptions.devMode;
-
-  function isEnabled(lang: LanguageServerDefinition, defaultEnabled: boolean) {
-    const name = lang.name;
-    // @ts-ignore
-    const enabled = serverOptions.lsp[name] && serverOptions.lsp[name].enabled;
-    return enabled === undefined ? defaultEnabled : enabled;
-  }
-  const results = LanguageServers.filter(lang => isEnabled(lang, true));
-  if (devMode) {
-    return results.concat(LanguageServersDeveloping.filter(lang => isEnabled(lang, devMode)));
-  }
-  return results;
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/lsp_benchmark.ts b/x-pack/legacy/plugins/code/server/lsp/lsp_benchmark.ts
deleted file mode 100644
index 8fbf3aab747988..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/lsp_benchmark.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import fs from 'fs';
-import path from 'path';
-import yaml from 'js-yaml';
-import { TestConfig, RequestType } from '../../model/test_config';
-import { TestRepoManager } from './test_repo_manager';
-import { LspTestRunner } from './lsp_test_runner';
-
-jest.setTimeout(300000);
-
-let repoManger: TestRepoManager;
-const resultFile = `benchmark_result_${Date.now()}.csv`;
-
-function sleep(ms: number) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-beforeAll(async () => {
-  const config: TestConfig = yaml.safeLoad(fs.readFileSync('test_config.yml', 'utf8'));
-  repoManger = new TestRepoManager(config);
-  await repoManger.importAllRepos();
-});
-
-it('test Java lsp full', async () => {
-  const repo = repoManger.getRepo('java');
-  const runner = new LspTestRunner(repo, RequestType.FULL, 10);
-  await runner.launchLspByLanguage();
-  // sleep until jdt connection established
-  await sleep(3000);
-  await runner.sendRandomRequest();
-  await runner.proxy!.exit();
-  runner.dumpToCSV(resultFile);
-  expect(true);
-});
-
-it('test Java lsp hover', async () => {
-  const repo = repoManger.getRepo('java');
-  const runner = new LspTestRunner(repo, RequestType.HOVER, 10);
-  await runner.launchLspByLanguage();
-  // sleep until jdt connection established
-  await sleep(3000);
-  await runner.sendRandomRequest();
-  await runner.proxy!.exit();
-  runner.dumpToCSV(resultFile);
-  expect(true);
-});
-
-it('test ts lsp full', async () => {
-  const repo = repoManger.getRepo('ts');
-  const runner = new LspTestRunner(repo, RequestType.FULL, 10);
-  await runner.launchLspByLanguage();
-  await sleep(2000);
-  await runner.sendRandomRequest();
-  await runner.proxy!.exit();
-  runner.dumpToCSV(resultFile);
-  await sleep(2000);
-  expect(true);
-});
-
-it('test ts lsp hover', async () => {
-  const repo = repoManger.getRepo('ts');
-  const runner = new LspTestRunner(repo, RequestType.HOVER, 10);
-  await runner.launchLspByLanguage();
-  await sleep(3000);
-  await runner.sendRandomRequest();
-  await runner.proxy!.exit();
-  runner.dumpToCSV(resultFile);
-  await sleep(2000);
-  expect(true);
-});
-
-afterAll(async () => {
-  // eslint-disable-next-line no-console
-  console.log(`result file ${path.resolve(__dirname)}/${resultFile} was saved!`);
-  await repoManger.cleanAllRepos();
-});
diff --git a/x-pack/legacy/plugins/code/server/lsp/lsp_service.ts b/x-pack/legacy/plugins/code/server/lsp/lsp_service.ts
deleted file mode 100644
index 88f9992f2d808d..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/lsp_service.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-
-import { LanguageServerStatus } from '../../common/language_server';
-import { GitOperations } from '../git_operations';
-import { EsClient } from '../lib/esqueue';
-import { RepositoryConfigController } from '../repository_config_controller';
-import { ServerOptions } from '../server_options';
-import { LoggerFactory } from '../utils/log_factory';
-import { LanguageServerController } from './controller';
-import { InstallManager } from './install_manager';
-import { WorkspaceHandler } from './workspace_handler';
-
-export class LspService {
-  public readonly controller: LanguageServerController;
-  public readonly workspaceHandler: WorkspaceHandler;
-  constructor(
-    targetHost: string,
-    serverOptions: ServerOptions,
-    gitOps: GitOperations,
-    client: EsClient,
-    installManager: InstallManager,
-    loggerFactory: LoggerFactory,
-    repoConfigController: RepositoryConfigController
-  ) {
-    this.workspaceHandler = new WorkspaceHandler(
-      gitOps,
-      serverOptions.workspacePath,
-      client,
-      loggerFactory
-    );
-    this.controller = new LanguageServerController(
-      serverOptions,
-      targetHost,
-      installManager,
-      loggerFactory,
-      repoConfigController
-    );
-  }
-
-  /**
-   * send a lsp request to language server, will initiate the language server if needed
-   * @param method the method name
-   * @param params the request params
-   */
-  public async sendRequest(method: string, params: any): Promise<ResponseMessage> {
-    const request = { method, params };
-    await this.workspaceHandler.handleRequest(request);
-    const response = await this.controller.handleRequest(request);
-    return this.workspaceHandler.handleResponse(request, response);
-  }
-
-  public async launchServers() {
-    await this.controller.launchServers();
-  }
-
-  public async deleteWorkspace(repoUri: string) {
-    for (const path of await this.workspaceHandler.listWorkspaceFolders(repoUri)) {
-      await this.controller.unloadWorkspace(path);
-    }
-    await this.workspaceHandler.clearWorkspace(repoUri);
-  }
-
-  /**
-   * shutdown all launched language servers
-   */
-  public async shutdown() {
-    await this.controller.exit();
-  }
-
-  public supportLanguage(lang: string) {
-    return this.controller.getLanguageServerDef(lang).length > 0;
-  }
-
-  public getLanguageSeverDef(lang: string) {
-    return this.controller.getLanguageServerDef(lang);
-  }
-
-  public languageServerStatus(name: string): LanguageServerStatus {
-    const defs = this.controller.getLanguageServerDef(name);
-    if (defs.length > 0) {
-      const def = defs[0];
-      return this.controller.status(def);
-    } else {
-      return LanguageServerStatus.NOT_INSTALLED;
-    }
-  }
-
-  public async initializeState(repoUri: string, revision: string) {
-    const workspacePath = await this.workspaceHandler.revisionDir(repoUri, revision);
-    return await this.controller.initializeState(workspacePath);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/lsp_test_runner.ts b/x-pack/legacy/plugins/code/server/lsp/lsp_test_runner.ts
deleted file mode 100644
index 4dca98b646b858..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/lsp_test_runner.ts
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/* eslint-disable no-console */
-
-import fs from 'fs';
-// @ts-ignore
-import * as sl from 'stats-lite';
-import _ from 'lodash';
-import papa from 'papaparse';
-
-import { InstallManager } from './install_manager';
-import { JavaLauncher } from './java_launcher';
-import { JAVA, TYPESCRIPT } from './language_servers';
-import { RequestExpander } from './request_expander';
-import { TypescriptServerLauncher } from './ts_launcher';
-import { GitOperations } from '../git_operations';
-import { createTestServerOption } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { LspRequest } from '../../model';
-import { Repo, RequestType } from '../../model/test_config';
-
-const requestTypeMapping = new Map<number, string>([
-  [RequestType.FULL, 'full'],
-  [RequestType.HOVER, 'hover'],
-  [RequestType.INITIALIZE, 'initialize'],
-]);
-
-interface Result {
-  repoName: string;
-  startTime: number;
-  numberOfRequests: number;
-  rps: number;
-  OK: number;
-  KO: number;
-  KORate: string;
-  latency_max: number;
-  latency_min: number;
-  latency_medium: number;
-  latency_95: number;
-  latency_99: number;
-  latency_avg: number;
-  latency_std_dev: number;
-}
-
-const serverOptions = createTestServerOption();
-
-export class LspTestRunner {
-  private repo: Repo;
-  public result: Result;
-  public proxy: RequestExpander | null;
-  private requestType: RequestType;
-  private times: number;
-
-  constructor(repo: Repo, requestType: RequestType, times: number) {
-    this.repo = repo;
-    this.requestType = requestType;
-    this.times = times;
-    this.proxy = null;
-    this.result = {
-      repoName: `${repo.url}`,
-      startTime: 0,
-      numberOfRequests: times,
-      rps: 0,
-      OK: 0,
-      KO: 0,
-      KORate: '',
-      latency_max: 0,
-      latency_min: 0,
-      latency_medium: 0,
-      latency_95: 0,
-      latency_99: 0,
-      latency_avg: 0,
-      latency_std_dev: 0,
-    };
-    if (!fs.existsSync(serverOptions.workspacePath)) {
-      fs.mkdirSync(serverOptions.workspacePath);
-    }
-  }
-
-  public async sendRandomRequest() {
-    const repoPath: string = this.repo.path;
-    const files = await this.getAllFile();
-    const randomFile = files[Math.floor(Math.random() * files.length)];
-    await this.proxy!.initialize(repoPath);
-    switch (this.requestType) {
-      case RequestType.HOVER: {
-        const req: LspRequest = {
-          method: 'textDocument/hover',
-          params: {
-            textDocument: {
-              uri: `file://${this.repo.path}/${randomFile}`,
-            },
-            position: this.randomizePosition(),
-          },
-        };
-        await this.launchRequest(req);
-        break;
-      }
-      case RequestType.INITIALIZE: {
-        this.proxy!.initialize(repoPath);
-        break;
-      }
-      case RequestType.FULL: {
-        const req: LspRequest = {
-          method: 'textDocument/full',
-          params: {
-            textDocument: {
-              uri: `file://${this.repo.path}/${randomFile}`,
-            },
-            reference: false,
-          },
-        };
-        await this.launchRequest(req);
-        break;
-      }
-      default: {
-        console.error('Unknown request type!');
-        break;
-      }
-    }
-  }
-
-  private async launchRequest(req: LspRequest) {
-    this.result.startTime = Date.now();
-    let OK: number = 0;
-    let KO: number = 0;
-    const responseTimes = [];
-    for (let i = 0; i < this.times; i++) {
-      try {
-        const start = Date.now();
-        await this.proxy!.handleRequest(req);
-        responseTimes.push(Date.now() - start);
-        OK += 1;
-      } catch (e) {
-        KO += 1;
-      }
-    }
-    this.result.KO = KO;
-    this.result.OK = OK;
-    this.result.KORate = ((KO / this.times) * 100).toFixed(2) + '%';
-    this.result.rps = this.times / (Date.now() - this.result.startTime);
-    this.collectMetrics(responseTimes);
-  }
-
-  private collectMetrics(responseTimes: number[]) {
-    this.result.latency_max = Math.max.apply(null, responseTimes);
-    this.result.latency_min = Math.min.apply(null, responseTimes);
-    this.result.latency_avg = sl.mean(responseTimes);
-    this.result.latency_medium = sl.median(responseTimes);
-    this.result.latency_95 = sl.percentile(responseTimes, 0.95);
-    this.result.latency_99 = sl.percentile(responseTimes, 0.99);
-    this.result.latency_std_dev = sl.stdev(responseTimes).toFixed(2);
-  }
-
-  public dumpToCSV(resultFile: string) {
-    const newResult = _.mapKeys(this.result as _.Dictionary<any>, (v, k) => {
-      if (k !== 'repoName') {
-        return `${requestTypeMapping.get(this.requestType)}_${k}`;
-      } else {
-        return 'repoName';
-      }
-    });
-    if (!fs.existsSync(resultFile)) {
-      console.log(papa.unparse([newResult]));
-      fs.writeFileSync(resultFile, papa.unparse([newResult]));
-    } else {
-      const file = fs.createReadStream(resultFile);
-      papa.parse(file, {
-        header: true,
-        complete: parsedResult => {
-          const originResults = parsedResult.data;
-          const index = originResults.findIndex(originResult => {
-            return originResult.repoName === newResult.repoName;
-          });
-          if (index === -1) {
-            originResults.push(newResult);
-          } else {
-            originResults[index] = { ...originResults[index], ...newResult };
-          }
-          fs.writeFileSync(resultFile, papa.unparse(originResults));
-        },
-      });
-    }
-  }
-
-  private async getAllFile() {
-    const gitOperator: GitOperations = new GitOperations(this.repo.path);
-    try {
-      const result: string[] = [];
-      const fileIterator = await gitOperator.iterateRepo('', 'HEAD');
-      for await (const file of fileIterator) {
-        const filePath = file.path!;
-        if (filePath.endsWith(this.repo.language)) {
-          result.push(filePath);
-        }
-      }
-      return result;
-    } catch (e) {
-      console.error(`get files error: ${e}`);
-      throw e;
-    }
-  }
-
-  private randomizePosition() {
-    // TODO:pcxu randomize position according to source file
-    return {
-      line: 19,
-      character: 2,
-    };
-  }
-
-  public async launchLspByLanguage() {
-    switch (this.repo.language) {
-      case 'java': {
-        this.proxy = await this.launchJavaLanguageServer();
-        break;
-      }
-      case 'ts': {
-        this.proxy = await this.launchTypescriptLanguageServer();
-        break;
-      }
-      default: {
-        console.error('unknown language type');
-        break;
-      }
-    }
-  }
-
-  private async launchTypescriptLanguageServer() {
-    const launcher = new TypescriptServerLauncher(
-      '127.0.0.1',
-      serverOptions,
-      new ConsoleLoggerFactory(),
-      TYPESCRIPT.embedPath!
-    );
-    return await launcher.launch(false, 1);
-  }
-
-  private async launchJavaLanguageServer() {
-    // @ts-ignore
-    const installManager = new InstallManager(null, serverOptions);
-    const launcher = new JavaLauncher(
-      '127.0.0.1',
-      serverOptions,
-      new ConsoleLoggerFactory(),
-      installManager.installationPath(JAVA)
-    );
-    return await launcher.launch(false, 1);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/mock_lang_server.js b/x-pack/legacy/plugins/code/server/lsp/mock_lang_server.js
deleted file mode 100644
index 656f2face70b00..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/mock_lang_server.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-/* eslint-disable */
-// This file is used in the test, using subprocess.fork to load a module directly, so this module can not be typescript
-const net = require('net');
-const jsonrpc = require('vscode-jsonrpc');
-const createMessageConnection = jsonrpc.createMessageConnection;
-const SocketMessageReader = jsonrpc.SocketMessageReader;
-const SocketMessageWriter = jsonrpc.SocketMessageWriter;
-
-function log(msg) {
-    if (process.send) {
-        process.send(msg);
-    }
-    else {
-        // eslint-disable-next-line no-console
-        console.log(msg);
-    }
-}
-class MockLangServer {
-    constructor(host, port) {
-        this.host = host;
-        this.port = port;
-        this.socket = null;
-        this.connection = null;
-        this.shutdown = false;
-    }
-    /**
-     * connect remote server as a client
-     */
-    connect() {
-        this.socket = new net.Socket();
-        this.socket.on('connect', () => {
-            const reader = new SocketMessageReader(this.socket);
-            const writer = new SocketMessageWriter(this.socket);
-            this.connection = createMessageConnection(reader, writer);
-            this.connection.listen();
-            this.connection.onNotification(this.onNotification.bind(this));
-            this.connection.onRequest(this.onRequest.bind(this));
-            log('socket connected');
-        });
-        this.socket.on('close', () => this.onSocketClosed());
-        log('start connecting');
-        this.socket.connect(this.port, this.host);
-    }
-    listen() {
-        const server = net.createServer(socket => {
-            server.close();
-            socket.on('close', () => this.onSocketClosed());
-            const reader = new SocketMessageReader(socket);
-            const writer = new SocketMessageWriter(socket);
-            this.connection = createMessageConnection(reader, writer);
-            this.connection.onNotification(this.onNotification.bind(this));
-            this.connection.onRequest(this.onRequest.bind(this));
-            this.connection.listen();
-            log('socket connected');
-        });
-        server.on('error', err => {
-            log(err);
-        });
-        log('start listening');
-        server.listen(this.port);
-    }
-    onNotification(method, ...params) {
-        log({ method, params });
-        // notify parent process what happened
-        if (method === 'exit') {
-            // https://microsoft.github.io/language-server-protocol/specification#exit
-            if (options.noExit) {
-                log('noExit');
-            }
-            else {
-                const code = this.shutdown ? 0 : 1;
-                log(`exit process with code ${code}`);
-                process.exit(code);
-            }
-        }
-    }
-    onRequest(method, ...params) {
-        // notify parent process what requested
-        log({ method, params });
-        if (method === 'shutdown') {
-            this.shutdown = true;
-        }
-        return { result: 'ok' };
-    }
-    onSocketClosed() {
-        // notify parent process that socket closed
-        log('socket closed');
-    }
-}
-log('process started');
-let port = 9999;
-let host = ' localhost';
-const options = { noExit: false };
-let langServer;
-process.on('message', (msg) => {
-    const [cmd, value] = msg.split(' ');
-    switch (cmd) {
-        case 'port':
-            port = parseInt(value, 10);
-            break;
-        case 'host':
-            host = value;
-            break;
-        case 'noExit':
-            options.noExit = true;
-            break;
-        case 'listen':
-            langServer = new MockLangServer(host, port);
-            langServer.listen();
-            break;
-        case 'connect':
-            langServer = new MockLangServer(host, port);
-            langServer.connect();
-            break;
-        case 'quit':
-            process.exit(0);
-            break;
-        default:
-        // nothing to do
-    }
-});
diff --git a/x-pack/legacy/plugins/code/server/lsp/process/controlled_program.ts b/x-pack/legacy/plugins/code/server/lsp/process/controlled_program.ts
deleted file mode 100644
index 228d9ae9dcc2df..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/process/controlled_program.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export interface ControlledProgram {
-  readonly pid: number;
-
-  kill(force: boolean): void;
-
-  onExit(callback: () => void): void;
-
-  killed(): boolean;
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/process/embed_ctag_server.ts b/x-pack/legacy/plugins/code/server/lsp/process/embed_ctag_server.ts
deleted file mode 100644
index 2967026f397bc9..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/process/embed_ctag_server.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as lsp from 'vscode-languageserver';
-import { IConnection } from 'vscode-languageserver';
-import { createLspConnection } from '@elastic/ctags-langserver/lib/lsp-connection';
-import { Logger } from '../../log';
-import { EmbedProgram } from './embed_program';
-
-export class EmbedCtagServer extends EmbedProgram {
-  private connection: IConnection | null = null;
-  constructor(public readonly port: number, log: Logger) {
-    super(log);
-  }
-
-  async stop(): Promise<void> {
-    if (this.connection) {
-      this.connection.dispose();
-    }
-  }
-
-  async start(): Promise<void> {
-    this.connection = createLspConnection({
-      ctagsPath: '',
-      showMessageLevel: lsp.MessageType.Warning,
-      socketPort: this.port,
-    });
-    this.connection.listen();
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/process/embed_program.ts b/x-pack/legacy/plugins/code/server/lsp/process/embed_program.ts
deleted file mode 100644
index a82a954851712d..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/process/embed_program.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EventEmitter } from 'events';
-import { ControlledProgram } from './controlled_program';
-import { Logger } from '../../log';
-
-let globalPid = 0;
-
-export abstract class EmbedProgram implements ControlledProgram {
-  private eventEmitter = new EventEmitter();
-  private _killed: boolean = false;
-  protected constructor(public readonly log: Logger) {
-    this.pid = globalPid++;
-  }
-
-  readonly pid: number;
-
-  kill(force?: boolean): void {
-    this.stop().then(() => {
-      this.log.debug('embed program stopped');
-      this._killed = true;
-      this.eventEmitter.emit('exit');
-    });
-  }
-
-  killed(): boolean {
-    return this._killed;
-  }
-
-  onExit(callback: () => void) {
-    this.eventEmitter.on('exit', callback);
-  }
-
-  abstract async stop(): Promise<void>;
-  abstract async start(): Promise<void>;
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/process/external_program.ts b/x-pack/legacy/plugins/code/server/lsp/process/external_program.ts
deleted file mode 100644
index 21100149e498ee..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/process/external_program.ts
+++ /dev/null
@@ -1,66 +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 fs from 'fs';
-import { ChildProcess } from 'child_process';
-import { ControlledProgram } from './controlled_program';
-import { ServerOptions } from '../../server_options';
-import { Logger } from '../../log';
-
-const OOM_SCORE_ADJ = 667;
-const OOM_ADJ = 10;
-
-export class ExternalProgram implements ControlledProgram {
-  constructor(
-    public readonly child: ChildProcess,
-    public readonly options: ServerOptions,
-    public readonly log: Logger
-  ) {
-    this.pid = child.pid;
-    if (this.options.lsp.oomScoreAdj && process.platform === 'linux') {
-      this.adjustOom(this.pid);
-    }
-    this.log.debug('spawned a child process ' + this.pid);
-  }
-
-  kill(force: boolean = false): void {
-    if (force) {
-      this.child.kill('SIGKILL');
-      this.log.info('force killed process ' + this.pid);
-    } else {
-      this.child.kill();
-      this.log.info('killed process ' + this.pid);
-    }
-  }
-
-  killed(): boolean {
-    return this.child.killed;
-  }
-
-  onExit(callback: () => void) {
-    this.child.on('exit', callback);
-  }
-
-  readonly pid: number;
-
-  private adjustOom(pid: number) {
-    try {
-      fs.writeFileSync(`/proc/${pid}/oom_score_adj`, `${OOM_SCORE_ADJ}\n`);
-      this.log.debug(`wrote oom_score_adj of process ${pid} to ${OOM_SCORE_ADJ}`);
-    } catch (e) {
-      this.log.warn(e);
-      try {
-        fs.writeFileSync(`/proc/${pid}/oom_adj`, `${OOM_ADJ}\n`);
-        this.log.debug(`wrote oom_adj of process ${pid} to ${OOM_ADJ}`);
-      } catch (err) {
-        this.log.warn(
-          'write oom_score_adj and oom_adj file both failed, reduce priority not working'
-        );
-        this.log.warn(err);
-      }
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/proxy.ts b/x-pack/legacy/plugins/code/server/lsp/proxy.ts
deleted file mode 100644
index 3ba796df9e7332..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/proxy.ts
+++ /dev/null
@@ -1,285 +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 EventEmitter from 'events';
-import * as net from 'net';
-import { fileURLToPath } from 'url';
-import {
-  createMessageConnection,
-  MessageConnection,
-  SocketMessageReader,
-  SocketMessageWriter,
-} from 'vscode-jsonrpc';
-import { ResponseError, ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-
-import {
-  ClientCapabilities,
-  ExitNotification,
-  InitializedNotification,
-  InitializeResult,
-  LogMessageNotification,
-  MessageType,
-  WorkspaceFolder,
-} from 'vscode-languageserver-protocol/lib/main';
-
-import { LspRequest } from '../../model';
-import { Logger } from '../log';
-import { InternalError, RequestCancelled } from '../../common/lsp_error_codes';
-import { InitializeOptions, WorkspaceStatus } from './request_expander';
-
-export interface ILanguageServerHandler {
-  lastAccess?: number;
-  handleRequest(request: LspRequest): Promise<ResponseMessage>;
-  exit(): Promise<any>;
-  unloadWorkspace(workspaceDir: string): Promise<void>;
-  initializeState?(
-    workspaceDir: string
-  ): Promise<{ [lang: string]: WorkspaceStatus }> | WorkspaceStatus;
-}
-
-export class LanguageServerProxy implements ILanguageServerHandler {
-  private error: any | null = null;
-  public get isClosed() {
-    return this.closed;
-  }
-
-  public initialized: boolean = false;
-  private socket: any;
-  private clientConnection: MessageConnection | null = null;
-  private closed: boolean = false;
-  private readonly targetHost: string;
-  private targetPort: number;
-  private readonly logger: Logger;
-  private eventEmitter = new EventEmitter();
-  private currentServer: net.Server | null = null;
-  private listeningPort: number | null = null;
-
-  constructor(targetPort: number, targetHost: string, logger: Logger) {
-    this.targetHost = targetHost;
-    this.targetPort = targetPort;
-    this.logger = logger;
-  }
-
-  public async handleRequest(request: LspRequest): Promise<ResponseMessage> {
-    const response: ResponseMessage = {
-      jsonrpc: '',
-      id: null,
-    };
-
-    const conn = await this.connected();
-    const params = Array.isArray(request.params) ? request.params : [request.params];
-    if (!request.isNotification) {
-      const file = request.documentUri || request.workspacePath;
-      this.logger.debug(`sending request ${request.method} for ${file}`);
-      response.result = await conn.sendRequest(request.method, ...params);
-      this.logger.debug(`request ${request.method} for ${file} done.`);
-    } else {
-      conn.sendNotification(request.method, ...params);
-    }
-    return response;
-  }
-
-  public connected(): Promise<MessageConnection> {
-    if (this.closed) {
-      return Promise.reject(new ResponseError(RequestCancelled, 'Server closed'));
-    } else if (this.error) {
-      return Promise.reject(new ResponseError(InternalError, 'Server error', this.error));
-    } else if (this.clientConnection) {
-      return Promise.resolve(this.clientConnection);
-    } else {
-      return new Promise<MessageConnection>((resolve, reject) => {
-        this.eventEmitter.on('err', error =>
-          reject(new ResponseError(InternalError, 'Server error', error))
-        );
-        this.eventEmitter.on('exit', () => {
-          reject(new ResponseError(RequestCancelled, 'Server closed'));
-          this.initialized = false;
-        });
-        this.eventEmitter.on('connect', () => resolve(this.clientConnection!));
-      });
-    }
-  }
-
-  public async initialize(
-    clientCapabilities: ClientCapabilities,
-    workspaceFolders: [WorkspaceFolder],
-    initOptions?: InitializeOptions
-  ): Promise<InitializeResult> {
-    if (this.error) {
-      throw this.error;
-    }
-    const clientConn = await this.connected();
-    const rootUri = workspaceFolders[0].uri;
-    if (
-      initOptions &&
-      initOptions.clientCapabilities &&
-      Object.keys(clientCapabilities).length === 0
-    ) {
-      clientCapabilities = initOptions.clientCapabilities;
-    }
-    const params = {
-      processId: null,
-      workspaceFolders,
-      rootUri,
-      capabilities: clientCapabilities,
-      rootPath: fileURLToPath(rootUri),
-    };
-    this.logger.debug(`sending initialize for ${params.rootPath}`);
-    return await clientConn
-      .sendRequest(
-        'initialize',
-        initOptions && initOptions.initialOptions
-          ? { ...params, initializationOptions: initOptions.initialOptions }
-          : params
-      )
-      .then(r => {
-        this.logger.info(`initialized at ${rootUri}`);
-
-        // @ts-ignore
-        // TODO fix this
-        clientConn.sendNotification(InitializedNotification.type, {});
-        this.initialized = true;
-        return r as InitializeResult;
-      });
-  }
-
-  public async shutdown() {
-    const clientConn = await this.connected();
-    this.logger.info(`sending shutdown request`);
-    return await clientConn.sendRequest('shutdown');
-  }
-  /**
-   * send a exit request to Language Server
-   * https://microsoft.github.io/language-server-protocol/specification#exit
-   */
-  public async exit() {
-    this.closed = true; // stop the socket reconnect
-    if (this.clientConnection) {
-      this.logger.info('sending `shutdown` request to language server.');
-      const clientConn = this.clientConnection;
-      clientConn.sendRequest('shutdown');
-      this.logger.info('sending `exit` notification to language server.');
-      // @ts-ignore
-      clientConn.sendNotification(ExitNotification.type);
-    }
-    this.eventEmitter.emit('exit');
-    this.initialized = false;
-  }
-
-  public startServerConnection() {
-    // prevent calling this method multiple times which may cause 'port already in use' error
-    if (this.currentServer) {
-      if (this.listeningPort === this.targetPort) {
-        return;
-      } else {
-        this.currentServer!.close();
-      }
-    }
-    const server = net.createServer(socket => {
-      this.initialized = false;
-      server.close();
-      this.currentServer = null;
-      socket.on('close', () => this.onSocketClosed());
-      this.eventEmitter.off('changePort', server.close);
-      this.logger.info('langserver connection established on port ' + this.targetPort);
-      const reader = new SocketMessageReader(socket);
-      const writer = new SocketMessageWriter(socket);
-      this.clientConnection = createMessageConnection(reader, writer, this.logger);
-      this.registerOnNotificationHandler(this.clientConnection);
-      this.clientConnection.listen();
-      this.eventEmitter.emit('connect');
-    });
-    server.on('error', this.setError);
-    const port = this.targetPort;
-    server.listen(port, () => {
-      this.listeningPort = port;
-      this.currentServer = server;
-      server.removeListener('error', this.setError);
-      this.logger.info('Wait langserver connection on port ' + this.targetPort);
-    });
-  }
-
-  /**
-   * get notification when proxy's socket disconnect
-   * @param listener
-   */
-  public onDisconnected(listener: () => void) {
-    this.eventEmitter.on('close', listener);
-  }
-
-  public onExit(listener: () => void) {
-    this.eventEmitter.on('exit', listener);
-  }
-
-  /**
-   * get notification when proxy's socket connect
-   * @param listener
-   */
-  public onConnected(listener: () => void) {
-    this.eventEmitter.on('connect', listener);
-  }
-
-  public connect() {
-    this.logger.debug('connecting');
-    this.socket = new net.Socket();
-
-    this.socket.on('connect', () => {
-      const reader = new SocketMessageReader(this.socket);
-      const writer = new SocketMessageWriter(this.socket);
-      this.clientConnection = createMessageConnection(reader, writer, this.logger);
-      this.registerOnNotificationHandler(this.clientConnection);
-      this.clientConnection.listen();
-      this.eventEmitter.emit('connect');
-    });
-
-    this.socket.on('close', () => this.onSocketClosed());
-
-    this.socket.on('error', () => void 0);
-    this.socket.on('timeout', () => void 0);
-    this.socket.on('drain', () => void 0);
-    this.socket.connect(this.targetPort, this.targetHost);
-  }
-
-  public unloadWorkspace(workspaceDir: string): Promise<void> {
-    return Promise.reject('should not hit here');
-  }
-
-  private onSocketClosed() {
-    this.clientConnection = null;
-    this.initialized = false;
-    this.eventEmitter.emit('close');
-  }
-
-  private registerOnNotificationHandler(clientConnection: MessageConnection) {
-    // @ts-ignore
-    clientConnection.onNotification(LogMessageNotification.type, notification => {
-      switch (notification.type) {
-        case MessageType.Log:
-          this.logger.debug(notification.message);
-          break;
-        case MessageType.Info:
-          this.logger.debug(notification.message);
-          break;
-        case MessageType.Warning:
-          this.logger.warn(notification.message);
-          break;
-        case MessageType.Error:
-          this.logger.error(notification.message);
-          break;
-      }
-    });
-  }
-
-  public changePort(port: number) {
-    if (port !== this.targetPort) {
-      this.targetPort = port;
-    }
-  }
-
-  public setError(error: any) {
-    this.error = error;
-    this.eventEmitter.emit('err', error);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/replies_map.ts b/x-pack/legacy/plugins/code/server/lsp/replies_map.ts
deleted file mode 100644
index 12ed53b9b57382..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/replies_map.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-
-export type RepliesMap = Map<
-  number,
-  [(resp: ResponseMessage) => void, (error: ResponseMessage['error']) => void]
->;
-
-export function createRepliesMap() {
-  return new Map() as RepliesMap;
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/request_expander.test.ts b/x-pack/legacy/plugins/code/server/lsp/request_expander.test.ts
deleted file mode 100644
index cf3999ec244f55..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/request_expander.test.ts
+++ /dev/null
@@ -1,179 +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 fs from 'fs';
-import rimraf from 'rimraf';
-import sinon from 'sinon';
-import { pathToFileURL } from 'url';
-
-import { ServerOptions } from '../server_options';
-import { LanguageServerProxy } from './proxy';
-import { RequestExpander, WorkspaceUnloadedError } from './request_expander';
-import { ConsoleLogger } from '../utils/console_logger';
-
-// @ts-ignore
-const options: ServerOptions = {
-  workspacePath: '/tmp/test/workspace',
-};
-beforeEach(async () => {
-  sinon.reset();
-  if (!fs.existsSync(options.workspacePath)) {
-    fs.mkdirSync(options.workspacePath, { recursive: true });
-  }
-});
-
-afterEach(() => {
-  return new Promise(resolve => {
-    rimraf(options.workspacePath, resolve);
-  });
-});
-
-function createMockProxy(initDelay: number = 0, requestDelay: number = 0) {
-  // @ts-ignore
-  const proxyStub = sinon.createStubInstance(LanguageServerProxy, {
-    handleRequest: sinon.stub().callsFake(() => {
-      if (requestDelay > 0) {
-        const start = Date.now();
-        return new Promise(resolve => {
-          setTimeout(() => {
-            resolve({ result: { start, end: Date.now() } });
-          }, requestDelay);
-        });
-      } else {
-        return sinon.stub().resolvesArg(0);
-      }
-    }),
-    initialize: sinon.stub().callsFake(
-      () =>
-        new Promise(resolve => {
-          proxyStub.initialized = true;
-          if (initDelay > 0) {
-            setTimeout(() => {
-              resolve();
-            }, initDelay);
-          } else {
-            resolve();
-          }
-        })
-    ),
-  });
-  return proxyStub;
-}
-
-const log = new ConsoleLogger();
-
-test('be able to open multiple workspace', async () => {
-  const proxyStub = createMockProxy();
-  const expander = new RequestExpander(proxyStub, true, 2, options, {}, log);
-  const request1 = {
-    method: 'request1',
-    params: [],
-    workspacePath: '/tmp/test/workspace/1',
-  };
-
-  const request2 = {
-    method: 'request2',
-    params: [],
-    workspacePath: '/tmp/test/workspace/2',
-  };
-  fs.mkdirSync(request1.workspacePath, { recursive: true });
-  fs.mkdirSync(request2.workspacePath, { recursive: true });
-  await expander.handleRequest(request1);
-  await expander.handleRequest(request2);
-  expect(proxyStub.initialize.called);
-  expect(
-    proxyStub.initialize.calledOnceWith({}, [
-      {
-        name: request1.workspacePath,
-        uri: pathToFileURL(request1.workspacePath).href,
-      },
-    ])
-  ).toBeTruthy();
-  expect(
-    proxyStub.handleRequest.calledWith({
-      method: 'workspace/didChangeWorkspaceFolders',
-      params: {
-        event: {
-          added: [
-            {
-              name: request2.workspacePath,
-              uri: pathToFileURL(request2.workspacePath).href,
-            },
-          ],
-          removed: [],
-        },
-      },
-      isNotification: true,
-    })
-  ).toBeTruthy();
-});
-
-test('be able to swap workspace', async () => {
-  const proxyStub = createMockProxy();
-  const expander = new RequestExpander(proxyStub, true, 1, options, {}, log);
-  const request1 = {
-    method: 'request1',
-    params: [],
-    workspacePath: '/tmp/test/workspace/1',
-  };
-  const request2 = {
-    method: 'request2',
-    params: [],
-    workspacePath: '/tmp/test/workspace/2',
-  };
-  fs.mkdirSync(request1.workspacePath, { recursive: true });
-  fs.mkdirSync(request2.workspacePath, { recursive: true });
-  await expander.handleRequest(request1);
-  await expander.handleRequest(request2);
-  expect(proxyStub.initialize.called);
-  expect(
-    proxyStub.handleRequest.calledWith({
-      method: 'workspace/didChangeWorkspaceFolders',
-      params: {
-        event: {
-          added: [
-            {
-              name: request2.workspacePath,
-              uri: pathToFileURL(request2.workspacePath).href,
-            },
-          ],
-          removed: [
-            {
-              name: request1.workspacePath,
-              uri: pathToFileURL(request1.workspacePath).href,
-            },
-          ],
-        },
-      },
-      isNotification: true,
-    })
-  ).toBeTruthy();
-});
-
-test('requests should be cancelled if workspace is unloaded', async () => {
-  // @ts-ignore
-
-  const clock = sinon.useFakeTimers();
-  const proxyStub = createMockProxy(300);
-  const expander = new RequestExpander(proxyStub, true, 1, options, {}, log);
-  const workspace1 = '/tmp/test/workspace/1';
-  const request = {
-    method: 'request1',
-    params: [],
-    workspacePath: workspace1,
-  };
-  fs.mkdirSync(workspace1, { recursive: true });
-  const promise1 = expander.handleRequest(request);
-  const promise2 = expander.handleRequest(request);
-  setTimeout(() => expander.unloadWorkspace(workspace1), 1);
-  clock.tick(100);
-
-  process.nextTick(() => clock.runAll());
-  await expect(promise1).rejects.toEqual(WorkspaceUnloadedError);
-  await expect(promise2).rejects.toEqual(WorkspaceUnloadedError);
-
-  clock.restore();
-});
diff --git a/x-pack/legacy/plugins/code/server/lsp/request_expander.ts b/x-pack/legacy/plugins/code/server/lsp/request_expander.ts
deleted file mode 100644
index 35d4d4b3846646..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/request_expander.ts
+++ /dev/null
@@ -1,272 +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 fs from 'fs';
-import path from 'path';
-import { pathToFileURL } from 'url';
-import { ResponseError, ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-import {
-  ClientCapabilities,
-  DidChangeWorkspaceFoldersParams,
-  InitializeResult,
-} from 'vscode-languageserver-protocol';
-import { RequestCancelled } from '../../common/lsp_error_codes';
-import { LspRequest } from '../../model';
-import { Logger } from '../log';
-import { ServerOptions } from '../server_options';
-import { Cancelable } from '../utils/cancelable';
-import { ILanguageServerHandler, LanguageServerProxy } from './proxy';
-
-export enum WorkspaceStatus {
-  Uninitialized = 'Uninitialized',
-  Initializing = 'Initializing',
-  Initialized = 'Initialized',
-}
-
-interface Workspace {
-  lastAccess: number;
-  status: WorkspaceStatus;
-  initPromise?: Cancelable<any>;
-}
-
-export interface InitializeOptions {
-  clientCapabilities?: ClientCapabilities;
-  initialOptions?: object;
-}
-
-export const WorkspaceUnloadedError = new ResponseError(RequestCancelled, 'Workspace unloaded');
-
-export class RequestExpander implements ILanguageServerHandler {
-  public lastAccess: number = 0;
-  private proxy: LanguageServerProxy;
-  // a map for workspacePath -> Workspace
-  private workspaces: Map<string, Workspace> = new Map();
-  private readonly workspaceRoot: string;
-  private exited = false;
-
-  constructor(
-    proxy: LanguageServerProxy,
-    public readonly builtinWorkspace: boolean,
-    public readonly maxWorkspace: number,
-    public readonly serverOptions: ServerOptions,
-    public readonly initialOptions: InitializeOptions,
-    public readonly log: Logger
-  ) {
-    this.proxy = proxy;
-    const clearListener = () => {
-      this.log.debug('proxy disconnected, clearing workspace status');
-      this.workspaces.clear();
-    };
-    proxy.onDisconnected(clearListener);
-    proxy.onExit(clearListener);
-    this.workspaceRoot = fs.realpathSync(this.serverOptions.workspacePath);
-  }
-
-  public handleRequest(request: LspRequest): Promise<ResponseMessage> {
-    this.lastAccess = Date.now();
-    return new Promise<ResponseMessage>((resolve, reject) => {
-      if (this.exited) {
-        reject(new Error('proxy is exited.'));
-        return;
-      }
-      this.log.debug(`handling a ${request.method} job for workspace ${request.workspacePath}`);
-      this.expand(request).then(
-        value => {
-          resolve(value);
-        },
-        err => {
-          this.log.error(err);
-          reject(err);
-        }
-      );
-    });
-  }
-
-  public async exit() {
-    this.exited = true;
-    this.log.debug(`exiting proxy`);
-    return this.proxy.exit();
-  }
-
-  public async unloadWorkspace(workspacePath: string) {
-    this.log.debug('unload workspace ' + workspacePath);
-    if (this.hasWorkspacePath(workspacePath)) {
-      const ws = this.getWorkspace(workspacePath);
-      if (ws.initPromise) {
-        ws.initPromise.cancel(WorkspaceUnloadedError);
-      }
-      if (this.builtinWorkspace) {
-        const params: DidChangeWorkspaceFoldersParams = {
-          event: {
-            removed: [
-              {
-                name: workspacePath!,
-                uri: pathToFileURL(workspacePath).href,
-              },
-            ],
-            added: [],
-          },
-        };
-        await this.proxy.handleRequest({
-          method: 'workspace/didChangeWorkspaceFolders',
-          params,
-          isNotification: true,
-        });
-      } else {
-        await this.exit();
-      }
-    }
-    this.removeWorkspace(workspacePath);
-  }
-
-  public async initialize(workspacePath: string): Promise<void | InitializeResult> {
-    this.updateWorkspace(workspacePath);
-    const ws = this.getWorkspace(workspacePath);
-    ws.status = WorkspaceStatus.Initializing;
-
-    try {
-      if (this.builtinWorkspace) {
-        if (this.proxy.initialized) {
-          await this.changeWorkspaceFolders(workspacePath, this.maxWorkspace);
-        } else {
-          // this is the first workspace, init the lsp server first
-          await this.sendInitRequest(workspacePath);
-        }
-        ws.status = WorkspaceStatus.Initialized;
-        delete ws.initPromise;
-      } else {
-        for (const w of this.workspaces.values()) {
-          if (w.status === WorkspaceStatus.Initialized) {
-            await this.proxy.shutdown();
-            this.workspaces.clear();
-            break;
-          }
-        }
-        const response = await this.sendInitRequest(workspacePath);
-        ws.status = WorkspaceStatus.Initialized;
-        return response;
-      }
-    } catch (e) {
-      ws.status = WorkspaceStatus.Uninitialized;
-      throw e;
-    }
-  }
-
-  private async sendInitRequest(workspacePath: string) {
-    return await this.proxy.initialize(
-      {},
-      [
-        {
-          name: workspacePath,
-          uri: pathToFileURL(workspacePath).href,
-        },
-      ],
-      this.initialOptions
-    );
-  }
-
-  private async expand(request: LspRequest): Promise<ResponseMessage> {
-    if (request.workspacePath) {
-      const ws = this.getWorkspace(request.workspacePath);
-      if (ws.status === WorkspaceStatus.Uninitialized) {
-        ws.initPromise = Cancelable.fromPromise(this.initialize(request.workspacePath));
-      }
-      // Uninitialized or initializing
-      if (ws.status === WorkspaceStatus.Initializing) {
-        await ws.initPromise!.promise;
-      }
-    }
-    return await this.proxy.handleRequest(request);
-  }
-
-  /**
-   * use DidChangeWorkspaceFolders notification add a new workspace folder
-   * replace the oldest one if count > maxWorkspace
-   * builtinWorkspace = false is equal to maxWorkspace =1
-   * @param workspacePath
-   * @param maxWorkspace
-   */
-  private async changeWorkspaceFolders(workspacePath: string, maxWorkspace: number): Promise<void> {
-    const params: DidChangeWorkspaceFoldersParams = {
-      event: {
-        added: [
-          {
-            name: workspacePath!,
-            uri: pathToFileURL(workspacePath).href,
-          },
-        ],
-        removed: [],
-      },
-    };
-    this.updateWorkspace(workspacePath);
-
-    if (this.workspaces.size > this.maxWorkspace) {
-      let oldestWorkspace;
-      let oldestAccess = Number.MAX_VALUE;
-      for (const [workspace, ws] of this.workspaces) {
-        if (ws.lastAccess < oldestAccess) {
-          oldestAccess = ws.lastAccess;
-          oldestWorkspace = path.join(this.serverOptions.workspacePath, workspace);
-        }
-      }
-      if (oldestWorkspace) {
-        params.event.removed.push({
-          name: oldestWorkspace,
-          uri: pathToFileURL(oldestWorkspace).href,
-        });
-        this.removeWorkspace(oldestWorkspace);
-      }
-    }
-    // adding a workspace folder may also need initialize
-    await this.proxy.handleRequest({
-      method: 'workspace/didChangeWorkspaceFolders',
-      params,
-      isNotification: true,
-    });
-  }
-
-  private removeWorkspace(workspacePath: string) {
-    this.workspaces.delete(this.relativePath(workspacePath));
-  }
-
-  private updateWorkspace(workspacePath: string) {
-    this.getWorkspace(workspacePath).lastAccess = Date.now();
-  }
-
-  private hasWorkspacePath(workspacePath: string) {
-    return this.workspaces.has(this.relativePath(workspacePath));
-  }
-
-  /**
-   * use a relative path to prevent bugs due to symbolic path
-   * @param workspacePath
-   */
-  private relativePath(workspacePath: string) {
-    const realPath = fs.realpathSync(workspacePath);
-    return path.relative(this.workspaceRoot, realPath);
-  }
-
-  private getWorkspace(workspacePath: string): Workspace {
-    const p = this.relativePath(workspacePath);
-    let ws = this.workspaces.get(p);
-    if (!ws) {
-      ws = {
-        status: WorkspaceStatus.Uninitialized,
-        lastAccess: Date.now(),
-      };
-      this.workspaces.set(p, ws);
-    }
-    return ws;
-  }
-
-  initializeState(workspaceDir: string): WorkspaceStatus {
-    const ws = this.getWorkspace(workspaceDir);
-    if (ws.status === WorkspaceStatus.Uninitialized) {
-      ws.initPromise = Cancelable.fromPromise(this.initialize(workspaceDir));
-    }
-    return ws.status;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/test_config.yml b/x-pack/legacy/plugins/code/server/lsp/test_config.yml
deleted file mode 100644
index f359261f802479..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/test_config.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-repos:
-    - url: 'https://github.com/javaee-samples/javaee7-simple-sample.git'
-      path: '/tmp/test/code/repos/github.com/javaee-samples/javaee7-simple-sample'
-      language: 'java'
-    - url: 'https://github.com/Microsoft/TypeScript-Node-Starter.git'
-      path: '/tmp/test/code/repos/github.com/Microsoft/TypeScript-Node-Starter'
-      language: 'ts'
diff --git a/x-pack/legacy/plugins/code/server/lsp/test_repo_manager.ts b/x-pack/legacy/plugins/code/server/lsp/test_repo_manager.ts
deleted file mode 100644
index 8c0594a0f1851d..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/test_repo_manager.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-/* eslint-disable no-console */
-
-import fs from 'fs';
-import rimraf from 'rimraf';
-
-import { TestConfig, Repo } from '../../model/test_config';
-import { prepareProjectByCloning } from '../test_utils';
-
-export class TestRepoManager {
-  private repos: Repo[];
-
-  constructor(testConfig: TestConfig) {
-    this.repos = testConfig.repos;
-  }
-
-  public async importAllRepos() {
-    for (const repo of this.repos) {
-      await prepareProjectByCloning(repo.url, repo.path);
-    }
-  }
-
-  public async cleanAllRepos() {
-    this.repos.forEach(repo => {
-      this.cleanRepo(repo.path);
-    });
-  }
-
-  public async cleanRepo(path: string) {
-    return new Promise(resolve => {
-      if (fs.existsSync(path)) {
-        rimraf(path, resolve);
-      } else {
-        resolve(true);
-      }
-    });
-  }
-
-  public getRepo(language: string): Repo {
-    return this.repos.filter(repo => {
-      return repo.language === language;
-    })[0];
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/ts_launcher.ts b/x-pack/legacy/plugins/code/server/lsp/ts_launcher.ts
deleted file mode 100644
index a2474e18243eb4..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/ts_launcher.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { spawn } from 'child_process';
-import getPort from 'get-port';
-import { Logger } from '../log';
-import { ServerOptions } from '../server_options';
-import { LoggerFactory } from '../utils/log_factory';
-import { AbstractLauncher } from './abstract_launcher';
-import { LanguageServerProxy } from './proxy';
-import { InitializeOptions, RequestExpander } from './request_expander';
-import { ExternalProgram } from './process/external_program';
-import { ControlledProgram } from './process/controlled_program';
-
-const TS_LANG_DETACH_PORT = 2089;
-
-export class TypescriptServerLauncher extends AbstractLauncher {
-  constructor(
-    public readonly targetHost: string,
-    public readonly options: ServerOptions,
-    public readonly loggerFactory: LoggerFactory,
-    public readonly installationPath: string
-  ) {
-    super('typescript', targetHost, options, loggerFactory);
-  }
-
-  async getPort() {
-    if (!this.options.lsp.detach) {
-      return await getPort();
-    }
-    return TS_LANG_DETACH_PORT;
-  }
-
-  protected startupTimeout = 5000;
-
-  createExpander(
-    proxy: LanguageServerProxy,
-    builtinWorkspace: boolean,
-    maxWorkspace: number
-  ): RequestExpander {
-    return new RequestExpander(
-      proxy,
-      builtinWorkspace,
-      maxWorkspace,
-      this.options,
-      {
-        initialOptions: {
-          installNodeDependency: this.options.security.installNodeDependency,
-          gitHostWhitelist: this.options.security.gitHostWhitelist,
-        },
-      } as InitializeOptions,
-      this.log
-    );
-  }
-  async spawnProcess(port: number, log: Logger): Promise<ControlledProgram> {
-    const p = spawn(process.execPath, [this.installationPath, '-p', port.toString(), '-c', '1'], {
-      detached: false,
-      stdio: 'pipe',
-    });
-    p.stdout.on('data', data => {
-      log.stdout(data.toString());
-    });
-    p.stderr.on('data', data => {
-      log.stderr(data.toString());
-    });
-    return new ExternalProgram(p, this.options, log);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/workspace_command.test.ts b/x-pack/legacy/plugins/code/server/lsp/workspace_command.test.ts
deleted file mode 100644
index f83fbcef13a22b..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/workspace_command.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import os from 'os';
-import { spawn } from 'child_process';
-import { Logger } from '../log';
-import { WorkspaceCommand } from './workspace_command';
-import { RepoConfig } from '../../model/workspace';
-jest.mock('child_process', () => ({
-  spawn: jest.fn().mockImplementation(() => ({
-    stdout: { on: jest.fn() },
-    stderr: { on: jest.fn() },
-    on: jest.fn().mockImplementation((event, cb) => {
-      cb('foo-code', 'foo-signal');
-    }),
-  })),
-}));
-jest.mock('proper-lockfile', () => ({
-  check: jest.fn().mockReturnValue(false),
-  lock: jest.fn().mockImplementation(() => {
-    return () => {};
-  }),
-}));
-
-afterEach(() => {
-  jest.clearAllMocks();
-});
-
-it(`spawns process if repoConfig.init comes from own properties`, async () => {
-  const repoConfig = {
-    repo: 'https://github.com/elastic/foo',
-    init: ['echo', 'hello'],
-  };
-  const mockLogger = {
-    info: jest.fn(),
-    error: jest.fn(),
-  };
-  const command = new WorkspaceCommand(
-    repoConfig,
-    os.tmpdir(),
-    'foo-revision',
-    (mockLogger as unknown) as Logger
-  );
-  await command.runInit(true);
-  expect(spawn).toHaveBeenCalled();
-});
-
-it(`doesn't spawn process if repoConfig.init comes from prototypes properties`, async () => {
-  const prototype = {
-    init: ['echo', 'noooo'],
-  };
-
-  const repoConfig = {
-    repo: 'https://github.com/elastic/foo',
-  };
-
-  Object.setPrototypeOf(repoConfig, prototype);
-
-  const mockLogger = {
-    info: jest.fn(),
-    error: jest.fn(),
-  };
-  const command = new WorkspaceCommand(
-    (repoConfig as unknown) as RepoConfig,
-    os.tmpdir(),
-    'foo-revision',
-    (mockLogger as unknown) as Logger
-  );
-  await command.runInit(true);
-  expect(spawn).not.toHaveBeenCalled();
-});
diff --git a/x-pack/legacy/plugins/code/server/lsp/workspace_command.ts b/x-pack/legacy/plugins/code/server/lsp/workspace_command.ts
deleted file mode 100644
index 10c2b971977101..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/workspace_command.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { spawn } from 'child_process';
-import fs from 'fs';
-import path from 'path';
-import LockFile from 'proper-lockfile';
-import stream from 'stream';
-import { RepoCmd, RepoConfig } from '../../model/workspace';
-import { Logger } from '../log';
-
-export class WorkspaceCommand {
-  constructor(
-    public readonly repoConfig: RepoConfig,
-    public readonly workspaceDir: string,
-    public readonly revision: string,
-    public readonly log: Logger
-  ) {}
-
-  public async runInit(force: boolean) {
-    if (this.repoConfig.init) {
-      const versionFile = path.join(this.workspaceDir, 'init.version');
-      if (this.checkRevision(versionFile) && !force) {
-        this.log.info('a same revision exists, init cmd skipped.');
-        return;
-      }
-      const lockFile = this.workspaceDir; // path.join(this.workspaceDir, 'init.lock');
-
-      const isLocked = await LockFile.check(lockFile);
-      if (isLocked) {
-        this.log.info('another process is running, please try again later');
-        return;
-      }
-      const release = await LockFile.lock(lockFile);
-
-      try {
-        if (!this.repoConfig.hasOwnProperty('init')) {
-          throw new Error(
-            `RepoConfig's init comes from a prototype, this is unexpected and unsupported`
-          );
-        }
-        const process = this.spawnProcess(this.repoConfig.init);
-        const logFile = path.join(this.workspaceDir, 'init.log');
-        const logFileStream = fs.createWriteStream(logFile, { encoding: 'utf-8', flags: 'a+' });
-        this.redirectOutput(process.stdout, logFileStream);
-        this.redirectOutput(process.stderr, logFileStream, true);
-        process.on('close', async (code, signal) => {
-          logFileStream.close();
-          await this.writeRevisionFile(versionFile);
-          this.log.info(`init process finished with code: ${code} signal: ${signal}`);
-          await release();
-        });
-      } catch (e) {
-        this.log.error(e);
-        release();
-      }
-    }
-  }
-
-  private spawnProcess(repoCmd: RepoCmd) {
-    let cmd: string;
-    let args: string[];
-    if (typeof repoCmd === 'string') {
-      cmd = repoCmd;
-      args = [];
-    } else {
-      [cmd, ...args] = repoCmd as string[];
-    }
-    return spawn(cmd, args, {
-      detached: false,
-      cwd: this.workspaceDir,
-    });
-  }
-
-  private redirectOutput(from: stream.Readable, to: fs.WriteStream, isError: boolean = false) {
-    from.on('data', (data: Buffer) => {
-      if (isError) {
-        this.log.error(data.toString('utf-8'));
-      } else {
-        this.log.info(data.toString('utf-8'));
-      }
-      to.write(data);
-    });
-  }
-
-  /**
-   * check the revision file in workspace, return true if it exists and its content equals current revision.
-   * @param versionFile
-   */
-  private checkRevision(versionFile: string) {
-    if (fs.existsSync(versionFile)) {
-      const revision = fs.readFileSync(versionFile, 'utf8').trim();
-      return revision === this.revision;
-    }
-    return false;
-  }
-
-  private writeRevisionFile(versionFile: string) {
-    return new Promise((resolve, reject) => {
-      fs.writeFile(versionFile, this.revision, err => {
-        if (err) {
-          reject(err);
-        }
-        resolve();
-      });
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/lsp/workspace_handler.test.ts b/x-pack/legacy/plugins/code/server/lsp/workspace_handler.test.ts
deleted file mode 100644
index d959eda2aa6dcd..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/workspace_handler.test.ts
+++ /dev/null
@@ -1,147 +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 fs from 'fs';
-import path from 'path';
-
-import * as os from 'os';
-import rimraf from 'rimraf';
-import { ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-
-import { LspRequest } from '../../model';
-import { GitOperations } from '../git_operations';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { WorkspaceHandler } from './workspace_handler';
-
-const baseDir = fs.mkdtempSync(path.join(os.tmpdir(), 'code_test'));
-const workspaceDir = path.join(baseDir, 'workspace');
-const repoDir = path.join(baseDir, 'repo');
-const gitOps = new GitOperations(repoDir);
-
-function handleResponseUri(wh: WorkspaceHandler, uri: string) {
-  const dummyRequest: LspRequest = {
-    method: 'textDocument/edefinition',
-    params: [],
-  };
-  const dummyResponse: ResponseMessage = {
-    id: null,
-    jsonrpc: '',
-    result: [
-      {
-        location: {
-          uri,
-        },
-      },
-    ],
-  };
-  wh.handleResponse(dummyRequest, dummyResponse);
-  return dummyResponse.result[0].location.uri;
-}
-
-function makeAFile(
-  workspacePath: string = workspaceDir,
-  repo = 'github.com/Microsoft/TypeScript-Node-Starter',
-  revision = 'master',
-  file = 'src/controllers/user.ts'
-) {
-  const fullPath = path.join(workspacePath, repo, '__randomString', revision, file);
-  fs.mkdirSync(path.dirname(fullPath), { recursive: true });
-  fs.writeFileSync(fullPath, '');
-  const strInUrl = fullPath
-    .split(path.sep)
-    .map(value => encodeURIComponent(value))
-    .join('/');
-  const uri = `file:///${strInUrl}`;
-  return { repo, revision, file, uri };
-}
-
-test('file system url should be converted', async () => {
-  const workspaceHandler = new WorkspaceHandler(
-    gitOps,
-    workspaceDir,
-    // @ts-ignore
-    null,
-    new ConsoleLoggerFactory()
-  );
-  const { repo, revision, file, uri } = makeAFile(workspaceDir);
-  const converted = handleResponseUri(workspaceHandler, uri);
-  expect(converted).toBe(`git://${repo}/blob/${revision}/${file}`);
-});
-
-test('should support symbol link', async () => {
-  const symlinkToWorkspace = path.join(baseDir, 'linkWorkspace');
-  fs.symlinkSync(workspaceDir, symlinkToWorkspace, 'dir');
-  // @ts-ignore
-  const workspaceHandler = new WorkspaceHandler(
-    gitOps,
-    symlinkToWorkspace,
-    // @ts-ignore
-    null,
-    new ConsoleLoggerFactory()
-  );
-
-  const { repo, revision, file, uri } = makeAFile(workspaceDir);
-  const converted = handleResponseUri(workspaceHandler, uri);
-  expect(converted).toBe(`git://${repo}/blob/${revision}/${file}`);
-});
-
-test('should support spaces in workspace dir', async () => {
-  const workspaceHasSpaces = path.join(baseDir, 'work  space');
-  const workspaceHandler = new WorkspaceHandler(
-    gitOps,
-    workspaceHasSpaces,
-    // @ts-ignore
-    null,
-    new ConsoleLoggerFactory()
-  );
-  const { repo, revision, file, uri } = makeAFile(workspaceHasSpaces);
-  const converted = handleResponseUri(workspaceHandler, uri);
-  expect(converted).toBe(`git://${repo}/blob/${revision}/${file}`);
-});
-
-// FLAKY: https://github.com/elastic/kibana/issues/43655
-test('should support case-insensitive workspace dir', async () => {
-  const workspaceCaseInsensitive = path.join(baseDir, 'CamelCaseWorkSpace');
-  // test only if it's case-insensitive
-  const workspaceHandler = new WorkspaceHandler(
-    gitOps,
-    workspaceCaseInsensitive,
-    // @ts-ignore
-    null,
-    new ConsoleLoggerFactory()
-  );
-  const { repo, revision, file, uri } = makeAFile(workspaceCaseInsensitive);
-  // normally this test won't run on linux since its filesystem are case sensitive
-  // So there is no 'CAMELCASEWORKSPACE' folder.
-  if (fs.existsSync(workspaceCaseInsensitive.toUpperCase())) {
-    const converted = handleResponseUri(workspaceHandler, uri.toLocaleLowerCase());
-    // workspace dir should  be stripped
-    expect(converted).toBe(
-      `git://${repo.toLocaleLowerCase()}/blob/${revision.toLocaleLowerCase()}/${file.toLocaleLowerCase()}`
-    );
-  }
-});
-
-test('should throw a error if url is invalid', async () => {
-  const workspaceHandler = new WorkspaceHandler(
-    gitOps,
-    workspaceDir,
-    // @ts-ignore
-    null,
-    new ConsoleLoggerFactory()
-  );
-  const invalidDir = path.join(baseDir, 'invalid_dir');
-  const { uri } = makeAFile(invalidDir);
-  expect(() => handleResponseUri(workspaceHandler, uri)).toThrow();
-});
-
-beforeAll(() => {
-  fs.mkdirSync(workspaceDir, { recursive: true });
-  fs.mkdirSync(repoDir, { recursive: true });
-});
-
-afterAll(() => {
-  rimraf.sync(baseDir);
-});
diff --git a/x-pack/legacy/plugins/code/server/lsp/workspace_handler.ts b/x-pack/legacy/plugins/code/server/lsp/workspace_handler.ts
deleted file mode 100644
index 052f38cdcdb812..00000000000000
--- a/x-pack/legacy/plugins/code/server/lsp/workspace_handler.ts
+++ /dev/null
@@ -1,441 +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 Boom from 'boom';
-import del from 'del';
-import fs from 'fs';
-import { delay } from 'lodash';
-import path from 'path';
-import crypto from 'crypto';
-import { ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-import { Hover, Location, TextDocumentPositionParams } from 'vscode-languageserver';
-
-import { DetailSymbolInformation, Full } from '@elastic/lsp-extension';
-
-import { SimpleGit } from '@elastic/simple-git/dist/promise';
-import { simplegit } from '@elastic/simple-git/dist';
-import { RepositoryUtils } from '../../common/repository_utils';
-import { parseLspUrl } from '../../common/uri_util';
-import { FileTreeItemType, LspRequest, WorkerReservedProgress } from '../../model';
-import { GitOperations, HEAD } from '../git_operations';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { RepositoryObjectClient } from '../search';
-import { LoggerFactory } from '../utils/log_factory';
-
-interface Worktree {
-  path: string;
-  revision: string;
-  branch: string;
-}
-
-export const MAX_RESULT_COUNT = 20;
-
-export class WorkspaceHandler {
-  private revisionMap: { [uri: string]: string } = {};
-  private log: Logger;
-  private readonly objectClient: RepositoryObjectClient | undefined = undefined;
-
-  constructor(
-    public readonly gitOps: GitOperations,
-    private readonly workspacePath: string,
-    private readonly client: EsClient,
-    loggerFactory: LoggerFactory
-  ) {
-    // this.git = new GitOperations(repoPath);
-    this.log = loggerFactory.getLogger(['LSP', 'workspace']);
-    if (this.client) {
-      this.objectClient = new RepositoryObjectClient(this.client);
-    }
-  }
-
-  /**
-   * open workspace for repositoryUri, update it from bare repository if necessary.
-   * @param repositoryUri the uri of bare repository.
-   * @param ref
-   */
-  public async openWorkspace(repositoryUri: string, ref: string) {
-    // Try get repository clone status with 3 retries at maximum.
-    const tryGetGitStatus = async (retryCount: number) => {
-      let gitStatus;
-      try {
-        gitStatus = await this.objectClient!.getRepositoryGitStatus(repositoryUri);
-      } catch (error) {
-        throw Boom.internal(`checkout workspace on an unknown status repository`);
-      }
-
-      if (
-        !RepositoryUtils.hasFullyCloned(gitStatus.cloneProgress) &&
-        gitStatus.progress < WorkerReservedProgress.COMPLETED
-      ) {
-        if (retryCount < 3) {
-          this.log.debug(`Check repository ${repositoryUri} clone status at trial ${retryCount}`);
-          return delay(tryGetGitStatus, 3000, retryCount + 1);
-        } else {
-          throw Boom.internal(`repository has not been fully cloned yet.`);
-        }
-      }
-    };
-    if (this.objectClient) {
-      await tryGetGitStatus(0);
-    }
-    const git = await this.gitOps.openGit(repositoryUri);
-    const defaultBranch = await this.gitOps.getDefaultBranch(repositoryUri);
-    const targetRevision = await this.gitOps.getRevision(repositoryUri, ref);
-    if (ref !== defaultBranch) {
-      await this.checkCommit(git, targetRevision);
-      ref = defaultBranch;
-    }
-    const workspaceBranch = this.workspaceWorktreeBranchName(ref);
-    const worktrees = await this.listWorktrees(git);
-    let wt: Worktree;
-    if (worktrees.has(workspaceBranch)) {
-      wt = worktrees.get(workspaceBranch)!;
-    } else {
-      wt = await this.openWorktree(
-        git,
-        workspaceBranch,
-        await this.revisionDir(repositoryUri, ref, this.randomPath()),
-        targetRevision
-      );
-    }
-    if (!targetRevision.startsWith(wt.revision)) {
-      await this.setWorkspaceRevision(wt.path, targetRevision);
-    }
-    return {
-      workspaceDir: wt.path,
-      workspaceRevision: targetRevision,
-    };
-  }
-
-  private randomPath() {
-    return crypto.randomBytes(4).toString('hex');
-  }
-
-  public async openWorktree(
-    git: SimpleGit,
-    workspaceBranch: string,
-    dir: string,
-    revision: string
-  ) {
-    await git.raw(['worktree', 'add', '-b', workspaceBranch, dir, revision]);
-    return {
-      revision,
-      path: dir,
-      branch: workspaceBranch,
-    } as Worktree;
-  }
-
-  public async listWorkspaceFolders(repoUri: string) {
-    const git = await this.gitOps.openGit(repoUri);
-    const worktrees = await this.listWorktrees(git);
-    const isDir = (source: string) => fs.lstatSync(source).isDirectory();
-    return [...worktrees.values()]
-      .filter(wt => wt.branch.startsWith('workspace'))
-      .map(wt => wt.path)
-      .filter(isDir);
-  }
-
-  public async listWorktrees(git: SimpleGit): Promise<Map<string, Worktree>> {
-    const str = await git.raw(['worktree', 'list']);
-    const regex = /(.*?)\s+([a-h0-9]+)\s+\[(.+)\]/gm;
-    let m;
-    const result: Map<string, Worktree> = new Map();
-    while ((m = regex.exec(str)) !== null) {
-      if (m.index === regex.lastIndex) {
-        regex.lastIndex++;
-      }
-      const [, p, revision, branch] = m;
-      result.set(branch, {
-        path: p,
-        revision,
-        branch,
-      });
-    }
-    return result;
-  }
-
-  public async clearWorkspace(repoUri: string) {
-    const git = await this.gitOps.openGit(repoUri);
-    const worktrees = await this.listWorktrees(git);
-    for (const wt of worktrees.values()) {
-      await git.raw(['worktree', 'remove', wt.path, '--force']);
-      await git.deleteLocalBranch(wt.branch);
-    }
-    const workspaceDir = await this.workspaceDir(repoUri);
-    await del([workspaceDir], { force: true });
-  }
-
-  public async handleRequest(request: LspRequest): Promise<void> {
-    const { method, params } = request;
-    switch (method) {
-      case 'textDocument/edefinition':
-      case 'textDocument/definition':
-      case 'textDocument/hover':
-      case 'textDocument/references':
-      case 'textDocument/documentSymbol':
-      case 'textDocument/full': {
-        const payload: TextDocumentPositionParams = params;
-        const { filePath, workspacePath, workspaceRevision } = await this.resolveUri(
-          params.textDocument.uri
-        );
-        if (filePath) {
-          request.documentUri = payload.textDocument.uri;
-          payload.textDocument.uri = request.resolvedFilePath = filePath;
-          request.workspacePath = workspacePath!;
-          request.workspaceRevision = workspaceRevision!;
-        }
-        break;
-      }
-      default:
-      // do nothing
-    }
-  }
-
-  public handleResponse(request: LspRequest, response: ResponseMessage): ResponseMessage {
-    if (!response.result) {
-      return response;
-    }
-    const { method } = request;
-    switch (method) {
-      case 'textDocument/hover': {
-        const result = response.result as Hover;
-        this.handleHoverContents(result);
-        return response;
-      }
-      case 'textDocument/edefinition': {
-        let result = response.result;
-        if (result) {
-          if (!Array.isArray(result)) {
-            response.result = result = [result];
-          }
-          for (const def of result) {
-            this.convertLocation(def.location);
-          }
-        }
-        return response;
-      }
-      case 'textDocument/definition': {
-        const result = response.result;
-        if (result) {
-          if (Array.isArray(result)) {
-            (result as Location[]).forEach(location => this.convertLocation(location));
-          } else {
-            this.convertLocation(result);
-          }
-        }
-        return response;
-      }
-      case 'textDocument/full': {
-        // unify the result of full as a array.
-        const result = Array.isArray(response.result)
-          ? (response.result as Full[])
-          : [response.result as Full];
-        for (const full of result) {
-          if (full.symbols) {
-            for (const symbol of full.symbols) {
-              this.convertLocation(symbol.symbolInformation.location);
-
-              if (symbol.contents !== null || symbol.contents !== undefined) {
-                this.handleHoverContents(symbol);
-              }
-            }
-          }
-          if (full.references) {
-            for (const reference of full.references) {
-              this.convertLocation(reference.location);
-              if (reference.target.location) {
-                this.convertLocation(reference.target.location);
-              }
-            }
-          }
-        }
-        response.result = result;
-        return response;
-      }
-      case 'textDocument/references': {
-        if (response.result) {
-          const locations = (response.result as Location[]).slice(0, MAX_RESULT_COUNT);
-          for (const location of locations) {
-            this.convertLocation(location);
-          }
-          response.result = locations;
-        }
-        return response;
-      }
-      case 'textDocument/documentSymbol': {
-        if (response.result) {
-          for (const symbol of response.result) {
-            this.convertLocation(symbol.location);
-          }
-        }
-        return response;
-      }
-      default:
-        return response;
-    }
-  }
-
-  private handleHoverContents(result: Hover | DetailSymbolInformation) {
-    if (!Array.isArray(result.contents)) {
-      if (typeof result.contents === 'string') {
-        result.contents = [{ language: '', value: result.contents }];
-      } else {
-        result.contents = [result.contents as { language: string; value: string }];
-      }
-    } else {
-      result.contents = Array.from(result.contents).map(c => {
-        if (typeof c === 'string') {
-          return { language: '', value: c };
-        } else {
-          return c;
-        }
-      });
-    }
-  }
-
-  private parseLocation(location: Location) {
-    const uri = location.uri;
-    const prefix = path.sep === '\\' ? 'file:///' : 'file://';
-    if (uri && uri.startsWith(prefix)) {
-      const locationPath = fs.realpathSync(decodeURIComponent(uri.substring(prefix.length)));
-      const workspacePath = fs.realpathSync(decodeURIComponent(this.workspacePath));
-      // On windows, it's possible one path has c:\ and another has C:\, so we need compare case-insensitive
-      if (locationPath.toLocaleLowerCase().startsWith(workspacePath.toLocaleLowerCase())) {
-        let relativePath = locationPath.substring(workspacePath.length + 1);
-        if (path.sep === '\\') {
-          relativePath = relativePath.replace(/\\/gi, '/');
-        }
-        const regex = /^(.*?\/.*?\/.*?)\/(__.*?\/)?([^_]+?)\/(.*)$/;
-        const m = relativePath.match(regex);
-        if (m) {
-          const repoUri = m[1];
-          const revision = m[3];
-          const gitRevision = this.revisionMap[`${repoUri}/${revision}`] || revision;
-          const file = m[4];
-          return { repoUri, revision: gitRevision, file };
-        }
-      }
-      // @ts-ignore
-      throw new Error("path in response doesn't not starts with workspace path");
-    }
-    return null;
-  }
-
-  private convertLocation(location: Location) {
-    if (location) {
-      const parsedLocation = this.parseLocation(location);
-      if (parsedLocation) {
-        const { repoUri, revision, file } = parsedLocation;
-        location.uri = `git://${repoUri}/blob/${revision}/${file}`;
-      }
-      return parsedLocation;
-    }
-  }
-
-  private fileUrl(str: string) {
-    let pathName = str.replace(/\\/g, '/');
-    // Windows drive letter must be prefixed with a slash
-    if (pathName[0] !== '/') {
-      pathName = '/' + pathName;
-    }
-    return 'file://' + pathName;
-  }
-
-  /**
-   * convert a git uri to absolute file path, checkout code into workspace
-   * @param uri the uri
-   */
-  private async resolveUri(uri: string) {
-    if (uri.startsWith('git://')) {
-      const { repoUri, file, revision } = parseLspUrl(uri)!;
-      const { workspaceDir, workspaceRevision } = await this.openWorkspace(repoUri, revision);
-      if (file) {
-        const isValidPath = await this.checkFile(repoUri, revision, file);
-        if (!isValidPath) {
-          throw new Error('invalid file path in requests.');
-        }
-      }
-      return {
-        workspacePath: workspaceDir,
-        filePath: this.fileUrl(path.resolve(workspaceDir, file || '/')),
-        uri,
-        workspaceRevision,
-      };
-    } else {
-      return {
-        workspacePath: undefined,
-        workspaceRevision: undefined,
-        filePath: undefined,
-        uri,
-      };
-    }
-  }
-
-  private async checkCommit(git: SimpleGit, targetRevision: string) {
-    // we only support headCommit now.
-    const headRevision = await git.revparse([HEAD]);
-    if (headRevision !== targetRevision) {
-      throw Boom.badRequest(`revision must be master.`);
-    }
-  }
-
-  public async revisionDir(repositoryUri: string, ref: string, randomStr: string = '') {
-    return path.join(await this.workspaceDir(repositoryUri, randomStr), ref);
-  }
-
-  private async workspaceDir(repoUri: string, randomStr: string = '') {
-    const base = path.join(this.workspacePath, repoUri);
-    if (randomStr === '') {
-      const git = await this.gitOps.openGit(repoUri);
-      const trees = await this.listWorktrees(git);
-      if (trees.size > 0) {
-        const wt = trees.values().next().value;
-        return path.dirname(wt.path);
-      }
-    }
-    if (randomStr) {
-      return path.join(base, `__${randomStr}`);
-    } else {
-      return base;
-    }
-  }
-
-  private workspaceWorktreeBranchName(branch: string): string {
-    return `workspace-${branch}`;
-  }
-
-  private async setWorkspaceRevision(workspaceDir: string, revision: string) {
-    const git = simplegit(workspaceDir);
-    await git.reset(['--hard', revision]);
-  }
-
-  /**
-   * check whether the file path specify in the request is valid. The file path must:
-   *  1. exists in git repo
-   *  2. is a valid file or dir, can't be a link or submodule
-   *
-   * @param repoUri
-   * @param revision
-   * @param filePath
-   */
-  private async checkFile(repoUri: string, revision: string, filePath: string) {
-    try {
-      const git = await this.gitOps.openGit(repoUri);
-      const p = filePath.endsWith('/') ? filePath.slice(0, -1) : filePath;
-      const tree = await this.gitOps.readTree(git, revision, p);
-      if (tree.entries.length !== 1) {
-        return false;
-      }
-      const entry = tree.entries[0];
-      const type = GitOperations.mode2type(entry.mode);
-      return type === FileTreeItemType.File || type === FileTreeItemType.Directory;
-    } catch (e) {
-      // filePath may not exists
-      return false;
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/plugin.ts b/x-pack/legacy/plugins/code/server/plugin.ts
deleted file mode 100644
index 737d0b5c6686b3..00000000000000
--- a/x-pack/legacy/plugins/code/server/plugin.ts
+++ /dev/null
@@ -1,343 +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 crypto from 'crypto';
-import * as _ from 'lodash';
-import { CoreSetup, IRouter } from 'src/core/server';
-
-import { RepositoryIndexInitializerFactory, tryMigrateIndices } from './indexer';
-import { Esqueue } from './lib/esqueue';
-import { Logger } from './log';
-import { JAVA } from './lsp/language_servers';
-import { LspService } from './lsp/lsp_service';
-import { RepositoryConfigController } from './repository_config_controller';
-import { IndexScheduler, UpdateScheduler } from './scheduler';
-import { CodeServerRouter } from './security';
-import { ServerOptions } from './server_options';
-import {
-  checkCodeNode,
-  checkRoute,
-  commitSearchRoute,
-  documentSearchRoute,
-  fileRoute,
-  installRoute,
-  lspRoute,
-  repositoryRoute,
-  repositorySearchRoute,
-  setupRoute,
-  statusRoute,
-  symbolByQnameRoute,
-  symbolSearchRoute,
-  workspaceRoute,
-} from './routes';
-import { CodeServices } from './distributed/code_services';
-import { CodeNodeAdapter } from './distributed/multinode/code_node_adapter';
-import { LocalHandlerAdapter } from './distributed/local_handler_adapter';
-import { NonCodeNodeAdapter } from './distributed/multinode/non_code_node_adapter';
-import {
-  GitServiceDefinition,
-  GitServiceDefinitionOption,
-  LspServiceDefinition,
-  LspServiceDefinitionOption,
-  RepositoryServiceDefinition,
-  SetupDefinition,
-  WorkspaceDefinition,
-} from './distributed/apis';
-import { initEs } from './init_es';
-import { initLocalService } from './init_local';
-import { initQueue } from './init_queue';
-import { initWorkers } from './init_workers';
-import { ClusterNodeAdapter } from './distributed/cluster/cluster_node_adapter';
-import { NodeRepositoriesService } from './distributed/cluster/node_repositories_service';
-import { initCodeUsageCollector } from './usage_collector';
-import { PluginSetupContract } from '../../../../plugins/code/server/index';
-
-declare module 'src/core/server' {
-  interface RequestHandlerContext {
-    code: {
-      codeServices: CodeServices | null;
-      // @deprecated
-      legacy: {
-        securityPlugin: any;
-      };
-    };
-  }
-}
-
-export class CodePlugin {
-  private isCodeNode = false;
-
-  private queue: Esqueue | null = null;
-  private log: Logger;
-  private serverOptions: ServerOptions;
-  private indexScheduler: IndexScheduler | null = null;
-  private updateScheduler: UpdateScheduler | null = null;
-  private lspService: LspService | null = null;
-  private codeServices: CodeServices | null = null;
-  private nodeService: NodeRepositoriesService | null = null;
-
-  private rndString: string | null = null;
-  private router: IRouter | null = null;
-
-  constructor(private readonly initContext: PluginSetupContract) {
-    this.log = {} as Logger;
-    this.serverOptions = {} as ServerOptions;
-  }
-
-  public async setup(core: CoreSetup, npHttp: any) {
-    const { server } = core.http as any;
-    this.serverOptions = new ServerOptions(this.initContext.legacy.config, server.config());
-    this.log = new Logger(this.initContext.legacy.logger, this.serverOptions.verbose);
-
-    this.router = npHttp.createRouter();
-    this.rndString = crypto.randomBytes(20).toString('hex');
-
-    npHttp.registerRouteHandlerContext('code', () => {
-      return {
-        codeServices: this.codeServices,
-        legacy: {
-          securityPlugin: server.plugins.security,
-        },
-      };
-    });
-  }
-
-  // TODO: CodeStart will not have the register route api.
-  // Let's make it CoreSetup as the param for now.
-  public async start(core: CoreSetup) {
-    // called after all plugins are set up
-    const { server } = core.http as any;
-    const codeServerRouter = new CodeServerRouter(this.router!);
-    const codeNodeUrl = this.serverOptions.codeNodeUrl;
-
-    checkRoute(this.router!, this.rndString!);
-
-    if (this.serverOptions.clusterEnabled) {
-      this.initDevMode(server);
-      this.codeServices = await this.initClusterNode(server, codeServerRouter);
-    } else if (codeNodeUrl) {
-      const checkResult = await this.retryUntilAvailable(
-        async () => await checkCodeNode(codeNodeUrl, this.log, this.rndString!),
-        5000
-      );
-      if (checkResult.me) {
-        const codeServices = new CodeServices(new CodeNodeAdapter(codeServerRouter, this.log));
-        this.log.info('Initializing Code plugin as code-node.');
-        this.codeServices = await this.initCodeNode(server, codeServices);
-      } else {
-        this.codeServices = await this.initNonCodeNode(codeNodeUrl, core);
-      }
-    } else {
-      const codeServices = new CodeServices(new LocalHandlerAdapter());
-      // codeNodeUrl not set, single node mode
-      this.log.info('Initializing Code plugin as single-node.');
-      this.initDevMode(server);
-      this.codeServices = await this.initCodeNode(server, codeServices);
-    }
-    await this.codeServices.start();
-  }
-
-  private async initClusterNode(server: any, codeServerRouter: CodeServerRouter) {
-    this.log.info('Initializing Code plugin as cluster-node');
-    const { esClient, repoConfigController, repoIndexInitializerFactory } = await initEs(
-      this.initContext.legacy.elasticsearch.adminClient$,
-      this.log
-    );
-    const clusterNodeAdapter = new ClusterNodeAdapter(
-      codeServerRouter,
-      this.log,
-      this.serverOptions,
-      esClient
-    );
-
-    const codeServices = new CodeServices(clusterNodeAdapter);
-
-    this.queue = initQueue(this.serverOptions, this.log, esClient);
-
-    const { gitOps, lspService } = initLocalService(
-      server,
-      this.initContext.legacy.logger,
-      this.serverOptions,
-      codeServices,
-      esClient,
-      repoConfigController
-    );
-    this.lspService = lspService;
-    const { indexScheduler, updateScheduler, cloneWorker } = initWorkers(
-      this.log,
-      esClient,
-      this.queue!,
-      lspService,
-      gitOps,
-      this.serverOptions,
-      codeServices
-    );
-    this.indexScheduler = indexScheduler;
-    this.updateScheduler = updateScheduler;
-
-    this.nodeService = new NodeRepositoriesService(
-      this.log,
-      clusterNodeAdapter.clusterService,
-      clusterNodeAdapter.clusterMembershipService,
-      cloneWorker
-    );
-    await this.nodeService.start();
-
-    this.initRoutes(server, codeServices, repoIndexInitializerFactory, repoConfigController);
-
-    // Execute index version checking and try to migrate index data if necessary.
-    await tryMigrateIndices(esClient, this.log);
-
-    return codeServices;
-  }
-
-  private async initCodeNode(server: any, codeServices: CodeServices) {
-    this.isCodeNode = true;
-    const { esClient, repoConfigController, repoIndexInitializerFactory } = await initEs(
-      this.initContext.legacy.elasticsearch.adminClient$,
-      this.log
-    );
-
-    this.queue = initQueue(this.serverOptions, this.log, esClient);
-
-    const { gitOps, lspService } = initLocalService(
-      server,
-      this.initContext.legacy.logger,
-      this.serverOptions,
-      codeServices,
-      esClient,
-      repoConfigController
-    );
-    this.lspService = lspService;
-    const { indexScheduler, updateScheduler } = initWorkers(
-      this.log,
-      esClient,
-      this.queue!,
-      lspService,
-      gitOps,
-      this.serverOptions,
-      codeServices
-    );
-    this.indexScheduler = indexScheduler;
-    this.updateScheduler = updateScheduler;
-
-    this.initRoutes(server, codeServices, repoIndexInitializerFactory, repoConfigController);
-
-    // TODO: extend the usage collection to cluster mode.
-    initCodeUsageCollector(server, esClient, lspService);
-
-    // Execute index version checking and try to migrate index data if necessary.
-    await tryMigrateIndices(esClient, this.log);
-
-    return codeServices;
-  }
-
-  public async stop() {
-    if (this.isCodeNode) {
-      if (this.indexScheduler) this.indexScheduler.stop();
-      if (this.updateScheduler) this.updateScheduler.stop();
-      if (this.queue) this.queue.destroy();
-      if (this.lspService) await this.lspService.shutdown();
-    }
-    if (this.codeServices) {
-      await this.codeServices.stop();
-    }
-    if (this.nodeService) {
-      await this.nodeService.stop();
-    }
-  }
-
-  private async initNonCodeNode(url: string, core: CoreSetup) {
-    const { server } = core.http as any;
-    this.log.info(
-      `Initializing Code plugin as non-code node, redirecting all code requests to ${url}`
-    );
-    const codeServices = new CodeServices(new NonCodeNodeAdapter(url, this.log));
-    codeServices.registerHandler(GitServiceDefinition, null, GitServiceDefinitionOption);
-    codeServices.registerHandler(RepositoryServiceDefinition, null);
-    codeServices.registerHandler(LspServiceDefinition, null, LspServiceDefinitionOption);
-    codeServices.registerHandler(WorkspaceDefinition, null);
-    codeServices.registerHandler(SetupDefinition, null);
-    const { repoConfigController, repoIndexInitializerFactory } = await initEs(
-      this.initContext.legacy.elasticsearch.adminClient$,
-      this.log
-    );
-    this.initRoutes(server, codeServices, repoIndexInitializerFactory, repoConfigController);
-    return codeServices;
-  }
-
-  private async initRoutes(
-    server: any,
-    codeServices: CodeServices,
-    repoIndexInitializerFactory: RepositoryIndexInitializerFactory,
-    repoConfigController: RepositoryConfigController
-  ) {
-    const codeServerRouter = new CodeServerRouter(this.router!);
-    repositoryRoute(
-      codeServerRouter,
-      codeServices,
-      repoIndexInitializerFactory,
-      repoConfigController,
-      this.serverOptions,
-      this.log
-    );
-    repositorySearchRoute(codeServerRouter, this.log);
-    if (this.serverOptions.enableCommitIndexing) {
-      commitSearchRoute(codeServerRouter, this.log);
-    }
-    documentSearchRoute(codeServerRouter, this.log);
-    symbolSearchRoute(codeServerRouter, this.log);
-    fileRoute(codeServerRouter, codeServices);
-    workspaceRoute(codeServerRouter, this.serverOptions, codeServices);
-    symbolByQnameRoute(codeServerRouter, this.log);
-    installRoute(server, codeServerRouter, codeServices, this.serverOptions);
-    lspRoute(codeServerRouter, codeServices, this.serverOptions, this.log);
-    setupRoute(codeServerRouter, codeServices);
-    statusRoute(codeServerRouter, codeServices);
-  }
-
-  private async retryUntilAvailable<T>(
-    func: () => Promise<T>,
-    intervalMs: number,
-    retries: number = Number.MAX_VALUE
-  ): Promise<T> {
-    const value = await func();
-    if (value) {
-      return value;
-    } else {
-      const promise = new Promise<T>(resolve => {
-        const retry = () => {
-          func().then(v => {
-            if (v) {
-              resolve(v);
-            } else {
-              retries--;
-              if (retries > 0) {
-                setTimeout(retry, intervalMs);
-              } else {
-                resolve(v);
-              }
-            }
-          });
-        };
-        setTimeout(retry, intervalMs);
-      });
-      return await promise;
-    }
-  }
-
-  private initDevMode(server: any) {
-    // @ts-ignore
-    const devMode: boolean = this.serverOptions.devMode;
-    server.injectUiAppVars('code', () => ({
-      enableLangserversDeveloping: devMode,
-    }));
-    // Enable the developing language servers in development mode.
-    if (devMode) {
-      JAVA.downloadUrl = _.partialRight(JAVA!.downloadUrl!, devMode);
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/poller.ts b/x-pack/legacy/plugins/code/server/poller.ts
deleted file mode 100644
index e2803e9cf4b8a4..00000000000000
--- a/x-pack/legacy/plugins/code/server/poller.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/*
- * Borrowed from https://github.com/elastic/kibana/blob/master/x-pack/legacy/common/poller.js
- */
-
-// Because the timers lib is global for Nodejs, it's not necessary to explicit import it.
-// Also explicitly importing this lib is going to make Sinon fake timer fail to work.
-// import { clearTimeout, setTimeout } from 'timers';
-
-const noop = () => {
-  // noop
-};
-
-interface PollerOptions<T> {
-  pollFrequencyInMillis: number;
-  functionToPoll: Poller<T>['functionToPoll'];
-  successFunction?: Poller<T>['successFunction'];
-  errorFunction?: Poller<T>['errorFunction'];
-  trailing?: boolean;
-  continuePollingOnError?: boolean;
-  pollFrequencyErrorMultiplier?: number;
-}
-
-export class Poller<T = void> {
-  private readonly pollFrequencyInMillis: number;
-  private readonly functionToPoll: () => Promise<T>;
-  private readonly successFunction: (result: T) => Promise<void> | void;
-  private readonly errorFunction: (error: Error) => Promise<void> | void;
-  private readonly trailing: boolean;
-  private readonly continuePollingOnError: boolean;
-  private readonly pollFrequencyErrorMultiplier: number;
-
-  private timeoutId?: NodeJS.Timer;
-
-  constructor(options: PollerOptions<T>) {
-    this.functionToPoll = options.functionToPoll; // Must return a Promise
-    this.successFunction = options.successFunction || noop;
-    this.errorFunction = options.errorFunction || noop;
-    this.pollFrequencyInMillis = options.pollFrequencyInMillis;
-    this.trailing = options.trailing || false;
-    this.continuePollingOnError = options.continuePollingOnError || false;
-    this.pollFrequencyErrorMultiplier = options.pollFrequencyErrorMultiplier || 1;
-  }
-
-  public getPollFrequency() {
-    return this.pollFrequencyInMillis;
-  }
-
-  public start() {
-    if (this.isRunning()) {
-      return;
-    }
-
-    if (this.trailing) {
-      this.timeoutId = global.setTimeout(this.poll.bind(this), this.pollFrequencyInMillis);
-    } else {
-      this.poll();
-    }
-  }
-
-  public stop() {
-    if (this.timeoutId) {
-      global.clearTimeout(this.timeoutId);
-      this.timeoutId = undefined;
-    }
-  }
-
-  public isRunning() {
-    return !!this.timeoutId;
-  }
-
-  private async poll() {
-    try {
-      await this.successFunction(await this.functionToPoll());
-
-      if (!this.isRunning()) {
-        return;
-      }
-
-      this.timeoutId = global.setTimeout(this.poll.bind(this), this.pollFrequencyInMillis);
-    } catch (error) {
-      await this.errorFunction(error);
-
-      if (!this.isRunning()) {
-        return;
-      }
-
-      if (this.continuePollingOnError) {
-        this.timeoutId = global.setTimeout(
-          this.poll.bind(this),
-          this.pollFrequencyInMillis * this.pollFrequencyErrorMultiplier
-        );
-      } else {
-        this.stop();
-      }
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/queue/abstract_git_worker.ts b/x-pack/legacy/plugins/code/server/queue/abstract_git_worker.ts
deleted file mode 100644
index 57d051f870f6d9..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/abstract_git_worker.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  CloneProgress,
-  CloneWorkerProgress,
-  CloneWorkerResult,
-  WorkerReservedProgress,
-  WorkerResult,
-} from '../../model';
-import { DiskWatermarkService } from '../disk_watermark';
-import { GitOperations } from '../git_operations';
-import { EsClient, Esqueue } from '../lib/esqueue';
-import { Logger } from '../log';
-import { RepositoryObjectClient } from '../search';
-import { ServerOptions } from '../server_options';
-import { AbstractWorker } from './abstract_worker';
-import { CancellationReason } from './cancellation_service';
-import { Job } from './job';
-
-export abstract class AbstractGitWorker extends AbstractWorker {
-  public id: string = 'abstract-git';
-  protected objectClient: RepositoryObjectClient;
-
-  constructor(
-    protected readonly queue: Esqueue,
-    protected readonly log: Logger,
-    protected readonly client: EsClient,
-    protected readonly serverOptions: ServerOptions,
-    protected readonly gitOps: GitOperations,
-    protected readonly watermarkService: DiskWatermarkService
-  ) {
-    super(queue, log);
-    this.objectClient = new RepositoryObjectClient(client);
-  }
-
-  public async executeJob(job: Job): Promise<WorkerResult> {
-    const uri = job.payload.uri;
-    if (await this.watermarkService.isLowWatermark()) {
-      // Return job result as cancelled.
-      return {
-        uri,
-        cancelled: true,
-        cancelledReason: CancellationReason.LOW_DISK_SPACE,
-      };
-    }
-
-    return { uri };
-  }
-
-  public async onJobCompleted(job: Job, res: CloneWorkerResult) {
-    await super.onJobCompleted(job, res);
-
-    // Update the default branch.
-    const repoUri = res.uri;
-    const revision = await this.gitOps.getHeadRevision(repoUri);
-    const defaultBranch = await this.gitOps.getDefaultBranch(repoUri);
-
-    // Update the repository data.
-    try {
-      await this.objectClient.updateRepository(repoUri, {
-        defaultBranch,
-        revision,
-      });
-    } catch (error) {
-      this.log.error(`Update repository default branch and revision error.`);
-      this.log.error(error);
-    }
-
-    // Update the git operation status.
-    try {
-      return await this.objectClient.updateRepositoryGitStatus(repoUri, {
-        revision,
-        progress: WorkerReservedProgress.COMPLETED,
-        cloneProgress: {
-          isCloned: true,
-        },
-      });
-    } catch (error) {
-      this.log.error(`Update revision of repo clone done error.`);
-      this.log.error(error);
-    }
-  }
-
-  public async updateProgress(
-    job: Job,
-    progress: number,
-    error?: Error,
-    cloneProgress?: CloneProgress
-  ) {
-    const { uri } = job.payload;
-    const p: CloneWorkerProgress = {
-      uri,
-      progress,
-      timestamp: new Date(),
-      cloneProgress,
-      errorMessage: error ? error.message : undefined,
-    };
-    try {
-      return await this.objectClient.updateRepositoryGitStatus(uri, p);
-    } catch (err) {
-      // Do nothing here since it's not blocking anything.
-      // this.log.warn(`Update git clone progress error.`);
-      // this.log.warn(err);
-    }
-  }
-
-  protected async onJobCancelled(job: Job, reason?: CancellationReason) {
-    if (reason && reason === CancellationReason.LOW_DISK_SPACE) {
-      // If the clone/update job is cancelled because of the disk watermark, manually
-      // trigger onJobExecutionError.
-      const msg = this.watermarkService.diskWatermarkViolationMessage();
-      this.log.error(
-        'Git clone/update job completed because of low disk space. Move forward as error.'
-      );
-      const error = new Error(msg);
-      await this.onJobExecutionError({ job, error });
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/queue/abstract_worker.ts b/x-pack/legacy/plugins/code/server/queue/abstract_worker.ts
deleted file mode 100644
index c74f640a1d212e..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/abstract_worker.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import moment from 'moment';
-
-import { WorkerReservedProgress, WorkerResult } from '../../model';
-import {
-  CancellationToken,
-  Esqueue,
-  events as esqueueEvents,
-  Job as JobInternal,
-} from '../lib/esqueue';
-import { Logger } from '../log';
-import { Job } from './job';
-import { Worker } from './worker';
-import { CodeServices } from '../distributed/code_services';
-
-export abstract class AbstractWorker implements Worker {
-  // The id of the worker. Also serves as the id of the job this worker consumes.
-  protected id = '';
-
-  constructor(protected readonly queue: Esqueue, protected readonly log: Logger) {}
-
-  // Assemble jobs, for now most of the job object construction should be the same.
-  public async createJob(payload: any, options: any): Promise<Job> {
-    const timestamp = moment().valueOf();
-    if (options.timeout !== undefined && options.timeout !== null) {
-      // If the job explicitly specify the timeout, then honor it.
-      return {
-        payload,
-        options,
-        timestamp,
-      };
-    } else {
-      // Otherwise, use a default timeout.
-      const timeout = await this.getTimeoutMs(payload);
-      return {
-        payload,
-        options: {
-          ...options,
-          timeout,
-        },
-        timestamp,
-      };
-    }
-  }
-
-  public async executeJob(job: Job): Promise<WorkerResult> {
-    // This is an abstract class. Do nothing here. You should override this.
-    return new Promise<WorkerResult>((resolve, _) => {
-      resolve();
-    });
-  }
-
-  // Enqueue the job.
-  public async enqueueJob(payload: any, options: any) {
-    const job: Job = await this.createJob(payload, options);
-    return new Promise((resolve, reject) => {
-      const jobInternal: JobInternal<Job> = this.queue.addJob(this.id, job, job.options);
-      jobInternal.on(esqueueEvents.EVENT_JOB_CREATED, async (createdJob: JobInternal<Job>) => {
-        if (createdJob.id === jobInternal.id) {
-          await this.onJobEnqueued(job);
-          resolve(jobInternal);
-        }
-      });
-      jobInternal.on(esqueueEvents.EVENT_JOB_CREATE_ERROR, reject);
-    });
-  }
-
-  public bind(codeServices: CodeServices) {
-    const workerFn = (payload: any, cancellationToken: CancellationToken) => {
-      const job: Job = {
-        ...payload,
-        cancellationToken,
-      };
-      return this.executeJob(job);
-    };
-
-    const workerOptions = {
-      interval: 5000,
-      capacity: 5,
-      intervalErrorMultiplier: 1,
-      codeServices,
-    };
-
-    const queueWorker = this.queue.registerWorker(this.id, workerFn as any, workerOptions);
-
-    queueWorker.on(esqueueEvents.EVENT_WORKER_COMPLETE, async (res: any) => {
-      const result: WorkerResult = res.output.content;
-      const job: Job = res.job;
-      await this.onJobCompleted(job, result);
-    });
-    queueWorker.on(esqueueEvents.EVENT_WORKER_JOB_EXECUTION_ERROR, async (res: any) => {
-      await this.onJobExecutionError(res);
-    });
-    queueWorker.on(esqueueEvents.EVENT_WORKER_JOB_TIMEOUT, async (res: any) => {
-      await this.onJobTimeOut(res);
-    });
-
-    return this;
-  }
-
-  public async onJobEnqueued(job: Job) {
-    this.log.info(`${this.id} job enqueued with details ${JSON.stringify(job)}`);
-    return await this.updateProgress(job, WorkerReservedProgress.INIT);
-  }
-
-  public async onJobCompleted(job: Job, res: WorkerResult) {
-    this.log.info(
-      `${this.id} job completed with result ${JSON.stringify(
-        res
-      )} in ${this.workerTaskDurationSeconds(job)} seconds.`
-    );
-    if (res.cancelled) {
-      // Skip updating job progress if the job is done because of cancellation.
-      return;
-    }
-    return await this.updateProgress(job, WorkerReservedProgress.COMPLETED);
-  }
-
-  public async onJobExecutionError(res: any) {
-    this.log.error(
-      `${this.id} job execution error ${JSON.stringify(res)} in ${this.workerTaskDurationSeconds(
-        res.job
-      )} seconds.`
-    );
-    return await this.updateProgress(res.job, WorkerReservedProgress.ERROR, res.error);
-  }
-
-  public async onJobTimeOut(res: any) {
-    this.log.error(
-      `${this.id} job timed out ${JSON.stringify(res)} in ${this.workerTaskDurationSeconds(
-        res.job
-      )} seconds.`
-    );
-    return await this.updateProgress(res.job, WorkerReservedProgress.TIMEOUT, res.error);
-  }
-
-  public async updateProgress(job: Job, progress: number, error?: Error) {
-    // This is an abstract class. Do nothing here. You should override this.
-    return new Promise<WorkerResult>((resolve, _) => {
-      resolve();
-    });
-  }
-
-  protected async getTimeoutMs(payload: any) {
-    // Set to 1 hour by default. Override this function for sub classes if necessary.
-    return moment.duration(1, 'hour').asMilliseconds();
-  }
-
-  private workerTaskDurationSeconds(job: Job) {
-    const diff = moment().diff(moment(job.timestamp));
-    return moment.duration(diff).asSeconds();
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/queue/cancellation_service.test.ts b/x-pack/legacy/plugins/code/server/queue/cancellation_service.test.ts
deleted file mode 100644
index 475925d7c82c36..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/cancellation_service.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { CancellationToken } from '../lib/esqueue';
-
-import sinon from 'sinon';
-
-import { CancellationReason, CancellationSerivce } from './cancellation_service';
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Register and cancel cancellation token', async () => {
-  const repoUri = 'github.com/elastic/code';
-  const service = new CancellationSerivce();
-  const token = {
-    cancel: (): void => {
-      return;
-    },
-  };
-  const cancelSpy = sinon.spy();
-  token.cancel = cancelSpy;
-
-  // create a promise and defer its fulfillment
-  let promiseResolve: () => void = () => {};
-  const promise = new Promise(resolve => {
-    promiseResolve = resolve;
-  });
-  await service.registerCancelableIndexJob(repoUri, (token as any) as CancellationToken, promise);
-  // do not wait on the promise, or there will be a dead lock
-  const cancelPromise = service.cancelIndexJob(repoUri, CancellationReason.NEW_JOB_OVERRIDEN);
-  // resolve the promise now
-  promiseResolve();
-
-  await cancelPromise;
-
-  expect(cancelSpy.calledOnce).toBeTruthy();
-});
-
-test('Register and cancel cancellation token while an exception is thrown from the job', async () => {
-  const repoUri = 'github.com/elastic/code';
-  const service = new CancellationSerivce();
-  const token = {
-    cancel: (): void => {
-      return;
-    },
-  };
-  const cancelSpy = sinon.spy();
-  token.cancel = cancelSpy;
-
-  // create a promise and defer its rejection
-  let promiseReject: () => void = () => {};
-  const promise = new Promise((resolve, reject) => {
-    promiseReject = reject;
-  });
-  await service.registerCancelableIndexJob(repoUri, (token as any) as CancellationToken, promise);
-  // expect no exceptions are thrown when cancelling the job
-  // do not wait on the promise, or there will be a dead lock
-  const cancelPromise = service.cancelIndexJob(repoUri, CancellationReason.NEW_JOB_OVERRIDEN);
-  // reject the promise now
-  promiseReject();
-
-  await cancelPromise;
-
-  expect(cancelSpy.calledOnce).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/server/queue/cancellation_service.ts b/x-pack/legacy/plugins/code/server/queue/cancellation_service.ts
deleted file mode 100644
index 0679ec7986c769..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/cancellation_service.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RepositoryUri } from '../../model';
-import { CancellationToken } from '../lib/esqueue';
-
-interface CancellableJob {
-  token: CancellationToken;
-  jobPromise: Promise<any>;
-}
-
-export enum CancellationReason {
-  REPOSITORY_DELETE = 'Cancel job because of deleting the entire repository',
-  LOW_DISK_SPACE = 'Cancel job because of low available disk space',
-  NEW_JOB_OVERRIDEN = 'Cancel job because of a new job of the same type has been registered',
-}
-
-export class CancellationSerivce {
-  private cloneCancellationMap: Map<RepositoryUri, CancellableJob>;
-  private updateCancellationMap: Map<RepositoryUri, CancellableJob>;
-  private indexCancellationMap: Map<RepositoryUri, CancellableJob>;
-
-  constructor() {
-    this.cloneCancellationMap = new Map<RepositoryUri, CancellableJob>();
-    this.updateCancellationMap = new Map<RepositoryUri, CancellableJob>();
-    this.indexCancellationMap = new Map<RepositoryUri, CancellableJob>();
-  }
-
-  public async cancelCloneJob(repoUri: RepositoryUri, reason: CancellationReason) {
-    await this.cancelJob(this.cloneCancellationMap, repoUri, reason);
-  }
-
-  public async cancelUpdateJob(repoUri: RepositoryUri, reason: CancellationReason) {
-    await this.cancelJob(this.updateCancellationMap, repoUri, reason);
-  }
-
-  public async cancelIndexJob(repoUri: RepositoryUri, reason: CancellationReason) {
-    await this.cancelJob(this.indexCancellationMap, repoUri, reason);
-  }
-
-  public async registerCancelableCloneJob(
-    repoUri: RepositoryUri,
-    token: CancellationToken,
-    jobPromise: Promise<any>
-  ) {
-    await this.registerCancelableJob(this.cloneCancellationMap, repoUri, token, jobPromise);
-  }
-
-  public async registerCancelableUpdateJob(
-    repoUri: RepositoryUri,
-    token: CancellationToken,
-    jobPromise: Promise<any>
-  ) {
-    await this.registerCancelableJob(this.updateCancellationMap, repoUri, token, jobPromise);
-  }
-
-  public async registerCancelableIndexJob(
-    repoUri: RepositoryUri,
-    token: CancellationToken,
-    jobPromise: Promise<any>
-  ) {
-    await this.registerCancelableJob(this.indexCancellationMap, repoUri, token, jobPromise);
-  }
-
-  private async registerCancelableJob(
-    jobMap: Map<RepositoryUri, CancellableJob>,
-    repoUri: RepositoryUri,
-    token: CancellationToken,
-    jobPromise: Promise<any>
-  ) {
-    // Try to cancel the job first.
-    await this.cancelJob(jobMap, repoUri, CancellationReason.NEW_JOB_OVERRIDEN);
-    jobMap.set(repoUri, { token, jobPromise });
-    // remove the record from the cancellation service when the promise is fulfilled or rejected.
-    jobPromise.finally(() => {
-      jobMap.delete(repoUri);
-    });
-  }
-
-  private async cancelJob(
-    jobMap: Map<RepositoryUri, CancellableJob>,
-    repoUri: RepositoryUri,
-    reason: CancellationReason
-  ) {
-    const payload = jobMap.get(repoUri);
-    if (payload) {
-      const { token, jobPromise } = payload;
-      // 1. Use the cancellation token to pass cancel message to job
-      token.cancel(reason);
-      // 2. waiting on the actual job promise to be resolved
-      try {
-        await jobPromise;
-      } catch (e) {
-        // the exception from the job also indicates the job is finished, and it should be the duty of the worker for
-        // the job to handle it, so it's safe to just ignore the exception here
-      }
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/queue/clone_worker.ts b/x-pack/legacy/plugins/code/server/queue/clone_worker.ts
deleted file mode 100644
index be9110c9f293cd..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/clone_worker.ts
+++ /dev/null
@@ -1,176 +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 { delay } from 'lodash';
-
-import { validateGitUrl } from '../../common/git_url_utils';
-import { RepositoryUtils } from '../../common/repository_utils';
-import {
-  CloneProgress,
-  CloneWorkerProgress,
-  CloneWorkerResult,
-  WorkerReservedProgress,
-} from '../../model';
-import { DiskWatermarkService } from '../disk_watermark';
-import { GitOperations } from '../git_operations';
-import { EsClient, Esqueue } from '../lib/esqueue';
-import { Logger } from '../log';
-import { RepositoryServiceFactory } from '../repository_service_factory';
-import { ServerOptions } from '../server_options';
-import { AbstractGitWorker } from './abstract_git_worker';
-import { CancellationReason, CancellationSerivce } from './cancellation_service';
-import { IndexWorker } from './index_worker';
-import { Job } from './job';
-
-export class CloneWorker extends AbstractGitWorker {
-  public id: string = 'clone';
-
-  constructor(
-    protected readonly queue: Esqueue,
-    protected readonly log: Logger,
-    protected readonly client: EsClient,
-    protected readonly serverOptions: ServerOptions,
-    protected readonly gitOps: GitOperations,
-    private readonly indexWorker: IndexWorker,
-    private readonly repoServiceFactory: RepositoryServiceFactory,
-    private readonly cancellationService: CancellationSerivce,
-    protected readonly watermarkService: DiskWatermarkService
-  ) {
-    super(queue, log, client, serverOptions, gitOps, watermarkService);
-  }
-
-  public async executeJob(job: Job) {
-    const superRes = await super.executeJob(job);
-    if (superRes.cancelled) {
-      return superRes;
-    }
-
-    const { payload, cancellationToken } = job;
-    const { url } = payload;
-    try {
-      validateGitUrl(
-        url,
-        this.serverOptions.security.gitHostWhitelist,
-        this.serverOptions.security.gitProtocolWhitelist
-      );
-    } catch (error) {
-      this.log.error(`Validate git url ${url} error.`);
-      this.log.error(error);
-      return {
-        uri: url,
-      } as CloneWorkerResult;
-    }
-
-    this.log.info(`Execute clone job for ${url}`);
-    const repoService = this.repoServiceFactory.newInstance(
-      this.serverOptions.repoPath,
-      this.serverOptions.credsPath,
-      this.log
-    );
-    const repo = RepositoryUtils.buildRepository(url);
-
-    // Try to cancel any existing clone job for this repository.
-    await this.cancellationService.cancelCloneJob(repo.uri, CancellationReason.NEW_JOB_OVERRIDEN);
-
-    let cancelled = false;
-    let cancelledReason;
-    if (cancellationToken) {
-      cancellationToken.on((reason: string) => {
-        cancelled = true;
-        cancelledReason = reason;
-      });
-    }
-
-    const cloneJobPromise = repoService.clone(
-      repo,
-      async (progress: number, cloneProgress?: CloneProgress) => {
-        if (cancelled) {
-          // return false to stop the clone progress
-          return false;
-        }
-
-        // Keep an eye on the disk usage during clone in case it goes above the
-        // disk watermark config.
-        if (await this.watermarkService.isLowWatermark()) {
-          // Cancel this clone job
-          if (cancellationToken) {
-            cancellationToken.cancel(CancellationReason.LOW_DISK_SPACE);
-          }
-          // return false to stop the clone progress
-          return false;
-        }
-
-        // For clone job payload, it only has the url. Populate back the
-        // repository uri before update progress.
-        job.payload.uri = repo.uri;
-        this.updateProgress(job, progress, undefined, cloneProgress);
-        return true;
-      }
-    );
-
-    if (cancellationToken) {
-      await this.cancellationService.registerCancelableCloneJob(
-        repo.uri,
-        cancellationToken,
-        cloneJobPromise
-      );
-    }
-    const res = await cloneJobPromise;
-    return {
-      ...res,
-      cancelled,
-      cancelledReason,
-    };
-  }
-
-  public async onJobCompleted(job: Job, res: CloneWorkerResult) {
-    if (res.cancelled) {
-      await this.onJobCancelled(job, res.cancelledReason);
-      // Skip updating job progress if the job is done because of cancellation.
-      return;
-    }
-
-    const { uri, revision } = res.repo!;
-    this.log.info(`Clone job done for ${uri}`);
-    // For clone job payload, it only has the url. Populate back the
-    // repository uri.
-    job.payload.uri = uri;
-    await super.onJobCompleted(job, res);
-
-    // Throw out a repository index request after 1 second.
-    return delay(async () => {
-      const payload = { uri, revision };
-      await this.indexWorker.enqueueJob(payload, {});
-    }, 1000);
-  }
-
-  public async onJobEnqueued(job: Job) {
-    const { url } = job.payload;
-    const repo = RepositoryUtils.buildRepository(url);
-    const progress: CloneWorkerProgress = {
-      uri: repo.uri,
-      progress: WorkerReservedProgress.INIT,
-      timestamp: new Date(),
-    };
-    return await this.objectClient.setRepositoryGitStatus(repo.uri, progress);
-  }
-
-  public async onJobExecutionError(res: any) {
-    // The payload of clone job won't have the `uri`, but only with `url`.
-    const url = res.job.payload.url;
-    const repo = RepositoryUtils.buildRepository(url);
-    res.job.payload.uri = repo.uri;
-    return await super.onJobExecutionError(res);
-  }
-
-  public async onJobTimeOut(res: any) {
-    // The payload of clone job won't have the `uri`, but only with `url`.
-    const url = res.job.payload.url;
-    const repo = RepositoryUtils.buildRepository(url);
-    res.job.payload.uri = repo.uri;
-    return await super.onJobTimeOut(res);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/queue/delete_worker.test.ts b/x-pack/legacy/plugins/code/server/queue/delete_worker.test.ts
deleted file mode 100644
index fd6de59ffa722e..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/delete_worker.test.ts
+++ /dev/null
@@ -1,373 +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 sinon from 'sinon';
-
-import { WorkerReservedProgress } from '../../model';
-import { RepositoryIndexStatusReservedField } from '../indexer/schema';
-import { EsClient, Esqueue } from '../lib/esqueue';
-import { GitOperations } from '../git_operations';
-import { Logger } from '../log';
-import { LspService } from '../lsp/lsp_service';
-import { RepositoryServiceFactory } from '../repository_service_factory';
-import { ServerOptions } from '../server_options';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { CancellationSerivce } from './cancellation_service';
-import { DeleteWorker } from './delete_worker';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esQueue = {};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Execute delete job.', async () => {
-  // Setup RepositoryService
-  const removeSpy = sinon.fake.returns(Promise.resolve());
-  const repoService = {
-    remove: emptyAsyncFunc,
-  };
-  repoService.remove = removeSpy;
-  const repoServiceFactory = {
-    newInstance: (): void => {
-      return;
-    },
-  };
-  const newInstanceSpy = sinon.fake.returns(repoService);
-  repoServiceFactory.newInstance = newInstanceSpy;
-
-  // Setup CancellationService
-  const cancelIndexJobSpy = sinon.spy();
-  const cancelCloneJobSpy = sinon.spy();
-  const cancelUpdateJobSpy = sinon.spy();
-  const cancellationService = {
-    cancelCloneJob: emptyAsyncFunc,
-    cancelUpdateJob: emptyAsyncFunc,
-    cancelIndexJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelIndexJob = cancelIndexJobSpy;
-  cancellationService.cancelCloneJob = cancelCloneJobSpy;
-  cancellationService.cancelUpdateJob = cancelUpdateJobSpy;
-
-  // Setup EsClient
-  const deleteSpy = sinon.fake.returns(Promise.resolve());
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryIndexStatusReservedField]: {
-          uri: 'github.com/elastic/kibana',
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          revision: 'abcdefg',
-        },
-      },
-    })
-  );
-  const esClient = {
-    indices: {
-      delete: emptyAsyncFunc,
-    },
-    get: emptyAsyncFunc,
-  };
-  esClient.indices.delete = deleteSpy;
-  esClient.get = getSpy;
-
-  // Setup LspService
-  const deleteWorkspaceSpy = sinon.fake.returns(Promise.resolve());
-  const lspService = {
-    deleteWorkspace: emptyAsyncFunc,
-  };
-  lspService.deleteWorkspace = deleteWorkspaceSpy;
-
-  // Setup GitOperations
-  const cleanRepoSpy = sinon.spy();
-  const gitOps = {
-    cleanRepo: cleanRepoSpy,
-  };
-
-  const deleteWorker = new DeleteWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    {} as ServerOptions,
-    (gitOps as any) as GitOperations,
-    (cancellationService as any) as CancellationSerivce,
-    (lspService as any) as LspService,
-    (repoServiceFactory as any) as RepositoryServiceFactory
-  );
-
-  await deleteWorker.executeJob({
-    payload: {
-      uri: 'github.com/elastic/kibana',
-    },
-    options: {},
-    timestamp: 0,
-  });
-
-  expect(cancelIndexJobSpy.calledOnce).toBeTruthy();
-  expect(cancelCloneJobSpy.calledOnce).toBeTruthy();
-  expect(cancelUpdateJobSpy.calledOnce).toBeTruthy();
-
-  expect(newInstanceSpy.calledOnce).toBeTruthy();
-  expect(removeSpy.calledOnce).toBeTruthy();
-  expect(deleteSpy.calledThrice).toBeTruthy();
-
-  expect(deleteWorkspaceSpy.calledOnce).toBeTruthy();
-});
-
-test('On delete job uri does not exist.', async () => {
-  // Setup RepositoryService
-  const removeSpy = sinon.fake.returns(Promise.resolve());
-  const repoService = {
-    remove: emptyAsyncFunc,
-  };
-  repoService.remove = removeSpy;
-  const repoServiceFactory = {
-    newInstance: (): void => {
-      return;
-    },
-  };
-  const newInstanceSpy = sinon.fake.returns(repoService);
-  repoServiceFactory.newInstance = newInstanceSpy;
-
-  // Setup CancellationService
-  const cancelIndexJobSpy = sinon.spy();
-  const cancelCloneJobSpy = sinon.spy();
-  const cancelUpdateJobSpy = sinon.spy();
-  const cancellationService = {
-    cancelCloneJob: emptyAsyncFunc,
-    cancelUpdateJob: emptyAsyncFunc,
-    cancelIndexJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelIndexJob = cancelIndexJobSpy;
-  cancellationService.cancelCloneJob = cancelCloneJobSpy;
-  cancellationService.cancelUpdateJob = cancelUpdateJobSpy;
-
-  // Setup EsClient
-  const deleteSpy = sinon.fake.returns(Promise.resolve());
-  const getSpy = sinon.fake.returns(Promise.reject(new Error('ES does not find the document')));
-  const esClient = {
-    indices: {
-      delete: emptyAsyncFunc,
-    },
-    get: emptyAsyncFunc,
-  };
-  esClient.indices.delete = deleteSpy;
-  esClient.get = getSpy;
-
-  // Setup LspService
-  const deleteWorkspaceSpy = sinon.fake.returns(Promise.resolve());
-  const lspService = {
-    deleteWorkspace: emptyAsyncFunc,
-  };
-  lspService.deleteWorkspace = deleteWorkspaceSpy;
-
-  // Setup GitOperations
-  const cleanRepoSpy = sinon.spy();
-  const gitOps = {
-    cleanRepo: cleanRepoSpy,
-  };
-
-  const deleteWorker = new DeleteWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    {
-      security: {},
-    } as ServerOptions,
-    (gitOps as any) as GitOperations,
-    (cancellationService as any) as CancellationSerivce,
-    (lspService as any) as LspService,
-    (repoServiceFactory as any) as RepositoryServiceFactory
-  );
-
-  const result = await deleteWorker.executeJob({
-    payload: {
-      uri: 'repo/doesnot/exist',
-    },
-    options: {},
-    timestamp: 0,
-  });
-
-  expect(result.uri).toEqual('repo/doesnot/exist');
-  expect(result.res).toBeTruthy();
-
-  // Non of them should be called.
-  expect(cancelIndexJobSpy.notCalled).toBeTruthy();
-  expect(cancelCloneJobSpy.notCalled).toBeTruthy();
-  expect(cancelUpdateJobSpy.notCalled).toBeTruthy();
-  expect(newInstanceSpy.notCalled).toBeTruthy();
-  expect(removeSpy.notCalled).toBeTruthy();
-  expect(deleteSpy.notCalled).toBeTruthy();
-  expect(deleteWorkspaceSpy.notCalled).toBeTruthy();
-});
-
-test('On delete job uri contains ../', async () => {
-  // Setup RepositoryService
-  const removeSpy = sinon.fake.returns(Promise.resolve());
-  const repoService = {
-    remove: emptyAsyncFunc,
-  };
-  repoService.remove = removeSpy;
-  const repoServiceFactory = {
-    newInstance: (): void => {
-      return;
-    },
-  };
-  const newInstanceSpy = sinon.fake.returns(repoService);
-  repoServiceFactory.newInstance = newInstanceSpy;
-
-  // Setup CancellationService
-  const cancelIndexJobSpy = sinon.spy();
-  const cancelCloneJobSpy = sinon.spy();
-  const cancelUpdateJobSpy = sinon.spy();
-  const cancellationService = {
-    cancelCloneJob: emptyAsyncFunc,
-    cancelUpdateJob: emptyAsyncFunc,
-    cancelIndexJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelIndexJob = cancelIndexJobSpy;
-  cancellationService.cancelCloneJob = cancelCloneJobSpy;
-  cancellationService.cancelUpdateJob = cancelUpdateJobSpy;
-
-  // Setup EsClient
-  const deleteSpy = sinon.fake.returns(Promise.resolve());
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryIndexStatusReservedField]: {
-          uri: 'github.com/elastic/kibana/../../../../foo/bar',
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          revision: 'abcdefg',
-        },
-      },
-    })
-  );
-  const esClient = {
-    indices: {
-      delete: emptyAsyncFunc,
-    },
-    get: emptyAsyncFunc,
-  };
-  esClient.indices.delete = deleteSpy;
-  esClient.get = getSpy;
-
-  // Setup LspService
-  const deleteWorkspaceSpy = sinon.fake.returns(Promise.resolve());
-  const lspService = {
-    deleteWorkspace: emptyAsyncFunc,
-  };
-  lspService.deleteWorkspace = deleteWorkspaceSpy;
-
-  // Setup GitOperations
-  const cleanRepoSpy = sinon.spy();
-  const gitOps = {
-    cleanRepo: cleanRepoSpy,
-  };
-
-  const deleteWorker = new DeleteWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    {
-      security: {},
-    } as ServerOptions,
-    (gitOps as any) as GitOperations,
-    (cancellationService as any) as CancellationSerivce,
-    (lspService as any) as LspService,
-    (repoServiceFactory as any) as RepositoryServiceFactory
-  );
-
-  const result = await deleteWorker.executeJob({
-    payload: {
-      uri: 'github.com/elastic/kibana/../../../../foo/bar',
-    },
-    options: {},
-    timestamp: 0,
-  });
-
-  expect(result.uri).toEqual('github.com/elastic/kibana/../../../../foo/bar');
-  expect(result.res).toBeTruthy();
-
-  // Non of them should be called.
-  expect(cancelIndexJobSpy.notCalled).toBeTruthy();
-  expect(cancelCloneJobSpy.notCalled).toBeTruthy();
-  expect(cancelUpdateJobSpy.notCalled).toBeTruthy();
-  expect(newInstanceSpy.notCalled).toBeTruthy();
-  expect(removeSpy.notCalled).toBeTruthy();
-  expect(deleteSpy.notCalled).toBeTruthy();
-  expect(deleteWorkspaceSpy.notCalled).toBeTruthy();
-});
-
-test('On delete job enqueued.', async () => {
-  // Setup EsClient
-  const indexSpy = sinon.fake.returns(Promise.resolve());
-  const esClient = {
-    index: emptyAsyncFunc,
-  };
-  esClient.index = indexSpy;
-
-  const deleteWorker = new DeleteWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    {} as ServerOptions,
-    {} as GitOperations,
-    {} as CancellationSerivce,
-    {} as LspService,
-    {} as RepositoryServiceFactory
-  );
-
-  await deleteWorker.onJobEnqueued({
-    payload: {
-      uri: 'github.com/elastic/kibana',
-    },
-    options: {},
-    timestamp: 0,
-  });
-
-  expect(indexSpy.calledOnce).toBeTruthy();
-});
-
-test('On delete job completed.', async () => {
-  // Setup EsClient
-  const updateSpy = sinon.fake.returns(Promise.resolve());
-  const esClient = {
-    update: emptyAsyncFunc,
-  };
-  esClient.update = updateSpy;
-
-  const deleteWorker = new DeleteWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    {} as ServerOptions,
-    {} as GitOperations,
-    {} as CancellationSerivce,
-    {} as LspService,
-    {} as RepositoryServiceFactory
-  );
-
-  await deleteWorker.onJobCompleted(
-    {
-      payload: {
-        uri: 'github.com/elastic/kibana',
-      },
-      options: {},
-      timestamp: 0,
-    },
-    {
-      uri: 'github.com/elastic/kibana',
-    }
-  );
-
-  // Nothing is called.
-  expect(updateSpy.notCalled).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/server/queue/delete_worker.ts b/x-pack/legacy/plugins/code/server/queue/delete_worker.ts
deleted file mode 100644
index b17716e6b5d7e0..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/delete_worker.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import moment from 'moment';
-
-import { RepositoryUri, WorkerReservedProgress } from '../../model';
-import { WorkerProgress } from '../../model/repository';
-import { GitOperations } from '../git_operations';
-import { DocumentIndexName, ReferenceIndexName, SymbolIndexName } from '../indexer/schema';
-import { EsClient, Esqueue } from '../lib/esqueue';
-import { Logger } from '../log';
-import { LspService } from '../lsp/lsp_service';
-import { RepositoryServiceFactory } from '../repository_service_factory';
-import { RepositoryObjectClient } from '../search';
-import { ServerOptions } from '../server_options';
-import { AbstractWorker } from './abstract_worker';
-import { CancellationReason, CancellationSerivce } from './cancellation_service';
-import { Job } from './job';
-
-export class DeleteWorker extends AbstractWorker {
-  public id: string = 'delete';
-  private objectClient: RepositoryObjectClient;
-
-  constructor(
-    protected readonly queue: Esqueue,
-    protected readonly log: Logger,
-    protected readonly client: EsClient,
-    protected readonly serverOptions: ServerOptions,
-    protected readonly gitOps: GitOperations,
-    private readonly cancellationService: CancellationSerivce,
-    private readonly lspService: LspService,
-    private readonly repoServiceFactory: RepositoryServiceFactory
-  ) {
-    super(queue, log);
-    this.objectClient = new RepositoryObjectClient(this.client);
-  }
-
-  public async executeJob(job: Job) {
-    const { uri } = job.payload;
-
-    try {
-      // 1. Check if the uri exsits
-      await this.objectClient.getRepository(uri);
-      // 2. Double check if the uri contains ".." which could result in
-      // deleting incorrect files in the file systems.
-      if (uri.split('/').includes('..')) {
-        throw new Error('Repository URI should not contain "..".');
-      }
-    } catch (error) {
-      this.log.error(`Invalid repository uri ${uri}. Skip delete job.`);
-      this.log.error(error);
-      return {
-        uri,
-        // Because the repository does not exist, we can regard the delete job to be successful.
-        res: true,
-      };
-    }
-
-    try {
-      // 1. Cancel running clone and update workers
-      await this.cancellationService.cancelCloneJob(uri, CancellationReason.REPOSITORY_DELETE);
-      await this.cancellationService.cancelUpdateJob(uri, CancellationReason.REPOSITORY_DELETE);
-
-      // 2. Delete workspace and index workers. Since the indexing could be
-      // hanging in the initialization stage, we should delete the workspace
-      // to cancel it in the meantime.
-      const deleteWorkspacePromise = this.deletePromiseWrapper(
-        this.lspService.deleteWorkspace(uri),
-        'workspace',
-        uri
-      );
-      const indexJobCancelPromise = this.cancellationService.cancelIndexJob(
-        uri,
-        CancellationReason.REPOSITORY_DELETE
-      );
-      await Promise.all([deleteWorkspacePromise, indexJobCancelPromise]);
-
-      // 3. Delete ES indices and aliases
-      const deleteSymbolESIndexPromise = this.deletePromiseWrapper(
-        this.client.indices.delete({ index: `${SymbolIndexName(uri)}*` }),
-        'symbol ES index',
-        uri
-      );
-
-      const deleteReferenceESIndexPromise = this.deletePromiseWrapper(
-        this.client.indices.delete({ index: `${ReferenceIndexName(uri)}*` }),
-        'reference ES index',
-        uri
-      );
-      await Promise.all([deleteSymbolESIndexPromise, deleteReferenceESIndexPromise]);
-
-      const repoService = this.repoServiceFactory.newInstance(
-        this.serverOptions.repoPath,
-        this.serverOptions.credsPath,
-        this.log
-      );
-      await this.deletePromiseWrapper(repoService.remove(uri), 'git data', uri);
-
-      // 4. Delete the document index and alias where the repository document and all status reside,
-      // so that you won't be able to import the same repositories until they are
-      // fully removed.
-      await this.deletePromiseWrapper(
-        this.client.indices.delete({ index: `${DocumentIndexName(uri)}*` }),
-        'document ES index',
-        uri
-      );
-
-      return {
-        uri,
-        res: true,
-      };
-    } catch (error) {
-      this.log.error(`Delete repository ${uri} error.`);
-      this.log.error(error);
-      return {
-        uri,
-        res: false,
-      };
-    }
-  }
-
-  public async onJobEnqueued(job: Job) {
-    const repoUri = job.payload.uri;
-    const progress: WorkerProgress = {
-      uri: repoUri,
-      progress: WorkerReservedProgress.INIT,
-      timestamp: new Date(),
-    };
-    return await this.objectClient.setRepositoryDeleteStatus(repoUri, progress);
-  }
-
-  public async updateProgress(job: Job, progress: number) {
-    const { uri } = job.payload;
-    const p: WorkerProgress = {
-      uri,
-      progress,
-      timestamp: new Date(),
-    };
-    if (progress !== WorkerReservedProgress.COMPLETED) {
-      return await this.objectClient.updateRepositoryDeleteStatus(uri, p);
-    }
-  }
-
-  protected async getTimeoutMs(_: any) {
-    return (
-      moment.duration(1, 'hour').asMilliseconds() + moment.duration(10, 'minutes').asMilliseconds()
-    );
-  }
-
-  private deletePromiseWrapper(
-    promise: Promise<any>,
-    type: string,
-    repoUri: RepositoryUri
-  ): Promise<any> {
-    return promise
-      .then(() => {
-        this.log.info(`Delete ${type} of repository ${repoUri} done.`);
-      })
-      .catch((error: Error) => {
-        this.log.error(`Delete ${type} of repository ${repoUri} error.`);
-        this.log.error(error);
-      });
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/queue/index.ts b/x-pack/legacy/plugins/code/server/queue/index.ts
deleted file mode 100644
index 35de744d53c9b5..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './cancellation_service';
-export * from './clone_worker';
-export * from './delete_worker';
-export * from './index_worker';
-export * from './update_worker';
-export * from './worker';
diff --git a/x-pack/legacy/plugins/code/server/queue/index_worker.test.ts b/x-pack/legacy/plugins/code/server/queue/index_worker.test.ts
deleted file mode 100644
index 0c78a7abb35839..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/index_worker.test.ts
+++ /dev/null
@@ -1,523 +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 sinon from 'sinon';
-
-import { IndexerType, WorkerReservedProgress } from '../../model';
-import { GitOperations } from '../git_operations';
-import {
-  RepositoryGitStatusReservedField,
-  RepositoryIndexStatusReservedField,
-} from '../indexer/schema';
-import { CancellationToken, EsClient, Esqueue } from '../lib/esqueue';
-import { Logger } from '../log';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { CancellationReason, CancellationSerivce } from './cancellation_service';
-import { IndexWorker } from './index_worker';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esQueue = {};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Execute index job.', async () => {
-  // Setup CancellationService
-  const cancelIndexJobSpy = sinon.spy();
-  const registerCancelableIndexJobSpy = sinon.spy();
-  const cancellationService = {
-    cancelIndexJob: emptyAsyncFunc,
-    registerCancelableIndexJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelIndexJob = cancelIndexJobSpy;
-  cancellationService.registerCancelableIndexJob = registerCancelableIndexJobSpy;
-
-  // Setup EsClient
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryIndexStatusReservedField]: {
-          uri: 'github.com/elastic/kibana',
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          revision: 'abcdefg',
-        },
-      },
-    })
-  );
-  const esClient = {
-    get: emptyAsyncFunc,
-  };
-  esClient.get = getSpy;
-
-  // Setup IndexerFactory
-  const cancelSpy = sinon.spy();
-  const startSpy = sinon.fake.returns(new Map());
-  const indexer = {
-    cancel: emptyAsyncFunc,
-    start: emptyAsyncFunc,
-  };
-  indexer.cancel = cancelSpy;
-  indexer.start = startSpy;
-  const createSpy = sinon.fake.returns(indexer);
-  const indexerFactory = {
-    create: emptyAsyncFunc,
-  };
-  indexerFactory.create = createSpy;
-
-  const cToken = new CancellationToken();
-
-  const indexerFactoryMap = new Map();
-  indexerFactoryMap.set(IndexerType.COMMIT, indexerFactory);
-  const indexWorker = new IndexWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    indexerFactoryMap,
-    {} as GitOperations,
-    (cancellationService as any) as CancellationSerivce
-  );
-
-  await indexWorker.executeJob({
-    payload: {
-      uri: 'github.com/elastic/kibana',
-    },
-    options: {},
-    cancellationToken: cToken,
-    timestamp: 0,
-  });
-
-  expect(cancelIndexJobSpy.calledOnce).toBeTruthy();
-  expect(getSpy.calledOnce).toBeTruthy();
-  expect(createSpy.calledOnce).toBeTruthy();
-  expect(startSpy.calledOnce).toBeTruthy();
-  expect(cancelSpy.notCalled).toBeTruthy();
-});
-
-test('Execute index job and then cancel.', async () => {
-  // Setup CancellationService
-  const cancelIndexJobSpy = sinon.spy();
-  const registerCancelableIndexJobSpy = sinon.spy();
-  const cancellationService = {
-    cancelIndexJob: emptyAsyncFunc,
-    registerCancelableIndexJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelIndexJob = cancelIndexJobSpy;
-  cancellationService.registerCancelableIndexJob = registerCancelableIndexJobSpy;
-
-  // Setup EsClient
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryIndexStatusReservedField]: {
-          uri: 'github.com/elastic/kibana',
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          revision: 'abcdefg',
-        },
-      },
-    })
-  );
-  const esClient = {
-    get: emptyAsyncFunc,
-  };
-  esClient.get = getSpy;
-
-  // Setup IndexerFactory
-  const cancelSpy = sinon.spy();
-  const startSpy = sinon.fake.returns(new Map());
-  const indexer = {
-    cancel: emptyAsyncFunc,
-    start: emptyAsyncFunc,
-  };
-  indexer.cancel = cancelSpy;
-  indexer.start = startSpy;
-  const createSpy = sinon.fake.returns(indexer);
-  const indexerFactory = {
-    create: emptyAsyncFunc,
-  };
-  indexerFactory.create = createSpy;
-
-  const cToken = new CancellationToken();
-
-  const indexerFactoryMap = new Map();
-  indexerFactoryMap.set(IndexerType.COMMIT, indexerFactory);
-  const indexWorker = new IndexWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    indexerFactoryMap,
-    {} as GitOperations,
-    (cancellationService as any) as CancellationSerivce
-  );
-
-  await indexWorker.executeJob({
-    payload: {
-      uri: 'github.com/elastic/kibana',
-    },
-    options: {},
-    cancellationToken: cToken,
-    timestamp: 0,
-  });
-
-  // Cancel the index job.
-  cToken.cancel(CancellationReason.REPOSITORY_DELETE);
-
-  expect(cancelIndexJobSpy.calledOnce).toBeTruthy();
-  expect(getSpy.calledOnce).toBeTruthy();
-  expect(createSpy.calledOnce).toBeTruthy();
-  expect(startSpy.calledOnce).toBeTruthy();
-  // Then the the cancel function of the indexer should be called.
-  expect(cancelSpy.calledOnce).toBeTruthy();
-});
-
-test('Index job skipped/deduplicated if revision matches', async () => {
-  // Setup CancellationService
-  const cancelIndexJobSpy = sinon.spy();
-  const registerCancelableIndexJobSpy = sinon.spy();
-  const cancellationService = {
-    cancelIndexJob: emptyAsyncFunc,
-    registerCancelableIndexJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelIndexJob = cancelIndexJobSpy;
-  cancellationService.registerCancelableIndexJob = registerCancelableIndexJobSpy;
-
-  // Setup EsClient
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryIndexStatusReservedField]: {
-          uri: 'github.com/elastic/kibana',
-          progress: 50,
-          timestamp: new Date(),
-          revision: 'abcdefg',
-          indexProgress: {},
-        },
-      },
-    })
-  );
-  const esClient = {
-    get: emptyAsyncFunc,
-  };
-  esClient.get = getSpy;
-
-  // Setup IndexerFactory
-  const cancelSpy = sinon.spy();
-  const startSpy = sinon.fake.returns(new Map());
-  const indexer = {
-    cancel: emptyAsyncFunc,
-    start: emptyAsyncFunc,
-  };
-  indexer.cancel = cancelSpy;
-  indexer.start = startSpy;
-  const createSpy = sinon.fake.returns(indexer);
-  const indexerFactory = {
-    create: emptyAsyncFunc,
-  };
-  indexerFactory.create = createSpy;
-
-  const cToken = new CancellationToken();
-
-  const indexerFactoryMap = new Map();
-  indexerFactoryMap.set(IndexerType.COMMIT, indexerFactory);
-  const indexWorker = new IndexWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    indexerFactoryMap,
-    {} as GitOperations,
-    (cancellationService as any) as CancellationSerivce
-  );
-
-  await indexWorker.executeJob({
-    payload: {
-      uri: 'github.com/elastic/kibana',
-      revision: 'abcdefg',
-    },
-    options: {},
-    cancellationToken: cToken,
-    timestamp: 0,
-  });
-
-  expect(getSpy.calledOnce).toBeTruthy();
-  expect(cancelIndexJobSpy.notCalled).toBeTruthy();
-  expect(createSpy.notCalled).toBeTruthy();
-  expect(startSpy.notCalled).toBeTruthy();
-  expect(cancelSpy.notCalled).toBeTruthy();
-});
-
-test('Index job continue if revision matches and checkpoint found', async () => {
-  // Setup CancellationService
-  const cancelIndexJobSpy = sinon.spy();
-  const registerCancelableIndexJobSpy = sinon.spy();
-  const cancellationService = {
-    cancelIndexJob: emptyAsyncFunc,
-    registerCancelableIndexJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelIndexJob = cancelIndexJobSpy;
-  cancellationService.registerCancelableIndexJob = registerCancelableIndexJobSpy;
-
-  // Setup EsClient
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryIndexStatusReservedField]: {
-          uri: 'github.com/elastic/kibana',
-          progress: 50,
-          timestamp: new Date(),
-          revision: 'abcdefg',
-          indexProgress: {
-            checkpoint: {
-              repoUri: 'github.com/elastic/kibana',
-              filePath: 'foo/bar.js',
-              revision: 'abcdefg',
-            },
-          },
-        },
-      },
-    })
-  );
-  const esClient = {
-    get: emptyAsyncFunc,
-  };
-  esClient.get = getSpy;
-
-  // Setup IndexerFactory
-  const cancelSpy = sinon.spy();
-  const startSpy = sinon.fake.returns(new Map());
-  const indexer = {
-    cancel: emptyAsyncFunc,
-    start: emptyAsyncFunc,
-  };
-  indexer.cancel = cancelSpy;
-  indexer.start = startSpy;
-  const createSpy = sinon.fake.returns(indexer);
-  const indexerFactory = {
-    create: emptyAsyncFunc,
-  };
-  indexerFactory.create = createSpy;
-
-  const cToken = new CancellationToken();
-
-  const indexerFactoryMap = new Map();
-  indexerFactoryMap.set(IndexerType.COMMIT, indexerFactory);
-  const indexWorker = new IndexWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    indexerFactoryMap,
-    {} as GitOperations,
-    (cancellationService as any) as CancellationSerivce
-  );
-
-  await indexWorker.executeJob({
-    payload: {
-      uri: 'github.com/elastic/kibana',
-      revision: 'abcdefg',
-    },
-    options: {},
-    cancellationToken: cToken,
-    timestamp: 0,
-  });
-
-  expect(getSpy.calledOnce).toBeTruthy();
-  // the rest of the index worker logic after the checkpoint handling
-  // should be executed.
-  expect(cancelIndexJobSpy.calledOnce).toBeTruthy();
-  expect(createSpy.calledOnce).toBeTruthy();
-  expect(startSpy.calledOnce).toBeTruthy();
-  expect(cancelSpy.notCalled).toBeTruthy();
-});
-
-test('On index job enqueued.', async () => {
-  // Setup EsClient
-  const indexSpy = sinon.fake.returns(Promise.resolve());
-  const esClient = {
-    index: emptyAsyncFunc,
-  };
-  esClient.index = indexSpy;
-
-  const indexWorker = new IndexWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    new Map(),
-    {} as GitOperations,
-    {} as CancellationSerivce
-  );
-
-  await indexWorker.onJobEnqueued({
-    payload: {
-      uri: 'github.com/elastic/kibana',
-    },
-    options: {},
-    timestamp: 0,
-  });
-
-  expect(indexSpy.calledOnce).toBeTruthy();
-});
-
-test('On index job completed.', async () => {
-  // Setup EsClient
-  const updateSpy = sinon.fake.returns(Promise.resolve());
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryGitStatusReservedField]: {
-          uri: 'github.com/elastic/kibana',
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          revision: 'master',
-        },
-      },
-    })
-  );
-  const esClient = {
-    update: emptyAsyncFunc,
-    get: emptyAsyncFunc,
-  };
-  esClient.update = updateSpy;
-  esClient.get = getSpy;
-
-  const indexWorker = new IndexWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    new Map(),
-    {} as GitOperations,
-    {} as CancellationSerivce
-  );
-
-  await indexWorker.onJobCompleted(
-    {
-      payload: {
-        uri: 'github.com/elastic/kibana',
-        revision: 'master',
-      },
-      options: {},
-      timestamp: 0,
-    },
-    {
-      uri: 'github.com/elastic/kibana',
-      revision: 'master',
-      stats: new Map(),
-    }
-  );
-
-  expect(updateSpy.calledTwice).toBeTruthy();
-});
-
-test('On index job completed because of cancellation.', async () => {
-  // Setup EsClient
-  const updateSpy = sinon.fake.returns(Promise.resolve());
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryGitStatusReservedField]: {
-          uri: 'github.com/elastic/kibana',
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          revision: 'master',
-        },
-      },
-    })
-  );
-  const esClient = {
-    update: emptyAsyncFunc,
-    get: emptyAsyncFunc,
-  };
-  esClient.update = updateSpy;
-  esClient.get = getSpy;
-
-  const indexWorker = new IndexWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    new Map(),
-    {} as GitOperations,
-    {} as CancellationSerivce
-  );
-
-  await indexWorker.onJobCompleted(
-    {
-      payload: {
-        uri: 'github.com/elastic/kibana',
-        revision: 'master',
-      },
-      options: {},
-      timestamp: 0,
-    },
-    {
-      uri: 'github.com/elastic/kibana',
-      revision: 'master',
-      stats: new Map(),
-      // Index job is done because of cancellation.
-      cancelled: true,
-    }
-  );
-
-  // The elasticsearch update won't be called for the sake of
-  // cancellation.
-  expect(updateSpy.notCalled).toBeTruthy();
-});
-
-test('On index job completed with a different revision in git status.', async () => {
-  // Setup EsClient
-  const updateSpy = sinon.fake.returns(Promise.resolve());
-  const getSpy = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryGitStatusReservedField]: {
-          uri: 'github.com/elastic/kibana',
-          progress: WorkerReservedProgress.COMPLETED,
-          timestamp: new Date(),
-          revision: 'new-revision',
-        },
-      },
-    })
-  );
-  const esClient = {
-    update: emptyAsyncFunc,
-    get: emptyAsyncFunc,
-  };
-  esClient.update = updateSpy;
-  esClient.get = getSpy;
-
-  const indexWorker = new IndexWorker(
-    {} as Esqueue,
-    log,
-    esClient as EsClient,
-    new Map(),
-    {} as GitOperations,
-    {} as CancellationSerivce
-  );
-  const enqueueJobStub = sinon.stub();
-  indexWorker.enqueueJob = enqueueJobStub;
-
-  await indexWorker.onJobCompleted(
-    {
-      payload: {
-        uri: 'github.com/elastic/kibana',
-        revision: 'old-revision',
-      },
-      options: {},
-      timestamp: 0,
-    },
-    {
-      uri: 'github.com/elastic/kibana',
-      revision: 'master',
-      stats: new Map(),
-    }
-  );
-
-  // An additional index job should be enqueued.
-  expect(enqueueJobStub.calledOnce).toBeTruthy();
-
-  expect(updateSpy.calledTwice).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/server/queue/index_worker.ts b/x-pack/legacy/plugins/code/server/queue/index_worker.ts
deleted file mode 100644
index 0f61605f99cf8b..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/index_worker.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import moment from 'moment';
-
-import {
-  IndexProgress,
-  IndexRequest,
-  IndexStats,
-  IndexerType,
-  IndexWorkerProgress,
-  IndexWorkerResult,
-  RepositoryUri,
-  WorkerProgress,
-  WorkerReservedProgress,
-} from '../../model';
-import { GitOperations, HEAD } from '../git_operations';
-import { IndexerFactory } from '../indexer';
-import { EsClient, Esqueue } from '../lib/esqueue';
-import { Logger } from '../log';
-import { RepositoryObjectClient } from '../search';
-import { aggregateIndexStats } from '../utils/index_stats_aggregator';
-import { AbstractWorker } from './abstract_worker';
-import { CancellationReason, CancellationSerivce } from './cancellation_service';
-import { Job } from './job';
-
-export class IndexWorker extends AbstractWorker {
-  public id: string = 'index';
-  private objectClient: RepositoryObjectClient;
-
-  constructor(
-    protected readonly queue: Esqueue,
-    protected readonly log: Logger,
-    protected readonly client: EsClient,
-    protected readonly indexerFactories: Map<IndexerType, IndexerFactory>,
-    protected readonly gitOps: GitOperations,
-    private readonly cancellationService: CancellationSerivce
-  ) {
-    super(queue, log);
-
-    this.objectClient = new RepositoryObjectClient(this.client);
-  }
-
-  public async executeJob(job: Job) {
-    const { payload, cancellationToken } = job;
-    const { uri, revision, enforceReindex } = payload;
-    const indexerNumber = this.indexerFactories.size;
-
-    const { resume, checkpointReqs } = await this.shouldJobResume(payload);
-    if (!resume) {
-      this.log.info(`Index job skipped for ${uri} at revision ${revision}`);
-      return {
-        uri,
-        revision,
-      };
-    }
-
-    // Binding the index cancellation logic
-    let cancelled = false;
-    await this.cancellationService.cancelIndexJob(uri, CancellationReason.NEW_JOB_OVERRIDEN);
-    const indexPromises: Array<Promise<IndexStats>> = Array.from(
-      this.indexerFactories.values()
-    ).map(async (factory: IndexerFactory) => {
-      const indexer = await factory.create(uri, revision, enforceReindex);
-      if (!indexer) {
-        this.log.info(`Failed to create indexer for ${uri}`);
-        return new Map(); // return an empty map as stats.
-      }
-
-      if (cancellationToken) {
-        cancellationToken.on(() => {
-          indexer.cancel();
-          cancelled = true;
-        });
-      }
-
-      const progressReporter = this.getProgressReporter(uri, revision, indexer.type, indexerNumber);
-      return indexer.start(progressReporter, checkpointReqs.get(indexer.type));
-    });
-
-    const allPromise = Promise.all(indexPromises);
-
-    if (cancellationToken) {
-      await this.cancellationService.registerCancelableIndexJob(uri, cancellationToken, allPromise);
-    }
-
-    const stats: IndexStats[] = await allPromise;
-    const res: IndexWorkerResult = {
-      uri,
-      revision,
-      stats: aggregateIndexStats(stats),
-      cancelled,
-    };
-    return res;
-  }
-
-  public async onJobEnqueued(job: Job) {
-    const { uri, revision } = job.payload;
-    const progress: WorkerProgress = {
-      uri,
-      progress: WorkerReservedProgress.INIT,
-      timestamp: new Date(),
-      revision,
-    };
-    return await this.objectClient.setRepositoryIndexStatus(uri, progress);
-  }
-
-  public async onJobCompleted(job: Job, res: IndexWorkerResult) {
-    if (res.cancelled) {
-      // Skip updating job progress if the job is done because of cancellation.
-      return;
-    }
-
-    this.log.info(`Index worker finished with stats: ${JSON.stringify([...res.stats])}`);
-    await super.onJobCompleted(job, res);
-    const { uri, revision } = job.payload;
-    try {
-      // Double check if the current revision is different from the origin reivsion.
-      // If so, kick off another index job to catch up the data descrepency.
-      const gitStatus = await this.objectClient.getRepositoryGitStatus(uri);
-      if (gitStatus.revision !== revision) {
-        const payload = {
-          uri,
-          revision: gitStatus.revision,
-        };
-        await this.enqueueJob(payload, {});
-      }
-
-      return await this.objectClient.updateRepository(uri, { indexedRevision: revision });
-    } catch (error) {
-      this.log.error(`Update indexed revision in repository object error.`);
-      this.log.error(error);
-    }
-  }
-
-  public async updateProgress(job: Job, progress: number) {
-    const { uri } = job.payload;
-    let p: any = {
-      uri,
-      progress,
-      timestamp: new Date(),
-    };
-    if (
-      progress === WorkerReservedProgress.COMPLETED ||
-      progress === WorkerReservedProgress.ERROR ||
-      progress === WorkerReservedProgress.TIMEOUT
-    ) {
-      // Reset the checkpoints if necessary.
-      p = {
-        ...p,
-        indexProgress: {
-          checkpoint: null,
-        },
-        commitIndexProgress: {
-          checkpoint: null,
-        },
-      };
-    }
-    try {
-      return await this.objectClient.updateRepositoryIndexStatus(uri, p);
-    } catch (error) {
-      this.log.error(`Update index progress error.`);
-      this.log.error(error);
-    }
-  }
-
-  protected async getTimeoutMs(payload: any) {
-    try {
-      const totalCount = await this.gitOps.countRepoFiles(payload.uri, HEAD);
-      let timeout = moment.duration(1, 'hour').asMilliseconds();
-      if (totalCount > 0) {
-        // timeout = ln(file_count) in hour
-        // e.g. 10 files -> 2.3 hours, 100 files -> 4.6 hours, 1000 -> 6.9 hours, 10000 -> 9.2 hours
-        timeout = moment.duration(Math.log(totalCount), 'hour').asMilliseconds();
-      }
-      this.log.info(`Set index job timeout to be ${timeout} ms.`);
-      return timeout;
-    } catch (error) {
-      this.log.error(`Get repo file total count error.`);
-      this.log.error(error);
-      throw error;
-    }
-  }
-
-  private getProgressReporter(
-    repoUri: RepositoryUri,
-    revision: string,
-    type: IndexerType,
-    total: number // total number of indexers
-  ) {
-    return async (progress: IndexProgress) => {
-      const indexStatus: IndexWorkerProgress = await this.objectClient.getRepositoryIndexStatus(
-        repoUri
-      );
-      const p: IndexWorkerProgress = {
-        uri: repoUri,
-        progress: indexStatus.progress,
-        timestamp: new Date(),
-        revision,
-      };
-
-      switch (type) {
-        case IndexerType.COMMIT:
-          p.commitIndexProgress = progress;
-          p.progress =
-            progress.percentage +
-            (indexStatus.indexProgress ? indexStatus.indexProgress.percentage : 0);
-          break;
-        case IndexerType.LSP:
-          p.indexProgress = progress;
-          p.progress =
-            progress.percentage +
-            (indexStatus.commitIndexProgress ? indexStatus.commitIndexProgress.percentage : 0);
-          break;
-        default:
-          this.log.warn(`Unknown indexer type ${type} for indexing progress report.`);
-          break;
-      }
-      return await this.objectClient.updateRepositoryIndexStatus(repoUri, p);
-    };
-  }
-
-  // 1. Try to load checkpointed requests for all indexers to the `checkpointReqs` field
-  // of the return value.
-  // 2. Make a decision on if the index job should proceed indicate by the boolean `resume`
-  // field of the return value.
-  private async shouldJobResume(
-    payload: any
-  ): Promise<{
-    resume: boolean;
-    checkpointReqs: Map<IndexerType, IndexRequest | undefined>;
-  }> {
-    const { uri, revision } = payload;
-
-    const workerProgress = (await this.objectClient.getRepositoryIndexStatus(
-      uri
-    )) as IndexWorkerProgress;
-
-    let lspCheckpointReq: IndexRequest | undefined;
-    let commitCheckpointReq: IndexRequest | undefined;
-    const checkpointReqs: Map<IndexerType, IndexRequest | undefined> = new Map();
-    if (workerProgress) {
-      // There exist an ongoing index process
-      const {
-        uri: currentUri,
-        revision: currentRevision,
-        indexProgress: currentLspIndexProgress,
-        commitIndexProgress: currentCommitIndexProgress,
-        progress,
-      } = workerProgress;
-
-      lspCheckpointReq = currentLspIndexProgress && currentLspIndexProgress.checkpoint;
-      commitCheckpointReq = currentCommitIndexProgress && currentCommitIndexProgress.checkpoint;
-
-      if (
-        !lspCheckpointReq &&
-        !commitCheckpointReq &&
-        progress > WorkerReservedProgress.INIT &&
-        progress < WorkerReservedProgress.COMPLETED &&
-        currentUri === uri &&
-        currentRevision === revision
-      ) {
-        // Dedup this index job request if:
-        // 1. no checkpoint exist (undefined or empty string) for either LSP or commit indexer
-        // 2. index progress is ongoing
-        // 3. the uri and revision match the current job
-        return {
-          resume: false,
-          checkpointReqs,
-        };
-      }
-    }
-
-    // Add the checkpoints into the map as a result to return. They could be undefined.
-    checkpointReqs.set(IndexerType.LSP, lspCheckpointReq);
-    checkpointReqs.set(IndexerType.LSP_INC, lspCheckpointReq);
-    checkpointReqs.set(IndexerType.COMMIT, commitCheckpointReq);
-    checkpointReqs.set(IndexerType.COMMIT_INC, commitCheckpointReq);
-
-    return {
-      resume: true,
-      checkpointReqs,
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/queue/job.ts b/x-pack/legacy/plugins/code/server/queue/job.ts
deleted file mode 100644
index 7ca328c128e659..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/job.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { CancellationToken } from '../lib/esqueue';
-
-export interface Job {
-  payload: any;
-  options: any;
-  timestamp: number;
-  cancellationToken?: CancellationToken;
-}
diff --git a/x-pack/legacy/plugins/code/server/queue/update_worker.test.ts b/x-pack/legacy/plugins/code/server/queue/update_worker.test.ts
deleted file mode 100644
index 808aa922d0f271..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/update_worker.test.ts
+++ /dev/null
@@ -1,286 +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 sinon from 'sinon';
-
-import { EsClient, Esqueue } from '../lib/esqueue';
-import { Repository, UpdateWorkerResult } from '../../model';
-import { DiskWatermarkService } from '../disk_watermark';
-import { GitOperations } from '../git_operations';
-import { Logger } from '../log';
-import { RepositoryServiceFactory } from '../repository_service_factory';
-import { ServerOptions } from '../server_options';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { CancellationReason, CancellationSerivce } from './cancellation_service';
-import { UpdateWorker } from './update_worker';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esClient = {
-  update: emptyAsyncFunc,
-  get: emptyAsyncFunc,
-};
-const esQueue = {};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Execute update job', async () => {
-  // Setup RepositoryService
-  const updateSpy = sinon.spy();
-  const repoService = {
-    update: emptyAsyncFunc,
-  };
-  repoService.update = updateSpy;
-  const repoServiceFactory = {
-    newInstance: (): void => {
-      return;
-    },
-  };
-  const newInstanceSpy = sinon.fake.returns(repoService);
-  repoServiceFactory.newInstance = newInstanceSpy;
-
-  // Setup CancellationService
-  const cancelUpdateJobSpy = sinon.spy();
-  const registerCancelableUpdateJobSpy = sinon.spy();
-  const cancellationService: any = {
-    cancelUpdateJob: emptyAsyncFunc,
-    registerCancelableUpdateJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelUpdateJob = cancelUpdateJobSpy;
-  cancellationService.registerCancelableUpdateJob = registerCancelableUpdateJobSpy;
-
-  // Setup DiskWatermarkService
-  const isLowWatermarkSpy = sinon.stub().resolves(false);
-  const diskWatermarkService: any = {
-    isLowWatermark: isLowWatermarkSpy,
-  };
-
-  const updateWorker = new UpdateWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    {
-      disk: {
-        thresholdEnabled: true,
-        watermarkLow: '80%',
-      },
-    } as ServerOptions,
-    {} as GitOperations,
-    (repoServiceFactory as any) as RepositoryServiceFactory,
-    cancellationService as CancellationSerivce,
-    diskWatermarkService as DiskWatermarkService
-  );
-
-  await updateWorker.executeJob({
-    payload: {
-      uri: 'mockrepo',
-    },
-    options: {},
-    timestamp: 0,
-  });
-
-  expect(isLowWatermarkSpy.calledOnce).toBeTruthy();
-  expect(newInstanceSpy.calledOnce).toBeTruthy();
-  expect(updateSpy.calledOnce).toBeTruthy();
-});
-
-test('On update job completed because of cancellation ', async () => {
-  // Setup RepositoryService
-  const updateSpy = sinon.spy();
-
-  // Setup CancellationService
-  const cancelUpdateJobSpy = sinon.spy();
-  const registerCancelableUpdateJobSpy = sinon.spy();
-  const cancellationService: any = {
-    cancelUpdateJob: emptyAsyncFunc,
-    registerCancelableUpdateJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelUpdateJob = cancelUpdateJobSpy;
-  cancellationService.registerCancelableUpdateJob = registerCancelableUpdateJobSpy;
-
-  const updateWorker = new UpdateWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    {
-      disk: {
-        thresholdEnabled: true,
-        watermarkLow: '80%',
-      },
-    } as ServerOptions,
-    {} as GitOperations,
-    {} as RepositoryServiceFactory,
-    cancellationService as CancellationSerivce,
-    {} as DiskWatermarkService
-  );
-
-  await updateWorker.onJobCompleted(
-    {
-      payload: {
-        uri: 'mockrepo',
-      },
-      options: {},
-      timestamp: 0,
-    },
-    {
-      uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-      repo: ({
-        uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-      } as any) as Repository,
-      // Update job is done because of cancellation.
-      cancelled: true,
-      cancelledReason: CancellationReason.REPOSITORY_DELETE,
-    }
-  );
-
-  // The elasticsearch update won't be called for the sake of
-  // cancellation.
-  expect(updateSpy.notCalled).toBeTruthy();
-});
-
-test('Execute update job failed because of low available disk space', async () => {
-  // Setup RepositoryService
-  const updateSpy = sinon.spy();
-  const repoService = {
-    update: emptyAsyncFunc,
-  };
-  repoService.update = updateSpy;
-  const repoServiceFactory = {
-    newInstance: (): void => {
-      return;
-    },
-  };
-  const newInstanceSpy = sinon.fake.returns(repoService);
-  repoServiceFactory.newInstance = newInstanceSpy;
-
-  // Setup CancellationService
-  const cancelUpdateJobSpy = sinon.spy();
-  const registerCancelableUpdateJobSpy = sinon.spy();
-  const cancellationService: any = {
-    cancelUpdateJob: emptyAsyncFunc,
-    registerCancelableUpdateJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelUpdateJob = cancelUpdateJobSpy;
-  cancellationService.registerCancelableUpdateJob = registerCancelableUpdateJobSpy;
-
-  // Setup DiskWatermarkService
-  const isLowWatermarkSpy = sinon.stub().resolves(true);
-  const diskWatermarkService: any = {
-    isLowWatermark: isLowWatermarkSpy,
-    diskWatermarkViolationMessage: sinon.stub().returns('No enough disk space'),
-  };
-
-  const updateWorker = new UpdateWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    {
-      disk: {
-        thresholdEnabled: true,
-        watermarkLow: '80%',
-      },
-    } as ServerOptions,
-    {} as GitOperations,
-    {} as RepositoryServiceFactory,
-    cancellationService as CancellationSerivce,
-    diskWatermarkService as DiskWatermarkService
-  );
-
-  let res: UpdateWorkerResult = {
-    uri: 'mockrepo',
-    branch: 'mockbranch',
-    revision: 'mockrevision',
-  };
-  try {
-    res = (await updateWorker.executeJob({
-      payload: {
-        uri: 'mockrepo',
-      },
-      options: {},
-      timestamp: 0,
-    })) as UpdateWorkerResult;
-    // This step should not be touched.
-    expect(false).toBeTruthy();
-  } catch (error) {
-    // Exception should be thrown.
-    expect(isLowWatermarkSpy.calledOnce).toBeTruthy();
-    expect(newInstanceSpy.notCalled).toBeTruthy();
-    expect(updateSpy.notCalled).toBeTruthy();
-  }
-
-  expect(res.cancelled).toBeTruthy();
-  expect(res.cancelledReason).toEqual(CancellationReason.LOW_DISK_SPACE);
-
-  const onJobExecutionErrorSpy = sinon.spy();
-  updateWorker.onJobExecutionError = onJobExecutionErrorSpy;
-
-  await updateWorker.onJobCompleted(
-    {
-      payload: {
-        uri: 'mockrepo',
-      },
-      options: {},
-      timestamp: 0,
-    },
-    res
-  );
-
-  expect(onJobExecutionErrorSpy.calledOnce).toBeTruthy();
-  // Non of the follow up steps of a normal complete job should not be called
-  // because the job is going to be forwarded as execution error.
-  expect(updateSpy.notCalled).toBeTruthy();
-});
-
-test('On update job error or timeout will not persist as error', async () => {
-  // Setup EsClient
-  const esUpdateSpy = sinon.spy();
-  esClient.update = esUpdateSpy;
-
-  // Setup CancellationService
-  const cancelUpdateJobSpy = sinon.spy();
-  const registerCancelableUpdateJobSpy = sinon.spy();
-  const cancellationService: any = {
-    cancelUpdateJob: emptyAsyncFunc,
-    registerCancelableUpdateJob: emptyAsyncFunc,
-  };
-  cancellationService.cancelUpdateJob = cancelUpdateJobSpy;
-  cancellationService.registerCancelableUpdateJob = registerCancelableUpdateJobSpy;
-
-  const updateWorker = new UpdateWorker(
-    esQueue as Esqueue,
-    log,
-    esClient as EsClient,
-    {
-      disk: {
-        thresholdEnabled: true,
-        watermarkLow: '80%',
-      },
-    } as ServerOptions,
-    {} as GitOperations,
-    {} as RepositoryServiceFactory,
-    cancellationService as CancellationSerivce,
-    {} as DiskWatermarkService
-  );
-
-  await updateWorker.onJobExecutionError({
-    job: {
-      payload: {
-        uri: 'mockrepo',
-      },
-      options: {},
-      timestamp: 0,
-    },
-    error: 'mock error message',
-  });
-
-  // The elasticsearch update will be called and the progress should be 'Completed'
-  expect(esUpdateSpy.calledOnce).toBeTruthy();
-  const updateBody = JSON.parse(esUpdateSpy.getCall(0).args[0].body);
-  expect(updateBody.doc.repository_git_status.progress).toBe(100);
-});
diff --git a/x-pack/legacy/plugins/code/server/queue/update_worker.ts b/x-pack/legacy/plugins/code/server/queue/update_worker.ts
deleted file mode 100644
index dcfcba2d6f3b0e..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/update_worker.ts
+++ /dev/null
@@ -1,121 +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 { CloneWorkerResult, Repository, WorkerReservedProgress } from '../../model';
-import { EsClient, Esqueue } from '../lib/esqueue';
-import { DiskWatermarkService } from '../disk_watermark';
-import { GitOperations } from '../git_operations';
-import { Logger } from '../log';
-import { RepositoryServiceFactory } from '../repository_service_factory';
-import { ServerOptions } from '../server_options';
-import { AbstractGitWorker } from './abstract_git_worker';
-import { CancellationReason, CancellationSerivce } from './cancellation_service';
-import { Job } from './job';
-
-export class UpdateWorker extends AbstractGitWorker {
-  public id: string = 'update';
-
-  constructor(
-    protected readonly queue: Esqueue,
-    protected readonly log: Logger,
-    protected readonly client: EsClient,
-    protected readonly serverOptions: ServerOptions,
-    protected readonly gitOps: GitOperations,
-    protected readonly repoServiceFactory: RepositoryServiceFactory,
-    private readonly cancellationService: CancellationSerivce,
-    protected readonly watermarkService: DiskWatermarkService
-  ) {
-    super(queue, log, client, serverOptions, gitOps, watermarkService);
-  }
-
-  public async executeJob(job: Job) {
-    const superRes = await super.executeJob(job);
-    if (superRes.cancelled) {
-      return superRes;
-    }
-
-    const { payload, cancellationToken } = job;
-    const repo: Repository = payload;
-    this.log.info(`Execute update job for ${repo.uri}`);
-    const repoService = this.repoServiceFactory.newInstance(
-      this.serverOptions.repoPath,
-      this.serverOptions.credsPath,
-      this.log
-    );
-
-    // Try to cancel any existing update job for this repository.
-    await this.cancellationService.cancelUpdateJob(repo.uri, CancellationReason.NEW_JOB_OVERRIDEN);
-
-    let cancelled = false;
-    let cancelledReason;
-    if (cancellationToken) {
-      cancellationToken.on((reason: string) => {
-        cancelled = true;
-        cancelledReason = reason;
-      });
-    }
-
-    const updateJobPromise = repoService.update(repo, async () => {
-      if (cancelled) {
-        // return false to stop the update progress
-        return false;
-      }
-
-      // Keep an eye on the disk usage during update in case it goes above the
-      // disk watermark config.
-      if (await this.watermarkService.isLowWatermark()) {
-        // Cancel this update job
-        if (cancellationToken) {
-          cancellationToken.cancel(CancellationReason.LOW_DISK_SPACE);
-        }
-        // return false to stop the update progress
-        return false;
-      }
-
-      return true;
-    });
-
-    if (cancellationToken) {
-      await this.cancellationService.registerCancelableUpdateJob(
-        repo.uri,
-        cancellationToken,
-        updateJobPromise
-      );
-    }
-    const res = await updateJobPromise;
-    return {
-      ...res,
-      cancelled,
-      cancelledReason,
-    };
-  }
-
-  public async onJobCompleted(job: Job, res: CloneWorkerResult) {
-    if (res.cancelled) {
-      await this.onJobCancelled(job, res.cancelledReason);
-      // Skip updating job progress if the job is done because of cancellation.
-      return;
-    }
-
-    this.log.info(`Update job done for ${job.payload.uri}`);
-    return await super.onJobCompleted(job, res);
-  }
-
-  public async onJobExecutionError(res: any) {
-    return await this.overrideUpdateErrorProgress(res);
-  }
-
-  public async onJobTimeOut(res: any) {
-    return await this.overrideUpdateErrorProgress(res);
-  }
-
-  private async overrideUpdateErrorProgress(res: any) {
-    this.log.warn(`Update job error`);
-    this.log.warn(res.error);
-    // Do not persist update errors assuming the next update trial is scheduling soon.
-    return await this.updateProgress(res.job, WorkerReservedProgress.COMPLETED);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/queue/worker.ts b/x-pack/legacy/plugins/code/server/queue/worker.ts
deleted file mode 100644
index a3ecff215eecee..00000000000000
--- a/x-pack/legacy/plugins/code/server/queue/worker.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Job } from './job';
-
-export interface Worker {
-  createJob(payload: any, options: any): Promise<Job>;
-  executeJob(job: Job): void;
-  enqueueJob(payload: any, options: any): void;
-
-  onJobEnqueued(res: any): void;
-  onJobCompleted(job: Job, res: any): void;
-  onJobExecutionError(res: any): void;
-  onJobTimeOut(res: any): void;
-
-  updateProgress(job: Job, progress: number): void;
-}
diff --git a/x-pack/legacy/plugins/code/server/repository_config_controller.ts b/x-pack/legacy/plugins/code/server/repository_config_controller.ts
deleted file mode 100644
index b420a9445198ee..00000000000000
--- a/x-pack/legacy/plugins/code/server/repository_config_controller.ts
+++ /dev/null
@@ -1,47 +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 { parseLspUrl } from '../common/uri_util';
-import { RepositoryConfig } from '../model';
-import { EsClient } from '../server/lib/esqueue';
-import { RepositoryObjectClient } from './search';
-
-export class RepositoryConfigController {
-  private repositoryConfigCache: { [repoUri: string]: RepositoryConfig } = {};
-  private repoObjectClient: RepositoryObjectClient;
-
-  constructor(public readonly esClient: EsClient) {
-    this.repoObjectClient = new RepositoryObjectClient(esClient);
-  }
-
-  public async isLanguageDisabled(uri: string, lang: string): Promise<boolean> {
-    const { repoUri } = parseLspUrl(uri)!;
-    let repoConfig = this.repositoryConfigCache[repoUri];
-
-    if (!repoConfig) {
-      try {
-        repoConfig = await this.repoObjectClient.getRepositoryConfig(repoUri);
-      } catch (err) {
-        return false;
-      }
-    }
-
-    if (lang === 'go' && repoConfig.disableGo === true) {
-      return true;
-    }
-    if (lang === 'java' && repoConfig.disableJava === true) {
-      return true;
-    }
-    if (lang === 'typescript' && repoConfig.disableTypescript === true) {
-      return true;
-    }
-    return false;
-  }
-
-  public async resetConfigCache(repoUri: string) {
-    delete this.repositoryConfigCache[repoUri];
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/repository_service.ts b/x-pack/legacy/plugins/code/server/repository_service.ts
deleted file mode 100644
index d1bdbe98e87aa3..00000000000000
--- a/x-pack/legacy/plugins/code/server/repository_service.ts
+++ /dev/null
@@ -1,202 +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 { Progress } from '@elastic/simple-git/dist';
-import del from 'del';
-import fs from 'fs';
-import { promisify } from 'util';
-import moment from 'moment';
-import path from 'path';
-
-import { SimpleGit } from '@elastic/simple-git/dist/promise';
-import { RepositoryUtils } from '../common/repository_utils';
-import { CloneProgress, CloneWorkerResult, DeleteWorkerResult, Repository } from '../model';
-import { Logger } from './log';
-import { GitOperations } from './git_operations';
-
-// Return false to stop the clone progress. Return true to keep going;
-export type CloneProgressHandler = (
-  progress: number,
-  cloneProgress?: CloneProgress
-) => Promise<boolean>;
-export type UpdateProgressHandler = () => Promise<boolean>;
-
-const GIT_FETCH_PROGRESS_CANCEL = -1;
-// TODO: Cannot directly access Git.Error.CODE.EUSER (-7). Investigate why.
-const NODEGIT_CALLBACK_RETURN_VALUE_ERROR = -7;
-const GIT_INDEXER_PROGRESS_CALLBACK_RETURN_VALUE_ERROR_MSG = `indexer progress callback returned ${GIT_FETCH_PROGRESS_CANCEL}`;
-const SSH_AUTH_ERROR = new Error('Failed to authenticate SSH session');
-
-const mkdirAsync = promisify(fs.mkdir);
-
-function isCancelled(error: any) {
-  return (
-    error &&
-    (error.message.includes(GIT_INDEXER_PROGRESS_CALLBACK_RETURN_VALUE_ERROR_MSG) ||
-      error.errno === NODEGIT_CALLBACK_RETURN_VALUE_ERROR)
-  );
-}
-
-// This is the service for any kind of repository handling, e.g. clone, update, delete, etc.
-export class RepositoryService {
-  private readonly gitOps: GitOperations;
-  constructor(
-    private readonly repoVolPath: string,
-    private readonly credsPath: string,
-    private readonly log: Logger
-  ) {
-    this.gitOps = new GitOperations(repoVolPath);
-  }
-
-  public async clone(repo: Repository, handler?: CloneProgressHandler): Promise<CloneWorkerResult> {
-    if (!repo) {
-      throw new Error(`Invalid repository.`);
-    } else {
-      const localPath = RepositoryUtils.repositoryLocalPath(this.repoVolPath, repo.uri);
-      if (fs.existsSync(localPath)) {
-        this.log.info(`Repository exist in local path. Do update instead of clone.`);
-        try {
-          // Do update instead of clone if the local repo exists.
-          return await this.update(repo);
-        } catch (error) {
-          // If failed to update the current git repo living in the disk, clean up the local git repo and
-          // move on with the clone.
-          await this.remove(repo.uri);
-        }
-      } else {
-        await mkdirAsync(localPath, { recursive: true });
-      }
-      // Go head with the actual clone.
-      const git = await this.gitOps.openGit(repo.uri, false);
-      await git.init(true);
-      await git.addRemote('origin', repo.url);
-      if (repo.protocol === 'ssh') {
-        return this.tryWithKeys(git, () => this.doFetch(git, repo, handler));
-      } else {
-        return await this.doFetch(git, repo, handler);
-      }
-    }
-  }
-
-  public async remove(uri: string): Promise<DeleteWorkerResult> {
-    const localPath = RepositoryUtils.repositoryLocalPath(this.repoVolPath, uri);
-    try {
-      if (localPath.split(path.sep).includes('..')) {
-        throw new Error('Repository path should not contain "..".');
-      }
-      // For now, just `rm -rf`
-      await del([localPath], { force: true });
-      this.log.info(`Remove local repository ${uri} done.`);
-      return {
-        uri,
-        res: true,
-      };
-    } catch (error) {
-      this.log.error(`Remove local repository ${uri} error: ${error}.`);
-      throw error;
-    }
-  }
-  public async update(repo: Repository, handler?: UpdateProgressHandler) {
-    const git = await this.gitOps.openGit(repo.uri);
-    if (repo.protocol === 'ssh') {
-      return await this.tryWithKeys(git, () => this.doFetch(git, repo, handler));
-    } else {
-      return await this.doFetch(git, repo, handler);
-    }
-  }
-
-  /**
-   * read credentials dir, try using each privateKey until action is successful
-   * @param git
-   * @param action
-   */
-  private async tryWithKeys<R>(git: SimpleGit, action: () => Promise<R>): Promise<R> {
-    const files = fs.existsSync(this.credsPath)
-      ? new Set(fs.readdirSync(this.credsPath))
-      : new Set([]);
-    for (const f of files) {
-      if (f.endsWith('.pub')) {
-        const privateKey = f.slice(0, f.length - 4);
-        if (files.has(privateKey)) {
-          try {
-            this.log.debug(`try with key ${privateKey}`);
-            await git.addConfig(
-              'core.sshCommand',
-              `ssh -i ${path.join(this.credsPath, privateKey)}`
-            );
-            return await action();
-          } catch (e) {
-            if (e !== SSH_AUTH_ERROR) {
-              throw e;
-            }
-            // continue to try another key
-          }
-        }
-      }
-    }
-    throw SSH_AUTH_ERROR;
-  }
-
-  private PROGRESS_UPDATE_THROTTLING_FREQ_MS = 1000;
-  private async doFetch(git: SimpleGit, repo: Repository, handler?: CloneProgressHandler) {
-    try {
-      let lastProgressUpdate = moment();
-      const progressCallback = async (progress: Progress) => {
-        const now = moment();
-        if (now.diff(lastProgressUpdate) < this.PROGRESS_UPDATE_THROTTLING_FREQ_MS) {
-          return 0;
-        }
-        lastProgressUpdate = now;
-
-        if (handler) {
-          const resumeClone = await handler(progress.percentage);
-          if (!resumeClone) {
-            return GIT_FETCH_PROGRESS_CANCEL;
-          }
-        }
-      };
-      await git.fetch(['origin'], undefined, {
-        progressCallback,
-      });
-      const currentBranchName = (await git.raw(['symbolic-ref', 'HEAD', '--short'])).trim();
-      const headRevision = await git.revparse([`origin/${currentBranchName}`]);
-      // Update master to match origin/master
-      await git.raw(['update-ref', `refs/heads/${currentBranchName}`, headRevision]);
-
-      this.log.info(
-        `Clone repository from ${repo.url} done with head revision ${headRevision} and default branch ${currentBranchName}`
-      );
-      return {
-        uri: repo.uri,
-        repo: {
-          ...repo,
-          defaultBranch: currentBranchName,
-          revision: headRevision,
-        },
-      };
-    } catch (error) {
-      if (isCancelled(error)) {
-        // Clone job was cancelled intentionally. Do not throw this error.
-        this.log.info(`Clone repository job for ${repo.uri} was cancelled.`);
-        this.log.debug(
-          `Clone repository job cancellation error: ${JSON.stringify(error, null, 2)}`
-        );
-        return {
-          uri: repo.uri,
-          repo,
-          cancelled: true,
-        };
-      } else if (error.message && error.message.startsWith(SSH_AUTH_ERROR.message)) {
-        throw SSH_AUTH_ERROR;
-      } else {
-        const msg = `Clone repository from ${repo.url} error.`;
-        this.log.error(msg);
-        this.log.error(error);
-        throw new Error(error.message);
-      }
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/repository_service_factory.ts b/x-pack/legacy/plugins/code/server/repository_service_factory.ts
deleted file mode 100644
index a258f54c117c9b..00000000000000
--- a/x-pack/legacy/plugins/code/server/repository_service_factory.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Logger } from './log';
-import { RepositoryService } from './repository_service';
-
-export class RepositoryServiceFactory {
-  public newInstance(repoPath: string, credsPath: string, log: Logger): RepositoryService {
-    return new RepositoryService(repoPath, credsPath, log);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/routes/check.ts b/x-pack/legacy/plugins/code/server/routes/check.ts
deleted file mode 100644
index 7e585ffc34922f..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/check.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { schema } from '@kbn/config-schema';
-import fetch from 'node-fetch';
-
-import {
-  IRouter,
-  KibanaRequest,
-  KibanaResponseFactory,
-  RequestHandlerContext,
-} from 'src/core/server';
-import { Logger } from '../log';
-
-export async function checkCodeNode(url: string, log: Logger, rndStr: string) {
-  try {
-    const res = await fetch(`${url}/api/code/codeNode?rndStr=${rndStr}`, {});
-    if (res.ok) {
-      return await res.json();
-    }
-  } catch (e) {
-    // request failed
-    log.error(e);
-  }
-
-  log.info(`Access code node ${url} failed, try again later.`);
-  return null;
-}
-
-export function checkRoute(router: IRouter, rndStr: string) {
-  router.get(
-    {
-      path: '/api/code/codeNode',
-      validate: {
-        query: schema.object({}, { allowUnknowns: true }),
-      },
-      options: {
-        authRequired: false,
-      },
-    },
-    (context: RequestHandlerContext, req: KibanaRequest, res: KibanaResponseFactory) => {
-      return res.ok({
-        // @ts-ignore
-        body: { me: req.query.rndStr === rndStr },
-      });
-    }
-  );
-}
diff --git a/x-pack/legacy/plugins/code/server/routes/file.ts b/x-pack/legacy/plugins/code/server/routes/file.ts
deleted file mode 100644
index 47cc16f7a6574f..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/file.ts
+++ /dev/null
@@ -1,331 +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, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-import { DEFAULT_TREE_CHILDREN_LIMIT } from '../git_operations';
-import { CodeServerRouter } from '../security';
-import { RepositoryObjectClient } from '../search';
-import { EsClientWithRequest } from '../utils/esclient_with_request';
-import { decodeRevisionString } from '../../common/uri_util';
-import { CodeServices } from '../distributed/code_services';
-import { GitServiceDefinition } from '../distributed/apis';
-import { getReferenceHelper } from '../utils/repository_reference_helper';
-
-export function fileRoute(router: CodeServerRouter, codeServices: CodeServices) {
-  const gitService = codeServices.serviceFor(GitServiceDefinition);
-
-  async function getRepoUriFromMeta(
-    context: RequestHandlerContext,
-    req: KibanaRequest,
-    repoUri: string
-  ): Promise<string | undefined> {
-    const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-
-    try {
-      const repo = await repoObjectClient.getRepository(repoUri);
-      await getReferenceHelper(context.core.savedObjects.client).ensureReference(repo.uri);
-      return repo.uri;
-    } catch (e) {
-      return undefined;
-    }
-  }
-
-  router.route({
-    path: '/api/code/repo/{uri*3}/tree/{ref}/{path*}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri, path, ref } = req.params as any;
-      const revision = decodeRevisionString(ref);
-      const queries = req.query as any;
-      const limit = queries.limit
-        ? parseInt(queries.limit as string, 10)
-        : DEFAULT_TREE_CHILDREN_LIMIT;
-      const skip = queries.skip ? parseInt(queries.skip as string, 10) : 0;
-      const withParents = 'parents' in queries;
-      const flatten = 'flatten' in queries;
-      const repoUri = await getRepoUriFromMeta(context, req, uri);
-      if (!repoUri) {
-        return res.notFound({ body: `repo ${uri} not found` });
-      }
-      const endpoint = await codeServices.locate(req, uri);
-      try {
-        const filetree = await gitService.fileTree(endpoint, {
-          uri: repoUri,
-          path,
-          revision,
-          skip,
-          limit,
-          withParents,
-          flatten,
-        });
-        return res.ok({ body: filetree });
-      } catch (e) {
-        if (e.isBoom) {
-          return res.customError({
-            body: e.error,
-            statusCode: e.statusCode ? e.statusCode : 500,
-          });
-        } else {
-          return res.internalError({ body: e.message || e.name });
-        }
-      }
-    },
-  });
-
-  router.route({
-    path: '/api/code/repo/{uri*3}/blob/{ref}/{path*}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri, path, ref } = req.params as any;
-      const revision = decodeRevisionString(ref);
-      const repoUri = await getRepoUriFromMeta(context, req, uri);
-      if (!repoUri) {
-        return res.notFound({ body: `repo ${uri} not found` });
-      }
-      const endpoint = await codeServices.locate(req, uri);
-      try {
-        const blob = await gitService.blob(endpoint, {
-          uri,
-          path,
-          line: (req.query as any).line as string,
-          revision: decodeURIComponent(revision),
-        });
-
-        if (blob.imageType) {
-          return res.ok({
-            body: blob.content,
-            headers: { 'Content-Type': blob.imageType },
-          });
-        } else if (blob.isBinary) {
-          return res.noContent({
-            headers: { 'Content-Type': 'application/octet-stream' },
-          });
-        } else {
-          if (blob.content) {
-            return res.ok({
-              body: blob.content,
-              headers: {
-                'Content-Type': 'text/plain',
-                lang: blob.lang!,
-              },
-            });
-          } else {
-            return res.ok({
-              body: blob.content,
-              headers: { 'Content-Type': 'text/big' },
-            });
-          }
-        }
-      } catch (e) {
-        if (e.isBoom) {
-          return res.customError({
-            body: e.error,
-            statusCode: e.statusCode ? e.statusCode : 500,
-          });
-        } else {
-          return res.internalError({ body: e.message || e.name });
-        }
-      }
-    },
-  });
-
-  router.route({
-    path: '/app/code/repo/{uri*3}/raw/{ref}/{path*}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri, path, ref } = req.params as any;
-      const revision = decodeRevisionString(ref);
-      const repoUri = await getRepoUriFromMeta(context, req, uri);
-      if (!repoUri) {
-        return res.notFound({ body: `repo ${uri} not found` });
-      }
-      const endpoint = await codeServices.locate(req, uri);
-
-      try {
-        const blob = await gitService.raw(endpoint, { uri: repoUri, path, revision });
-        if (blob.isBinary) {
-          return res.ok({
-            body: blob.content,
-            headers: { 'Content-Transfer-Encoding': 'binary' },
-          });
-        } else {
-          return res.ok({
-            body: blob.content,
-            headers: { 'Content-Type': 'text/plain' },
-          });
-        }
-      } catch (e) {
-        if (e.isBoom) {
-          return res.customError({
-            body: e.error,
-            statusCode: e.statusCode ? e.statusCode : 500,
-          });
-        } else {
-          return res.internalError({ body: e.message || e.name });
-        }
-      }
-    },
-  });
-
-  router.route({
-    path: '/api/code/repo/{uri*3}/history/{ref}',
-    method: 'GET',
-    npHandler: historyHandler,
-  });
-
-  router.route({
-    path: '/api/code/repo/{uri*3}/history/{ref}/{path*}',
-    method: 'GET',
-    npHandler: historyHandler,
-  });
-
-  async function historyHandler(
-    context: RequestHandlerContext,
-    req: KibanaRequest,
-    res: KibanaResponseFactory
-  ) {
-    const { uri, ref, path } = req.params as any;
-    const revision = decodeRevisionString(ref);
-    const queries = req.query as any;
-    const count = queries.count ? parseInt(queries.count as string, 10) : 10;
-    const after = queries.after !== undefined;
-    try {
-      const repoUri = await getRepoUriFromMeta(context, req, uri);
-      if (!repoUri) {
-        return res.notFound({ body: `repo ${uri} not found` });
-      }
-      const endpoint = await codeServices.locate(req, uri);
-      const history = await gitService.history(endpoint, {
-        uri: repoUri,
-        path,
-        revision,
-        count,
-        after,
-      });
-      return res.ok({ body: history });
-    } catch (e) {
-      if (e.isBoom) {
-        return res.customError({
-          body: e.error,
-          statusCode: e.statusCode ? e.statusCode : 500,
-        });
-      } else {
-        return res.internalError({ body: e.message || e.name });
-      }
-    }
-  }
-
-  router.route({
-    path: '/api/code/repo/{uri*3}/references',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri } = req.params as any;
-      const repoUri = await getRepoUriFromMeta(context, req, uri);
-      if (!repoUri) {
-        return res.badRequest({ body: `repo ${uri} not found` });
-      }
-      const endpoint = await codeServices.locate(req, uri);
-
-      try {
-        const branchesAndTags = await gitService.branchesAndTags(endpoint, { uri: repoUri });
-        return res.ok({ body: branchesAndTags });
-      } catch (e) {
-        if (e.isBoom) {
-          return res.customError({
-            body: e.error,
-            statusCode: e.statusCode ? e.statusCode : 500,
-          });
-        } else {
-          return res.internalError({ body: e.message || e.name });
-        }
-      }
-    },
-  });
-
-  router.route({
-    path: '/api/code/repo/{uri*3}/diff/{revision}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri, revision } = req.params as any;
-      const repoUri = await getRepoUriFromMeta(context, req, uri);
-      if (!repoUri) {
-        return res.notFound({ body: `repo ${uri} not found` });
-      }
-      const endpoint = await codeServices.locate(req, uri);
-      try {
-        const diff = await gitService.commitDiff(endpoint, {
-          uri: repoUri,
-          revision: decodeRevisionString(revision),
-        });
-        return res.ok({ body: diff });
-      } catch (e) {
-        if (e.isBoom) {
-          return res.customError({
-            body: e.error,
-            statusCode: e.statusCode ? e.statusCode : 500,
-          });
-        } else {
-          return res.internalError({ body: e.message || e.name });
-        }
-      }
-    },
-  });
-
-  router.route({
-    path: '/api/code/repo/{uri*3}/blame/{revision}/{path*}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri, path, revision } = req.params as any;
-      const repoUri = await getRepoUriFromMeta(context, req, uri);
-      if (!repoUri) {
-        return res.notFound({ body: `repo ${uri} not found` });
-      }
-      const endpoint = await codeServices.locate(req, uri);
-
-      try {
-        const blames = await gitService.blame(endpoint, {
-          uri: repoUri,
-          revision: decodeRevisionString(decodeURIComponent(revision)),
-          path,
-        });
-        return res.ok({ body: blames });
-      } catch (e) {
-        if (e.isBoom) {
-          return res.customError({
-            body: e.error,
-            statusCode: e.statusCode ? e.statusCode : 500,
-          });
-        } else {
-          return res.internalError({ body: e.message || e.name });
-        }
-      }
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/code/server/routes/index.ts b/x-pack/legacy/plugins/code/server/routes/index.ts
deleted file mode 100644
index 82973ac1d27912..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './check';
-export * from './file';
-export * from './install';
-export * from './lsp';
-export * from './repository';
-export * from './search';
-export * from './setup';
-export * from './status';
-export * from './workspace';
diff --git a/x-pack/legacy/plugins/code/server/routes/install.ts b/x-pack/legacy/plugins/code/server/routes/install.ts
deleted file mode 100644
index 28ccc4012ceec3..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/install.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-import { ServerFacade } from '../..';
-import { enabledLanguageServers, LanguageServerDefinition } from '../lsp/language_servers';
-import { CodeServerRouter } from '../security';
-import { CodeServices } from '../distributed/code_services';
-import { LspServiceDefinition } from '../distributed/apis';
-import { Endpoint } from '../distributed/resource_locator';
-import { ServerOptions } from '../server_options';
-
-export function installRoute(
-  server: ServerFacade,
-  router: CodeServerRouter,
-  codeServices: CodeServices,
-  options: ServerOptions
-) {
-  const lspService = codeServices.serviceFor(LspServiceDefinition);
-  const kibanaVersion = server.config().get('pkg.version') as string;
-  const status = async (endpoint: Endpoint, def: LanguageServerDefinition) => ({
-    name: def.name,
-    status: await lspService.languageServerStatus(endpoint, { langName: def.name }),
-    version: def.version,
-    build: def.build,
-    languages: def.languages,
-    installationType: def.installationType,
-    downloadUrl:
-      typeof def.downloadUrl === 'function' ? def.downloadUrl(kibanaVersion) : def.downloadUrl,
-    pluginName: def.installationPluginName,
-  });
-
-  router.route({
-    path: '/api/code/install',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const endpoint = await codeServices.locate(req, '');
-      const installRes = await Promise.all(
-        enabledLanguageServers(options).map(def => status(endpoint, def))
-      );
-      return res.ok({ body: installRes });
-    },
-    method: 'GET',
-  });
-
-  router.route({
-    path: '/api/code/install/{name}',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { name } = req.params as any;
-      const def = enabledLanguageServers(options).find(d => d.name === name);
-      const endpoint = await codeServices.locate(req, '');
-      if (def) {
-        const installRes = await status(endpoint, def);
-        return res.ok({ body: installRes });
-      } else {
-        return res.notFound({ body: `language server ${name} not found.` });
-      }
-    },
-    method: 'GET',
-  });
-}
diff --git a/x-pack/legacy/plugins/code/server/routes/lsp.ts b/x-pack/legacy/plugins/code/server/routes/lsp.ts
deleted file mode 100644
index 6b8af10f9f11eb..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/lsp.ts
+++ /dev/null
@@ -1,239 +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 { ResponseError } from 'vscode-jsonrpc';
-import { ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-import { SymbolLocator } from '@elastic/lsp-extension';
-import { KibanaRequest, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-
-import {
-  LanguageServerStartFailed,
-  ServerNotInitialized,
-  UnknownFileLanguage,
-} from '../../common/lsp_error_codes';
-import { parseLspUrl } from '../../common/uri_util';
-import { Logger } from '../log';
-import { SymbolSearchClient } from '../search';
-import { CodeServerRouter } from '../security';
-import { ServerOptions } from '../server_options';
-
-import { EsClientWithRequest } from '../utils/esclient_with_request';
-import { promiseTimeout } from '../utils/timeout';
-import { CodeServices } from '../distributed/code_services';
-import { GitServiceDefinition, LspServiceDefinition } from '../distributed/apis';
-import { findTitleFromHover, groupFiles } from '../utils/lsp_utils';
-import { getReferenceHelper } from '../utils/repository_reference_helper';
-import { SymbolSearchResult } from '../../model';
-
-const LANG_SERVER_ERROR = 'language server error';
-
-export function lspRoute(
-  router: CodeServerRouter,
-  codeServices: CodeServices,
-  serverOptions: ServerOptions,
-  log: Logger
-) {
-  const lspService = codeServices.serviceFor(LspServiceDefinition);
-  const gitService = codeServices.serviceFor(GitServiceDefinition);
-
-  router.route({
-    path: '/api/code/lsp/textDocument/{method}',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      if (typeof req.body === 'object' && req.body != null) {
-        // @ts-ignore
-        const method = req.params.method;
-        if (method) {
-          try {
-            const params = (req.body as unknown) as any;
-            const uri = params.textDocument.uri;
-            const { repoUri } = parseLspUrl(uri)!;
-            await getReferenceHelper(context.core.savedObjects.client).ensureReference(repoUri);
-            const endpoint = await codeServices.locate(req, repoUri);
-            const requestPromise = lspService.sendRequest(endpoint, {
-              method: `textDocument/${method}`,
-              params: req.body,
-            });
-            const result = await promiseTimeout(serverOptions.lsp.requestTimeoutMs, requestPromise);
-            return res.ok({ body: result });
-          } catch (error) {
-            if (error instanceof ResponseError) {
-              // hide some errors;
-              if (
-                error.code === UnknownFileLanguage ||
-                error.code === ServerNotInitialized ||
-                error.code === LanguageServerStartFailed
-              ) {
-                log.debug(error);
-              }
-              return res.custom({
-                statusCode: 500,
-                body: { error: { code: 500, msg: LANG_SERVER_ERROR } },
-              });
-            } else if (error.isBoom) {
-              return res.customError({
-                body: error.error,
-                statusCode: error.statusCode ? error.statusCode : 500,
-              });
-            } else {
-              log.error(error);
-              return res.custom({
-                statusCode: 500,
-                body: { error: { code: 500, msg: LANG_SERVER_ERROR } },
-              });
-            }
-          }
-        } else {
-          return res.badRequest({ body: 'missing `method` in request' });
-        }
-      } else {
-        return res.badRequest({ body: 'json body required' });
-      }
-    },
-    method: 'POST',
-  });
-
-  router.route({
-    path: '/api/code/lsp/findDefinitions',
-    method: 'POST',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      // @ts-ignore
-      const { textDocument, position } = req.body as any;
-      // @ts-ignore
-      const { qname } = req.params as any;
-      const { uri } = textDocument;
-      const { repoUri } = parseLspUrl(uri);
-      await getReferenceHelper(context.core.savedObjects.client).ensureReference(repoUri);
-      const endpoint = await codeServices.locate(req, repoUri);
-      const response: ResponseMessage = await promiseTimeout(
-        serverOptions.lsp.requestTimeoutMs,
-        lspService.sendRequest(endpoint, {
-          method: `textDocument/edefinition`,
-          params: { textDocument: { uri }, position },
-        })
-      );
-      const hover = await lspService.sendRequest(endpoint, {
-        method: 'textDocument/hover',
-        params: {
-          textDocument: { uri },
-          position,
-        },
-      });
-      const title: string = await findTitleFromHover(hover, uri, position);
-      const symbolSearchClient = new SymbolSearchClient(new EsClientWithRequest(context, req), log);
-
-      const locators = response.result as SymbolLocator[];
-      const locations = [];
-      const repoScope = await getReferenceHelper(context.core.savedObjects.client).findReferences();
-      for (const locator of locators) {
-        if (locator.location) {
-          locations.push(locator.location);
-        } else if (locator.qname && repoScope.length > 0) {
-          const searchResults = await symbolSearchClient.findByQname(qname, repoScope);
-          for (const symbol of searchResults.symbols) {
-            locations.push(symbol.symbolInformation.location);
-          }
-        }
-      }
-      const files = await groupFiles(locations, async loc => {
-        const ep = await codeServices.locate(req, loc.uri);
-        return await gitService.blob(ep, loc);
-      });
-      return res.ok({ body: { title, files, uri, position } });
-    },
-  });
-
-  router.route({
-    path: '/api/code/lsp/findReferences',
-    method: 'POST',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      try {
-        const { textDocument, position } = req.body as any;
-        const { uri } = textDocument;
-        const { repoUri } = parseLspUrl(uri);
-        await getReferenceHelper(context.core.savedObjects.client).ensureReference(repoUri);
-        const endpoint = await codeServices.locate(req, repoUri);
-        const response: ResponseMessage = await promiseTimeout(
-          serverOptions.lsp.requestTimeoutMs,
-          lspService.sendRequest(endpoint, {
-            method: `textDocument/references`,
-            params: { textDocument: { uri }, position },
-          })
-        );
-        const hover = await lspService.sendRequest(endpoint, {
-          method: 'textDocument/hover',
-          params: {
-            textDocument: { uri },
-            position,
-          },
-        });
-        const title: string = await findTitleFromHover(hover, uri, position);
-        const files = await groupFiles(response.result, async loc => {
-          const ep = await codeServices.locate(req, loc.uri);
-          return await gitService.blob(ep, loc);
-        });
-        return res.ok({ body: { title, files, uri, position } });
-      } catch (error) {
-        log.error(error);
-        if (error instanceof ResponseError) {
-          return res.custom({
-            statusCode: 500,
-            body: { error: { code: error.code, msg: LANG_SERVER_ERROR } },
-          });
-        } else if (error.isBoom) {
-          return res.customError({
-            body: error.error,
-            statusCode: error.statusCode ? error.statusCode : 500,
-          });
-        } else {
-          return res.custom({
-            statusCode: 500,
-            body: { error: { code: 500, msg: LANG_SERVER_ERROR } },
-          });
-        }
-      }
-    },
-  });
-}
-
-export function symbolByQnameRoute(router: CodeServerRouter, log: Logger) {
-  router.route({
-    path: '/api/code/lsp/symbol/{qname}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      // @ts-ignore
-      const { qname } = req.params as any;
-      const symbolSearchClient = new SymbolSearchClient(new EsClientWithRequest(context, req), log);
-      const repoScope = await getReferenceHelper(context.core.savedObjects.client).findReferences();
-      if (repoScope.length === 0) {
-        return res.ok({
-          body: {
-            symbols: [],
-            total: 0,
-            took: 0,
-          } as SymbolSearchResult,
-        });
-      }
-      const symbol = await symbolSearchClient.findByQname(qname, repoScope);
-      return res.ok({ body: symbol });
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/code/server/routes/repository.ts b/x-pack/legacy/plugins/code/server/routes/repository.ts
deleted file mode 100644
index d9e8edb4d2f500..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/repository.ts
+++ /dev/null
@@ -1,368 +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 { KibanaRequest, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-
-import { validateGitUrl } from '../../common/git_url_utils';
-import { RepositoryUtils } from '../../common/repository_utils';
-import { RepositoryConfig, RepositoryUri, WorkerReservedProgress } from '../../model';
-import { RepositoryIndexInitializer, RepositoryIndexInitializerFactory } from '../indexer';
-import { Logger } from '../log';
-import { RepositoryConfigController } from '../repository_config_controller';
-import { RepositoryObjectClient } from '../search';
-import { ServerOptions } from '../server_options';
-import { EsClientWithRequest } from '../utils/esclient_with_request';
-import { CodeServerRouter } from '../security';
-import { CodeServices } from '../distributed/code_services';
-import { RepositoryServiceDefinition } from '../distributed/apis';
-import { getReferenceHelper } from '../utils/repository_reference_helper';
-
-export function repositoryRoute(
-  router: CodeServerRouter,
-  codeServices: CodeServices,
-  repoIndexInitializerFactory: RepositoryIndexInitializerFactory,
-  repoConfigController: RepositoryConfigController,
-  options: ServerOptions,
-  log: Logger
-) {
-  const repositoryService = codeServices.serviceFor(RepositoryServiceDefinition);
-  // Clone a git repository
-  router.route({
-    path: '/api/code/repo',
-    requireAdmin: true,
-    method: 'POST',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const repoUrl: string = (req.body as any).url;
-
-      // Reject the request if the url is an invalid git url.
-      try {
-        validateGitUrl(
-          repoUrl,
-          options.security.gitHostWhitelist,
-          options.security.gitProtocolWhitelist
-        );
-      } catch (error) {
-        log.error(`Validate git url ${repoUrl} error.`);
-        log.error(error);
-        return res.badRequest({ body: error });
-      }
-
-      const repo = RepositoryUtils.buildRepository(repoUrl);
-      const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-
-      try {
-        // Check if the repository already exists
-        await repoObjectClient.getRepository(repo.uri);
-        // distinguish between that the repository exists in the current space and that the repository exists in
-        // another space, and return the default message if error happens during reference checking.
-        try {
-          const hasRef = await getReferenceHelper(context.core.savedObjects.client).hasReference(
-            repo.uri
-          );
-          if (!hasRef) {
-            return res.custom({
-              statusCode: 409, // conflict
-              body: i18n.translate(
-                'xpack.code.repositoryManagement.repoOtherSpaceImportedMessage',
-                {
-                  defaultMessage: 'The repository has already been imported in another space!',
-                }
-              ),
-            });
-          }
-        } catch (e) {
-          log.error(`Failed to check reference for ${repo.uri} in current space`);
-        }
-        const msg = `Repository ${repoUrl} already exists. Skip clone.`;
-        log.info(msg);
-        return res.custom({ statusCode: 304, body: msg });
-      } catch (error) {
-        log.info(`Repository ${repoUrl} does not exist. Go ahead with clone.`);
-        try {
-          // create the reference first, and make the creation idempotent, to avoid potential dangling repositories
-          // which have no references from any space, in case the writes to ES may fail independently
-          await getReferenceHelper(context.core.savedObjects.client).createReference(repo.uri);
-
-          // Create the index for the repository
-          const initializer = (await repoIndexInitializerFactory.create(
-            repo.uri,
-            ''
-          )) as RepositoryIndexInitializer;
-          await initializer.init();
-
-          // Persist to elasticsearch
-          await repoObjectClient.setRepository(repo.uri, repo);
-
-          // Kick off clone job
-          const payload = {
-            url: repoUrl,
-          };
-          // before the repository is cloned, it doesn't exist in the cluster
-          // in this case, it should be allocated right away, otherwise it cannot be found in the cluster
-          const endpoint = await codeServices.allocate(req, repoUrl);
-          // the endpoint could be undefined, as we may not clone it here for the cluster mode implementation
-          if (endpoint) {
-            await repositoryService.clone(endpoint, payload);
-          }
-          return res.ok({ body: repo });
-        } catch (error2) {
-          const msg = `Issue repository clone request for ${repoUrl} error`;
-          log.error(msg);
-          log.error(error2);
-          return res.badRequest({ body: msg });
-        }
-      }
-    },
-  });
-
-  // Remove a git repository
-  router.route({
-    path: '/api/code/repo/{uri*3}',
-    requireAdmin: true,
-    method: 'DELETE',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri: repoUri } = req.params as any;
-      const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-      try {
-        // make sure the repo belongs to the current space
-        getReferenceHelper(context.core.savedObjects.client).ensureReference(repoUri);
-
-        // Check if the repository already exists. If not, an error will be thrown.
-        await repoObjectClient.getRepository(repoUri);
-
-        // Check if the repository delete status already exists. If so, we should ignore this
-        // request.
-        try {
-          const status = await repoObjectClient.getRepositoryDeleteStatus(repoUri);
-          // if the delete status is an ERROR, we can give it another try
-          if (status.progress !== WorkerReservedProgress.ERROR) {
-            const msg = `Repository ${repoUri} is already in delete.`;
-            log.info(msg);
-            return res.custom({ statusCode: 304, body: msg });
-          }
-        } catch (error) {
-          // Do nothing here since this error is expected.
-          log.info(`Repository ${repoUri} delete status does not exist. Go ahead with delete.`);
-        }
-
-        const payload = {
-          uri: repoUri,
-        };
-        const endpoint = await codeServices.locate(req, repoUri);
-        await repositoryService.delete(endpoint, payload);
-        // delete the reference last to avoid dangling repositories
-        await getReferenceHelper(context.core.savedObjects.client).deleteReference(repoUri);
-        return res.ok();
-      } catch (error) {
-        const msg = `Issue repository delete request for ${repoUri} error`;
-        log.error(msg);
-        log.error(error);
-        return res.notFound({ body: msg });
-      }
-    },
-  });
-
-  // Get a git repository
-  router.route({
-    path: '/api/code/repo/{uri*3}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri: repoUri } = req.params as any;
-      try {
-        await getReferenceHelper(context.core.savedObjects.client).ensureReference(repoUri);
-        const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-        const repo = await repoObjectClient.getRepository(repoUri);
-        return res.ok({ body: repo });
-      } catch (error) {
-        const msg = `Get repository ${repoUri} error`;
-        log.error(msg);
-        log.error(error);
-        return res.notFound({ body: msg });
-      }
-    },
-  });
-
-  router.route({
-    path: '/api/code/repo/status/{uri*3}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri: repoUri } = req.params as any;
-      try {
-        const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-        let gitStatus = null;
-        let indexStatus = null;
-        let deleteStatus = null;
-        const hasRef = await getReferenceHelper(context.core.savedObjects.client).hasReference(
-          repoUri
-        );
-
-        if (hasRef) {
-          try {
-            gitStatus = await repoObjectClient.getRepositoryGitStatus(repoUri);
-          } catch (error) {
-            log.debug(`Get repository git status ${repoUri} error: ${error}`);
-          }
-
-          try {
-            indexStatus = await repoObjectClient.getRepositoryIndexStatus(repoUri);
-          } catch (error) {
-            log.debug(`Get repository index status ${repoUri} error: ${error}`);
-          }
-
-          try {
-            deleteStatus = await repoObjectClient.getRepositoryDeleteStatus(repoUri);
-          } catch (error) {
-            log.debug(`Get repository delete status ${repoUri} error: ${error}`);
-          }
-        }
-        const status = {
-          gitStatus,
-          indexStatus,
-          deleteStatus,
-        };
-        return res.ok({ body: status });
-      } catch (error) {
-        const msg = `Get repository status ${repoUri} error`;
-        log.error(msg);
-        log.error(error);
-        return res.notFound({ body: msg });
-      }
-    },
-  });
-
-  // Get all git repositories
-  router.route({
-    path: '/api/code/repos',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      try {
-        const uris = await getReferenceHelper(context.core.savedObjects.client).findReferences();
-        const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-        const repo = await repoObjectClient.getRepositories(uris);
-        return res.ok({ body: repo });
-      } catch (error) {
-        const msg = `Get all repositories error`;
-        log.error(msg);
-        log.error(error);
-        return res.notFound({ body: msg });
-      }
-    },
-  });
-
-  // Issue a repository index task.
-  // TODO(mengwei): This is just temporary API stub to trigger the index job. Eventually in the near
-  // future, this route will be removed. The scheduling strategy is still in discussion.
-  router.route({
-    path: '/api/code/repo/index/{uri*3}',
-    method: 'POST',
-    requireAdmin: true,
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri: repoUri } = req.params as any;
-      const reindex: boolean = (req.body as any).reindex;
-      try {
-        await getReferenceHelper(context.core.savedObjects.client).ensureReference(repoUri);
-        const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-        const cloneStatus = await repoObjectClient.getRepositoryGitStatus(repoUri);
-
-        const payload = {
-          uri: repoUri,
-          revision: cloneStatus.revision,
-          enforceReindex: reindex,
-        };
-        const endpoint = await codeServices.locate(req, repoUri);
-        await repositoryService.index(endpoint, payload);
-        return res.ok();
-      } catch (error) {
-        const msg = `Index repository ${repoUri} error`;
-        log.error(msg);
-        log.error(error);
-        return res.notFound({ body: msg });
-      }
-    },
-  });
-
-  // Update a repo config
-  router.route({
-    path: '/api/code/repo/config/{uri*3}',
-    method: 'PUT',
-    requireAdmin: true,
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const config: RepositoryConfig = req.body as RepositoryConfig;
-      const repoUri: RepositoryUri = config.uri;
-      const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-
-      try {
-        // Check if the repository exists
-        await getReferenceHelper(context.core.savedObjects.client).ensureReference(repoUri);
-        await repoObjectClient.getRepository(repoUri);
-      } catch (error) {
-        return res.badRequest({ body: `Repository not existed for ${repoUri}` });
-      }
-
-      try {
-        // Persist to elasticsearch
-        await repoObjectClient.setRepositoryConfig(repoUri, config);
-        repoConfigController.resetConfigCache(repoUri);
-        return res.ok();
-      } catch (error) {
-        const msg = `Update repository config for ${repoUri} error`;
-        log.error(msg);
-        log.error(error);
-        return res.notFound({ body: msg });
-      }
-    },
-  });
-
-  // Get repository config
-  router.route({
-    path: '/api/code/repo/config/{uri*3}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri: repoUri } = req.params as any;
-      try {
-        await getReferenceHelper(context.core.savedObjects.client).ensureReference(repoUri);
-        const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-        const config = await repoObjectClient.getRepositoryConfig(repoUri);
-        return res.ok({ body: config });
-      } catch (error) {
-        return res.notFound({ body: `Repository config ${repoUri} not exist` });
-      }
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/code/server/routes/search.ts b/x-pack/legacy/plugins/code/server/routes/search.ts
deleted file mode 100644
index 5c2b731b33c42d..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/search.ts
+++ /dev/null
@@ -1,294 +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, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-import {
-  CommitSearchRequest,
-  DocumentSearchRequest,
-  RepositorySearchRequest,
-  ResolveSnippetsRequest,
-  StackTraceItem,
-  StackTraceSnippetsRequest,
-  SymbolSearchRequest,
-} from '../../model';
-import { Logger } from '../log';
-import {
-  CommitSearchClient,
-  DocumentSearchClient,
-  IntegrationsSearchClient,
-  RepositorySearchClient,
-  SymbolSearchClient,
-} from '../search';
-import { EsClientWithRequest } from '../utils/esclient_with_request';
-import { CodeServerRouter } from '../security';
-import { getReferenceHelper } from '../utils/repository_reference_helper';
-
-export function repositorySearchRoute(router: CodeServerRouter, log: Logger) {
-  router.route({
-    path: '/api/code/search/repo',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      let page = 1;
-      const { p, q, repoScope } = req.query as any;
-      if (p) {
-        page = parseInt(p as string, 10);
-      }
-
-      const searchReq: RepositorySearchRequest = {
-        query: q as string,
-        page,
-        repoScope: await getScope(context, repoScope),
-      };
-      try {
-        const repoSearchClient = new RepositorySearchClient(
-          new EsClientWithRequest(context, req),
-          log
-        );
-        const searchRes = await repoSearchClient.search(searchReq);
-        return res.ok({ body: searchRes });
-      } catch (error) {
-        return res.internalError({ body: 'Search Exception' });
-      }
-    },
-  });
-
-  router.route({
-    path: '/api/code/suggestions/repo',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      let page = 1;
-      const { p, q, repoScope } = req.query as any;
-      if (p) {
-        page = parseInt(p as string, 10);
-      }
-
-      const searchReq: RepositorySearchRequest = {
-        query: q as string,
-        page,
-        repoScope: await getScope(context, repoScope),
-      };
-      try {
-        const repoSearchClient = new RepositorySearchClient(
-          new EsClientWithRequest(context, req),
-          log
-        );
-        const searchRes = await repoSearchClient.suggest(searchReq);
-        return res.ok({ body: searchRes });
-      } catch (error) {
-        return res.internalError({ body: 'Search Exception' });
-      }
-    },
-  });
-}
-
-export function documentSearchRoute(router: CodeServerRouter, log: Logger) {
-  router.route({
-    path: '/api/code/search/doc',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      let page = 1;
-      const { p, q, langs, repos, repoScope } = req.query as any;
-      if (p) {
-        page = parseInt(p as string, 10);
-      }
-
-      const searchReq: DocumentSearchRequest = {
-        query: q as string,
-        page,
-        langFilters: langs ? (langs as string).split(',') : [],
-        repoFilters: repos ? decodeURIComponent(repos as string).split(',') : [],
-        repoScope: await getScope(context, repoScope),
-      };
-      try {
-        const docSearchClient = new DocumentSearchClient(
-          new EsClientWithRequest(context, req),
-          log
-        );
-        const searchRes = await docSearchClient.search(searchReq);
-        return res.ok({ body: searchRes });
-      } catch (error) {
-        return res.internalError({ body: 'Search Exception' });
-      }
-    },
-  });
-
-  router.route({
-    path: '/api/code/suggestions/doc',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      let page = 1;
-      const { p, q, repoScope } = req.query as any;
-      if (p) {
-        page = parseInt(p as string, 10);
-      }
-
-      const searchReq: DocumentSearchRequest = {
-        query: q as string,
-        page,
-        repoScope: await getScope(context, repoScope),
-      };
-      try {
-        const docSearchClient = new DocumentSearchClient(
-          new EsClientWithRequest(context, req),
-          log
-        );
-        const searchRes = await docSearchClient.suggest(searchReq);
-        return res.ok({ body: searchRes });
-      } catch (error) {
-        return res.internalError({ body: 'Search Exception' });
-      }
-    },
-  });
-
-  // Resolve source code snippets base on APM's stacktrace item data including:
-  // * repoUri: ID of the repository
-  // * revision: Optional. Revision of the file.
-  // * filePath: the path of the file.
-  // * lineNumStart: the start line number of the snippet.
-  // * lineNumEnd: Optional. The end line number of the snippet.
-  // We can always add more context for snippet resolution in the future.
-  router.route({
-    path: '/api/code/integration/snippets',
-    method: 'POST',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const scopes = new Set(
-        await getReferenceHelper(context.core.savedObjects.client).findReferences()
-      );
-      const reqs: StackTraceSnippetsRequest[] = (req.body as any).requests;
-      const searchRes = await Promise.all(
-        reqs.map((stacktraceReq: StackTraceSnippetsRequest) => {
-          const integClient = new IntegrationsSearchClient(
-            new EsClientWithRequest(context, req),
-            log
-          );
-          return Promise.all(
-            stacktraceReq.stacktraceItems.map((stacktrace: StackTraceItem) => {
-              const repoUris = stacktraceReq.repoUris.filter(uri => scopes.has(uri));
-              const integrationReq: ResolveSnippetsRequest = {
-                repoUris,
-                revision: stacktraceReq.revision,
-                filePath: stacktrace.filePath,
-                lineNumStart: stacktrace.lineNumStart,
-                lineNumEnd: stacktrace.lineNumEnd,
-              };
-              return integClient.resolveSnippets(integrationReq);
-            })
-          );
-        })
-      );
-      return res.ok({ body: searchRes });
-    },
-  });
-}
-
-export function symbolSearchRoute(router: CodeServerRouter, log: Logger) {
-  const symbolSearchHandler = async (
-    context: RequestHandlerContext,
-    req: KibanaRequest,
-    res: KibanaResponseFactory
-  ) => {
-    let page = 1;
-    const { p, q, repoScope } = req.query as any;
-    if (p) {
-      page = parseInt(p as string, 10);
-    }
-
-    const searchReq: SymbolSearchRequest = {
-      query: q as string,
-      page,
-      repoScope: await getScope(context, repoScope),
-    };
-    try {
-      const symbolSearchClient = new SymbolSearchClient(new EsClientWithRequest(context, req), log);
-      const searchRes = await symbolSearchClient.suggest(searchReq);
-      return res.ok({ body: searchRes });
-    } catch (error) {
-      return res.internalError({ body: 'Search Exception' });
-    }
-  };
-
-  // Currently these 2 are the same.
-  router.route({
-    path: '/api/code/suggestions/symbol',
-    method: 'GET',
-    npHandler: symbolSearchHandler,
-  });
-  router.route({
-    path: '/api/code/search/symbol',
-    method: 'GET',
-    npHandler: symbolSearchHandler,
-  });
-}
-
-export function commitSearchRoute(router: CodeServerRouter, log: Logger) {
-  router.route({
-    path: '/api/code/search/commit',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      let page = 1;
-      const { p, q, repos, repoScope } = req.query as any;
-      if (p) {
-        page = parseInt(p as string, 10);
-      }
-
-      const searchReq: CommitSearchRequest = {
-        query: q as string,
-        page,
-        repoFilters: repos ? decodeURIComponent(repos as string).split(',') : [],
-        repoScope: await getScope(context, repoScope),
-      };
-      try {
-        const commitSearchClient = new CommitSearchClient(
-          new EsClientWithRequest(context, req),
-          log
-        );
-        const searchRes = await commitSearchClient.search(searchReq);
-        return res.ok({ body: searchRes });
-      } catch (error) {
-        return res.internalError({ body: 'Search Exception' });
-      }
-    },
-  });
-}
-
-async function getScope(
-  context: RequestHandlerContext,
-  repoScope: string | string[]
-): Promise<string[]> {
-  let scope: string[] = await getReferenceHelper(context.core.savedObjects.client).findReferences();
-  if (typeof repoScope === 'string') {
-    const uriSet = new Set(repoScope.split(','));
-    scope = scope.filter(uri => uriSet.has(uri));
-  } else if (Array.isArray(repoScope)) {
-    const uriSet = new Set(repoScope);
-    scope = scope.filter(uri => uriSet.has(uri));
-  }
-  return scope;
-}
diff --git a/x-pack/legacy/plugins/code/server/routes/setup.ts b/x-pack/legacy/plugins/code/server/routes/setup.ts
deleted file mode 100644
index 6f89ebf35441f6..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/setup.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 { KibanaRequest, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-
-import { CodeServerRouter } from '../security';
-import { CodeServices } from '../distributed/code_services';
-import { SetupDefinition } from '../distributed/apis';
-
-export function setupRoute(router: CodeServerRouter, codeServices: CodeServices) {
-  const setupService = codeServices.serviceFor(SetupDefinition);
-  router.route({
-    method: 'get',
-    path: '/api/code/setup',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const endpoint = await codeServices.locate(req, '');
-      const setup = await setupService.setup(endpoint, {});
-      return res.ok({ body: setup });
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/code/server/routes/status.ts b/x-pack/legacy/plugins/code/server/routes/status.ts
deleted file mode 100644
index e2723342b49d21..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/status.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-
-import { CodeServerRouter } from '../security';
-import { LangServerType, RepoFileStatus, StatusReport } from '../../common/repo_file_status';
-import { CTAGS, LanguageServerDefinition } from '../lsp/language_servers';
-import { LanguageServerStatus } from '../../common/language_server';
-import { WorkspaceStatus } from '../lsp/request_expander';
-import { RepositoryObjectClient } from '../search';
-import { EsClientWithRequest } from '../utils/esclient_with_request';
-import { CodeServices } from '../distributed/code_services';
-import { GitServiceDefinition, LspServiceDefinition } from '../distributed/apis';
-import { Endpoint } from '../distributed/resource_locator';
-import { getReferenceHelper } from '../utils/repository_reference_helper';
-
-export function statusRoute(router: CodeServerRouter, codeServices: CodeServices) {
-  const gitService = codeServices.serviceFor(GitServiceDefinition);
-  const lspService = codeServices.serviceFor(LspServiceDefinition);
-  async function handleRepoStatus(
-    endpoint: Endpoint,
-    report: StatusReport,
-    repoUri: string,
-    revision: string,
-    repoObjectClient: RepositoryObjectClient
-  ) {
-    const commit = await gitService.commit(endpoint, {
-      uri: repoUri,
-      revision: decodeURIComponent(revision),
-    });
-    const head = await gitService.headRevision(endpoint, { uri: repoUri });
-    if (head === commit.id) {
-      try {
-        const indexStatus = await repoObjectClient.getRepositoryIndexStatus(repoUri);
-        if (indexStatus.progress < 100) {
-          report.repoStatus = RepoFileStatus.INDEXING;
-        }
-      } catch (e) {
-        // index may not stated yet
-        report.repoStatus = RepoFileStatus.INDEXING;
-      }
-    } else {
-      report.repoStatus = RepoFileStatus.REVISION_NOT_INDEXED;
-    }
-  }
-
-  async function handleFileStatus(
-    endpoint: Endpoint,
-    report: StatusReport,
-    blob: { isBinary: boolean; imageType?: string; content?: string; lang?: string }
-  ) {
-    if (blob.content) {
-      const lang: string = blob.lang!;
-      const defs = await lspService.languageSeverDef(endpoint, { lang });
-      if (defs.length === 0) {
-        report.fileStatus = RepoFileStatus.FILE_NOT_SUPPORTED;
-      } else {
-        return defs;
-      }
-    } else {
-      report.fileStatus = RepoFileStatus.FILE_IS_TOO_BIG;
-    }
-    return [];
-  }
-
-  async function handleLspStatus(
-    endpoint: Endpoint,
-    report: StatusReport,
-    defs: LanguageServerDefinition[],
-    repoUri: string,
-    revision: string
-  ) {
-    const dedicated = defs.find(d => d !== CTAGS);
-    const generic = defs.find(d => d === CTAGS);
-    report.langServerType = dedicated ? LangServerType.DEDICATED : LangServerType.GENERIC;
-    if (
-      dedicated &&
-      (await lspService.languageServerStatus(endpoint, { langName: dedicated.name })) ===
-        LanguageServerStatus.NOT_INSTALLED
-    ) {
-      report.langServerStatus = RepoFileStatus.LANG_SERVER_NOT_INSTALLED;
-      if (generic) {
-        // dedicated lang server not installed, fallback to generic
-        report.langServerType = LangServerType.GENERIC;
-      }
-    } else {
-      const def = dedicated || generic;
-      if (
-        (await lspService.languageServerStatus(endpoint, { langName: def!.name })) ===
-        LanguageServerStatus.LAUNCH_FAILED
-      ) {
-        report.langServerStatus = RepoFileStatus.LANG_SERVER_LAUNCH_FAILED;
-        return;
-      }
-      const state = await lspService.initializeState(endpoint, { repoUri, revision });
-      const initState = state[def!.name];
-      report.langServerStatus =
-        initState === WorkspaceStatus.Initialized
-          ? RepoFileStatus.LANG_SERVER_INITIALIZED
-          : RepoFileStatus.LANG_SERVER_IS_INITIALIZING;
-    }
-  }
-  router.route({
-    path: '/api/code/repo/{uri*3}/status/{ref}/{path*}',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri, path, ref } = req.params as any;
-      const report: StatusReport = {};
-      const repoObjectClient = new RepositoryObjectClient(new EsClientWithRequest(context, req));
-      const endpoint = await codeServices.locate(req, uri);
-
-      try {
-        // Check if the repository already exists
-        const repo = await repoObjectClient.getRepository(uri);
-        await getReferenceHelper(context.core.savedObjects.client).ensureReference(repo.uri);
-      } catch (e) {
-        return res.notFound({ body: `repo ${uri} not found` });
-      }
-      await handleRepoStatus(endpoint, report, uri, ref, repoObjectClient);
-      if (path) {
-        try {
-          try {
-            const blob = await gitService.blob(endpoint, {
-              uri,
-              path,
-              revision: decodeURIComponent(ref),
-            });
-            // text file
-            if (!blob.isBinary) {
-              const defs = await handleFileStatus(endpoint, report, blob);
-              if (defs.length > 0) {
-                await handleLspStatus(endpoint, report, defs, uri, ref);
-              }
-            }
-          } catch (e) {
-            // not a file? The path may be a dir.
-          }
-        } catch (e) {
-          return res.internalError({ body: e.message || e.name });
-        }
-      }
-      return res.ok({ body: report });
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/code/server/routes/workspace.ts b/x-pack/legacy/plugins/code/server/routes/workspace.ts
deleted file mode 100644
index 4dfafda7369c19..00000000000000
--- a/x-pack/legacy/plugins/code/server/routes/workspace.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { KibanaRequest, KibanaResponseFactory, RequestHandlerContext } from 'src/core/server';
-
-import { RequestQueryFacade } from '../../';
-import { ServerOptions } from '../server_options';
-import { CodeServerRouter } from '../security';
-import { CodeServices } from '../distributed/code_services';
-import { WorkspaceDefinition } from '../distributed/apis';
-import { getReferenceHelper } from '../utils/repository_reference_helper';
-
-export function workspaceRoute(
-  router: CodeServerRouter,
-  serverOptions: ServerOptions,
-  codeServices: CodeServices
-) {
-  const workspaceService = codeServices.serviceFor(WorkspaceDefinition);
-
-  router.route({
-    path: '/api/code/workspace',
-    method: 'GET',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      return res.ok({ body: serverOptions.repoConfigs });
-    },
-  });
-
-  router.route({
-    path: '/api/code/workspace/{uri*3}/{revision}',
-    requireAdmin: true,
-    method: 'POST',
-    async npHandler(
-      context: RequestHandlerContext,
-      req: KibanaRequest,
-      res: KibanaResponseFactory
-    ) {
-      const { uri: repoUri, revision } = req.params as any;
-      getReferenceHelper(context.core.savedObjects.client).ensureReference(repoUri);
-      const repoConfig = serverOptions.repoConfigs[repoUri];
-      const force = !!(req.query as RequestQueryFacade).force;
-      if (repoConfig) {
-        const endpoint = await codeServices.locate(req, repoUri);
-        try {
-          await workspaceService.initCmd(endpoint, { repoUri, revision, force, repoConfig });
-          return res.ok();
-        } catch (e) {
-          if (e.isBoom) {
-            return res.customError({
-              body: e.error,
-              statusCode: e.statusCode ? e.statusCode : 500,
-            });
-          } else {
-            return res.customError({
-              body: e.error,
-              statusCode: 500,
-            });
-          }
-        }
-      } else {
-        return res.notFound({ body: `repo config for ${repoUri} not found.` });
-      }
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/code/server/scheduler/abstract_scheduler.ts b/x-pack/legacy/plugins/code/server/scheduler/abstract_scheduler.ts
deleted file mode 100644
index df4ed4eddbfac0..00000000000000
--- a/x-pack/legacy/plugins/code/server/scheduler/abstract_scheduler.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Repository } from '../../model';
-import { EsClient } from '../lib/esqueue';
-import { Poller } from '../poller';
-import { RepositoryObjectClient } from '../search';
-
-export abstract class AbstractScheduler {
-  private poller: Poller;
-
-  constructor(
-    protected readonly client: EsClient,
-    pollFrequencyMs: number,
-    protected readonly onScheduleFinished?: () => void
-  ) {
-    this.poller = new Poller({
-      functionToPoll: () => {
-        return this.schedule();
-      },
-      pollFrequencyInMillis: pollFrequencyMs,
-      trailing: true,
-      continuePollingOnError: true,
-      pollFrequencyErrorMultiplier: 2,
-    });
-  }
-
-  public start() {
-    this.poller.start();
-  }
-
-  public stop() {
-    this.poller.stop();
-  }
-
-  public async schedule(): Promise<void> {
-    const repoObjectClient = new RepositoryObjectClient(this.client);
-    const repos = await repoObjectClient.getAllRepositories();
-
-    const schedulingPromises = repos.map((r: Repository) => {
-      return this.executeSchedulingJob(r);
-    });
-
-    await Promise.all(schedulingPromises);
-    // Execute the callback after each schedule is done.
-    if (this.onScheduleFinished) {
-      this.onScheduleFinished();
-    }
-  }
-
-  protected repoNextSchedulingTime(): Date {
-    const duration =
-      this.getRepoSchedulingFrequencyMs() / 2 +
-      ((Math.random() * Number.MAX_SAFE_INTEGER) % this.getRepoSchedulingFrequencyMs());
-    const now = new Date().getTime();
-    return new Date(now + duration);
-  }
-
-  protected getRepoSchedulingFrequencyMs() {
-    // This is an abstract class. Do nothing here. You should override this.
-    return -1;
-  }
-
-  protected async executeSchedulingJob(repo: Repository) {
-    // This is an abstract class. Do nothing here. You should override this.
-    return new Promise<any>((resolve, _) => {
-      resolve();
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/scheduler/clone_scheduler.test.ts b/x-pack/legacy/plugins/code/server/scheduler/clone_scheduler.test.ts
deleted file mode 100644
index cca747af26b804..00000000000000
--- a/x-pack/legacy/plugins/code/server/scheduler/clone_scheduler.test.ts
+++ /dev/null
@@ -1,192 +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 fs from 'fs';
-import sinon from 'sinon';
-
-import { Repository, WorkerReservedProgress, WorkerProgress } from '../../model';
-import { RepositoryDeleteStatusReservedField, RepositoryReservedField } from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { CloneWorker } from '../queue/clone_worker';
-import { ServerOptions } from '../server_options';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { CloneScheduler } from './clone_scheduler';
-
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-const esClient = {
-  get: emptyAsyncFunc,
-  search: emptyAsyncFunc,
-  update: emptyAsyncFunc,
-};
-const cloneWorker = {
-  enqueueJob: emptyAsyncFunc,
-};
-
-const createSearchSpy = (): sinon.SinonSpy => {
-  const repo: Repository = {
-    uri: 'github.com/elastic/code',
-    url: 'https://github.com/elastic/code.git',
-    org: 'elastic',
-    name: 'code',
-  };
-  return sinon.fake.returns(
-    Promise.resolve({
-      hits: {
-        hits: [
-          {
-            _source: {
-              [RepositoryReservedField]: repo,
-            },
-          },
-        ],
-      },
-    })
-  );
-};
-
-const createGetSpy = (inDelete: boolean): sinon.SinonStub => {
-  const deleteStatus: WorkerProgress = {
-    uri: 'github.com/elastic/code',
-    progress: WorkerReservedProgress.INIT,
-    timestamp: new Date(),
-  };
-  const stub = sinon.stub();
-  if (inDelete) {
-    stub.returns(
-      Promise.resolve({
-        _source: {
-          [RepositoryDeleteStatusReservedField]: deleteStatus,
-        },
-      })
-    );
-  } else {
-    stub.throwsException('Failed to get delete status');
-  }
-
-  return stub;
-};
-
-beforeEach(() => {
-  fs.mkdirSync('/tmp/github.com/elastic/code', { recursive: true });
-});
-
-afterEach(() => {
-  fs.rmdirSync('/tmp/github.com/elastic/code');
-  sinon.restore();
-});
-
-test('Reschedule clone job if local repository folder does not exist', async done => {
-  // Setup the clone worker spy.
-  const enqueueJobSpy = sinon.spy(cloneWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy();
-  esClient.search = searchSpy;
-
-  // Set up esClient
-  const getSpy = createGetSpy(false);
-  esClient.get = getSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      expect(getSpy.calledOnce).toBeTruthy();
-      // Expect a clone job has been issued to the queue.
-      expect(enqueueJobSpy.calledOnce).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  const cloneScheduler = new CloneScheduler(
-    (cloneWorker as any) as CloneWorker,
-    {
-      repoPath: '/tmp/does-not-exist/code',
-    } as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  await cloneScheduler.schedule();
-});
-
-test('Do not reschedule clone job if local repository folder exist', async done => {
-  // Setup the clone worker spy.
-  const enqueueJobSpy = sinon.spy(cloneWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy();
-  esClient.search = searchSpy;
-
-  // Set up esClient
-  const getSpy = createGetSpy(false);
-  esClient.get = getSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      expect(getSpy.calledOnce).toBeTruthy();
-      // Expect no clone job submitted to the queue.
-      expect(enqueueJobSpy.notCalled).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  const cloneScheduler = new CloneScheduler(
-    (cloneWorker as any) as CloneWorker,
-    {
-      repoPath: '/tmp',
-    } as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  await cloneScheduler.schedule();
-});
-
-test('Do not reschedule clone job if the repository is in deletion', async done => {
-  // Setup the clone worker spy.
-  const enqueueJobSpy = sinon.spy(cloneWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy();
-  esClient.search = searchSpy;
-
-  // Set up esClient
-  const getSpy = createGetSpy(true);
-  esClient.get = getSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      expect(getSpy.calledOnce).toBeTruthy();
-      // Expect no clone job submitted to the queue.
-      expect(enqueueJobSpy.notCalled).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  const cloneScheduler = new CloneScheduler(
-    (cloneWorker as any) as CloneWorker,
-    {
-      repoPath: '/tmp/does-not-exist/code',
-    } as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  await cloneScheduler.schedule();
-});
diff --git a/x-pack/legacy/plugins/code/server/scheduler/clone_scheduler.ts b/x-pack/legacy/plugins/code/server/scheduler/clone_scheduler.ts
deleted file mode 100644
index d3ed5a2649e500..00000000000000
--- a/x-pack/legacy/plugins/code/server/scheduler/clone_scheduler.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import fs from 'fs';
-
-import { RepositoryUtils } from '../../common/repository_utils';
-import { Repository } from '../../model';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { CloneWorker } from '../queue';
-import { RepositoryObjectClient } from '../search';
-import { ServerOptions } from '../server_options';
-import { AbstractScheduler } from './abstract_scheduler';
-
-// Currently, this clone schedule is only used for reclone git repository
-// in case the local repository is gone for any reasons. This will only
-// be scheduled once at the startup time of Kibana.
-export class CloneScheduler extends AbstractScheduler {
-  private objectClient: RepositoryObjectClient;
-
-  constructor(
-    private readonly cloneWorker: CloneWorker,
-    private readonly serverOptions: ServerOptions,
-    protected readonly client: EsClient,
-    protected readonly log: Logger,
-    protected readonly onScheduleFinished?: () => void
-  ) {
-    super(client, Number.MAX_SAFE_INTEGER, onScheduleFinished);
-    this.objectClient = new RepositoryObjectClient(this.client);
-  }
-
-  protected getRepoSchedulingFrequencyMs() {
-    // We don't need this scheduler to be executed repeatedly for now.
-    return Number.MAX_SAFE_INTEGER;
-  }
-
-  protected async executeSchedulingJob(repo: Repository) {
-    const { uri, url } = repo;
-    this.log.debug(`Try to schedule clone repo request for ${uri}`);
-    try {
-      // 1. Check if the repository is in deletion
-      let inDelete = false;
-      try {
-        await this.objectClient.getRepositoryDeleteStatus(repo.uri);
-        inDelete = true;
-      } catch (error) {
-        inDelete = false;
-      }
-
-      // 2. Check if the folder exsits
-      const path = RepositoryUtils.repositoryLocalPath(this.serverOptions.repoPath, uri);
-      const repoExist = fs.existsSync(path);
-
-      if (!inDelete && !repoExist) {
-        this.log.info(
-          `Repository does not exist on local disk. Start to schedule clone repo request for ${uri}`
-        );
-        const payload = { url };
-        await this.cloneWorker.enqueueJob(payload, {});
-      } else {
-        this.log.debug(
-          `Repository ${uri} has not been fully cloned yet or in update/delete. Skip clone.`
-        );
-      }
-    } catch (error) {
-      this.log.error(`Schedule clone for ${uri} error.`);
-      this.log.error(error);
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/scheduler/index.ts b/x-pack/legacy/plugins/code/server/scheduler/index.ts
deleted file mode 100644
index 9f360ca089dcdb..00000000000000
--- a/x-pack/legacy/plugins/code/server/scheduler/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './clone_scheduler';
-export * from './index_scheduler';
-export * from './update_scheduler';
diff --git a/x-pack/legacy/plugins/code/server/scheduler/index_scheduler.test.ts b/x-pack/legacy/plugins/code/server/scheduler/index_scheduler.test.ts
deleted file mode 100644
index 50645dd063cb58..00000000000000
--- a/x-pack/legacy/plugins/code/server/scheduler/index_scheduler.test.ts
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import moment from 'moment';
-import sinon from 'sinon';
-
-import {
-  CloneProgress,
-  CloneWorkerProgress,
-  Repository,
-  WorkerProgress,
-  WorkerReservedProgress,
-} from '../../model';
-import {
-  RepositoryGitStatusReservedField,
-  RepositoryIndexStatusReservedField,
-  RepositoryReservedField,
-} from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { IndexWorker } from '../queue/index_worker';
-import { ServerOptions } from '../server_options';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { IndexScheduler } from './index_scheduler';
-
-const INDEX_FREQUENCY_MS: number = 1000;
-const INDEX_REPO_FREQUENCY_MS: number = 8000;
-const serverOpts = {
-  indexFrequencyMs: INDEX_FREQUENCY_MS,
-  indexRepoFrequencyMs: INDEX_REPO_FREQUENCY_MS,
-};
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esClient = {
-  get: emptyAsyncFunc,
-  search: emptyAsyncFunc,
-  update: emptyAsyncFunc,
-};
-const indexWorker = {
-  enqueueJob: emptyAsyncFunc,
-};
-
-const createSearchSpy = (nextIndexTimestamp: number): sinon.SinonSpy => {
-  const repo: Repository = {
-    uri: 'github.com/elastic/code',
-    url: 'https://github.com/elastic/code.git',
-    org: 'elastic',
-    name: 'code',
-    revision: 'master',
-    nextIndexTimestamp: moment()
-      .add(nextIndexTimestamp, 'ms')
-      .toDate(),
-  };
-  return sinon.fake.returns(
-    Promise.resolve({
-      hits: {
-        hits: [
-          {
-            _source: {
-              [RepositoryReservedField]: repo,
-            },
-          },
-        ],
-      },
-    })
-  );
-};
-
-const createGetStub = (
-  gitProgress: number,
-  lspIndexProgress: number,
-  lspIndexRevision: string
-): sinon.SinonStub => {
-  const cloneStatus: CloneWorkerProgress = {
-    uri: 'github.com/elastic/code',
-    progress: gitProgress,
-    timestamp: new Date(),
-    cloneProgress: {
-      isCloned: true,
-    } as CloneProgress,
-  };
-  const lspIndexStatus: WorkerProgress = {
-    uri: 'github.com/elastic/code',
-    progress: lspIndexProgress,
-    timestamp: new Date(),
-    revision: lspIndexRevision,
-  };
-  const stub = sinon.stub();
-  stub.onFirstCall().returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryGitStatusReservedField]: cloneStatus,
-      },
-    })
-  );
-  stub.onSecondCall().returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryIndexStatusReservedField]: lspIndexStatus,
-      },
-    })
-  );
-  return stub;
-};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Next job should not execute when scheduled index time is not current.', done => {
-  const clock = sinon.useFakeTimers();
-
-  // Setup the IndexWorker spy.
-  const enqueueJobSpy = sinon.spy(indexWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy(INDEX_FREQUENCY_MS + 1);
-  esClient.search = searchSpy;
-
-  // Set up the update and get spies of esClient
-  const getSpy = sinon.spy();
-  esClient.get = getSpy;
-  const updateSpy = sinon.spy();
-  esClient.update = updateSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      // Expect no update on anything regarding the index task scheduling.
-      expect(enqueueJobSpy.notCalled).toBeTruthy();
-      expect(getSpy.notCalled).toBeTruthy();
-      expect(updateSpy.notCalled).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  // Start the scheduler.
-  const indexScheduler = new IndexScheduler(
-    (indexWorker as any) as IndexWorker,
-    serverOpts as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  indexScheduler.start();
-
-  // Roll the clock to the time when the first scheduled index task
-  // is executed.
-  clock.tick(INDEX_FREQUENCY_MS);
-});
-
-test('Next job should not execute when repo is still in clone.', done => {
-  const clock = sinon.useFakeTimers();
-
-  // Setup the IndexWorker spy.
-  const enqueueJobSpy = sinon.spy(indexWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy(INDEX_FREQUENCY_MS - 1);
-  esClient.search = searchSpy;
-
-  // Set up the update and get spies of esClient
-  const getStub = createGetStub(50, WorkerReservedProgress.COMPLETED, 'newrevision');
-  esClient.get = getStub;
-  const updateSpy = sinon.spy();
-  esClient.update = updateSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories and
-      // the get stub to be called to pull out git status.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      expect(getStub.calledOnce).toBeTruthy();
-      // Expect no update on anything regarding the index task scheduling.
-      expect(enqueueJobSpy.notCalled).toBeTruthy();
-      expect(updateSpy.notCalled).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  // Start the scheduler.
-  const indexScheduler = new IndexScheduler(
-    (indexWorker as any) as IndexWorker,
-    serverOpts as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  indexScheduler.start();
-
-  // Roll the clock to the time when the first scheduled index task
-  // is executed.
-  clock.tick(INDEX_FREQUENCY_MS);
-});
-
-test('Next job should not execute when repo is still in the preivous index job.', done => {
-  const clock = sinon.useFakeTimers();
-
-  // Setup the IndexWorker spy.
-  const enqueueJobSpy = sinon.spy(indexWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy(INDEX_FREQUENCY_MS - 1);
-  esClient.search = searchSpy;
-
-  // Set up the update and get spies of esClient
-  const getStub = createGetStub(WorkerReservedProgress.COMPLETED, 50, 'newrevision');
-  esClient.get = getStub;
-  const updateSpy = sinon.spy();
-  esClient.update = updateSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      // Expect the get stub to be called twice to pull out git status and
-      // lsp index status respectively.
-      expect(getStub.calledTwice).toBeTruthy();
-      // Expect no update on anything regarding the index task scheduling.
-      expect(enqueueJobSpy.notCalled).toBeTruthy();
-      expect(updateSpy.notCalled).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  // Start the scheduler.
-  const indexScheduler = new IndexScheduler(
-    (indexWorker as any) as IndexWorker,
-    serverOpts as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  indexScheduler.start();
-
-  // Roll the clock to the time when the first scheduled index task
-  // is executed.
-  clock.tick(INDEX_FREQUENCY_MS);
-});
-
-test('Next job should not execute when repo revision did not change.', done => {
-  const clock = sinon.useFakeTimers();
-
-  // Setup the IndexWorker spy.
-  const enqueueJobSpy = sinon.spy(indexWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy(INDEX_FREQUENCY_MS - 1);
-  esClient.search = searchSpy;
-
-  // Set up the update and get spies of esClient
-  const getStub = createGetStub(
-    WorkerReservedProgress.COMPLETED,
-    WorkerReservedProgress.COMPLETED,
-    'master'
-  );
-  esClient.get = getStub;
-  const updateSpy = sinon.spy();
-  esClient.update = updateSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      // Expect the get stub to be called twice to pull out git status and
-      // lsp index status respectively.
-      expect(getStub.calledTwice).toBeTruthy();
-      // Expect no update on anything regarding the index task scheduling.
-      expect(enqueueJobSpy.notCalled).toBeTruthy();
-      expect(updateSpy.notCalled).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  // Start the scheduler.
-  const indexScheduler = new IndexScheduler(
-    (indexWorker as any) as IndexWorker,
-    serverOpts as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  indexScheduler.start();
-
-  // Roll the clock to the time when the first scheduled index task
-  // is executed.
-  clock.tick(INDEX_FREQUENCY_MS);
-});
-
-test('Next job should execute.', done => {
-  const clock = sinon.useFakeTimers();
-
-  // Setup the IndexWorker spy.
-  const enqueueJobSpy = sinon.spy(indexWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy(INDEX_FREQUENCY_MS - 1);
-  esClient.search = searchSpy;
-
-  // Set up the update and get spies of esClient
-  const getStub = createGetStub(
-    WorkerReservedProgress.COMPLETED,
-    WorkerReservedProgress.COMPLETED,
-    'newrevision'
-  );
-  esClient.get = getStub;
-  const updateSpy = sinon.spy();
-  esClient.update = updateSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      // Expect the get stub to be called twice to pull out git status and
-      // lsp index status respectively.
-      expect(getStub.calledTwice).toBeTruthy();
-      // Expect the update stub to be called to update next schedule timestamp.
-      expect(updateSpy.calledOnce).toBeTruthy();
-      // Expect the enqueue job stub to be called to issue the index job.
-      expect(enqueueJobSpy.calledOnce).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  // Start the scheduler.
-  const indexScheduler = new IndexScheduler(
-    (indexWorker as any) as IndexWorker,
-    serverOpts as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  indexScheduler.start();
-
-  // Roll the clock to the time when the first scheduled index task
-  // is executed.
-  clock.tick(INDEX_FREQUENCY_MS);
-});
diff --git a/x-pack/legacy/plugins/code/server/scheduler/index_scheduler.ts b/x-pack/legacy/plugins/code/server/scheduler/index_scheduler.ts
deleted file mode 100644
index 5319a0359739d7..00000000000000
--- a/x-pack/legacy/plugins/code/server/scheduler/index_scheduler.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { RepositoryUtils } from '../../common/repository_utils';
-import { Repository, WorkerReservedProgress } from '../../model';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { IndexWorker } from '../queue';
-import { RepositoryObjectClient } from '../search';
-import { ServerOptions } from '../server_options';
-import { AbstractScheduler } from './abstract_scheduler';
-
-export class IndexScheduler extends AbstractScheduler {
-  private objectClient: RepositoryObjectClient;
-
-  constructor(
-    private readonly indexWorker: IndexWorker,
-    private readonly serverOptions: ServerOptions,
-    protected readonly client: EsClient,
-    protected readonly log: Logger,
-    protected readonly onScheduleFinished?: () => void
-  ) {
-    super(client, serverOptions.indexFrequencyMs, onScheduleFinished);
-    this.objectClient = new RepositoryObjectClient(this.client);
-  }
-
-  protected getRepoSchedulingFrequencyMs() {
-    return this.serverOptions.indexRepoFrequencyMs;
-  }
-
-  protected async executeSchedulingJob(repo: Repository) {
-    this.log.debug(`Schedule index repo request for ${repo.uri}`);
-    try {
-      // This repository is too soon to execute the next index job.
-      if (repo.nextIndexTimestamp && new Date() < new Date(repo.nextIndexTimestamp)) {
-        this.log.debug(`Repo ${repo.uri} is too soon to execute the next index job.`);
-        return;
-      }
-      const cloneStatus = await this.objectClient.getRepositoryGitStatus(repo.uri);
-      if (
-        !RepositoryUtils.hasFullyCloned(cloneStatus.cloneProgress) ||
-        cloneStatus.progress !== WorkerReservedProgress.COMPLETED
-      ) {
-        this.log.debug(`Repo ${repo.uri} has not been fully cloned yet or in update. Skip index.`);
-        return;
-      }
-
-      const repoIndexStatus = await this.objectClient.getRepositoryIndexStatus(repo.uri);
-
-      // Schedule index job only when the indexed revision is different from the current repository
-      // revision.
-      this.log.debug(
-        `Current repo revision: ${repo.revision}, indexed revision ${repoIndexStatus.revision}.`
-      );
-      if (
-        repoIndexStatus.progress >= 0 &&
-        repoIndexStatus.progress < WorkerReservedProgress.COMPLETED
-      ) {
-        this.log.debug(`Repo is still in indexing. Skip index for ${repo.uri}`);
-      } else if (
-        repoIndexStatus.progress === WorkerReservedProgress.COMPLETED &&
-        repoIndexStatus.revision === repo.revision
-      ) {
-        this.log.debug(`Repo does not change since last index. Skip index for ${repo.uri}.`);
-      } else {
-        const payload = {
-          uri: repo.uri,
-          revision: repo.revision,
-        };
-
-        // Update the next repo index timestamp.
-        const nextRepoIndexTimestamp = this.repoNextSchedulingTime();
-        await this.objectClient.updateRepository(repo.uri, {
-          nextIndexTimestamp: nextRepoIndexTimestamp,
-        });
-
-        await this.indexWorker.enqueueJob(payload, {});
-      }
-    } catch (error) {
-      this.log.error(`Schedule index job for ${repo.uri} error.`);
-      this.log.error(error);
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/scheduler/update_scheduler.test.ts b/x-pack/legacy/plugins/code/server/scheduler/update_scheduler.test.ts
deleted file mode 100644
index e7721cd4ae1ac8..00000000000000
--- a/x-pack/legacy/plugins/code/server/scheduler/update_scheduler.test.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import moment from 'moment';
-import sinon from 'sinon';
-
-import {
-  CloneProgress,
-  CloneWorkerProgress,
-  Repository,
-  WorkerReservedProgress,
-} from '../../model';
-import {
-  RepositoryDeleteStatusReservedField,
-  RepositoryGitStatusReservedField,
-  RepositoryReservedField,
-} from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { UpdateWorker } from '../queue/update_worker';
-import { ServerOptions } from '../server_options';
-import { emptyAsyncFunc } from '../test_utils';
-import { ConsoleLoggerFactory } from '../utils/console_logger_factory';
-import { UpdateScheduler } from './update_scheduler';
-
-const UPDATE_FREQUENCY_MS: number = 1000;
-const UPDATE_REPO_FREQUENCY_MS: number = 8000;
-const serverOpts = {
-  updateFrequencyMs: UPDATE_FREQUENCY_MS,
-  updateRepoFrequencyMs: UPDATE_REPO_FREQUENCY_MS,
-};
-const log: Logger = new ConsoleLoggerFactory().getLogger(['test']);
-
-const esClient = {
-  get: emptyAsyncFunc,
-  search: emptyAsyncFunc,
-  update: emptyAsyncFunc,
-};
-const updateWorker = {
-  enqueueJob: emptyAsyncFunc,
-};
-
-const createSearchSpy = (nextUpdateTimestamp: number): sinon.SinonSpy => {
-  const repo: Repository = {
-    uri: 'github.com/elastic/code',
-    url: 'https://github.com/elastic/code.git',
-    org: 'elastic',
-    name: 'code',
-    nextUpdateTimestamp: moment()
-      .add(nextUpdateTimestamp, 'ms')
-      .toDate(),
-  };
-  return sinon.fake.returns(
-    Promise.resolve({
-      hits: {
-        hits: [
-          {
-            _source: {
-              [RepositoryReservedField]: repo,
-            },
-          },
-        ],
-      },
-    })
-  );
-};
-
-const createGetSpy = (progress: number, inDelete: boolean): sinon.SinonStub => {
-  const cloneStatus: CloneWorkerProgress = {
-    uri: 'github.com/elastic/code',
-    progress,
-    timestamp: new Date(),
-    cloneProgress: {
-      isCloned: true,
-    } as CloneProgress,
-  };
-  const stub = sinon.stub();
-  if (inDelete) {
-    stub.onFirstCall().returns(
-      Promise.resolve({
-        _source: {
-          [RepositoryDeleteStatusReservedField]: {
-            uri: 'github.com/elastic/code',
-            progress: WorkerReservedProgress.INIT,
-            timestamp: new Date(),
-          },
-        },
-      })
-    );
-  } else {
-    stub.onFirstCall().throwsException('Failed to get delete status');
-  }
-  stub.onSecondCall().returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryGitStatusReservedField]: cloneStatus,
-      },
-    })
-  );
-  return stub;
-};
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('Next job should not execute when scheduled update time is not current.', done => {
-  const clock = sinon.useFakeTimers();
-
-  // Setup the UpdateWorker spy.
-  const enqueueJobSpy = sinon.spy(updateWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy(UPDATE_FREQUENCY_MS + 1);
-  esClient.search = searchSpy;
-
-  // Set up the update and get spies of esClient
-  const getSpy = createGetSpy(WorkerReservedProgress.COMPLETED, false /* inDelete */);
-  esClient.get = getSpy;
-  const updateSpy = sinon.spy();
-  esClient.update = updateSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      // Expect no update on anything regarding the update task scheduling.
-      expect(enqueueJobSpy.notCalled).toBeTruthy();
-      expect(getSpy.notCalled).toBeTruthy();
-      expect(updateSpy.notCalled).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  // Start the scheduler.
-  const updateScheduler = new UpdateScheduler(
-    (updateWorker as any) as UpdateWorker,
-    serverOpts as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  updateScheduler.start();
-
-  // Roll the clock to the time when the first scheduled update task
-  // is executed.
-  clock.tick(UPDATE_FREQUENCY_MS);
-});
-
-test('Next job should not execute when repo is still in clone.', done => {
-  const clock = sinon.useFakeTimers();
-
-  // Setup the UpdateWorker spy.
-  const enqueueJobSpy = sinon.spy(updateWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy(UPDATE_FREQUENCY_MS - 1);
-  esClient.search = searchSpy;
-
-  // Set up the update and get spies of esClient
-  const getSpy = createGetSpy(50, false /* inDelete */);
-  esClient.get = getSpy;
-  const updateSpy = sinon.spy();
-  esClient.update = updateSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories and
-      // the get stub to be called twice to pull out git status and delete
-      // status.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      expect(getSpy.calledTwice).toBeTruthy();
-      // Expect no update on anything regarding the update task scheduling.
-      expect(enqueueJobSpy.notCalled).toBeTruthy();
-      expect(updateSpy.notCalled).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  // Start the scheduler.
-  const updateScheduler = new UpdateScheduler(
-    (updateWorker as any) as UpdateWorker,
-    serverOpts as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  updateScheduler.start();
-
-  // Roll the clock to the time when the first scheduled update task
-  // is executed.
-  clock.tick(UPDATE_FREQUENCY_MS);
-});
-
-test('Next job should not execute when repository is in deletion', done => {
-  const clock = sinon.useFakeTimers();
-
-  // Setup the UpdateWorker spy.
-  const enqueueJobSpy = sinon.stub(updateWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy(UPDATE_FREQUENCY_MS - 1);
-  esClient.search = searchSpy;
-
-  // Set up the update and get spies of esClient
-  const getSpy = createGetSpy(WorkerReservedProgress.COMPLETED, true /* inDelete */);
-  esClient.get = getSpy;
-  const updateSpy = sinon.spy();
-  esClient.update = updateSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      expect(getSpy.calledTwice).toBeTruthy();
-      // Expect no update on anything regarding the update task scheduling.
-      expect(enqueueJobSpy.notCalled).toBeTruthy();
-      expect(updateSpy.notCalled).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  // Start the scheduler.
-  const updateScheduler = new UpdateScheduler(
-    (updateWorker as any) as UpdateWorker,
-    serverOpts as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  updateScheduler.start();
-
-  // Roll the clock to the time when the first scheduled update task
-  // is executed.
-  clock.tick(UPDATE_FREQUENCY_MS);
-});
-
-test('Next job should execute.', done => {
-  const clock = sinon.useFakeTimers();
-
-  // Setup the UpdateWorker spy.
-  const enqueueJobSpy = sinon.stub(updateWorker, 'enqueueJob');
-
-  // Setup the search stub to mock loading all repositories from ES.
-  const searchSpy = createSearchSpy(UPDATE_FREQUENCY_MS - 1);
-  esClient.search = searchSpy;
-
-  // Set up the update and get spies of esClient
-  const getSpy = createGetSpy(WorkerReservedProgress.COMPLETED, false /* inDelete */);
-  esClient.get = getSpy;
-  const updateSpy = sinon.spy();
-  esClient.update = updateSpy;
-
-  const onScheduleFinished = () => {
-    try {
-      // Expect the search stub to be called to pull all repositories.
-      expect(searchSpy.calledOnce).toBeTruthy();
-      // Expect the get stub to be called to pull git status and delete status.
-      expect(getSpy.calledTwice).toBeTruthy();
-      // Expect the update stub to be called to update next schedule timestamp.
-      expect(updateSpy.calledOnce).toBeTruthy();
-      // Expect the enqueue job stub to be called to issue the update job.
-      expect(enqueueJobSpy.calledOnce).toBeTruthy();
-      done();
-    } catch (err) {
-      done.fail(err);
-    }
-  };
-
-  // Start the scheduler.
-  const updateScheduler = new UpdateScheduler(
-    (updateWorker as any) as UpdateWorker,
-    serverOpts as ServerOptions,
-    esClient as EsClient,
-    log,
-    onScheduleFinished
-  );
-  updateScheduler.start();
-
-  // Roll the clock to the time when the first scheduled update task
-  // is executed.
-  clock.tick(UPDATE_FREQUENCY_MS);
-});
diff --git a/x-pack/legacy/plugins/code/server/scheduler/update_scheduler.ts b/x-pack/legacy/plugins/code/server/scheduler/update_scheduler.ts
deleted file mode 100644
index 7cc2daa0fbe60b..00000000000000
--- a/x-pack/legacy/plugins/code/server/scheduler/update_scheduler.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Repository, WorkerReservedProgress } from '../../model';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { UpdateWorker } from '../queue';
-import { RepositoryObjectClient } from '../search';
-import { ServerOptions } from '../server_options';
-import { AbstractScheduler } from './abstract_scheduler';
-
-export class UpdateScheduler extends AbstractScheduler {
-  private objectClient: RepositoryObjectClient;
-
-  constructor(
-    private readonly updateWorker: UpdateWorker,
-    private readonly serverOptions: ServerOptions,
-    protected readonly client: EsClient,
-    protected readonly log: Logger,
-    protected readonly onScheduleFinished?: () => void
-  ) {
-    super(client, serverOptions.updateFrequencyMs, onScheduleFinished);
-    this.objectClient = new RepositoryObjectClient(this.client);
-  }
-
-  protected getRepoSchedulingFrequencyMs() {
-    return this.serverOptions.updateRepoFrequencyMs;
-  }
-
-  // TODO: Currently the schduling algorithm the most naive one, which go through
-  // all repositories and execute update. Later we can repeat the one we used
-  // before for task throttling.
-  protected async executeSchedulingJob(repo: Repository) {
-    this.log.debug(`Try to schedule update repo request for ${repo.uri}`);
-    try {
-      // This repository is too soon to execute the next update job.
-      if (repo.nextUpdateTimestamp && new Date() < new Date(repo.nextUpdateTimestamp)) {
-        this.log.debug(`Repo ${repo.uri} is too soon to execute the next update job.`);
-        return;
-      }
-      this.log.debug(`Start to schedule update repo request for ${repo.uri}`);
-
-      let inDelete = false;
-      try {
-        await this.objectClient.getRepositoryDeleteStatus(repo.uri);
-        inDelete = true;
-      } catch (error) {
-        inDelete = false;
-      }
-
-      const cloneStatus = await this.objectClient.getRepositoryGitStatus(repo.uri);
-      // Schedule update job only when the repo has been fully cloned already and not in delete
-      if (
-        !inDelete &&
-        cloneStatus.cloneProgress &&
-        cloneStatus.cloneProgress.isCloned &&
-        cloneStatus.progress === WorkerReservedProgress.COMPLETED
-      ) {
-        const payload = repo;
-
-        // Update the next repo update timestamp.
-        const nextRepoUpdateTimestamp = this.repoNextSchedulingTime();
-        await this.objectClient.updateRepository(repo.uri, {
-          nextUpdateTimestamp: nextRepoUpdateTimestamp,
-        });
-
-        await this.updateWorker.enqueueJob(payload, {});
-      } else {
-        this.log.debug(
-          `Repo ${repo.uri} has not been fully cloned yet or in update/delete. Skip update.`
-        );
-      }
-    } catch (error) {
-      this.log.error(`Schedule update for ${repo.uri} error.`);
-      this.log.error(error);
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/search/abstract_search_client.ts b/x-pack/legacy/plugins/code/server/search/abstract_search_client.ts
deleted file mode 100644
index e0390d660fb392..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/abstract_search_client.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { SearchRequest, SearchResult } from '../../model';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { SearchClient } from './search_client';
-
-export abstract class AbstractSearchClient implements SearchClient {
-  protected RESULTS_PER_PAGE = 20;
-
-  constructor(protected readonly client: EsClient, protected readonly log: Logger) {}
-
-  // For the full search request.
-  public async search(req: SearchRequest): Promise<SearchResult> {
-    // This is the abstract implementation, you should override this function.
-    return new Promise<SearchResult>((resolve, reject) => {
-      resolve();
-    });
-  }
-
-  // For the typeahead suggestions request.
-  public async suggest(req: SearchRequest): Promise<SearchResult> {
-    // This is the abstract implementation, you should override this function.
-    // By default, return the same result as search function above.
-    return this.search(req);
-  }
-
-  public getResultsPerPage(req: SearchRequest): number {
-    let resultsPerPage = this.RESULTS_PER_PAGE;
-    if (req.resultsPerPage !== undefined) {
-      resultsPerPage = req.resultsPerPage;
-    }
-    return resultsPerPage;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/search/commit_search_client.test.ts b/x-pack/legacy/plugins/code/server/search/commit_search_client.test.ts
deleted file mode 100644
index 112263c3fa8bc9..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/commit_search_client.test.ts
+++ /dev/null
@@ -1,190 +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 sinon from 'sinon';
-
-import { AnyObject, EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { CommitSearchClient } from './commit_search_client';
-
-let commitSearchClient: CommitSearchClient;
-let esClient;
-
-// Setup the entire RepositorySearchClient.
-function initSearchClient() {
-  const log: Logger = (sinon.stub() as any) as Logger;
-  esClient = initEsClient();
-
-  commitSearchClient = new CommitSearchClient(esClient, log);
-}
-
-const mockSearchResults = [
-  // 1. The first response is a valid CommitSearchResult with 2 docs
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 2,
-      },
-      hits: [
-        {
-          _source: {
-            repoUri: 'github.com/Microsoft/TypeScript-Node-Starter',
-            id: '018200a626125b197573fc4d2af840af102d6ecc',
-            message:
-              'Merge pull request #200 from peterblazejewicz/update/deps\n\nUpdate project dependencies',
-            body: 'Update project dependencies',
-            date: '2019-06-23T02:16:29.000Z',
-            parents: [
-              'c37be997b176292953629959e038ae88074bbfba',
-              'ccf6ad89a643c321f43ec6063efa86f5a0b8a234',
-            ],
-            author: {
-              name: 'Orta',
-              email: 'ortam@microsoft.com',
-            },
-            committer: {
-              name: 'GitHub',
-              email: 'noreply@github.com',
-            },
-          },
-        },
-        {
-          _source: {
-            repoUri: 'github.com/Microsoft/TypeScript-Node-Starter',
-            id: 'fc4c2b2d25d51c543dc7134c12f8a825ea8d6230',
-            message:
-              'Merge pull request #88 from peterblazejewicz/feat/update-shelljs\n\nUpdate ShellJS version',
-            body: 'Update ShellJS version',
-            date: '2018-02-27T01:09:07.000Z',
-            parents: [
-              'd15b403884879c505ef7c18a2f7785f4e6e67a52',
-              'd0403de6cfcfa5d2477cf38baad71db15e70965c',
-            ],
-            author: {
-              name: 'Bowden Kelly',
-              email: 'wilkelly@microsoft.com',
-            },
-            committer: {
-              name: 'GitHub',
-              email: 'noreply@github.com',
-            },
-          },
-        },
-      ],
-    },
-    aggregations: {
-      repoUri: {
-        buckets: [
-          {
-            'github.com/Microsoft/TypeScript-Node-Starter': 2,
-          },
-        ],
-      },
-    },
-  },
-  // 2. The second response is a valid CommitSearchResult with 0 doc
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 0,
-      },
-      hits: [],
-    },
-    aggregations: {
-      repoUri: {
-        buckets: [],
-      },
-    },
-  },
-];
-
-// Setup the mock EsClient.
-function initEsClient(): EsClient {
-  esClient = {
-    search: async (_: AnyObject): Promise<any> => {
-      Promise.resolve({});
-    },
-  };
-  const searchStub = sinon.stub(esClient, 'search');
-
-  // Binding the mock search results to the stub.
-  mockSearchResults.forEach((result, index) => {
-    searchStub.onCall(index).returns(Promise.resolve(result));
-  });
-
-  return (esClient as any) as EsClient;
-}
-
-beforeEach(() => {
-  initSearchClient();
-});
-
-test('Commit search', async () => {
-  // 1. The first response should have 2 commits.
-  const responseWithResult = await commitSearchClient.search({ query: 'string', page: 1 });
-  expect(responseWithResult).toEqual(
-    expect.objectContaining({
-      total: 2,
-      totalPage: 1,
-      page: 1,
-      query: 'string',
-      commits: [
-        {
-          repoUri: 'github.com/Microsoft/TypeScript-Node-Starter',
-          id: '018200a626125b197573fc4d2af840af102d6ecc',
-          message:
-            'Merge pull request #200 from peterblazejewicz/update/deps\n\nUpdate project dependencies',
-          body: 'Update project dependencies',
-          date: '2019-06-23T02:16:29.000Z',
-          parents: [
-            'c37be997b176292953629959e038ae88074bbfba',
-            'ccf6ad89a643c321f43ec6063efa86f5a0b8a234',
-          ],
-          author: {
-            name: 'Orta',
-            email: 'ortam@microsoft.com',
-          },
-          committer: {
-            name: 'GitHub',
-            email: 'noreply@github.com',
-          },
-        },
-        {
-          repoUri: 'github.com/Microsoft/TypeScript-Node-Starter',
-          id: 'fc4c2b2d25d51c543dc7134c12f8a825ea8d6230',
-          message:
-            'Merge pull request #88 from peterblazejewicz/feat/update-shelljs\n\nUpdate ShellJS version',
-          body: 'Update ShellJS version',
-          date: '2018-02-27T01:09:07.000Z',
-          parents: [
-            'd15b403884879c505ef7c18a2f7785f4e6e67a52',
-            'd0403de6cfcfa5d2477cf38baad71db15e70965c',
-          ],
-          author: {
-            name: 'Bowden Kelly',
-            email: 'wilkelly@microsoft.com',
-          },
-          committer: {
-            name: 'GitHub',
-            email: 'noreply@github.com',
-          },
-        },
-      ],
-      repoAggregations: [
-        {
-          'github.com/Microsoft/TypeScript-Node-Starter': 2,
-        },
-      ],
-    })
-  );
-
-  // 2. The first response should have 0 commit.
-  const responseWithEmptyResult = await commitSearchClient.search({ query: 'string', page: 1 });
-  expect(responseWithEmptyResult.commits!.length).toEqual(0);
-  expect(responseWithEmptyResult.total).toEqual(0);
-});
diff --git a/x-pack/legacy/plugins/code/server/search/commit_search_client.ts b/x-pack/legacy/plugins/code/server/search/commit_search_client.ts
deleted file mode 100644
index 82a5e7bf5e64ed..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/commit_search_client.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-
-import {
-  Commit,
-  CommitSearchRequest,
-  CommitSearchResult,
-  CommitSearchResultItem,
-  emptyCommitSearchResult,
-} from '../../model';
-import { CommitSearchIndexWithScope, CommitIndexNamePrefix } from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { AbstractSearchClient } from './abstract_search_client';
-
-export class CommitSearchClient extends AbstractSearchClient {
-  constructor(protected readonly client: EsClient, protected readonly log: Logger) {
-    super(client, log);
-  }
-
-  public async search(req: CommitSearchRequest): Promise<CommitSearchResult> {
-    const resultsPerPage = this.getResultsPerPage(req);
-    const from = (req.page - 1) * resultsPerPage;
-    const size = resultsPerPage;
-
-    const index = req.repoScope
-      ? CommitSearchIndexWithScope(req.repoScope)
-      : `${CommitIndexNamePrefix}*`;
-    if (index.length === 0) {
-      return emptyCommitSearchResult(req.query);
-    }
-
-    // Post filters for repository
-    let repositoryPostFilters: object[] = [];
-    if (req.repoFilters) {
-      repositoryPostFilters = req.repoFilters.map((repoUri: string) => {
-        return {
-          term: {
-            repoUri,
-          },
-        };
-      });
-    }
-
-    const rawRes = await this.client.search({
-      index,
-      body: {
-        from,
-        size,
-        query: {
-          bool: {
-            should: [
-              {
-                match: {
-                  message: req.query,
-                },
-              },
-              {
-                match: {
-                  body: req.query,
-                },
-              },
-            ],
-            disable_coord: false,
-            adjust_pure_negative: true,
-            boost: 1.0,
-          },
-        },
-        post_filter: {
-          bool: {
-            should: repositoryPostFilters,
-            disable_coord: false,
-            adjust_pure_negative: true,
-            boost: 1.0,
-          },
-        },
-        aggregations: {
-          repoUri: {
-            terms: {
-              field: 'repoUri',
-              size: 10,
-              min_doc_count: 1,
-              shard_min_doc_count: 0,
-              show_term_doc_count_error: false,
-              order: [
-                {
-                  _count: 'desc',
-                },
-                {
-                  _key: 'asc',
-                },
-              ],
-            },
-          },
-        },
-      },
-    });
-
-    const hits: any[] = rawRes.hits.hits;
-    const aggregations = rawRes.aggregations;
-
-    const results: CommitSearchResultItem[] = hits.map(hit => {
-      const commit: Commit = hit._source;
-      return commit;
-    });
-    const total = rawRes.hits.total.value;
-    return {
-      query: req.query,
-      from,
-      page: req.page,
-      totalPage: Math.ceil(total / resultsPerPage),
-      commits: results,
-      repoAggregations: aggregations.repoUri.buckets,
-      took: rawRes.took,
-      total,
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/search/document_search_client.test.ts b/x-pack/legacy/plugins/code/server/search/document_search_client.test.ts
deleted file mode 100644
index 5cc50b3c3a53f9..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/document_search_client.test.ts
+++ /dev/null
@@ -1,230 +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 sinon from 'sinon';
-
-import { AnyObject, EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { DocumentSearchClient } from './document_search_client';
-
-let docSearchClient: DocumentSearchClient;
-let esClient;
-
-// Setup the entire DocumentSearchClient.
-function initSearchClient() {
-  const log: Logger = (sinon.stub() as any) as Logger;
-  esClient = initEsClient();
-
-  docSearchClient = new DocumentSearchClient(esClient, log);
-}
-
-const mockSearchResults = [
-  // 1. The first response is a valid DocumentSearchResult with 2 docs
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 2,
-      },
-      hits: [
-        // File content matching
-        {
-          _source: {
-            repoUri: 'github.com/Microsoft/TypeScript-Node-Starter',
-            path: 'src/types/express-flash.d.ts',
-            content:
-              "\n/// <reference types='express' />\n\n// Add RequestValidation Interface on to Express's Request Interface.\ndeclare namespace Express {\n    interface Request extends Flash {}\n}\n\ninterface Flash {\n    flash(type: string, message: any): void;\n}\n\ndeclare module 'express-flash';\n\n",
-            language: 'typescript',
-            qnames: ['express-flash', 'Express', 'Request', 'Flash', 'flash'],
-          },
-          highlight: {
-            content: [
-              'declare namespace Express {\n    interface Request extends Flash {}\n}\n\ninterface Flash {\n    flash(type: _@-string-@_',
-            ],
-          },
-        },
-        // File path matching
-        {
-          _source: {
-            repoUri: 'github.com/Microsoft/TypeScript-Node-Starter',
-            path: 'src/types/string.d.ts',
-            content:
-              'no query in content;\nno query in content;\nno query in content;\nno query in content;\nno query in content;\n',
-            language: 'typescript',
-            qnames: ['express-flash'],
-          },
-          highlight: {
-            content: [],
-          },
-        },
-      ],
-    },
-    aggregations: {
-      repoUri: {
-        buckets: [
-          {
-            'github.com/Microsoft/TypeScript-Node-Starter': 2,
-          },
-        ],
-      },
-      language: {
-        buckets: [
-          {
-            typescript: 2,
-          },
-        ],
-      },
-    },
-  },
-  // 2. The second response is a valid DocumentSearchResult with 0 doc
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 0,
-      },
-      hits: [],
-    },
-    aggregations: {
-      repoUri: {
-        buckets: [],
-      },
-      language: {
-        buckets: [],
-      },
-    },
-  },
-];
-
-// Setup the mock EsClient.
-function initEsClient(): EsClient {
-  esClient = {
-    search: async (_: AnyObject): Promise<any> => {
-      Promise.resolve({});
-    },
-  };
-  const searchStub = sinon.stub(esClient, 'search');
-
-  // Binding the mock search results to the stub.
-  mockSearchResults.forEach((result, index) => {
-    searchStub.onCall(index).returns(Promise.resolve(result));
-  });
-
-  return (esClient as any) as EsClient;
-}
-
-beforeEach(() => {
-  initSearchClient();
-});
-
-test('Document search', async () => {
-  // 1. The first response should have 1 result.
-  const responseWithResult = await docSearchClient.search({ query: 'string', page: 1 });
-  expect(responseWithResult).toEqual(
-    expect.objectContaining({
-      total: 2,
-      totalPage: 1,
-      page: 1,
-      query: 'string',
-      results: [
-        {
-          uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-          filePath: 'src/types/express-flash.d.ts',
-          compositeContent: {
-            // Content is shorted
-            content: '\n\ninterface Flash {\n    flash(type: string, message: any): void;\n}\n\n',
-            // Line mapping data is populated
-            lineMapping: ['..', '8', '9', '10', '11', '12', '..'],
-            // Highlight ranges are calculated
-            ranges: [
-              {
-                endColumn: 23,
-                endLineNumber: 4,
-                startColumn: 17,
-                startLineNumber: 4,
-              },
-            ],
-          },
-          language: 'typescript',
-          hits: 1,
-        },
-        {
-          uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-          filePath: 'src/types/string.d.ts',
-          compositeContent: {
-            // Content is shorted
-            content: 'no query in content;\nno query in content;\nno query in content;\n',
-            // Line mapping data is populated
-            lineMapping: ['1', '2', '3', '..'],
-            // Highlight ranges are calculated
-            ranges: [],
-          },
-          language: 'typescript',
-          hits: 0,
-        },
-      ],
-      repoAggregations: [
-        {
-          'github.com/Microsoft/TypeScript-Node-Starter': 2,
-        },
-      ],
-      langAggregations: [
-        {
-          typescript: 2,
-        },
-      ],
-    })
-  );
-
-  // 2. The first response should have 0 results.
-  const responseWithEmptyResult = await docSearchClient.search({ query: 'string', page: 1 });
-  expect(responseWithEmptyResult.results!.length).toEqual(0);
-  expect(responseWithEmptyResult.total).toEqual(0);
-});
-
-test('Document suggest', async () => {
-  // 1. The first response should have 2 docs.
-  const responseWithResult = await docSearchClient.suggest({ query: 'string', page: 1 });
-  expect(responseWithResult).toEqual(
-    expect.objectContaining({
-      total: 2,
-      totalPage: 1,
-      page: 1,
-      query: 'string',
-      results: [
-        {
-          uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-          filePath: 'src/types/express-flash.d.ts',
-          // compositeContent field is intended to leave empty.
-          compositeContent: {
-            content: '',
-            lineMapping: [],
-            ranges: [],
-          },
-          language: 'typescript',
-          hits: 0,
-        },
-        {
-          uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-          filePath: 'src/types/string.d.ts',
-          // compositeContent field is intended to leave empty.
-          compositeContent: {
-            content: '',
-            lineMapping: [],
-            ranges: [],
-          },
-          language: 'typescript',
-          hits: 0,
-        },
-      ],
-    })
-  );
-
-  // 2. The second response should have 0 result.
-  const responseWithEmptyResult = await docSearchClient.suggest({ query: 'string', page: 1 });
-  expect(responseWithEmptyResult.results!.length).toEqual(0);
-  expect(responseWithEmptyResult.total).toEqual(0);
-});
diff --git a/x-pack/legacy/plugins/code/server/search/document_search_client.ts b/x-pack/legacy/plugins/code/server/search/document_search_client.ts
deleted file mode 100644
index 21f19b36b1cc45..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/document_search_client.ts
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import { IRange } from 'monaco-editor';
-import { LineMapper } from '../../common/line_mapper';
-import {
-  Document,
-  DocumentSearchRequest,
-  DocumentSearchResult,
-  SearchResultItem,
-  SourceHit,
-  SourceRange,
-  emptyDocumentSearchResult,
-} from '../../model';
-import { DocumentIndexNamePrefix, DocumentSearchIndexWithScope } from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import {
-  expandRanges,
-  extractSourceContent,
-  LineMapping,
-  LineRange,
-  mergeRanges,
-} from '../utils/composite_source_merger';
-import { AbstractSearchClient } from './abstract_search_client';
-
-const HIT_MERGE_LINE_INTERVAL = 2; // Inclusive
-const MAX_HIT_NUMBER = 5;
-
-export class DocumentSearchClient extends AbstractSearchClient {
-  private HIGHLIGHT_PRE_TAG = '_@-';
-  private HIGHLIGHT_POST_TAG = '-@_';
-  protected LINE_SEPARATOR = '\n';
-
-  constructor(protected readonly client: EsClient, protected readonly log: Logger) {
-    super(client, log);
-  }
-
-  public async search(req: DocumentSearchRequest): Promise<DocumentSearchResult> {
-    const resultsPerPage = this.getResultsPerPage(req);
-    const from = (req.page - 1) * resultsPerPage;
-    const size = resultsPerPage;
-
-    // The query to search qname field.
-    const qnameQuery = {
-      constant_score: {
-        filter: {
-          match: {
-            qnames: {
-              query: req.query,
-              operator: 'OR',
-              prefix_length: 0,
-              max_expansions: 50,
-              fuzzy_transpositions: true,
-              lenient: false,
-              zero_terms_query: 'NONE',
-              boost: 1.0,
-            },
-          },
-        },
-        boost: 1.0,
-      },
-    };
-
-    // The queries to search content and path filter.
-    const contentQuery = {
-      match: {
-        content: req.query,
-      },
-    };
-    const pathQuery = {
-      match: {
-        path: req.query,
-      },
-    };
-
-    // Post filters for repository
-    let repositoryPostFilters: object[] = [];
-    if (req.repoFilters) {
-      repositoryPostFilters = req.repoFilters.map((repoUri: string) => {
-        return {
-          term: {
-            repoUri,
-          },
-        };
-      });
-    }
-
-    // Post filters for language
-    let languagePostFilters: object[] = [];
-    if (req.langFilters) {
-      languagePostFilters = req.langFilters.map((lang: string) => {
-        return {
-          term: {
-            language: lang,
-          },
-        };
-      });
-    }
-
-    const index = req.repoScope
-      ? DocumentSearchIndexWithScope(req.repoScope)
-      : `${DocumentIndexNamePrefix}*`;
-    if (index.length === 0) {
-      return emptyDocumentSearchResult(req.query);
-    }
-
-    const rawRes = await this.client.search({
-      index,
-      body: {
-        from,
-        size,
-        query: {
-          bool: {
-            should: [qnameQuery, contentQuery, pathQuery],
-            disable_coord: false,
-            adjust_pure_negative: true,
-            boost: 1.0,
-          },
-        },
-        post_filter: {
-          bool: {
-            must: [
-              {
-                bool: {
-                  should: repositoryPostFilters,
-                  disable_coord: false,
-                  adjust_pure_negative: true,
-                  boost: 1.0,
-                },
-              },
-              {
-                bool: {
-                  should: languagePostFilters,
-                  disable_coord: false,
-                  adjust_pure_negative: true,
-                  boost: 1.0,
-                },
-              },
-            ],
-            disable_coord: false,
-            adjust_pure_negative: true,
-            boost: 1.0,
-          },
-        },
-        aggregations: {
-          repoUri: {
-            terms: {
-              field: 'repoUri',
-              size: 10,
-              min_doc_count: 1,
-              shard_min_doc_count: 0,
-              show_term_doc_count_error: false,
-              order: [
-                {
-                  _count: 'desc',
-                },
-                {
-                  _key: 'asc',
-                },
-              ],
-            },
-          },
-          language: {
-            terms: {
-              field: 'language',
-              size: 10,
-              min_doc_count: 1,
-              shard_min_doc_count: 0,
-              show_term_doc_count_error: false,
-              order: [
-                {
-                  _count: 'desc',
-                },
-                {
-                  _key: 'asc',
-                },
-              ],
-            },
-          },
-        },
-        highlight: {
-          // TODO: we might need to improve the highlighting separator.
-          pre_tags: [this.HIGHLIGHT_PRE_TAG],
-          post_tags: [this.HIGHLIGHT_POST_TAG],
-          fields: {
-            content: {},
-            path: {},
-          },
-        },
-      },
-    });
-
-    const hits: any[] = rawRes.hits.hits;
-    const aggregations = rawRes.aggregations;
-    const results: SearchResultItem[] = hits.map(hit => {
-      const doc: Document = hit._source;
-      const { repoUri, path, language } = doc;
-
-      let termContent: string[] = [];
-      // Similar to https://github.com/lambdalab/lambdalab/blob/master/services/liaceservice/src/main/scala/com/lambdalab/liaceservice/LiaceServiceImpl.scala#L147
-      // Might need refactoring.
-      if (hit.highlight) {
-        const highlightContent: string[] = hit.highlight.content;
-        if (highlightContent) {
-          highlightContent.forEach((c: string) => {
-            termContent = termContent.concat(this.extractKeywords(c));
-          });
-        }
-      }
-      const hitsContent = this.termsToHits(doc.content, termContent);
-      const sourceContent = this.getSourceContent(hitsContent, doc);
-      const item: SearchResultItem = {
-        uri: repoUri,
-        filePath: path,
-        language: language!,
-        hits: hitsContent.length,
-        compositeContent: sourceContent,
-      };
-      return item;
-    });
-    const total = rawRes.hits.total.value;
-    return {
-      query: req.query,
-      from,
-      page: req.page,
-      totalPage: Math.ceil(total / resultsPerPage),
-      results,
-      repoAggregations: aggregations.repoUri.buckets,
-      langAggregations: aggregations.language.buckets,
-      took: rawRes.took,
-      total,
-    };
-  }
-
-  public async suggest(req: DocumentSearchRequest): Promise<DocumentSearchResult> {
-    const resultsPerPage = this.getResultsPerPage(req);
-    const from = (req.page - 1) * resultsPerPage;
-    const size = resultsPerPage;
-
-    const index = req.repoScope
-      ? DocumentSearchIndexWithScope(req.repoScope)
-      : `${DocumentIndexNamePrefix}*`;
-    if (index.length === 0) {
-      return emptyDocumentSearchResult(req.query);
-    }
-
-    const queryStr = req.query.toLowerCase();
-
-    const rawRes = await this.client.search({
-      index,
-      body: {
-        from,
-        size,
-        query: {
-          bool: {
-            should: [
-              {
-                prefix: {
-                  'path.hierarchy': {
-                    value: queryStr,
-                    boost: 1.0,
-                  },
-                },
-              },
-              {
-                term: {
-                  'path.hierarchy': {
-                    value: queryStr,
-                    boost: 10.0,
-                  },
-                },
-              },
-            ],
-            disable_coord: false,
-            adjust_pure_negative: true,
-            boost: 1.0,
-          },
-        },
-      },
-    });
-
-    const hits: any[] = rawRes.hits.hits;
-    const results: SearchResultItem[] = hits.map(hit => {
-      const doc: Document = hit._source;
-      const { repoUri, path, language } = doc;
-
-      const item: SearchResultItem = {
-        uri: repoUri,
-        filePath: path,
-        language: language!,
-        hits: 0,
-        compositeContent: {
-          content: '',
-          lineMapping: [],
-          ranges: [],
-        },
-      };
-      return item;
-    });
-    const total = rawRes.hits.total.value;
-    return {
-      query: req.query,
-      from,
-      page: req.page,
-      totalPage: Math.ceil(total / resultsPerPage),
-      results,
-      took: rawRes.took,
-      total,
-    };
-  }
-
-  protected getSourceContent(hitsContent: SourceHit[], doc: Document) {
-    const docInLines = doc.content.split(this.LINE_SEPARATOR);
-    let slicedRanges: LineRange[] = [];
-    if (hitsContent.length === 0) {
-      // Always add a placeholder range of the first line so that for filepath
-      // matching search result, we will render some file content.
-      slicedRanges = [
-        {
-          startLine: 0,
-          endLine: 0,
-        },
-      ];
-    } else {
-      const slicedHighlights = hitsContent.slice(0, MAX_HIT_NUMBER);
-      slicedRanges = slicedHighlights.map(hit => ({
-        startLine: hit.range.startLoc.line,
-        endLine: hit.range.endLoc.line,
-      }));
-    }
-
-    const expandedRanges = expandRanges(slicedRanges, HIT_MERGE_LINE_INTERVAL);
-    const mergedRanges = mergeRanges(expandedRanges);
-    const lineMapping = new LineMapping();
-    const result = extractSourceContent(mergedRanges, docInLines, lineMapping);
-    const ranges: IRange[] = hitsContent
-      .filter(hit => lineMapping.hasLine(hit.range.startLoc.line))
-      .map(hit => ({
-        startColumn: hit.range.startLoc.column + 1,
-        startLineNumber: lineMapping.lineNumber(hit.range.startLoc.line),
-        endColumn: hit.range.endLoc.column + 1,
-        endLineNumber: lineMapping.lineNumber(hit.range.endLoc.line),
-      }));
-    return {
-      content: result.join(this.LINE_SEPARATOR),
-      lineMapping: lineMapping.toStringArray(),
-      ranges,
-    };
-  }
-
-  private termsToHits(source: string, terms: string[]): SourceHit[] {
-    // Dedup search terms by using Set.
-    const filteredTerms = new Set(
-      terms.filter(t => t.trim().length > 0).map(t => _.escapeRegExp(t))
-    );
-    if (filteredTerms.size === 0) {
-      return [];
-    }
-
-    const lineMapper = new LineMapper(source);
-    const regex = new RegExp(`(${Array.from(filteredTerms.values()).join('|')})`, 'g');
-    let match;
-    const hits: SourceHit[] = [];
-    do {
-      match = regex.exec(source);
-      if (match) {
-        const begin = match.index;
-        const end = regex.lastIndex;
-        const startLoc = lineMapper.getLocation(begin);
-        const endLoc = lineMapper.getLocation(end);
-        const range: SourceRange = {
-          startLoc,
-          endLoc,
-        };
-        const hit: SourceHit = {
-          range,
-          score: 0.0,
-          term: match[1],
-        };
-        hits.push(hit);
-      }
-    } while (match);
-    return hits;
-  }
-
-  private extractKeywords(text: string | null): string[] {
-    if (!text) {
-      return [];
-    } else {
-      // console.log(text);
-      const keywordRegex = new RegExp(
-        `${this.HIGHLIGHT_PRE_TAG}(\\w*)${this.HIGHLIGHT_POST_TAG}`,
-        'g'
-      );
-      const keywords = text.match(keywordRegex);
-      if (keywords) {
-        return keywords.map((k: string) => {
-          return k
-            .replace(new RegExp(this.HIGHLIGHT_PRE_TAG, 'g'), '')
-            .replace(new RegExp(this.HIGHLIGHT_POST_TAG, 'g'), '');
-        });
-      } else {
-        return [];
-      }
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/search/index.ts b/x-pack/legacy/plugins/code/server/search/index.ts
deleted file mode 100644
index 814b292f1c2d9d..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './commit_search_client';
-export * from './document_search_client';
-export * from './repository_search_client';
-export * from './symbol_search_client';
-export * from './repository_object_client';
-export * from './integrations_search_client';
diff --git a/x-pack/legacy/plugins/code/server/search/integrations_search_client.test.ts b/x-pack/legacy/plugins/code/server/search/integrations_search_client.test.ts
deleted file mode 100644
index b8036934a3a2d2..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/integrations_search_client.test.ts
+++ /dev/null
@@ -1,160 +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 sinon from 'sinon';
-
-import { AnyObject, EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { IntegrationsSearchClient } from './integrations_search_client';
-
-let integSearchClient: IntegrationsSearchClient;
-let esClient;
-
-// Setup the entire RepositorySearchClient.
-function initSearchClient() {
-  const log: Logger = (sinon.stub() as any) as Logger;
-  esClient = initEsClient();
-
-  integSearchClient = new IntegrationsSearchClient(esClient, log);
-}
-
-const mockSearchResults = [
-  // 1. The first response is a valid DocumentSearchResult with 1 doc
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 1,
-      },
-      hits: [
-        {
-          _source: {
-            repoUri: 'github.com/Microsoft/TypeScript-Node-Starter',
-            path: 'src/types/express-flash.d.ts',
-            content:
-              "\n/// <reference types='express' />\n\n// Add RequestValidation Interface on to Express's Request Interface.\ndeclare namespace Express {\n    interface Request extends Flash {}\n}\n\ninterface Flash {\n    flash(type: string, message: any): void;\n}\n\ndeclare module 'express-flash';\n\n",
-            language: 'typescript',
-            qnames: ['express-flash', 'Express', 'Request', 'Flash', 'flash'],
-          },
-          highlight: {
-            content: [
-              'declare namespace Express {\n    interface Request extends Flash {}\n}\n\ninterface Flash {\n    flash(type: _@-string-@_',
-            ],
-          },
-        },
-      ],
-    },
-  },
-  // 2. The second response is a valid DocumentSearchResult with 0 doc
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 0,
-      },
-      hits: [],
-    },
-    aggregations: {
-      repoUri: {
-        buckets: [],
-      },
-      language: {
-        buckets: [],
-      },
-    },
-  },
-  // 3. The third response is a valid DocumentSearchResult with 0 doc
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 0,
-      },
-      hits: [],
-    },
-    aggregations: {
-      repoUri: {
-        buckets: [],
-      },
-      language: {
-        buckets: [],
-      },
-    },
-  },
-];
-
-// Setup the mock EsClient.
-function initEsClient(): EsClient {
-  esClient = {
-    search: async (_: AnyObject): Promise<any> => {
-      Promise.resolve({});
-    },
-  };
-  const searchStub = sinon.stub(esClient, 'search');
-
-  // Binding the mock search results to the stub.
-  mockSearchResults.forEach((result, index) => {
-    searchStub.onCall(index).returns(Promise.resolve(result));
-  });
-
-  return (esClient as any) as EsClient;
-}
-
-beforeEach(() => {
-  initSearchClient();
-});
-
-test('Document search', async () => {
-  // 1. The first response should have 1 result.
-  const responseWithResult = await integSearchClient.resolveSnippets({
-    repoUris: ['github.com/Microsoft/TypeScript-Node-Starter'],
-    filePath: 'src/types/express-flash.d.ts',
-    lineNumStart: 3,
-    lineNumEnd: 7,
-  });
-  expect(responseWithResult).toEqual(
-    expect.objectContaining({
-      fallback: false,
-      took: 1,
-      total: 1,
-      results: [
-        {
-          uri: 'github.com/Microsoft/TypeScript-Node-Starter',
-          filePath: 'src/types/express-flash.d.ts',
-          compositeContent: {
-            // Content is shorted
-            content:
-              "\n/// <reference types='express' />\n\n// Add RequestValidation Interface on to Express's Request Interface.\ndeclare namespace Express {\n    interface Request extends Flash {}\n}\n\ninterface Flash {\n",
-            // Line mapping data is populated
-            lineMapping: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '..'],
-            // Highlight ranges are calculated
-            ranges: [
-              {
-                endColumn: 1,
-                endLineNumber: 7,
-                startColumn: 1,
-                startLineNumber: 3,
-              },
-            ],
-          },
-          language: 'typescript',
-          hits: 1,
-        },
-      ],
-    })
-  );
-
-  // 2. The first response should have 0 results.
-  const responseWithEmptyResult = await integSearchClient.resolveSnippets({
-    repoUris: ['github.com/Microsoft/TypeScript-Node-Starter'],
-    filePath: 'src/types/foo-bar',
-    lineNumStart: 3,
-    lineNumEnd: 7,
-  });
-  expect(responseWithEmptyResult.results!.length).toEqual(0);
-  expect(responseWithEmptyResult.total).toEqual(0);
-  expect(responseWithEmptyResult.fallback).toBeTruthy();
-});
diff --git a/x-pack/legacy/plugins/code/server/search/integrations_search_client.ts b/x-pack/legacy/plugins/code/server/search/integrations_search_client.ts
deleted file mode 100644
index 2c0a986745429b..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/integrations_search_client.ts
+++ /dev/null
@@ -1,121 +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 {
-  Document,
-  IntegrationsSearchResult,
-  ResolveSnippetsRequest,
-  SearchResultItem,
-  SourceHit,
-  emptyIntegrationsSearchResult,
-} from '../../model';
-import { DocumentSearchIndexWithScope } from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { DocumentSearchClient } from './document_search_client';
-
-export class IntegrationsSearchClient extends DocumentSearchClient {
-  constructor(protected readonly client: EsClient, protected readonly log: Logger) {
-    super(client, log);
-  }
-
-  public async resolveSnippets(req: ResolveSnippetsRequest): Promise<IntegrationsSearchResult> {
-    const { repoUris, filePath, lineNumStart, lineNumEnd } = req;
-    const index = DocumentSearchIndexWithScope(repoUris);
-    if (index.length === 0) {
-      return emptyIntegrationsSearchResult();
-    }
-
-    let fallback = false;
-    let rawRes = await this.client.search({
-      index,
-      body: {
-        query: {
-          term: {
-            'path.keyword': {
-              value: filePath,
-            },
-          },
-        },
-      },
-    });
-    if (rawRes.hits.hits.length === 0) {
-      // Fall back with match query with gauss score normalization on path length.
-      rawRes = await this.client.search({
-        index,
-        body: {
-          query: {
-            script_score: {
-              query: {
-                term: {
-                  'path.hierarchy': {
-                    value: filePath,
-                  },
-                },
-              },
-              script: {
-                source:
-                  "decayNumericGauss(params.origin, params.scale, params.offset, params.decay, doc['path.keyword'].value.length())",
-                params: {
-                  origin: filePath.length,
-                  scale: 20,
-                  offset: 0,
-                  decay: 0.8,
-                },
-              },
-            },
-          },
-        },
-      });
-      fallback = true;
-    }
-
-    const total = rawRes.hits.total.value;
-    const hits: any[] = rawRes.hits.hits;
-    const results: SearchResultItem[] = hits.map(hit => {
-      const doc: Document = hit._source;
-      const { repoUri: uri, path, language } = doc;
-
-      const sourceContent = this.getSnippetContent(doc, lineNumStart, lineNumEnd);
-      const item: SearchResultItem = {
-        uri,
-        filePath: path,
-        language: language!,
-        hits: 1,
-        compositeContent: sourceContent,
-      };
-      return item;
-    });
-
-    return {
-      results,
-      fallback,
-      took: rawRes.took,
-      total,
-    };
-  }
-
-  private getSnippetContent(doc: Document, lineNumStart: number, lineNumEnd?: number) {
-    const hit: SourceHit = {
-      range: {
-        startLoc: {
-          line: lineNumStart - 1,
-          column: 0,
-          offset: 0,
-        },
-        endLoc: {
-          line: lineNumEnd === undefined ? lineNumStart - 1 : lineNumEnd - 1,
-          column: 0,
-          offset: 0,
-        },
-      },
-      score: 0,
-      term: '',
-    };
-
-    return super.getSourceContent([hit], doc);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/search/repository_object_client.test.ts b/x-pack/legacy/plugins/code/server/search/repository_object_client.test.ts
deleted file mode 100644
index ed643929158852..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/repository_object_client.test.ts
+++ /dev/null
@@ -1,318 +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 sinon from 'sinon';
-
-import {
-  CloneWorkerProgress,
-  Repository,
-  WorkerProgress,
-  WorkerReservedProgress,
-} from '../../model';
-import {
-  RepositoryDeleteStatusReservedField,
-  RepositoryGitStatusReservedField,
-  RepositoryIndexName,
-  RepositoryIndexNamePrefix,
-  RepositoryIndexStatusReservedField,
-  RepositoryReservedField,
-} from '../indexer/schema';
-import { AnyObject, EsClient } from '../lib/esqueue';
-import { RepositoryObjectClient } from './repository_object_client';
-
-const esClient = {
-  get: async (_: AnyObject): Promise<any> => {
-    Promise.resolve({});
-  },
-  search: async (_: AnyObject): Promise<any> => {
-    Promise.resolve({});
-  },
-  update: async (_: AnyObject): Promise<any> => {
-    Promise.resolve({});
-  },
-  delete: async (_: AnyObject): Promise<any> => {
-    Promise.resolve({});
-  },
-  index: async (_: AnyObject): Promise<any> => {
-    Promise.resolve({});
-  },
-};
-const repoObjectClient = new RepositoryObjectClient((esClient as any) as EsClient);
-
-afterEach(() => {
-  sinon.restore();
-});
-
-test('CRUD of Repository', async () => {
-  const repoUri = 'github.com/elastic/code';
-
-  // Create
-  const indexSpy = sinon.spy(esClient, 'index');
-  const cObj: Repository = {
-    uri: repoUri,
-    url: 'https://github.com/elastic/code.git',
-    org: 'elastic',
-    name: 'code',
-  };
-  await repoObjectClient.setRepository(repoUri, cObj);
-  expect(indexSpy.calledOnce).toBeTruthy();
-  expect(indexSpy.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryReservedField,
-      body: JSON.stringify({
-        [RepositoryReservedField]: cObj,
-      }),
-    })
-  );
-
-  // Read
-  const getFake = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryReservedField]: cObj,
-      },
-    })
-  );
-  esClient.get = getFake;
-  await repoObjectClient.getRepository(repoUri);
-  expect(getFake.calledOnce).toBeTruthy();
-  expect(getFake.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryReservedField,
-    })
-  );
-
-  // Update
-  const updateSpy = sinon.spy(esClient, 'update');
-  const uObj = {
-    url: 'https://github.com/elastic/codesearch.git',
-  };
-  await repoObjectClient.updateRepository(repoUri, uObj);
-  expect(updateSpy.calledOnce).toBeTruthy();
-  expect(updateSpy.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryReservedField,
-      body: JSON.stringify({
-        doc: {
-          [RepositoryReservedField]: uObj,
-        },
-      }),
-    })
-  );
-});
-
-test('Get All Repositories', async () => {
-  const cObj: Repository = {
-    uri: 'github.com/elastic/code',
-    url: 'https://github.com/elastic/code.git',
-    org: 'elastic',
-    name: 'code',
-  };
-  const searchFake = sinon.fake.returns(
-    Promise.resolve({
-      hits: {
-        hits: [
-          {
-            _source: {
-              [RepositoryReservedField]: cObj,
-            },
-          },
-        ],
-      },
-    })
-  );
-  esClient.search = searchFake;
-  await repoObjectClient.getAllRepositories();
-  expect(searchFake.calledOnce).toBeTruthy();
-  expect(searchFake.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: `${RepositoryIndexNamePrefix}*`,
-    })
-  );
-});
-
-test('CRUD of Repository Git Status', async () => {
-  const repoUri = 'github.com/elastic/code';
-
-  // Create
-  const indexSpy = sinon.spy(esClient, 'index');
-  const cObj: CloneWorkerProgress = {
-    uri: repoUri,
-    progress: WorkerReservedProgress.COMPLETED,
-    timestamp: new Date(),
-  };
-  await repoObjectClient.setRepositoryGitStatus(repoUri, cObj);
-  expect(indexSpy.calledOnce).toBeTruthy();
-  expect(indexSpy.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryGitStatusReservedField,
-      body: JSON.stringify({
-        [RepositoryGitStatusReservedField]: cObj,
-      }),
-    })
-  );
-
-  // Read
-  const getFake = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryGitStatusReservedField]: cObj,
-      },
-    })
-  );
-  esClient.get = getFake;
-  await repoObjectClient.getRepositoryGitStatus(repoUri);
-  expect(getFake.calledOnce).toBeTruthy();
-  expect(getFake.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryGitStatusReservedField,
-    })
-  );
-
-  // Update
-  const updateSpy = sinon.spy(esClient, 'update');
-  const uObj = {
-    progress: 50,
-  };
-  await repoObjectClient.updateRepositoryGitStatus(repoUri, uObj);
-  expect(updateSpy.calledOnce).toBeTruthy();
-  expect(updateSpy.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryGitStatusReservedField,
-      body: JSON.stringify({
-        doc: {
-          [RepositoryGitStatusReservedField]: uObj,
-        },
-      }),
-    })
-  );
-});
-
-test('CRUD of Repository LSP Index Status', async () => {
-  const repoUri = 'github.com/elastic/code';
-
-  // Create
-  const indexSpy = sinon.spy(esClient, 'index');
-  const cObj: WorkerProgress = {
-    uri: repoUri,
-    progress: WorkerReservedProgress.COMPLETED,
-    timestamp: new Date(),
-  };
-  await repoObjectClient.setRepositoryIndexStatus(repoUri, cObj);
-  expect(indexSpy.calledOnce).toBeTruthy();
-  expect(indexSpy.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryIndexStatusReservedField,
-      body: JSON.stringify({
-        [RepositoryIndexStatusReservedField]: cObj,
-      }),
-    })
-  );
-
-  // Read
-  const getFake = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryIndexStatusReservedField]: cObj,
-      },
-    })
-  );
-  esClient.get = getFake;
-  await repoObjectClient.getRepositoryIndexStatus(repoUri);
-  expect(getFake.calledOnce).toBeTruthy();
-  expect(getFake.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryIndexStatusReservedField,
-    })
-  );
-
-  // Update
-  const updateSpy = sinon.spy(esClient, 'update');
-  const uObj = {
-    progress: 50,
-  };
-  await repoObjectClient.updateRepositoryIndexStatus(repoUri, uObj);
-  expect(updateSpy.calledOnce).toBeTruthy();
-  expect(updateSpy.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryIndexStatusReservedField,
-      body: JSON.stringify({
-        doc: {
-          [RepositoryIndexStatusReservedField]: uObj,
-        },
-      }),
-    })
-  );
-});
-
-test('CRUD of Repository Delete Status', async () => {
-  const repoUri = 'github.com/elastic/code';
-
-  // Create
-  const indexSpy = sinon.spy(esClient, 'index');
-  const cObj: CloneWorkerProgress = {
-    uri: repoUri,
-    progress: WorkerReservedProgress.COMPLETED,
-    timestamp: new Date(),
-  };
-  await repoObjectClient.setRepositoryDeleteStatus(repoUri, cObj);
-  expect(indexSpy.calledOnce).toBeTruthy();
-  expect(indexSpy.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryDeleteStatusReservedField,
-      body: JSON.stringify({
-        [RepositoryDeleteStatusReservedField]: cObj,
-      }),
-    })
-  );
-
-  // Read
-  const getFake = sinon.fake.returns(
-    Promise.resolve({
-      _source: {
-        [RepositoryDeleteStatusReservedField]: cObj,
-      },
-    })
-  );
-  esClient.get = getFake;
-  await repoObjectClient.getRepositoryDeleteStatus(repoUri);
-  expect(getFake.calledOnce).toBeTruthy();
-  expect(getFake.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryDeleteStatusReservedField,
-    })
-  );
-
-  // Update
-  const updateSpy = sinon.spy(esClient, 'update');
-  const uObj = {
-    progress: 50,
-  };
-  await repoObjectClient.updateRepositoryDeleteStatus(repoUri, uObj);
-  expect(updateSpy.calledOnce).toBeTruthy();
-  expect(updateSpy.getCall(0).args[0]).toEqual(
-    expect.objectContaining({
-      index: RepositoryIndexName(repoUri),
-      id: RepositoryDeleteStatusReservedField,
-      body: JSON.stringify({
-        doc: {
-          [RepositoryDeleteStatusReservedField]: uObj,
-        },
-      }),
-    })
-  );
-});
diff --git a/x-pack/legacy/plugins/code/server/search/repository_object_client.ts b/x-pack/legacy/plugins/code/server/search/repository_object_client.ts
deleted file mode 100644
index 23ae73d35b8fc5..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/repository_object_client.ts
+++ /dev/null
@@ -1,167 +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 {
-  CloneWorkerProgress,
-  Repository,
-  RepositoryConfig,
-  RepositoryUri,
-  WorkerProgress,
-} from '../../model';
-import {
-  RepositoryConfigReservedField,
-  RepositoryDeleteStatusReservedField,
-  RepositoryGitStatusReservedField,
-  RepositoryIndexName,
-  RepositoryIndexNamePrefix,
-  RepositoryIndexStatusReservedField,
-  RepositoryReservedField,
-  RepositorySearchIndexWithScope,
-} from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-
-/*
- * This RepositoryObjectClient is dedicated to manipulate resository related objects
- * stored in ES.
- */
-export class RepositoryObjectClient {
-  constructor(protected readonly esClient: EsClient) {}
-
-  public async getRepositoryGitStatus(repoUri: RepositoryUri): Promise<CloneWorkerProgress> {
-    return await this.getRepositoryObject(repoUri, RepositoryGitStatusReservedField);
-  }
-
-  public async getRepositoryIndexStatus(repoUri: RepositoryUri): Promise<WorkerProgress> {
-    return await this.getRepositoryObject(repoUri, RepositoryIndexStatusReservedField);
-  }
-
-  public async getRepositoryDeleteStatus(repoUri: RepositoryUri): Promise<WorkerProgress> {
-    return await this.getRepositoryObject(repoUri, RepositoryDeleteStatusReservedField);
-  }
-
-  public async getRepositoryConfig(repoUri: RepositoryUri): Promise<RepositoryConfig> {
-    return await this.getRepositoryObject(repoUri, RepositoryConfigReservedField);
-  }
-
-  public async getRepositories(uris: string[]): Promise<Repository[]> {
-    if (uris.length === 0) {
-      return [];
-    }
-    return this.getRepositoriesInternal(RepositorySearchIndexWithScope(uris));
-  }
-
-  public async getRepository(repoUri: RepositoryUri): Promise<Repository> {
-    return await this.getRepositoryObject(repoUri, RepositoryReservedField);
-  }
-
-  public async getAllRepositories(): Promise<Repository[]> {
-    return await this.getRepositoriesInternal(`${RepositoryIndexNamePrefix}*`);
-  }
-
-  private async getRepositoriesInternal(index: string) {
-    const res = await this.esClient.search({
-      index,
-      body: {
-        query: {
-          exists: {
-            field: RepositoryReservedField,
-          },
-        },
-      },
-      from: 0,
-      size: 10000,
-    });
-    const hits: any[] = res.hits.hits;
-    const repos: Repository[] = hits.map(hit => {
-      const repo: Repository = hit._source[RepositoryReservedField];
-      return repo;
-    });
-    return repos;
-  }
-
-  public async setRepositoryGitStatus(repoUri: RepositoryUri, gitStatus: CloneWorkerProgress) {
-    return await this.setRepositoryObject(repoUri, RepositoryGitStatusReservedField, gitStatus);
-  }
-
-  public async setRepositoryIndexStatus(repoUri: RepositoryUri, indexStatus: WorkerProgress) {
-    return await this.setRepositoryObject(repoUri, RepositoryIndexStatusReservedField, indexStatus);
-  }
-
-  public async setRepositoryDeleteStatus(repoUri: RepositoryUri, deleteStatus: WorkerProgress) {
-    return await this.setRepositoryObject(
-      repoUri,
-      RepositoryDeleteStatusReservedField,
-      deleteStatus
-    );
-  }
-
-  public async setRepositoryConfig(repoUri: RepositoryUri, config: RepositoryConfig) {
-    return await this.setRepositoryObject(repoUri, RepositoryConfigReservedField, config);
-  }
-
-  public async setRepository(repoUri: RepositoryUri, repo: Repository) {
-    return await this.setRepositoryObject(repoUri, RepositoryReservedField, repo);
-  }
-
-  public async updateRepositoryGitStatus(repoUri: RepositoryUri, obj: any) {
-    return await this.updateRepositoryObject(repoUri, RepositoryGitStatusReservedField, obj);
-  }
-
-  public async updateRepositoryIndexStatus(repoUri: RepositoryUri, obj: any) {
-    return await this.updateRepositoryObject(repoUri, RepositoryIndexStatusReservedField, obj);
-  }
-
-  public async updateRepositoryDeleteStatus(repoUri: RepositoryUri, obj: any) {
-    return await this.updateRepositoryObject(repoUri, RepositoryDeleteStatusReservedField, obj);
-  }
-
-  public async updateRepository(repoUri: RepositoryUri, obj: any) {
-    return await this.updateRepositoryObject(repoUri, RepositoryReservedField, obj);
-  }
-
-  private async getRepositoryObject(
-    repoUri: RepositoryUri,
-    reservedFieldName: string
-  ): Promise<any> {
-    const res = await this.esClient.get({
-      index: RepositoryIndexName(repoUri),
-      id: this.getRepositoryObjectId(reservedFieldName),
-    });
-    return res._source[reservedFieldName];
-  }
-
-  private async setRepositoryObject(repoUri: RepositoryUri, reservedFieldName: string, obj: any) {
-    return await this.esClient.index({
-      index: RepositoryIndexName(repoUri),
-      id: this.getRepositoryObjectId(reservedFieldName),
-      refresh: 'true',
-      body: JSON.stringify({
-        [reservedFieldName]: obj,
-      }),
-    });
-  }
-
-  private async updateRepositoryObject(
-    repoUri: RepositoryUri,
-    reservedFieldName: string,
-    obj: any
-  ) {
-    return await this.esClient.update({
-      index: RepositoryIndexName(repoUri),
-      id: this.getRepositoryObjectId(reservedFieldName),
-      refresh: 'true',
-      body: JSON.stringify({
-        doc: {
-          [reservedFieldName]: obj,
-        },
-      }),
-    });
-  }
-
-  private getRepositoryObjectId(reservedFieldName: string): string {
-    return reservedFieldName;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/search/repository_search_client.test.ts b/x-pack/legacy/plugins/code/server/search/repository_search_client.test.ts
deleted file mode 100644
index 1198ac7fb139ba..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/repository_search_client.test.ts
+++ /dev/null
@@ -1,133 +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 sinon from 'sinon';
-
-import { RepositoryReservedField } from '../indexer/schema';
-import { AnyObject, EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { RepositorySearchClient } from './repository_search_client';
-
-let repoSearchClient: RepositorySearchClient;
-let esClient;
-
-// Setup the entire RepositorySearchClient.
-function initSearchClient() {
-  const log: Logger = (sinon.stub() as any) as Logger;
-  esClient = initEsClient();
-
-  repoSearchClient = new RepositorySearchClient(esClient, log);
-}
-
-const mockSearchResults = [
-  // 1. The first response is a valid RepositorySearchResult with 2 repos
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 2,
-      },
-      hits: [
-        {
-          _source: {
-            [RepositoryReservedField]: {
-              uri: 'github.com/elastic/elasticsearch',
-              url: 'https://github.com/elastic/elasticsearch.git',
-              name: 'elasticsearch',
-              org: 'elastic',
-            },
-          },
-        },
-        {
-          _source: {
-            [RepositoryReservedField]: {
-              uri: 'github.com/elastic/kibana',
-              url: 'https://github.com/elastic/kibana.git',
-              name: 'kibana',
-              org: 'elastic',
-            },
-          },
-        },
-      ],
-    },
-  },
-  // 2. The second response is a valid RepositorySearchResult with 0 repos
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 0,
-      },
-      hits: [],
-    },
-  },
-  // 3. The third response is an invalid RepositorySearchResult with results
-  // but without the RepositoryReservedField
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 1,
-      },
-      hits: [
-        {
-          _source: {},
-        },
-      ],
-    },
-  },
-];
-
-// Setup the mock EsClient.
-function initEsClient(): EsClient {
-  esClient = {
-    search: async (_: AnyObject): Promise<any> => {
-      Promise.resolve({});
-    },
-  };
-  const searchStub = sinon.stub(esClient, 'search');
-
-  // Binding the mock search results to the stub.
-  mockSearchResults.forEach((result, index) => {
-    searchStub.onCall(index).returns(Promise.resolve(result));
-  });
-
-  return (esClient as any) as EsClient;
-}
-
-beforeEach(() => {
-  initSearchClient();
-});
-
-test('Repository search', async () => {
-  // 1. The first response should have 2 results.
-  const responseWithResult = await repoSearchClient.search({ query: 'mockQuery', page: 1 });
-  expect(responseWithResult.repositories.length).toEqual(2);
-  expect(responseWithResult.total).toEqual(2);
-  expect(responseWithResult.repositories[0]).toEqual({
-    uri: 'github.com/elastic/elasticsearch',
-    url: 'https://github.com/elastic/elasticsearch.git',
-    name: 'elasticsearch',
-    org: 'elastic',
-  });
-  expect(responseWithResult.repositories[1]).toEqual({
-    uri: 'github.com/elastic/kibana',
-    url: 'https://github.com/elastic/kibana.git',
-    name: 'kibana',
-    org: 'elastic',
-  });
-
-  // 2. The second response should have 0 result.
-  const responseWithEmptyResult = await repoSearchClient.search({ query: 'mockQuery', page: 1 });
-  expect(responseWithEmptyResult.repositories.length).toEqual(0);
-  expect(responseWithEmptyResult.total).toEqual(0);
-
-  // 3. The third response should have 1 hit, but 0 RepositorySearchResults, because the result
-  // does not have the RepositoryReservedField.
-  const responseWithInvalidResult = await repoSearchClient.search({ query: 'mockQuery', page: 1 });
-  expect(responseWithInvalidResult.repositories.length).toEqual(0);
-  expect(responseWithInvalidResult.total).toEqual(1);
-});
diff --git a/x-pack/legacy/plugins/code/server/search/repository_search_client.ts b/x-pack/legacy/plugins/code/server/search/repository_search_client.ts
deleted file mode 100644
index 6e6f42cbd7b59b..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/repository_search_client.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  Repository,
-  RepositorySearchRequest,
-  RepositorySearchResult,
-  emptyRepositorySearchResult,
-} from '../../model';
-import {
-  RepositoryIndexNamePrefix,
-  RepositoryReservedField,
-  RepositorySearchIndexWithScope,
-} from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { AbstractSearchClient } from './abstract_search_client';
-
-export class RepositorySearchClient extends AbstractSearchClient {
-  constructor(protected readonly client: EsClient, protected readonly log: Logger) {
-    super(client, log);
-  }
-
-  public async search(req: RepositorySearchRequest): Promise<RepositorySearchResult> {
-    const resultsPerPage = this.getResultsPerPage(req);
-    const from = (req.page - 1) * resultsPerPage;
-    const size = resultsPerPage;
-
-    const index = req.repoScope
-      ? RepositorySearchIndexWithScope(req.repoScope)
-      : `${RepositoryIndexNamePrefix}*`;
-
-    if (index.length === 0) {
-      return emptyRepositorySearchResult();
-    }
-
-    const queryStr = req.query.toLowerCase();
-
-    const rawRes = await this.client.search({
-      index,
-      body: {
-        from,
-        size,
-        query: {
-          bool: {
-            should: [
-              {
-                simple_query_string: {
-                  query: queryStr,
-                  fields: [
-                    `${RepositoryReservedField}.name^1.0`,
-                    `${RepositoryReservedField}.org^1.0`,
-                  ],
-                  default_operator: 'or',
-                  lenient: false,
-                  analyze_wildcard: false,
-                  boost: 1.0,
-                },
-              },
-              // This prefix query is mostly for typeahead search.
-              {
-                prefix: {
-                  [`${RepositoryReservedField}.name`]: {
-                    value: queryStr,
-                    boost: 100.0,
-                  },
-                },
-              },
-            ],
-            disable_coord: false,
-            adjust_pure_negative: true,
-            boost: 1.0,
-          },
-        },
-      },
-    });
-
-    const hits: any[] = rawRes.hits.hits;
-    const repos: Repository[] = hits
-      .filter(hit => hit._source[RepositoryReservedField])
-      .map(hit => {
-        const repo: Repository = hit._source[RepositoryReservedField];
-        return repo;
-      });
-    const total = rawRes.hits.total.value;
-    return {
-      repositories: repos,
-      took: rawRes.took,
-      total,
-      from,
-      page: req.page,
-      totalPage: Math.ceil(total / resultsPerPage),
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/search/search_client.ts b/x-pack/legacy/plugins/code/server/search/search_client.ts
deleted file mode 100644
index a98d468d59b5fc..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/search_client.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { SearchRequest, SearchResult } from '../../model';
-
-export interface SearchClient {
-  search(req: SearchRequest): Promise<SearchResult>;
-}
diff --git a/x-pack/legacy/plugins/code/server/search/symbol_search_client.test.ts b/x-pack/legacy/plugins/code/server/search/symbol_search_client.test.ts
deleted file mode 100644
index 7df66dc3181c04..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/symbol_search_client.test.ts
+++ /dev/null
@@ -1,168 +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 sinon from 'sinon';
-
-import { AnyObject, EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { SymbolSearchClient } from './symbol_search_client';
-
-let symbolSearchClient: SymbolSearchClient;
-let esClient;
-
-// Setup the entire SymbolSearchClient.
-function initSearchClient() {
-  const log: Logger = (sinon.stub() as any) as Logger;
-  esClient = initEsClient();
-
-  symbolSearchClient = new SymbolSearchClient(esClient, log);
-}
-
-const mockSearchResults = [
-  // 1. The first response is a valid SymbolSearchResult with 2 symbols
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 2,
-      },
-      hits: [
-        {
-          _source: {
-            qname: 'copyStaticAssets.shell',
-            symbolInformation: {
-              name: 'shell',
-              kind: 13,
-              location: {
-                uri:
-                  'git://github.com/Microsoft/TypeScript-Node-Starter/blob/4779cb7/copyStaticAssets.ts',
-                range: {
-                  start: {
-                    line: 0,
-                    character: 7,
-                  },
-                  end: {
-                    line: 0,
-                    character: 17,
-                  },
-                },
-              },
-              containerName: 'copyStaticAssets',
-            },
-          },
-        },
-        {
-          _source: {
-            qname: 'app.apiController',
-            symbolInformation: {
-              name: 'apiController',
-              kind: 13,
-              location: {
-                uri: 'git://github.com/Microsoft/TypeScript-Node-Starter/blob/4779cb7/src/app.ts',
-                range: {
-                  start: {
-                    line: 24,
-                    character: 7,
-                  },
-                  end: {
-                    line: 24,
-                    character: 25,
-                  },
-                },
-              },
-              containerName: 'app',
-            },
-          },
-        },
-      ],
-    },
-  },
-  // 2. The second response is a valid SymbolSearchResult with 0 symbol.
-  {
-    took: 1,
-    hits: {
-      total: {
-        value: 0,
-      },
-      hits: [],
-    },
-  },
-];
-
-// Setup the mock EsClient.
-function initEsClient(): EsClient {
-  esClient = {
-    search: async (_: AnyObject): Promise<any> => {
-      Promise.resolve({});
-    },
-  };
-  const searchStub = sinon.stub(esClient, 'search');
-
-  // Binding the mock search results to the stub.
-  mockSearchResults.forEach((result, index) => {
-    searchStub.onCall(index).returns(Promise.resolve(result));
-  });
-
-  return (esClient as any) as EsClient;
-}
-
-beforeEach(() => {
-  initSearchClient();
-});
-
-test('Symbol suggest/typeahead', async () => {
-  // 1. The first response should have 2 results.
-  const responseWithResult = await symbolSearchClient.suggest({ query: 'mockQuery', page: 1 });
-  expect(responseWithResult.symbols.length).toEqual(2);
-  expect(responseWithResult.total).toEqual(2);
-  expect(responseWithResult.symbols[0]).toEqual({
-    qname: 'copyStaticAssets.shell',
-    symbolInformation: {
-      name: 'shell',
-      kind: 13,
-      location: {
-        uri: 'git://github.com/Microsoft/TypeScript-Node-Starter/blob/4779cb7/copyStaticAssets.ts',
-        range: {
-          start: {
-            line: 0,
-            character: 7,
-          },
-          end: {
-            line: 0,
-            character: 17,
-          },
-        },
-      },
-      containerName: 'copyStaticAssets',
-    },
-  });
-  expect(responseWithResult.symbols[1]).toEqual({
-    qname: 'app.apiController',
-    symbolInformation: {
-      name: 'apiController',
-      kind: 13,
-      location: {
-        uri: 'git://github.com/Microsoft/TypeScript-Node-Starter/blob/4779cb7/src/app.ts',
-        range: {
-          start: {
-            line: 24,
-            character: 7,
-          },
-          end: {
-            line: 24,
-            character: 25,
-          },
-        },
-      },
-      containerName: 'app',
-    },
-  });
-
-  // 2. The second response should have 0 results.
-  const responseWithEmptyResult = await symbolSearchClient.suggest({ query: 'mockQuery', page: 1 });
-  expect(responseWithEmptyResult.symbols.length).toEqual(0);
-  expect(responseWithEmptyResult.total).toEqual(0);
-});
diff --git a/x-pack/legacy/plugins/code/server/search/symbol_search_client.ts b/x-pack/legacy/plugins/code/server/search/symbol_search_client.ts
deleted file mode 100644
index 686961333aed02..00000000000000
--- a/x-pack/legacy/plugins/code/server/search/symbol_search_client.ts
+++ /dev/null
@@ -1,152 +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 { DetailSymbolInformation } from '@elastic/lsp-extension';
-
-import { SymbolSearchRequest, SymbolSearchResult, emptySymbolSearchResult } from '../../model';
-import { SymbolIndexNamePrefix, SymbolSearchIndexWithScope } from '../indexer/schema';
-import { EsClient } from '../lib/esqueue';
-import { Logger } from '../log';
-import { AbstractSearchClient } from './abstract_search_client';
-
-export class SymbolSearchClient extends AbstractSearchClient {
-  constructor(protected readonly client: EsClient, protected readonly log: Logger) {
-    super(client, log);
-  }
-
-  public async findByQname(qname: string, repoScope: string[]): Promise<SymbolSearchResult> {
-    const [from, size] = [0, 1];
-    const rawRes = await this.client.search({
-      index: SymbolSearchIndexWithScope(repoScope),
-      body: {
-        from,
-        size,
-        query: {
-          term: {
-            qname,
-          },
-        },
-      },
-    });
-    return this.handleResults(rawRes);
-  }
-
-  public async suggest(req: SymbolSearchRequest): Promise<SymbolSearchResult> {
-    const resultsPerPage = this.getResultsPerPage(req);
-    const from = (req.page - 1) * resultsPerPage;
-    const size = resultsPerPage;
-
-    const index = req.repoScope
-      ? SymbolSearchIndexWithScope(req.repoScope)
-      : `${SymbolIndexNamePrefix}*`;
-    if (index.length === 0) {
-      return emptySymbolSearchResult();
-    }
-
-    const rawRes = await this.client.search({
-      index,
-      body: {
-        from,
-        size,
-        query: {
-          bool: {
-            should: [
-              // Boost more for case sensitive prefix query.
-              {
-                prefix: {
-                  qname: {
-                    value: req.query,
-                    boost: 2.0,
-                  },
-                },
-              },
-              // Boost less for lowercased prefix query.
-              {
-                prefix: {
-                  'qname.lowercased': {
-                    // prefix query does not apply analyzer for query. so manually lowercase the query in here.
-                    value: req.query.toLowerCase(),
-                    boost: 1.0,
-                  },
-                },
-              },
-              // Boost the exact match with case sensitive query the most.
-              {
-                term: {
-                  qname: {
-                    value: req.query,
-                    boost: 20.0,
-                  },
-                },
-              },
-              {
-                term: {
-                  'qname.lowercased': {
-                    // term query does not apply analyzer for query either. so manually lowercase the query in here.
-                    value: req.query.toLowerCase(),
-                    boost: 10.0,
-                  },
-                },
-              },
-              // The same applies for `symbolInformation.name` feild.
-              {
-                prefix: {
-                  'symbolInformation.name': {
-                    value: req.query,
-                    boost: 2.0,
-                  },
-                },
-              },
-              {
-                prefix: {
-                  'symbolInformation.name.lowercased': {
-                    value: req.query.toLowerCase(),
-                    boost: 1.0,
-                  },
-                },
-              },
-              {
-                term: {
-                  'symbolInformation.name': {
-                    value: req.query,
-                    boost: 20.0,
-                  },
-                },
-              },
-              {
-                term: {
-                  'symbolInformation.name.lowercased': {
-                    value: req.query.toLowerCase(),
-                    boost: 10.0,
-                  },
-                },
-              },
-            ],
-            disable_coord: false,
-            adjust_pure_negative: true,
-            boost: 1.0,
-          },
-        },
-      },
-    });
-
-    return this.handleResults(rawRes);
-  }
-
-  private handleResults(rawRes: any) {
-    const hits: any[] = rawRes.hits.hits;
-    const symbols: DetailSymbolInformation[] = hits.map(hit => {
-      const symbol: DetailSymbolInformation = hit._source;
-      return symbol;
-    });
-    const result: SymbolSearchResult = {
-      symbols,
-      took: rawRes.took,
-      total: rawRes.hits.total.value,
-    };
-    return result;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/security.ts b/x-pack/legacy/plugins/code/server/security.ts
deleted file mode 100644
index 1ed8e86d0b15e9..00000000000000
--- a/x-pack/legacy/plugins/code/server/security.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { schema } from '@kbn/config-schema';
-
-import { IRouter, RequestHandler } from 'src/core/server';
-import { ServerRouteFacade, RouteOptionsFacade } from '..';
-
-export class CodeServerRouter {
-  constructor(public readonly router: IRouter) {}
-
-  route(route: CodeRoute) {
-    const routeOptions: RouteOptionsFacade = (route.options || {}) as RouteOptionsFacade;
-    const tags = [
-      ...(routeOptions.tags || []),
-      `access:code_${route.requireAdmin ? 'admin' : 'user'}`,
-    ];
-
-    const routeHandler = route.npHandler!;
-
-    switch ((route.method as string).toLowerCase()) {
-      case 'get': {
-        this.router.get(
-          {
-            path: route.path,
-            validate: {
-              query: schema.object({}, { allowUnknowns: true }),
-              params: schema.object({}, { allowUnknowns: true }),
-            },
-            options: {
-              tags,
-            },
-          },
-          routeHandler
-        );
-        break;
-      }
-      case 'put': {
-        this.router.put(
-          {
-            path: route.path,
-            validate: {
-              query: schema.object({}, { allowUnknowns: true }),
-              params: schema.object({}, { allowUnknowns: true }),
-              body: schema.object({}, { allowUnknowns: true }),
-            },
-            options: {
-              tags,
-            },
-          },
-          routeHandler
-        );
-        break;
-      }
-      case 'delete': {
-        this.router.delete(
-          {
-            path: route.path,
-            validate: {
-              query: schema.object({}, { allowUnknowns: true }),
-              params: schema.object({}, { allowUnknowns: true }),
-            },
-            options: {
-              tags,
-            },
-          },
-          routeHandler
-        );
-        break;
-      }
-      case 'patch':
-      case 'post': {
-        this.router.post(
-          {
-            path: route.path,
-            validate: {
-              query: schema.object({}, { allowUnknowns: true }),
-              params: schema.object({}, { allowUnknowns: true }),
-              body: schema.object({}, { allowUnknowns: true }),
-            },
-            options: {
-              tags,
-            },
-          },
-          routeHandler
-        );
-        break;
-      }
-      default: {
-        throw new Error(`Unknown HTTP method: ${route.method}`);
-      }
-    }
-  }
-}
-
-export interface CodeRoute extends ServerRouteFacade {
-  requireAdmin?: boolean;
-  // New Platform Route Handler API
-  npHandler?: RequestHandler<any, any, any>;
-}
diff --git a/x-pack/legacy/plugins/code/server/server_options.ts b/x-pack/legacy/plugins/code/server/server_options.ts
deleted file mode 100644
index e267e6f9146eb1..00000000000000
--- a/x-pack/legacy/plugins/code/server/server_options.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { resolve } from 'path';
-import { RepoConfig, RepoConfigs } from '../model';
-import { CodeNode } from './distributed/cluster/code_nodes';
-
-export interface LspOptions {
-  requestTimeoutMs: number;
-  detach: boolean;
-  oomScoreAdj: boolean;
-}
-
-export interface SecurityOptions {
-  enableMavenImport: boolean;
-  enableGradleImport: boolean;
-  installGoDependency: boolean;
-  installNodeDependency: boolean;
-  gitHostWhitelist: string[];
-  gitProtocolWhitelist: string[];
-  enableJavaSecurityManager: boolean;
-  extraJavaRepositoryWhitelist: string[];
-}
-
-export interface DiskOptions {
-  thresholdEnabled: boolean;
-  watermarkLow: string;
-}
-
-export class ServerOptions {
-  public readonly devMode: boolean = this.config.get('env.dev');
-
-  public readonly workspacePath = resolve(this.config.get('path.data'), 'code/workspace');
-
-  public readonly repoPath = resolve(this.config.get('path.data'), 'code/repos');
-
-  public readonly credsPath = resolve(this.config.get('path.data'), 'code/credentials');
-
-  public readonly jdtWorkspacePath = resolve(this.config.get('path.data'), 'code/jdt_ws');
-
-  public readonly jdtConfigPath = resolve(this.config.get('path.data'), 'code/jdt_config');
-
-  public readonly goPath = resolve(this.config.get('path.data'), 'code/gopath');
-
-  public readonly updateFrequencyMs: number = this.options.updateFrequencyMs;
-
-  public readonly indexFrequencyMs: number = this.options.indexFrequencyMs;
-
-  public readonly updateRepoFrequencyMs: number = this.options.updateRepoFrequencyMs;
-
-  public readonly indexRepoFrequencyMs: number = this.options.indexRepoFrequencyMs;
-
-  public readonly maxWorkspace: number = this.options.maxWorkspace;
-
-  public readonly enableGlobalReference: boolean = this.options.enableGlobalReference;
-
-  public readonly enableCommitIndexing: boolean = this.options.enableCommitIndexing;
-
-  public readonly lsp: LspOptions = this.options.lsp;
-
-  public readonly security: SecurityOptions = this.options.security;
-
-  public readonly disk: DiskOptions = this.options.disk;
-
-  public readonly repoConfigs: RepoConfigs = (this.options.repos as RepoConfig[]).reduce(
-    (previous, current) => {
-      previous[current.repo] = current;
-      return previous;
-    },
-    {} as RepoConfigs
-  );
-
-  public readonly enabled: boolean = this.options.enabled;
-
-  public readonly codeNodeUrl: string = this.options.codeNodeUrl;
-
-  public readonly clusterEnabled: boolean = this.options.clustering.enabled;
-
-  public readonly verbose: boolean = this.options.verbose;
-
-  public readonly codeNodes: CodeNode[] = this.options.clustering.codeNodes;
-
-  public readonly queueIndex: string = this.options.queueIndex;
-  public readonly queueTimeoutMs: number = this.options.queueTimeoutMs;
-
-  constructor(private options: any, private config: any) {}
-
-  /**
-   * TODO 'server.uuid' is not guaranteed to be loaded when the object is constructed.
-   *
-   * See [[manageUuid()]], as it was called asynchronously without actions on the completion.
-   */
-  public get serverUUID(): string {
-    return this.config.get('server.uuid');
-  }
-
-  public get localAddress(): string {
-    const serverCfg = this.config.get('server');
-    return 'http://' + serverCfg.host + ':' + serverCfg.port + serverCfg.basePath;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/test_utils.ts b/x-pack/legacy/plugins/code/server/test_utils.ts
deleted file mode 100644
index 6276515fae1b6b..00000000000000
--- a/x-pack/legacy/plugins/code/server/test_utils.ts
+++ /dev/null
@@ -1,121 +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 fs from 'fs';
-import { Server } from 'hapi';
-import * as os from 'os';
-import path from 'path';
-
-import { simplegit } from '@elastic/simple-git/dist';
-import rimraf from 'rimraf';
-import { AnyObject } from './lib/esqueue';
-import { ServerOptions } from './server_options';
-import { ServerFacade } from '..';
-
-export function prepareProjectByCloning(url: string, p: string) {
-  return new Promise(resolve => {
-    if (!fs.existsSync(p)) {
-      rimraf(p, error => {
-        fs.mkdirSync(p, { recursive: true });
-        const git = simplegit(p);
-        git.clone(url, p, ['--bare']).then(resolve);
-      });
-    } else {
-      resolve();
-    }
-  });
-}
-
-export async function prepareProjectByInit(
-  repoPath: string,
-  commits: { [commitMessage: string]: { [path: string]: string } }
-) {
-  if (!fs.existsSync(repoPath)) fs.mkdirSync(repoPath, { recursive: true });
-  const git = simplegit(repoPath);
-  await git.init();
-  await git.addConfig('user.email', 'test@test.com');
-  await git.addConfig('user.name', 'tester');
-  const results: string[] = [];
-  for (const [message, commit] of Object.entries(commits)) {
-    const files = [];
-    for (const [file, content] of Object.entries(commit)) {
-      const filePath = path.join(repoPath, file);
-      const dir = path.dirname(filePath);
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-      }
-      fs.writeFileSync(filePath, content, 'utf8');
-      files.push(file);
-      await git.add(file);
-    }
-    await git.commit(message, files);
-    const c = await git.revparse(['HEAD']);
-    results.push(c);
-  }
-  return { git, commits: results };
-}
-
-export const emptyAsyncFunc = async (_: AnyObject): Promise<any> => {
-  Promise.resolve({});
-};
-
-const TEST_OPTIONS = {
-  enabled: true,
-  queueIndex: '.code_internal-worker-queue',
-  queueTimeoutMs: 60 * 60 * 1000, // 1 hour by default
-  updateFreqencyMs: 5 * 60 * 1000, // 5 minutes by default
-  indexFrequencyMs: 24 * 60 * 60 * 1000, // 1 day by default
-  lsp: {
-    requestTimeoutMs: 5 * 60, // timeout a request over 30s
-    detach: false,
-    verbose: false,
-  },
-  security: {
-    enableMavenImport: true,
-    enableGradleImport: true,
-    installNodeDependency: true,
-    gitProtocolWhitelist: ['ssh', 'https', 'git'],
-    enableJavaSecurityManager: true,
-  },
-  disk: {
-    thresholdEnabled: true,
-    watermarkLow: '80%',
-  },
-  clustering: {
-    enabled: false,
-    codeNodes: [],
-  },
-  repos: [],
-  maxWorkspace: 5, // max workspace folder for each language server
-};
-
-export function createTestServerOption() {
-  const tmpDataPath = fs.mkdtempSync(path.join(os.tmpdir(), 'code_test'));
-
-  const config = {
-    get(key: string) {
-      if (key === 'path.data') {
-        return tmpDataPath;
-      }
-    },
-  };
-
-  return new ServerOptions(TEST_OPTIONS, config);
-}
-
-export function createTestHapiServer() {
-  const server: ServerFacade = new Server();
-  // @ts-ignore
-  server.config = () => {
-    return {
-      get(key: string) {
-        if (key === 'env.dev') return false;
-        else return true;
-      },
-    };
-  };
-  return server;
-}
diff --git a/x-pack/legacy/plugins/code/server/usage_collector.test.ts b/x-pack/legacy/plugins/code/server/usage_collector.test.ts
deleted file mode 100644
index 1b97c9dcc996b7..00000000000000
--- a/x-pack/legacy/plugins/code/server/usage_collector.test.ts
+++ /dev/null
@@ -1,131 +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 sinon from 'sinon';
-
-import { LanguageServerStatus } from '../common/language_server';
-import { RepositoryReservedField } from './indexer/schema';
-import { EsClient } from './lib/esqueue';
-import { LspService } from './lsp/lsp_service';
-import { emptyAsyncFunc } from './test_utils';
-import * as usageCollector from './usage_collector';
-
-const esClient = {
-  search: emptyAsyncFunc,
-};
-
-const lspService = {
-  languageServerStatus: emptyAsyncFunc,
-};
-
-const createSearchSpy = (): sinon.SinonSpy => {
-  return sinon.fake.returns(
-    Promise.resolve({
-      hits: {
-        hits: [
-          {
-            _source: {
-              [RepositoryReservedField]: {
-                uri: 'github.com/elastic/code1',
-              },
-            },
-          },
-          {
-            _source: {
-              [RepositoryReservedField]: {
-                uri: 'github.com/elastic/code2',
-              },
-            },
-          },
-        ],
-      },
-    })
-  );
-};
-
-describe('Code Usage Collector', () => {
-  let makeUsageCollectorStub: any;
-  let registerStub: any;
-  let serverStub: any;
-  let callClusterStub: any;
-  let languageServerStatusStub: any;
-  let searchStub: any;
-
-  beforeEach(() => {
-    makeUsageCollectorStub = sinon.spy();
-    registerStub = sinon.stub();
-    serverStub = {
-      usage: {
-        collectorSet: { makeUsageCollector: makeUsageCollectorStub, register: registerStub },
-        register: {},
-      },
-    };
-    callClusterStub = sinon.stub();
-
-    searchStub = createSearchSpy();
-    esClient.search = searchStub;
-
-    languageServerStatusStub = sinon.stub();
-    languageServerStatusStub.withArgs('TypeScript').returns(LanguageServerStatus.READY);
-    languageServerStatusStub.withArgs('Java').returns(LanguageServerStatus.READY);
-    languageServerStatusStub.withArgs('Ctags').returns(LanguageServerStatus.READY);
-    languageServerStatusStub.withArgs('Go').returns(LanguageServerStatus.NOT_INSTALLED);
-    lspService.languageServerStatus = languageServerStatusStub;
-  });
-
-  describe('initCodeUsageCollector', () => {
-    it('should call collectorSet.register', () => {
-      usageCollector.initCodeUsageCollector(
-        serverStub,
-        esClient as EsClient,
-        (lspService as any) as LspService
-      );
-      expect(registerStub.calledOnce).toBeTruthy();
-    });
-
-    it('should call makeUsageCollector with type = code', () => {
-      usageCollector.initCodeUsageCollector(
-        serverStub,
-        esClient as EsClient,
-        (lspService as any) as LspService
-      );
-      expect(makeUsageCollectorStub.calledOnce).toBeTruthy();
-      expect(makeUsageCollectorStub.getCall(0).args[0].type).toBe('code');
-    });
-
-    it('should return correct stats', async () => {
-      usageCollector.initCodeUsageCollector(
-        serverStub,
-        esClient as EsClient,
-        (lspService as any) as LspService
-      );
-      const codeStats = await makeUsageCollectorStub.getCall(0).args[0].fetch(callClusterStub);
-      expect(callClusterStub.notCalled).toBeTruthy();
-      expect(codeStats).toEqual({
-        enabled: 1,
-        repositories: 2,
-        langserver: [
-          {
-            enabled: 1,
-            key: 'TypeScript',
-          },
-          {
-            enabled: 1,
-            key: 'Java',
-          },
-          {
-            enabled: 0,
-            key: 'Go',
-          },
-          {
-            enabled: 1,
-            key: 'Ctags',
-          },
-        ],
-      });
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/code/server/usage_collector.ts b/x-pack/legacy/plugins/code/server/usage_collector.ts
deleted file mode 100644
index 0844235821bbb8..00000000000000
--- a/x-pack/legacy/plugins/code/server/usage_collector.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ServerFacade } from '../';
-import { APP_USAGE_TYPE } from '../common/constants';
-import { LanguageServerStatus } from '../common/language_server';
-import { CodeUsageMetrics } from '../model/usage_telemetry_metrics';
-import { EsClient } from './lib/esqueue';
-import { RepositoryObjectClient } from './search';
-import { LspService } from './lsp/lsp_service';
-import { LanguageServers, LanguageServerDefinition } from './lsp/language_servers';
-
-export async function fetchCodeUsageMetrics(client: EsClient, lspService: LspService) {
-  const repositoryObjectClient: RepositoryObjectClient = new RepositoryObjectClient(client);
-  const allRepos = await repositoryObjectClient.getAllRepositories();
-  const langServerEnabled = async (name: string) => {
-    const status = await lspService.languageServerStatus(name);
-    return status !== LanguageServerStatus.NOT_INSTALLED ? 1 : 0;
-  };
-
-  const langServersEnabled = await Promise.all(
-    LanguageServers.map(async (langServer: LanguageServerDefinition) => {
-      return {
-        key: langServer.name,
-        enabled: await langServerEnabled(langServer.name),
-      };
-    })
-  );
-
-  return {
-    [CodeUsageMetrics.ENABLED]: 1,
-    [CodeUsageMetrics.REPOSITORIES]: allRepos.length,
-    [CodeUsageMetrics.LANGUAGE_SERVERS]: langServersEnabled,
-  };
-}
-
-export function initCodeUsageCollector(
-  server: ServerFacade,
-  client: EsClient,
-  lspService: LspService
-) {
-  const codeUsageCollector = server.usage.collectorSet.makeUsageCollector({
-    type: APP_USAGE_TYPE,
-    isReady: () => true,
-    fetch: async () => fetchCodeUsageMetrics(client, lspService),
-  });
-
-  server.usage.collectorSet.register(codeUsageCollector);
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/buffer.test.ts b/x-pack/legacy/plugins/code/server/utils/buffer.test.ts
deleted file mode 100644
index d06279080958a9..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/buffer.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { extractLines } from './buffer';
-const text = `line0
-line1
-line2
-line3
-line4`;
-
-const buffer = Buffer.from(text);
-
-test('extract first line from buffer', () => {
-  const lines = extractLines(buffer, 0, 1);
-  expect(lines).toEqual('line0');
-});
-
-test('extract 2 lines from buffer', () => {
-  const lines = extractLines(buffer, 1, 3);
-  expect(lines).toEqual('line1\nline2');
-});
-
-test('extract all lines from buffer', () => {
-  const lines = extractLines(buffer, 0, Number.MAX_VALUE);
-  expect(lines).toEqual(text);
-});
-
-test('extract at least one line', () => {
-  const oneLineText = Buffer.from('line0');
-  const lines = extractLines(oneLineText, 0, 1);
-  expect(lines).toEqual('line0');
-});
diff --git a/x-pack/legacy/plugins/code/server/utils/buffer.ts b/x-pack/legacy/plugins/code/server/utils/buffer.ts
deleted file mode 100644
index 67db68a0a528a2..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/buffer.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-const LF = '\n'.charCodeAt(0);
-const CR = '\r'.charCodeAt(0);
-
-export function extractLines(buf: Buffer, fromLine: number, toLine: number) {
-  let currentLine = 0;
-  let fromIdx = 0;
-  let toIdx = buf.length;
-  let lastChar = -1;
-  for (const [idx, char] of buf.entries()) {
-    if (char === LF) {
-      currentLine++;
-      if (currentLine === fromLine) {
-        fromIdx = idx + 1;
-      }
-      if (currentLine === toLine) {
-        // line-break is CRLF under windows
-        if (lastChar === CR) {
-          toIdx = idx - 1;
-        } else {
-          toIdx = idx;
-        }
-        break;
-      }
-    }
-    lastChar = char;
-  }
-  return buf.toString('utf8', fromIdx, toIdx);
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/cancelable.ts b/x-pack/legacy/plugins/code/server/utils/cancelable.ts
deleted file mode 100644
index 71693bf586cf73..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/cancelable.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-type Resolve<T> = (t: T) => void;
-type Reject = (error: any) => void;
-type Cancel = (error: any) => void;
-type OnCancel = (cancel: Cancel) => void;
-
-export class Cancelable<T> {
-  public readonly promise: Promise<T>;
-  private resolve: Resolve<T> | undefined = undefined;
-  private reject: Reject | undefined = undefined;
-  private _cancel: Cancel | undefined = undefined;
-  private resolved: boolean = false;
-
-  constructor(
-    public readonly fn: (resolve: Resolve<T>, reject: Reject, onCancel: OnCancel) => void
-  ) {
-    this.promise = new Promise<T>((resolve, reject) => {
-      this.resolve = resolve;
-      this.reject = reject;
-    }).then((t: T) => {
-      this.resolved = true;
-      return t;
-    });
-    fn(this.resolve!, this.reject!, (cancel: Cancel) => {
-      this._cancel = cancel;
-    });
-  }
-
-  public cancel(error: any = 'canceled'): void {
-    if (!this.resolved) {
-      if (this._cancel) {
-        this._cancel(error);
-      } else if (this.reject) {
-        this.reject(error);
-      }
-    }
-  }
-
-  public error(error: any) {
-    if (this.reject) {
-      this.reject(error);
-    }
-  }
-
-  public static fromPromise<T>(promise: Promise<T>) {
-    return new Cancelable((resolve, reject, c) => {
-      promise.then(resolve, reject);
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/composite_source_merger.test.ts b/x-pack/legacy/plugins/code/server/utils/composite_source_merger.test.ts
deleted file mode 100644
index 91adfd6372e0e0..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/composite_source_merger.test.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  expandRanges,
-  extractSourceContent,
-  LineMapping,
-  mergeRanges,
-} from './composite_source_merger';
-
-function asRanges(array: number[][]) {
-  return array.map(v => {
-    const [startLine, endLine] = v;
-    return { startLine, endLine };
-  });
-}
-
-test('expand lines to ranges', () => {
-  const lines = asRanges([[1, 1], [3, 3], [5, 6]]);
-  const expectedRanges = asRanges([[0, 4], [1, 6], [3, 9]]);
-  expect(expandRanges(lines, 2)).toEqual(expectedRanges);
-});
-
-test('merge ranges', () => {
-  const ranges = asRanges([[0, 3], [2, 5], [6, 7], [7, 10]]);
-  const expectedRanges = asRanges([[0, 5], [6, 10]]);
-  expect(mergeRanges(ranges)).toEqual(expectedRanges);
-});
-
-test('extract source by ranges', () => {
-  const source = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'];
-  const ranges = asRanges([[0, 3], [7, 11]]);
-  const lineMappings = new LineMapping();
-  const extracted = extractSourceContent(ranges, source, lineMappings);
-  expect(extracted).toEqual(['0', '1', '2', '', '7', '8', '9', '10']);
-  const expectedLineNumbers = ['1', '2', '3', '...', '8', '9', '10', '11'];
-  expect(lineMappings.toStringArray('...')).toEqual(expectedLineNumbers);
-  expect(lineMappings.lineNumber(7)).toBe(5);
-  expect(lineMappings.lineNumber(0)).toBe(1);
-});
diff --git a/x-pack/legacy/plugins/code/server/utils/composite_source_merger.ts b/x-pack/legacy/plugins/code/server/utils/composite_source_merger.ts
deleted file mode 100644
index 982e77a28cd93d..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/composite_source_merger.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const DEFAULT_LINE_NUMBER_PLACEHOLDER = '..';
-
-export interface LineRange {
-  startLine: number;
-  endLine: number;
-}
-
-/**
- * expand ranges of lines, eg:
- * expand 2 lines of [[3,4], [9,9]] with value 2 becomes [(1,7), (7,12)]
- * @param lines the array of line numbers
- * @param expand the expand range
- */
-export function expandRanges(lines: LineRange[], expand: number): LineRange[] {
-  return lines.map(line => ({
-    startLine: Math.max(0, line.startLine - expand),
-    endLine: line.endLine + expand + 1,
-  }));
-}
-
-/**
- * merge the ranges that overlap each other into one, eg:
- * [(1,3), (2,5)] => [(1,5)]
- * @param ranges
- */
-export function mergeRanges(ranges: LineRange[]): LineRange[] {
-  const sortedRanges = ranges.sort((a, b) => a.startLine - b.startLine);
-  const results: LineRange[] = [];
-
-  const mergeIfOverlap = (a: LineRange, b: LineRange) => {
-    // a <= b is always true here because sorting above
-    if (b.startLine >= a.startLine && b.startLine <= a.endLine) {
-      // overlap
-      if (b.endLine > a.endLine) {
-        a.endLine = b.endLine; // extend previous range
-      }
-      return true;
-    }
-    return false;
-  };
-
-  for (const range of sortedRanges) {
-    if (results.length > 0) {
-      const last = results[results.length - 1];
-      if (mergeIfOverlap(last, range)) {
-        continue;
-      }
-    }
-    results.push(range);
-  }
-  return results;
-}
-
-/**
- * extract content from source by ranges
- * @param ranges the partials ranges of contents
- * @param source the source content
- * @param mapper a line mapper object which contains the relationship between source content and partial content
- * @return the extracted partial contents
- * #todo To support server side render for grammar highlights, we could change the source parameter to HighlightedCode[].
- * #todo interface HighlightedCode { text: string, highlights: ... };
- */
-export function extractSourceContent(
-  ranges: LineRange[],
-  source: string[],
-  mapper: LineMapping
-): string[] {
-  const sortedRanges = ranges.sort((a, b) => a.startLine - b.startLine);
-  let results: string[] = [];
-  const pushPlaceholder = () => {
-    results.push('');
-    mapper.addPlaceholder();
-  };
-  for (const range of sortedRanges) {
-    if (!(results.length === 0 && range.startLine === 0)) {
-      pushPlaceholder();
-    }
-    const slicedContent = source.slice(range.startLine, range.endLine);
-    results = results.concat(slicedContent);
-    mapper.addMapping(range.startLine, range.startLine + slicedContent.length);
-  }
-  const lastRange = sortedRanges[sortedRanges.length - 1];
-  if (lastRange.endLine < source.length) {
-    pushPlaceholder();
-  }
-  return results;
-}
-
-export class LineMapping {
-  private lines: number[] = [];
-  private reverseMap: Map<number, number> = new Map<number, number>();
-  public toStringArray(
-    placeHolder: string = DEFAULT_LINE_NUMBER_PLACEHOLDER,
-    startAtLine: number = 1
-  ): string[] {
-    return this.lines.map(v => {
-      if (Number.isNaN(v)) {
-        return placeHolder;
-      } else {
-        return (v + startAtLine).toString();
-      }
-    });
-  }
-  public addPlaceholder() {
-    this.lines.push(Number.NaN);
-  }
-
-  public addMapping(start: number, end: number) {
-    for (let i = start; i < end; i++) {
-      this.lines.push(i);
-      this.reverseMap.set(i, this.lines.length - 1);
-    }
-  }
-
-  public lineNumber(originLineNumber: number, startAtLine: number = 1) {
-    const n = this.reverseMap.get(originLineNumber);
-    if (n === undefined) {
-      return Number.NaN;
-    } else {
-      return n + startAtLine;
-    }
-  }
-
-  public hasLine(line: number) {
-    return this.reverseMap.has(line);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/console_logger.ts b/x-pack/legacy/plugins/code/server/utils/console_logger.ts
deleted file mode 100644
index afc8677f494cfb..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/console_logger.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-/* eslint-disable no-console */
-
-import { Logger } from '../log';
-
-export class ConsoleLogger extends Logger {
-  constructor() {
-    super({
-      get: (...contextParts: string[]) => {
-        return console as any;
-      },
-    });
-  }
-
-  public info(msg: string | any) {
-    console.info(msg);
-  }
-
-  public error(msg: string | any) {
-    console.error(msg);
-  }
-
-  public log(message: string): void {
-    this.info(message);
-  }
-
-  public debug(msg: string | any) {
-    console.debug(msg);
-  }
-
-  public warn(msg: string | any): void {
-    console.warn(msg);
-  }
-
-  public stdout(msg: string | any) {
-    console.info(msg);
-  }
-
-  public stderr(msg: string | any) {
-    console.error(msg);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/console_logger_factory.ts b/x-pack/legacy/plugins/code/server/utils/console_logger_factory.ts
deleted file mode 100644
index 01588f38a85804..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/console_logger_factory.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Logger } from '../log';
-import { ConsoleLogger } from './console_logger';
-import { LoggerFactory } from './log_factory';
-
-export class ConsoleLoggerFactory implements LoggerFactory {
-  public getLogger(tags: string[] = []): Logger {
-    return new ConsoleLogger();
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/detect_language.test.ts b/x-pack/legacy/plugins/code/server/utils/detect_language.test.ts
deleted file mode 100644
index 52cbfb24d74c89..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/detect_language.test.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { detectLanguageByFilename } from './detect_language';
-
-test('detect file types', () => {
-  expect(detectLanguageByFilename('a.h')).toEqual('c');
-  expect(detectLanguageByFilename('a.c')).toEqual('c');
-  expect(detectLanguageByFilename('a.cc')).toEqual('cpp');
-  expect(detectLanguageByFilename('a.m')).toEqual('objective-c');
-  expect(detectLanguageByFilename('a.ts')).toEqual('typescript');
-  expect(detectLanguageByFilename('a.java')).toEqual('java');
-});
diff --git a/x-pack/legacy/plugins/code/server/utils/detect_language.ts b/x-pack/legacy/plugins/code/server/utils/detect_language.ts
deleted file mode 100644
index c779efef8a510b..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/detect_language.ts
+++ /dev/null
@@ -1,61 +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 path from 'path';
-import fs from 'fs';
-
-function matchAll(s: string, re: RegExp): string[][] {
-  let m;
-  const result = [];
-  while ((m = re.exec(s)) !== null) {
-    // This is necessary to avoid infinite loops with zero-width matches
-    if (m.index === re.lastIndex) {
-      re.lastIndex++;
-    }
-    result.push(m);
-  }
-  return result;
-}
-
-const entryFilePath = require.resolve('monaco-editor/esm/vs/basic-languages/monaco.contribution');
-const languageMap: { [key: string]: string } = {};
-if (entryFilePath) {
-  const entryFileContent = fs.readFileSync(entryFilePath, 'utf8');
-  const importRegex = /import '(.*\.contribution\.js)'/gm;
-  const dir = path.dirname(entryFilePath);
-  const regex = /id:\s*'(.*)',\s*extensions:\s*\[(.+)\]/gm;
-
-  for (const m of matchAll(entryFileContent, importRegex)) {
-    const contributionFile = path.join(dir, m[1]);
-    if (fs.existsSync(contributionFile)) {
-      const contributionContent = fs.readFileSync(contributionFile, 'utf8');
-      for (const mm of matchAll(contributionContent, regex)) {
-        const langId = mm[1];
-        const extensions = mm[2];
-        for (let ext of extensions.split(',')) {
-          ext = ext.trim().slice(1, -1);
-          languageMap[ext] = langId;
-        }
-      }
-    }
-  }
-}
-function detectByFilename(file: string): string {
-  const ext = path.extname(file);
-  if (ext) {
-    return languageMap[ext];
-  }
-  return 'other'; // TODO: if how should we deal with other types?
-}
-
-export function detectLanguageByFilename(filename: string) {
-  const lang = detectByFilename(filename);
-  return lang && lang.toLowerCase();
-}
-
-export async function detectLanguage(file: string, fileContent?: Buffer | string): Promise<any> {
-  const lang = detectByFilename(file);
-  return await Promise.resolve(lang ? lang.toLowerCase() : null);
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/es_index_client.ts b/x-pack/legacy/plugins/code/server/utils/es_index_client.ts
deleted file mode 100644
index c47f57374af6f0..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/es_index_client.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  IndicesCreateParams,
-  IndicesDeleteParams,
-  IndicesExistsParams,
-  IndicesExistsAliasParams,
-  IndicesDeleteAliasParams,
-  IndicesGetAliasParams,
-  IndicesGetMappingParams,
-  IndicesPutAliasParams,
-  IndicesUpdateAliasesParams,
-  IndicesRefreshParams,
-} from 'elasticsearch';
-
-import { WithRequest } from './with_request';
-import { WithInternalRequest } from './with_internal_request';
-
-export class EsIndexClient {
-  constructor(public readonly self: WithRequest | WithInternalRequest) {}
-
-  public exists(params: IndicesExistsParams): Promise<any> {
-    return this.self.callCluster('indices.exists', params);
-  }
-
-  public create(params: IndicesCreateParams): Promise<any> {
-    return this.self.callCluster('indices.create', params);
-  }
-
-  public refresh(params: IndicesRefreshParams): Promise<any> {
-    return this.self.callCluster('indices.refresh', params);
-  }
-
-  public delete(params: IndicesDeleteParams): Promise<any> {
-    return this.self.callCluster('indices.delete', params);
-  }
-
-  public existsAlias(params: IndicesExistsAliasParams): Promise<any> {
-    return this.self.callCluster('indices.existsAlias', params);
-  }
-
-  public getAlias(params: IndicesGetAliasParams): Promise<any> {
-    return this.self.callCluster('indices.getAlias', params);
-  }
-
-  public putAlias(params: IndicesPutAliasParams): Promise<any> {
-    return this.self.callCluster('indices.putAlias', params);
-  }
-
-  public deleteAlias(params: IndicesDeleteAliasParams): Promise<any> {
-    return this.self.callCluster('indices.deleteAlias', params);
-  }
-
-  public updateAliases(params: IndicesUpdateAliasesParams): Promise<any> {
-    return this.self.callCluster('indices.updateAliases', params);
-  }
-
-  public getMapping(params: IndicesGetMappingParams): Promise<any> {
-    return this.self.callCluster('indices.getMapping', params);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/esclient_with_internal_request.ts b/x-pack/legacy/plugins/code/server/utils/esclient_with_internal_request.ts
deleted file mode 100644
index 60a57f4dd26ea5..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/esclient_with_internal_request.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  BulkIndexDocumentsParams,
-  DeleteDocumentByQueryParams,
-  DeleteDocumentParams,
-  GetParams,
-  IndexDocumentParams,
-  ReindexParams,
-  SearchParams,
-  UpdateDocumentParams,
-  UpdateDocumentByQueryParams,
-} from 'elasticsearch';
-import { IClusterClient } from 'src/core/server';
-import { EsClient } from '../lib/esqueue';
-import { EsIndexClient } from './es_index_client';
-import { WithInternalRequest } from './with_internal_request';
-
-export class EsClientWithInternalRequest extends WithInternalRequest implements EsClient {
-  public readonly indices = new EsIndexClient(this);
-
-  constructor(cluster: IClusterClient) {
-    super(cluster);
-  }
-
-  public bulk(params: BulkIndexDocumentsParams): Promise<any> {
-    return this.callCluster('bulk', params);
-  }
-
-  public delete(params: DeleteDocumentParams): Promise<any> {
-    return this.callCluster('delete', params);
-  }
-
-  public deleteByQuery(params: DeleteDocumentByQueryParams): Promise<any> {
-    return this.callCluster('deleteByQuery', params);
-  }
-
-  public get(params: GetParams): Promise<any> {
-    return this.callCluster('get', params);
-  }
-
-  public index(params: IndexDocumentParams<any>): Promise<any> {
-    return this.callCluster('index', params);
-  }
-
-  public ping(): Promise<void> {
-    return this.callCluster('ping');
-  }
-
-  public reindex(params: ReindexParams): Promise<any> {
-    return this.callCluster('reindex', params);
-  }
-
-  public search(params: SearchParams): Promise<any> {
-    return this.callCluster('search', params);
-  }
-
-  public update(params: UpdateDocumentParams): Promise<any> {
-    return this.callCluster('update', params);
-  }
-
-  public updateByQuery(params: UpdateDocumentByQueryParams): Promise<any> {
-    return this.callCluster('updateByQuery', params);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/esclient_with_request.ts b/x-pack/legacy/plugins/code/server/utils/esclient_with_request.ts
deleted file mode 100644
index a685106f37c3a1..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/esclient_with_request.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 { KibanaRequest, RequestHandlerContext } from 'src/core/server';
-import { AnyObject, EsClient } from '../lib/esqueue';
-import { EsIndexClient } from './es_index_client';
-import { WithRequest } from './with_request';
-
-export class EsClientWithRequest extends WithRequest implements EsClient {
-  public readonly indices = new EsIndexClient(this);
-
-  constructor(public readonly context: RequestHandlerContext, public readonly req: KibanaRequest) {
-    super(context, req);
-  }
-
-  public bulk(params: AnyObject): Promise<any> {
-    return this.callCluster('bulk', params);
-  }
-
-  public delete(params: AnyObject): Promise<any> {
-    return this.callCluster('delete', params);
-  }
-
-  public deleteByQuery(params: AnyObject): Promise<any> {
-    return this.callCluster('deleteByQuery', params);
-  }
-
-  public get(params: AnyObject): Promise<any> {
-    return this.callCluster('get', params);
-  }
-
-  public index(params: AnyObject): Promise<any> {
-    return this.callCluster('index', params);
-  }
-
-  public ping(): Promise<void> {
-    return this.callCluster('ping');
-  }
-
-  public reindex(params: AnyObject): Promise<any> {
-    return this.callCluster('reindex', params);
-  }
-
-  public search(params: AnyObject): Promise<any> {
-    return this.callCluster('search', params);
-  }
-
-  public update(params: AnyObject): Promise<any> {
-    return this.callCluster('update', params);
-  }
-
-  public updateByQuery(params: AnyObject): Promise<any> {
-    return this.callCluster('updateByQuery', params);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/format_parser.ts b/x-pack/legacy/plugins/code/server/utils/format_parser.ts
deleted file mode 100644
index a09cdb20322c79..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/format_parser.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { set } from 'lodash';
-
-export interface Format {
-  [field: string]: string | Format;
-}
-
-export interface Field {
-  name: string;
-  path: string;
-  format: string;
-}
-
-const BOUNDARY = 'ª––––––––º';
-
-const SPLITTER = '≤∞≥';
-
-export class FormatParser {
-  private fields: Field[];
-
-  constructor(public readonly format: Format) {
-    this.fields = [];
-    this.toFields(this.fields, format);
-  }
-
-  private toFields(fields: Field[], format: Format, prefix: string = '') {
-    Object.entries(format).forEach(entry => {
-      const [key, value] = entry;
-      if (typeof value === 'string') {
-        fields.push({
-          name: key,
-          path: `${prefix}${key}`,
-          format: value,
-        });
-      } else {
-        this.toFields(fields, value, `${prefix}${key}.`);
-      }
-    });
-  }
-
-  public toFormatStr(): string {
-    return this.fields.map(f => f.format).join(SPLITTER) + BOUNDARY;
-  }
-
-  public parseResult(result: string): any[] {
-    return result
-      .split(BOUNDARY)
-      .map(item => item.trim().split(SPLITTER))
-      .filter(items => items.length > 0)
-      .map(items => this.toObject(items));
-  }
-
-  private toObject(items: string[]) {
-    const result = {};
-    this.fields.forEach((f, i) => {
-      set(result, f.path, items[i]);
-    });
-    return result;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/index_stats_aggregator.ts b/x-pack/legacy/plugins/code/server/utils/index_stats_aggregator.ts
deleted file mode 100644
index 3b75771c32c6e0..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/index_stats_aggregator.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 { IndexStats, IndexStatsKey } from '../../model';
-
-export function aggregateIndexStats(stats: IndexStats[]): IndexStats {
-  const res = new Map<IndexStatsKey, number>();
-  stats.forEach((s: IndexStats) => {
-    s.forEach((value: number, key: IndexStatsKey) => {
-      if (!res.has(key)) {
-        res.set(key, 0);
-      }
-      res.set(key, res.get(key)! + value);
-    });
-  });
-
-  return res;
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/log_factory.ts b/x-pack/legacy/plugins/code/server/utils/log_factory.ts
deleted file mode 100644
index c43e0c2d18ed1e..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/log_factory.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Logger } from '../log';
-
-export interface LoggerFactory {
-  getLogger(tags: string[]): Logger;
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/lsp_utils.test.ts b/x-pack/legacy/plugins/code/server/utils/lsp_utils.test.ts
deleted file mode 100644
index ee25000643eddf..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/lsp_utils.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { Location } from 'vscode-languageserver-types';
-import { groupFiles } from './lsp_utils';
-
-test('group files', async () => {
-  const range = {
-    start: { character: 0, line: 1 },
-    end: { character: 0, line: 2 },
-  };
-  const url1 = 'https://github.com/elastic/code/blob/master/1';
-  const url2 = 'https://github.com/elastic/code/blob/master/2';
-  const url3 = 'https://github.com/elastic/code2/blob/master/1';
-  const locs = [
-    {
-      uri: url1,
-      range,
-    },
-    {
-      uri: url1,
-      range: {
-        start: { character: 0, line: 2 },
-        end: { character: 0, line: 3 },
-      },
-    },
-    {
-      uri: url2,
-      range,
-    },
-    {
-      uri: url3,
-      range,
-    },
-  ] as Location[];
-  const fakeSource = `1
-  2
-  3
-  4
-  5
-  `;
-
-  const fakeLoader = () => Promise.resolve({ content: fakeSource, lang: 'test' });
-  // @ts-ignore
-  const result = await groupFiles(locs, fakeLoader);
-  const files = result['github.com/elastic/code'];
-  expect(files.length).toBe(2);
-  const file = files.find((f: any) => f.uri === url1);
-  expect(file).not.toBeUndefined();
-  expect(file.lineNumbers).toStrictEqual(['1', '2', '3', '4', '5', '..']);
-  expect(result['github.com/elastic/code2'].length).toBe(1);
-});
diff --git a/x-pack/legacy/plugins/code/server/utils/lsp_utils.ts b/x-pack/legacy/plugins/code/server/utils/lsp_utils.ts
deleted file mode 100644
index 0bd6ea0ca05fc6..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/lsp_utils.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { groupBy, last } from 'lodash';
-import { Location, Position } from 'vscode-languageserver-types';
-import { ResponseMessage } from 'vscode-jsonrpc/lib/messages';
-import { CTAGS, GO } from '../lsp/language_servers';
-import {
-  expandRanges,
-  extractSourceContent,
-  LineMapping,
-  mergeRanges,
-} from './composite_source_merger';
-import { detectLanguage } from './detect_language';
-import { parseLspUrl } from '../../common/uri_util';
-import { GitServiceDefinition } from '../distributed/apis';
-
-type SourceLoader = (
-  loc: typeof GitServiceDefinition.blob.request
-) => Promise<typeof GitServiceDefinition.blob.response>;
-
-export interface File {
-  repo: string;
-  file: string;
-  language: string;
-  uri: string;
-  revision: string;
-  code: string;
-  lineNumbers: number[];
-  highlights: any[];
-}
-
-export interface GroupedFiles {
-  [repo: string]: File[];
-}
-
-export async function groupFiles(
-  list: Location[],
-  sourceLoader: SourceLoader
-): Promise<GroupedFiles> {
-  const files = [];
-  const groupedLocations = groupBy(list, 'uri');
-  for (const url of Object.keys(groupedLocations)) {
-    const { repoUri, revision, file } = parseLspUrl(url)!;
-    const locations: Location[] = groupedLocations[url];
-    const lines = locations.map(l => ({
-      startLine: l.range.start.line,
-      endLine: l.range.end.line,
-    }));
-    const ranges = expandRanges(lines, 1);
-    const mergedRanges = mergeRanges(ranges);
-    try {
-      const blob = await sourceLoader({ uri: repoUri, path: file!, revision });
-      if (blob.content) {
-        const source = blob.content.split('\n');
-        const language = blob.lang;
-        const lineMappings = new LineMapping();
-        const code = extractSourceContent(mergedRanges, source, lineMappings).join('\n');
-        const lineNumbers = lineMappings.toStringArray();
-        const highlights = locations.map(l => {
-          const { start, end } = l.range;
-          const startLineNumber = lineMappings.lineNumber(start.line);
-          const endLineNumber = lineMappings.lineNumber(end.line);
-          return {
-            startLineNumber,
-            startColumn: start.character + 1,
-            endLineNumber,
-            endColumn: end.character + 1,
-          };
-        });
-        files.push({
-          repo: repoUri,
-          file,
-          language,
-          uri: url,
-          revision,
-          code,
-          lineNumbers,
-          highlights,
-        });
-      }
-    } catch (e) {
-      // can't load this file, ignore this result
-    }
-  }
-  return (groupBy(files, 'repo') as unknown) as GroupedFiles;
-}
-
-export async function findTitleFromHover(hover: ResponseMessage, uri: string, position: Position) {
-  let title: string;
-  if (hover.result && hover.result.contents) {
-    if (Array.isArray(hover.result.contents)) {
-      const content = hover.result.contents[0];
-      title = hover.result.contents[0].value;
-      const lang = await detectLanguage(uri.replace('file://', ''));
-      // TODO(henrywong) Find a gernal approach to construct the reference title.
-      if (content.kind) {
-        // The format of the hover result is 'MarkupContent', extract appropriate pieces as the references title.
-        if (GO.languages.includes(lang)) {
-          title = title.substring(title.indexOf('```go\n') + 5, title.lastIndexOf('\n```'));
-          if (title.includes('{\n')) {
-            title = title.substring(0, title.indexOf('{\n'));
-          }
-        }
-      } else if (CTAGS.languages.includes(lang)) {
-        // There are language servers may provide hover results with markdown syntax, like ctags-langserver,
-        // extract the plain text.
-        if (title.substring(0, 2) === '**' && title.includes('**\n')) {
-          title = title.substring(title.indexOf('**\n') + 3);
-        }
-      }
-    } else {
-      title = hover.result.contents as 'string';
-    }
-  } else {
-    title = last(uri.split('/')) + `(${position.line}, ${position.character})`;
-  }
-  return title;
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/repository_reference_helper.ts b/x-pack/legacy/plugins/code/server/utils/repository_reference_helper.ts
deleted file mode 100644
index dcbd551a5eac28..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/repository_reference_helper.ts
+++ /dev/null
@@ -1,112 +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 { SavedObjectsClientContract } from 'src/core/server';
-import Boom from 'boom';
-import { SAVED_OBJ_REPO } from '../../common/constants';
-
-export interface RepositoryReferenceHelper {
-  /**
-   * Creates a reference from the current namespace to the given repository.
-   *
-   * @param uri The uri of the repository.
-   * @returns true if there is no other references for the repository, false otherwise.
-   */
-  createReference(uri: string): Promise<boolean>;
-
-  /**
-   * Checks whether there is a reference from the current namespace to the given repository.
-   *
-   * @param uri The uri of the repository.
-   * @returns true if there is a reference from the current namespace to the given repository, false otherwise.
-   */
-  hasReference(uri: string): Promise<boolean>;
-
-  /**
-   * Throws an error if there is no reference from the current namespace to the given repository.
-   * there is none.
-   *
-   * @param uri The uri of the repository.
-   */
-  ensureReference(uri: string): Promise<void>;
-
-  /**
-   * Deletes the reference from the current namespace to the given repository.
-   *
-   * @param uri The uri of the repository.
-   * @returns True if there is no more references to the repository after the deletion.
-   */
-  deleteReference(uri: string): Promise<boolean>;
-
-  /**
-   * Finds all repository uris of which the current namespace has references.
-   *
-   * @returns uris the current namespace references to.
-   */
-  findReferences(): Promise<string[]>;
-}
-
-/**
- * A factory function helps to create a appropriate helper instance.
- *
- * @param client A saved objects client instance.
- * @returns An helper instance.
- */
-export function getReferenceHelper(client: SavedObjectsClientContract): RepositoryReferenceHelper {
-  return new DefaultReferenceHelper(client);
-}
-
-class DefaultReferenceHelper implements RepositoryReferenceHelper {
-  constructor(private readonly client: SavedObjectsClientContract) {}
-
-  async createReference(uri: string): Promise<boolean> {
-    try {
-      await this.client.create(
-        SAVED_OBJ_REPO,
-        {
-          uri,
-        },
-        {
-          id: uri,
-        }
-      );
-      return true;
-    } catch (e) {
-      if (Boom.isBoom(e) && e.output.statusCode === 409) {
-        return false;
-      }
-      throw e;
-    }
-  }
-
-  async deleteReference(uri: string): Promise<boolean> {
-    await this.client.delete(SAVED_OBJ_REPO, uri);
-    return true;
-  }
-
-  async ensureReference(uri: string): Promise<void> {
-    await this.client.get(SAVED_OBJ_REPO, uri);
-  }
-
-  async hasReference(uri: string): Promise<boolean> {
-    try {
-      await this.ensureReference(uri);
-      return true;
-    } catch (e) {
-      if (Boom.isBoom(e) && e.output.statusCode === 404) {
-        return false;
-      }
-      throw e;
-    }
-  }
-
-  async findReferences(): Promise<string[]> {
-    const resp = await this.client.find({
-      type: SAVED_OBJ_REPO,
-    });
-    return resp.saved_objects.map(obj => obj.attributes.uri as string);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/server_logger_factory.ts b/x-pack/legacy/plugins/code/server/utils/server_logger_factory.ts
deleted file mode 100644
index e9687da443f9a6..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/server_logger_factory.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { LoggerFactory } from 'src/core/server';
-import { Logger } from '../log';
-import { LoggerFactory as CodeLoggerFactory } from './log_factory';
-
-export class ServerLoggerFactory implements CodeLoggerFactory {
-  constructor(private readonly loggerFactory: LoggerFactory, private readonly verbose: boolean) {}
-
-  public getLogger(tags: string[] = []): Logger {
-    return new Logger(this.loggerFactory, this.verbose, tags);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/timeout.ts b/x-pack/legacy/plugins/code/server/utils/timeout.ts
deleted file mode 100644
index 4892e082ee4bd9..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/timeout.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import Boom from 'boom';
-
-export function promiseTimeout<T>(ms: number, promise: Promise<T>): Promise<T> {
-  const boom = Boom.gatewayTimeout('Timed out in ' + ms + 'ms.');
-  // @ts-ignore
-  boom.isTimeout = true;
-
-  if (ms > 0) {
-    // Create a promise that rejects in <ms> milliseconds
-    const timeout = new Promise<T>((resolve, reject) => {
-      const id = setTimeout(() => {
-        clearTimeout(id);
-        reject(boom);
-      }, ms);
-    });
-
-    // Returns a race between our timeout and the passed in promise
-    return Promise.race([promise, timeout]);
-  } else {
-    return Promise.reject(boom);
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/with_internal_request.ts b/x-pack/legacy/plugins/code/server/utils/with_internal_request.ts
deleted file mode 100644
index 9f8dde129039a2..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/with_internal_request.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { APICaller, IClusterClient } from 'src/core/server';
-
-export class WithInternalRequest {
-  public readonly callCluster: APICaller;
-
-  constructor(cluster: IClusterClient) {
-    this.callCluster = cluster.callAsInternalUser;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/server/utils/with_request.ts b/x-pack/legacy/plugins/code/server/utils/with_request.ts
deleted file mode 100644
index 167e9c41192f57..00000000000000
--- a/x-pack/legacy/plugins/code/server/utils/with_request.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { APICaller, KibanaRequest, RequestHandlerContext } from 'src/core/server';
-
-export class WithRequest {
-  public readonly callCluster: APICaller;
-
-  constructor(public readonly context: RequestHandlerContext, public readonly req: KibanaRequest) {
-    const securityPlugin = context.code.legacy.securityPlugin;
-    const useRbac =
-      securityPlugin &&
-      securityPlugin.authorization &&
-      // @ts-ignore
-      securityPlugin.authorization.mode.useRbacForRequest(req);
-    this.callCluster = useRbac
-      ? context.core.elasticsearch.dataClient.callAsInternalUser
-      : context.core.elasticsearch.dataClient.callAsCurrentUser;
-  }
-}
diff --git a/x-pack/legacy/plugins/code/webpackShims/simple-git.d.ts b/x-pack/legacy/plugins/code/webpackShims/simple-git.d.ts
deleted file mode 100644
index 708eff2abed28e..00000000000000
--- a/x-pack/legacy/plugins/code/webpackShims/simple-git.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-declare module '@elastic/simple-git/dist/util/paths' {
-  // eslint-disable-next-line
-  export default function paths(platform: any): any;
-}
diff --git a/x-pack/legacy/plugins/code/webpackShims/stats-lite.d.ts b/x-pack/legacy/plugins/code/webpackShims/stats-lite.d.ts
deleted file mode 100644
index 60bee75396767e..00000000000000
--- a/x-pack/legacy/plugins/code/webpackShims/stats-lite.d.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.
- */
-
-export function histogram(vals: any, bins: any): any;
-export function mean(vals: any): any;
-export function median(vals: any): any;
-export function mode(vals: any): any;
-export function numbers(vals: any): any;
-export function percentile(vals: any, ptile: any): any;
-export function populationStdev(vals: any): any;
-export function populationVariance(vals: any): any;
-export function sampleStdev(vals: any): any;
-export function sampleVariance(vals: any): any;
-export function stdev(vals: any): any;
-export function sum(vals: any): any;
-export function variance(vals: any): any;
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/README.md b/x-pack/legacy/plugins/encrypted_saved_objects/README.md
deleted file mode 100644
index f63c558d323e8f..00000000000000
--- a/x-pack/legacy/plugins/encrypted_saved_objects/README.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# Encrypted Saved Objects
-
-## Overview
-
-The purpose of this plugin is to provide a way to encrypt/decrypt attributes on the custom Saved Objects that works with
-security and spaces filtering as well as performing audit logging.
-
-[RFC #2: Encrypted Saved Objects Attributes](../../../rfcs/text/0002_encrypted_attributes.md).
-
-## Usage
-
-Follow these steps to use `encrypted_saved_objects` in your plugin: 
-
-1. Declare `encrypted_saved_objects` as a dependency:
-
-```typescript
-...
-new kibana.Plugin({
-  ...
-  require: ['encrypted_saved_objects'],
-  ...
-});
-```
-
-2. Add attributes to be encrypted in `mappings.json` file for the respective Saved Object type. These attributes should
-always have a `binary` type since they'll contain encrypted content as a `Base64` encoded string and should never be 
-searchable or analyzed:
-
-```json
-{
- "my-saved-object-type": {
-   "properties": {
-     "name": { "type": "keyword" },
-     "mySecret": { "type": "binary" }
-   }
- }
-}
-```
-
-3. Register Saved Object type using the provided API:
-
-```typescript
-server.plugins.encrypted_saved_objects.registerType({
-  type: 'my-saved-object-type',
-  attributesToEncrypt: new Set(['mySecret']),
-});
-```
-
-4. For any Saved Object operation that does not require retrieval of decrypted content, use standard REST or 
-programmatic Saved Object API, e.g.:
-
-```typescript
-...
-async handler(request: Request) {
-  return await server.savedObjects
-    .getScopedSavedObjectsClient(request)
-    .create('my-saved-object-type', { name: 'some name', mySecret: 'non encrypted secret' });
-}
-...
-```
-
-5. To retrieve Saved Object with decrypted content use the dedicated `getDecryptedAsInternalUser` API method. 
-
-**Note:** As name suggests the method will retrieve the encrypted values and decrypt them on behalf of the internal Kibana
-user to make it possible to use this method even when user request context is not available (e.g. in background tasks).
-Hence this method should only be used wherever consumers would otherwise feel comfortable using `callWithInternalUser`
-and preferably only as a part of the Kibana server routines that are outside of the lifecycle of a HTTP request that a 
-user has control over.
-
-```typescript
-const savedObjectWithDecryptedContent =  await server.plugins.encrypted_saved_objects.getDecryptedAsInternalUser(
-  'my-saved-object-type',
-  'saved-object-id'
-);
-```
-
-`getDecryptedAsInternalUser` also accepts the 3rd optional `options` argument that has exactly the same type as `options`
-one would pass to `SavedObjectsClient.get`. These argument allows to specify `namespace` property that, for example, is
-required if Saved Object was created within a non-default space.
-
-## Testing
-
-### Unit tests
-
-From `kibana-root-folder/x-pack`, run:
-```bash
-$ node scripts/jest.js
-```
-
-### API Integration tests
-
-In one shell, from `kibana-root-folder/x-pack`:
-```bash
-$ node scripts/functional_tests_server.js --config test/plugin_api_integration/config.js
-```
-
-In another shell, from `kibana-root-folder/x-pack`:
-```bash
-$ node ../scripts/functional_test_runner.js --config test/plugin_api_integration/config.js --grep="{TEST_NAME}"
-```
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/__snapshots__/index.test.ts.snap b/x-pack/legacy/plugins/encrypted_saved_objects/__snapshots__/index.test.ts.snap
deleted file mode 100644
index e3c069069bf144..00000000000000
--- a/x-pack/legacy/plugins/encrypted_saved_objects/__snapshots__/index.test.ts.snap
+++ /dev/null
@@ -1,14 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`config schema with context {"dist":false} produces correct config 1`] = `
-Object {
-  "enabled": true,
-  "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-}
-`;
-
-exports[`config schema with context {"dist":true} produces correct config 1`] = `
-Object {
-  "enabled": true,
-}
-`;
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/index.test.ts b/x-pack/legacy/plugins/encrypted_saved_objects/index.test.ts
deleted file mode 100644
index 26c0166186c4c5..00000000000000
--- a/x-pack/legacy/plugins/encrypted_saved_objects/index.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { encryptedSavedObjects } from './index';
-import { getConfigSchema } from '../../../test_utils';
-
-const describeWithContext = describe.each([[{ dist: false }], [{ dist: true }]]);
-
-describeWithContext('config schema with context %j', context => {
-  it('produces correct config', async () => {
-    const schema = await getConfigSchema(encryptedSavedObjects);
-    await expect(schema.validate({}, { context })).resolves.toMatchSnapshot();
-  });
-});
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/index.ts b/x-pack/legacy/plugins/encrypted_saved_objects/index.ts
index a5f28631f3d529..3969959d03cffd 100644
--- a/x-pack/legacy/plugins/encrypted_saved_objects/index.ts
+++ b/x-pack/legacy/plugins/encrypted_saved_objects/index.ts
@@ -5,62 +5,41 @@
  */
 
 import { Root } from 'joi';
-import { Legacy, Server } from 'kibana';
-
+import { Legacy } from 'kibana';
+import { PluginSetupContract } from '../../../plugins/encrypted_saved_objects/server';
 // @ts-ignore
 import { AuditLogger } from '../../server/lib/audit_logger';
 
-import { CONFIG_PREFIX, PLUGIN_ID, Plugin } from './server/plugin';
-
-/**
- * Public interface of the security plugin for the legacy plugin system.
- */
-export type EncryptedSavedObjectsPlugin = ReturnType<Plugin['setup']>;
-
-export const encryptedSavedObjects = (kibana: any) =>
+export const encryptedSavedObjects = (kibana: {
+  Plugin: new (options: Legacy.PluginSpecOptions & { configPrefix?: string }) => unknown;
+}) =>
   new kibana.Plugin({
-    id: PLUGIN_ID,
-    configPrefix: CONFIG_PREFIX,
-    require: ['kibana', 'elasticsearch', 'xpack_main'],
-
-    config(Joi: Root) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-        encryptionKey: Joi.when(Joi.ref('$dist'), {
-          is: true,
-          then: Joi.string().min(32),
-          otherwise: Joi.string()
-            .min(32)
-            .default('a'.repeat(32)),
-        }),
-      }).default();
-    },
-
-    async init(server: Legacy.Server) {
-      const loggerFacade = {
-        fatal: (errorOrMessage: string | Error) => server.log(['fatal', PLUGIN_ID], errorOrMessage),
-        trace: (message: string) => server.log(['debug', PLUGIN_ID], message),
-        error: (message: string) => server.log(['error', PLUGIN_ID], message),
-        warn: (message: string) => server.log(['warning', PLUGIN_ID], message),
-        debug: (message: string) => server.log(['debug', PLUGIN_ID], message),
-        info: (message: string) => server.log(['info', PLUGIN_ID], message),
-      } as Server.Logger;
-
-      const config = server.config();
-      const encryptedSavedObjectsSetup = new Plugin(loggerFacade).setup(
-        {
-          config: {
-            encryptionKey: config.get<string | undefined>(`${CONFIG_PREFIX}.encryptionKey`),
-          },
-          savedObjects: server.savedObjects,
-          elasticsearch: server.plugins.elasticsearch,
-        },
-        { audit: new AuditLogger(server, PLUGIN_ID, config, server.plugins.xpack_main.info) }
-      );
-
-      // Re-expose plugin setup contract through legacy mechanism.
-      for (const [setupMethodName, setupMethod] of Object.entries(encryptedSavedObjectsSetup)) {
-        server.expose(setupMethodName, setupMethod);
+    id: 'encryptedSavedObjects',
+    configPrefix: 'xpack.encryptedSavedObjects',
+    require: ['xpack_main'],
+
+    // Some legacy plugins still use `enabled` config key, so we keep it here, but the rest of the
+    // keys is handled by the New Platform plugin.
+    config: (Joi: Root) =>
+      Joi.object({ enabled: Joi.boolean().default(true) })
+        .unknown(true)
+        .default(),
+
+    init(server: Legacy.Server) {
+      const encryptedSavedObjectsPlugin = (server.newPlatform.setup.plugins
+        .encryptedSavedObjects as unknown) as PluginSetupContract;
+      if (!encryptedSavedObjectsPlugin) {
+        throw new Error('New Platform XPack EncryptedSavedObjects plugin is not available.');
       }
+
+      encryptedSavedObjectsPlugin.__legacyCompat.registerLegacyAPI({
+        savedObjects: server.savedObjects,
+        auditLogger: new AuditLogger(
+          server,
+          'encryptedSavedObjects',
+          server.config(),
+          server.plugins.xpack_main.info
+        ),
+      });
     },
   });
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_audit_logger.test.ts b/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_audit_logger.test.ts
deleted file mode 100644
index 8c286da8308f2a..00000000000000
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_audit_logger.test.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 { EncryptedSavedObjectsAuditLogger } from './encrypted_saved_objects_audit_logger';
-
-test('properly logs audit events', () => {
-  const mockInternalAuditLogger = { log: jest.fn() };
-  const audit = new EncryptedSavedObjectsAuditLogger(mockInternalAuditLogger);
-
-  audit.encryptAttributesSuccess(['one', 'two'], {
-    type: 'known-type',
-    id: 'object-id',
-  });
-  audit.encryptAttributesSuccess(['one', 'two'], {
-    type: 'known-type-ns',
-    id: 'object-id-ns',
-    namespace: 'object-ns',
-  });
-
-  audit.decryptAttributesSuccess(['three', 'four'], {
-    type: 'known-type-1',
-    id: 'object-id-1',
-  });
-  audit.decryptAttributesSuccess(['three', 'four'], {
-    type: 'known-type-1-ns',
-    id: 'object-id-1-ns',
-    namespace: 'object-ns',
-  });
-
-  audit.encryptAttributeFailure('five', {
-    type: 'known-type-2',
-    id: 'object-id-2',
-  });
-  audit.encryptAttributeFailure('five', {
-    type: 'known-type-2-ns',
-    id: 'object-id-2-ns',
-    namespace: 'object-ns',
-  });
-
-  audit.decryptAttributeFailure('six', {
-    type: 'known-type-3',
-    id: 'object-id-3',
-  });
-  audit.decryptAttributeFailure('six', {
-    type: 'known-type-3-ns',
-    id: 'object-id-3-ns',
-    namespace: 'object-ns',
-  });
-
-  expect(mockInternalAuditLogger.log).toHaveBeenCalledTimes(8);
-  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
-    'encrypt_success',
-    'Successfully encrypted attributes "[one,two]" for saved object "[known-type,object-id]".',
-    { id: 'object-id', type: 'known-type', attributesNames: ['one', 'two'] }
-  );
-  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
-    'encrypt_success',
-    'Successfully encrypted attributes "[one,two]" for saved object "[object-ns,known-type-ns,object-id-ns]".',
-    {
-      id: 'object-id-ns',
-      type: 'known-type-ns',
-      namespace: 'object-ns',
-      attributesNames: ['one', 'two'],
-    }
-  );
-
-  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
-    'decrypt_success',
-    'Successfully decrypted attributes "[three,four]" for saved object "[known-type-1,object-id-1]".',
-    { id: 'object-id-1', type: 'known-type-1', attributesNames: ['three', 'four'] }
-  );
-  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
-    'decrypt_success',
-    'Successfully decrypted attributes "[three,four]" for saved object "[object-ns,known-type-1-ns,object-id-1-ns]".',
-    {
-      id: 'object-id-1-ns',
-      type: 'known-type-1-ns',
-      namespace: 'object-ns',
-      attributesNames: ['three', 'four'],
-    }
-  );
-
-  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
-    'encrypt_failure',
-    'Failed to encrypt attribute "five" for saved object "[known-type-2,object-id-2]".',
-    { id: 'object-id-2', type: 'known-type-2', attributeName: 'five' }
-  );
-  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
-    'encrypt_failure',
-    'Failed to encrypt attribute "five" for saved object "[object-ns,known-type-2-ns,object-id-2-ns]".',
-    { id: 'object-id-2-ns', type: 'known-type-2-ns', namespace: 'object-ns', attributeName: 'five' }
-  );
-
-  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
-    'decrypt_failure',
-    'Failed to decrypt attribute "six" for saved object "[known-type-3,object-id-3]".',
-    { id: 'object-id-3', type: 'known-type-3', attributeName: 'six' }
-  );
-  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
-    'decrypt_failure',
-    'Failed to decrypt attribute "six" for saved object "[object-ns,known-type-3-ns,object-id-3-ns]".',
-    { id: 'object-id-3-ns', type: 'known-type-3-ns', namespace: 'object-ns', attributeName: 'six' }
-  );
-});
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_audit_logger.ts b/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_audit_logger.ts
deleted file mode 100644
index e6a832a074e03e..00000000000000
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_audit_logger.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { SavedObjectDescriptor, descriptorToArray } from './encrypted_saved_objects_service';
-
-/**
- * Represents all audit events the plugin can log.
- */
-export class EncryptedSavedObjectsAuditLogger {
-  constructor(private readonly auditLogger: any) {}
-
-  public encryptAttributeFailure(attributeName: string, descriptor: SavedObjectDescriptor) {
-    this.auditLogger.log(
-      'encrypt_failure',
-      `Failed to encrypt attribute "${attributeName}" for saved object "[${descriptorToArray(
-        descriptor
-      )}]".`,
-      { ...descriptor, attributeName }
-    );
-  }
-
-  public decryptAttributeFailure(attributeName: string, descriptor: SavedObjectDescriptor) {
-    this.auditLogger.log(
-      'decrypt_failure',
-      `Failed to decrypt attribute "${attributeName}" for saved object "[${descriptorToArray(
-        descriptor
-      )}]".`,
-      { ...descriptor, attributeName }
-    );
-  }
-
-  public encryptAttributesSuccess(
-    attributesNames: readonly string[],
-    descriptor: SavedObjectDescriptor
-  ) {
-    this.auditLogger.log(
-      'encrypt_success',
-      `Successfully encrypted attributes "[${attributesNames}]" for saved object "[${descriptorToArray(
-        descriptor
-      )}]".`,
-      { ...descriptor, attributesNames }
-    );
-  }
-
-  public decryptAttributesSuccess(
-    attributesNames: readonly string[],
-    descriptor: SavedObjectDescriptor
-  ) {
-    this.auditLogger.log(
-      'decrypt_success',
-      `Successfully decrypted attributes "[${attributesNames}]" for saved object "[${descriptorToArray(
-        descriptor
-      )}]".`,
-      { ...descriptor, attributesNames }
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_service.mock.ts b/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_service.mock.ts
deleted file mode 100644
index 235d64cc348c91..00000000000000
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_service.mock.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EncryptedSavedObjectsService,
-  EncryptedSavedObjectTypeRegistration,
-  SavedObjectDescriptor,
-} from './encrypted_saved_objects_service';
-
-export function createEncryptedSavedObjectsServiceMock(
-  registrations: EncryptedSavedObjectTypeRegistration[] = []
-) {
-  const mock: jest.Mocked<EncryptedSavedObjectsService> = new (jest.requireMock(
-    './encrypted_saved_objects_service'
-  )).EncryptedSavedObjectsService();
-
-  function processAttributes<T extends Record<string, any>>(
-    descriptor: Pick<SavedObjectDescriptor, 'type'>,
-    attrs: T,
-    action: (attrs: T, attrName: string) => void
-  ) {
-    const registration = registrations.find(r => r.type === descriptor.type);
-    if (!registration) {
-      return attrs;
-    }
-
-    const clonedAttrs = { ...attrs };
-    for (const attrName of registration.attributesToEncrypt) {
-      if (attrName in clonedAttrs) {
-        action(clonedAttrs, attrName);
-      }
-    }
-    return clonedAttrs;
-  }
-
-  mock.isRegistered.mockImplementation(type => registrations.findIndex(r => r.type === type) >= 0);
-  mock.encryptAttributes.mockImplementation(async (descriptor, attrs) =>
-    processAttributes(
-      descriptor,
-      attrs,
-      (clonedAttrs, attrName) => (clonedAttrs[attrName] = `*${clonedAttrs[attrName]}*`)
-    )
-  );
-  mock.decryptAttributes.mockImplementation(async (descriptor, attrs) =>
-    processAttributes(
-      descriptor,
-      attrs,
-      (clonedAttrs, attrName) =>
-        (clonedAttrs[attrName] = (clonedAttrs[attrName] as string).slice(1, -1))
-    )
-  );
-  mock.stripEncryptedAttributes.mockImplementation((type, attrs) =>
-    processAttributes({ type }, attrs, (clonedAttrs, attrName) => delete clonedAttrs[attrName])
-  );
-
-  return mock;
-}
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/index.ts b/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/index.ts
deleted file mode 100644
index e60342ebca54d6..00000000000000
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export {
-  EncryptedSavedObjectsService,
-  EncryptedSavedObjectTypeRegistration,
-} from './encrypted_saved_objects_service';
-export { EncryptionError } from './encryption_error';
-export { EncryptedSavedObjectsAuditLogger } from './encrypted_saved_objects_audit_logger';
-export { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/plugin.mock.ts b/x-pack/legacy/plugins/encrypted_saved_objects/server/plugin.mock.ts
deleted file mode 100644
index 7c6e37c7e5d4cf..00000000000000
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/plugin.mock.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 { Plugin } from './plugin';
-type EncryptedSavedObjectsPlugin = ReturnType<Plugin['setup']>;
-
-const createEncryptedSavedObjectsMock = () => {
-  const mocked: jest.Mocked<EncryptedSavedObjectsPlugin> = {
-    isEncryptionError: jest.fn(),
-    registerType: jest.fn(),
-    getDecryptedAsInternalUser: jest.fn(),
-  };
-  return mocked;
-};
-
-export const encryptedSavedObjectsMock = {
-  create: createEncryptedSavedObjectsMock,
-};
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/plugin.ts b/x-pack/legacy/plugins/encrypted_saved_objects/server/plugin.ts
deleted file mode 100644
index ad38ca0f7a881c..00000000000000
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/plugin.ts
+++ /dev/null
@@ -1,92 +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 crypto from 'crypto';
-import { Legacy, Server } from 'kibana';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsRepository } from 'src/core/server/saved_objects/service';
-import { SavedObjectsBaseOptions, SavedObject, SavedObjectAttributes } from 'src/core/server';
-import {
-  EncryptedSavedObjectsService,
-  EncryptedSavedObjectTypeRegistration,
-  EncryptionError,
-  EncryptedSavedObjectsAuditLogger,
-  EncryptedSavedObjectsClientWrapper,
-} from './lib';
-
-export const PLUGIN_ID = 'encrypted_saved_objects';
-export const CONFIG_PREFIX = `xpack.${PLUGIN_ID}`;
-
-interface CoreSetup {
-  config: { encryptionKey?: string };
-  elasticsearch: Legacy.Plugins.elasticsearch.Plugin;
-  savedObjects: Legacy.SavedObjectsService;
-}
-
-interface PluginsSetup {
-  audit: unknown;
-}
-
-export class Plugin {
-  constructor(private readonly log: Server.Logger) {}
-
-  public setup(core: CoreSetup, plugins: PluginsSetup) {
-    let encryptionKey = core.config.encryptionKey;
-    if (encryptionKey == null) {
-      this.log.warn(
-        `Generating a random key for ${CONFIG_PREFIX}.encryptionKey. To be able ` +
-          'to decrypt encrypted saved objects attributes after restart, please set ' +
-          `${CONFIG_PREFIX}.encryptionKey in kibana.yml`
-      );
-
-      encryptionKey = crypto.randomBytes(16).toString('hex');
-    }
-
-    const service = Object.freeze(
-      new EncryptedSavedObjectsService(
-        encryptionKey,
-        core.savedObjects.types,
-        this.log,
-        new EncryptedSavedObjectsAuditLogger(plugins.audit)
-      )
-    );
-
-    // Register custom saved object client that will encrypt, decrypt and strip saved object
-    // attributes where appropriate for any saved object repository request. We choose max possible
-    // priority for this wrapper to allow all other wrappers to set proper `namespace` for the Saved
-    // Object (e.g. wrapper registered by the Spaces plugin) before we encrypt attributes since
-    // `namespace` is included into AAD.
-    core.savedObjects.addScopedSavedObjectsClientWrapperFactory(
-      Number.MAX_SAFE_INTEGER,
-      'encrypted_saved_objects',
-      ({ client: baseClient }) => new EncryptedSavedObjectsClientWrapper({ baseClient, service })
-    );
-
-    const internalRepository: SavedObjectsRepository = core.savedObjects.getSavedObjectsRepository(
-      core.elasticsearch.getCluster('admin').callWithInternalUser
-    );
-
-    return {
-      isEncryptionError: (error: Error) => error instanceof EncryptionError,
-      registerType: (typeRegistration: EncryptedSavedObjectTypeRegistration) =>
-        service.registerType(typeRegistration),
-      getDecryptedAsInternalUser: async <T extends SavedObjectAttributes = any>(
-        type: string,
-        id: string,
-        options?: SavedObjectsBaseOptions
-      ): Promise<SavedObject<T>> => {
-        const savedObject = await internalRepository.get(type, id, options);
-        return {
-          ...savedObject,
-          attributes: await service.decryptAttributes(
-            { type, id, namespace: options && options.namespace },
-            savedObject.attributes
-          ),
-        };
-      },
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/file_upload/public/kibana_services.js b/x-pack/legacy/plugins/file_upload/public/kibana_services.js
index 8dd2923752b991..10a6ae7179bc21 100644
--- a/x-pack/legacy/plugins/file_upload/public/kibana_services.js
+++ b/x-pack/legacy/plugins/file_upload/public/kibana_services.js
@@ -4,10 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { uiModules } from 'ui/modules';
+import { start as data } from '../../../../../src/legacy/core_plugins/data/public/legacy';
 
-export let indexPatternService;
-
-uiModules.get('app/file_upload').run(($injector) => {
-  indexPatternService = $injector.get('indexPatterns');
-});
+export const indexPatternService = data.indexPatterns.indexPatterns;
diff --git a/x-pack/legacy/plugins/file_upload/public/util/indexing_service.test.js b/x-pack/legacy/plugins/file_upload/public/util/indexing_service.test.js
index 47582cb47a2aa7..d6ca3d3180d6e1 100644
--- a/x-pack/legacy/plugins/file_upload/public/util/indexing_service.test.js
+++ b/x-pack/legacy/plugins/file_upload/public/util/indexing_service.test.js
@@ -4,6 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+// Not all index pattern dependencies are avab. in jest context,
+// prevent unrelated import errors by mocking kibana services
+jest.mock('../kibana_services', () => {});
 import { checkIndexPatternValid } from './indexing_service';
 
 describe('indexing_service', () => {
diff --git a/x-pack/legacy/plugins/file_upload/public/util/size_limited_chunking.js b/x-pack/legacy/plugins/file_upload/public/util/size_limited_chunking.js
index 4c49772b9ddce2..387060279ca0dd 100644
--- a/x-pack/legacy/plugins/file_upload/public/util/size_limited_chunking.js
+++ b/x-pack/legacy/plugins/file_upload/public/util/size_limited_chunking.js
@@ -5,16 +5,23 @@
  */
 import { MAX_BYTES } from '../../common/constants/file_import';
 
+// MAX_BYTES is a good guideline for splitting up posts, but this logic
+// occasionally sizes chunks so closely to the limit, that the remaining content
+// of a post (besides features) tips it over the max. Adding a 2MB buffer
+// to ensure this doesn't happen
+const CHUNK_BUFFER = 2097152;
+
 // Add data elements to chunk until limit is met
-export function sizeLimitedChunking(dataArr, maxChunkSize = MAX_BYTES) {
+export function sizeLimitedChunking(dataArr, maxByteSize = MAX_BYTES - CHUNK_BUFFER) {
   let chunkSize = 0;
+
   return dataArr.reduce((accu, el) => {
     const featureByteSize = (
       new Blob([JSON.stringify(el)], { type: 'application/json' })
     ).size;
-    if (featureByteSize > maxChunkSize) {
-      throw `Some features exceed maximum chunk size of ${maxChunkSize}`;
-    } else if (chunkSize + featureByteSize < maxChunkSize) {
+    if (featureByteSize > maxByteSize) {
+      throw `Some features exceed maximum chunk size of ${maxByteSize}`;
+    } else if (chunkSize + featureByteSize < maxByteSize) {
       const lastChunkRef = accu.length - 1;
       chunkSize += featureByteSize;
       accu[lastChunkRef].push(el);
diff --git a/x-pack/legacy/plugins/graph/index.js b/x-pack/legacy/plugins/graph/index.js
index 1a61caca7a7c17..9ece9966b7da4e 100644
--- a/x-pack/legacy/plugins/graph/index.js
+++ b/x-pack/legacy/plugins/graph/index.js
@@ -23,7 +23,7 @@ export function graph(kibana) {
         order: 9000,
         icon: 'plugins/graph/icon.png',
         euiIconType: 'graphApp',
-        main: 'plugins/graph/app',
+        main: 'plugins/graph/index',
       },
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       hacks: ['plugins/graph/hacks/toggle_app_link_in_nav'],
diff --git a/x-pack/legacy/plugins/graph/public/angular/directives/graph_inspect.js b/x-pack/legacy/plugins/graph/public/angular/directives/graph_inspect.js
deleted file mode 100644
index 1e6622fd796fb2..00000000000000
--- a/x-pack/legacy/plugins/graph/public/angular/directives/graph_inspect.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { uiModules } from 'ui/modules';
-import template from '../templates/inspect.html';
-const app = uiModules.get('app/graph');
-
-app.directive('graphInspect', function () {
-  return {
-    replace: true,
-    restrict: 'E',
-    template,
-  };
-});
diff --git a/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.js b/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.js
index 96be9eed2b4679..b981f732d1bc6d 100644
--- a/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.js
+++ b/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.js
@@ -894,10 +894,6 @@ module.exports = (function () {
           existingEdge.doc_count = Math.max(existingEdge.doc_count, edge.doc_count);
           continue;
         }
-        // Inferred edges were a feature that used Levenshtein edit distance on node labels
-        // to determine connections - removed that feature but may bring back.
-
-        const inferred = edge.inferred ? true : false;
         const newEdge = {
           'source': srcWrapperObj,
           'target': targetWrapperObj,
@@ -905,7 +901,6 @@ module.exports = (function () {
           'width': edge.width,
           'id': edge.id,
           'doc_count': edge.doc_count,
-          'inferred': inferred
         };
         if (edge.label) {
           newEdge.label = edge.label;
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.js b/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.js
index 1d28b4ba5ab309..444e68dd03520e 100644
--- a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.js
+++ b/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.js
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { uiModules } from 'ui/modules';
 import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
 import { i18n } from '@kbn/i18n';
 import {
@@ -12,8 +11,6 @@ import {
   injectReferences,
 } from './saved_workspace_references';
 
-const module = uiModules.get('app/dashboard');
-
 export function SavedWorkspaceProvider(Private) {
   // SavedWorkspace constructor. Usually you'd interact with an instance of this.
   // ID is option, without it one will be generated on save.
@@ -68,8 +65,3 @@ export function SavedWorkspaceProvider(Private) {
   SavedWorkspace.searchsource = false;
   return SavedWorkspace;
 }
-
-// Used only by the savedDashboards service, usually no reason to change this
-module.factory('SavedGraphWorkspace', function (Private) {
-  return Private(SavedWorkspaceProvider);
-});
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.js b/x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.js
index 7af0dad3c704c7..1fef4b7c38c075 100644
--- a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.js
+++ b/x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.js
@@ -6,7 +6,6 @@
 
 import _ from 'lodash';
 
-import { uiModules } from 'ui/modules';
 import chrome from 'ui/chrome';
 import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
 import { SavedObjectsClientProvider } from 'ui/saved_objects';
@@ -87,9 +86,5 @@ export function SavedWorkspacesProvider(kbnUrl, Private, Promise) {
       });
   };
 }
-// This is the only thing that gets injected into controllers
-uiModules.get('app/graph').service('savedGraphWorkspaces',  function (Private) {
-  return Private(SavedWorkspacesProvider);
-});
 
 SavedObjectRegistryProvider.register(SavedWorkspacesProvider);
diff --git a/x-pack/legacy/plugins/graph/public/angular/templates/index.html b/x-pack/legacy/plugins/graph/public/angular/templates/index.html
index a3b025ff9d6dfb..20b1059ae45eca 100644
--- a/x-pack/legacy/plugins/graph/public/angular/templates/index.html
+++ b/x-pack/legacy/plugins/graph/public/angular/templates/index.html
@@ -4,7 +4,49 @@
   </kbn-top-nav>
 
   <div class="gphGraph__menus" ng-show="menus.showInspect">
-    <graph-inspect ng-show="menus.showInspect"></graph-inspect>
+    <div>
+      <div
+        class="kuiLocalDropdownTitle"
+        i18n-id="xpack.graph.inspect.title"
+        i18n-default-message="Inspect"
+      ></div>
+
+      <div
+        class="list-group-item"
+        ng-if="(workspace !== null)"
+      >
+        <small class="help-block">http://host:port/{{ selectedIndex.name }}/_graph/explore</small>
+        <ul class="nav nav-tabs">
+          <li ng-class="{active: spymode === 'request'}">
+            <a
+              ng-click="spymode='request'"
+              i18n-id="xpack.graph.inspect.requestTabTitle"
+              i18n-default-message="Request"
+            ></a>
+          </li>
+          <li ng-class="{active: spymode === 'response'}">
+            <a
+              ng-click="spymode='response'"
+              i18n-id="xpack.graph.inspect.responseTabTitle"
+              i18n-default-message="Response"
+            ></a>
+          </li>
+        </ul>
+
+        <div
+          ng-show="spymode == 'request'"
+          ui-ace="{ onLoad: aceLoaded, mode: 'json', advanced: { readOnly: true } }"
+          ng-model="workspace.lastRequest"
+          class="gphSettings__jsonView"
+        ></div>
+        <div
+          ng-show="spymode == 'response'"
+          ui-ace="{ onLoad: aceLoaded, mode: 'json', advanced: { readOnly: true } }"
+          ng-model="workspace.lastResponse"
+          class="gphSettings__jsonView"
+        ></div>
+      </div>
+    </div>
   </div>
 
   <div
@@ -19,7 +61,7 @@
     initial-query="initialQuery"
     plugin-data-start="pluginDataStart"
     core-start="coreStart"
-    store="store"
+    storage="storage"
     no-index-patterns="noIndexPatterns"
   ></div>
 
@@ -335,61 +377,6 @@
             } }}"
           >{{mc.v2}}</small>
         </div>
-
-
-
-        <div class="gphSidebar__panel" ng-if="(detail.inferredEdge)">
-          <div class="gphSidebar__header">
-            <span class="kuiIcon fa-cog"></span>
-            {{ ::'xpack.graph.sidebar.similarLabelsTitle' | i18n: { defaultMessage: 'Similar labels' } }}
-          </div>
-
-          <div class="form-group form-group-sm gphFormGroup--small">
-            <div style="line-height: 24px;">
-              <button
-                tooltip="{{ ::'xpack.graph.sidebar.similarLabels.mergeTargetToSrcButtonTooltip' | i18n: {
-                  defaultMessage: 'Merge {targetLabel} into {srcLabel}',
-                  values: { targetLabel: detail.inferredEdge.topTarget.label, srcLabel: detail.inferredEdge.topSrc.label },
-                } }}"
-                type="button" style="vertical-align: top;" class="kuiButton kuiButton--basic kuiButton--small"
-                ng-click="performMerge(detail.inferredEdge.topTarget.id, detail.inferredEdge.topSrc.id)">
-                <span class="kui fa-chevron-circle-down"></span>
-              </button>
-              <svg width="24" height="24">
-                <circle class="gphNode__circle " r="10" cx="12" cy="12" ng-attr-style="fill:{{detail.inferredEdge.topSrc.color}}" />
-
-                <text ng-if="detail.inferredEdge.topSrc.icon" class="fa gphNode__text" text-anchor="middle" x="12" y="16">{{detail.inferredEdge.topSrc.icon.code}}</text>
-              </svg>
-              <span style="vertical-align: top;">{{detail.inferredEdge.topSrc.label}}</span>
-            </div>
-            <div style="line-height: 24px;">
-              <button
-                tooltip="{{ ::'xpack.graph.sidebar.similarLabels.mergeSrcToTargetButtonTooltip' | i18n: {
-                  defaultMessage: 'Merge {srcLabel} into {targetLabel}',
-                  values: { targetLabel: detail.inferredEdge.topTarget.label, srcLabel: detail.inferredEdge.topSrc.label },
-                } }}"
-                type="button" style="vertical-align: top;" class="kuiButton kuiButton--basic kuiButton--small"
-                ng-click="performMerge(detail.inferredEdge.topSrc.id, detail.inferredEdge.topTarget.id)">
-                <span class="kuiIcon fa-chevron-circle-up"></span>
-              </button>
-
-              <svg width="24" height="24">
-                <circle class="gphNode__circle " r="10" cx="12" cy="12" ng-attr-style="fill:{{detail.inferredEdge.topTarget.color}}" />
-
-                <text ng-if="detail.inferredEdge.topTarget.icon" class="fa gphNode__text" text-anchor="middle" x="12" y="16">{{detail.inferredEdge.topTarget.icon.code}}</text>
-              </svg>
-              <span style="vertical-align: top;">{{detail.inferredEdge.topTarget.label}}</span>
-
-            </div>
-
-            <div
-              class="col-sm-10"
-              i18n-id="xpack.graph.sidebar.similarLabels.keyTermsText"
-              i18n-default-message="Key terms: {inferredEdgeLabel}"
-              i18n-values="{ html_inferredEdgeLabel: '<small>' + detail.inferredEdge.label + '</small>' }"
-            ></div>
-          </div>
-        </div>
       </div>
       <!-- end edge-merge detail panel -->
 
diff --git a/x-pack/legacy/plugins/graph/public/angular/templates/inspect.html b/x-pack/legacy/plugins/graph/public/angular/templates/inspect.html
deleted file mode 100644
index a0c4f9803d8442..00000000000000
--- a/x-pack/legacy/plugins/graph/public/angular/templates/inspect.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div>
-  <div
-    class="kuiLocalDropdownTitle"
-    i18n-id="xpack.graph.inspect.title"
-    i18n-default-message="Inspect"
-  ></div>
-
-  <div
-    class="list-group-item"
-    ng-if="(workspace !== null)"
-  >
-    <small class="help-block">http://host:port/{{ selectedIndex.name }}/_graph/explore</small>
-    <ul class="nav nav-tabs">
-      <li ng-class="{active: spymode === 'request'}">
-        <a
-          ng-click="spymode='request'"
-          i18n-id="xpack.graph.inspect.requestTabTitle"
-          i18n-default-message="Request"
-        ></a>
-      </li>
-      <li ng-class="{active: spymode === 'response'}">
-        <a
-          ng-click="spymode='response'"
-          i18n-id="xpack.graph.inspect.responseTabTitle"
-          i18n-default-message="Response"
-        ></a>
-      </li>
-    </ul>
-
-    <div
-      ng-show="spymode == 'request'"
-      ui-ace="{ onLoad: aceLoaded, mode: 'json', advanced: { readOnly: true } }"
-      ng-model="workspace.lastRequest"
-      class="gphSettings__jsonView"
-    ></div>
-    <div
-      ng-show="spymode == 'response'"
-      ui-ace="{ onLoad: aceLoaded, mode: 'json', advanced: { readOnly: true } }"
-      ng-model="workspace.lastResponse"
-      class="gphSettings__jsonView"
-    ></div>
-  </div>
-</div>
diff --git a/x-pack/legacy/plugins/graph/public/app.js b/x-pack/legacy/plugins/graph/public/app.js
index ba69756e7b0706..b60f6b267ad842 100644
--- a/x-pack/legacy/plugins/graph/public/app.js
+++ b/x-pack/legacy/plugins/graph/public/app.js
@@ -11,31 +11,8 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { isColorDark, hexToRgb } from '@elastic/eui';
 
-// import the uiExports that we want to "use"
-import 'uiExports/fieldFormats';
-import 'uiExports/savedObjectTypes';
-
-import 'ui/autoload/all';
-import 'ui/angular-bootstrap';
-import 'ui/kbn_top_nav';
-import 'ui/directives/saved_object_finder';
-import 'ui/directives/input_focus';
-import 'ui/saved_objects/ui/saved_object_save_as_checkbox';
-import 'uiExports/autocompleteProviders';
-import chrome from 'ui/chrome';
-import { uiModules } from 'ui/modules';
-import uiRoutes from 'ui/routes';
-import { addAppRedirectMessageToUrl, toastNotifications } from 'ui/notify';
-import { formatAngularHttpError } from 'ui/notify/lib';
-import { start as data } from '../../../../../src/legacy/core_plugins/data/public/legacy';
-import { SavedObjectsClientProvider } from 'ui/saved_objects';
-import { npStart } from 'ui/new_platform';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
-import { capabilities } from 'ui/capabilities';
 import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
-import { Storage } from 'ui/storage';
-
-import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
+import { addAppRedirectMessageToUrl } from 'ui/notify';
 
 import appTemplate from './angular/templates/index.html';
 import listingTemplate from './angular/templates/listing_ng_wrapper.html';
@@ -48,7 +25,6 @@ import { Settings } from './components/settings';
 import { GraphVisualization } from './components/graph_visualization';
 
 import gws from './angular/graph_client_workspace.js';
-import { SavedWorkspacesProvider } from './angular/services/saved_workspaces';
 import { getEditUrl, getNewPath, getEditPath, setBreadcrumbs } from './services/url';
 import { createCachedIndexPatternProvider } from './services/index_pattern_cache';
 import { urlTemplateRegex } from  './helpers/url_template';
@@ -61,529 +37,533 @@ import {
   datasourceSelector,
   hasFieldsSelector
 } from './state_management';
+import { formatHttpError } from './helpers/format_http_error';
 
-import './angular/directives/graph_inspect';
+export function initGraphApp(angularModule, deps) {
+  const {
+    xpackInfo,
+    chrome,
+    savedGraphWorkspaces,
+    toastNotifications,
+    savedObjectsClient,
+    indexPatterns,
+    kbnBaseUrl,
+    addBasePath,
+    getBasePath,
+    npData,
+    config,
+    savedObjectRegistry,
+    capabilities,
+    coreStart,
+    Storage,
+    canEditDrillDownUrls,
+    graphSavePolicy,
+  } = deps;
+
+  const app = angularModule;
+
+  function checkLicense(kbnBaseUrl) {
+    const licenseAllowsToShowThisPage = xpackInfo.get('features.graph.showAppLink') &&
+      xpackInfo.get('features.graph.enableAppLink');
+    if (!licenseAllowsToShowThisPage) {
+      const message = xpackInfo.get('features.graph.message');
+      const newUrl = addAppRedirectMessageToUrl(addBasePath(kbnBaseUrl), message);
+      window.location.href = newUrl;
+      throw new Error('Graph license error');
+    }
+  }
 
-const app = uiModules.get('app/graph');
+  app.directive('vennDiagram', function (reactDirective) {
+    return reactDirective(VennDiagram);
+  });
 
-function checkLicense(kbnBaseUrl) {
-  const licenseAllowsToShowThisPage = xpackInfo.get('features.graph.showAppLink') &&
-    xpackInfo.get('features.graph.enableAppLink');
-  if (!licenseAllowsToShowThisPage) {
-    const message = xpackInfo.get('features.graph.message');
-    const newUrl = addAppRedirectMessageToUrl(chrome.addBasePath(kbnBaseUrl), message);
-    window.location.href = newUrl;
-    throw new Error('Graph license error');
-  }
-}
+  app.directive('graphVisualization', function (reactDirective) {
+    return reactDirective(GraphVisualization);
+  });
 
-app.directive('vennDiagram', function (reactDirective) {
-  return reactDirective(VennDiagram);
-});
-
-app.directive('graphListing', function (reactDirective) {
-  return reactDirective(Listing, [
-    ['coreStart', { watchDepth: 'reference' }],
-    ['createItem', { watchDepth: 'reference' }],
-    ['findItems', { watchDepth: 'reference' }],
-    ['deleteItems', { watchDepth: 'reference' }],
-    ['editItem', { watchDepth: 'reference' }],
-    ['getViewUrl', { watchDepth: 'reference' }],
-    ['listingLimit', { watchDepth: 'reference' }],
-    ['hideWriteControls', { watchDepth: 'reference' }],
-    ['capabilities', { watchDepth: 'reference' }],
-    ['initialFilter', { watchDepth: 'reference' }],
-  ]);
-});
-
-app.directive('graphApp', function (reactDirective) {
-  return reactDirective(GraphApp, [
-    ['store', { watchDepth: 'reference' }],
-    ['isInitialized', { watchDepth: 'reference' }],
-    ['currentIndexPattern', { watchDepth: 'reference' }],
-    ['indexPatternProvider', { watchDepth: 'reference' }],
-    ['isLoading', { watchDepth: 'reference' }],
-    ['onQuerySubmit', { watchDepth: 'reference' }],
-    ['initialQuery', { watchDepth: 'reference' }],
-    ['confirmWipeWorkspace', { watchDepth: 'reference' }],
-    ['coreStart', { watchDepth: 'reference' }],
-    ['noIndexPatterns', { watchDepth: 'reference' }],
-    ['reduxStore', { watchDepth: 'reference' }],
-    ['pluginDataStart', { watchDepth: 'reference' }],
-  ], { restrict: 'A' });
-});
-
-app.directive('graphVisualization', function (reactDirective) {
-  return reactDirective(GraphVisualization, undefined, { restrict: 'A' });
-});
-
-if (uiRoutes.enable) {
-  uiRoutes.enable();
-}
+  app.directive('graphListing', function (reactDirective) {
+    return reactDirective(Listing, [
+      ['coreStart', { watchDepth: 'reference' }],
+      ['createItem', { watchDepth: 'reference' }],
+      ['findItems', { watchDepth: 'reference' }],
+      ['deleteItems', { watchDepth: 'reference' }],
+      ['editItem', { watchDepth: 'reference' }],
+      ['getViewUrl', { watchDepth: 'reference' }],
+      ['listingLimit', { watchDepth: 'reference' }],
+      ['hideWriteControls', { watchDepth: 'reference' }],
+      ['capabilities', { watchDepth: 'reference' }],
+      ['initialFilter', { watchDepth: 'reference' }],
+    ]);
+  });
 
-uiRoutes
-  .when('/home', {
-    template: listingTemplate,
-    badge: getReadonlyBadge,
-    controller($injector, $location, $scope, Private, config, kbnBaseUrl) {
-      checkLicense(kbnBaseUrl);
-      const services = Private(SavedObjectRegistryProvider).byLoaderPropertiesName;
-      const graphService = services['Graph workspace'];
-      const kbnUrl = $injector.get('kbnUrl');
+  app.directive('graphApp', function (reactDirective) {
+    return reactDirective(GraphApp, [
+      ['storage', { watchDepth: 'reference' }],
+      ['isInitialized', { watchDepth: 'reference' }],
+      ['currentIndexPattern', { watchDepth: 'reference' }],
+      ['indexPatternProvider', { watchDepth: 'reference' }],
+      ['isLoading', { watchDepth: 'reference' }],
+      ['onQuerySubmit', { watchDepth: 'reference' }],
+      ['initialQuery', { watchDepth: 'reference' }],
+      ['confirmWipeWorkspace', { watchDepth: 'reference' }],
+      ['coreStart', { watchDepth: 'reference' }],
+      ['noIndexPatterns', { watchDepth: 'reference' }],
+      ['reduxStore', { watchDepth: 'reference' }],
+      ['pluginDataStart', { watchDepth: 'reference' }],
+    ], { restrict: 'A' });
+  });
 
-      $scope.listingLimit = config.get('savedObjects:listingLimit');
-      $scope.create = () => {
-        kbnUrl.redirect(getNewPath());
-      };
-      $scope.find = (search) => {
-        return graphService.find(search, $scope.listingLimit);
-      };
-      $scope.editItem = (workspace) => {
-        kbnUrl.redirect(getEditPath(workspace));
-      };
-      $scope.getViewUrl = (workspace) => getEditUrl(chrome, workspace);
-      $scope.delete = (workspaces) => {
-        return graphService.delete(workspaces.map(({ id }) => id));
-      };
-      $scope.capabilities = capabilities.get().graph;
-      $scope.initialFilter = ($location.search()).filter || '';
-      $scope.coreStart = npStart.core;
-      setBreadcrumbs({ chrome });
-    }
-  })
-  .when('/workspace/:id?', {
-    template: appTemplate,
-    badge: getReadonlyBadge,
-    resolve: {
-      savedWorkspace: function (savedGraphWorkspaces, $route) {
-        return $route.current.params.id ? savedGraphWorkspaces.get($route.current.params.id)
-          .catch(
-            function () {
-              toastNotifications.addDanger(
-                i18n.translate('xpack.graph.missingWorkspaceErrorMessage', {
-                  defaultMessage: 'Missing workspace',
-                })
-              );
-            }
-          ) : savedGraphWorkspaces.get();
-      },
-      indexPatterns: function (Private) {
-        const savedObjectsClient = Private(SavedObjectsClientProvider);
-
-        return savedObjectsClient.find({
-          type: 'index-pattern',
-          fields: ['title', 'type'],
-          perPage: 10000
-        }).then(response => response.savedObjects);
-      },
-      GetIndexPatternProvider: function (Private) {
-        return data.indexPatterns.indexPatterns;
-      },
-      SavedWorkspacesProvider: function (Private) {
-        return Private(SavedWorkspacesProvider);
-      }
-    }
-  })
-  .otherwise({
-    redirectTo: '/home'
+  app.directive('graphVisualization', function (reactDirective) {
+    return reactDirective(GraphVisualization, undefined, { restrict: 'A' });
   });
 
+  app.config(function ($routeProvider) {
+    $routeProvider.when('/home', {
+      template: listingTemplate,
+      badge: getReadonlyBadge,
+      controller($location, $scope) {
+        checkLicense(kbnBaseUrl);
+        const services = savedObjectRegistry.byLoaderPropertiesName;
+        const graphService = services['Graph workspace'];
+
+        $scope.listingLimit = config.get('savedObjects:listingLimit');
+        $scope.create = () => {
+          $location.url(getNewPath());
+        };
+        $scope.find = (search) => {
+          return graphService.find(search, $scope.listingLimit);
+        };
+        $scope.editItem = (workspace) => {
+          $location.url(getEditPath(workspace));
+        };
+        $scope.getViewUrl = (workspace) => getEditUrl(addBasePath, workspace);
+        $scope.delete = (workspaces) => {
+          return graphService.delete(workspaces.map(({ id }) => id));
+        };
+        $scope.capabilities = capabilities;
+        $scope.initialFilter = ($location.search()).filter || '';
+        $scope.coreStart = coreStart;
+        setBreadcrumbs({ chrome });
+      }
+    })
+      .when('/workspace/:id?', {
+        template: appTemplate,
+        badge: getReadonlyBadge,
+        resolve: {
+          savedWorkspace: function ($route) {
+            return $route.current.params.id ? savedGraphWorkspaces.get($route.current.params.id)
+              .catch(
+                function () {
+                  toastNotifications.addDanger(
+                    i18n.translate('xpack.graph.missingWorkspaceErrorMessage', {
+                      defaultMessage: 'Missing workspace',
+                    })
+                  );
+                }
+              ) : savedGraphWorkspaces.get();
+
+          },
+          //Copied from example found in wizard.js ( Kibana TODO - can't
+          indexPatterns: function () {
+            return savedObjectsClient.find({
+              type: 'index-pattern',
+              fields: ['title', 'type'],
+              perPage: 10000
+            }).then(response => response.savedObjects);
+          },
+          GetIndexPatternProvider: function () {
+            return indexPatterns;
+          },
+        }
+      })
+      .otherwise({
+        redirectTo: '/home'
+      });
+  });
 
-//========  Controller for basic UI ==================
-app.controller('graphuiPlugin', function (
-  $scope,
-  $route,
-  $http,
-  kbnUrl,
-  confirmModal,
-  kbnBaseUrl
-) {
-  checkLicense(kbnBaseUrl);
 
-  function handleError(err) {
+  //========  Controller for basic UI ==================
+  app.controller('graphuiPlugin', function ($scope, $route, $location, confirmModal) {
     checkLicense(kbnBaseUrl);
-    const toastTitle = i18n.translate('xpack.graph.errorToastTitle', {
-      defaultMessage: 'Graph Error',
-      description: '"Graph" is a product name and should not be translated.',
-    });
-    if (err instanceof Error) {
-      toastNotifications.addError(err, {
-        title: toastTitle,
-      });
-    } else {
-      toastNotifications.addDanger({
-        title: toastTitle,
-        text: String(err),
+
+    function handleError(err) {
+      checkLicense(kbnBaseUrl);
+      const toastTitle = i18n.translate('xpack.graph.errorToastTitle', {
+        defaultMessage: 'Graph Error',
+        description: '"Graph" is a product name and should not be translated.',
       });
+      if (err instanceof Error) {
+        toastNotifications.addError(err, {
+          title: toastTitle,
+        });
+      } else {
+        toastNotifications.addDanger({
+          title: toastTitle,
+          text: String(err),
+        });
+      }
     }
-  }
 
-  async function handleHttpError(error) {
-    checkLicense(kbnBaseUrl);
-    toastNotifications.addDanger(formatAngularHttpError(error));
-  }
+    async function handleHttpError(error) {
+      checkLicense(kbnBaseUrl);
+      toastNotifications.addDanger(formatHttpError(error));
+    }
 
-  // Replacement function for graphClientWorkspace's comms so
-  // that it works with Kibana.
-  function callNodeProxy(indexName, query, responseHandler) {
-    const request = {
-      index: indexName,
-      query: query
-    };
-    $scope.loading = true;
-    return $http.post('../api/graph/graphExplore', request)
-      .then(function (resp) {
-        if (resp.data.resp.timed_out) {
-          toastNotifications.addWarning(
-            i18n.translate('xpack.graph.exploreGraph.timedOutWarningText', {
-              defaultMessage: 'Exploration timed out',
-            })
-          );
-        }
-        responseHandler(resp.data.resp);
-      })
-      .catch(handleHttpError)
-      .finally(() => {
-        $scope.loading = false;
-      });
-  }
+    // Replacement function for graphClientWorkspace's comms so
+    // that it works with Kibana.
+    function callNodeProxy(indexName, query, responseHandler) {
+      const request = {
+        body: JSON.stringify({
+          index: indexName,
+          query: query
+        })
+      };
+      $scope.loading = true;
+      return coreStart.http.post('../api/graph/graphExplore', request)
+        .then(function (data) {
+          const response = data.resp;
+          if (response.timed_out) {
+            toastNotifications.addWarning(
+              i18n.translate('xpack.graph.exploreGraph.timedOutWarningText', {
+                defaultMessage: 'Exploration timed out',
+              })
+            );
+          }
+          responseHandler(response);
+        })
+        .catch(handleHttpError)
+        .finally(() => {
+          $scope.loading = false;
+          $scope.$digest();
+        });
+    }
 
 
-  //Helper function for the graphClientWorkspace to perform a query
-  const callSearchNodeProxy = function (indexName, query, responseHandler) {
-    const request = {
-      index: indexName,
-      body: query
-    };
-    $scope.loading = true;
-    $http.post('../api/graph/searchProxy', request)
-      .then(function (resp) {
-        responseHandler(resp.data.resp);
-      })
-      .catch(handleHttpError)
-      .finally(() => {
-        $scope.loading = false;
-      });
-  };
-
-  $scope.indexPatternProvider = createCachedIndexPatternProvider($route.current.locals.GetIndexPatternProvider.get);
-
-  const store = createGraphStore({
-    basePath: chrome.getBasePath(),
-    indexPatternProvider: $scope.indexPatternProvider,
-    indexPatterns: $route.current.locals.indexPatterns,
-    createWorkspace: (indexPattern, exploreControls) => {
-      const options = {
-        indexName: indexPattern,
-        vertex_fields: [],
-        // Here we have the opportunity to look up labels for nodes...
-        nodeLabeller: function () {
-          //   console.log(newNodes);
-        },
-        changeHandler: function () {
-          //Allows DOM to update with graph layout changes.
-          $scope.$apply();
-        },
-        graphExploreProxy: callNodeProxy,
-        searchProxy: callSearchNodeProxy,
-        exploreControls,
+    //Helper function for the graphClientWorkspace to perform a query
+    const callSearchNodeProxy = function (indexName, query, responseHandler) {
+      const request = {
+        body: JSON.stringify({
+          index: indexName,
+          body: query
+        })
       };
-      $scope.workspace = gws.createWorkspace(options);
-    },
-    setLiveResponseFields: (fields) => {
-      $scope.liveResponseFields = fields;
-    },
-    setUrlTemplates: (urlTemplates) => {
-      $scope.urlTemplates = urlTemplates;
-    },
-    getWorkspace: () => {
-      return $scope.workspace;
-    },
-    getSavedWorkspace: () => {
-      return $route.current.locals.savedWorkspace;
-    },
-    notifications: npStart.core.notifications,
-    http: npStart.core.http,
-    showSaveModal,
-    setWorkspaceInitialized: () => {
-      $scope.workspaceInitialized = true;
-    },
-    savePolicy: chrome.getInjected('graphSavePolicy'),
-    changeUrl: (newUrl) => {
-      $scope.$evalAsync(() => {
-        kbnUrl.change(newUrl, {});
-      });
-    },
-    notifyAngular: () => {
-      $scope.$digest();
-    },
-    chrome,
-  });
+      $scope.loading = true;
+      coreStart.http.post('../api/graph/searchProxy', request)
+        .then(function (data) {
+          const response = data.resp;
+          responseHandler(response);
+        })
+        .catch(handleHttpError)
+        .finally(() => {
+          $scope.loading = false;
+          $scope.$digest();
+        });
+    };
 
-  // register things on scope passed down to react components
-  $scope.pluginDataStart = npStart.plugins.data;
-  $scope.store = new Storage(window.localStorage);
-  $scope.coreStart = npStart.core;
-  $scope.loading = false;
-  $scope.reduxStore = store;
-  $scope.savedWorkspace = $route.current.locals.savedWorkspace;
-
-  // register things for legacy angular UI
-  const allSavingDisabled = chrome.getInjected('graphSavePolicy') === 'none';
-  $scope.spymode = 'request';
-  $scope.colors = colorChoices;
-  $scope.isColorDark = (color) => isColorDark(...hexToRgb(color));
-  $scope.nodeClick = function (n, $event) {
-
-    //Selection logic - shift key+click helps selects multiple nodes
-    // Without the shift key we deselect all prior selections (perhaps not
-    // a great idea for touch devices with no concept of shift key)
-    if (!$event.shiftKey) {
-      const prevSelection = n.isSelected;
-      $scope.workspace.selectNone();
-      n.isSelected = prevSelection;
-    }
+    $scope.indexPatternProvider = createCachedIndexPatternProvider($route.current.locals.GetIndexPatternProvider.get);
+
+    const store = createGraphStore({
+      basePath: getBasePath(),
+      indexPatternProvider: $scope.indexPatternProvider,
+      indexPatterns: $route.current.locals.indexPatterns,
+      createWorkspace: (indexPattern, exploreControls) => {
+        const options = {
+          indexName: indexPattern,
+          vertex_fields: [],
+          // Here we have the opportunity to look up labels for nodes...
+          nodeLabeller: function () {
+            //   console.log(newNodes);
+          },
+          changeHandler: function () {
+            //Allows DOM to update with graph layout changes.
+            $scope.$apply();
+          },
+          graphExploreProxy: callNodeProxy,
+          searchProxy: callSearchNodeProxy,
+          exploreControls,
+        };
+        $scope.workspace = gws.createWorkspace(options);
+      },
+      setLiveResponseFields: (fields) => {
+        $scope.liveResponseFields = fields;
+      },
+      setUrlTemplates: (urlTemplates) => {
+        $scope.urlTemplates = urlTemplates;
+      },
+      getWorkspace: () => {
+        return $scope.workspace;
+      },
+      getSavedWorkspace: () => {
+        return $route.current.locals.savedWorkspace;
+      },
+      notifications: coreStart.notifications,
+      http: coreStart.http,
+      showSaveModal,
+      setWorkspaceInitialized: () => {
+        $scope.workspaceInitialized = true;
+      },
+      savePolicy: graphSavePolicy,
+      changeUrl: (newUrl) => {
+        $scope.$evalAsync(() => {
+          $location.url(newUrl);
+        });
+      },
+      notifyAngular: () => {
+        $scope.$digest();
+      },
+      chrome,
+    });
 
+    // register things on scope passed down to react components
+    $scope.pluginDataStart = npData;
+    $scope.storage = new Storage(window.localStorage);
+    $scope.coreStart = coreStart;
+    $scope.loading = false;
+    $scope.reduxStore = store;
+    $scope.savedWorkspace = $route.current.locals.savedWorkspace;
+
+    // register things for legacy angular UI
+    const allSavingDisabled = graphSavePolicy === 'none';
+    $scope.spymode = 'request';
+    $scope.colors = colorChoices;
+    $scope.isColorDark = (color) => isColorDark(...hexToRgb(color));
+    $scope.nodeClick = function (n, $event) {
+
+      //Selection logic - shift key+click helps selects multiple nodes
+      // Without the shift key we deselect all prior selections (perhaps not
+      // a great idea for touch devices with no concept of shift key)
+      if (!$event.shiftKey) {
+        const prevSelection = n.isSelected;
+        $scope.workspace.selectNone();
+        n.isSelected = prevSelection;
+      }
 
-    if ($scope.workspace.toggleNodeSelection(n)) {
-      $scope.selectSelected(n);
-    } else {
-      $scope.detail = null;
-    }
-  };
 
-  function canWipeWorkspace(callback, text, options) {
-    if (!hasFieldsSelector(store.getState())) {
-      callback();
-      return;
-    }
-    const confirmModalOptions = {
-      onConfirm: callback,
-      onCancel: (() => {}),
-      confirmButtonText: i18n.translate('xpack.graph.leaveWorkspace.confirmButtonLabel', {
-        defaultMessage: 'Leave anyway',
-      }),
-      title: i18n.translate('xpack.graph.leaveWorkspace.modalTitle', {
-        defaultMessage: 'Unsaved changes',
-      }),
-      ...options,
+      if ($scope.workspace.toggleNodeSelection(n)) {
+        $scope.selectSelected(n);
+      } else {
+        $scope.detail = null;
+      }
     };
-    confirmModal(text || i18n.translate('xpack.graph.leaveWorkspace.confirmText', {
-      defaultMessage: 'If you leave now, you will lose unsaved changes.',
-    }), confirmModalOptions);
-  }
-  $scope.confirmWipeWorkspace = canWipeWorkspace;
 
-  $scope.clickEdge = function (edge) {
-    if (edge.inferred) {
-      $scope.setDetail ({ 'inferredEdge': edge });
-    }else {
+    $scope.clickEdge = function (edge) {
       $scope.workspace.getAllIntersections($scope.handleMergeCandidatesCallback, [edge.topSrc, edge.topTarget]);
-    }
-  };
-
-  $scope.submit = function (searchTerm) {
-    $scope.workspaceInitialized = true;
-    const numHops = 2;
-    if (searchTerm.startsWith('{')) {
-      try {
-        const query = JSON.parse(searchTerm);
-        if (query.vertices) {
-          // Is a graph explore request
-          $scope.workspace.callElasticsearch(query);
-        }else {
-          // Is a regular query DSL query
-          $scope.workspace.search(query, $scope.liveResponseFields, numHops);
+    };
+
+    $scope.submit = function (searchTerm) {
+      $scope.workspaceInitialized = true;
+      const numHops = 2;
+      if (searchTerm.startsWith('{')) {
+        try {
+          const query = JSON.parse(searchTerm);
+          if (query.vertices) {
+            // Is a graph explore request
+            $scope.workspace.callElasticsearch(query);
+          }else {
+            // Is a regular query DSL query
+            $scope.workspace.search(query, $scope.liveResponseFields, numHops);
+          }
         }
+        catch (err) {
+          handleError(err);
+        }
+        return;
       }
-      catch (err) {
-        handleError(err);
-      }
-      return;
-    }
-    $scope.workspace.simpleSearch(searchTerm, $scope.liveResponseFields, numHops);
-  };
+      $scope.workspace.simpleSearch(searchTerm, $scope.liveResponseFields, numHops);
+    };
 
-  $scope.selectSelected = function (node) {
-    $scope.detail = {
-      latestNodeSelection: node
+    $scope.selectSelected = function (node) {
+      $scope.detail = {
+        latestNodeSelection: node
+      };
+      return $scope.selectedSelectedVertex = node;
     };
-    return $scope.selectedSelectedVertex = node;
-  };
-
-  $scope.isSelectedSelected = function (node) {
-    return $scope.selectedSelectedVertex === node;
-  };
-
-  $scope.openUrlTemplate = function (template) {
-    const url = template.url;
-    const newUrl = url.replace(urlTemplateRegex, template.encoder.encode($scope.workspace));
-    window.open(newUrl, '_blank');
-  };
-
-  $scope.aceLoaded = (editor) => {
-    editor.$blockScrolling = Infinity;
-  };
-
-  $scope.setDetail = function (data) {
-    $scope.detail = data;
-  };
-
-  $scope.performMerge = function (parentId, childId) {
-    let found = true;
-    while (found) {
-      found = false;
-      for (const i in $scope.detail.mergeCandidates) {
-        const mc = $scope.detail.mergeCandidates[i];
-        if ((mc.id1 === childId) || (mc.id2 === childId)) {
-          $scope.detail.mergeCandidates.splice(i, 1);
-          found = true;
-          break;
-        }
+
+    $scope.isSelectedSelected = function (node) {
+      return $scope.selectedSelectedVertex === node;
+    };
+
+    $scope.openUrlTemplate = function (template) {
+      const url = template.url;
+      const newUrl = url.replace(urlTemplateRegex, template.encoder.encode($scope.workspace));
+      window.open(newUrl, '_blank');
+    };
+
+    $scope.aceLoaded = (editor) => {
+      editor.$blockScrolling = Infinity;
+    };
+
+    $scope.setDetail = function (data) {
+      $scope.detail = data;
+    };
+
+    function canWipeWorkspace(callback, text, options) {
+      if (!hasFieldsSelector(store.getState())) {
+        callback();
+        return;
       }
+      const confirmModalOptions = {
+        onConfirm: callback,
+        onCancel: (() => {}),
+        confirmButtonText: i18n.translate('xpack.graph.leaveWorkspace.confirmButtonLabel', {
+          defaultMessage: 'Leave anyway',
+        }),
+        title: i18n.translate('xpack.graph.leaveWorkspace.modalTitle', {
+          defaultMessage: 'Unsaved changes',
+        }),
+        ...options,
+      };
+      confirmModal(text || i18n.translate('xpack.graph.leaveWorkspace.confirmText', {
+        defaultMessage: 'If you leave now, you will lose unsaved changes.',
+      }), confirmModalOptions);
     }
-    $scope.workspace.mergeIds(parentId, childId);
-    $scope.detail = null;
-  };
-
-
-  $scope.handleMergeCandidatesCallback = function (termIntersects) {
-    const mergeCandidates = [];
-    for (const i in termIntersects) {
-      const ti = termIntersects[i];
-      mergeCandidates.push({
-        'id1': ti.id1,
-        'id2': ti.id2,
-        'term1': ti.term1,
-        'term2': ti.term2,
-        'v1': ti.v1,
-        'v2': ti.v2,
-        'overlap': ti.overlap
-      });
+    $scope.confirmWipeWorkspace = canWipeWorkspace;
+
+    $scope.performMerge = function (parentId, childId) {
+      let found = true;
+      while (found) {
+        found = false;
+        for (const i in $scope.detail.mergeCandidates) {
+          const mc = $scope.detail.mergeCandidates[i];
+          if ((mc.id1 === childId) || (mc.id2 === childId)) {
+            $scope.detail.mergeCandidates.splice(i, 1);
+            found = true;
+            break;
+          }
+        }
+      }
+      $scope.workspace.mergeIds(parentId, childId);
+      $scope.detail = null;
+    };
 
-    }
-    $scope.detail = { mergeCandidates };
-  };
-
-  // ===== Menubar configuration =========
-  $scope.topNavMenu = [];
-  $scope.topNavMenu.push({
-    key: 'new',
-    label: i18n.translate('xpack.graph.topNavMenu.newWorkspaceLabel', {
-      defaultMessage: 'New',
-    }),
-    description: i18n.translate('xpack.graph.topNavMenu.newWorkspaceAriaLabel', {
-      defaultMessage: 'New Workspace',
-    }),
-    tooltip: i18n.translate('xpack.graph.topNavMenu.newWorkspaceTooltip', {
-      defaultMessage: 'Create a new workspace',
-    }),
-    run: function () {
-      canWipeWorkspace(function () {
-        kbnUrl.change('/workspace/', {});
-      });  },
-    testId: 'graphNewButton',
-  });
+    $scope.handleMergeCandidatesCallback = function (termIntersects) {
+      const mergeCandidates = [];
+      for (const i in termIntersects) {
+        const ti = termIntersects[i];
+        mergeCandidates.push({
+          'id1': ti.id1,
+          'id2': ti.id2,
+          'term1': ti.term1,
+          'term2': ti.term2,
+          'v1': ti.v1,
+          'v2': ti.v2,
+          'overlap': ti.overlap
+        });
 
-  // if saving is disabled using uiCapabilities, we don't want to render the save
-  // button so it's consistent with all of the other applications
-  if (capabilities.get().graph.save) {
-    // allSavingDisabled is based on the xpack.graph.savePolicy, we'll maintain this functionality
+      }
+      $scope.detail = { mergeCandidates };
+    };
 
+    // ===== Menubar configuration =========
+    $scope.topNavMenu = [];
     $scope.topNavMenu.push({
-      key: 'save',
-      label: i18n.translate('xpack.graph.topNavMenu.saveWorkspace.enabledLabel', {
-        defaultMessage: 'Save',
+      key: 'new',
+      label: i18n.translate('xpack.graph.topNavMenu.newWorkspaceLabel', {
+        defaultMessage: 'New',
       }),
-      description: i18n.translate('xpack.graph.topNavMenu.saveWorkspace.enabledAriaLabel', {
-        defaultMessage: 'Save workspace',
+      description: i18n.translate('xpack.graph.topNavMenu.newWorkspaceAriaLabel', {
+        defaultMessage: 'New Workspace',
       }),
-      tooltip: () => {
-        if (allSavingDisabled) {
-          return i18n.translate('xpack.graph.topNavMenu.saveWorkspace.disabledTooltip', {
-            defaultMessage: 'No changes to saved workspaces are permitted by the current save policy',
-          });
-        } else {
-          return i18n.translate('xpack.graph.topNavMenu.saveWorkspace.enabledTooltip', {
-            defaultMessage: 'Save this workspace',
+      tooltip: i18n.translate('xpack.graph.topNavMenu.newWorkspaceTooltip', {
+        defaultMessage: 'Create a new workspace',
+      }),
+      run: function () {
+        canWipeWorkspace(function () {
+          $scope.$evalAsync(() => {
+            if ($location.url() === '/workspace/') {
+              $route.reload();
+            } else {
+              $location.url('/workspace/');
+            }
           });
-        }
-      },
-      disableButton: function () {
-        return allSavingDisabled || !hasFieldsSelector(store.getState());
-      },
-      run: () => {
-        store.dispatch({
-          type: 'x-pack/graph/SAVE_WORKSPACE',
-          payload: $route.current.locals.savedWorkspace,
         });
       },
-      testId: 'graphSaveButton',
+      testId: 'graphNewButton',
     });
-  }
-  $scope.topNavMenu.push({
-    key: 'inspect',
-    disableButton: function () { return $scope.workspace === null; },
-    label: i18n.translate('xpack.graph.topNavMenu.inspectLabel', {
-      defaultMessage: 'Inspect',
-    }),
-    description: i18n.translate('xpack.graph.topNavMenu.inspectAriaLabel', {
-      defaultMessage: 'Inspect',
-    }),
-    run: () => {
-      $scope.$evalAsync(() => {
-        const curState = $scope.menus.showInspect;
-        $scope.closeMenus();
-        $scope.menus.showInspect = !curState;
-      });
-    },
-  });
 
-  $scope.topNavMenu.push({
-    key: 'settings',
-    disableButton: function () { return datasourceSelector(store.getState()).type === 'none'; },
-    label: i18n.translate('xpack.graph.topNavMenu.settingsLabel', {
-      defaultMessage: 'Settings',
-    }),
-    description: i18n.translate('xpack.graph.topNavMenu.settingsAriaLabel', {
-      defaultMessage: 'Settings',
-    }),
-    run: () => {
-      const settingsObservable = asAngularSyncedObservable(() => ({
-        blacklistedNodes: $scope.workspace ? [...$scope.workspace.blacklistedNodes] : undefined,
-        unblacklistNode: $scope.workspace ? $scope.workspace.unblacklist : undefined,
-        canEditDrillDownUrls: chrome.getInjected('canEditDrillDownUrls')
-      }), $scope.$digest.bind($scope));
-      npStart.core.overlays.openFlyout(
-        <Provider store={store}>
-          <Settings observable={settingsObservable} />
-        </Provider>, {
-          size: 'm',
-          closeButtonAriaLabel: i18n.translate('xpack.graph.settings.closeLabel', { defaultMessage: 'Close' }),
-          'data-test-subj': 'graphSettingsFlyout',
-          ownFocus: true,
-          className: 'gphSettingsFlyout',
-          maxWidth: 520,
+    // if saving is disabled using uiCapabilities, we don't want to render the save
+    // button so it's consistent with all of the other applications
+    if (capabilities.save) {
+      // allSavingDisabled is based on the xpack.graph.savePolicy, we'll maintain this functionality
+
+      $scope.topNavMenu.push({
+        key: 'save',
+        label: i18n.translate('xpack.graph.topNavMenu.saveWorkspace.enabledLabel', {
+          defaultMessage: 'Save',
+        }),
+        description: i18n.translate('xpack.graph.topNavMenu.saveWorkspace.enabledAriaLabel', {
+          defaultMessage: 'Save workspace',
+        }),
+        tooltip: () => {
+          if (allSavingDisabled) {
+            return i18n.translate('xpack.graph.topNavMenu.saveWorkspace.disabledTooltip', {
+              defaultMessage: 'No changes to saved workspaces are permitted by the current save policy',
+            });
+          } else {
+            return i18n.translate('xpack.graph.topNavMenu.saveWorkspace.enabledTooltip', {
+              defaultMessage: 'Save this workspace',
+            });
+          }
+        },
+        disableButton: function () {
+          return allSavingDisabled || !hasFieldsSelector(store.getState());
+        },
+        run: () => {
+          store.dispatch({
+            type: 'x-pack/graph/SAVE_WORKSPACE',
+            payload: $route.current.locals.savedWorkspace,
+          });
+        },
+        testId: 'graphSaveButton',
+      });
+    }
+    $scope.topNavMenu.push({
+      key: 'inspect',
+      disableButton: function () { return $scope.workspace === null; },
+      label: i18n.translate('xpack.graph.topNavMenu.inspectLabel', {
+        defaultMessage: 'Inspect',
+      }),
+      description: i18n.translate('xpack.graph.topNavMenu.inspectAriaLabel', {
+        defaultMessage: 'Inspect',
+      }),
+      run: () => {
+        $scope.$evalAsync(() => {
+          const curState = $scope.menus.showInspect;
+          $scope.closeMenus();
+          $scope.menus.showInspect = !curState;
         });
-    },
-  });
-
-  $scope.menus = {
-    showSettings: false,
-  };
-
-  $scope.closeMenus = () => {
-    _.forOwn($scope.menus, function (_, key) {
-      $scope.menus[key] = false;
+      },
     });
-  };
 
-  // Deal with situation of request to open saved workspace
-  if ($route.current.locals.savedWorkspace.id) {
-    store.dispatch({
-      type: 'x-pack/graph/LOAD_WORKSPACE',
-      payload: $route.current.locals.savedWorkspace,
+    $scope.topNavMenu.push({
+      key: 'settings',
+      disableButton: function () { return datasourceSelector(store.getState()).type === 'none'; },
+      label: i18n.translate('xpack.graph.topNavMenu.settingsLabel', {
+        defaultMessage: 'Settings',
+      }),
+      description: i18n.translate('xpack.graph.topNavMenu.settingsAriaLabel', {
+        defaultMessage: 'Settings',
+      }),
+      run: () => {
+        const settingsObservable = asAngularSyncedObservable(() => ({
+          blacklistedNodes: $scope.workspace ? [...$scope.workspace.blacklistedNodes] : undefined,
+          unblacklistNode: $scope.workspace ? $scope.workspace.unblacklist : undefined,
+          canEditDrillDownUrls: canEditDrillDownUrls
+        }), $scope.$digest.bind($scope));
+        coreStart.overlays.openFlyout(
+          <Provider store={store}>
+            <Settings observable={settingsObservable} />
+          </Provider>, {
+            size: 'm',
+            closeButtonAriaLabel: i18n.translate('xpack.graph.settings.closeLabel', { defaultMessage: 'Close' }),
+            'data-test-subj': 'graphSettingsFlyout',
+            ownFocus: true,
+            className: 'gphSettingsFlyout',
+            maxWidth: 520,
+          });
+      },
     });
+
     // Allow URLs to include a user-defined text query
     if ($route.current.params.query) {
       $scope.initialQuery = $route.current.params.query;
@@ -595,8 +575,26 @@ app.controller('graphuiPlugin', function (
         $scope.submit($route.current.params.query);
       });
     }
-  } else {
-    $scope.noIndexPatterns = $route.current.locals.indexPatterns.length === 0;
-  }
-});
 
+    $scope.menus = {
+      showSettings: false,
+    };
+
+    $scope.closeMenus = () => {
+      _.forOwn($scope.menus, function (_, key) {
+        $scope.menus[key] = false;
+      });
+    };
+
+    // Deal with situation of request to open saved workspace
+    if ($route.current.locals.savedWorkspace.id) {
+      store.dispatch({
+        type: 'x-pack/graph/LOAD_WORKSPACE',
+        payload: $route.current.locals.savedWorkspace,
+      });
+    } else {
+      $scope.noIndexPatterns = $route.current.locals.indexPatterns.length === 0;
+    }
+  });
+//End controller
+}
diff --git a/x-pack/legacy/plugins/graph/public/components/app.tsx b/x-pack/legacy/plugins/graph/public/components/app.tsx
index aa2221441793f1..5ff7fc2e5da93d 100644
--- a/x-pack/legacy/plugins/graph/public/components/app.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/app.tsx
@@ -10,8 +10,8 @@ import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { Provider } from 'react-redux';
 import React, { useState } from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
-import { Storage } from 'ui/storage';
 import { CoreStart } from 'kibana/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { FieldManager } from './field_manager';
 import { SearchBarProps, SearchBar } from './search_bar';
 import { GraphStore } from '../state_management';
@@ -23,7 +23,7 @@ export interface GraphAppProps extends SearchBarProps {
   coreStart: CoreStart;
   // This is not named dataStart because of Angular treating data- prefix differently
   pluginDataStart: DataPublicPluginStart;
-  store: Storage;
+  storage: IStorageWrapper;
   reduxStore: GraphStore;
   isInitialized: boolean;
   noIndexPatterns: boolean;
@@ -34,7 +34,7 @@ export function GraphApp(props: GraphAppProps) {
   const {
     coreStart,
     pluginDataStart,
-    store,
+    storage,
     reduxStore,
     noIndexPatterns,
     ...searchBarProps
@@ -45,7 +45,7 @@ export function GraphApp(props: GraphAppProps) {
       <KibanaContextProvider
         services={{
           appName: 'graph',
-          store,
+          storage,
           data: pluginDataStart,
           ...coreStart,
         }}
diff --git a/x-pack/legacy/plugins/graph/public/components/graph_visualization/_graph_visualization.scss b/x-pack/legacy/plugins/graph/public/components/graph_visualization/_graph_visualization.scss
index a2e34606cea17b..975e4e84d6b0da 100644
--- a/x-pack/legacy/plugins/graph/public/components/graph_visualization/_graph_visualization.scss
+++ b/x-pack/legacy/plugins/graph/public/components/graph_visualization/_graph_visualization.scss
@@ -24,10 +24,6 @@
     stroke: $euiColorDarkShade;
     stroke-opacity: 0.95;
   }
-
-  &--inferred {
-    stroke-dasharray: 5, 5;
-  }
 }
 
 .gphNode {
diff --git a/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.test.tsx b/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.test.tsx
index deeea8175da8ec..be3ebee9f0e233 100644
--- a/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.test.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.test.tsx
@@ -80,7 +80,6 @@ describe('graph_visualization', () => {
   ];
   const edges: GroupAwareWorkspaceEdge[] = [
     {
-      inferred: false,
       isSelected: true,
       label: '',
       topSrc: nodes[0],
@@ -91,7 +90,6 @@ describe('graph_visualization', () => {
       width: 2,
     },
     {
-      inferred: false,
       isSelected: true,
       label: '',
       topSrc: nodes[1],
diff --git a/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.tsx b/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.tsx
index 696e94da68a68a..162e4d01db6a47 100644
--- a/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/graph_visualization/graph_visualization.tsx
@@ -94,7 +94,6 @@ export function GraphVisualization({
                 }}
                 className={classNames('gphEdge', {
                   'gphEdge--selected': edge.isSelected,
-                  'gphEdge--inferred': edge.inferred,
                 })}
                 style={{ strokeWidth: edge.width }}
                 strokeLinecap="round"
diff --git a/x-pack/legacy/plugins/graph/public/components/search_bar.test.tsx b/x-pack/legacy/plugins/graph/public/components/search_bar.test.tsx
index 777b1f95462879..fd2004558be77a 100644
--- a/x-pack/legacy/plugins/graph/public/components/search_bar.test.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/search_bar.test.tsx
@@ -48,7 +48,7 @@ function wrapSearchBarInContext(testProps: OuterSearchBarProps) {
     } as CoreStart['docLinks'],
     http: {} as CoreStart['http'],
     overlays: {} as CoreStart['overlays'],
-    store: {
+    storage: {
       get: () => {},
     },
   };
diff --git a/x-pack/legacy/plugins/graph/public/components/settings/blacklist_form.tsx b/x-pack/legacy/plugins/graph/public/components/settings/blacklist_form.tsx
index b321ea3a0d8eda..f7ae04ef9dbcc1 100644
--- a/x-pack/legacy/plugins/graph/public/components/settings/blacklist_form.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/settings/blacklist_form.tsx
@@ -39,7 +39,7 @@ export function BlacklistForm({
             <FormattedMessage
               id="xpack.graph.blacklist.noEntriesDescription"
               defaultMessage="You don't have any blocked terms. Select vertices and click {stopSign} in the control panel on the right to block them. Documents that match blocked terms are no longer explored and relationships to them are hidden."
-              values={{ stopSign: <span className="kuiIcon fa-ban"></span> }}
+              values={{ stopSign: <span className="kuiIcon fa-ban" /> }}
             />
           }
         />
diff --git a/x-pack/legacy/plugins/graph/public/hacks/toggle_app_link_in_nav.js b/x-pack/legacy/plugins/graph/public/hacks/toggle_app_link_in_nav.js
index 11b02354a97c50..5b1eb6181fd610 100644
--- a/x-pack/legacy/plugins/graph/public/hacks/toggle_app_link_in_nav.js
+++ b/x-pack/legacy/plugins/graph/public/hacks/toggle_app_link_in_nav.js
@@ -4,20 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { uiModules } from 'ui/modules';
 import { npStart } from 'ui/new_platform';
 import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
 
-uiModules.get('xpack/graph')
-  .run(() => {
-    const navLinkUpdates = {};
-    navLinkUpdates.hidden = true;
-    const showAppLink = xpackInfo.get('features.graph.showAppLink', false);
-    navLinkUpdates.hidden = !showAppLink;
-    if (showAppLink) {
-      navLinkUpdates.disabled = !xpackInfo.get('features.graph.enableAppLink', false);
-      navLinkUpdates.tooltip = xpackInfo.get('features.graph.message');
-    }
+const navLinkUpdates = {};
+navLinkUpdates.hidden = true;
+const showAppLink = xpackInfo.get('features.graph.showAppLink', false);
+navLinkUpdates.hidden = !showAppLink;
+if (showAppLink) {
+  navLinkUpdates.disabled = !xpackInfo.get('features.graph.enableAppLink', false);
+  navLinkUpdates.tooltip = xpackInfo.get('features.graph.message');
+}
 
-    npStart.core.chrome.navLinks.update('graph', navLinkUpdates);
-  });
+npStart.core.chrome.navLinks.update('graph', navLinkUpdates);
diff --git a/x-pack/legacy/plugins/graph/public/helpers/format_http_error.ts b/x-pack/legacy/plugins/graph/public/helpers/format_http_error.ts
new file mode 100644
index 00000000000000..5e0ac1e1ce56f0
--- /dev/null
+++ b/x-pack/legacy/plugins/graph/public/helpers/format_http_error.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { IHttpFetchError } from 'kibana/public';
+
+export function formatHttpError(error: IHttpFetchError) {
+  if (!error.response) {
+    return i18n.translate('xpack.graph.fatalError.unavailableServerErrorMessage', {
+      defaultMessage:
+        'An HTTP request has failed to connect. ' +
+        'Please check if the Kibana server is running and that your browser has a working connection, ' +
+        'or contact your system administrator.',
+    });
+  }
+  return i18n.translate('xpack.graph.fatalError.errorStatusMessage', {
+    defaultMessage: 'Error {errStatus} {errStatusText}: {errMessage}',
+    values: {
+      errStatus: error.body.status,
+      errStatusText: error.body.statusText,
+      errMessage: error.body.message,
+    },
+  });
+}
diff --git a/x-pack/legacy/plugins/graph/public/index.ts b/x-pack/legacy/plugins/graph/public/index.ts
new file mode 100644
index 00000000000000..48420d403653f1
--- /dev/null
+++ b/x-pack/legacy/plugins/graph/public/index.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.
+ */
+
+// legacy imports currently necessary to power Graph
+// for a cutover all of these have to be resolved
+import 'uiExports/fieldFormats';
+import 'uiExports/savedObjectTypes';
+import 'uiExports/autocompleteProviders';
+import 'ui/autoload/all';
+import chrome from 'ui/chrome';
+import { IPrivate } from 'ui/private';
+// @ts-ignore
+import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
+// @ts-ignore
+import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+
+import { npSetup, npStart } from 'ui/new_platform';
+import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+import { start as data } from '../../../../../src/legacy/core_plugins/data/public/legacy';
+import { GraphPlugin } from './plugin';
+
+// @ts-ignore
+import { SavedWorkspacesProvider } from './angular/services/saved_workspaces';
+import { LegacyAngularInjectedDependencies } from './render_app';
+
+/**
+ * Get dependencies relying on the global angular context.
+ * They also have to get resolved together with the legacy imports above
+ */
+async function getAngularInjectedDependencies(): Promise<LegacyAngularInjectedDependencies> {
+  const injector = await chrome.dangerouslyGetActiveInjector();
+
+  const Private = injector.get<IPrivate>('Private');
+
+  return {
+    savedObjectRegistry: Private(SavedObjectRegistryProvider),
+    kbnBaseUrl: injector.get('kbnBaseUrl'),
+    savedGraphWorkspaces: Private(SavedWorkspacesProvider),
+  };
+}
+
+(async () => {
+  const instance = new GraphPlugin();
+  instance.setup(npSetup.core, {
+    __LEGACY: {
+      xpackInfo,
+      Storage,
+    },
+  });
+  instance.start(npStart.core, {
+    data,
+    npData: npStart.plugins.data,
+    __LEGACY: {
+      angularDependencies: await getAngularInjectedDependencies(),
+    },
+  });
+})();
diff --git a/x-pack/legacy/plugins/graph/public/plugin.ts b/x-pack/legacy/plugins/graph/public/plugin.ts
new file mode 100644
index 00000000000000..d01f325dd8b700
--- /dev/null
+++ b/x-pack/legacy/plugins/graph/public/plugin.ts
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// NP type imports
+import { CoreSetup, CoreStart, Plugin, SavedObjectsClientContract } from 'src/core/public';
+import { DataStart } from 'src/legacy/core_plugins/data/public';
+import { Plugin as DataPlugin } from 'src/plugins/data/public';
+import { LegacyAngularInjectedDependencies } from './render_app';
+
+export interface GraphPluginStartDependencies {
+  data: DataStart;
+  npData: ReturnType<DataPlugin['start']>;
+}
+
+export interface GraphPluginSetupDependencies {
+  __LEGACY: {
+    Storage: any;
+    xpackInfo: any;
+  };
+}
+
+export interface GraphPluginStartDependencies {
+  __LEGACY: {
+    angularDependencies: LegacyAngularInjectedDependencies;
+  };
+}
+
+export class GraphPlugin implements Plugin {
+  private dataStart: DataStart | null = null;
+  private npDataStart: ReturnType<DataPlugin['start']> | null = null;
+  private savedObjectsClient: SavedObjectsClientContract | null = null;
+  private angularDependencies: LegacyAngularInjectedDependencies | null = null;
+
+  setup(core: CoreSetup, { __LEGACY: { xpackInfo, Storage } }: GraphPluginSetupDependencies) {
+    core.application.register({
+      id: 'graph',
+      title: 'Graph',
+      mount: async ({ core: contextCore }, params) => {
+        const { renderApp } = await import('./render_app');
+        return renderApp({
+          ...params,
+          npData: this.npDataStart!,
+          savedObjectsClient: this.savedObjectsClient!,
+          xpackInfo,
+          addBasePath: core.http.basePath.prepend,
+          getBasePath: core.http.basePath.get,
+          canEditDrillDownUrls: core.injectedMetadata.getInjectedVar(
+            'canEditDrillDownUrls'
+          ) as boolean,
+          graphSavePolicy: core.injectedMetadata.getInjectedVar('graphSavePolicy') as string,
+          Storage,
+          capabilities: contextCore.application.capabilities.graph,
+          coreStart: contextCore,
+          chrome: contextCore.chrome,
+          config: contextCore.uiSettings,
+          toastNotifications: contextCore.notifications.toasts,
+          indexPatterns: this.dataStart!.indexPatterns.indexPatterns,
+          ...this.angularDependencies!,
+        });
+      },
+    });
+  }
+
+  start(
+    core: CoreStart,
+    { data, npData, __LEGACY: { angularDependencies } }: GraphPluginStartDependencies
+  ) {
+    // TODO is this really the right way? I though the app context would give us those
+    this.dataStart = data;
+    this.npDataStart = npData;
+    this.angularDependencies = angularDependencies;
+    this.savedObjectsClient = core.savedObjects.client;
+  }
+
+  stop() {}
+}
diff --git a/x-pack/legacy/plugins/graph/public/render_app.ts b/x-pack/legacy/plugins/graph/public/render_app.ts
new file mode 100644
index 00000000000000..a8a86f4d1f850e
--- /dev/null
+++ b/x-pack/legacy/plugins/graph/public/render_app.ts
@@ -0,0 +1,141 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiConfirmModal } from '@elastic/eui';
+
+// inner angular imports
+// these are necessary to bootstrap the local angular.
+// They can stay even after NP cutover
+import angular from 'angular';
+import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
+import 'ui/angular-bootstrap';
+import 'ace';
+import 'ui/kbn_top_nav';
+import { configureAppAngularModule } from 'ui/legacy_compat';
+// @ts-ignore
+import { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_top_nav';
+// @ts-ignore
+import { confirmModalFactory } from 'ui/modals/confirm_modal';
+
+// type imports
+import { DataStart } from 'src/legacy/core_plugins/data/public';
+import {
+  AppMountContext,
+  ChromeStart,
+  SavedObjectsClientContract,
+  ToastsStart,
+  UiSettingsClientContract,
+} from 'kibana/public';
+// @ts-ignore
+import { initGraphApp } from './app';
+import { Plugin as DataPlugin } from '../../../../../src/plugins/data/public';
+
+/**
+ * These are dependencies of the Graph app besides the base dependencies
+ * provided by the application service. Some of those still rely on non-shimmed
+ * plugins in LP-world, but if they are migrated only the import path in the plugin
+ * itself changes
+ */
+export interface GraphDependencies extends LegacyAngularInjectedDependencies {
+  element: HTMLElement;
+  appBasePath: string;
+  capabilities: Record<string, boolean | Record<string, boolean>>;
+  coreStart: AppMountContext['core'];
+  chrome: ChromeStart;
+  config: UiSettingsClientContract;
+  toastNotifications: ToastsStart;
+  indexPatterns: DataStart['indexPatterns']['indexPatterns'];
+  npData: ReturnType<DataPlugin['start']>;
+  savedObjectsClient: SavedObjectsClientContract;
+  xpackInfo: { get(path: string): unknown };
+  addBasePath: (url: string) => string;
+  getBasePath: () => string;
+  Storage: any;
+  canEditDrillDownUrls: boolean;
+  graphSavePolicy: string;
+}
+
+/**
+ * Dependencies of the Graph app which rely on the global angular instance.
+ * These dependencies have to be migrated to their NP counterparts.
+ */
+export interface LegacyAngularInjectedDependencies {
+  /**
+   * Instance of SavedObjectRegistryProvider
+   */
+  savedObjectRegistry: any;
+  kbnBaseUrl: any;
+  /**
+   * Instance of SavedWorkspacesProvider
+   */
+  savedGraphWorkspaces: any;
+}
+
+export const renderApp = ({ appBasePath, element, ...deps }: GraphDependencies) => {
+  const graphAngularModule = createLocalAngularModule(deps.coreStart);
+  configureAppAngularModule(graphAngularModule);
+  initGraphApp(graphAngularModule, deps);
+  const $injector = mountGraphApp(appBasePath, element);
+  return () => $injector.get('$rootScope').$destroy();
+};
+
+const mainTemplate = (basePath: string) => `<div style="height: 100%">
+  <base href="${basePath}" />
+  <div ng-view style="height: 100%; display:flex; justify-content: center;"></div>
+</div>
+`;
+
+const moduleName = 'app/graph';
+
+const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react', 'ui.bootstrap', 'ui.ace'];
+
+function mountGraphApp(appBasePath: string, element: HTMLElement) {
+  const mountpoint = document.createElement('div');
+  mountpoint.setAttribute('style', 'height: 100%');
+  // eslint-disable-next-line
+  mountpoint.innerHTML = mainTemplate(appBasePath);
+  // bootstrap angular into detached element and attach it later to
+  // make angular-within-angular possible
+  const $injector = angular.bootstrap(mountpoint, [moduleName]);
+  element.appendChild(mountpoint);
+  return $injector;
+}
+
+function createLocalAngularModule(core: AppMountContext['core']) {
+  createLocalI18nModule();
+  createLocalTopNavModule();
+  createLocalConfirmModalModule();
+
+  const graphAngularModule = angular.module(moduleName, [
+    ...thirdPartyAngularDependencies,
+    'graphI18n',
+    'graphTopNav',
+    'graphConfirmModal',
+  ]);
+  return graphAngularModule;
+}
+
+function createLocalConfirmModalModule() {
+  angular
+    .module('graphConfirmModal', ['react'])
+    .factory('confirmModal', confirmModalFactory)
+    .directive('confirmModal', reactDirective => reactDirective(EuiConfirmModal));
+}
+
+function createLocalTopNavModule() {
+  angular
+    .module('graphTopNav', ['react'])
+    .directive('kbnTopNav', createTopNavDirective)
+    .directive('kbnTopNavHelper', createTopNavHelper);
+}
+
+function createLocalI18nModule() {
+  angular
+    .module('graphI18n', [])
+    .provider('i18n', I18nProvider)
+    .filter('i18n', i18nFilter)
+    .directive('i18nId', i18nDirective);
+}
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.test.ts b/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.test.ts
index 6aa9fd671ffcb3..c7f8b72cc1abfa 100644
--- a/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.test.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.test.ts
@@ -91,8 +91,8 @@ describe('deserialize', () => {
           },
         ],
         links: [
-          { inferred: false, label: '', weight: 5, width: 5, source: 2, target: 0 },
-          { inferred: false, label: '', weight: 5, width: 5, source: 2, target: 4 },
+          { label: '', weight: 5, width: 5, source: 2, target: 0 },
+          { label: '', weight: 5, width: 5, source: 2, target: 4 },
         ],
         urlTemplates: [
           {
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/serialize.test.ts b/x-pack/legacy/plugins/graph/public/services/persistence/serialize.test.ts
index 95f55bcc87eb75..0e0c750383a71e 100644
--- a/x-pack/legacy/plugins/graph/public/services/persistence/serialize.test.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/serialize.test.ts
@@ -138,7 +138,6 @@ describe('serialize', () => {
 
     // A <-> C
     appState.workspace.edges.push({
-      inferred: false,
       label: '',
       source: appState.workspace.nodes[2],
       target: appState.workspace.nodes[0],
@@ -148,7 +147,6 @@ describe('serialize', () => {
 
     // C <-> E
     appState.workspace.edges.push({
-      inferred: false,
       label: '',
       source: appState.workspace.nodes[2],
       target: appState.workspace.nodes[4],
@@ -187,7 +185,6 @@ describe('serialize', () => {
         "indexPattern": "Testindexpattern",
         "links": Array [
           Object {
-            "inferred": false,
             "label": "",
             "source": 2,
             "target": 0,
@@ -195,7 +192,6 @@ describe('serialize', () => {
             "width": 5,
           },
           Object {
-            "inferred": false,
             "label": "",
             "source": 2,
             "target": 4,
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/serialize.ts b/x-pack/legacy/plugins/graph/public/services/persistence/serialize.ts
index 3a94136d26e7ca..cc6af1b9222f16 100644
--- a/x-pack/legacy/plugins/graph/public/services/persistence/serialize.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/serialize.ts
@@ -36,13 +36,12 @@ function serializeNode(
 }
 
 function serializeEdge(
-  { source, target, weight, width, inferred, label }: WorkspaceEdge,
+  { source, target, weight, width, label }: WorkspaceEdge,
   allNodes: WorkspaceNode[] = []
 ): SerializedEdge {
   return {
     weight,
     width,
-    inferred,
     label,
     source: allNodes.indexOf(source),
     target: allNodes.indexOf(target),
diff --git a/x-pack/legacy/plugins/graph/public/services/url.ts b/x-pack/legacy/plugins/graph/public/services/url.ts
index 91e14564bf3aa7..b709683a457fb3 100644
--- a/x-pack/legacy/plugins/graph/public/services/url.ts
+++ b/x-pack/legacy/plugins/graph/public/services/url.ts
@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Chrome } from 'ui/chrome';
+import { ChromeStart } from 'kibana/public';
 import { GraphWorkspaceSavedObject } from '../types';
 import { MetaDataState } from '../state_management';
 
@@ -21,23 +21,26 @@ export function getEditPath({ id }: GraphWorkspaceSavedObject) {
   return `/workspace/${id}`;
 }
 
-export function getEditUrl(chrome: Chrome, workspace: GraphWorkspaceSavedObject) {
-  return chrome.addBasePath(`#${getEditPath(workspace)}`);
+export function getEditUrl(
+  addBasePath: (url: string) => string,
+  workspace: GraphWorkspaceSavedObject
+) {
+  return addBasePath(`#${getEditPath(workspace)}`);
 }
 
 export type SetBreadcrumbOptions =
   | {
-      chrome: Chrome;
+      chrome: ChromeStart;
     }
   | {
-      chrome: Chrome;
+      chrome: ChromeStart;
       metaData: MetaDataState;
       navigateTo: (path: string) => void;
     };
 
 export function setBreadcrumbs(options: SetBreadcrumbOptions) {
   if ('metaData' in options) {
-    options.chrome.breadcrumbs.set([
+    options.chrome.setBreadcrumbs([
       {
         text: i18n.translate('xpack.graph.home.breadcrumb', {
           defaultMessage: 'Graph',
@@ -53,7 +56,7 @@ export function setBreadcrumbs(options: SetBreadcrumbOptions) {
       },
     ]);
   } else {
-    options.chrome.breadcrumbs.set([
+    options.chrome.setBreadcrumbs([
       {
         text: i18n.translate('xpack.graph.home.breadcrumb', {
           defaultMessage: 'Graph',
diff --git a/x-pack/legacy/plugins/graph/public/state_management/meta_data.test.ts b/x-pack/legacy/plugins/graph/public/state_management/meta_data.test.ts
index 8ac3746158f3f7..25be050edfc137 100644
--- a/x-pack/legacy/plugins/graph/public/state_management/meta_data.test.ts
+++ b/x-pack/legacy/plugins/graph/public/state_management/meta_data.test.ts
@@ -6,7 +6,6 @@
 
 import { createMockGraphStore, MockedGraphEnvironment } from './mocks';
 import { syncBreadcrumbSaga, updateMetaData } from './meta_data';
-import { Chrome } from 'ui/chrome';
 
 describe('breadcrumb sync saga', () => {
   let env: MockedGraphEnvironment;
@@ -14,22 +13,15 @@ describe('breadcrumb sync saga', () => {
   beforeEach(() => {
     env = createMockGraphStore({
       sagas: [syncBreadcrumbSaga],
-      mockedDepsOverwrites: {
-        chrome: ({
-          breadcrumbs: {
-            set: jest.fn(),
-          },
-        } as unknown) as Chrome,
-      },
     });
   });
 
   it('syncs breadcrumb initially', () => {
-    expect(env.mockedDeps.chrome.breadcrumbs.set).toHaveBeenCalled();
+    expect(env.mockedDeps.chrome.setBreadcrumbs).toHaveBeenCalled();
   });
 
   it('syncs breadcrumb with each change to meta data', () => {
     env.store.dispatch(updateMetaData({}));
-    expect(env.mockedDeps.chrome.breadcrumbs.set).toHaveBeenCalledTimes(2);
+    expect(env.mockedDeps.chrome.setBreadcrumbs).toHaveBeenCalledTimes(2);
   });
 });
diff --git a/x-pack/legacy/plugins/graph/public/state_management/mocks.ts b/x-pack/legacy/plugins/graph/public/state_management/mocks.ts
index 11cbf84e759ea2..9672edef31d6f1 100644
--- a/x-pack/legacy/plugins/graph/public/state_management/mocks.ts
+++ b/x-pack/legacy/plugins/graph/public/state_management/mocks.ts
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Chrome } from 'ui/chrome';
 import { IndexPattern } from 'src/legacy/core_plugins/data/public';
 import { NotificationsStart, HttpStart } from 'kibana/public';
 import createSagaMiddleware from 'redux-saga';
 import { createStore, applyMiddleware, AnyAction } from 'redux';
+import { ChromeStart } from 'kibana/public';
 import { GraphStoreDependencies, createRootReducer, GraphStore, GraphState } from './store';
 import { Workspace, GraphWorkspaceSavedObject, IndexPatternSavedObject } from '../types';
 
@@ -52,10 +52,8 @@ export function createMockGraphStore({
     basePath: 'basepath',
     changeUrl: jest.fn(),
     chrome: ({
-      breadcrumbs: {
-        set: jest.fn(),
-      },
-    } as unknown) as Chrome,
+      setBreadcrumbs: jest.fn(),
+    } as unknown) as ChromeStart,
     createWorkspace: jest.fn(),
     getWorkspace: jest.fn(() => workspaceMock),
     getSavedWorkspace: jest.fn(() => savedWorkspace),
diff --git a/x-pack/legacy/plugins/graph/public/state_management/store.ts b/x-pack/legacy/plugins/graph/public/state_management/store.ts
index 752483e65d8cca..bb01f20196f876 100644
--- a/x-pack/legacy/plugins/graph/public/state_management/store.ts
+++ b/x-pack/legacy/plugins/graph/public/state_management/store.ts
@@ -6,8 +6,8 @@
 
 import createSagaMiddleware, { SagaMiddleware } from 'redux-saga';
 import { combineReducers, createStore, Store, AnyAction, Dispatch, applyMiddleware } from 'redux';
+import { ChromeStart } from 'kibana/public';
 import { CoreStart } from 'src/core/public';
-import { Chrome } from 'ui/chrome';
 import {
   fieldsReducer,
   FieldsState,
@@ -61,7 +61,7 @@ export interface GraphStoreDependencies {
   setLiveResponseFields: (fields: WorkspaceField[]) => void;
   setUrlTemplates: (templates: UrlTemplate[]) => void;
   setWorkspaceInitialized: () => void;
-  chrome: Chrome;
+  chrome: ChromeStart;
 }
 
 export function createRootReducer(basePath: string) {
diff --git a/x-pack/legacy/plugins/graph/public/types/workspace_state.ts b/x-pack/legacy/plugins/graph/public/types/workspace_state.ts
index 6a95de134bd3de..6a3f3146219eff 100644
--- a/x-pack/legacy/plugins/graph/public/types/workspace_state.ts
+++ b/x-pack/legacy/plugins/graph/public/types/workspace_state.ts
@@ -34,7 +34,6 @@ export interface WorkspaceNode {
 export interface WorkspaceEdge {
   weight: number;
   width: number;
-  inferred: boolean;
   label: string;
   source: WorkspaceNode;
   target: WorkspaceNode;
@@ -60,7 +59,6 @@ export interface ServerResultEdge {
   weight: number;
   width: number;
   doc_count?: number;
-  inferred: boolean;
 }
 
 export interface GraphData {
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js b/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
index e96fc799673168..31d8337857911b 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
@@ -111,7 +111,7 @@ describe('policy table', () => {
   });
   test('should show more when per page value is increased', () => {
     const rendered = mountWithIntl(component);
-    const perPageButton = rendered.find('#customizablePagination').find('button');
+    const perPageButton = rendered.find('EuiTablePagination EuiPopover').find('button');
     perPageButton.simulate('click');
     rendered.update();
     const fiftyButton = rendered.find('.euiContextMenuItem').at(1);
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/cold_phase/cold_phase.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/cold_phase/cold_phase.js
index 493da3e19b9f3c..91fbb4f63cbc3a 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/cold_phase/cold_phase.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/cold_phase/cold_phase.js
@@ -58,12 +58,12 @@ export class ColdPhase extends PureComponent {
         <EuiDescribedFormGroup
           title={
             <div>
-              <span className="eui-displayInlineBlock eui-alignMiddle">
+              <h2 className="eui-displayInlineBlock eui-alignMiddle">
                 <FormattedMessage
                   id="xpack.indexLifecycleMgmt.editPolicy.coldPhase.coldPhaseLabel"
                   defaultMessage="Cold phase"
                 />
-              </span>{' '}
+              </h2>{' '}
               {phaseData[PHASE_ENABLED] && !isShowingErrors ? <ActiveBadge /> : null}
               <PhaseErrorMessage isShowingErrors={isShowingErrors} />
             </div>
@@ -162,12 +162,12 @@ export class ColdPhase extends PureComponent {
           <Fragment>
             <EuiDescribedFormGroup
               title={
-                <p>
+                <h3>
                   <FormattedMessage
                     id="xpack.indexLifecycleMgmt.editPolicy.coldPhase.freezeText"
                     defaultMessage="Freeze"
                   />
-                </p>
+                </h3>
               }
               description={
                 <EuiTextColor color="subdued">
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/delete_phase/delete_phase.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/delete_phase/delete_phase.js
index 0e7663a6aef7d3..d5eb76889494c1 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/delete_phase/delete_phase.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/delete_phase/delete_phase.js
@@ -43,12 +43,12 @@ export class DeletePhase extends PureComponent {
         <EuiDescribedFormGroup
           title={
             <div>
-              <span className="eui-displayInlineBlock eui-alignMiddle">
+              <h2 className="eui-displayInlineBlock eui-alignMiddle">
                 <FormattedMessage
                   id="xpack.indexLifecycleMgmt.editPolicy.deletePhase.deletePhaseLabel"
                   defaultMessage="Delete phase"
                 />
-              </span>{' '}
+              </h2>{' '}
               {phaseData[PHASE_ENABLED] && !isShowingErrors ? (
                 <ActiveBadge />
               ) : null}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js
index 69370ab2d0a389..e7ac890a20ebc6 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js
@@ -54,12 +54,12 @@ export class HotPhase extends PureComponent {
         <EuiDescribedFormGroup
           title={
             <div>
-              <span className="eui-displayInlineBlock eui-alignMiddle">
+              <h2 className="eui-displayInlineBlock eui-alignMiddle">
                 <FormattedMessage
                   id="xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseLabel"
                   defaultMessage="Hot phase"
                 />
-              </span>{' '}
+              </h2>{' '}
               {isShowingErrors ? null : <ActiveBadge />}
               <PhaseErrorMessage isShowingErrors={isShowingErrors} />
             </div>
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/set_priority_input.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/set_priority_input.js
index 3f4c32b05a2dcb..c2c2b002a7693e 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/set_priority_input.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/set_priority_input.js
@@ -21,12 +21,12 @@ export const SetPriorityInput = props => {
   return (
     <EuiDescribedFormGroup
       title={
-        <p>
+        <h3>
           <FormattedMessage
             id="xpack.indexLifecycleMgmt.editPolicy.indexPriorityText"
             defaultMessage="Index priority"
           />
-        </p>
+        </h3>
       }
       description={
         <EuiTextColor color="subdued">
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/warm_phase/warm_phase.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/warm_phase/warm_phase.js
index 2f88578e128ef2..77afd4f7051dc0 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/warm_phase/warm_phase.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/warm_phase/warm_phase.js
@@ -77,12 +77,12 @@ export class WarmPhase extends PureComponent {
         <EuiDescribedFormGroup
           title={
             <div>
-              <span className="eui-displayInlineBlock eui-alignMiddle">
+              <h2 className="eui-displayInlineBlock eui-alignMiddle">
                 <FormattedMessage
                   id="xpack.indexLifecycleMgmt.editPolicy.warmPhase.warmPhaseLabel"
                   defaultMessage="Warm phase"
                 />
-              </span>{' '}
+              </h2>{' '}
               {phaseData[PHASE_ENABLED] && !isShowingErrors ? <ActiveBadge /> : null}
               <PhaseErrorMessage isShowingErrors={isShowingErrors} />
             </div>
@@ -202,12 +202,12 @@ export class WarmPhase extends PureComponent {
           <Fragment>
             <EuiDescribedFormGroup
               title={
-                <p>
+                <h3>
                   <FormattedMessage
                     id="xpack.indexLifecycleMgmt.editPolicy.warmPhase.shrinkText"
                     defaultMessage="Shrink"
                   />
-                </p>
+                </h3>
               }
               description={
                 <EuiTextColor color="subdued">
@@ -270,12 +270,12 @@ export class WarmPhase extends PureComponent {
             </EuiDescribedFormGroup>
             <EuiDescribedFormGroup
               title={
-                <p>
+                <h3>
                   <FormattedMessage
                     id="xpack.indexLifecycleMgmt.editPolicy.warmPhase.forceMergeDataText"
                     defaultMessage="Force merge"
                   />
-                </p>
+                </h3>
               }
               description={
                 <EuiTextColor color="subdued">
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/edit_policy.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/edit_policy.js
index 2b07e9615030f5..ef9b6de84f1e4c 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/edit_policy.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/edit_policy.js
@@ -157,8 +157,8 @@ export class EditPolicy extends Component {
             verticalPosition="center"
             horizontalPosition="center"
           >
-            <EuiTitle>
-              <h4>
+            <EuiTitle size="l">
+              <h1>
                 {isNewPolicy
                   ? i18n.translate('xpack.indexLifecycleMgmt.editPolicy.createPolicyMessage', {
                     defaultMessage: 'Create an index lifecycle policy'
@@ -167,7 +167,7 @@ export class EditPolicy extends Component {
                     defaultMessage: 'Edit index lifecycle policy {originalPolicyName}',
                     values: { originalPolicyName }
                   })}
-              </h4>
+              </h1>
             </EuiTitle>
 
             <div className="euiAnimateContentLoad">
diff --git a/x-pack/legacy/plugins/index_management/__jest__/components/index_table.test.js b/x-pack/legacy/plugins/index_management/__jest__/components/index_table.test.js
index 4ac631694e46f6..be791964eb1dc6 100644
--- a/x-pack/legacy/plugins/index_management/__jest__/components/index_table.test.js
+++ b/x-pack/legacy/plugins/index_management/__jest__/components/index_table.test.js
@@ -161,7 +161,7 @@ describe('index table', () => {
   });
   test('should show more when per page value is increased', () => {
     const rendered = mountWithIntl(component);
-    const perPageButton = rendered.find('#customizablePagination').find('button');
+    const perPageButton = rendered.find('EuiTablePagination EuiPopover').find('button');
     perPageButton.simulate('click');
     rendered.update();
     const fiftyButton = rendered.find('.euiContextMenuItem').at(1);
diff --git a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_aliases.tsx b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_aliases.tsx
index bd0370f059d45e..8628b6d8b8d74f 100644
--- a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_aliases.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_aliases.tsx
@@ -39,12 +39,12 @@ export const StepAliases: React.FunctionComponent<StepProps> = ({
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle>
-            <h3 data-test-subj="stepTitle">
+            <h2 data-test-subj="stepTitle">
               <FormattedMessage
                 id="xpack.idxMgmt.templateForm.stepAliases.stepTitle"
                 defaultMessage="Aliases (optional)"
               />
-            </h3>
+            </h2>
           </EuiTitle>
 
           <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_logistics.tsx b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_logistics.tsx
index 7979b69dfb3ba3..290ade35045512 100644
--- a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_logistics.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_logistics.tsx
@@ -22,7 +22,7 @@ import { schemas } from '../template_form_schemas';
 
 // Create or Form components with partial props that are common to all instances
 const UseField = getUseField({ component: Field });
-const FormRow = getFormRow({ titleTag: 'h4' });
+const FormRow = getFormRow({ titleTag: 'h3' });
 
 const fieldsMeta = {
   name: {
@@ -97,12 +97,12 @@ export const StepLogistics: React.FunctionComponent<StepProps> = ({
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle>
-            <h3>
+            <h2>
               <FormattedMessage
                 id="xpack.idxMgmt.templateForm.stepLogistics.stepTitle"
                 defaultMessage="Logistics"
               />
-            </h3>
+            </h2>
           </EuiTitle>
         </EuiFlexItem>
 
diff --git a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_mappings.tsx b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_mappings.tsx
index ed5ff2732fbf20..97cbaa57afef28 100644
--- a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_mappings.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_mappings.tsx
@@ -39,12 +39,12 @@ export const StepMappings: React.FunctionComponent<StepProps> = ({
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle>
-            <h3 data-test-subj="stepTitle">
+            <h2 data-test-subj="stepTitle">
               <FormattedMessage
                 id="xpack.idxMgmt.templateForm.stepMappings.stepTitle"
                 defaultMessage="Mappings (optional)"
               />
-            </h3>
+            </h2>
           </EuiTitle>
 
           <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_review.tsx b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_review.tsx
index 8befc9f4e1178f..8f2d3978a67806 100644
--- a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_review.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_review.tsx
@@ -188,13 +188,13 @@ export const StepReview: React.FunctionComponent<StepProps> = ({ template, updat
   return (
     <div data-test-subj="stepSummary">
       <EuiTitle>
-        <h3 data-test-subj="stepTitle">
+        <h2 data-test-subj="stepTitle">
           <FormattedMessage
             id="xpack.idxMgmt.templateForm.stepReview.stepTitle"
             defaultMessage="Review details for '{templateName}'"
             values={{ templateName: name }}
           />
-        </h3>
+        </h2>
       </EuiTitle>
 
       <EuiSpacer size="l" />
diff --git a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_settings.tsx b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_settings.tsx
index d8024a1efc1321..cead652c9f6fcb 100644
--- a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_settings.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_settings.tsx
@@ -39,12 +39,12 @@ export const StepSettings: React.FunctionComponent<StepProps> = ({
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle>
-            <h3 data-test-subj="stepTitle">
+            <h2 data-test-subj="stepTitle">
               <FormattedMessage
                 id="xpack.idxMgmt.templateForm.stepSettings.stepTitle"
                 defaultMessage="Index settings (optional)"
               />
-            </h3>
+            </h2>
           </EuiTitle>
 
           <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_aliases.tsx b/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_aliases.tsx
index ad23a2ca95200d..421119bd8df960 100644
--- a/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_aliases.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_aliases.tsx
@@ -34,6 +34,6 @@ export const TabAliases: React.FunctionComponent<Props> = ({ templateDetails })
       }
       iconType="pin"
       data-test-subj="noAliasesCallout"
-    ></EuiCallOut>
+    />
   );
 };
diff --git a/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_mappings.tsx b/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_mappings.tsx
index 10f570b66a51b1..83f2e67fb12c5e 100644
--- a/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_mappings.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_mappings.tsx
@@ -34,6 +34,6 @@ export const TabMappings: React.FunctionComponent<Props> = ({ templateDetails })
       }
       iconType="pin"
       data-test-subj="noMappingsCallout"
-    ></EuiCallOut>
+    />
   );
 };
diff --git a/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_settings.tsx b/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_settings.tsx
index 2067d4972ccbea..8b2a431bee65a6 100644
--- a/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_settings.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_details/tabs/tab_settings.tsx
@@ -34,6 +34,6 @@ export const TabSettings: React.FunctionComponent<Props> = ({ templateDetails })
       }
       iconType="pin"
       data-test-subj="noSettingsCallout"
-    ></EuiCallOut>
+    />
   );
 };
diff --git a/x-pack/legacy/plugins/infra/index.ts b/x-pack/legacy/plugins/infra/index.ts
index 671ae7d747e017..9bf679fb5ff805 100644
--- a/x-pack/legacy/plugins/infra/index.ts
+++ b/x-pack/legacy/plugins/infra/index.ts
@@ -43,7 +43,7 @@ export function infra(kibana: any) {
             defaultMessage: 'Explore your metrics',
           }),
           icon: 'plugins/infra/images/infra_mono_white.svg',
-          euiIconType: 'infraApp',
+          euiIconType: 'metricsApp',
           id: 'infra:home',
           order: 8000,
           title: i18n.translate('xpack.infra.linkInfrastructureTitle', {
@@ -56,7 +56,7 @@ export function infra(kibana: any) {
             defaultMessage: 'Explore your logs',
           }),
           icon: 'plugins/infra/images/logging_mono_white.svg',
-          euiIconType: 'loggingApp',
+          euiIconType: 'logsApp',
           id: 'infra:logs',
           order: 8001,
           title: i18n.translate('xpack.infra.linkLogsTitle', {
@@ -76,7 +76,7 @@ export function infra(kibana: any) {
         {
           path: `/app/${APP_ID}#/logs`,
           label: logsSampleDataLinkLabel,
-          icon: 'loggingApp',
+          icon: 'logsApp',
         },
       ]);
     },
diff --git a/x-pack/legacy/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/legacy/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
index ca67aec9642ac3..d7c9876a07a8da 100644
--- a/x-pack/legacy/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx
@@ -11,36 +11,30 @@ import React from 'react';
 import { AutocompleteSuggestion } from '../../../../../../../src/plugins/data/public';
 import euiStyled from '../../../../../common/eui_styled_components';
 
-interface SuggestionItemProps {
+interface Props {
   isSelected?: boolean;
   onClick?: React.MouseEventHandler<HTMLDivElement>;
   onMouseEnter?: React.MouseEventHandler<HTMLDivElement>;
   suggestion: AutocompleteSuggestion;
 }
 
-export class SuggestionItem extends React.Component<SuggestionItemProps> {
-  public static defaultProps: Partial<SuggestionItemProps> = {
-    isSelected: false,
-  };
+export const SuggestionItem: React.SFC<Props> = props => {
+  const { isSelected, onClick, onMouseEnter, suggestion } = props;
 
-  public render() {
-    const { isSelected, onClick, onMouseEnter, suggestion } = this.props;
+  return (
+    <SuggestionItemContainer isSelected={isSelected} onClick={onClick} onMouseEnter={onMouseEnter}>
+      <SuggestionItemIconField suggestionType={suggestion.type}>
+        <EuiIcon type={getEuiIconType(suggestion.type)} />
+      </SuggestionItemIconField>
+      <SuggestionItemTextField>{suggestion.text}</SuggestionItemTextField>
+      <SuggestionItemDescriptionField>{suggestion.description}</SuggestionItemDescriptionField>
+    </SuggestionItemContainer>
+  );
+};
 
-    return (
-      <SuggestionItemContainer
-        isSelected={isSelected}
-        onClick={onClick}
-        onMouseEnter={onMouseEnter}
-      >
-        <SuggestionItemIconField suggestionType={suggestion.type}>
-          <EuiIcon type={getEuiIconType(suggestion.type)} />
-        </SuggestionItemIconField>
-        <SuggestionItemTextField>{suggestion.text}</SuggestionItemTextField>
-        <SuggestionItemDescriptionField>{suggestion.description}</SuggestionItemDescriptionField>
-      </SuggestionItemContainer>
-    );
-  }
-}
+SuggestionItem.defaultProps = {
+  isSelected: false,
+};
 
 const SuggestionItemContainer = euiStyled.div<{
   isSelected?: boolean;
diff --git a/x-pack/legacy/plugins/infra/public/components/eui/toolbar/toolbar.tsx b/x-pack/legacy/plugins/infra/public/components/eui/toolbar/toolbar.tsx
index b65f3043c2144d..6f1cfc4078ae22 100644
--- a/x-pack/legacy/plugins/infra/public/components/eui/toolbar/toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/eui/toolbar/toolbar.tsx
@@ -17,5 +17,4 @@ export const Toolbar = euiStyled(EuiPanel).attrs({
   border-left: none;
   border-radius: 0;
   padding: ${props => props.theme.eui.euiSizeS} ${props => props.theme.eui.euiSizeL};
-  z-index: ${props => props.theme.eui.euiZLevel1};
 `;
diff --git a/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar_wrapper.tsx b/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar_wrapper.tsx
index 3c2c3d3bd05d06..7cb86f6e4d0eca 100644
--- a/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar_wrapper.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar_wrapper.tsx
@@ -108,7 +108,7 @@ export const toMetricOpt = (metric: InfraSnapshotMetricType) => {
     case InfraSnapshotMetricType.tx:
       return {
         text: ToolbarTranslations.OutboundTraffic,
-        value: InfraSnapshotMetricType.rx,
+        value: InfraSnapshotMetricType.tx,
       };
     case InfraSnapshotMetricType.logRate:
       return {
diff --git a/x-pack/legacy/plugins/infra/public/components/loading_overlay_wrapper.tsx b/x-pack/legacy/plugins/infra/public/components/loading_overlay_wrapper.tsx
new file mode 100644
index 00000000000000..0f70c40059c932
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/loading_overlay_wrapper.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 { EuiLoadingSpinner } from '@elastic/eui';
+import { transparentize } from 'polished';
+import React from 'react';
+
+import { euiStyled } from '../../../../common/eui_styled_components';
+
+export const LoadingOverlayWrapper: React.FC<
+  React.HTMLAttributes<HTMLDivElement> & {
+    isLoading: boolean;
+    loadingChildren?: React.ReactNode;
+  }
+> = ({ children, isLoading, loadingChildren, ...rest }) => {
+  return (
+    <RelativeDiv {...rest}>
+      {children}
+      {isLoading ? <Overlay>{loadingChildren}</Overlay> : null}
+    </RelativeDiv>
+  );
+};
+
+const Overlay: React.FC = ({ children }) => (
+  <OverlayDiv>{children ? children : <EuiLoadingSpinner size="xl" />}</OverlayDiv>
+);
+
+const RelativeDiv = euiStyled.div`
+  position: relative;
+`;
+
+const OverlayDiv = euiStyled.div`
+  align-items: center;
+  background-color: ${props => transparentize(0.3, props.theme.eui.euiColorEmptyShade)};
+  display: flex;
+  height: 100%;
+  justify-content: center;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+`;
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx
index 9c81cda0a3fb6c..90b1e455d477e3 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx
@@ -80,7 +80,8 @@ export class LogMinimap extends React.Component<LogMinimapProps, LogMinimapState
   }
 
   public handleClick = (event: MouseEvent) => {
-    const { svgPosition } = this.state;
+    if (!this.dragTargetArea) return;
+    const svgPosition = this.dragTargetArea.getBoundingClientRect();
     const clickedYPosition = event.clientY - svgPosition.top;
     const clickedTime = Math.floor(this.getYScale().invert(clickedYPosition));
     this.setState({
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
index 218b42b48c9b99..752a0d6e27a7fb 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx
@@ -114,29 +114,28 @@ interface ProgressEntryProps {
   isLoading: boolean;
 }
 
-class ProgressEntry extends React.PureComponent<ProgressEntryProps, {}> {
-  public render() {
-    const { alignment, children, className, color, isLoading } = this.props;
-    // NOTE: styled-components seems to make all props in EuiProgress required, so this
-    // style attribute hacking replaces styled-components here for now until that can be fixed
-    // see: https://github.com/elastic/eui/issues/1655
-    const alignmentStyle =
-      alignment === 'top' ? { top: 0, bottom: 'initial' } : { top: 'initial', bottom: 0 };
+const ProgressEntry: React.SFC<ProgressEntryProps> = props => {
+  const { alignment, children, className, color, isLoading } = props;
 
-    return (
-      <ProgressEntryWrapper className={className}>
-        <EuiProgress
-          style={alignmentStyle}
-          color={color}
-          size="xs"
-          position="absolute"
-          {...(!isLoading ? { max: 1, value: 1 } : {})}
-        />
-        {children}
-      </ProgressEntryWrapper>
-    );
-  }
-}
+  // NOTE: styled-components seems to make all props in EuiProgress required, so this
+  // style attribute hacking replaces styled-components here for now until that can be fixed
+  // see: https://github.com/elastic/eui/issues/1655
+  const alignmentStyle =
+    alignment === 'top' ? { top: 0, bottom: 'initial' } : { top: 'initial', bottom: 0 };
+
+  return (
+    <ProgressEntryWrapper className={className}>
+      <EuiProgress
+        style={alignmentStyle}
+        color={color}
+        size="xs"
+        position="absolute"
+        {...(!isLoading ? { max: 1, value: 1 } : {})}
+      />
+      {children}
+    </ProgressEntryWrapper>
+  );
+};
 
 const ProgressEntryWrapper = euiStyled.div`
   align-items: center;
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
index d439308194d18a..fc3c8b3bf2b31d 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
@@ -102,6 +102,14 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
         targetId: null,
         items: [],
       };
+    } else if (
+      hasItems &&
+      (nextItems.length !== prevState.items.length || nextItems[0] !== prevState.items[0])
+    ) {
+      return {
+        ...prevState,
+        items: nextItems,
+      };
     }
 
     return null;
@@ -180,6 +188,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
                         hideScrollbar={true}
                         data-test-subj={'logStream'}
                         isLocked={scrollLock.isEnabled}
+                        entriesCount={items.length}
                       >
                         {registerChild => (
                           <>
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
index 8edec4d1777d09..dd368ef4d8f925 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx
@@ -30,6 +30,7 @@ interface VerticalScrollPanelProps<Child> {
   hideScrollbar?: boolean;
   'data-test-subj'?: string;
   isLocked: boolean;
+  entriesCount: number;
 }
 
 interface VerticalScrollPanelSnapshot<Child> {
@@ -155,7 +156,7 @@ export class VerticalScrollPanel<Child> extends React.PureComponent<
     } = this;
 
     if (scrollRef.current === null || !target || childDimensions.size <= 0) {
-      return;
+      return false;
     }
 
     const targetDimensions = childDimensions.get(target);
@@ -166,15 +167,20 @@ export class VerticalScrollPanel<Child> extends React.PureComponent<
       // opposed to being in direct response to user input
       this.nextScrollEventFromCenterTarget = true;
       scrollRef.current.scrollTop = targetDimensions.top + targetOffset - scrollViewHeight / 2;
+      return true;
     }
+    return false;
   };
 
   public handleUpdatedChildren = (target: Child | undefined, offset: number | undefined) => {
     this.updateChildDimensions();
+    let centerTargetWillReportChildren = false;
     if (!!target) {
-      this.centerTarget(target, offset);
+      centerTargetWillReportChildren = this.centerTarget(target, offset);
+    }
+    if (!centerTargetWillReportChildren) {
+      this.reportVisibleChildren();
     }
-    this.reportVisibleChildren();
   };
 
   public componentDidMount() {
@@ -221,7 +227,7 @@ export class VerticalScrollPanel<Child> extends React.PureComponent<
     if (
       prevProps.height !== this.props.height ||
       prevProps.target !== this.props.target ||
-      React.Children.count(prevProps.children) !== React.Children.count(this.props.children)
+      prevProps.entriesCount !== this.props.entriesCount
     ) {
       this.handleUpdatedChildren(snapshot.scrollTarget, snapshot.scrollOffset);
     }
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics/sections/chart_section.tsx b/x-pack/legacy/plugins/infra/public/components/metrics/sections/chart_section.tsx
index cf148eefe8e8fe..6d8503b333c0bf 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics/sections/chart_section.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics/sections/chart_section.tsx
@@ -127,7 +127,7 @@ export const ChartSection = ({
                 key={`series-${section.id}-${series.id}`}
                 id={`series-${section.id}-${series.id}`}
                 series={series}
-                name={getChartName(section, series.id, series.label)}
+                name={getChartName(section, series.id, series.id)}
                 type={getChartType(section, series.id)}
                 color={getChartColor(section, series.id)}
                 stack={visConfig.stacked}
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics/sections/series_chart.tsx b/x-pack/legacy/plugins/infra/public/components/metrics/sections/series_chart.tsx
index 9fd1f3eadfb496..b75f669a6d1ec3 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics/sections/series_chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics/sections/series_chart.tsx
@@ -45,12 +45,6 @@ export const AreaChart = ({ id, color, series, name, type, stack }: Props) => {
       strokeWidth: 'area' === type ? 1 : 2,
       visible: true,
     },
-    point: {
-      visible: true,
-      radius: 1,
-      strokeWidth: 2,
-      opacity: 1,
-    },
   };
   const colors: DataSeriesColorsValues = {
     colorValues: [],
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx
index 5293af666723a0..aa3616c5ecfbee 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.tsx
@@ -96,7 +96,7 @@ export const MetricsExplorerChartContextMenu = ({
           name: i18n.translate('xpack.infra.metricsExplorer.filterByLabel', {
             defaultMessage: 'Add filter',
           }),
-          icon: 'infraApp',
+          icon: 'metricsApp',
           onClick: handleFilter,
           'data-test-subj': 'metricsExplorerAction-AddFilter',
         },
@@ -111,7 +111,7 @@ export const MetricsExplorerChartContextMenu = ({
             defaultMessage: 'View metrics for {name}',
             values: { name: nodeType },
           }),
-          icon: 'infraApp',
+          icon: 'metricsApp',
           href: createNodeDetailLink(nodeType, series.id, timeRange.from, timeRange.to),
           'data-test-subj': 'metricsExplorerAction-ViewNodeMetrics',
         },
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/series_chart.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/series_chart.tsx
index 5b70b0cef083a4..8c3c80e0a3852f 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/series_chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/series_chart.tsx
@@ -63,12 +63,6 @@ export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack }: Pr
       opacity: 0.5,
       visible: type === MetricsExplorerChartType.area,
     },
-    point: {
-      visible: true,
-      radius: 2,
-      strokeWidth: 2,
-      opacity: 1,
-    },
   };
   return (
     <AreaSeries
@@ -87,7 +81,7 @@ export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack }: Pr
   );
 };
 
-export const MetricsExplorerBarChart = ({ metric, id, series, type, stack }: Props) => {
+export const MetricsExplorerBarChart = ({ metric, id, series, stack }: Props) => {
   const color =
     (metric.color && colorTransformer(metric.color)) ||
     colorTransformer(MetricsExplorerColor.color0);
diff --git a/x-pack/legacy/plugins/infra/public/components/navigation/routed_tabs.tsx b/x-pack/legacy/plugins/infra/public/components/navigation/routed_tabs.tsx
index 437a0eb513da04..0b1d34870a72d4 100644
--- a/x-pack/legacy/plugins/infra/public/components/navigation/routed_tabs.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/navigation/routed_tabs.tsx
@@ -4,9 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiTab, EuiTabs, EuiLink } from '@elastic/eui';
+import { EuiBetaBadge, EuiLink, EuiTab, EuiTabs } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { Route } from 'react-router-dom';
+
 import euiStyled from '../../../../../common/eui_styled_components';
 
 interface TabConfiguration {
@@ -54,6 +56,24 @@ export class RoutedTabs extends React.Component<RoutedTabsProps> {
   }
 }
 
+const tabBetaBadgeLabel = i18n.translate('xpack.infra.common.tabBetaBadgeLabel', {
+  defaultMessage: 'Beta',
+});
+
+const tabBetaBadgeTooltipContent = i18n.translate('xpack.infra.common.tabBetaBadgeTooltipContent', {
+  defaultMessage:
+    'This feature is under active development. Extra functionality is coming, and some functionality may change.',
+});
+
+export const TabBetaBadge = euiStyled(EuiBetaBadge).attrs({
+  'aria-label': tabBetaBadgeLabel,
+  label: tabBetaBadgeLabel,
+  tooltipContent: tabBetaBadgeTooltipContent,
+})`
+  margin-left: 4px;
+  vertical-align: baseline;
+`;
+
 const TabContainer = euiStyled.div`
   .euiLink {
     color: inherit !important;
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_results.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_results.tsx
index d834b825e414a6..81a80fb565a4b4 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_results.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_results.tsx
@@ -8,17 +8,36 @@ import createContainer from 'constate';
 import { useMemo, useEffect } from 'react';
 
 import { useLogEntryRate } from './log_entry_rate';
+import { GetLogEntryRateSuccessResponsePayload } from '../../../../common/http_api/log_analysis';
+
+type PartitionBucket = {
+  startTime: number;
+} & GetLogEntryRateSuccessResponsePayload['data']['histogramBuckets'][0]['partitions'][0];
+
+type PartitionRecord = Record<
+  string,
+  { buckets: PartitionBucket[]; topAnomalyScore: number; totalNumberOfLogEntries: number }
+>;
+
+export interface LogRateResults {
+  bucketDuration: number;
+  totalNumberOfLogEntries: number;
+  histogramBuckets: GetLogEntryRateSuccessResponsePayload['data']['histogramBuckets'];
+  partitionBuckets: PartitionRecord;
+}
 
 export const useLogAnalysisResults = ({
   sourceId,
   startTime,
   endTime,
   bucketDuration = 15 * 60 * 1000,
+  lastRequestTime,
 }: {
   sourceId: string;
   startTime: number;
   endTime: number;
   bucketDuration?: number;
+  lastRequestTime: number;
 }) => {
   const { isLoading: isLoadingLogEntryRate, logEntryRate, getLogEntryRate } = useLogEntryRate({
     sourceId,
@@ -31,12 +50,68 @@ export const useLogAnalysisResults = ({
 
   useEffect(() => {
     getLogEntryRate();
-  }, [sourceId, startTime, endTime, bucketDuration]);
+  }, [sourceId, startTime, endTime, bucketDuration, lastRequestTime]);
+
+  const logRateResults: LogRateResults | null = useMemo(() => {
+    if (logEntryRate) {
+      return {
+        bucketDuration: logEntryRate.bucketDuration,
+        totalNumberOfLogEntries: logEntryRate.totalNumberOfLogEntries,
+        histogramBuckets: logEntryRate.histogramBuckets,
+        partitionBuckets: formatLogEntryRateResultsByPartition(logEntryRate),
+      };
+    } else {
+      return null;
+    }
+  }, [logEntryRate]);
 
   return {
     isLoading,
-    logEntryRate,
+    logRateResults,
   };
 };
 
 export const LogAnalysisResults = createContainer(useLogAnalysisResults);
+
+const formatLogEntryRateResultsByPartition = (
+  results: GetLogEntryRateSuccessResponsePayload['data']
+): PartitionRecord => {
+  const partitionedBuckets = results.histogramBuckets.reduce<
+    Record<string, { buckets: PartitionBucket[] }>
+  >((partitionResults, bucket) => {
+    return bucket.partitions.reduce<Record<string, { buckets: PartitionBucket[] }>>(
+      (_partitionResults, partition) => {
+        return {
+          ..._partitionResults,
+          [partition.partitionId]: {
+            buckets: _partitionResults[partition.partitionId]
+              ? [
+                  ..._partitionResults[partition.partitionId].buckets,
+                  { startTime: bucket.startTime, ...partition },
+                ]
+              : [{ startTime: bucket.startTime, ...partition }],
+          },
+        };
+      },
+      partitionResults
+    );
+  }, {});
+
+  const resultsByPartition: PartitionRecord = {};
+
+  Object.entries(partitionedBuckets).map(([key, value]) => {
+    const anomalyScores = value.buckets.reduce((scores: number[], bucket) => {
+      return [...scores, bucket.maximumAnomalyScore];
+    }, []);
+    const totalNumberOfLogEntries = value.buckets.reduce((total, bucket) => {
+      return (total += bucket.numberOfLogEntries);
+    }, 0);
+    resultsByPartition[key] = {
+      topAnomalyScore: Math.max(...anomalyScores),
+      totalNumberOfLogEntries,
+      buckets: value.buckets,
+    };
+  });
+
+  return resultsByPartition;
+};
diff --git a/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_view_state.tsx b/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_view_state.tsx
index cd9ce35a32b687..86beb28a7f3ca1 100644
--- a/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_view_state.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_view_state.tsx
@@ -106,6 +106,13 @@ export const withWaffleViewState = connect(
               ),
             })
           );
+        } else {
+          dispatch(
+            waffleFilterActions.applyWaffleFilterQuery({
+              query: null,
+              serializedQuery: null,
+            })
+          );
         }
       },
     };
diff --git a/x-pack/legacy/plugins/infra/public/pages/link_to/link_to.tsx b/x-pack/legacy/plugins/infra/public/pages/link_to/link_to.tsx
index abb3aa6b26b154..1318e9ca6c2c5e 100644
--- a/x-pack/legacy/plugins/infra/public/pages/link_to/link_to.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/link_to/link_to.tsx
@@ -16,27 +16,21 @@ interface LinkToPageProps {
   match: RouteMatch<{}>;
 }
 
-export class LinkToPage extends React.Component<LinkToPageProps> {
-  public render() {
-    const { match } = this.props;
-
-    return (
-      <Switch>
-        <Route
-          path={`${match.url}/:sourceId?/:nodeType(host|container|pod)-logs/:nodeId`}
-          component={RedirectToNodeLogs}
-        />
-        <Route
-          path={`${match.url}/:nodeType(host|container|pod)-detail/:nodeId`}
-          component={RedirectToNodeDetail}
-        />
-        <Route
-          path={`${match.url}/host-detail-via-ip/:hostIp`}
-          component={RedirectToHostDetailViaIP}
-        />
-        <Route path={`${match.url}/:sourceId?/logs`} component={RedirectToLogs} />
-        <Redirect to="/infrastructure" />
-      </Switch>
-    );
-  }
-}
+export const LinkToPage: React.SFC<LinkToPageProps> = props => (
+  <Switch>
+    <Route
+      path={`${props.match.url}/:sourceId?/:nodeType(host|container|pod)-logs/:nodeId`}
+      component={RedirectToNodeLogs}
+    />
+    <Route
+      path={`${props.match.url}/:nodeType(host|container|pod)-detail/:nodeId`}
+      component={RedirectToNodeDetail}
+    />
+    <Route
+      path={`${props.match.url}/host-detail-via-ip/:hostIp`}
+      component={RedirectToHostDetailViaIP}
+    />
+    <Route path={`${props.match.url}/:sourceId?/logs`} component={RedirectToLogs} />
+    <Redirect to="/infrastructure" />
+  </Switch>
+);
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/page_results_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/page_results_content.tsx
index e846d4e9e4ac5e..7fa9ff3c93db72 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/page_results_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/page_results_content.tsx
@@ -6,23 +6,23 @@
 
 import datemath from '@elastic/datemath';
 import {
+  EuiBadge,
   EuiFlexGroup,
   EuiFlexItem,
   EuiPage,
   EuiPanel,
   EuiSuperDatePicker,
-  EuiBadge,
   EuiText,
 } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 import numeral from '@elastic/numeral';
 import { FormattedMessage } from '@kbn/i18n/react';
 import moment from 'moment';
 import React, { useCallback, useContext, useMemo, useState } from 'react';
+
 import euiStyled from '../../../../../../common/eui_styled_components';
 import { TimeRange } from '../../../../common/http_api/shared/time_range';
 import { bucketSpan } from '../../../../common/log_analysis';
-import { LoadingPage } from '../../../components/loading_page';
+import { LoadingOverlayWrapper } from '../../../components/loading_overlay_wrapper';
 import {
   LogAnalysisJobs,
   StringTimeRange,
@@ -57,9 +57,13 @@ export const AnalysisResultsContent = ({
     setAutoRefresh,
   } = useLogAnalysisResultsUrlState();
 
-  const [queryTimeRange, setQueryTimeRange] = useState<TimeRange>(
-    stringToNumericTimeRange(selectedTimeRange)
-  );
+  const [queryTimeRange, setQueryTimeRange] = useState<{
+    value: TimeRange;
+    lastChangedTime: number;
+  }>(() => ({
+    value: stringToNumericTimeRange(selectedTimeRange),
+    lastChangedTime: Date.now(),
+  }));
 
   const bucketDuration = useMemo(() => {
     // This function takes the current time range in ms,
@@ -69,26 +73,32 @@ export const AnalysisResultsContent = ({
     // 900000 (15 minutes) to it, so that we don't end up with
     // jaggy bucket boundaries between the ML buckets and our
     // aggregation buckets.
-    const msRange = moment(queryTimeRange.endTime).diff(moment(queryTimeRange.startTime));
+    const msRange = moment(queryTimeRange.value.endTime).diff(
+      moment(queryTimeRange.value.startTime)
+    );
     const bucketIntervalInMs = msRange / 100;
     const result = bucketSpan * Math.round(bucketIntervalInMs / bucketSpan);
     const roundedResult = parseInt(Number(result).toFixed(0), 10);
     return roundedResult < bucketSpan ? bucketSpan : roundedResult;
-  }, [queryTimeRange.startTime, queryTimeRange.endTime]);
+  }, [queryTimeRange.value.startTime, queryTimeRange.value.endTime]);
 
-  const { isLoading, logEntryRate } = useLogAnalysisResults({
+  const { isLoading, logRateResults } = useLogAnalysisResults({
     sourceId,
-    startTime: queryTimeRange.startTime,
-    endTime: queryTimeRange.endTime,
+    startTime: queryTimeRange.value.startTime,
+    endTime: queryTimeRange.value.endTime,
     bucketDuration,
+    lastRequestTime: queryTimeRange.lastChangedTime,
   });
-  const hasResults = useMemo(() => logEntryRate && logEntryRate.histogramBuckets.length > 0, [
-    logEntryRate,
+  const hasResults = useMemo(() => logRateResults && logRateResults.histogramBuckets.length > 0, [
+    logRateResults,
   ]);
 
   const handleQueryTimeRangeChange = useCallback(
     ({ start: startTime, end: endTime }: { start: string; end: string }) => {
-      setQueryTimeRange(stringToNumericTimeRange({ startTime, endTime }));
+      setQueryTimeRange({
+        value: stringToNumericTimeRange({ startTime, endTime }),
+        lastChangedTime: Date.now(),
+      });
     },
     [setQueryTimeRange]
   );
@@ -141,89 +151,88 @@ export const AnalysisResultsContent = ({
     fetchJobStatus();
   }, JOB_STATUS_POLLING_INTERVAL);
 
+  useInterval(
+    () => {
+      handleQueryTimeRangeChange({
+        start: selectedTimeRange.startTime,
+        end: selectedTimeRange.endTime,
+      });
+    },
+    autoRefresh.isPaused ? null : autoRefresh.interval
+  );
+
   return (
-    <>
-      {isLoading && !logEntryRate ? (
-        <LoadingPage
-          message={i18n.translate('xpack.infra.logs.logsAnalysisResults.loadingMessage', {
-            defaultMessage: 'Loading results...',
-          })}
-        />
-      ) : (
-        <>
-          <ResultsContentPage>
-            <EuiFlexGroup direction="column">
+    <ResultsContentPage>
+      <EuiFlexGroup direction="column">
+        <EuiFlexItem grow={false}>
+          <EuiPanel paddingSize="l">
+            <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
               <EuiFlexItem grow={false}>
-                <EuiPanel paddingSize="l">
-                  <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
-                    <EuiFlexItem grow={false}>
-                      {!isLoading && logEntryRate ? (
-                        <EuiText size="s">
-                          <FormattedMessage
-                            id="xpack.infra.logs.analysis.logRateResultsToolbarText"
-                            defaultMessage="Analyzed {numberOfLogs} log entries from {startTime} to {endTime}"
-                            values={{
-                              numberOfLogs: (
-                                <EuiBadge color="primary">
-                                  <EuiText size="s" color="ghost">
-                                    {numeral(logEntryRate.totalNumberOfLogEntries).format('0.00a')}
-                                  </EuiText>
-                                </EuiBadge>
-                              ),
-                              startTime: (
-                                <b>{moment(queryTimeRange.startTime).format(dateFormat)}</b>
-                              ),
-                              endTime: <b>{moment(queryTimeRange.endTime).format(dateFormat)}</b>,
-                            }}
-                          />
-                        </EuiText>
-                      ) : null}
-                    </EuiFlexItem>
-                    <EuiFlexItem grow={false}>
-                      <EuiSuperDatePicker
-                        start={selectedTimeRange.startTime}
-                        end={selectedTimeRange.endTime}
-                        onTimeChange={handleSelectedTimeRangeChange}
-                        isPaused={autoRefresh.isPaused}
-                        refreshInterval={autoRefresh.interval}
-                        onRefreshChange={handleAutoRefreshChange}
-                        onRefresh={handleQueryTimeRangeChange}
+                {logRateResults ? (
+                  <LoadingOverlayWrapper isLoading={isLoading}>
+                    <EuiText size="s">
+                      <FormattedMessage
+                        id="xpack.infra.logs.analysis.logRateResultsToolbarText"
+                        defaultMessage="Analyzed {numberOfLogs} log entries from {startTime} to {endTime}"
+                        values={{
+                          numberOfLogs: (
+                            <EuiBadge color="primary">
+                              <EuiText size="s" color="ghost">
+                                {numeral(logRateResults.totalNumberOfLogEntries).format('0.00a')}
+                              </EuiText>
+                            </EuiBadge>
+                          ),
+                          startTime: (
+                            <b>{moment(queryTimeRange.value.startTime).format(dateFormat)}</b>
+                          ),
+                          endTime: <b>{moment(queryTimeRange.value.endTime).format(dateFormat)}</b>,
+                        }}
                       />
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                </EuiPanel>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiPanel paddingSize="l">
-                  {isFirstUse && !hasResults ? <FirstUseCallout /> : null}
-                  <LogRateResults
-                    isLoading={isLoading}
-                    results={logEntryRate}
-                    setTimeRange={handleChartTimeRangeChange}
-                    timeRange={queryTimeRange}
-                  />
-                </EuiPanel>
+                    </EuiText>
+                  </LoadingOverlayWrapper>
+                ) : null}
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiPanel paddingSize="l">
-                  <AnomaliesResults
-                    isLoading={isLoading}
-                    jobStatus={jobStatus['log-entry-rate']}
-                    viewSetupForReconfiguration={viewSetupForReconfiguration}
-                    viewSetupForUpdate={viewSetupForUpdate}
-                    results={logEntryRate}
-                    setTimeRange={handleChartTimeRangeChange}
-                    setupStatus={setupStatus}
-                    timeRange={queryTimeRange}
-                    jobId={jobIds['log-entry-rate']}
-                  />
-                </EuiPanel>
+                <EuiSuperDatePicker
+                  start={selectedTimeRange.startTime}
+                  end={selectedTimeRange.endTime}
+                  onTimeChange={handleSelectedTimeRangeChange}
+                  isPaused={autoRefresh.isPaused}
+                  refreshInterval={autoRefresh.interval}
+                  onRefreshChange={handleAutoRefreshChange}
+                />
               </EuiFlexItem>
             </EuiFlexGroup>
-          </ResultsContentPage>
-        </>
-      )}
-    </>
+          </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiPanel paddingSize="l">
+            {isFirstUse && !hasResults ? <FirstUseCallout /> : null}
+            <LogRateResults
+              isLoading={isLoading}
+              results={logRateResults}
+              setTimeRange={handleChartTimeRangeChange}
+              timeRange={queryTimeRange.value}
+            />
+          </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiPanel paddingSize="l">
+            <AnomaliesResults
+              isLoading={isLoading}
+              jobStatus={jobStatus['log-entry-rate']}
+              viewSetupForReconfiguration={viewSetupForReconfiguration}
+              viewSetupForUpdate={viewSetupForUpdate}
+              results={logRateResults}
+              setTimeRange={handleChartTimeRangeChange}
+              setupStatus={setupStatus}
+              timeRange={queryTimeRange.value}
+              jobId={jobIds['log-entry-rate']}
+            />
+          </EuiPanel>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </ResultsContentPage>
   );
 };
 
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/analyze_in_ml_button.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/analyze_in_ml_button.tsx
index 191e3cb7d7bfd3..317bd6ec5e925a 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/analyze_in_ml_button.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/analyze_in_ml_button.tsx
@@ -25,7 +25,7 @@ export const AnalyzeInMlButton: React.FunctionComponent<{
       defaultMessage="Analyze in ML"
     />
   );
-  return partition ? (
+  return typeof partition === 'string' ? (
     <EuiButton
       fill={false}
       href={getPartitionSpecificSingleMetricViewerLink(pathname, jobId, partition, timeRange)}
@@ -81,7 +81,7 @@ const getPartitionSpecificSingleMetricViewerLink = (
 
   const _a = encode({
     mlTimeSeriesExplorer: {
-      entities: { 'event.dataset': partition === 'unknown' ? '' : partition },
+      entities: { 'event.dataset': partition },
     },
   });
 
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/chart.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/chart.tsx
index 73adcd13e24412..e4100c6d774b18 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/chart.tsx
@@ -94,6 +94,7 @@ export const AnomaliesChart: React.FunctionComponent<{
           onBrushEnd={handleBrushEnd}
           tooltip={tooltipProps}
           baseTheme={isDarkMode ? DARK_THEME : LIGHT_THEME}
+          xDomain={{ min: timeRange.startTime, max: timeRange.endTime }}
         />
       </Chart>
     </div>
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/expanded_row.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/expanded_row.tsx
index 43cfbb306717d1..cf3c46c9c40388 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/expanded_row.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/expanded_row.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 import numeral from '@elastic/numeral';
 import { EuiFlexGroup, EuiFlexItem, EuiStat, EuiSpacer } from '@elastic/eui';
 import { AnomaliesChart } from './chart';
-import { GetLogEntryRateSuccessResponsePayload } from '../../../../../../common/http_api/log_analysis/results/log_entry_rate';
+import { LogRateResults } from '../../../../../containers/logs/log_analysis/log_analysis_results';
 import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
 import {
   getLogEntryRateSeriesForPartition,
@@ -22,7 +22,7 @@ import { AnalyzeInMlButton } from '../analyze_in_ml_button';
 export const AnomaliesTableExpandedRow: React.FunctionComponent<{
   partitionId: string;
   topAnomalyScore: number;
-  results: GetLogEntryRateSuccessResponsePayload['data'];
+  results: LogRateResults;
   setTimeRange: (timeRange: TimeRange) => void;
   timeRange: TimeRange;
   jobId: string;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/index.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/index.tsx
index 5aa5891d7981d6..26f44519312e5f 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/index.tsx
@@ -8,17 +8,17 @@ import {
   EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiLoadingChart,
   EuiSpacer,
   EuiStat,
   EuiTitle,
+  EuiLoadingSpinner,
 } from '@elastic/eui';
 import numeral from '@elastic/numeral';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
 
 import euiStyled from '../../../../../../../../common/eui_styled_components';
-import { GetLogEntryRateSuccessResponsePayload } from '../../../../../../common/http_api';
+import { LogRateResults } from '../../../../../containers/logs/log_analysis/log_analysis_results';
 import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
 import { JobStatus, SetupStatus } from '../../../../../../common/log_analysis';
 import {
@@ -31,11 +31,12 @@ import { AnomaliesChart } from './chart';
 import { AnomaliesTable } from './table';
 import { LogAnalysisJobProblemIndicator } from '../../../../../components/logging/log_analysis_job_status';
 import { AnalyzeInMlButton } from '../analyze_in_ml_button';
+import { LoadingOverlayWrapper } from '../../../../../components/loading_overlay_wrapper';
 
 export const AnomaliesResults: React.FunctionComponent<{
   isLoading: boolean;
   jobStatus: JobStatus;
-  results: GetLogEntryRateSuccessResponsePayload['data'] | null;
+  results: LogRateResults | null;
   setTimeRange: (timeRange: TimeRange) => void;
   setupStatus: SetupStatus;
   timeRange: TimeRange;
@@ -53,15 +54,6 @@ export const AnomaliesResults: React.FunctionComponent<{
   viewSetupForUpdate,
   jobId,
 }) => {
-  const title = i18n.translate('xpack.infra.logs.analysis.anomaliesSectionTitle', {
-    defaultMessage: 'Anomalies',
-  });
-
-  const loadingAriaLabel = i18n.translate(
-    'xpack.infra.logs.analysis.anomaliesSectionLoadingAriaLabel',
-    { defaultMessage: 'Loading anomalies' }
-  );
-
   const hasAnomalies = useMemo(() => {
     return results && results.histogramBuckets
       ? results.histogramBuckets.some(bucket => {
@@ -117,92 +109,93 @@ export const AnomaliesResults: React.FunctionComponent<{
         onRecreateMlJobForUpdate={viewSetupForUpdate}
       />
       <EuiSpacer size="m" />
-      {isLoading ? (
-        <EuiFlexGroup justifyContent="center">
-          <EuiFlexItem grow={false}>
-            <EuiLoadingChart size="xl" aria-label={loadingAriaLabel} />
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      ) : !results || (results && results.histogramBuckets && !results.histogramBuckets.length) ? (
-        <EuiEmptyPrompt
-          title={
-            <h2>
-              {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoDataTitle', {
-                defaultMessage: 'There is no data to display.',
-              })}
-            </h2>
-          }
-          titleSize="m"
-          body={
-            <p>
-              {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoDataBody', {
-                defaultMessage: 'You may want to adjust your time range.',
-              })}
-            </p>
-          }
-        />
-      ) : !hasAnomalies ? (
-        <EuiEmptyPrompt
-          title={
-            <h2>
-              {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoAnomaliesTitle', {
-                defaultMessage: 'No anomalies were detected.',
-              })}
-            </h2>
-          }
-          titleSize="m"
-        />
-      ) : (
-        <>
-          <EuiFlexGroup>
-            <EuiFlexItem grow={8}>
-              <AnomaliesChart
-                chartId="overall"
-                setTimeRange={setTimeRange}
-                timeRange={timeRange}
-                series={logEntryRateSeries}
-                annotations={anomalyAnnotations}
-                renderAnnotationTooltip={renderAnnotationTooltip}
-              />
-            </EuiFlexItem>
-            <EuiFlexItem grow={2}>
-              <EuiStat
-                title={numeral(results.totalNumberOfLogEntries).format('0.00a')}
-                description={i18n.translate(
-                  'xpack.infra.logs.analysis.overallAnomaliesNumberOfLogEntriesDescription',
-                  {
-                    defaultMessage: 'Number of log entries',
-                  }
-                )}
-                reverse
-              />
-              <EuiStat
-                title={topAnomalyScore ? formatAnomalyScore(topAnomalyScore) : null}
-                description={i18n.translate(
-                  'xpack.infra.logs.analysis.overallAnomaliesTopAnomalyScoreDescription',
-                  {
-                    defaultMessage: 'Max anomaly score',
-                  }
-                )}
-                reverse
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiSpacer size="l" />
-          <AnomaliesTable
-            results={results}
-            setTimeRange={setTimeRange}
-            timeRange={timeRange}
-            jobId={jobId}
+
+      <LoadingOverlayWrapper isLoading={isLoading} loadingChildren={<LoadingOverlayContent />}>
+        {!results || (results && results.histogramBuckets && !results.histogramBuckets.length) ? (
+          <EuiEmptyPrompt
+            title={
+              <h2>
+                {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoDataTitle', {
+                  defaultMessage: 'There is no data to display.',
+                })}
+              </h2>
+            }
+            titleSize="m"
+            body={
+              <p>
+                {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoDataBody', {
+                  defaultMessage: 'You may want to adjust your time range.',
+                })}
+              </p>
+            }
+          />
+        ) : !hasAnomalies ? (
+          <EuiEmptyPrompt
+            title={
+              <h2>
+                {i18n.translate('xpack.infra.logs.analysis.anomalySectionNoAnomaliesTitle', {
+                  defaultMessage: 'No anomalies were detected.',
+                })}
+              </h2>
+            }
+            titleSize="m"
           />
-        </>
-      )}
+        ) : (
+          <>
+            <EuiFlexGroup>
+              <EuiFlexItem grow={8}>
+                <AnomaliesChart
+                  chartId="overall"
+                  setTimeRange={setTimeRange}
+                  timeRange={timeRange}
+                  series={logEntryRateSeries}
+                  annotations={anomalyAnnotations}
+                  renderAnnotationTooltip={renderAnnotationTooltip}
+                />
+              </EuiFlexItem>
+              <EuiFlexItem grow={2}>
+                <EuiStat
+                  title={numeral(results.totalNumberOfLogEntries).format('0.00a')}
+                  description={i18n.translate(
+                    'xpack.infra.logs.analysis.overallAnomaliesNumberOfLogEntriesDescription',
+                    {
+                      defaultMessage: 'Number of log entries',
+                    }
+                  )}
+                  reverse
+                />
+                <EuiStat
+                  title={topAnomalyScore ? formatAnomalyScore(topAnomalyScore) : null}
+                  description={i18n.translate(
+                    'xpack.infra.logs.analysis.overallAnomaliesTopAnomalyScoreDescription',
+                    {
+                      defaultMessage: 'Max anomaly score',
+                    }
+                  )}
+                  reverse
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+            <EuiSpacer size="l" />
+            <AnomaliesTable
+              results={results}
+              setTimeRange={setTimeRange}
+              timeRange={timeRange}
+              jobId={jobId}
+            />
+          </>
+        )}
+      </LoadingOverlayWrapper>
     </>
   );
 };
 
+const title = i18n.translate('xpack.infra.logs.analysis.anomaliesSectionTitle', {
+  defaultMessage: 'Anomalies',
+});
+
 interface ParsedAnnotationDetails {
-  anomalyScoresByPartition: Array<{ partitionId: string; maximumAnomalyScore: number }>;
+  anomalyScoresByPartition: Array<{ partitionName: string; maximumAnomalyScore: number }>;
 }
 
 const overallAnomalyScoreLabel = i18n.translate(
@@ -211,6 +204,7 @@ const overallAnomalyScoreLabel = i18n.translate(
     defaultMessage: 'Max anomaly scores:',
   }
 );
+
 const AnnotationTooltip: React.FunctionComponent<{ details: string }> = ({ details }) => {
   const parsedDetails: ParsedAnnotationDetails = JSON.parse(details);
   return (
@@ -219,11 +213,11 @@ const AnnotationTooltip: React.FunctionComponent<{ details: string }> = ({ detai
         <b>{overallAnomalyScoreLabel}</b>
       </span>
       <ul>
-        {parsedDetails.anomalyScoresByPartition.map(({ partitionId, maximumAnomalyScore }) => {
+        {parsedDetails.anomalyScoresByPartition.map(({ partitionName, maximumAnomalyScore }) => {
           return (
-            <li key={`overall-anomaly-chart-${partitionId}`}>
+            <li key={`overall-anomaly-chart-${partitionName}`}>
               <span>
-                {`${partitionId}: `}
+                {`${partitionName}: `}
                 <b>{maximumAnomalyScore}</b>
               </span>
             </li>
@@ -237,7 +231,7 @@ const AnnotationTooltip: React.FunctionComponent<{ details: string }> = ({ detai
 const renderAnnotationTooltip = (details?: string) => {
   // Note: Seems to be necessary to get things typed correctly all the way through to elastic-charts components
   if (!details) {
-    return <div></div>;
+    return <div />;
   }
   return <AnnotationTooltip details={details} />;
 };
@@ -245,3 +239,10 @@ const renderAnnotationTooltip = (details?: string) => {
 const TooltipWrapper = euiStyled('div')`
   white-space: nowrap;
 `;
+
+const loadingAriaLabel = i18n.translate(
+  'xpack.infra.logs.analysis.anomaliesSectionLoadingAriaLabel',
+  { defaultMessage: 'Loading anomalies' }
+);
+
+const LoadingOverlayContent = () => <EuiLoadingSpinner size="xl" aria-label={loadingAriaLabel} />;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/table.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/table.tsx
index 88ffcae6e9dea1..ebf31d8320df55 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/table.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/anomalies/table.tsx
@@ -9,9 +9,9 @@ import { EuiBasicTable, EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services';
 import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
-import { GetLogEntryRateSuccessResponsePayload } from '../../../../../../common/http_api/log_analysis/results/log_entry_rate';
+import { LogRateResults } from '../../../../../containers/logs/log_analysis/log_analysis_results';
 import { AnomaliesTableExpandedRow } from './expanded_row';
-import { getTopAnomalyScoresByPartition, formatAnomalyScore } from '../helpers/data_formatters';
+import { formatAnomalyScore, getFriendlyNameForPartitionId } from '../helpers/data_formatters';
 
 interface TableItem {
   id: string;
@@ -49,17 +49,20 @@ const maxAnomalyScoreColumnName = i18n.translate(
 );
 
 export const AnomaliesTable: React.FunctionComponent<{
-  results: GetLogEntryRateSuccessResponsePayload['data'];
+  results: LogRateResults;
   setTimeRange: (timeRange: TimeRange) => void;
   timeRange: TimeRange;
   jobId: string;
 }> = ({ results, timeRange, setTimeRange, jobId }) => {
   const tableItems: TableItem[] = useMemo(() => {
-    return Object.entries(getTopAnomalyScoresByPartition(results)).map(([key, value]) => {
+    return Object.entries(results.partitionBuckets).map(([key, value]) => {
       return {
-        id: key || 'unknown', // Note: EUI's table expanded rows won't work with a key of '' in itemIdToExpandedRowMap
-        partition: key || 'unknown',
-        topAnomalyScore: formatAnomalyScore(value),
+        // Note: EUI's table expanded rows won't work with a key of '' in itemIdToExpandedRowMap, so we have to use the friendly name here
+        id: getFriendlyNameForPartitionId(key),
+        // The real ID
+        partitionId: key,
+        partition: getFriendlyNameForPartitionId(key),
+        topAnomalyScore: formatAnomalyScore(value.topAnomalyScore),
       };
     });
   }, [results]);
@@ -108,7 +111,7 @@ export const AnomaliesTable: React.FunctionComponent<{
           ...itemIdToExpandedRowMap,
           [item.id]: (
             <AnomaliesTableExpandedRow
-              partitionId={item.id}
+              partitionId={item.partitionId}
               results={results}
               topAnomalyScore={item.topAnomalyScore}
               setTimeRange={setTimeRange}
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/helpers/data_formatters.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/helpers/data_formatters.tsx
index 105604507b4250..74a3b5f80a577d 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/helpers/data_formatters.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/helpers/data_formatters.tsx
@@ -6,7 +6,7 @@
 
 import { RectAnnotationDatum } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
-import { GetLogEntryRateSuccessResponsePayload } from '../../../../../../common/http_api/log_analysis/results/log_entry_rate';
+import { LogRateResults } from '../../../../../containers/logs/log_analysis/log_analysis_results';
 
 export type MLSeverityScoreCategories = 'warning' | 'minor' | 'major' | 'critical';
 type MLSeverityScores = Record<MLSeverityScoreCategories, number>;
@@ -17,15 +17,13 @@ const ML_SEVERITY_SCORES: MLSeverityScores = {
   critical: 75,
 };
 
-export const getLogEntryRatePartitionedSeries = (
-  results: GetLogEntryRateSuccessResponsePayload['data']
-) => {
+export const getLogEntryRatePartitionedSeries = (results: LogRateResults) => {
   return results.histogramBuckets.reduce<Array<{ group: string; time: number; value: number }>>(
     (buckets, bucket) => {
       return [
         ...buckets,
         ...bucket.partitions.map(partition => ({
-          group: partition.partitionId === '' ? 'unknown' : partition.partitionId,
+          group: getFriendlyNameForPartitionId(partition.partitionId),
           time: bucket.startTime,
           value: partition.averageActualLogEntryRate,
         })),
@@ -35,9 +33,7 @@ export const getLogEntryRatePartitionedSeries = (
   );
 };
 
-export const getLogEntryRateCombinedSeries = (
-  results: GetLogEntryRateSuccessResponsePayload['data']
-) => {
+export const getLogEntryRateCombinedSeries = (results: LogRateResults) => {
   return results.histogramBuckets.reduce<Array<{ time: number; value: number }>>(
     (buckets, bucket) => {
       return [
@@ -54,69 +50,27 @@ export const getLogEntryRateCombinedSeries = (
   );
 };
 
-export const getLogEntryRateSeriesForPartition = (
-  results: GetLogEntryRateSuccessResponsePayload['data'],
-  partitionId: string
-) => {
-  return results.histogramBuckets.reduce<Array<{ time: number; value: number }>>(
-    (buckets, bucket) => {
-      const partitionResults = bucket.partitions.find(partition => {
-        return (
-          partition.partitionId === partitionId ||
-          (partition.partitionId === '' && partitionId === 'unknown')
-        );
-      });
-      if (!partitionResults) {
-        return buckets;
-      }
-      return [
-        ...buckets,
-        {
-          time: bucket.startTime,
-          value: partitionResults.averageActualLogEntryRate,
-        },
-      ];
-    },
-    []
-  );
-};
-
-export const getTopAnomalyScoresByPartition = (
-  results: GetLogEntryRateSuccessResponsePayload['data']
-) => {
-  return results.histogramBuckets.reduce<Record<string, number>>((topScores, bucket) => {
-    bucket.partitions.forEach(partition => {
-      if (partition.maximumAnomalyScore > 0) {
-        topScores = {
-          ...topScores,
-          [partition.partitionId]:
-            !topScores[partition.partitionId] ||
-            partition.maximumAnomalyScore > topScores[partition.partitionId]
-              ? partition.maximumAnomalyScore
-              : topScores[partition.partitionId],
-        };
-      }
-    });
-    return topScores;
-  }, {});
+export const getLogEntryRateSeriesForPartition = (results: LogRateResults, partitionId: string) => {
+  return results.partitionBuckets[partitionId].buckets.reduce<
+    Array<{ time: number; value: number }>
+  >((buckets, bucket) => {
+    return [
+      ...buckets,
+      {
+        time: bucket.startTime,
+        value: bucket.averageActualLogEntryRate,
+      },
+    ];
+  }, []);
 };
 
-export const getAnnotationsForPartition = (
-  results: GetLogEntryRateSuccessResponsePayload['data'],
-  partitionId: string
-) => {
-  return results.histogramBuckets.reduce<Record<MLSeverityScoreCategories, RectAnnotationDatum[]>>(
+export const getAnnotationsForPartition = (results: LogRateResults, partitionId: string) => {
+  return results.partitionBuckets[partitionId].buckets.reduce<
+    Record<MLSeverityScoreCategories, RectAnnotationDatum[]>
+  >(
     (annotatedBucketsBySeverity, bucket) => {
-      const partitionResults = bucket.partitions.find(partition => {
-        return (
-          partition.partitionId === partitionId ||
-          (partition.partitionId === '' && partitionId === 'unknown')
-        );
-      });
-      const severityCategory = partitionResults
-        ? getSeverityCategoryForScore(partitionResults.maximumAnomalyScore)
-        : null;
-      if (!partitionResults || !partitionResults.maximumAnomalyScore || !severityCategory) {
+      const severityCategory = getSeverityCategoryForScore(bucket.maximumAnomalyScore);
+      if (!severityCategory) {
         return annotatedBucketsBySeverity;
       }
 
@@ -134,7 +88,7 @@ export const getAnnotationsForPartition = (
               {
                 defaultMessage: 'Max anomaly score: {maxAnomalyScore}',
                 values: {
-                  maxAnomalyScore: formatAnomalyScore(partitionResults.maximumAnomalyScore),
+                  maxAnomalyScore: formatAnomalyScore(bucket.maximumAnomalyScore),
                 },
               }
             ),
@@ -152,29 +106,17 @@ export const getAnnotationsForPartition = (
 };
 
 export const getTotalNumberOfLogEntriesForPartition = (
-  results: GetLogEntryRateSuccessResponsePayload['data'],
+  results: LogRateResults,
   partitionId: string
 ) => {
-  return results.histogramBuckets.reduce<number>((sumPartitionNumberOfLogEntries, bucket) => {
-    const partitionResults = bucket.partitions.find(partition => {
-      return (
-        partition.partitionId === partitionId ||
-        (partition.partitionId === '' && partitionId === 'unknown')
-      );
-    });
-    if (!partitionResults || !partitionResults.numberOfLogEntries) {
-      return sumPartitionNumberOfLogEntries;
-    } else {
-      return (sumPartitionNumberOfLogEntries += partitionResults.numberOfLogEntries);
-    }
-  }, 0);
+  return results.partitionBuckets[partitionId].totalNumberOfLogEntries;
 };
 
-export const getAnnotationsForAll = (results: GetLogEntryRateSuccessResponsePayload['data']) => {
+export const getAnnotationsForAll = (results: LogRateResults) => {
   return results.histogramBuckets.reduce<Record<MLSeverityScoreCategories, RectAnnotationDatum[]>>(
     (annotatedBucketsBySeverity, bucket) => {
       const maxAnomalyScoresByPartition = bucket.partitions.reduce<
-        Array<{ partitionId: string; maximumAnomalyScore: number }>
+        Array<{ partitionName: string; maximumAnomalyScore: number }>
       >((bucketMaxAnomalyScoresByPartition, partition) => {
         if (!getSeverityCategoryForScore(partition.maximumAnomalyScore)) {
           return bucketMaxAnomalyScoresByPartition;
@@ -182,7 +124,7 @@ export const getAnnotationsForAll = (results: GetLogEntryRateSuccessResponsePayl
         return [
           ...bucketMaxAnomalyScoresByPartition,
           {
-            partitionId: partition.partitionId ? partition.partitionId : 'unknown',
+            partitionName: getFriendlyNameForPartitionId(partition.partitionId),
             maximumAnomalyScore: formatAnomalyScore(partition.maximumAnomalyScore),
           },
         ];
@@ -227,16 +169,14 @@ export const getAnnotationsForAll = (results: GetLogEntryRateSuccessResponsePayl
   );
 };
 
-export const getTopAnomalyScoreAcrossAllPartitions = (
-  results: GetLogEntryRateSuccessResponsePayload['data']
-) => {
-  const allMaxScores = results.histogramBuckets.reduce<number[]>((scores, bucket) => {
-    const bucketMaxScores = bucket.partitions.reduce<number[]>((bucketScores, partition) => {
-      return [...bucketScores, partition.maximumAnomalyScore];
-    }, []);
-    return [...scores, ...bucketMaxScores];
-  }, []);
-  return Math.max(...allMaxScores);
+export const getTopAnomalyScoreAcrossAllPartitions = (results: LogRateResults) => {
+  const allTopScores = Object.values(results.partitionBuckets).reduce(
+    (scores: number[], partition) => {
+      return [...scores, partition.topAnomalyScore];
+    },
+    []
+  );
+  return Math.max(...allTopScores);
 };
 
 const getSeverityCategoryForScore = (score: number): MLSeverityScoreCategories | undefined => {
@@ -257,3 +197,7 @@ const getSeverityCategoryForScore = (score: number): MLSeverityScoreCategories |
 export const formatAnomalyScore = (score: number) => {
   return Math.round(score);
 };
+
+export const getFriendlyNameForPartitionId = (partitionId: string) => {
+  return partitionId !== '' ? partitionId : 'unknown';
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/bar_chart.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/bar_chart.tsx
index de856bee905137..5055e3fc08239b 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/bar_chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/bar_chart.tsx
@@ -90,6 +90,7 @@ export const LogEntryRateBarChart: React.FunctionComponent<{
           theme={isDarkMode ? DARK_THEME : LIGHT_THEME}
           showLegend
           legendPosition="right"
+          xDomain={{ min: timeRange.startTime, max: timeRange.endTime }}
         />
       </Chart>
     </div>
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/index.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/index.tsx
index d4ddd14bfaa289..44805520f3b9ea 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/sections/log_rate/index.tsx
@@ -4,22 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  EuiEmptyPrompt,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiLoadingChart,
-  EuiSpacer,
-  EuiTitle,
-  EuiText,
-} from '@elastic/eui';
+import { EuiEmptyPrompt, EuiLoadingSpinner, EuiSpacer, EuiTitle, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
 
-import { GetLogEntryRateSuccessResponsePayload } from '../../../../../../common/http_api/log_analysis/results/log_entry_rate';
+import { LogRateResults as Results } from '../../../../../containers/logs/log_analysis/log_analysis_results';
 import { TimeRange } from '../../../../../../common/http_api/shared/time_range';
 import { LogEntryRateBarChart } from './bar_chart';
 import { getLogEntryRatePartitionedSeries } from '../helpers/data_formatters';
+import { LoadingOverlayWrapper } from '../../../../../components/loading_overlay_wrapper';
 
 export const LogRateResults = ({
   isLoading,
@@ -28,19 +21,10 @@ export const LogRateResults = ({
   timeRange,
 }: {
   isLoading: boolean;
-  results: GetLogEntryRateSuccessResponsePayload['data'] | null;
+  results: Results | null;
   setTimeRange: (timeRange: TimeRange) => void;
   timeRange: TimeRange;
 }) => {
-  const title = i18n.translate('xpack.infra.logs.analysis.logRateSectionTitle', {
-    defaultMessage: 'Log entries',
-  });
-
-  const loadingAriaLabel = i18n.translate(
-    'xpack.infra.logs.analysis.logRateSectionLoadingAriaLabel',
-    { defaultMessage: 'Loading log rate results' }
-  );
-
   const logEntryRateSeries = useMemo(
     () => (results && results.histogramBuckets ? getLogEntryRatePartitionedSeries(results) : []),
     [results]
@@ -51,57 +35,61 @@ export const LogRateResults = ({
       <EuiTitle size="m" aria-label={title}>
         <h2>{title}</h2>
       </EuiTitle>
-      {isLoading ? (
-        <>
-          <EuiSpacer size="l" />
-          <EuiFlexGroup justifyContent="center">
-            <EuiFlexItem grow={false}>
-              <EuiLoadingChart size="xl" aria-label={loadingAriaLabel} />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </>
-      ) : !results || (results && results.histogramBuckets && !results.histogramBuckets.length) ? (
-        <>
-          <EuiSpacer size="l" />
-          <EuiEmptyPrompt
-            title={
-              <h2>
-                {i18n.translate('xpack.infra.logs.analysis.logRateSectionNoDataTitle', {
-                  defaultMessage: 'There is no data to display.',
-                })}
-              </h2>
-            }
-            titleSize="m"
-            body={
+      <LoadingOverlayWrapper isLoading={isLoading} loadingChildren={<LoadingOverlayContent />}>
+        {!results || (results && results.histogramBuckets && !results.histogramBuckets.length) ? (
+          <>
+            <EuiSpacer size="l" />
+            <EuiEmptyPrompt
+              title={
+                <h2>
+                  {i18n.translate('xpack.infra.logs.analysis.logRateSectionNoDataTitle', {
+                    defaultMessage: 'There is no data to display.',
+                  })}
+                </h2>
+              }
+              titleSize="m"
+              body={
+                <p>
+                  {i18n.translate('xpack.infra.logs.analysis.logRateSectionNoDataBody', {
+                    defaultMessage: 'You may want to adjust your time range.',
+                  })}
+                </p>
+              }
+            />
+          </>
+        ) : (
+          <>
+            <EuiText size="s">
               <p>
-                {i18n.translate('xpack.infra.logs.analysis.logRateSectionNoDataBody', {
-                  defaultMessage: 'You may want to adjust your time range.',
+                <b>
+                  {i18n.translate('xpack.infra.logs.analysis.logRateSectionBucketSpanLabel', {
+                    defaultMessage: 'Bucket span: ',
+                  })}
+                </b>
+                {i18n.translate('xpack.infra.logs.analysis.logRateSectionBucketSpanValue', {
+                  defaultMessage: '15 minutes',
                 })}
               </p>
-            }
-          />
-        </>
-      ) : (
-        <>
-          <EuiText size="s">
-            <p>
-              <b>
-                {i18n.translate('xpack.infra.logs.analysis.logRateSectionBucketSpanLabel', {
-                  defaultMessage: 'Bucket span: ',
-                })}
-              </b>
-              {i18n.translate('xpack.infra.logs.analysis.logRateSectionBucketSpanValue', {
-                defaultMessage: '15 minutes',
-              })}
-            </p>
-          </EuiText>
-          <LogEntryRateBarChart
-            setTimeRange={setTimeRange}
-            timeRange={timeRange}
-            series={logEntryRateSeries}
-          />
-        </>
-      )}
+            </EuiText>
+            <LogEntryRateBarChart
+              setTimeRange={setTimeRange}
+              timeRange={timeRange}
+              series={logEntryRateSeries}
+            />
+          </>
+        )}
+      </LoadingOverlayWrapper>
     </>
   );
 };
+
+const title = i18n.translate('xpack.infra.logs.analysis.logRateSectionTitle', {
+  defaultMessage: 'Log entries',
+});
+
+const loadingAriaLabel = i18n.translate(
+  'xpack.infra.logs.analysis.logRateSectionLoadingAriaLabel',
+  { defaultMessage: 'Loading log rate results' }
+);
+
+const LoadingOverlayContent = () => <EuiLoadingSpinner size="xl" aria-label={loadingAriaLabel} />;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
index e966336567e59e..17f1aa48c87a26 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/analysis/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
@@ -4,18 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useMemo } from 'react';
-import moment, { Moment } from 'moment';
-
-import { i18n } from '@kbn/i18n';
 import {
-  EuiDescribedFormGroup,
-  EuiFormRow,
   EuiDatePicker,
+  EuiDatePickerProps,
+  EuiDescribedFormGroup,
   EuiFlexGroup,
   EuiFormControlLayout,
+  EuiFormRow,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import moment, { Moment } from 'moment';
+import React, { useMemo } from 'react';
+
+import { euiStyled } from '../../../../../../../../common/eui_styled_components';
 
 const startTimeLabel = i18n.translate('xpack.infra.analysisSetup.startTimeLabel', {
   defaultMessage: 'Start time',
@@ -84,7 +86,7 @@ export const AnalysisSetupTimerangeForm: React.FunctionComponent<{
           <EuiFormControlLayout
             clear={startTime ? { onClick: () => setStartTime(undefined) } : undefined}
           >
-            <EuiDatePicker
+            <FixedDatePicker
               showTimeSelect
               selected={startTimeValue}
               onChange={date => setStartTime(selectedDateToParam(date))}
@@ -105,7 +107,7 @@ export const AnalysisSetupTimerangeForm: React.FunctionComponent<{
           <EuiFormControlLayout
             clear={endTime ? { onClick: () => setEndTime(undefined) } : undefined}
           >
-            <EuiDatePicker
+            <FixedDatePicker
               showTimeSelect
               selected={endTimeValue}
               onChange={date => setEndTime(selectedDateToParam(date))}
@@ -129,3 +131,18 @@ export const AnalysisSetupTimerangeForm: React.FunctionComponent<{
     </EuiDescribedFormGroup>
   );
 };
+
+const FixedDatePicker = euiStyled(
+  ({
+    className,
+    inputClassName,
+    ...datePickerProps
+  }: {
+    className?: string;
+    inputClassName?: string;
+  } & EuiDatePickerProps) => (
+    <EuiDatePicker {...datePickerProps} className={inputClassName} popperClassName={className} />
+  )
+)`
+  z-index: 3 !important;
+`;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
index 7e935f3fb73eaa..895d95b1471a0e 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
@@ -5,7 +5,6 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { EuiBetaBadge } from '@elastic/eui';
 import React from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 import { UICapabilities } from 'ui/capabilities';
@@ -14,7 +13,7 @@ import { injectUICapabilities } from 'ui/capabilities/react';
 import { DocumentTitle } from '../../components/document_title';
 import { HelpCenterContent } from '../../components/help_center_content';
 import { Header } from '../../components/header';
-import { RoutedTabs } from '../../components/navigation/routed_tabs';
+import { RoutedTabs, TabBetaBadge } from '../../components/navigation/routed_tabs';
 import { ColumnarPage } from '../../components/page';
 import { SourceLoadingPage } from '../../components/source_loading_page';
 import { SourceErrorPage } from '../../components/source_error_page';
@@ -28,6 +27,7 @@ import {
   LogAnalysisCapabilities,
 } from '../../containers/logs/log_analysis';
 import { useSourceId } from '../../containers/source_id';
+import { RedirectWithQueryParams } from '../../utils/redirect_with_query_params';
 
 interface LogsPageProps extends RouteComponentProps {
   uiCapabilities: UICapabilities;
@@ -39,76 +39,32 @@ export const LogsPage = injectUICapabilities(({ match, uiCapabilities }: LogsPag
   const logAnalysisCapabilities = useLogAnalysisCapabilities();
 
   const streamTab = {
-    title: i18n.translate('xpack.infra.logs.index.streamTabTitle', { defaultMessage: 'Stream' }),
+    title: streamTabTitle,
     path: `${match.path}/stream`,
   };
-  const analysisBetaBadgeTitle = i18n.translate('xpack.infra.logs.index.analysisBetaBadgeTitle', {
-    defaultMessage: 'Analysis',
-  });
-  const analysisBetaBadgeLabel = i18n.translate('xpack.infra.logs.index.analysisBetaBadgeLabel', {
-    defaultMessage: 'Beta',
-  });
-  const analysisBetaBadgeTooltipContent = i18n.translate(
-    'xpack.infra.logs.index.analysisBetaBadgeTooltipContent',
-    {
-      defaultMessage:
-        'This feature is under active development. Extra functionality is coming, and some functionality may change.',
-    }
-  );
-  const analysisBetaBadge = (
-    <EuiBetaBadge
-      label={analysisBetaBadgeLabel}
-      aria-label={analysisBetaBadgeLabel}
-      title={analysisBetaBadgeTitle}
-      tooltipContent={analysisBetaBadgeTooltipContent}
-    />
-  );
-  const analysisTab = {
+
+  const logRateTab = {
     title: (
       <>
-        <span
-          style={{
-            display: 'inline-block',
-            position: 'relative',
-            top: '-4px',
-            marginRight: '5px',
-          }}
-        >
-          {i18n.translate('xpack.infra.logs.index.analysisTabTitle', {
-            defaultMessage: 'Analysis',
-          })}
-        </span>
-        {analysisBetaBadge}
+        {logRateTabTitle}
+        <TabBetaBadge title={logRateTabTitle} />
       </>
     ),
-    path: `${match.path}/analysis`,
+    path: `${match.path}/log-rate`,
   };
+
   const settingsTab = {
-    title: i18n.translate('xpack.infra.logs.index.settingsTabTitle', {
-      defaultMessage: 'Settings',
-    }),
+    title: settingsTabTitle,
     path: `${match.path}/settings`,
   };
-  const pageTitle = i18n.translate('xpack.infra.header.logsTitle', {
-    defaultMessage: 'Logs',
-  });
+
   return (
     <Source.Context.Provider value={source}>
       <LogAnalysisCapabilities.Context.Provider value={logAnalysisCapabilities}>
         <ColumnarPage>
-          <DocumentTitle
-            title={i18n.translate('xpack.infra.logs.index.documentTitle', {
-              defaultMessage: 'Logs',
-            })}
-          />
+          <DocumentTitle title={pageTitle} />
 
-          <HelpCenterContent
-            feedbackLink="https://discuss.elastic.co/c/logs"
-            feedbackLinkText={i18n.translate(
-              'xpack.infra.logsPage.logsHelpContent.feedbackLinkText',
-              { defaultMessage: 'Provide feedback for Logs' }
-            )}
-          />
+          <HelpCenterContent feedbackLink={feedbackLinkUrl} feedbackLinkText={feedbackLinkText} />
 
           <Header
             breadcrumbs={[
@@ -134,16 +90,21 @@ export const LogsPage = injectUICapabilities(({ match, uiCapabilities }: LogsPag
                 <RoutedTabs
                   tabs={
                     logAnalysisCapabilities.hasLogAnalysisCapabilites
-                      ? [streamTab, analysisTab, settingsTab]
+                      ? [streamTab, logRateTab, settingsTab]
                       : [streamTab, settingsTab]
                   }
                 />
               </AppNavigation>
 
               <Switch>
-                <Route path={`${match.path}/stream`} component={StreamPage} />
-                <Route path={`${match.path}/analysis`} component={AnalysisPage} />
-                <Route path={`${match.path}/settings`} component={SettingsPage} />
+                <Route path={streamTab.path} component={StreamPage} />
+                <Route path={logRateTab.path} component={AnalysisPage} />
+                <Route path={settingsTab.path} component={SettingsPage} />
+                <RedirectWithQueryParams
+                  from={`${match.path}/analysis`}
+                  to={logRateTab.path}
+                  exact
+                />
               </Switch>
             </>
           )}
@@ -152,3 +113,25 @@ export const LogsPage = injectUICapabilities(({ match, uiCapabilities }: LogsPag
     </Source.Context.Provider>
   );
 });
+
+const pageTitle = i18n.translate('xpack.infra.header.logsTitle', {
+  defaultMessage: 'Logs',
+});
+
+const streamTabTitle = i18n.translate('xpack.infra.logs.index.streamTabTitle', {
+  defaultMessage: 'Stream',
+});
+
+const logRateTabTitle = i18n.translate('xpack.infra.logs.index.analysisBetaBadgeTitle', {
+  defaultMessage: 'Log Rate',
+});
+
+const settingsTabTitle = i18n.translate('xpack.infra.logs.index.settingsTabTitle', {
+  defaultMessage: 'Settings',
+});
+
+const feedbackLinkText = i18n.translate('xpack.infra.logsPage.logsHelpContent.feedbackLinkText', {
+  defaultMessage: 'Provide feedback for Logs',
+});
+
+const feedbackLinkUrl = 'https://discuss.elastic.co/c/logs';
diff --git a/x-pack/legacy/plugins/infra/public/register_feature.ts b/x-pack/legacy/plugins/infra/public/register_feature.ts
index 2557503ef5c0ab..bf56db77e360f0 100644
--- a/x-pack/legacy/plugins/infra/public/register_feature.ts
+++ b/x-pack/legacy/plugins/infra/public/register_feature.ts
@@ -21,7 +21,7 @@ FeatureCatalogueRegistryProvider.register((i18n: I18nServiceType) => ({
     defaultMessage:
       'Explore infrastructure metrics and logs for common servers, containers, and services.',
   }),
-  icon: 'infraApp',
+  icon: 'metricsApp',
   path: `/app/${APP_ID}#infrastructure`,
   showOnHomePage: true,
   category: FeatureCatalogueCategory.DATA,
@@ -36,7 +36,7 @@ FeatureCatalogueRegistryProvider.register((i18n: I18nServiceType) => ({
     defaultMessage:
       'Stream logs in real time or scroll through historical views in a console-like experience.',
   }),
-  icon: 'loggingApp',
+  icon: 'logsApp',
   path: `/app/${APP_ID}#logs`,
   showOnHomePage: true,
   category: FeatureCatalogueCategory.DATA,
diff --git a/x-pack/legacy/plugins/infra/public/store/local/waffle_filter/reducer.ts b/x-pack/legacy/plugins/infra/public/store/local/waffle_filter/reducer.ts
index a34cc9659f0b7e..912ad96357334d 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/waffle_filter/reducer.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/waffle_filter/reducer.ts
@@ -16,8 +16,8 @@ export interface KueryFilterQuery {
 export type FilterQuery = KueryFilterQuery;
 
 export interface SerializedFilterQuery {
-  query: FilterQuery;
-  serializedQuery: string;
+  query: FilterQuery | null;
+  serializedQuery: string | null;
 }
 
 export interface WaffleFilterState {
diff --git a/x-pack/legacy/plugins/infra/server/kibana.index.ts b/x-pack/legacy/plugins/infra/server/kibana.index.ts
index 59e3ffb3cb33d0..48ef846ec52750 100644
--- a/x-pack/legacy/plugins/infra/server/kibana.index.ts
+++ b/x-pack/legacy/plugins/infra/server/kibana.index.ts
@@ -35,7 +35,7 @@ export const initServerWithKibana = (kbnServer: KbnServer) => {
     name: i18n.translate('xpack.infra.featureRegistry.linkInfrastructureTitle', {
       defaultMessage: 'Metrics',
     }),
-    icon: 'infraApp',
+    icon: 'metricsApp',
     navLinkId: 'infra:home',
     app: ['infra', 'kibana'],
     catalogue: ['infraops'],
@@ -73,7 +73,7 @@ export const initServerWithKibana = (kbnServer: KbnServer) => {
     name: i18n.translate('xpack.infra.featureRegistry.linkLogsTitle', {
       defaultMessage: 'Logs',
     }),
-    icon: 'loggingApp',
+    icon: 'logsApp',
     navLinkId: 'infra:logs',
     app: ['infra', 'kibana'],
     catalogue: ['infralogging'],
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__fixtures__/index_pattern_response.json b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__fixtures__/index_pattern_response.json
index 408e839596ae2f..27e480623f3119 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__fixtures__/index_pattern_response.json
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__fixtures__/index_pattern_response.json
@@ -161,8 +161,7 @@
       "searchable": true,
       "aggregatable": true,
       "readFromDocValues": true,
-      "parent": "machine.os",
-      "subType": "multi"
+      "subType":{ "multi":{ "parent": "machine.os" } }
     },
     {
       "name": "geo.src",
@@ -277,6 +276,28 @@
       "searchable": true,
       "aggregatable": true,
       "readFromDocValues": false
+    },
+    {
+      "name": "nestedField.child",
+      "type": "string",
+      "esTypes": ["text"],
+      "count": 0,
+      "scripted": false,
+      "searchable": true,
+      "aggregatable": false,
+      "readFromDocValues": false,
+      "subType": { "nested": { "path": "nestedField" } }
+    },
+    {
+      "name": "nestedField.nestedChild.doublyNestedChild",
+      "type": "string",
+      "esTypes": ["text"],
+      "count": 0,
+      "scripted": false,
+      "searchable": true,
+      "aggregatable": false,
+      "readFromDocValues": false,
+      "subType": { "nested": { "path": "nestedField.nestedChild" } }
     }
   ]
 }
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__tests__/field.js b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__tests__/field.js
index d19fb47468829d..8a20337317cfb4 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__tests__/field.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__tests__/field.js
@@ -80,4 +80,60 @@ describe('Kuery field suggestions', function () {
       expect(suggestion).to.have.property('description');
     });
   });
+
+  describe('nested fields', function () {
+
+    it('should automatically wrap nested fields in KQL\'s nested syntax', () => {
+      const prefix = 'ch';
+      const suffix = '';
+      const suggestions = getSuggestions({ prefix, suffix });
+
+      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
+      expect(suggestion.text).to.be('nestedField:{ child  }');
+
+      // For most suggestions the cursor can be placed at the end of the suggestion text, but
+      // for the nested field syntax we want to place the cursor inside the curly braces
+      expect(suggestion.cursorIndex).to.be(20);
+    });
+
+    it('should narrow suggestions to children of a nested path if provided', () => {
+      const prefix = 'ch';
+      const suffix = '';
+
+      const allSuggestions = getSuggestions({ prefix, suffix });
+      expect(allSuggestions.length).to.be.greaterThan(2);
+
+      const nestedSuggestions = getSuggestions({ prefix, suffix, nestedPath: 'nestedField' });
+      expect(nestedSuggestions).to.have.length(2);
+    });
+
+    it('should not wrap the suggestion in KQL\'s nested syntax if the correct nested path is already provided', () => {
+      const prefix = 'ch';
+      const suffix = '';
+
+      const suggestions = getSuggestions({ prefix, suffix, nestedPath: 'nestedField' });
+      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
+      expect(suggestion.text).to.be('child ');
+    });
+
+    it('should handle fields nested multiple levels deep', () => {
+      const prefix = 'doubly';
+      const suffix = '';
+
+      const suggestionsWithNoPath = getSuggestions({ prefix, suffix });
+      expect(suggestionsWithNoPath).to.have.length(1);
+      const [ noPathSuggestion ] = suggestionsWithNoPath;
+      expect(noPathSuggestion.text).to.be('nestedField.nestedChild:{ doublyNestedChild  }');
+
+      const suggestionsWithPartialPath = getSuggestions({ prefix, suffix, nestedPath: 'nestedField' });
+      expect(suggestionsWithPartialPath).to.have.length(1);
+      const [ partialPathSuggestion ] = suggestionsWithPartialPath;
+      expect(partialPathSuggestion.text).to.be('nestedChild:{ doublyNestedChild  }');
+
+      const suggestionsWithFullPath = getSuggestions({ prefix, suffix, nestedPath: 'nestedField.nestedChild' });
+      expect(suggestionsWithFullPath).to.have.length(1);
+      const [ fullPathSuggestion ] = suggestionsWithFullPath;
+      expect(fullPathSuggestion.text).to.be('doublyNestedChild ');
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__tests__/operator.js b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__tests__/operator.js
index 57d38ddab5c3db..bb20e927039c09 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__tests__/operator.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/__tests__/operator.js
@@ -56,4 +56,9 @@ describe('Kuery operator suggestions', function () {
       expect(suggestion).to.have.property('description');
     });
   });
+
+  it('should handle nested paths', () => {
+    const suggestions = getSuggestions({ fieldName: 'child', nestedPath: 'nestedField' });
+    expect(suggestions.length).to.be.greaterThan(0);
+  });
 });
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/field.js b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/field.js
index 4f62c6344e9a00..3d7e1979d224bf 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/field.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/field.js
@@ -29,15 +29,28 @@ export function getSuggestionsProvider({ indexPatterns }) {
   const allFields = flatten(indexPatterns.map(indexPattern => {
     return indexPattern.fields.filter(isFilterable);
   }));
-  return function getFieldSuggestions({ start, end, prefix, suffix }) {
-    const search = `${prefix}${suffix}`.toLowerCase();
-    const fieldNames = allFields.map(field => field.name);
-    const matchingFieldNames = fieldNames.filter(name => name.toLowerCase().includes(search));
-    const sortedFieldNames = sortPrefixFirst(matchingFieldNames.sort(keywordComparator), search);
-    const suggestions = sortedFieldNames.map(fieldName => {
-      const text = `${escapeKuery(fieldName)} `;
-      const description = getDescription(fieldName);
-      return { type, text, description, start, end };
+  return function getFieldSuggestions({ start, end, prefix, suffix, nestedPath = '' }) {
+    const search = `${prefix}${suffix}`.trim().toLowerCase();
+    const matchingFields = allFields.filter(field => {
+      return (
+        !nestedPath
+        || (nestedPath && (field.subType && field.subType.nested && field.subType.nested.path.includes(nestedPath)))
+      )
+      && field.name.toLowerCase().includes(search) && field.name !== search;
+    });
+    const sortedFields = sortPrefixFirst(matchingFields.sort(keywordComparator), search, 'name');
+    const suggestions = sortedFields.map(field => {
+      const remainingPath = field.subType && field.subType.nested
+        ? field.subType.nested.path.slice(nestedPath ? nestedPath.length + 1 : 0)
+        : '';
+      const text = field.subType && field.subType.nested && remainingPath.length > 0
+        ? `${escapeKuery(remainingPath)}:{ ${escapeKuery(field.name.slice(field.subType.nested.path.length + 1))}  }`
+        : `${escapeKuery(field.name.slice(nestedPath ? nestedPath.length + 1 : 0))} `;
+      const description = getDescription(field.name);
+      const cursorIndex = field.subType && field.subType.nested && remainingPath.length > 0
+        ? text.length - 2
+        : text.length;
+      return { type, text, description, start, end, cursorIndex, field };
     });
     return suggestions;
   };
@@ -45,10 +58,10 @@ export function getSuggestionsProvider({ indexPatterns }) {
 
 function keywordComparator(first, second) {
   const extensions = ['raw', 'keyword'];
-  if (extensions.map(ext => `${first}.${ext}`).includes(second)) {
+  if (extensions.map(ext => `${first.name}.${ext}`).includes(second.name)) {
     return 1;
-  } else if (extensions.map(ext => `${second}.${ext}`).includes(first)) {
+  } else if (extensions.map(ext => `${second.name}.${ext}`).includes(first.name)) {
     return -1;
   }
-  return first.localeCompare(second);
+  return first.name.localeCompare(second.name);
 }
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/operator.js b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/operator.js
index a60216bd9316a4..3955fdfd9afe78 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/operator.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/operator.js
@@ -123,8 +123,9 @@ export function getSuggestionsProvider({ indexPatterns }) {
   const allFields = flatten(indexPatterns.map(indexPattern => {
     return indexPattern.fields.slice();
   }));
-  return function getOperatorSuggestions({ end, fieldName }) {
-    const fields = allFields.filter(field => field.name === fieldName);
+  return function getOperatorSuggestions({ end, fieldName, nestedPath }) {
+    const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
+    const fields = allFields.filter(field => field.name === fullFieldName);
     return flatten(fields.map(field => {
       const matchingOperators = Object.keys(operators).filter(operator => {
         const { fieldTypes } = operators[operator];
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/value.js b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/value.js
index 66e62e884e9b3a..52bf347a94075c 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/value.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/value.js
@@ -26,9 +26,11 @@ export function getSuggestionsProvider({ indexPatterns, boolFilter }) {
     prefix,
     suffix,
     fieldName,
+    nestedPath,
   }) {
-    const fields = allFields.filter(field => field.name === fieldName);
-    const query = `${prefix}${suffix}`;
+    const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
+    const fields = allFields.filter(field => field.name === fullFieldName);
+    const query = `${prefix}${suffix}`.trim();
     const { getSuggestions } = npStart.plugins.data;
 
     const suggestionsByField = fields.map(field => {
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/value.test.js b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/value.test.js
index c59917ebdc3bf3..591833d6463606 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/value.test.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/value.test.js
@@ -19,7 +19,11 @@ jest.mock('ui/new_platform', () => ({
             res = [true, false];
           } else if (field.name === 'machine.os') {
             res = ['Windo"ws', 'Mac\'', 'Linux'];
-          } else {
+          }
+          else if (field.name === 'nestedField.child') {
+            res = ['foo'];
+          }
+          else {
             res = [];
           }
           return Promise.resolve(res);
@@ -67,6 +71,17 @@ describe('Kuery value suggestions', function () {
     expect(suggestions[0].end).toEqual(end);
   });
 
+  test('should handle nested paths', async () => {
+    const suggestions = await getSuggestions({
+      fieldName: 'child',
+      nestedPath: 'nestedField',
+      prefix: '',
+      suffix: '',
+    });
+    expect(suggestions.length).toEqual(1);
+    expect(suggestions[0].text).toEqual('"foo" ');
+  });
+
   describe('Boolean suggestions', function () {
     test('should stringify boolean fields', async () => {
       const fieldName = 'ssl';
diff --git a/x-pack/legacy/plugins/lens/index.ts b/x-pack/legacy/plugins/lens/index.ts
index a8984bd80fb1c6..20f92ebbe0654a 100644
--- a/x-pack/legacy/plugins/lens/index.ts
+++ b/x-pack/legacy/plugins/lens/index.ts
@@ -18,6 +18,7 @@ export const lens: LegacyPluginInitializer = kibana => {
   return new kibana.Plugin({
     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'],
     publicDir: resolve(__dirname, 'public'),
 
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 77d0d5a5305aa5..31d622c7089a86 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
@@ -7,27 +7,32 @@
 import React from 'react';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
-import { buildExistsFilter } from '@kbn/es-query';
 import { App } from './app';
 import { EditorFrameInstance } from '../types';
-import { Storage } from 'ui/storage';
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { Document, SavedObjectStore } from '../persistence';
 import { mount } from 'enzyme';
+import { esFilters } from '../../../../../../src/plugins/data/public';
 
 import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
 const dataStartMock = dataPluginMock.createStartContract();
 
-import {
-  TopNavMenu,
-  TopNavMenuData,
-} from '../../../../../../src/legacy/core_plugins/kibana_react/public';
+import { TopNavMenuData } from '../../../../../../src/legacy/core_plugins/navigation/public';
 import { DataStart } from '../../../../../../src/legacy/core_plugins/data/public';
 import { coreMock } from 'src/core/public/mocks';
 
-jest.mock('../../../../../../src/legacy/core_plugins/kibana_react/public', () => ({
-  TopNavMenu: jest.fn(() => null),
+jest.mock('../../../../../../src/legacy/core_plugins/navigation/public/legacy', () => ({
+  start: {
+    ui: {
+      TopNavMenu: jest.fn(() => null),
+    },
+  },
 }));
 
+import { start as navigation } from '../../../../../../src/legacy/core_plugins/navigation/public/legacy';
+
+const { TopNavMenu } = navigation.ui;
+
 jest.mock('ui/new_platform');
 jest.mock('../persistence');
 jest.mock('src/core/public');
@@ -75,7 +80,7 @@ describe('Lens App', () => {
     data: typeof dataStartMock;
     core: typeof core;
     dataShim: DataStart;
-    store: Storage;
+    storage: Storage;
     docId?: string;
     docStorage: SavedObjectStore;
     redirectTo: (id?: string) => void;
@@ -92,6 +97,11 @@ describe('Lens App', () => {
           },
         },
       },
+      data: {
+        query: {
+          filterManager: createMockFilterManager(),
+        },
+      },
       dataShim: {
         indexPatterns: {
           indexPatterns: {
@@ -101,11 +111,8 @@ describe('Lens App', () => {
           },
         },
         timefilter: { history: {} },
-        filter: {
-          filterManager: createMockFilterManager(),
-        },
       },
-      store: {
+      storage: {
         get: jest.fn(),
       },
       docStorage: {
@@ -118,7 +125,7 @@ describe('Lens App', () => {
       data: typeof dataStartMock;
       core: typeof core;
       dataShim: DataStart;
-      store: Storage;
+      storage: Storage;
       docId?: string;
       docStorage: SavedObjectStore;
       redirectTo: (id?: string) => void;
@@ -127,7 +134,7 @@ describe('Lens App', () => {
 
   beforeEach(() => {
     frame = createMockFrame();
-    core = coreMock.createStart();
+    core = coreMock.createStart({ basePath: '/testbasepath' });
 
     core.uiSettings.get.mockImplementation(
       jest.fn(type => {
@@ -140,9 +147,6 @@ describe('Lens App', () => {
         }
       })
     );
-
-    (core.http.basePath.get as jest.Mock).mockReturnValue(`/testbasepath`);
-    (core.http.basePath.prepend as jest.Mock).mockImplementation(s => `/testbasepath${s}`);
   });
 
   it('renders the editor frame', () => {
@@ -494,6 +498,8 @@ describe('Lens App', () => {
       expect(TopNavMenu).toHaveBeenCalledWith(
         expect.objectContaining({
           query: { query: '', language: 'kuery' },
+          dateRangeFrom: 'now-7d',
+          dateRangeTo: 'now',
         }),
         {}
       );
@@ -568,6 +574,8 @@ describe('Lens App', () => {
       expect(TopNavMenu).toHaveBeenCalledWith(
         expect.objectContaining({
           query: { query: 'new', language: 'lucene' },
+          dateRangeFrom: 'now-14d',
+          dateRangeTo: 'now-7d',
         }),
         {}
       );
@@ -586,8 +594,8 @@ describe('Lens App', () => {
 
       const instance = mount(<App {...args} />);
 
-      args.dataShim.filter.filterManager.setFilters([
-        buildExistsFilter({ name: 'myfield' }, { id: 'index1' }),
+      args.data.query.filterManager.setFilters([
+        esFilters.buildExistsFilter({ name: 'myfield' }, { id: 'index1' }),
       ]);
 
       instance.update();
@@ -595,7 +603,7 @@ describe('Lens App', () => {
       expect(frame.mount).toHaveBeenCalledWith(
         expect.any(Element),
         expect.objectContaining({
-          filters: [buildExistsFilter({ name: 'myfield' }, { id: 'index1' })],
+          filters: [esFilters.buildExistsFilter({ name: 'myfield' }, { id: 'index1' })],
         })
       );
     });
@@ -717,8 +725,8 @@ describe('Lens App', () => {
         query: { query: 'new', language: 'lucene' },
       });
 
-      args.dataShim.filter.filterManager.setFilters([
-        buildExistsFilter({ name: 'myfield' }, { id: 'index1' }),
+      args.data.query.filterManager.setFilters([
+        esFilters.buildExistsFilter({ name: 'myfield' }, { id: 'index1' }),
       ]);
       instance.update();
 
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
index 1152a3de771811..2815ac9ddda4e5 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
@@ -8,7 +8,6 @@ import _ from 'lodash';
 import React, { useState, useEffect, useCallback } from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { Storage } from 'ui/storage';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
 import { CoreStart, NotificationsStart } from 'src/core/public';
@@ -19,13 +18,14 @@ import {
   SavedQuery,
   Query,
 } from 'src/legacy/core_plugins/data/public';
-import { Filter } from '@kbn/es-query';
-import { TopNavMenu } from '../../../../../../src/legacy/core_plugins/kibana_react/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { start as navigation } from '../../../../../../src/legacy/core_plugins/navigation/public/legacy';
 import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { Document, SavedObjectStore } from '../persistence';
 import { EditorFrameInstance } from '../types';
 import { NativeRenderer } from '../native_renderer';
 import { trackUiEvent } from '../lens_ui_telemetry';
+import { esFilters } from '../../../../../../src/plugins/data/public';
 
 interface State {
   isLoading: boolean;
@@ -40,7 +40,7 @@ interface State {
     toDate: string;
   };
   query: Query;
-  filters: Filter[];
+  filters: esFilters.Filter[];
   savedQuery?: SavedQuery;
 }
 
@@ -49,7 +49,7 @@ export function App({
   data,
   dataShim,
   core,
-  store,
+  storage,
   docId,
   docStorage,
   redirectTo,
@@ -58,14 +58,14 @@ export function App({
   data: DataPublicPluginStart;
   core: CoreStart;
   dataShim: DataStart;
-  store: Storage;
+  storage: IStorageWrapper;
   docId?: string;
   docStorage: SavedObjectStore;
   redirectTo: (id?: string) => void;
 }) {
   const timeDefaults = core.uiSettings.get('timepicker:timeDefaults');
   const language =
-    store.get('kibana.userQueryLanguage') || core.uiSettings.get('search:queryLanguage');
+    storage.get('kibana.userQueryLanguage') || core.uiSettings.get('search:queryLanguage');
 
   const [state, setState] = useState<State>({
     isLoading: !!docId,
@@ -82,10 +82,9 @@ export function App({
   const { lastKnownDoc } = state;
 
   useEffect(() => {
-    const subscription = dataShim.filter.filterManager.getUpdates$().subscribe({
+    const subscription = data.query.filterManager.getUpdates$().subscribe({
       next: () => {
-        setState(s => ({ ...s, filters: dataShim.filter.filterManager.getFilters() }));
-
+        setState(s => ({ ...s, filters: data.query.filterManager.getFilters() }));
         trackUiEvent('app_filters_updated');
       },
     });
@@ -163,13 +162,15 @@ export function App({
     []
   );
 
+  const { TopNavMenu } = navigation.ui;
+
   return (
     <I18nProvider>
       <KibanaContextProvider
         services={{
           appName: 'lens',
           data,
-          store,
+          storage,
           ...core,
         }}
       >
@@ -225,9 +226,7 @@ export function App({
                 setState(s => ({ ...s, savedQuery }));
               }}
               onSavedQueryUpdated={savedQuery => {
-                dataShim.filter.filterManager.setFilters(
-                  savedQuery.attributes.filters || state.filters
-                );
+                data.query.filterManager.setFilters(savedQuery.attributes.filters || state.filters);
                 setState(s => ({
                   ...s,
                   savedQuery: { ...savedQuery }, // Shallow query for reference issues
@@ -240,7 +239,7 @@ export function App({
                 }));
               }}
               onClearSavedQuery={() => {
-                dataShim.filter.filterManager.removeAll();
+                data.query.filterManager.removeAll();
                 setState(s => ({
                   ...s,
                   savedQuery: undefined,
@@ -248,12 +247,14 @@ export function App({
                   query: {
                     query: '',
                     language:
-                      store.get('kibana.userQueryLanguage') ||
+                      storage.get('kibana.userQueryLanguage') ||
                       core.uiSettings.get('search:queryLanguage'),
                   },
                 }));
               }}
               query={state.query}
+              dateRangeFrom={state.dateRange.fromDate}
+              dateRangeTo={state.dateRange.toDate}
             />
           </div>
 
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
index 1f8779bb68b819..56c19ea2bb9f26 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
@@ -8,12 +8,12 @@ import React from 'react';
 import { I18nProvider, FormattedMessage } from '@kbn/i18n/react';
 import { HashRouter, Switch, Route, RouteComponentProps } from 'react-router-dom';
 import chrome from 'ui/chrome';
-import { Storage } from 'ui/storage';
 import { CoreSetup, CoreStart } from 'src/core/public';
 import { npSetup, npStart } from 'ui/new_platform';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { DataStart } from '../../../../../../src/legacy/core_plugins/data/public';
 import { start as dataShimStart } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { editorFrameSetup, editorFrameStart, editorFrameStop } from '../editor_frame_plugin';
 import { indexPatternDatasourceSetup, indexPatternDatasourceStop } from '../indexpattern_plugin';
 import { SavedObjectIndexStore } from '../persistence';
@@ -72,7 +72,6 @@ export class AppPlugin {
     setReportManager(
       new LensReportManager({
         storage: new Storage(localStorage),
-        basePath: core.http.basePath.get(),
         http: core.http,
       })
     );
@@ -85,7 +84,7 @@ export class AppPlugin {
           data={data}
           dataShim={dataShim}
           editorFrame={this.instance!}
-          store={new Storage(localStorage)}
+          storage={new Storage(localStorage)}
           docId={routeProps.match.params.id}
           docStorage={store}
           redirectTo={id => {
diff --git a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/expression.tsx b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/expression.tsx
index 23b49ecc168cc3..30c955d45289be 100644
--- a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/expression.tsx
+++ b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/expression.tsx
@@ -8,10 +8,13 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { EuiBasicTable } from '@elastic/eui';
-import { ExpressionFunction } from '../../../../../../src/plugins/expressions/common';
+import { ExpressionFunction } from '../../../../../../src/plugins/expressions/public';
 import { KibanaDatatable } from '../../../../../../src/legacy/core_plugins/interpreter/public';
 import { LensMultiTable } from '../types';
-import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/expressions/public';
+import {
+  IInterpreterRenderFunction,
+  IInterpreterRenderHandlers,
+} from '../../../../../../src/legacy/core_plugins/expressions/public';
 import { FormatFactory } from '../../../../../../src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities';
 import { VisualizationContainer } from '../visualization_container';
 
@@ -113,8 +116,19 @@ export const getDatatableRenderer = (
   help: '',
   validate: () => {},
   reuseDomNode: true,
-  render: async (domNode: Element, config: DatatableProps, _handlers: unknown) => {
-    ReactDOM.render(<DatatableComponent {...config} formatFactory={formatFactory} />, domNode);
+  render: async (
+    domNode: Element,
+    config: DatatableProps,
+    handlers: IInterpreterRenderHandlers
+  ) => {
+    ReactDOM.render(
+      <DatatableComponent {...config} formatFactory={formatFactory} />,
+      domNode,
+      () => {
+        handlers.done();
+      }
+    );
+    handlers.onDestroy(() => ReactDOM.unmountComponentAtNode(domNode));
   },
 });
 
diff --git a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.test.tsx b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.test.tsx
index 083ceff3bb4444..25d88fbae5b341 100644
--- a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.test.tsx
@@ -12,7 +12,7 @@ import {
   DataTableLayer,
 } from './visualization';
 import { mount } from 'enzyme';
-import { Operation, DataType, FramePublicAPI } from '../types';
+import { Operation, DataType, FramePublicAPI, TableSuggestionColumn } from '../types';
 import { generateId } from '../id_generator';
 
 jest.mock('../id_generator');
@@ -72,6 +72,112 @@ describe('Datatable Visualization', () => {
     });
   });
 
+  describe('#getSuggestions', () => {
+    function numCol(columnId: string): TableSuggestionColumn {
+      return {
+        columnId,
+        operation: {
+          dataType: 'number',
+          label: `Avg ${columnId}`,
+          isBucketed: false,
+        },
+      };
+    }
+
+    function strCol(columnId: string): TableSuggestionColumn {
+      return {
+        columnId,
+        operation: {
+          dataType: 'string',
+          label: `Top 5 ${columnId}`,
+          isBucketed: true,
+        },
+      };
+    }
+
+    it('should accept a single-layer suggestion', () => {
+      const suggestions = datatableVisualization.getSuggestions({
+        state: {
+          layers: [{ layerId: 'first', columns: ['col1'] }],
+        },
+        table: {
+          isMultiRow: true,
+          layerId: 'first',
+          changeType: 'initial',
+          columns: [numCol('col1'), strCol('col2')],
+        },
+        keptLayerIds: [],
+      });
+
+      expect(suggestions.length).toBeGreaterThan(0);
+    });
+
+    it('should not make suggestions when the table is unchanged', () => {
+      const suggestions = datatableVisualization.getSuggestions({
+        state: {
+          layers: [{ layerId: 'first', columns: ['col1'] }],
+        },
+        table: {
+          isMultiRow: true,
+          layerId: 'first',
+          changeType: 'unchanged',
+          columns: [numCol('col1')],
+        },
+        keptLayerIds: ['first'],
+      });
+
+      expect(suggestions).toEqual([]);
+    });
+
+    it('should not make suggestions when multiple layers are involved', () => {
+      const suggestions = datatableVisualization.getSuggestions({
+        state: {
+          layers: [{ layerId: 'first', columns: ['col1'] }],
+        },
+        table: {
+          isMultiRow: true,
+          layerId: 'first',
+          changeType: 'unchanged',
+          columns: [numCol('col1')],
+        },
+        keptLayerIds: ['first', 'second'],
+      });
+
+      expect(suggestions).toEqual([]);
+    });
+
+    it('should not make suggestions when the suggestion keeps a different layer', () => {
+      const suggestions = datatableVisualization.getSuggestions({
+        state: {
+          layers: [{ layerId: 'older', columns: ['col1'] }],
+        },
+        table: {
+          isMultiRow: true,
+          layerId: 'newer',
+          changeType: 'initial',
+          columns: [numCol('col1'), strCol('col2')],
+        },
+        keptLayerIds: ['older'],
+      });
+
+      expect(suggestions).toEqual([]);
+    });
+
+    it('should suggest unchanged tables when the state is not passed in', () => {
+      const suggestions = datatableVisualization.getSuggestions({
+        table: {
+          isMultiRow: true,
+          layerId: 'first',
+          changeType: 'unchanged',
+          columns: [numCol('col1')],
+        },
+        keptLayerIds: ['first'],
+      });
+
+      expect(suggestions.length).toBeGreaterThan(0);
+    });
+  });
+
   describe('DataTableLayer', () => {
     it('allows all kinds of operations', () => {
       const setState = jest.fn();
diff --git a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.tsx b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.tsx
index 65f97b6d4e4b53..f9a7ec419a9b9a 100644
--- a/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.tsx
+++ b/x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.tsx
@@ -134,10 +134,15 @@ export const datatableVisualization: Visualization<
   getSuggestions({
     table,
     state,
+    keptLayerIds,
   }: SuggestionRequest<DatatableVisualizationState>): Array<
     VisualizationSuggestion<DatatableVisualizationState>
   > {
-    if (state && table.changeType === 'unchanged') {
+    if (
+      keptLayerIds.length > 1 ||
+      (keptLayerIds.length && table.layerId !== keptLayerIds[0]) ||
+      (state && table.changeType === 'unchanged')
+    ) {
       return [];
     }
     const title =
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_expression_renderer.scss b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_expression_renderer.scss
index 5d181b9c06da8d..8f8dc2323b0b76 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_expression_renderer.scss
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_expression_renderer.scss
@@ -1,11 +1,12 @@
 .lnsExpressionRenderer {
+  position: relative;
   width: 100%;
   height: 100%;
   display: flex;
   overflow-x: hidden;
   padding: $euiSize;
-}
 
-.lnsExpressionRenderer > * {
-  flex: 1;
+  > .expExpressionRenderer {
+    position: static; // Let the progress indicator position itself against the outer parent
+  }
 }
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_suggestion_panel.scss b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_suggestion_panel.scss
index 0e89bbe2da9688..cb4ca425afc84c 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_suggestion_panel.scss
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_suggestion_panel.scss
@@ -16,6 +16,7 @@
 }
 
 .lnsSuggestionPanel__button {
+  position: relative; // Let the expression progress indicator position itself against the button
   flex: 0 0 auto;
   width: $lnsSuggestionWidth !important; // sass-lint:disable-line no-important
   height: $lnsSuggestionHeight;
@@ -45,16 +46,22 @@
 
 .lnsSuggestionPanel__chartWrapper {
   display: flex;
-  height: $lnsSuggestionHeight - $euiSize;
+  height: 100%;
+  width: 100%;
   pointer-events: none;
-  margin: 0 $euiSizeS;
+  padding: $euiSizeS;
+
+  > .expExpressionRenderer {
+    position: static; // Let the progress indicator position itself against the button
+  }
 }
 
 .lnsSuggestionPanel__chartWrapper--withLabel {
-  height: $lnsSuggestionHeight - $euiSizeL;
+  height: calc(100% - #{$euiSizeL});
 }
 
 .lnsSuggestionPanel__buttonLabel {
+  @include euiTextTruncate;
   @include euiFontSizeXS;
   display: block;
   font-weight: $euiFontWeightBold;
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_workspace_panel_wrapper.scss b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_workspace_panel_wrapper.scss
index 7811df93ba8ceb..3ef387eca1e8b1 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_workspace_panel_wrapper.scss
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/_workspace_panel_wrapper.scss
@@ -22,6 +22,7 @@
     align-items: stretch;
     justify-content: stretch;
     overflow: auto;
+    position: relative;
 
     > * {
       flex: 1 1 100%;
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.test.tsx
index 298b25b5090c46..1b60098fd45ad1 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.test.tsx
@@ -94,6 +94,7 @@ describe('chart_switch', () => {
           layerId: 'a',
           changeType: 'unchanged',
         },
+        keptLayerIds: ['a'],
       },
     ]);
     return {
@@ -180,6 +181,8 @@ describe('chart_switch', () => {
 
     switchTo('subvisB', component);
 
+    expect(frame.removeLayers).toHaveBeenCalledWith(['a']);
+
     expect(dispatch).toHaveBeenCalledWith({
       initialState: 'visB initial state',
       newVisualizationId: 'visB',
@@ -219,6 +222,7 @@ describe('chart_switch', () => {
           isMultiRow: true,
           changeType: 'unchanged',
         },
+        keptLayerIds: [],
       },
     ]);
     datasourceMap.testDatasource.publicAPIMock.getTableSpec.mockReturnValue([
@@ -307,11 +311,7 @@ describe('chart_switch', () => {
 
   it('should not indicate data loss if visualization is not changed', () => {
     const dispatch = jest.fn();
-    const removeLayers = jest.fn();
-    const frame = {
-      ...mockFrame(['a', 'b', 'c']),
-      removeLayers,
-    };
+    const frame = mockFrame(['a', 'b', 'c']);
     const visualizations = mockVisualizations();
     const switchVisualizationType = jest.fn(() => 'therebedragons');
 
@@ -332,30 +332,6 @@ describe('chart_switch', () => {
     expect(getMenuItem('subvisC2', component).prop('betaBadgeIconType')).toBeUndefined();
   });
 
-  it('should remove unused layers', () => {
-    const removeLayers = jest.fn();
-    const frame = {
-      ...mockFrame(['a', 'b', 'c']),
-      removeLayers,
-    };
-    const component = mount(
-      <ChartSwitch
-        visualizationId="visA"
-        visualizationState={{}}
-        visualizationMap={mockVisualizations()}
-        dispatch={jest.fn()}
-        framePublicAPI={frame}
-        datasourceMap={mockDatasourceMap()}
-        datasourceStates={mockDatasourceStates()}
-      />
-    );
-
-    switchTo('subvisB', component);
-
-    expect(removeLayers).toHaveBeenCalledTimes(1);
-    expect(removeLayers).toHaveBeenCalledWith(['b', 'c']);
-  });
-
   it('should remove all layers if there is no suggestion', () => {
     const dispatch = jest.fn();
     const visualizations = mockVisualizations();
@@ -378,15 +354,24 @@ describe('chart_switch', () => {
 
     expect(frame.removeLayers).toHaveBeenCalledTimes(1);
     expect(frame.removeLayers).toHaveBeenCalledWith(['a', 'b', 'c']);
+
+    expect(visualizations.visB.getSuggestions).toHaveBeenCalledWith(
+      expect.objectContaining({
+        keptLayerIds: ['a'],
+      })
+    );
+
+    expect(dispatch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: 'SWITCH_VISUALIZATION',
+        initialState: 'visB initial state',
+      })
+    );
   });
 
-  it('should not remove layers if the visualization is not changing', () => {
+  it('should not remove layers when switching between subtypes', () => {
     const dispatch = jest.fn();
-    const removeLayers = jest.fn();
-    const frame = {
-      ...mockFrame(['a', 'b', 'c']),
-      removeLayers,
-    };
+    const frame = mockFrame(['a', 'b', 'c']);
     const visualizations = mockVisualizations();
     const switchVisualizationType = jest.fn(() => 'therebedragons');
 
@@ -405,7 +390,6 @@ describe('chart_switch', () => {
     );
 
     switchTo('subvisC2', component);
-    expect(removeLayers).not.toHaveBeenCalled();
     expect(switchVisualizationType).toHaveBeenCalledWith('subvisC2', 'therebegriffins');
     expect(dispatch).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -413,6 +397,7 @@ describe('chart_switch', () => {
         initialState: 'therebedragons',
       })
     );
+    expect(frame.removeLayers).not.toHaveBeenCalled();
   });
 
   it('should switch to the updated datasource state', () => {
@@ -447,6 +432,7 @@ describe('chart_switch', () => {
           isMultiRow: true,
           changeType: 'unchanged',
         },
+        keptLayerIds: [],
       },
     ]);
 
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.tsx
index 26db1224eb3520..dca6b3e7616d67 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/chart_switch.tsx
@@ -28,6 +28,7 @@ interface VisualizationSelection {
   dataLoss: 'nothing' | 'layers' | 'everything' | 'columns';
   datasourceId?: string;
   datasourceState?: unknown;
+  sameDatasources?: boolean;
 }
 
 interface Props {
@@ -52,8 +53,8 @@ function VisualizationSummary(props: Props) {
   if (!visualization) {
     return (
       <>
-        {i18n.translate('xpack.lens.configPanel.chooseVisualization', {
-          defaultMessage: 'Choose a visualization',
+        {i18n.translate('xpack.lens.configPanel.selectVisualization', {
+          defaultMessage: 'Select a visualization',
         })}
       </>
     );
@@ -88,6 +89,13 @@ export function ChartSwitch(props: Props) {
       },
       'SWITCH_VISUALIZATION'
     );
+
+    if (
+      (!selection.datasourceId && !selection.sameDatasources) ||
+      selection.dataLoss === 'everything'
+    ) {
+      props.framePublicAPI.removeLayers(Object.keys(props.framePublicAPI.datasourceLayers));
+    }
   };
 
   function getSelection(
@@ -105,6 +113,7 @@ export function ChartSwitch(props: Props) {
         dataLoss: 'nothing',
         keptLayerIds: Object.keys(props.framePublicAPI.datasourceLayers),
         getVisualizationState: () => switchVisType(subVisualizationId, props.visualizationState),
+        sameDatasources: true,
       };
     }
 
@@ -201,8 +210,8 @@ export function ChartSwitch(props: Props) {
       anchorPosition="downLeft"
     >
       <EuiPopoverTitle>
-        {i18n.translate('xpack.lens.configPanel.chooseVisualization', {
-          defaultMessage: 'Choose a visualization',
+        {i18n.translate('xpack.lens.configPanel.selectVisualization', {
+          defaultMessage: 'Select a visualization',
         })}
       </EuiPopoverTitle>
       <EuiKeyPadMenu>
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/data_panel_wrapper.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/data_panel_wrapper.tsx
index 115e8cbf002c3b..a5509cdc945595 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/data_panel_wrapper.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/data_panel_wrapper.tsx
@@ -6,7 +6,6 @@
 
 import React, { useMemo, memo, useContext, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { Filter } from '@kbn/es-query';
 import { EuiPopover, EuiButtonIcon, EuiContextMenuPanel, EuiContextMenuItem } from '@elastic/eui';
 import { Query } from 'src/plugins/data/common';
 import { DatasourceDataPanelProps, Datasource } from '../../../public';
@@ -14,6 +13,7 @@ import { NativeRenderer } from '../../native_renderer';
 import { Action } from './state_management';
 import { DragContext } from '../../drag_drop';
 import { StateSetter, FramePublicAPI } from '../../types';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 interface DataPanelWrapperProps {
   datasourceState: unknown;
@@ -24,7 +24,7 @@ interface DataPanelWrapperProps {
   core: DatasourceDataPanelProps['core'];
   query: Query;
   dateRange: FramePublicAPI['dateRange'];
-  filters: Filter[];
+  filters: esFilters.Filter[];
 }
 
 export const DataPanelWrapper = memo((props: DataPanelWrapperProps) => {
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx
index fb3f8774be92a8..1e8f50f4ddb1f7 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx
@@ -35,6 +35,7 @@ function generateSuggestion(state = {}): DatasourceSuggestion {
       layerId: 'first',
       changeType: 'unchanged',
     },
+    keptLayerIds: ['first'],
   };
 }
 
@@ -807,30 +808,38 @@ describe('editor_frame', () => {
       await waitForPromises();
 
       expect(mockDatasource.getPublicAPI).toHaveBeenCalledWith(
-        datasource1State,
-        expect.anything(),
-        'first'
+        expect.objectContaining({
+          state: datasource1State,
+          setState: expect.anything(),
+          layerId: 'first',
+        })
       );
       expect(mockDatasource2.getPublicAPI).toHaveBeenCalledWith(
-        datasource2State,
-        expect.anything(),
-        'second'
+        expect.objectContaining({
+          state: datasource2State,
+          setState: expect.anything(),
+          layerId: 'second',
+        })
       );
       expect(mockDatasource2.getPublicAPI).toHaveBeenCalledWith(
-        datasource2State,
-        expect.anything(),
-        'third'
+        expect.objectContaining({
+          state: datasource2State,
+          setState: expect.anything(),
+          layerId: 'third',
+        })
       );
     });
 
     it('should give access to the datasource state in the datasource factory function', async () => {
       const datasourceState = {};
+      const dateRange = { fromDate: 'now-1w', toDate: 'now' };
       mockDatasource.initialize.mockResolvedValue(datasourceState);
       mockDatasource.getLayers.mockReturnValue(['first']);
 
       mount(
         <EditorFrame
           {...getDefaultProps()}
+          dateRange={dateRange}
           visualizationMap={{
             testVis: mockVisualization,
           }}
@@ -845,11 +854,12 @@ describe('editor_frame', () => {
 
       await waitForPromises();
 
-      expect(mockDatasource.getPublicAPI).toHaveBeenCalledWith(
-        datasourceState,
-        expect.any(Function),
-        'first'
-      );
+      expect(mockDatasource.getPublicAPI).toHaveBeenCalledWith({
+        dateRange,
+        state: datasourceState,
+        setState: expect.any(Function),
+        layerId: 'first',
+      });
     });
 
     it('should re-create the public api after state has been set', async () => {
@@ -872,15 +882,17 @@ describe('editor_frame', () => {
       await waitForPromises();
 
       const updatedState = {};
-      const setDatasourceState = mockDatasource.getPublicAPI.mock.calls[0][1];
+      const setDatasourceState = mockDatasource.getPublicAPI.mock.calls[0][0].setState;
       act(() => {
         setDatasourceState(updatedState);
       });
 
       expect(mockDatasource.getPublicAPI).toHaveBeenLastCalledWith(
-        updatedState,
-        expect.any(Function),
-        'first'
+        expect.objectContaining({
+          state: updatedState,
+          setState: expect.any(Function),
+          layerId: 'first',
+        })
       );
     });
   });
@@ -917,6 +929,7 @@ describe('editor_frame', () => {
             layerId: 'first',
             changeType: 'unchanged',
           },
+          keptLayerIds: [],
         },
       ]);
 
@@ -1062,6 +1075,7 @@ describe('editor_frame', () => {
             isMultiRow: true,
             layerId: 'first',
           },
+          keptLayerIds: [],
         },
       ]);
       mount(
@@ -1509,7 +1523,7 @@ describe('editor_frame', () => {
             query: { query: '', language: 'lucene' },
             filters: [],
           },
-          title: 'New visualization',
+          title: '',
           type: 'lens',
           visualizationType: 'testVis',
         },
@@ -1528,7 +1542,7 @@ describe('editor_frame', () => {
             query: { query: '', language: 'lucene' },
             filters: [],
           },
-          title: 'New visualization',
+          title: '',
           type: 'lens',
           visualizationType: 'testVis',
         },
@@ -1585,7 +1599,7 @@ describe('editor_frame', () => {
             query: { query: 'new query', language: 'lucene' },
             filters: [],
           },
-          title: 'New visualization',
+          title: '',
           type: 'lens',
           visualizationType: 'testVis',
         },
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx
index 04c0b22c378d72..6d782d119525dc 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx
@@ -6,7 +6,6 @@
 
 import React, { useEffect, useReducer } from 'react';
 import { CoreSetup, CoreStart } from 'src/core/public';
-import { Filter } from '@kbn/es-query';
 import { Query, SavedQuery } from '../../../../../../../src/legacy/core_plugins/data/public';
 import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
 import {
@@ -26,6 +25,7 @@ import { Document } from '../../persistence/saved_object_store';
 import { getSavedObjectFormat } from './save';
 import { WorkspacePanelWrapper } from './workspace_panel_wrapper';
 import { generateId } from '../../id_generator';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 export interface EditorFrameProps {
   doc?: Document;
@@ -41,7 +41,7 @@ export interface EditorFrameProps {
     toDate: string;
   };
   query: Query;
-  filters: Filter[];
+  filters: esFilters.Filter[];
   savedQuery?: SavedQuery;
   onChange: (arg: {
     filterableIndexPatterns: DatasourceMetaData['filterableIndexPatterns'];
@@ -89,9 +89,9 @@ export function EditorFrame(props: EditorFrameProps) {
 
       const layers = datasource.getLayers(datasourceState);
       layers.forEach(layer => {
-        const publicAPI = props.datasourceMap[id].getPublicAPI(
-          datasourceState,
-          (newState: unknown) => {
+        const publicAPI = props.datasourceMap[id].getPublicAPI({
+          state: datasourceState,
+          setState: (newState: unknown) => {
             dispatch({
               type: 'UPDATE_DATASOURCE_STATE',
               datasourceId: id,
@@ -99,8 +99,9 @@ export function EditorFrame(props: EditorFrameProps) {
               clearStagedPreview: true,
             });
           },
-          layer
-        );
+          layerId: layer,
+          dateRange: props.dateRange,
+        });
 
         datasourceLayers[layer] = publicAPI;
       });
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/expression_helpers.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/expression_helpers.ts
index 1ddfc54cc187b1..f03b64295641bd 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/expression_helpers.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/expression_helpers.ts
@@ -6,9 +6,9 @@
 
 import { TimeRange } from 'src/plugins/data/public';
 import { Query } from 'src/legacy/core_plugins/data/public';
-import { Filter } from '@kbn/es-query';
 import { Ast, fromExpression, ExpressionFunctionAST } from '@kbn/interpreter/common';
 import { Visualization, Datasource, FramePublicAPI } from '../../types';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 export function prependDatasourceExpression(
   visualizationExpression: Ast | string | null,
@@ -71,7 +71,7 @@ export function prependKibanaContext(
   }: {
     timeRange?: TimeRange;
     query?: Query;
-    filters?: Filter[];
+    filters?: esFilters.Filter[];
   }
 ): Ast {
   const parsedExpression = typeof expression === 'string' ? fromExpression(expression) : expression;
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/save.test.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/save.test.ts
index ef8194aa6f924b..f223a9c06a2a75 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/save.test.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/save.test.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { buildExistsFilter } from '@kbn/es-query';
 import { getSavedObjectFormat, Props } from './save';
 import { createMockDatasource, createMockVisualization } from '../mocks';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 describe('save editor frame state', () => {
   const mockVisualization = createMockVisualization();
@@ -37,7 +37,7 @@ describe('save editor frame state', () => {
       },
       query: { query: '', language: 'lucene' },
       dateRange: { fromDate: 'now-7d', toDate: 'now' },
-      filters: [buildExistsFilter({ name: '@timestamp' }, { id: 'indexpattern' })],
+      filters: [esFilters.buildExistsFilter({ name: '@timestamp' }, { id: 'indexpattern' })],
     },
   };
 
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts
index 5104ace7c79a30..78a9a13f48d6aa 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/state_management.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { i18n } from '@kbn/i18n';
 import { EditorFrameProps } from '../editor_frame';
 import { Document } from '../../persistence/saved_object_store';
 
@@ -113,7 +112,7 @@ export const getInitialState = (props: EditorFrameProps): EditorFrameState => {
   }
 
   return {
-    title: i18n.translate('xpack.lens.chartTitle', { defaultMessage: 'New visualization' }),
+    title: '',
     datasourceStates,
     activeDatasourceId: getInitialDatasourceId(props),
     visualization: {
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.test.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.test.ts
index 7b3e4454a5e39e..487a91c22b5d53 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.test.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.test.ts
@@ -16,6 +16,7 @@ const generateSuggestion = (state = {}, layerId: string = 'first'): DatasourceSu
     layerId,
     changeType: 'unchanged',
   },
+  keptLayerIds: [layerId],
 });
 
 let datasourceMap: Record<string, DatasourceMock>;
@@ -235,8 +236,8 @@ describe('suggestion helpers', () => {
       changeType: 'unchanged',
     };
     datasourceMap.mock.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
-      { state: {}, table: table1 },
-      { state: {}, table: table2 },
+      { state: {}, table: table1, keptLayerIds: ['first'] },
+      { state: {}, table: table2, keptLayerIds: ['first'] },
     ]);
     getSuggestions({
       visualizationMap: {
@@ -343,45 +344,4 @@ describe('suggestion helpers', () => {
       })
     );
   });
-
-  it('should drop other layers only on visualization switch', () => {
-    const mockVisualization1 = createMockVisualization();
-    const mockVisualization2 = createMockVisualization();
-    datasourceMap.mock.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
-      generateSuggestion(),
-    ]);
-    datasourceMap.mock.getLayers.mockReturnValue(['first', 'second']);
-    const suggestions = getSuggestions({
-      visualizationMap: {
-        vis1: {
-          ...mockVisualization1,
-          getSuggestions: () => [
-            {
-              score: 0.8,
-              title: 'Test2',
-              state: {},
-              previewIcon: 'empty',
-            },
-          ],
-        },
-        vis2: {
-          ...mockVisualization2,
-          getSuggestions: () => [
-            {
-              score: 0.6,
-              title: 'Test3',
-              state: {},
-              previewIcon: 'empty',
-            },
-          ],
-        },
-      },
-      activeVisualizationId: 'vis1',
-      visualizationState: {},
-      datasourceMap,
-      datasourceStates,
-    });
-    expect(suggestions[0].keptLayerIds).toEqual(['first', 'second']);
-    expect(suggestions[1].keptLayerIds).toEqual(['first']);
-  });
 });
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.ts
index d3e768a1932dcf..173f64c6292a87 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_helpers.ts
@@ -13,6 +13,7 @@ import {
   FramePublicAPI,
   TableChangeType,
   TableSuggestion,
+  DatasourceSuggestion,
 } from '../../types';
 import { Action } from './state_management';
 
@@ -20,7 +21,6 @@ export interface Suggestion {
   visualizationId: string;
   datasourceState?: unknown;
   datasourceId?: string;
-  keptLayerIds: string[];
   columns: number;
   score: number;
   title: string;
@@ -29,6 +29,7 @@ export interface Suggestion {
   previewIcon: IconType;
   hide?: boolean;
   changeType: TableChangeType;
+  keptLayerIds: string[];
 }
 
 /**
@@ -64,12 +65,6 @@ export function getSuggestions({
     ([datasourceId]) => datasourceStates[datasourceId] && !datasourceStates[datasourceId].isLoading
   );
 
-  const allLayerIds = _.flatten(
-    datasources.map(([datasourceId, datasource]) =>
-      datasource.getLayers(datasourceStates[datasourceId].state)
-    )
-  );
-
   // Collect all table suggestions from available datasources
   const datasourceTableSuggestions = _.flatten(
     datasources.map(([datasourceId, datasource]) => {
@@ -90,17 +85,12 @@ export function getSuggestions({
           const table = datasourceSuggestion.table;
           const currentVisualizationState =
             visualizationId === activeVisualizationId ? visualizationState : undefined;
-          const keptLayerIds =
-            visualizationId !== activeVisualizationId
-              ? [datasourceSuggestion.table.layerId]
-              : allLayerIds;
           return getVisualizationSuggestions(
             visualization,
             table,
             visualizationId,
             datasourceSuggestion,
-            currentVisualizationState,
-            keptLayerIds
+            currentVisualizationState
           );
         })
       )
@@ -118,20 +108,20 @@ function getVisualizationSuggestions(
   visualization: Visualization<unknown, unknown>,
   table: TableSuggestion,
   visualizationId: string,
-  datasourceSuggestion: { datasourceId: string; state: unknown; table: TableSuggestion },
-  currentVisualizationState: unknown,
-  keptLayerIds: string[]
+  datasourceSuggestion: DatasourceSuggestion & { datasourceId: string },
+  currentVisualizationState: unknown
 ) {
   return visualization
     .getSuggestions({
       table,
       state: currentVisualizationState,
+      keptLayerIds: datasourceSuggestion.keptLayerIds,
     })
     .map(({ state, ...visualizationSuggestion }) => ({
       ...visualizationSuggestion,
       visualizationId,
       visualizationState: state,
-      keptLayerIds,
+      keptLayerIds: datasourceSuggestion.keptLayerIds,
       datasourceState: datasourceSuggestion.state,
       datasourceId: datasourceSuggestion.datasourceId,
       columns: table.columns.length,
@@ -144,7 +134,7 @@ export function switchToSuggestion(
   dispatch: (action: Action) => void,
   suggestion: Pick<
     Suggestion,
-    'visualizationId' | 'visualizationState' | 'datasourceState' | 'datasourceId' | 'keptLayerIds'
+    'visualizationId' | 'visualizationState' | 'datasourceState' | 'datasourceId'
   >,
   type: 'SWITCH_VISUALIZATION' | 'SELECT_SUGGESTION' = 'SELECT_SUGGESTION'
 ) {
@@ -156,10 +146,4 @@ export function switchToSuggestion(
     datasourceId: suggestion.datasourceId!,
   };
   dispatch(action);
-  const layerIds = Object.keys(frame.datasourceLayers).filter(id => {
-    return !suggestion.keptLayerIds.includes(id);
-  });
-  if (layerIds.length > 0) {
-    frame.removeLayers(layerIds);
-  }
 }
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.test.tsx
index 8840f7dfd3b785..e32fe5f1f866da 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.test.tsx
@@ -218,36 +218,6 @@ describe('suggestion_panel', () => {
     );
   });
 
-  it('should remove unused layers if suggestion is clicked', () => {
-    defaultProps.frame.datasourceLayers.a = mockDatasource.publicAPIMock;
-    defaultProps.frame.datasourceLayers.b = mockDatasource.publicAPIMock;
-    const wrapper = mount(
-      <SuggestionPanel
-        {...defaultProps}
-        stagedPreview={{ visualization: { state: {}, activeId: 'vis' }, datasourceStates: {} }}
-        activeVisualizationId="vis2"
-      />
-    );
-
-    act(() => {
-      wrapper
-        .find('button[data-test-subj="lnsSuggestion"]')
-        .at(1)
-        .simulate('click');
-    });
-
-    wrapper.update();
-
-    act(() => {
-      wrapper
-        .find('[data-test-subj="lensSubmitSuggestion"]')
-        .first()
-        .simulate('click');
-    });
-
-    expect(defaultProps.frame.removeLayers).toHaveBeenCalledWith(['b']);
-  });
-
   it('should render preview expression if there is one', () => {
     mockDatasource.getLayers.mockReturnValue(['first']);
     (getSuggestions as jest.Mock).mockReturnValue([
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.tsx
index 7d1f400f484e1a..e29ac84486d0be 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.tsx
@@ -63,38 +63,33 @@ const PreviewRenderer = ({
   expression: string;
   ExpressionRendererComponent: ExpressionRenderer;
 }) => {
-  const [expressionError, setExpressionError] = useState<boolean>(false);
-
-  useEffect(() => {
-    setExpressionError(false);
-  }, [expression]);
-
-  return expressionError ? (
-    <div className="lnsSuggestionPanel__suggestionIcon">
-      <EuiIconTip
-        size="xl"
-        color="danger"
-        type="alert"
-        aria-label={i18n.translate('xpack.lens.editorFrame.previewErrorLabel', {
-          defaultMessage: 'Preview rendering failed',
-        })}
-        content={i18n.translate('xpack.lens.editorFrame.previewErrorTooltip', {
-          defaultMessage: 'Preview rendering failed',
-        })}
-      />
-    </div>
-  ) : (
-    <ExpressionRendererComponent
+  return (
+    <div
       className={classNames('lnsSuggestionPanel__chartWrapper', {
         'lnsSuggestionPanel__chartWrapper--withLabel': withLabel,
       })}
-      expression={expression}
-      onRenderFailure={(e: unknown) => {
-        // eslint-disable-next-line no-console
-        console.error(`Failed to render preview: `, e);
-        setExpressionError(true);
-      }}
-    />
+    >
+      <ExpressionRendererComponent
+        expression={expression}
+        renderError={() => {
+          return (
+            <div className="lnsSuggestionPanel__suggestionIcon">
+              <EuiIconTip
+                size="xl"
+                color="danger"
+                type="alert"
+                aria-label={i18n.translate('xpack.lens.editorFrame.previewErrorLabel', {
+                  defaultMessage: 'Preview rendering failed',
+                })}
+                content={i18n.translate('xpack.lens.editorFrame.previewErrorLabel', {
+                  defaultMessage: 'Preview rendering failed',
+                })}
+              />
+            </div>
+          );
+        }}
+      />
+    </div>
   );
 };
 
@@ -259,20 +254,27 @@ export function SuggestionPanel({
         </EuiFlexItem>
         {stagedPreview && (
           <EuiFlexItem grow={false}>
-            <EuiButtonEmpty
-              data-test-subj="lensSubmitSuggestion"
-              size="xs"
-              onClick={() => {
-                trackUiEvent('suggestion_confirmed');
-                dispatch({
-                  type: 'SUBMIT_SUGGESTION',
-                });
-              }}
-            >
-              {i18n.translate('xpack.lens.sugegstion.confirmSuggestionLabel', {
-                defaultMessage: 'Reload suggestions',
+            <EuiToolTip
+              content={i18n.translate('xpack.lens.suggestion.refreshSuggestionTooltip', {
+                defaultMessage: 'Refresh the suggestions based on the selected visualization.',
               })}
-            </EuiButtonEmpty>
+            >
+              <EuiButtonEmpty
+                data-test-subj="lensSubmitSuggestion"
+                size="xs"
+                iconType="refresh"
+                onClick={() => {
+                  trackUiEvent('suggestion_confirmed');
+                  dispatch({
+                    type: 'SUBMIT_SUGGESTION',
+                  });
+                }}
+              >
+                {i18n.translate('xpack.lens.sugegstion.refreshSuggestionLabel', {
+                  defaultMessage: 'Refresh',
+                })}
+              </EuiButtonEmpty>
+            </EuiToolTip>
           </EuiFlexItem>
         )}
       </EuiFlexGroup>
@@ -365,7 +367,12 @@ function getPreviewExpression(
     const changedLayers = datasource.getLayers(visualizableState.datasourceState);
     changedLayers.forEach(layerId => {
       if (updatedLayerApis[layerId]) {
-        updatedLayerApis[layerId] = datasource.getPublicAPI(datasourceState, () => {}, layerId);
+        updatedLayerApis[layerId] = datasource.getPublicAPI({
+          layerId,
+          dateRange: frame.dateRange,
+          state: datasourceState,
+          setState: () => {},
+        });
       }
     });
   }
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.test.tsx
index ddb82565e4b8b4..fd35ecd702d23a 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.test.tsx
@@ -5,8 +5,6 @@
  */
 
 import React from 'react';
-
-import { buildExistsFilter } from '@kbn/es-query';
 import { ExpressionRendererProps } from '../../../../../../../src/legacy/core_plugins/expressions/public';
 import { Visualization, FramePublicAPI, TableSuggestion } from '../../types';
 import {
@@ -22,6 +20,7 @@ import { ReactWrapper } from 'enzyme';
 import { DragDrop, ChildDragDropProvider } from '../../drag_drop';
 import { Ast } from '@kbn/interpreter/common';
 import { coreMock } from 'src/core/public/mocks';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 const waitForPromises = () => new Promise(resolve => setTimeout(resolve));
 
@@ -382,7 +381,7 @@ describe('workspace_panel', () => {
     instance.setProps({
       framePublicAPI: {
         ...framePublicAPI,
-        filters: [buildExistsFilter({ name: 'myfield' }, { id: 'index1' })],
+        filters: [esFilters.buildExistsFilter({ name: 'myfield' }, { id: 'index1' })],
       },
     });
 
@@ -392,190 +391,135 @@ describe('workspace_panel', () => {
     expect(expressionRendererMock).toHaveBeenCalledTimes(2);
   });
 
-  describe('expression failures', () => {
-    it('should show an error message if the expression fails to parse', () => {
-      mockDatasource.toExpression.mockReturnValue('|||');
-      mockDatasource.getLayers.mockReturnValue(['first']);
-      const framePublicAPI = createMockFramePublicAPI();
-      framePublicAPI.datasourceLayers = {
-        first: mockDatasource.publicAPIMock,
-      };
-
-      instance = mount(
-        <InnerWorkspacePanel
-          activeDatasourceId={'mock'}
-          datasourceStates={{
-            mock: {
-              state: {},
-              isLoading: false,
-            },
-          }}
-          datasourceMap={{
-            mock: mockDatasource,
-          }}
-          framePublicAPI={framePublicAPI}
-          activeVisualizationId="vis"
-          visualizationMap={{
-            vis: { ...mockVisualization, toExpression: () => 'vis' },
-          }}
-          visualizationState={{}}
-          dispatch={() => {}}
-          ExpressionRenderer={expressionRendererMock}
-          core={coreMock.createSetup()}
-        />
-      );
-
-      expect(instance.find('[data-test-subj="expression-failure"]').first()).toBeTruthy();
-      expect(instance.find(expressionRendererMock)).toHaveLength(0);
-    });
-
-    it('should show an error message if the expression fails to render', async () => {
-      mockDatasource.toExpression.mockReturnValue('datasource');
-      mockDatasource.getLayers.mockReturnValue(['first']);
-      const framePublicAPI = createMockFramePublicAPI();
-      framePublicAPI.datasourceLayers = {
-        first: mockDatasource.publicAPIMock,
-      };
-      expressionRendererMock = jest.fn(({ onRenderFailure }) => {
-        Promise.resolve().then(() => onRenderFailure!({ type: 'error' }));
-        return <span />;
-      });
-
-      instance = mount(
-        <InnerWorkspacePanel
-          activeDatasourceId={'mock'}
-          datasourceStates={{
-            mock: {
-              state: {},
-              isLoading: false,
-            },
-          }}
-          datasourceMap={{
-            mock: mockDatasource,
-          }}
-          framePublicAPI={framePublicAPI}
-          activeVisualizationId="vis"
-          visualizationMap={{
-            vis: { ...mockVisualization, toExpression: () => 'vis' },
-          }}
-          visualizationState={{}}
-          dispatch={() => {}}
-          ExpressionRenderer={expressionRendererMock}
-          core={coreMock.createSetup()}
-        />
-      );
-
-      // "wait" for the expression to execute
-      await waitForPromises();
+  it('should show an error message if the expression fails to parse', () => {
+    mockDatasource.toExpression.mockReturnValue('|||');
+    mockDatasource.getLayers.mockReturnValue(['first']);
+    const framePublicAPI = createMockFramePublicAPI();
+    framePublicAPI.datasourceLayers = {
+      first: mockDatasource.publicAPIMock,
+    };
 
-      instance.update();
+    instance = mount(
+      <InnerWorkspacePanel
+        activeDatasourceId={'mock'}
+        datasourceStates={{
+          mock: {
+            state: {},
+            isLoading: false,
+          },
+        }}
+        datasourceMap={{
+          mock: mockDatasource,
+        }}
+        framePublicAPI={framePublicAPI}
+        activeVisualizationId="vis"
+        visualizationMap={{
+          vis: { ...mockVisualization, toExpression: () => 'vis' },
+        }}
+        visualizationState={{}}
+        dispatch={() => {}}
+        ExpressionRenderer={expressionRendererMock}
+        core={coreMock.createSetup()}
+      />
+    );
 
-      expect(instance.find('EuiFlexItem[data-test-subj="expression-failure"]')).toHaveLength(1);
-      expect(instance.find(expressionRendererMock)).toHaveLength(0);
-    });
+    expect(instance.find('[data-test-subj="expression-failure"]').first()).toBeTruthy();
+    expect(instance.find(expressionRendererMock)).toHaveLength(0);
+  });
 
-    it('should not attempt to run the expression again if it does not change', async () => {
-      mockDatasource.toExpression.mockReturnValue('datasource');
-      mockDatasource.getLayers.mockReturnValue(['first']);
-      const framePublicAPI = createMockFramePublicAPI();
-      framePublicAPI.datasourceLayers = {
-        first: mockDatasource.publicAPIMock,
-      };
-      expressionRendererMock = jest.fn(({ onRenderFailure }) => {
-        Promise.resolve().then(() => onRenderFailure!({ type: 'error' }));
-        return <span />;
-      });
+  it('should not attempt to run the expression again if it does not change', async () => {
+    mockDatasource.toExpression.mockReturnValue('datasource');
+    mockDatasource.getLayers.mockReturnValue(['first']);
+    const framePublicAPI = createMockFramePublicAPI();
+    framePublicAPI.datasourceLayers = {
+      first: mockDatasource.publicAPIMock,
+    };
 
-      instance = mount(
-        <InnerWorkspacePanel
-          activeDatasourceId={'mock'}
-          datasourceStates={{
-            mock: {
-              state: {},
-              isLoading: false,
-            },
-          }}
-          datasourceMap={{
-            mock: mockDatasource,
-          }}
-          framePublicAPI={framePublicAPI}
-          activeVisualizationId="vis"
-          visualizationMap={{
-            vis: { ...mockVisualization, toExpression: () => 'vis' },
-          }}
-          visualizationState={{}}
-          dispatch={() => {}}
-          ExpressionRenderer={expressionRendererMock}
-          core={coreMock.createSetup()}
-        />
-      );
+    instance = mount(
+      <InnerWorkspacePanel
+        activeDatasourceId={'mock'}
+        datasourceStates={{
+          mock: {
+            state: {},
+            isLoading: false,
+          },
+        }}
+        datasourceMap={{
+          mock: mockDatasource,
+        }}
+        framePublicAPI={framePublicAPI}
+        activeVisualizationId="vis"
+        visualizationMap={{
+          vis: { ...mockVisualization, toExpression: () => 'vis' },
+        }}
+        visualizationState={{}}
+        dispatch={() => {}}
+        ExpressionRenderer={expressionRendererMock}
+        core={coreMock.createSetup()}
+      />
+    );
 
-      // "wait" for the expression to execute
-      await waitForPromises();
+    // "wait" for the expression to execute
+    await waitForPromises();
 
-      instance.update();
+    instance.update();
 
-      expect(expressionRendererMock).toHaveBeenCalledTimes(1);
+    expect(expressionRendererMock).toHaveBeenCalledTimes(1);
 
-      instance.update();
+    instance.update();
 
-      expect(expressionRendererMock).toHaveBeenCalledTimes(1);
-    });
+    expect(expressionRendererMock).toHaveBeenCalledTimes(1);
+  });
 
-    it('should attempt to run the expression again if changes after an error', async () => {
-      mockDatasource.toExpression.mockReturnValue('datasource');
-      mockDatasource.getLayers.mockReturnValue(['first']);
-      const framePublicAPI = createMockFramePublicAPI();
-      framePublicAPI.datasourceLayers = {
-        first: mockDatasource.publicAPIMock,
-      };
-      expressionRendererMock = jest.fn(({ onRenderFailure }) => {
-        Promise.resolve().then(() => onRenderFailure!({ type: 'error' }));
-        return <span />;
-      });
+  it('should attempt to run the expression again if it changes', async () => {
+    mockDatasource.toExpression.mockReturnValue('datasource');
+    mockDatasource.getLayers.mockReturnValue(['first']);
+    const framePublicAPI = createMockFramePublicAPI();
+    framePublicAPI.datasourceLayers = {
+      first: mockDatasource.publicAPIMock,
+    };
 
-      instance = mount(
-        <InnerWorkspacePanel
-          activeDatasourceId={'mock'}
-          datasourceStates={{
-            mock: {
-              state: {},
-              isLoading: false,
-            },
-          }}
-          datasourceMap={{
-            mock: mockDatasource,
-          }}
-          framePublicAPI={framePublicAPI}
-          activeVisualizationId="vis"
-          visualizationMap={{
-            vis: { ...mockVisualization, toExpression: () => 'vis' },
-          }}
-          visualizationState={{}}
-          dispatch={() => {}}
-          ExpressionRenderer={expressionRendererMock}
-          core={coreMock.createSetup()}
-        />
-      );
+    instance = mount(
+      <InnerWorkspacePanel
+        activeDatasourceId={'mock'}
+        datasourceStates={{
+          mock: {
+            state: {},
+            isLoading: false,
+          },
+        }}
+        datasourceMap={{
+          mock: mockDatasource,
+        }}
+        framePublicAPI={framePublicAPI}
+        activeVisualizationId="vis"
+        visualizationMap={{
+          vis: { ...mockVisualization, toExpression: () => 'vis' },
+        }}
+        visualizationState={{}}
+        dispatch={() => {}}
+        ExpressionRenderer={expressionRendererMock}
+        core={coreMock.createSetup()}
+      />
+    );
 
-      // "wait" for the expression to execute
-      await waitForPromises();
+    // "wait" for the expression to execute
+    await waitForPromises();
 
-      instance.update();
+    instance.update();
 
-      expect(expressionRendererMock).toHaveBeenCalledTimes(1);
+    expect(expressionRendererMock).toHaveBeenCalledTimes(1);
 
-      expressionRendererMock.mockImplementation(_ => {
-        return <span />;
-      });
+    expressionRendererMock.mockImplementation(_ => {
+      return <span />;
+    });
 
-      instance.setProps({ visualizationState: {} });
-      instance.update();
+    instance.setProps({ visualizationState: {} });
+    instance.update();
 
-      expect(expressionRendererMock).toHaveBeenCalledTimes(2);
+    expect(expressionRendererMock).toHaveBeenCalledTimes(2);
 
-      expect(instance.find(expressionRendererMock)).toHaveLength(1);
-    });
+    expect(instance.find(expressionRendererMock)).toHaveLength(1);
   });
 
   describe('suggestions from dropping in workspace panel', () => {
@@ -629,6 +573,7 @@ describe('workspace_panel', () => {
         {
           state: {},
           table: expectedTable,
+          keptLayerIds: [],
         },
       ]);
       mockVisualization.getSuggestions.mockReturnValueOnce([
@@ -668,6 +613,7 @@ describe('workspace_panel', () => {
             columns: [],
             changeType: 'unchanged',
           },
+          keptLayerIds: [],
         },
       ]);
       mockVisualization.getSuggestions.mockReturnValueOnce([
@@ -694,6 +640,7 @@ describe('workspace_panel', () => {
             columns: [],
             changeType: 'unchanged',
           },
+          keptLayerIds: [],
         },
       ]);
       mockVisualization2.getSuggestions.mockReturnValueOnce([
@@ -720,6 +667,7 @@ describe('workspace_panel', () => {
             columns: [],
             changeType: 'unchanged',
           },
+          keptLayerIds: [],
         },
       ]);
       mockVisualization.getSuggestions.mockReturnValueOnce([
@@ -749,6 +697,7 @@ describe('workspace_panel', () => {
             layerId: '1',
             changeType: 'unchanged',
           },
+          keptLayerIds: [],
         },
         {
           state: {},
@@ -758,6 +707,7 @@ describe('workspace_panel', () => {
             layerId: '1',
             changeType: 'unchanged',
           },
+          keptLayerIds: [],
         },
       ]);
       mockVisualization.getSuggestions.mockReturnValueOnce([
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.tsx
index 1fb1af46f6f0db..d72bf541fd43e3 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.tsx
@@ -8,15 +8,14 @@ import React, { useState, useEffect, useMemo, useContext } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import {
-  EuiCodeBlock,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiIcon,
   EuiImage,
   EuiText,
   EuiBetaBadge,
   EuiButtonEmpty,
 } from '@elastic/eui';
-import { toExpression } from '@kbn/interpreter/common';
 import { CoreStart, CoreSetup } from 'src/core/public';
 import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
 import { Action } from './state_management';
@@ -92,7 +91,10 @@ export function InnerWorkspacePanel({
     return suggestions.find(s => s.visualizationId === activeVisualizationId) || suggestions[0];
   }, [dragDropContext.dragging]);
 
-  const [expressionError, setExpressionError] = useState<unknown>(undefined);
+  const [localState, setLocalState] = useState({
+    expressionBuildError: undefined as string | undefined,
+    expandError: false,
+  });
 
   const activeVisualization = activeVisualizationId
     ? visualizationMap[activeVisualizationId]
@@ -107,7 +109,8 @@ export function InnerWorkspacePanel({
         framePublicAPI,
       });
     } catch (e) {
-      setExpressionError(e.toString());
+      // Most likely an error in the expression provided by a datasource or visualization
+      setLocalState(s => ({ ...s, expressionBuildError: e.toString() }));
     }
   }, [
     activeVisualization,
@@ -178,8 +181,11 @@ export function InnerWorkspacePanel({
   function renderVisualization() {
     useEffect(() => {
       // reset expression error if component attempts to run it again
-      if (expressionError) {
-        setExpressionError(undefined);
+      if (expression && localState.expressionBuildError) {
+        setLocalState(s => ({
+          ...s,
+          expressionBuildError: undefined,
+        }));
       }
     }, [expression]);
 
@@ -187,37 +193,63 @@ export function InnerWorkspacePanel({
       return renderEmptyWorkspace();
     }
 
-    if (expressionError) {
+    if (localState.expressionBuildError) {
       return (
-        <EuiFlexGroup direction="column">
+        <EuiFlexGroup direction="column" alignItems="center">
+          <EuiFlexItem>
+            <EuiIcon type="alert" size="xl" color="danger" />
+          </EuiFlexItem>
           <EuiFlexItem data-test-subj="expression-failure">
-            {/* TODO word this differently because expressions should not be exposed at this level */}
             <FormattedMessage
               id="xpack.lens.editorFrame.expressionFailure"
-              defaultMessage="Expression could not be executed successfully"
+              defaultMessage="An error occurred in the expression"
             />
           </EuiFlexItem>
-          {expression && (
-            <EuiFlexItem>
-              <EuiCodeBlock>{toExpression(expression)}</EuiCodeBlock>
-            </EuiFlexItem>
-          )}
-          <EuiFlexItem>
-            <EuiCodeBlock>{JSON.stringify(expressionError, null, 2)}</EuiCodeBlock>
-          </EuiFlexItem>
+          <EuiFlexItem grow={false}>{localState.expressionBuildError}</EuiFlexItem>
         </EuiFlexGroup>
       );
-    } else {
-      return (
+    }
+
+    return (
+      <div className="lnsExpressionRenderer">
         <ExpressionRendererComponent
-          className="lnsExpressionRenderer"
           expression={expression!}
-          onRenderFailure={(e: unknown) => {
-            setExpressionError(e);
+          renderError={(errorMessage?: string | null) => {
+            return (
+              <EuiFlexGroup direction="column" alignItems="center">
+                <EuiFlexItem>
+                  <EuiIcon type="alert" size="xl" color="danger" />
+                </EuiFlexItem>
+                <EuiFlexItem data-test-subj="expression-failure">
+                  <FormattedMessage
+                    id="xpack.lens.editorFrame.dataFailure"
+                    defaultMessage="An error occurred when loading data."
+                  />
+                </EuiFlexItem>
+                {errorMessage ? (
+                  <EuiFlexItem className="eui-textBreakAll" grow={false}>
+                    <EuiButtonEmpty
+                      onClick={() => {
+                        setLocalState(prevState => ({
+                          ...prevState,
+                          expandError: !prevState.expandError,
+                        }));
+                      }}
+                    >
+                      {i18n.translate('xpack.lens.editorFrame.expandRenderingErrorButton', {
+                        defaultMessage: 'Show details of error',
+                      })}
+                    </EuiButtonEmpty>
+
+                    {localState.expandError ? errorMessage : null}
+                  </EuiFlexItem>
+                ) : null}
+              </EuiFlexGroup>
+            );
           }}
         />
-      );
-    }
+      </div>
+    );
   }
 
   return (
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel_wrapper.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel_wrapper.tsx
index 18d5feac4edbec..cc91510146f35f 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel_wrapper.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel_wrapper.tsx
@@ -15,9 +15,11 @@ interface Props {
 export function WorkspacePanelWrapper({ children, title }: Props) {
   return (
     <EuiPageContent className="lnsWorkspacePanelWrapper">
-      <EuiPageContentHeader className="lnsWorkspacePanelWrapper__pageContentHeader">
-        <span data-test-subj="lns_ChartTitle">{title}</span>
-      </EuiPageContentHeader>
+      {title && (
+        <EuiPageContentHeader className="lnsWorkspacePanelWrapper__pageContentHeader">
+          <span data-test-subj="lns_ChartTitle">{title}</span>
+        </EuiPageContentHeader>
+      )}
       <EuiPageContentBody className="lnsWorkspacePanelWrapper__pageContentBody">
         {children}
       </EuiPageContentBody>
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.test.tsx
index 96624764bb8ca0..95d39409c57de3 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.test.tsx
@@ -5,12 +5,10 @@
  */
 
 import { Embeddable } from './embeddable';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange, esFilters } from 'src/plugins/data/public';
 import { Query } from 'src/legacy/core_plugins/data/public';
 import { ExpressionRendererProps } from 'src/legacy/core_plugins/expressions/public';
-import { Filter } from '@kbn/es-query';
 import { Document } from '../../persistence';
-import { act } from 'react-dom/test-utils';
 
 jest.mock('../../../../../../../src/legacy/ui/public/inspector', () => ({
   isAvailable: false,
@@ -61,29 +59,12 @@ describe('embeddable', () => {
     expect(expressionRenderer.mock.calls[0][0]!.expression).toEqual(savedVis.expression);
   });
 
-  it('should display error if expression renderering fails', () => {
-    const embeddable = new Embeddable(
-      expressionRenderer,
-      {
-        editUrl: '',
-        editable: true,
-        savedVis,
-      },
-      { id: '123' }
-    );
-    embeddable.render(mountpoint);
-
-    act(() => {
-      expressionRenderer.mock.calls[0][0]!.onRenderFailure!({ type: 'error' });
-    });
-
-    expect(mountpoint.innerHTML).toContain("Visualization couldn't be displayed");
-  });
-
   it('should re-render if new input is pushed', () => {
     const timeRange: TimeRange = { from: 'now-15d', to: 'now' };
     const query: Query = { language: 'kquery', query: '' };
-    const filters: Filter[] = [{ meta: { alias: 'test', negate: false, disabled: false } }];
+    const filters: esFilters.Filter[] = [
+      { meta: { alias: 'test', negate: false, disabled: false } },
+    ];
 
     const embeddable = new Embeddable(
       expressionRenderer,
@@ -108,7 +89,9 @@ describe('embeddable', () => {
   it('should pass context to embeddable', () => {
     const timeRange: TimeRange = { from: 'now-15d', to: 'now' };
     const query: Query = { language: 'kquery', query: '' };
-    const filters: Filter[] = [{ meta: { alias: 'test', negate: false, disabled: false } }];
+    const filters: esFilters.Filter[] = [
+      { meta: { alias: 'test', negate: false, disabled: false } },
+    ];
 
     const embeddable = new Embeddable(
       expressionRenderer,
@@ -132,7 +115,9 @@ describe('embeddable', () => {
   it('should not re-render if only change is in disabled filter', () => {
     const timeRange: TimeRange = { from: 'now-15d', to: 'now' };
     const query: Query = { language: 'kquery', query: '' };
-    const filters: Filter[] = [{ meta: { alias: 'test', negate: false, disabled: true } }];
+    const filters: esFilters.Filter[] = [
+      { meta: { alias: 'test', negate: false, disabled: true } },
+    ];
 
     const embeddable = new Embeddable(
       expressionRenderer,
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.tsx
index e815a1951bdb70..0b5d4909c8e73a 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.tsx
@@ -8,10 +8,9 @@ import _ from 'lodash';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange, esFilters } from 'src/plugins/data/public';
 import { Query, StaticIndexPattern } from 'src/legacy/core_plugins/data/public';
 import { ExpressionRenderer } from 'src/legacy/core_plugins/expressions/public';
-import { Filter } from '@kbn/es-query';
 import { Subscription } from 'rxjs';
 import {
   Embeddable as AbstractEmbeddable,
@@ -32,7 +31,7 @@ export interface LensEmbeddableConfiguration {
 export interface LensEmbeddableInput extends EmbeddableInput {
   timeRange?: TimeRange;
   query?: Query;
-  filters?: Filter[];
+  filters?: esFilters.Filter[];
 }
 
 export interface LensEmbeddableOutput extends EmbeddableOutput {
@@ -50,7 +49,7 @@ export class Embeddable extends AbstractEmbeddable<LensEmbeddableInput, LensEmbe
   private currentContext: {
     timeRange?: TimeRange;
     query?: Query;
-    filters?: Filter[];
+    filters?: esFilters.Filter[];
     lastReloadRequestTime?: number;
   } = {};
 
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/expression_wrapper.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/expression_wrapper.tsx
index daf5e0c8d0dca4..fc6122821ebf5a 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/expression_wrapper.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/expression_wrapper.tsx
@@ -4,15 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import _ from 'lodash';
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 
 import { I18nProvider } from '@kbn/i18n/react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiText, EuiIcon } from '@elastic/eui';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange, esFilters } from 'src/plugins/data/public';
 import { Query } from 'src/legacy/core_plugins/data/public';
-import { Filter } from '@kbn/es-query';
 import { ExpressionRenderer } from 'src/legacy/core_plugins/expressions/public';
 
 export interface ExpressionWrapperProps {
@@ -21,7 +19,7 @@ export interface ExpressionWrapperProps {
   context: {
     timeRange?: TimeRange;
     query?: Query;
-    filters?: Filter[];
+    filters?: esFilters.Filter[];
     lastReloadRequestTime?: number;
   };
 }
@@ -31,16 +29,9 @@ export function ExpressionWrapper({
   expression,
   context,
 }: ExpressionWrapperProps) {
-  const [expressionError, setExpressionError] = useState<unknown>(undefined);
-  useEffect(() => {
-    // reset expression error if component attempts to run it again
-    if (expressionError) {
-      setExpressionError(undefined);
-    }
-  }, [expression, context]);
   return (
     <I18nProvider>
-      {expression === '' || expressionError ? (
+      {expression === '' ? (
         <EuiFlexGroup direction="column" alignItems="center" justifyContent="center">
           <EuiFlexItem>
             <EuiIcon type="alert" color="danger" />
@@ -55,14 +46,12 @@ export function ExpressionWrapper({
           </EuiFlexItem>
         </EuiFlexGroup>
       ) : (
-        <ExpressionRendererComponent
-          className="lnsExpressionRenderer"
-          expression={expression}
-          onRenderFailure={(e: unknown) => {
-            setExpressionError(e);
-          }}
-          searchContext={{ ...context, type: 'kibana_context' }}
-        />
+        <div className="lnsExpressionRenderer">
+          <ExpressionRendererComponent
+            expression={expression}
+            searchContext={{ ...context, type: 'kibana_context' }}
+          />
+        </div>
       )}
     </I18nProvider>
   );
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx
index f349585ce88a48..c3e91c9debcd0e 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx
@@ -53,7 +53,7 @@ export function createMockDatasource(): DatasourceMock {
     getDatasourceSuggestionsForField: jest.fn((_state, item) => []),
     getDatasourceSuggestionsFromCurrentState: jest.fn(_state => []),
     getPersistableState: jest.fn(),
-    getPublicAPI: jest.fn((_state, _setState, _layerId) => publicAPIMock),
+    getPublicAPI: jest.fn().mockReturnValue(publicAPIMock),
     initialize: jest.fn((_state?) => Promise.resolve()),
     renderDataPanel: jest.fn(),
     toExpression: jest.fn((_frame, _state) => null),
diff --git a/x-pack/legacy/plugins/lens/public/help_menu_util.tsx b/x-pack/legacy/plugins/lens/public/help_menu_util.tsx
index 3865f08862e1c7..30a05dbc38537c 100644
--- a/x-pack/legacy/plugins/lens/public/help_menu_util.tsx
+++ b/x-pack/legacy/plugins/lens/public/help_menu_util.tsx
@@ -12,7 +12,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Chrome } from 'ui/chrome';
 
-const docsPage = undefined;
+const docsPage = 'lens';
 
 export function addHelpMenuToAppChrome(chrome: Chrome) {
   chrome.helpExtension.set(domElement => {
@@ -47,7 +47,7 @@ function HelpMenu() {
       <EuiSpacer />
       <EuiText size="s">
         <EuiIcon type="logoGithub" color="primary" /> &nbsp;
-        <EuiLink href="https://github.com/elastic/kibana/issues/new" target="_blank">
+        <EuiLink href="https://github.com/elastic/kibana/issues/new/choose" target="_blank">
           {i18n.translate('xpack.lens.helpMenu.feedbackLinkText', {
             defaultMessage: 'Provide feedback for the Lens application',
           })}
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.test.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.test.ts
new file mode 100644
index 00000000000000..8146bc39ef82e9
--- /dev/null
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.test.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { autoDate } from './auto_date';
+
+jest.mock('ui/new_platform');
+jest.mock('ui/chrome');
+
+describe('auto_date', () => {
+  it('should do nothing if no time range is provided', () => {
+    const result = autoDate.fn(
+      {
+        type: 'kibana_context',
+      },
+      {
+        aggConfigs: 'canttouchthis',
+      },
+      {}
+    );
+
+    expect(result).toEqual('canttouchthis');
+  });
+
+  it('should not change anything if there are no auto date histograms', () => {
+    const aggConfigs = JSON.stringify([
+      { type: 'date_histogram', params: { interval: '35h' } },
+      { type: 'count' },
+    ]);
+    const result = autoDate.fn(
+      {
+        timeRange: {
+          from: 'now-10d',
+          to: 'now',
+        },
+        type: 'kibana_context',
+      },
+      {
+        aggConfigs,
+      },
+      {}
+    );
+
+    expect(result).toEqual(aggConfigs);
+  });
+
+  it('should change auto date histograms', () => {
+    const aggConfigs = JSON.stringify([
+      { type: 'date_histogram', params: { interval: 'auto' } },
+      { type: 'count' },
+    ]);
+    const result = autoDate.fn(
+      {
+        timeRange: {
+          from: 'now-10d',
+          to: 'now',
+        },
+        type: 'kibana_context',
+      },
+      {
+        aggConfigs,
+      },
+      {}
+    );
+
+    const interval = JSON.parse(result).find(
+      (agg: { type: string }) => agg.type === 'date_histogram'
+    ).params.interval;
+
+    expect(interval).toBeTruthy();
+    expect(typeof interval).toEqual('string');
+    expect(interval).not.toEqual('auto');
+  });
+});
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts
index 359c6d7c35c3a0..dec0adba98103a 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts
@@ -9,26 +9,39 @@ import dateMath from '@elastic/datemath';
 import {
   ExpressionFunction,
   KibanaContext,
-} from '../../../../../../src/plugins/expressions/common';
+} from '../../../../../../src/plugins/expressions/public';
+import { DateRange } from '../../common';
 
 interface LensAutoDateProps {
   aggConfigs: string;
 }
 
-export function getAutoInterval(ctx?: KibanaContext | null) {
-  if (!ctx || !ctx.timeRange) {
-    return;
+export function autoIntervalFromDateRange(dateRange?: DateRange, defaultValue: string = '1h') {
+  if (!dateRange) {
+    return defaultValue;
   }
 
-  const { timeRange } = ctx;
   const buckets = new TimeBuckets();
   buckets.setInterval('auto');
   buckets.setBounds({
-    min: dateMath.parse(timeRange.from),
-    max: dateMath.parse(timeRange.to, { roundUp: true }),
+    min: dateMath.parse(dateRange.fromDate),
+    max: dateMath.parse(dateRange.toDate, { roundUp: true }),
   });
 
-  return buckets.getInterval();
+  return buckets.getInterval().expression;
+}
+
+function autoIntervalFromContext(ctx?: KibanaContext | null) {
+  if (!ctx || !ctx.timeRange) {
+    return;
+  }
+
+  const { timeRange } = ctx;
+
+  return autoIntervalFromDateRange({
+    fromDate: timeRange.from,
+    toDate: timeRange.to,
+  });
 }
 
 /**
@@ -56,7 +69,7 @@ export const autoDate: ExpressionFunction<
     },
   },
   fn(ctx: KibanaContext, args: LensAutoDateProps) {
-    const interval = getAutoInterval(ctx);
+    const interval = autoIntervalFromContext(ctx);
 
     if (!interval) {
       return args.aggConfigs;
@@ -76,7 +89,7 @@ export const autoDate: ExpressionFunction<
         ...c,
         params: {
           ...c.params,
-          interval: interval.expression,
+          interval,
         },
       };
     });
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/change_indexpattern.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/change_indexpattern.tsx
index dc42b97cce08d1..4d9bc6276d52a9 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/change_indexpattern.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/change_indexpattern.tsx
@@ -5,8 +5,15 @@
  */
 
 import _ from 'lodash';
+import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
-import { EuiButtonEmpty, EuiPopover, EuiSelectable, EuiButtonEmptyProps } from '@elastic/eui';
+import {
+  EuiButtonEmpty,
+  EuiPopover,
+  EuiPopoverTitle,
+  EuiSelectable,
+  EuiButtonEmptyProps,
+} from '@elastic/eui';
 import { EuiSelectableProps } from '@elastic/eui/src/components/selectable/selectable';
 import { IndexPatternRef } from './types';
 import { trackUiEvent } from '../lens_ui_telemetry';
@@ -62,6 +69,11 @@ export function ChangeIndexPattern({
         ownFocus
       >
         <div style={{ width: 320 }}>
+          <EuiPopoverTitle>
+            {i18n.translate('xpack.lens.indexPattern.changeIndexPatternTitle', {
+              defaultMessage: 'Change index pattern',
+            })}
+          </EuiPopoverTitle>
           <EuiSelectable
             {...selectableProps}
             searchable
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx
index f7f56b948cfe64..11294bedbfff0f 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx
@@ -13,6 +13,8 @@ import { coreMock } from 'src/core/public/mocks';
 import { IndexPatternPrivateState } from './types';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { ChangeIndexPattern } from './change_indexpattern';
+import { EuiProgress } from '@elastic/eui';
+import { documentField } from './document_field';
 
 jest.mock('ui/new_platform');
 jest.mock('../../../../../../src/legacy/ui/public/registry/field_formats');
@@ -120,6 +122,7 @@ const initialState: IndexPatternPrivateState = {
           aggregatable: true,
           searchable: true,
         },
+        documentField,
       ],
     },
     '2': {
@@ -173,6 +176,7 @@ const initialState: IndexPatternPrivateState = {
             },
           },
         },
+        documentField,
       ],
     },
     '3': {
@@ -198,6 +202,7 @@ const initialState: IndexPatternPrivateState = {
           aggregatable: true,
           searchable: true,
         },
+        documentField,
       ],
     },
   },
@@ -265,7 +270,14 @@ describe('IndexPattern Data Panel', () => {
   });
 
   describe('loading existence data', () => {
-    async function testExistenceLoading(stateChanges?: unknown, propChanges?: unknown) {
+    function waitForPromises() {
+      return Promise.resolve()
+        .catch(() => {})
+        .then(() => {})
+        .then(() => {});
+    }
+
+    function testProps() {
       const setState = jest.fn();
       core.http.get = jest.fn(async (url: string) => {
         const parts = url.split('/');
@@ -277,7 +289,7 @@ describe('IndexPattern Data Panel', () => {
           ),
         };
       });
-      const props = {
+      return {
         ...defaultProps,
         changeIndexPattern: jest.fn(),
         setState,
@@ -301,8 +313,17 @@ describe('IndexPattern Data Panel', () => {
           },
         } as IndexPatternPrivateState,
       };
+    }
+
+    async function testExistenceLoading(stateChanges?: unknown, propChanges?: unknown) {
+      const props = testProps();
       const inst = mountWithIntl(<IndexPatternDataPanel {...props} />);
-      inst.update();
+
+      act(() => {
+        inst.update();
+      });
+
+      await waitForPromises();
 
       if (stateChanges || propChanges) {
         act(() => {
@@ -316,9 +337,10 @@ describe('IndexPattern Data Panel', () => {
           });
           inst.update();
         });
+        await waitForPromises();
       }
 
-      return setState;
+      return props.setState;
     }
 
     it('loads existence data', async () => {
@@ -446,6 +468,98 @@ describe('IndexPattern Data Panel', () => {
         },
       });
     });
+
+    it('shows a loading indicator when loading', async () => {
+      const inst = mountWithIntl(<IndexPatternDataPanel {...testProps()} />);
+
+      expect(inst.find(EuiProgress).length).toEqual(1);
+
+      await waitForPromises();
+      inst.update();
+
+      expect(inst.find(EuiProgress).length).toEqual(0);
+    });
+
+    it('does not perform multiple queries at once', async () => {
+      let queryCount = 0;
+      let overlapCount = 0;
+      const props = testProps();
+
+      core.http.get = jest.fn((url: string) => {
+        if (queryCount) {
+          ++overlapCount;
+        }
+        ++queryCount;
+
+        const parts = url.split('/');
+        const indexPatternTitle = parts[parts.length - 1];
+        const result = Promise.resolve({
+          indexPatternTitle,
+          existingFieldNames: ['field_1', 'field_2'].map(
+            fieldName => `${indexPatternTitle}_${fieldName}`
+          ),
+        });
+
+        result.then(() => --queryCount);
+
+        return result;
+      });
+
+      const inst = mountWithIntl(<IndexPatternDataPanel {...props} />);
+
+      inst.update();
+
+      act(() => {
+        ((inst.setProps as unknown) as (props: unknown) => {})({
+          ...props,
+          dateRange: { fromDate: '2019-01-01', toDate: '2020-01-02' },
+        });
+        inst.update();
+      });
+
+      act(() => {
+        ((inst.setProps as unknown) as (props: unknown) => {})({
+          ...props,
+          dateRange: { fromDate: '2019-01-01', toDate: '2020-01-03' },
+        });
+        inst.update();
+      });
+
+      await waitForPromises();
+
+      expect(core.http.get).toHaveBeenCalledTimes(2);
+      expect(overlapCount).toEqual(0);
+    });
+
+    it('shows all fields if empty state button is clicked', async () => {
+      const props = testProps();
+
+      core.http.get = jest.fn((url: string) => {
+        return Promise.resolve({
+          indexPatternTitle: props.currentIndexPatternId,
+          existingFieldNames: [],
+        });
+      });
+
+      const inst = mountWithIntl(<IndexPatternDataPanel {...props} />);
+
+      inst.update();
+      await waitForPromises();
+
+      expect(inst.find('[data-test-subj="lnsFieldListPanelField"]').length).toEqual(0);
+
+      act(() => {
+        inst
+          .find('[data-test-subj="lnsDataPanelShowAllFields"]')
+          .first()
+          .simulate('click');
+        inst.update();
+      });
+
+      expect(
+        props.setState.mock.calls.map(([fn]) => fn(props.state)).filter(s => s.showEmptyFields)
+      ).toHaveLength(1);
+    });
   });
 
   describe('while showing empty fields', () => {
@@ -455,6 +569,7 @@ describe('IndexPattern Data Panel', () => {
       );
 
       expect(wrapper.find(FieldItem).map(fieldItem => fieldItem.prop('field').name)).toEqual([
+        'Records',
         'bytes',
         'client',
         'memory',
@@ -520,6 +635,7 @@ describe('IndexPattern Data Panel', () => {
         .simulate('click');
 
       expect(wrapper.find(FieldItem).map(fieldItem => fieldItem.prop('field').name)).toEqual([
+        'Records',
         'bytes',
         'client',
         'memory',
@@ -588,6 +704,7 @@ describe('IndexPattern Data Panel', () => {
       const wrapper = shallowWithIntl(<InnerIndexPatternDataPanel {...props} />);
 
       expect(wrapper.find(FieldItem).map(fieldItem => fieldItem.prop('field').name)).toEqual([
+        'Records',
         'bytes',
         'memory',
       ]);
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.tsx
index 7fa8175e1857ca..8fc80e14dc166a 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.tsx
@@ -18,11 +18,13 @@ import {
   EuiPopoverTitle,
   EuiPopoverFooter,
   EuiCallOut,
-  EuiText,
   EuiFormControlLayout,
   EuiSwitch,
   EuiFacetButton,
   EuiIcon,
+  EuiButtonEmpty,
+  EuiSpacer,
+  EuiFormLabel,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -38,6 +40,7 @@ import {
 import { trackUiEvent } from '../lens_ui_telemetry';
 import { syncExistingFields } from './loader';
 import { fieldExists } from './pure_helpers';
+import { Loader } from '../loader';
 
 export type Props = DatasourceDataPanelProps<IndexPatternPrivateState> & {
   changeIndexPattern: (
@@ -58,10 +61,11 @@ function sortFields(fieldA: IndexPatternField, fieldB: IndexPatternField) {
   return fieldA.name.localeCompare(fieldB.name, undefined, { sensitivity: 'base' });
 }
 
-const supportedFieldTypes = new Set(['string', 'number', 'boolean', 'date', 'ip']);
+const supportedFieldTypes = new Set(['string', 'number', 'boolean', 'date', 'ip', 'document']);
 const PAGINATION_SIZE = 50;
 
 const fieldTypeNames: Record<DataType, string> = {
+  document: i18n.translate('xpack.lens.datatypes.record', { defaultMessage: 'record' }),
   string: i18n.translate('xpack.lens.datatypes.string', { defaultMessage: 'string' }),
   number: i18n.translate('xpack.lens.datatypes.number', { defaultMessage: 'number' }),
   boolean: i18n.translate('xpack.lens.datatypes.boolean', { defaultMessage: 'boolean' }),
@@ -86,9 +90,16 @@ export function IndexPatternDataPanel({
     [state, setState]
   );
 
-  const onToggleEmptyFields = useCallback(() => {
-    setState(prevState => ({ ...prevState, showEmptyFields: !prevState.showEmptyFields }));
-  }, [setState]);
+  const onToggleEmptyFields = useCallback(
+    (showEmptyFields?: boolean) => {
+      setState(prevState => ({
+        ...prevState,
+        showEmptyFields:
+          showEmptyFields === undefined ? !prevState.showEmptyFields : showEmptyFields,
+      }));
+    },
+    [setState]
+  );
 
   const indexPatternList = uniq(
     Object.values(state.layers)
@@ -102,34 +113,38 @@ export function IndexPatternDataPanel({
       timeFieldName: indexPatterns[id].timeFieldName,
     }));
 
-  useEffect(() => {
-    syncExistingFields({
-      dateRange,
-      setState,
-      indexPatterns: indexPatternList,
-      fetchJson: core.http.get,
-    });
-  }, [
-    dateRange.fromDate,
-    dateRange.toDate,
-    indexPatternList.map(x => `${x.title}:${x.timeFieldName}`).join(','),
-  ]);
-
   return (
-    <MemoizedDataPanel
-      currentIndexPatternId={currentIndexPatternId}
-      indexPatternRefs={indexPatternRefs}
-      indexPatterns={indexPatterns}
-      query={query}
-      dateRange={dateRange}
-      filters={filters}
-      dragDropContext={dragDropContext}
-      showEmptyFields={state.showEmptyFields}
-      onToggleEmptyFields={onToggleEmptyFields}
-      core={core}
-      onChangeIndexPattern={onChangeIndexPattern}
-      existingFields={state.existingFields}
-    />
+    <>
+      <Loader
+        load={() =>
+          syncExistingFields({
+            dateRange,
+            setState,
+            indexPatterns: indexPatternList,
+            fetchJson: core.http.get,
+          })
+        }
+        loadDeps={[
+          dateRange.fromDate,
+          dateRange.toDate,
+          indexPatternList.map(x => `${x.title}:${x.timeFieldName}`).join(','),
+        ]}
+      />
+      <MemoizedDataPanel
+        currentIndexPatternId={currentIndexPatternId}
+        indexPatternRefs={indexPatternRefs}
+        indexPatterns={indexPatterns}
+        query={query}
+        dateRange={dateRange}
+        filters={filters}
+        dragDropContext={dragDropContext}
+        showEmptyFields={state.showEmptyFields}
+        onToggleEmptyFields={onToggleEmptyFields}
+        core={core}
+        onChangeIndexPattern={onChangeIndexPattern}
+        existingFields={state.existingFields}
+      />
+    </>
   );
 }
 
@@ -158,7 +173,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
   indexPatterns: Record<string, IndexPattern>;
   dragDropContext: DragContextState;
   showEmptyFields: boolean;
-  onToggleEmptyFields: () => void;
+  onToggleEmptyFields: (showEmptyFields?: boolean) => void;
   onChangeIndexPattern: (newId: string) => void;
   existingFields: IndexPatternPrivateState['existingFields'];
 }) {
@@ -201,6 +216,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
   const currentIndexPattern = indexPatterns[currentIndexPatternId];
   const allFields = currentIndexPattern.fields;
   const fieldByName = indexBy(allFields, 'name');
+  const clearLocalState = () => setLocalState(s => ({ ...s, nameFilter: '', typeFilter: [] }));
 
   const lazyScroll = () => {
     if (scrollContainer) {
@@ -241,7 +257,8 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
     if (!showEmptyFields) {
       const indexField = currentIndexPattern && fieldByName[field.name];
       const exists =
-        indexField && fieldExists(existingFields, currentIndexPattern.title, indexField.name);
+        field.type === 'document' ||
+        (indexField && fieldExists(existingFields, currentIndexPattern.title, indexField.name));
       if (localState.typeFilter.length > 0) {
         return exists && localState.typeFilter.includes(field.type as DataType);
       }
@@ -256,7 +273,12 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
     return true;
   });
 
-  const paginatedFields = displayedFields.sort(sortFields).slice(0, pageSize);
+  const specialFields = displayedFields.filter(f => f.type === 'document');
+  const paginatedFields = displayedFields
+    .filter(f => f.type !== 'document')
+    .sort(sortFields)
+    .slice(0, pageSize);
+  const hilight = localState.nameFilter.toLowerCase();
 
   return (
     <ChildDragDropProvider {...dragDropContext}>
@@ -279,12 +301,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
               indexPatternRefs={indexPatternRefs}
               onChangeIndexPattern={(newId: string) => {
                 onChangeIndexPattern(newId);
-
-                setLocalState(s => ({
-                  ...s,
-                  nameFilter: '',
-                  typeFilter: [],
-                }));
+                clearLocalState();
               }}
             />
           </div>
@@ -303,11 +320,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
                 }),
                 onClick: () => {
                   trackUiEvent('indexpattern_filters_cleared');
-                  setLocalState(s => ({
-                    ...s,
-                    nameFilter: '',
-                    typeFilter: [],
-                  }));
+                  clearLocalState();
                 },
               }}
             >
@@ -315,7 +328,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
                 className="euiFieldText euiFieldText--fullWidth lnsInnerIndexPatternDataPanel__textField"
                 data-test-subj="lnsIndexPatternFieldSearch"
                 placeholder={i18n.translate('xpack.lens.indexPatterns.filterByNameLabel', {
-                  defaultMessage: 'Search for fields',
+                  defaultMessage: 'Search field names',
                   description:
                     'Search the list of fields in the index pattern for the provided text',
                 })}
@@ -334,7 +347,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
               id="dataPanelTypeFilter"
               panelClassName="euiFilterGroup__popoverPanel"
               panelPaddingSize="none"
-              anchorPosition="downLeft"
+              anchorPosition="rightDown"
               display="block"
               isOpen={localState.isTypeFilterOpen}
               closePopover={() => setLocalState(() => ({ ...localState, isTypeFilterOpen: false }))}
@@ -354,7 +367,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
                 >
                   <FormattedMessage
                     id="xpack.lens.indexPatterns.toggleFiltersPopover"
-                    defaultMessage="Fields filtered"
+                    defaultMessage="Filter by type"
                   />
                 </EuiFacetButton>
               }
@@ -413,6 +426,31 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
             onScroll={lazyScroll}
           >
             <div className="lnsInnerIndexPatternDataPanel__list">
+              {specialFields.map(field => (
+                <FieldItem
+                  core={core}
+                  key={field.name}
+                  indexPattern={currentIndexPattern}
+                  field={field}
+                  highlight={hilight}
+                  exists={paginatedFields.length > 0}
+                  dateRange={dateRange}
+                  query={query}
+                  filters={filters}
+                  hideDetails={true}
+                />
+              ))}
+              {specialFields.length > 0 && (
+                <>
+                  <EuiSpacer size="s" />
+                  <EuiFormLabel>
+                    {i18n.translate('xpack.lens.indexPattern.individualFieldsLabel', {
+                      defaultMessage: 'Individual fields',
+                    })}
+                  </EuiFormLabel>
+                  <EuiSpacer size="s" />
+                </>
+              )}
               {paginatedFields.map(field => {
                 const overallField = fieldByName[field.name];
                 return (
@@ -421,7 +459,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
                     indexPattern={currentIndexPattern}
                     key={field.name}
                     field={field}
-                    highlight={localState.nameFilter.toLowerCase()}
+                    highlight={hilight}
                     exists={
                       overallField &&
                       fieldExists(existingFields, currentIndexPattern.title, overallField.name)
@@ -434,21 +472,45 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
               })}
 
               {paginatedFields.length === 0 && (
-                <EuiText size="s" color="subdued">
-                  <p>
-                    <strong>
-                      {showEmptyFields
-                        ? i18n.translate('xpack.lens.indexPatterns.hiddenFieldsLabel', {
+                <EuiCallOut
+                  size="s"
+                  color="warning"
+                  title={
+                    showEmptyFields
+                      ? localState.typeFilter.length || localState.nameFilter.length
+                        ? i18n.translate('xpack.lens.indexPatterns.noFilteredFieldsLabel', {
                             defaultMessage:
-                              'No fields have data with the current filters. You can show fields without data using the filters above.',
+                              'No fields match the current filters. Try changing your filters or time range.',
                           })
                         : i18n.translate('xpack.lens.indexPatterns.noFieldsLabel', {
-                            defaultMessage: 'No fields in {title} can be visualized.',
-                            values: { title: currentIndexPattern.title },
-                          })}
-                    </strong>
-                  </p>
-                </EuiText>
+                            defaultMessage: 'No fields exist in this index pattern.',
+                          })
+                      : i18n.translate('xpack.lens.indexPatterns.emptyFieldsWithDataLabel', {
+                          defaultMessage:
+                            'No fields have data with the current filters and time range. Try changing your filters or time range.',
+                        })
+                  }
+                >
+                  {(!showEmptyFields ||
+                    localState.typeFilter.length ||
+                    localState.nameFilter.length) && (
+                    <EuiButtonEmpty
+                      size="xs"
+                      color="primary"
+                      flush="left"
+                      data-test-subj="lnsDataPanelShowAllFields"
+                      onClick={() => {
+                        trackUiEvent('indexpattern_show_all_fields_clicked');
+                        clearLocalState();
+                        onToggleEmptyFields(true);
+                      }}
+                    >
+                      {i18n.translate('xpack.lens.indexPatterns.showAllFields.buttonText', {
+                        defaultMessage: 'Show all fields',
+                      })}
+                    </EuiButtonEmpty>
+                  )}
+                </EuiCallOut>
               )}
             </div>
           </div>
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
index 49a04e59b7cc9b..d4cf4f7ffbaa61 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
@@ -18,13 +18,13 @@ import {
   SavedObjectsClientContract,
   HttpServiceBase,
 } from 'src/core/public';
-import { Storage } from 'ui/storage';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { IndexPatternPrivateState } from '../types';
+import { documentField } from '../document_field';
 
 jest.mock('ui/new_platform');
 jest.mock('../loader');
 jest.mock('../state_helpers');
-jest.mock('../operations');
 
 // Used by indexpattern plugin, which is a dependency of a dependency
 jest.mock('ui/chrome');
@@ -67,6 +67,7 @@ const expectedIndexPatterns = {
         searchable: true,
         exists: true,
       },
+      documentField,
     ],
   },
 };
@@ -129,11 +130,12 @@ describe('IndexPatternDimensionPanel', () => {
       dragDropContext,
       state,
       setState,
+      dateRange: { fromDate: 'now-1d', toDate: 'now' },
       columnId: 'col1',
       layerId: 'first',
       uniqueLabel: 'stuff',
       filterOperations: () => true,
-      storage: {} as Storage,
+      storage: {} as IStorageWrapper,
       uiSettings: {} as UiSettingsClientContract,
       savedObjectsClient: {} as SavedObjectsClientContract,
       http: {} as HttpServiceBase,
@@ -199,7 +201,7 @@ describe('IndexPatternDimensionPanel', () => {
 
     expect(options).toHaveLength(2);
 
-    expect(options![0].label).toEqual('Document');
+    expect(options![0].label).toEqual('Records');
 
     expect(options![1].options!.map(({ label }) => label)).toEqual([
       'timestamp',
@@ -231,7 +233,7 @@ describe('IndexPatternDimensionPanel', () => {
     expect(options![1].options!.map(({ label }) => label)).toEqual(['timestamp', 'source']);
   });
 
-  it('should indicate fields which are imcompatible for the operation of the current column', () => {
+  it('should indicate fields which are incompatible for the operation of the current column', () => {
     wrapper = mount(
       <IndexPatternDimensionPanel
         {...defaultProps}
@@ -262,7 +264,7 @@ describe('IndexPatternDimensionPanel', () => {
 
     const options = wrapper.find(EuiComboBox).prop('options');
 
-    expect(options![0]['data-test-subj']).toEqual('lns-documentOptionIncompatible');
+    expect(options![0]['data-test-subj']).toEqual('lns-fieldOptionIncompatible-Records');
 
     expect(
       options![1].options!.filter(({ label }) => label === 'timestamp')[0]['data-test-subj']
@@ -658,6 +660,7 @@ describe('IndexPatternDimensionPanel', () => {
                 isBucketed: false,
                 label: '',
                 operationType: 'count',
+                sourceField: 'Records',
               },
             },
           },
@@ -852,6 +855,7 @@ describe('IndexPatternDimensionPanel', () => {
               isBucketed: false,
               label: '',
               operationType: 'count',
+              sourceField: 'Records',
             },
           },
         },
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.tsx
index c0c774a2256423..9f558b7354acd3 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.tsx
@@ -7,13 +7,13 @@
 import _ from 'lodash';
 import React, { memo, useMemo } from 'react';
 import { EuiButtonIcon } from '@elastic/eui';
-import { Storage } from 'ui/storage';
 import { i18n } from '@kbn/i18n';
 import {
   UiSettingsClientContract,
   SavedObjectsClientContract,
   HttpServiceBase,
 } from 'src/core/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { DatasourceDimensionPanelProps, StateSetter } from '../../types';
 import { IndexPatternColumn, OperationType } from '../indexpattern';
 import { getAvailableOperationsByMetadata, buildColumn, changeField } from '../operations';
@@ -23,23 +23,24 @@ import { changeColumn, deleteColumn } from '../state_helpers';
 import { isDraggedField, hasField } from '../utils';
 import { IndexPatternPrivateState, IndexPatternField } from '../types';
 import { trackUiEvent } from '../../lens_ui_telemetry';
+import { DateRange } from '../../../common';
 
 export type IndexPatternDimensionPanelProps = DatasourceDimensionPanelProps & {
   state: IndexPatternPrivateState;
   setState: StateSetter<IndexPatternPrivateState>;
   dragDropContext: DragContextState;
   uiSettings: UiSettingsClientContract;
-  storage: Storage;
+  storage: IStorageWrapper;
   savedObjectsClient: SavedObjectsClientContract;
   layerId: string;
   http: HttpServiceBase;
   uniqueLabel: string;
+  dateRange: DateRange;
 };
 
 export interface OperationFieldSupportMatrix {
   operationByField: Partial<Record<string, OperationType[]>>;
   fieldByOperation: Partial<Record<OperationType, string[]>>;
-  operationByDocument: OperationType[];
 }
 
 export const IndexPatternDimensionPanel = memo(function IndexPatternDimensionPanel(
@@ -55,30 +56,25 @@ export const IndexPatternDimensionPanel = memo(function IndexPatternDimensionPan
 
     const supportedOperationsByField: Partial<Record<string, OperationType[]>> = {};
     const supportedFieldsByOperation: Partial<Record<OperationType, string[]>> = {};
-    const supportedOperationsByDocument: OperationType[] = [];
+
     filteredOperationsByMetadata.forEach(({ operations }) => {
       operations.forEach(operation => {
-        if (operation.type === 'field') {
-          if (supportedOperationsByField[operation.field]) {
-            supportedOperationsByField[operation.field]!.push(operation.operationType);
-          } else {
-            supportedOperationsByField[operation.field] = [operation.operationType];
-          }
+        if (supportedOperationsByField[operation.field]) {
+          supportedOperationsByField[operation.field]!.push(operation.operationType);
+        } else {
+          supportedOperationsByField[operation.field] = [operation.operationType];
+        }
 
-          if (supportedFieldsByOperation[operation.operationType]) {
-            supportedFieldsByOperation[operation.operationType]!.push(operation.field);
-          } else {
-            supportedFieldsByOperation[operation.operationType] = [operation.field];
-          }
+        if (supportedFieldsByOperation[operation.operationType]) {
+          supportedFieldsByOperation[operation.operationType]!.push(operation.field);
         } else {
-          supportedOperationsByDocument.push(operation.operationType);
+          supportedFieldsByOperation[operation.operationType] = [operation.field];
         }
       });
     });
     return {
       operationByField: _.mapValues(supportedOperationsByField, _.uniq),
       fieldByOperation: _.mapValues(supportedFieldsByOperation, _.uniq),
-      operationByDocument: _.uniq(supportedOperationsByDocument),
     };
   }, [currentIndexPattern, props.filterOperations]);
 
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/field_select.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/field_select.tsx
index 7eeffdff383e10..ba18cd150c7a5c 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/field_select.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/field_select.tsx
@@ -21,9 +21,11 @@ import { IndexPattern, IndexPatternField, IndexPatternPrivateState } from '../ty
 import { trackUiEvent } from '../../lens_ui_telemetry';
 import { fieldExists } from '../pure_helpers';
 
-export type FieldChoice =
-  | { type: 'field'; field: string; operationType?: OperationType }
-  | { type: 'document' };
+export interface FieldChoice {
+  type: 'field';
+  field: string;
+  operationType?: OperationType;
+}
 
 export interface FieldSelectProps {
   currentIndexPattern: IndexPattern;
@@ -50,8 +52,7 @@ export function FieldSelect({
   onDeleteColumn,
   existingFields,
 }: FieldSelectProps) {
-  const { operationByDocument, operationByField } = operationFieldSupportMatrix;
-
+  const { operationByField } = operationFieldSupportMatrix;
   const memoizedFieldOptions = useMemo(() => {
     const fields = Object.keys(operationByField).sort();
 
@@ -65,68 +66,58 @@ export function FieldSelect({
       );
     }
 
-    const isCurrentOperationApplicableWithoutField =
-      (!selectedColumnOperationType && !incompatibleSelectedOperationType) ||
-      operationByDocument.includes(
-        incompatibleSelectedOperationType || selectedColumnOperationType!
-      );
+    const [specialFields, normalFields] = _.partition(
+      fields,
+      field => fieldMap[field].type === 'document'
+    );
 
-    const fieldOptions = [];
-
-    if (operationByDocument.length > 0) {
-      fieldOptions.push({
-        label: i18n.translate('xpack.lens.indexPattern.documentField', {
-          defaultMessage: 'Document',
-        }),
-        value: { type: 'document' },
-        className: classNames({
-          'lnFieldSelect__option--incompatible': !isCurrentOperationApplicableWithoutField,
-        }),
-        'data-test-subj': `lns-documentOption${
-          isCurrentOperationApplicableWithoutField ? '' : 'Incompatible'
-        }`,
-      });
+    function fieldNamesToOptions(items: string[]) {
+      return items
+        .map(field => ({
+          label: field,
+          value: {
+            type: 'field',
+            field,
+            dataType: fieldMap[field].type,
+            operationType:
+              selectedColumnOperationType && isCompatibleWithCurrentOperation(field)
+                ? selectedColumnOperationType
+                : undefined,
+          },
+          exists:
+            fieldMap[field].type === 'document' ||
+            fieldExists(existingFields, currentIndexPattern.title, field),
+          compatible: isCompatibleWithCurrentOperation(field),
+        }))
+        .filter(field => showEmptyFields || field.exists)
+        .sort((a, b) => {
+          if (a.compatible && !b.compatible) {
+            return -1;
+          }
+          if (!a.compatible && b.compatible) {
+            return 1;
+          }
+          return 0;
+        })
+        .map(({ label, value, compatible, exists }) => ({
+          label,
+          value,
+          className: classNames({
+            'lnFieldSelect__option--incompatible': !compatible,
+            'lnFieldSelect__option--nonExistant': !exists,
+          }),
+          'data-test-subj': `lns-fieldOption${compatible ? '' : 'Incompatible'}-${label}`,
+        }));
     }
 
+    const fieldOptions: unknown[] = fieldNamesToOptions(specialFields);
+
     if (fields.length > 0) {
       fieldOptions.push({
         label: i18n.translate('xpack.lens.indexPattern.individualFieldsLabel', {
           defaultMessage: 'Individual fields',
         }),
-        options: fields
-          .map(field => ({
-            label: field,
-            value: {
-              type: 'field',
-              field,
-              dataType: fieldMap[field].type,
-              operationType:
-                selectedColumnOperationType && isCompatibleWithCurrentOperation(field)
-                  ? selectedColumnOperationType
-                  : undefined,
-            },
-            exists: fieldExists(existingFields, currentIndexPattern.title, field),
-            compatible: isCompatibleWithCurrentOperation(field),
-          }))
-          .filter(field => showEmptyFields || field.exists)
-          .sort((a, b) => {
-            if (a.compatible && !b.compatible) {
-              return -1;
-            }
-            if (!a.compatible && b.compatible) {
-              return 1;
-            }
-            return 0;
-          })
-          .map(({ label, value, compatible, exists }) => ({
-            label,
-            value,
-            className: classNames({
-              'lnFieldSelect__option--incompatible': !compatible,
-              'lnFieldSelect__option--nonExistant': !exists,
-            }),
-            'data-test-subj': `lns-fieldOption${compatible ? '' : 'Incompatible'}-${label}`,
-          })),
+        options: fieldNamesToOptions(normalFields),
       });
     }
 
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/popover_editor.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/popover_editor.tsx
index b9baa489f3382a..0555787ec840dc 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/popover_editor.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/popover_editor.tsx
@@ -38,10 +38,13 @@ import { trackUiEvent } from '../../lens_ui_telemetry';
 
 const operationPanels = getOperationDisplay();
 
-export function asOperationOptions(
-  operationTypes: OperationType[],
-  compatibleWithCurrentField: boolean
-) {
+export interface PopoverEditorProps extends IndexPatternDimensionPanelProps {
+  selectedColumn?: IndexPatternColumn;
+  operationFieldSupportMatrix: OperationFieldSupportMatrix;
+  currentIndexPattern: IndexPattern;
+}
+
+function asOperationOptions(operationTypes: OperationType[], compatibleWithCurrentField: boolean) {
   return [...operationTypes]
     .sort((opType1, opType2) => {
       return operationPanels[opType1].displayName.localeCompare(
@@ -54,12 +57,6 @@ export function asOperationOptions(
     }));
 }
 
-export interface PopoverEditorProps extends IndexPatternDimensionPanelProps {
-  selectedColumn?: IndexPatternColumn;
-  operationFieldSupportMatrix: OperationFieldSupportMatrix;
-  currentIndexPattern: IndexPattern;
-}
-
 export function PopoverEditor(props: PopoverEditorProps) {
   const {
     selectedColumn,
@@ -72,7 +69,7 @@ export function PopoverEditor(props: PopoverEditorProps) {
     uniqueLabel,
     hideGrouping,
   } = props;
-  const { operationByDocument, operationByField, fieldByOperation } = operationFieldSupportMatrix;
+  const { operationByField, fieldByOperation } = operationFieldSupportMatrix;
   const [isPopoverOpen, setPopoverOpen] = useState(false);
   const [
     incompatibleSelectedOperationType,
@@ -87,19 +84,12 @@ export function PopoverEditor(props: PopoverEditorProps) {
     currentIndexPattern.fields.forEach(field => {
       fields[field.name] = field;
     });
-
     return fields;
   }, [currentIndexPattern]);
 
   function getOperationTypes() {
-    const possibleOperationTypes = Object.keys(fieldByOperation).concat(
-      operationByDocument
-    ) as OperationType[];
-
+    const possibleOperationTypes = Object.keys(fieldByOperation) as OperationType[];
     const validOperationTypes: OperationType[] = [];
-    if (!selectedColumn || !hasField(selectedColumn)) {
-      validOperationTypes.push(...operationByDocument);
-    }
 
     if (!selectedColumn) {
       validOperationTypes.push(...(Object.keys(fieldByOperation) as OperationType[]));
@@ -139,12 +129,8 @@ export function PopoverEditor(props: PopoverEditorProps) {
           onClick() {
             if (!selectedColumn) {
               const possibleFields = fieldByOperation[operationType] || [];
-              const isFieldlessPossible = operationByDocument.includes(operationType);
 
-              if (
-                possibleFields.length === 1 ||
-                (possibleFields.length === 0 && isFieldlessPossible)
-              ) {
+              if (possibleFields.length === 1) {
                 setState(
                   changeColumn({
                     state,
@@ -156,8 +142,7 @@ export function PopoverEditor(props: PopoverEditorProps) {
                       layerId: props.layerId,
                       op: operationType,
                       indexPattern: currentIndexPattern,
-                      field: possibleFields.length === 1 ? fieldMap[possibleFields[0]] : undefined,
-                      asDocumentOperation: possibleFields.length === 0,
+                      field: fieldMap[possibleFields[0]],
                     }),
                   })
                 );
@@ -184,7 +169,7 @@ export function PopoverEditor(props: PopoverEditorProps) {
               layerId: props.layerId,
               op: operationType,
               indexPattern: currentIndexPattern,
-              field: hasField(selectedColumn) ? fieldMap[selectedColumn.sourceField] : undefined,
+              field: fieldMap[selectedColumn.sourceField],
             });
             trackUiEvent(
               `indexpattern_dimension_operation_from_${selectedColumn.operationType}_to_${operationType}`
@@ -307,12 +292,11 @@ export function PopoverEditor(props: PopoverEditorProps) {
                   }
                   column = buildColumn({
                     columns: props.state.layers[props.layerId].columns,
-                    field: 'field' in choice ? fieldMap[choice.field] : undefined,
+                    field: fieldMap[choice.field],
                     indexPattern: currentIndexPattern,
                     layerId: props.layerId,
                     suggestedPriority: props.suggestedPriority,
                     op: operation as OperationType,
-                    asDocumentOperation: choice.type === 'document',
                   });
                 }
 
@@ -354,7 +338,7 @@ export function PopoverEditor(props: PopoverEditorProps) {
                       defaultMessage: 'To use this function, select a field.',
                     })}
                     iconType="sortUp"
-                  ></EuiCallOut>
+                  />
                 )}
                 {!incompatibleSelectedOperationType && ParamEditor && (
                   <>
@@ -368,6 +352,7 @@ export function PopoverEditor(props: PopoverEditorProps) {
                       savedObjectsClient={props.savedObjectsClient}
                       layerId={layerId}
                       http={props.http}
+                      dateRange={props.dateRange}
                     />
                     <EuiSpacer size="m" />
                   </>
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/document_field.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/document_field.ts
new file mode 100644
index 00000000000000..e0a7f27835e42f
--- /dev/null
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/document_field.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+/**
+ * This is a special-case field which allows us to perform
+ * document-level operations such as count.
+ */
+export const documentField = {
+  name: i18n.translate('xpack.lens.indexPattern.records', {
+    defaultMessage: 'Records',
+  }),
+  type: 'document',
+  aggregatable: true,
+  searchable: true,
+};
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_item.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_item.tsx
index 41a4bd3549dc19..962eece4977e01 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_item.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_item.tsx
@@ -35,8 +35,9 @@ import {
   niceTimeFormatter,
 } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
-import { Filter, buildEsQuery, getEsQueryConfig } from '@kbn/es-query';
+import { buildEsQuery, getEsQueryConfig } from '@kbn/es-query';
 import { Query } from 'src/plugins/data/common';
+import { esFilters } from '../../../../../../src/plugins/data/public';
 // @ts-ignore
 import { fieldFormats } from '../../../../../../src/legacy/ui/public/registry/field_formats';
 import { DraggedField } from './indexpattern';
@@ -55,7 +56,8 @@ export interface FieldItemProps {
   exists: boolean;
   query: Query;
   dateRange: DatasourceDataPanelProps['dateRange'];
-  filters: Filter[];
+  filters: esFilters.Filter[];
+  hideDetails?: boolean;
 }
 
 interface State {
@@ -75,7 +77,17 @@ function wrapOnDot(str?: string) {
 }
 
 export function FieldItem(props: FieldItemProps) {
-  const { core, field, indexPattern, highlight, exists, query, dateRange, filters } = props;
+  const {
+    core,
+    field,
+    indexPattern,
+    highlight,
+    exists,
+    query,
+    dateRange,
+    filters,
+    hideDetails,
+  } = props;
 
   const [infoIsOpen, setOpen] = useState(false);
 
@@ -140,6 +152,10 @@ export function FieldItem(props: FieldItemProps) {
   }
 
   function togglePopover() {
+    if (hideDetails) {
+      return;
+    }
+
     setOpen(!infoIsOpen);
     if (!infoIsOpen) {
       trackUiEvent('indexpattern_field_info_click');
@@ -174,10 +190,8 @@ export function FieldItem(props: FieldItemProps) {
                   togglePopover();
                 }
               }}
-              aria-label={i18n.translate('xpack.lens.indexPattern.fieldStatsButtonAriaLabel', {
-                defaultMessage:
-                  'Click or press Enter for information about {fieldName}. Or, drag field into visualization.',
-                values: { fieldName: field.name },
+              aria-label={i18n.translate('xpack.lens.indexPattern.fieldStatsButtonLabel', {
+                defaultMessage: 'Click for a field preview, or drag and drop to visualize.',
               })}
             >
               <LensFieldIcon type={field.type as DataType} />
@@ -188,11 +202,15 @@ export function FieldItem(props: FieldItemProps) {
 
               <EuiIconTip
                 anchorClassName="lnsFieldItem__infoIcon"
-                content={i18n.translate('xpack.lens.indexPattern.fieldStatsButton', {
-                  defaultMessage:
-                    'Click for information about {fieldName}. Or, drag field into visualization.',
-                  values: { fieldName: field.name },
-                })}
+                content={
+                  hideDetails
+                    ? i18n.translate('xpack.lens.indexPattern.fieldItemTooltip', {
+                        defaultMessage: 'Drag and drop to visualize.',
+                      })
+                    : i18n.translate('xpack.lens.indexPattern.fieldStatsButtonLabel', {
+                        defaultMessage: 'Click for a field preview, or drag and drop to visualize.',
+                      })
+                }
                 type="iInCircle"
                 color="subdued"
                 size="s"
@@ -226,7 +244,7 @@ function FieldItemPopoverContents(props: State & FieldItemProps) {
     return (
       <EuiText size="s">
         {i18n.translate('xpack.lens.indexPattern.fieldStatsNoData', {
-          defaultMessage: 'No data to display',
+          defaultMessage: 'No data to display.',
         })}
       </EuiText>
     );
@@ -465,7 +483,7 @@ function FieldItemPopoverContents(props: State & FieldItemProps) {
                   )}
                 </EuiFlexItem>
                 <EuiFlexItem grow={false}>
-                  <EuiText size="s" textAlign="left" color={euiTextColor}>
+                  <EuiText size="xs" textAlign="left" color={euiTextColor}>
                     {Math.round((topValue.count / props.sampledValues!) * 100)}%
                   </EuiText>
                 </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.test.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.test.ts
index 845cfa29d5724c..d998437f3e4920 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.test.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.test.ts
@@ -5,7 +5,7 @@
  */
 
 import chromeMock from 'ui/chrome';
-import { Storage } from 'ui/storage';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { SavedObjectsClientContract } from 'kibana/public';
 import { getIndexPatternDatasource, IndexPatternColumn, uniqueLabels } from './indexpattern';
 import { DatasourcePublicAPI, Operation, Datasource } from '../types';
@@ -143,7 +143,7 @@ describe('IndexPattern Data Source', () => {
   beforeEach(() => {
     indexPatternDatasource = getIndexPatternDatasource({
       chrome: chromeMock,
-      storage: {} as Storage,
+      storage: {} as IStorageWrapper,
       core: coreMock.createStart(),
       savedObjectsClient: {} as SavedObjectsClientContract,
       data: pluginsMock.createStart().data,
@@ -183,6 +183,7 @@ describe('IndexPattern Data Source', () => {
         isBucketed: false,
         label: 'Foo',
         operationType: 'count',
+        sourceField: 'Records',
       };
       const map = uniqueLabels({
         a: {
@@ -240,19 +241,16 @@ describe('IndexPattern Data Source', () => {
             columnOrder: ['col1', 'col2'],
             columns: {
               col1: {
-                label: 'Count of Documents',
+                label: 'Count of records',
                 dataType: 'number',
                 isBucketed: false,
-
-                // Private
+                sourceField: 'Records',
                 operationType: 'count',
               },
               col2: {
                 label: 'Date',
                 dataType: 'date',
                 isBucketed: true,
-
-                // Private
                 operationType: 'date_histogram',
                 sourceField: 'timestamp',
                 params: {
@@ -272,7 +270,7 @@ describe('IndexPattern Data Source', () => {
               metricsAtAllLevels=false
               partialRows=false
               includeFormatHints=true
-              aggConfigs={lens_auto_date aggConfigs='[{\\"id\\":\\"col1\\",\\"enabled\\":true,\\"type\\":\\"count\\",\\"schema\\":\\"metric\\",\\"params\\":{}},{\\"id\\":\\"col2\\",\\"enabled\\":true,\\"type\\":\\"date_histogram\\",\\"schema\\":\\"segment\\",\\"params\\":{\\"field\\":\\"timestamp\\",\\"useNormalizedEsInterval\\":true,\\"interval\\":\\"1d\\",\\"drop_partials\\":false,\\"min_doc_count\\":0,\\"extended_bounds\\":{}}}]'} | lens_rename_columns idMap='{\\"col-0-col1\\":{\\"label\\":\\"Count of Documents\\",\\"dataType\\":\\"number\\",\\"isBucketed\\":false,\\"operationType\\":\\"count\\",\\"id\\":\\"col1\\"},\\"col-1-col2\\":{\\"label\\":\\"Date\\",\\"dataType\\":\\"date\\",\\"isBucketed\\":true,\\"operationType\\":\\"date_histogram\\",\\"sourceField\\":\\"timestamp\\",\\"params\\":{\\"interval\\":\\"1d\\"},\\"id\\":\\"col2\\"}}'"
+              aggConfigs={lens_auto_date aggConfigs='[{\\"id\\":\\"col1\\",\\"enabled\\":true,\\"type\\":\\"count\\",\\"schema\\":\\"metric\\",\\"params\\":{}},{\\"id\\":\\"col2\\",\\"enabled\\":true,\\"type\\":\\"date_histogram\\",\\"schema\\":\\"segment\\",\\"params\\":{\\"field\\":\\"timestamp\\",\\"useNormalizedEsInterval\\":true,\\"interval\\":\\"1d\\",\\"drop_partials\\":false,\\"min_doc_count\\":0,\\"extended_bounds\\":{}}}]'} | lens_rename_columns idMap='{\\"col-0-col1\\":{\\"label\\":\\"Count of records\\",\\"dataType\\":\\"number\\",\\"isBucketed\\":false,\\"sourceField\\":\\"Records\\",\\"operationType\\":\\"count\\",\\"id\\":\\"col1\\"},\\"col-1-col2\\":{\\"label\\":\\"Date\\",\\"dataType\\":\\"date\\",\\"isBucketed\\":true,\\"operationType\\":\\"date_histogram\\",\\"sourceField\\":\\"timestamp\\",\\"params\\":{\\"interval\\":\\"1d\\"},\\"id\\":\\"col2\\"}}'"
       `);
     });
   });
@@ -414,7 +412,15 @@ describe('IndexPattern Data Source', () => {
 
     beforeEach(async () => {
       const initialState = stateFromPersistedState(persistedState);
-      publicAPI = indexPatternDatasource.getPublicAPI(initialState, () => {}, 'first');
+      publicAPI = indexPatternDatasource.getPublicAPI({
+        state: initialState,
+        setState: () => {},
+        layerId: 'first',
+        dateRange: {
+          fromDate: 'now-30d',
+          toDate: 'now',
+        },
+      });
     });
 
     describe('getTableSpec', () => {
@@ -453,8 +459,8 @@ describe('IndexPattern Data Source', () => {
             suggestedPriority: 2,
           },
         };
-        const api = indexPatternDatasource.getPublicAPI(
-          {
+        const api = indexPatternDatasource.getPublicAPI({
+          state: {
             ...initialState,
             layers: {
               first: {
@@ -465,8 +471,12 @@ describe('IndexPattern Data Source', () => {
             },
           },
           setState,
-          'first'
-        );
+          layerId: 'first',
+          dateRange: {
+            fromDate: 'now-1y',
+            toDate: 'now',
+          },
+        });
 
         api.removeColumnInTableSpec('b');
 
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx
index 359eb687b5741a..443667ab644767 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx
@@ -9,13 +9,14 @@ import React from 'react';
 import { render } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
 import { CoreStart, SavedObjectsClientContract } from 'src/core/public';
-import { Storage } from 'ui/storage';
 import { i18n } from '@kbn/i18n';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import {
   DatasourceDimensionPanelProps,
   DatasourceDataPanelProps,
   Operation,
   DatasourceLayerPanelProps,
+  PublicAPIProps,
 } from '../types';
 import { loadInitialState, changeIndexPattern, changeLayerIndexPattern } from './loader';
 import { toExpression } from './to_expression';
@@ -27,7 +28,7 @@ import {
   getDatasourceSuggestionsFromCurrentState,
 } from './indexpattern_suggestions';
 
-import { isDraggedField } from './utils';
+import { isDraggedField, normalizeOperationDataType } from './utils';
 import { LayerPanel } from './layerpanel';
 import { IndexPatternColumn } from './operations';
 import {
@@ -50,7 +51,7 @@ export interface DraggedField {
 export function columnToOperation(column: IndexPatternColumn, uniqueLabel?: string): Operation {
   const { dataType, label, isBucketed, scale } = column;
   return {
-    dataType,
+    dataType: normalizeOperationDataType(dataType),
     isBucketed,
     scale,
     label: uniqueLabel || label,
@@ -104,7 +105,7 @@ export function getIndexPatternDatasource({
   // Core start is being required here because it contains the savedObject client
   // In the new platform, this plugin wouldn't be initialized until after setup
   core: CoreStart;
-  storage: Storage;
+  storage: IStorageWrapper;
   savedObjectsClient: SavedObjectsClientContract;
   data: ReturnType<DataPlugin['start']>;
 }) {
@@ -196,11 +197,12 @@ export function getIndexPatternDatasource({
       );
     },
 
-    getPublicAPI(
-      state: IndexPatternPrivateState,
-      setState: StateSetter<IndexPatternPrivateState>,
-      layerId: string
-    ) {
+    getPublicAPI({
+      state,
+      setState,
+      layerId,
+      dateRange,
+    }: PublicAPIProps<IndexPatternPrivateState>) {
       const columnLabelMap = uniqueLabels(state.layers);
 
       return {
@@ -221,7 +223,7 @@ export function getIndexPatternDatasource({
               <KibanaContextProvider
                 services={{
                   appName: 'lens',
-                  store: storage,
+                  storage,
                   uiSettings,
                   data,
                   savedObjects: core.savedObjects,
@@ -237,6 +239,7 @@ export function getIndexPatternDatasource({
                   layerId={props.layerId}
                   http={core.http}
                   uniqueLabel={columnLabelMap[props.columnId]}
+                  dateRange={dateRange}
                   {...props}
                 />
               </KibanaContextProvider>
@@ -257,6 +260,7 @@ export function getIndexPatternDatasource({
                   state,
                   layerId: props.layerId,
                   onError: onIndexPatternLoadError,
+                  replaceIfPossible: true,
                 });
               }}
               {...props}
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern_suggestions.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern_suggestions.test.tsx
index ff6911bd25f841..e86a16c1af9d66 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern_suggestions.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern_suggestions.test.tsx
@@ -562,6 +562,62 @@ describe('IndexPattern Data Source suggestions', () => {
           })
         );
       });
+
+      it('creates a new layer and replaces layer if no match is found', () => {
+        const suggestions = getDatasourceSuggestionsForField(stateWithEmptyLayer(), '2', {
+          name: 'source',
+          type: 'string',
+          aggregatable: true,
+          searchable: true,
+        });
+
+        expect(suggestions).toContainEqual(
+          expect.objectContaining({
+            state: expect.objectContaining({
+              layers: {
+                previousLayer: expect.objectContaining({
+                  indexPatternId: '1',
+                }),
+                id1: expect.objectContaining({
+                  indexPatternId: '2',
+                }),
+              },
+            }),
+            table: {
+              changeType: 'initial',
+              label: undefined,
+              isMultiRow: true,
+              columns: expect.arrayContaining([]),
+              layerId: 'id1',
+            },
+            keptLayerIds: ['previousLayer'],
+          })
+        );
+
+        expect(suggestions).toContainEqual(
+          expect.objectContaining({
+            state: expect.objectContaining({
+              layers: {
+                id1: expect.objectContaining({
+                  indexPatternId: '2',
+                }),
+              },
+            }),
+            table: {
+              changeType: 'initial',
+              label: undefined,
+              isMultiRow: false,
+              columns: expect.arrayContaining([
+                expect.objectContaining({
+                  columnId: expect.any(String),
+                }),
+              ]),
+              layerId: 'id1',
+            },
+            keptLayerIds: [],
+          })
+        );
+      });
     });
 
     describe('suggesting extensions to non-empty tables', () => {
@@ -979,12 +1035,25 @@ describe('IndexPattern Data Source suggestions', () => {
       };
 
       const result = getDatasourceSuggestionsFromCurrentState(state);
+
       expect(result).toContainEqual(
         expect.objectContaining({
-          table: {
+          table: expect.objectContaining({
             isMultiRow: true,
             changeType: 'unchanged',
             label: undefined,
+            layerId: 'first',
+          }),
+          keptLayerIds: ['first', 'second'],
+        })
+      );
+
+      expect(result).toContainEqual(
+        expect.objectContaining({
+          table: {
+            isMultiRow: true,
+            changeType: 'layers',
+            label: 'Show only layer 1',
             columns: [
               {
                 columnId: 'col1',
@@ -1005,8 +1074,8 @@ describe('IndexPattern Data Source suggestions', () => {
         expect.objectContaining({
           table: {
             isMultiRow: true,
-            changeType: 'unchanged',
-            label: undefined,
+            changeType: 'layers',
+            label: 'Show only layer 2',
             columns: [
               {
                 columnId: 'cola',
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern_suggestions.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern_suggestions.ts
index 49944614edbb45..d2cf6261835fdc 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern_suggestions.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern_suggestions.ts
@@ -23,6 +23,7 @@ import {
   IndexPatternLayer,
   IndexPatternField,
 } from './types';
+import { documentField } from './document_field';
 
 type IndexPatternSugestion = DatasourceSuggestion<IndexPatternPrivateState>;
 
@@ -80,6 +81,8 @@ function buildSuggestion({
       changeType,
       label,
     },
+
+    keptLayerIds: Object.keys(state.layers),
   };
 }
 
@@ -92,10 +95,13 @@ export function getDatasourceSuggestionsForField(
   const layerIds = layers.filter(id => state.layers[id].indexPatternId === indexPatternId);
 
   if (layerIds.length === 0) {
-    // The field we're suggesting on does not match any existing layer. This will always add
-    // a new layer if possible, but that might not be desirable if the layers are too complicated
-    // already
-    return getEmptyLayerSuggestionsForField(state, generateId(), indexPatternId, field);
+    // The field we're suggesting on does not match any existing layer.
+    // This generates a set of suggestions where we add a layer.
+    // A second set of suggestions is generated for visualizations that don't work with layers
+    const newId = generateId();
+    return getEmptyLayerSuggestionsForField(state, newId, indexPatternId, field).concat(
+      getEmptyLayerSuggestionsForField({ ...state, layers: {} }, newId, indexPatternId, field)
+    );
   } else {
     // The field we're suggesting on matches an existing layer. In this case we find the layer with
     // the fewest configured columns and try to add the field to this table. If this layer does not
@@ -165,7 +171,7 @@ function addFieldAsMetricOperation(
   layerId: string,
   indexPattern: IndexPattern,
   field: IndexPatternField
-) {
+): IndexPatternLayer | undefined {
   const operations = getOperationTypesForField(field);
   const operationsAlreadyAppliedToThisField = Object.values(layer.columns)
     .filter(column => hasField(column) && column.sourceField === field.name)
@@ -175,7 +181,7 @@ function addFieldAsMetricOperation(
   );
 
   if (!operationCandidate) {
-    return undefined;
+    return;
   }
 
   const newColumn = buildColumn({
@@ -205,7 +211,7 @@ function addFieldAsBucketOperation(
   layerId: string,
   indexPattern: IndexPattern,
   field: IndexPatternField
-) {
+): IndexPatternLayer {
   const applicableBucketOperation = getBucketOperation(field);
   const newColumn = buildColumn({
     op: applicableBucketOperation,
@@ -249,7 +255,7 @@ function getEmptyLayerSuggestionsForField(
   layerId: string,
   indexPatternId: string,
   field: IndexPatternField
-) {
+): IndexPatternSugestion[] {
   const indexPattern = state.indexPatterns[indexPatternId];
   let newLayer: IndexPatternLayer | undefined;
   if (getBucketOperation(field)) {
@@ -278,13 +284,14 @@ function createNewLayerWithBucketAggregation(
   layerId: string,
   indexPattern: IndexPattern,
   field: IndexPatternField
-) {
+): IndexPatternLayer {
   const countColumn = buildColumn({
     op: 'count',
     columns: {},
     indexPattern,
     layerId,
     suggestedPriority: undefined,
+    field: documentField,
   });
 
   const col1 = generateId();
@@ -316,7 +323,7 @@ function createNewLayerWithMetricAggregation(
   layerId: string,
   indexPattern: IndexPattern,
   field: IndexPatternField
-) {
+): IndexPatternLayer {
   const dateField = indexPattern.fields.find(f => f.name === indexPattern.timeFieldName)!;
 
   const operations = getOperationTypesForField(field);
@@ -354,16 +361,59 @@ function createNewLayerWithMetricAggregation(
 export function getDatasourceSuggestionsFromCurrentState(
   state: IndexPatternPrivateState
 ): Array<DatasourceSuggestion<IndexPatternPrivateState>> {
+  const layers = Object.entries(state.layers || {});
+  if (layers.length > 1) {
+    // Return suggestions that reduce the data to each layer individually
+    return layers
+      .map(([layerId, layer], index) => {
+        const hasMatchingLayer = layers.some(
+          ([otherLayerId, otherLayer]) =>
+            otherLayerId !== layerId && otherLayer.indexPatternId === layer.indexPatternId
+        );
+
+        const suggestionTitle = hasMatchingLayer
+          ? i18n.translate('xpack.lens.indexPatternSuggestion.removeLayerPositionLabel', {
+              defaultMessage: 'Show only layer {layerNumber}',
+              values: { layerNumber: index + 1 },
+            })
+          : i18n.translate('xpack.lens.indexPatternSuggestion.removeLayerLabel', {
+              defaultMessage: 'Show only {indexPatternTitle}',
+              values: { indexPatternTitle: state.indexPatterns[layer.indexPatternId].title },
+            });
+
+        return buildSuggestion({
+          state: {
+            ...state,
+            layers: {
+              [layerId]: layer,
+            },
+          },
+          layerId,
+          changeType: 'layers',
+          label: suggestionTitle,
+        });
+      })
+      .concat([
+        buildSuggestion({
+          state,
+          layerId: layers[0][0],
+          changeType: 'unchanged',
+        }),
+      ]);
+  }
   return _.flatten(
     Object.entries(state.layers || {})
-      .filter(([_id, layer]) => layer.columnOrder.length)
-      .map(([layerId, layer], index) => {
+      .filter(([_id, layer]) => layer.columnOrder.length && layer.indexPatternId)
+      .map(([layerId, layer]) => {
         const indexPattern = state.indexPatterns[layer.indexPatternId];
         const [buckets, metrics] = separateBucketColumns(layer);
         const timeDimension = layer.columnOrder.find(
           columnId =>
             layer.columns[columnId].isBucketed && layer.columns[columnId].dataType === 'date'
         );
+        const timeField = indexPattern.fields.find(
+          ({ name }) => name === indexPattern.timeFieldName
+        );
 
         const suggestions: Array<DatasourceSuggestion<IndexPatternPrivateState>> = [];
         if (metrics.length === 0) {
@@ -376,9 +426,9 @@ export function getDatasourceSuggestionsFromCurrentState(
             })
           );
         } else if (buckets.length === 0) {
-          if (indexPattern.timeFieldName) {
+          if (timeField) {
             // suggest current metric over time if there is a default time field
-            suggestions.push(createSuggestionWithDefaultDateHistogram(state, layerId));
+            suggestions.push(createSuggestionWithDefaultDateHistogram(state, layerId, timeField));
           }
           suggestions.push(...createAlternativeMetricSuggestions(indexPattern, layerId, state));
           // also suggest simple current state
@@ -392,10 +442,10 @@ export function getDatasourceSuggestionsFromCurrentState(
         } else {
           suggestions.push(...createSimplifiedTableSuggestions(state, layerId));
 
-          if (!timeDimension && indexPattern.timeFieldName) {
+          if (!timeDimension && timeField) {
             // suggest current configuration over time if there is a default time field
             // and no time dimension yet
-            suggestions.push(createSuggestionWithDefaultDateHistogram(state, layerId));
+            suggestions.push(createSuggestionWithDefaultDateHistogram(state, layerId, timeField));
           }
 
           if (buckets.length === 2) {
@@ -427,7 +477,6 @@ function createMetricSuggestion(
   state: IndexPatternPrivateState,
   field: IndexPatternField
 ) {
-  const layer = state.layers[layerId];
   const operationDefinitionsMap = _.indexBy(operationDefinitions, 'type');
   const [column] = getOperationTypesForField(field)
     .map(type =>
@@ -439,20 +488,33 @@ function createMetricSuggestion(
         suggestedPriority: 0,
       })
     )
-    .filter(op => op.dataType === 'number' && !op.isBucketed);
+    .filter(op => (op.dataType === 'number' || op.dataType === 'document') && !op.isBucketed);
 
   if (!column) {
     return;
   }
 
   const newId = generateId();
+
   return buildSuggestion({
     layerId,
     state,
     changeType: 'initial',
     updatedLayer: {
-      ...layer,
-      columns: { [newId]: column },
+      indexPatternId: indexPattern.id,
+      columns: {
+        [newId]:
+          column.dataType !== 'document'
+            ? column
+            : buildColumn({
+                op: 'count',
+                columns: {},
+                indexPattern,
+                layerId,
+                suggestedPriority: undefined,
+                field: documentField,
+              }),
+      },
       columnOrder: [newId],
     },
   });
@@ -462,8 +524,8 @@ function getNestedTitle([outerBucket, innerBucket]: IndexPatternColumn[]) {
   return i18n.translate('xpack.lens.indexpattern.suggestions.nestingChangeLabel', {
     defaultMessage: '{innerOperation} for each {outerOperation}',
     values: {
-      innerOperation: hasField(innerBucket) ? innerBucket.sourceField : innerBucket.label,
-      outerOperation: hasField(outerBucket) ? outerBucket.sourceField : outerBucket.label,
+      innerOperation: innerBucket.sourceField,
+      outerOperation: outerBucket.sourceField,
     },
   });
 }
@@ -497,7 +559,7 @@ function createAlternativeMetricSuggestions(
       suggestedPriority: undefined,
     });
     const updatedLayer = {
-      ...layer,
+      indexPatternId: indexPattern.id,
       columns: { [newId]: newColumn },
       columnOrder: [newId],
     };
@@ -515,7 +577,8 @@ function createAlternativeMetricSuggestions(
 
 function createSuggestionWithDefaultDateHistogram(
   state: IndexPatternPrivateState,
-  layerId: string
+  layerId: string,
+  timeField: IndexPatternField
 ) {
   const layer = state.layers[layerId];
   const indexPattern = state.indexPatterns[layer.indexPatternId];
@@ -526,11 +589,11 @@ function createSuggestionWithDefaultDateHistogram(
     op: 'date_histogram',
     indexPattern,
     columns: layer.columns,
-    field: indexPattern.fields.find(({ name }) => name === indexPattern.timeFieldName),
+    field: timeField,
     suggestedPriority: undefined,
   });
   const updatedLayer = {
-    ...layer,
+    indexPatternId: layer.indexPatternId,
     columns: { ...layer.columns, [newId]: timeColumn },
     columnOrder: [...buckets, newId, ...metrics],
   };
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/lens_field_icon.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/lens_field_icon.tsx
index 1773022bf6e1a0..cd2bb69f6e580b 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/lens_field_icon.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/lens_field_icon.tsx
@@ -8,9 +8,10 @@ import React from 'react';
 import { palettes } from '@elastic/eui';
 import { FieldIcon, typeToEuiIconMap } from '../../../../../../src/plugins/kibana_react/public';
 import { DataType } from '../types';
+import { normalizeOperationDataType } from './utils';
 
 export function getColorForDataType(type: string) {
-  const iconMap = typeToEuiIconMap[type];
+  const iconMap = typeToEuiIconMap[normalizeOperationDataType(type as DataType)];
   if (iconMap) {
     return iconMap.color;
   }
@@ -18,5 +19,12 @@ export function getColorForDataType(type: string) {
 }
 
 export function LensFieldIcon({ type }: { type: DataType }) {
-  return <FieldIcon type={type} className="lnsFieldListPanel__fieldIcon" size="m" useColor />;
+  return (
+    <FieldIcon
+      type={normalizeOperationDataType(type)}
+      className="lnsFieldListPanel__fieldIcon"
+      size="m"
+      useColor
+    />
+  );
 }
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts
index b3f296a96e56d8..03bbddb998b3c1 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.test.ts
@@ -14,6 +14,7 @@ import {
   syncExistingFields,
 } from './loader';
 import { IndexPatternPersistedState, IndexPatternPrivateState } from './types';
+import { documentField } from './document_field';
 
 // TODO: This should not be necessary
 jest.mock('ui/new_platform');
@@ -63,6 +64,7 @@ const sampleIndexPatterns = {
         searchable: true,
         esTypes: ['keyword'],
       },
+      documentField,
     ],
   },
   b: {
@@ -121,6 +123,7 @@ const sampleIndexPatterns = {
         },
         esTypes: ['keyword'],
       },
+      documentField,
     ],
   },
 };
@@ -133,7 +136,7 @@ function indexPatternSavedObject({ id }: { id: keyof typeof sampleIndexPatterns
     attributes: {
       title: pattern.title,
       timeFieldName: pattern.timeFieldName,
-      fields: JSON.stringify(pattern.fields),
+      fields: JSON.stringify(pattern.fields.filter(f => f.type !== 'document')),
     },
   };
 }
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
index dd1f43f7b9276b..d83777b758da63 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
@@ -23,6 +23,7 @@ import {
 import { updateLayerIndexPattern } from './state_helpers';
 import { DateRange, ExistingFields } from '../../common/types';
 import { BASE_API_URL } from '../../common';
+import { documentField } from './document_field';
 
 interface SavedIndexPatternAttributes extends SavedObjectAttributes {
   title: string;
@@ -171,6 +172,7 @@ export async function changeLayerIndexPattern({
   state,
   setState,
   onError,
+  replaceIfPossible,
 }: {
   indexPatternId: string;
   layerId: string;
@@ -178,6 +180,7 @@ export async function changeLayerIndexPattern({
   state: IndexPatternPrivateState;
   setState: SetState;
   onError: ErrorHandler;
+  replaceIfPossible?: boolean;
 }) {
   try {
     const indexPatterns = await loadIndexPatterns({
@@ -196,6 +199,7 @@ export async function changeLayerIndexPattern({
         ...s.indexPatterns,
         [indexPatternId]: indexPatterns[indexPatternId],
       },
+      currentIndexPatternId: replaceIfPossible ? indexPatternId : s.currentIndexPatternId,
     }));
   } catch (err) {
     onError(err);
@@ -211,10 +215,14 @@ async function loadIndexPatternRefs(
     perPage: 10000,
   });
 
-  return result.savedObjects.map(o => ({
-    id: String(o.id),
-    title: (o.attributes as { title: string }).title,
-  }));
+  return result.savedObjects
+    .map(o => ({
+      id: String(o.id),
+      title: (o.attributes as { title: string }).title,
+    }))
+    .sort((a, b) => {
+      return a.title.localeCompare(b.title);
+    });
 }
 
 export async function syncExistingFields({
@@ -278,10 +286,12 @@ function fromSavedObject(
     id,
     type,
     title: attributes.title,
-    fields: (JSON.parse(attributes.fields) as IndexPatternField[]).filter(
-      ({ type: fieldType, esTypes }) =>
-        fieldType !== 'string' || (esTypes && esTypes.includes('keyword'))
-    ),
+    fields: (JSON.parse(attributes.fields) as IndexPatternField[])
+      .filter(
+        ({ type: fieldType, esTypes }) =>
+          fieldType !== 'string' || (esTypes && esTypes.includes('keyword'))
+      )
+      .concat(documentField),
     typeMeta: attributes.typeMeta
       ? (JSON.parse(attributes.typeMeta) as SavedRestrictionsInfo)
       : undefined,
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/column_types.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/column_types.ts
index ed0e2fb3c96c5a..fe8a3d34d1c1cb 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/column_types.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/column_types.ts
@@ -14,6 +14,7 @@ import { Operation, DimensionPriority } from '../../../types';
 export interface BaseIndexPatternColumn extends Operation {
   // Private
   operationType: string;
+  sourceField: string;
   suggestedPriority?: DimensionPriority;
 }
 
@@ -35,6 +36,5 @@ export type ParameterlessIndexPatternColumn<
 > = TBase & { operationType: TOperationType };
 
 export interface FieldBasedIndexPatternColumn extends BaseIndexPatternColumn {
-  sourceField: string;
   suggestedPriority?: DimensionPriority;
 }
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/count.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/count.tsx
index 68a36787ec189c..d86e688fca0132 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/count.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/count.tsx
@@ -7,9 +7,10 @@
 import { i18n } from '@kbn/i18n';
 import { OperationDefinition } from '.';
 import { ParameterlessIndexPatternColumn, BaseIndexPatternColumn } from './column_types';
+import { IndexPatternField } from '../../types';
 
 const countLabel = i18n.translate('xpack.lens.indexPattern.countOf', {
-  defaultMessage: 'Count of documents',
+  defaultMessage: 'Count of records',
 });
 
 export type CountIndexPatternColumn = ParameterlessIndexPatternColumn<
@@ -23,14 +24,23 @@ export const countOperation: OperationDefinition<CountIndexPatternColumn> = {
   displayName: i18n.translate('xpack.lens.indexPattern.count', {
     defaultMessage: 'Count',
   }),
-  getPossibleOperationForDocument: () => {
+  onFieldChange: (oldColumn, indexPattern, field) => {
     return {
-      dataType: 'number',
-      isBucketed: false,
-      scale: 'ratio',
+      ...oldColumn,
+      label: field.name,
+      sourceField: field.name,
     };
   },
-  buildColumn({ suggestedPriority }) {
+  getPossibleOperationForField: (field: IndexPatternField) => {
+    if (field.type === 'document') {
+      return {
+        dataType: 'number',
+        isBucketed: false,
+        scale: 'ratio',
+      };
+    }
+  },
+  buildColumn({ suggestedPriority, field }) {
     return {
       label: countLabel,
       dataType: 'number',
@@ -38,6 +48,7 @@ export const countOperation: OperationDefinition<CountIndexPatternColumn> = {
       suggestedPriority,
       isBucketed: false,
       scale: 'ratio',
+      sourceField: field.name,
     };
   },
   toEsAggsConfig: (column, columnId) => ({
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.test.tsx
index f984597a8eb4b0..d19493d579b64a 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.test.tsx
@@ -8,17 +8,37 @@ import React from 'react';
 import { DateHistogramIndexPatternColumn } from './date_histogram';
 import { dateHistogramOperation } from '.';
 import { shallow } from 'enzyme';
-import { EuiRange, EuiSwitch } from '@elastic/eui';
+import { EuiSwitch } from '@elastic/eui';
 import {
   UiSettingsClientContract,
   SavedObjectsClientContract,
   HttpServiceBase,
 } from 'src/core/public';
-import { Storage } from 'ui/storage';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { createMockedIndexPattern } from '../../mocks';
 import { IndexPatternPrivateState } from '../../types';
 
 jest.mock('ui/new_platform');
+jest.mock('ui/chrome', () => ({
+  getUiSettingsClient: () => ({
+    get(path: string) {
+      if (path === 'histogram:maxBars') {
+        return 10;
+      }
+    },
+  }),
+}));
+
+const defaultOptions = {
+  storage: {} as IStorageWrapper,
+  uiSettings: {} as UiSettingsClientContract,
+  savedObjectsClient: {} as SavedObjectsClientContract,
+  dateRange: {
+    fromDate: 'now-1y',
+    toDate: 'now',
+  },
+  http: {} as HttpServiceBase,
+};
 
 describe('date_histogram', () => {
   let state: IndexPatternPrivateState;
@@ -72,7 +92,7 @@ describe('date_histogram', () => {
               // Private
               operationType: 'date_histogram',
               params: {
-                interval: 'w',
+                interval: '42w',
               },
               sourceField: 'timestamp',
             },
@@ -118,6 +138,27 @@ describe('date_histogram', () => {
     };
   });
 
+  function stateWithInterval(interval: string) {
+    return ({
+      ...state,
+      layers: {
+        ...state.layers,
+        first: {
+          ...state.layers.first,
+          columns: {
+            ...state.layers.first.columns,
+            col1: {
+              ...state.layers.first.columns.col1,
+              params: {
+                interval,
+              },
+            },
+          },
+        },
+      },
+    } as unknown) as IndexPatternPrivateState;
+  }
+
   describe('buildColumn', () => {
     it('should create column object with auto interval for primary time field', () => {
       const column = dateHistogramOperation.buildColumn({
@@ -188,7 +229,7 @@ describe('date_histogram', () => {
       expect(esAggsConfig).toEqual(
         expect.objectContaining({
           params: expect.objectContaining({
-            interval: 'w',
+            interval: '42w',
             field: 'timestamp',
           }),
         })
@@ -217,7 +258,7 @@ describe('date_histogram', () => {
       expect(column.label).toContain('start_date');
     });
 
-    it('should change interval from auto when switching to a non primary time field', () => {
+    it('should not change interval from auto when switching to a non primary time field', () => {
       const oldColumn: DateHistogramIndexPatternColumn = {
         operationType: 'date_histogram',
         sourceField: 'timestamp',
@@ -233,7 +274,7 @@ describe('date_histogram', () => {
 
       const column = dateHistogramOperation.onFieldChange(oldColumn, indexPattern, newDateField);
       expect(column).toHaveProperty('sourceField', 'start_date');
-      expect(column).toHaveProperty('params.interval', 'd');
+      expect(column).toHaveProperty('params.interval', 'auto');
       expect(column.label).toContain('start_date');
     });
   });
@@ -281,7 +322,7 @@ describe('date_histogram', () => {
       );
     });
 
-    it('should remove time zone param and normalize interval param', () => {
+    it('should retain interval', () => {
       const transferedColumn = dateHistogramOperation.transfer!(
         {
           dataType: 'date',
@@ -309,7 +350,7 @@ describe('date_histogram', () => {
       expect(transferedColumn).toEqual(
         expect.objectContaining({
           params: {
-            interval: 'M',
+            interval: '20s',
             timeZone: undefined,
           },
         })
@@ -322,55 +363,49 @@ describe('date_histogram', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultOptions}
           state={state}
           setState={setStateSpy}
           columnId="col1"
           layerId="first"
           currentColumn={state.layers.first.columns.col1 as DateHistogramIndexPatternColumn}
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
 
-      expect(instance.find(EuiRange).prop('value')).toEqual(1);
+      expect(instance.find('[data-test-subj="lensDateHistogramValue"]').prop('value')).toEqual(42);
+      expect(instance.find('[data-test-subj="lensDateHistogramUnit"]').prop('value')).toEqual('w');
     });
 
     it('should render current value for other index pattern', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultOptions}
           state={state}
           setState={setStateSpy}
           columnId="col2"
           currentColumn={state.layers.second.columns.col2 as DateHistogramIndexPatternColumn}
           layerId="second"
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
 
-      expect(instance.find(EuiRange).prop('value')).toEqual(2);
+      expect(instance.find('[data-test-subj="lensDateHistogramValue"]').prop('value')).toEqual('');
+      expect(instance.find('[data-test-subj="lensDateHistogramUnit"]').prop('value')).toEqual('d');
     });
 
-    it('should render disabled switch and no time intervals control for auto interval', () => {
+    it('should render disabled switch and no time interval control for auto interval', () => {
       const instance = shallow(
         <InlineOptions
+          {...defaultOptions}
           state={state}
           setState={jest.fn()}
           columnId="col1"
           currentColumn={state.layers.third.columns.col1 as DateHistogramIndexPatternColumn}
           layerId="third"
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
-      expect(instance.find(EuiRange).exists()).toBe(false);
+      expect(instance.find('[data-test-subj="lensDateHistogramValue"]').exists()).toBeFalsy();
+      expect(instance.find('[data-test-subj="lensDateHistogramUnit"]').exists()).toBeFalsy();
       expect(instance.find(EuiSwitch).prop('checked')).toBe(false);
     });
 
@@ -378,15 +413,12 @@ describe('date_histogram', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultOptions}
           state={state}
           setState={setStateSpy}
           columnId="col1"
           layerId="third"
           currentColumn={state.layers.third.columns.col1 as DateHistogramIndexPatternColumn}
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
       instance.find(EuiSwitch).prop('onChange')!({
@@ -394,57 +426,124 @@ describe('date_histogram', () => {
       } as React.ChangeEvent<HTMLInputElement>);
       expect(setStateSpy).toHaveBeenCalled();
       const newState = setStateSpy.mock.calls[0][0];
-      expect(newState).toHaveProperty('layers.third.columns.col1.params.interval', 'd');
+      expect(newState).toHaveProperty('layers.third.columns.col1.params.interval', '30d');
     });
 
-    it('should update state with the interval value', () => {
+    it('should force calendar values to 1', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultOptions}
           state={state}
           setState={setStateSpy}
           columnId="col1"
           layerId="first"
           currentColumn={state.layers.first.columns.col1 as DateHistogramIndexPatternColumn}
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
+      instance.find('[data-test-subj="lensDateHistogramValue"]').prop('onChange')!({
+        target: {
+          value: '2',
+        },
+      } as React.ChangeEvent<HTMLInputElement>);
+      expect(setStateSpy).toHaveBeenCalledWith(stateWithInterval('1w'));
+    });
 
-      instance.find(EuiRange).prop('onChange')!(
-        {
-          target: {
-            value: '2',
-          },
-        } as React.ChangeEvent<HTMLInputElement>,
-        true
+    it('should display error if an invalid interval is specified', () => {
+      const setStateSpy = jest.fn();
+      const testState = stateWithInterval('4quid');
+      const instance = shallow(
+        <InlineOptions
+          {...defaultOptions}
+          state={testState}
+          setState={setStateSpy}
+          columnId="col1"
+          layerId="first"
+          currentColumn={testState.layers.first.columns.col1 as DateHistogramIndexPatternColumn}
+        />
       );
-      expect(setStateSpy).toHaveBeenCalledWith({
-        ...state,
-        layers: {
-          ...state.layers,
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col1: {
-                ...state.layers.first.columns.col1,
-                params: {
-                  interval: 'd',
-                },
-              },
-            },
-          },
+      expect(instance.find('[data-test-subj="lensDateHistogramError"]').exists()).toBeTruthy();
+    });
+
+    it('should not display error if interval value is blank', () => {
+      const setStateSpy = jest.fn();
+      const testState = stateWithInterval('d');
+      const instance = shallow(
+        <InlineOptions
+          {...defaultOptions}
+          state={testState}
+          setState={setStateSpy}
+          columnId="col1"
+          layerId="first"
+          currentColumn={testState.layers.first.columns.col1 as DateHistogramIndexPatternColumn}
+        />
+      );
+      expect(instance.find('[data-test-subj="lensDateHistogramError"]').exists()).toBeFalsy();
+    });
+
+    it('should display error if interval value is 0', () => {
+      const setStateSpy = jest.fn();
+      const testState = stateWithInterval('0d');
+      const instance = shallow(
+        <InlineOptions
+          {...defaultOptions}
+          state={testState}
+          setState={setStateSpy}
+          columnId="col1"
+          layerId="first"
+          currentColumn={testState.layers.first.columns.col1 as DateHistogramIndexPatternColumn}
+        />
+      );
+      expect(instance.find('[data-test-subj="lensDateHistogramError"]').exists()).toBeTruthy();
+    });
+
+    it('should update the unit', () => {
+      const setStateSpy = jest.fn();
+      const instance = shallow(
+        <InlineOptions
+          {...defaultOptions}
+          state={state}
+          setState={setStateSpy}
+          columnId="col1"
+          layerId="first"
+          currentColumn={state.layers.first.columns.col1 as DateHistogramIndexPatternColumn}
+        />
+      );
+      instance.find('[data-test-subj="lensDateHistogramUnit"]').prop('onChange')!({
+        target: {
+          value: 'd',
         },
-      });
+      } as React.ChangeEvent<HTMLInputElement>);
+      expect(setStateSpy).toHaveBeenCalledWith(stateWithInterval('42d'));
+    });
+
+    it('should update the value', () => {
+      const setStateSpy = jest.fn();
+      const testState = stateWithInterval('42d');
+
+      const instance = shallow(
+        <InlineOptions
+          {...defaultOptions}
+          state={testState}
+          setState={setStateSpy}
+          columnId="col1"
+          layerId="first"
+          currentColumn={testState.layers.first.columns.col1 as DateHistogramIndexPatternColumn}
+        />
+      );
+      instance.find('[data-test-subj="lensDateHistogramValue"]').prop('onChange')!({
+        target: {
+          value: '9',
+        },
+      } as React.ChangeEvent<HTMLInputElement>);
+      expect(setStateSpy).toHaveBeenCalledWith(stateWithInterval('9d'));
     });
 
     it('should not render options if they are restricted', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultOptions}
           state={{
             ...state,
             indexPatterns: {
@@ -469,14 +568,10 @@ describe('date_histogram', () => {
           columnId="col1"
           layerId="first"
           currentColumn={state.layers.first.columns.col1 as DateHistogramIndexPatternColumn}
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
 
-      expect(instance.find(EuiRange)).toHaveLength(0);
+      expect(instance.find('[data-test-subj="lensDateHistogramValue"]').exists()).toBeFalsy();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.tsx
index 89c4899bb8e562..017dccab646079 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.tsx
@@ -7,31 +7,29 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiForm, EuiFormRow, EuiRange, EuiSwitch } from '@elastic/eui';
+
+// TODO: make this new-platform compatible
+import { isValidInterval } from 'ui/agg_types/utils';
+
+import {
+  EuiForm,
+  EuiFormRow,
+  EuiSwitch,
+  EuiFieldNumber,
+  EuiSelect,
+  EuiFlexItem,
+  EuiFlexGroup,
+  EuiTextColor,
+  EuiSpacer,
+} from '@elastic/eui';
 import { updateColumnParam } from '../../state_helpers';
 import { OperationDefinition } from '.';
 import { FieldBasedIndexPatternColumn } from './column_types';
-import { IndexPattern } from '../../types';
-
-type PropType<C> = C extends React.ComponentType<infer P> ? P : unknown;
+import { autoIntervalFromDateRange } from '../../auto_date';
+import { AggregationRestrictions } from '../../types';
 
 const autoInterval = 'auto';
-const supportedIntervals = ['M', 'w', 'd', 'h'];
-const defaultCustomInterval = supportedIntervals[2];
-
-// Add ticks to EuiRange component props
-const FixedEuiRange = (EuiRange as unknown) as React.ComponentType<
-  PropType<typeof EuiRange> & {
-    ticks?: Array<{
-      label: string;
-      value: number;
-    }>;
-  }
->;
-
-function supportsAutoInterval(fieldName: string, indexPattern: IndexPattern): boolean {
-  return indexPattern.timeFieldName ? indexPattern.timeFieldName === fieldName : false;
-}
+const calendarOnlyIntervals = new Set(['w', 'M', 'q', 'y']);
 
 export interface DateHistogramIndexPatternColumn extends FieldBasedIndexPatternColumn {
   operationType: 'date_histogram';
@@ -59,12 +57,11 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
       };
     }
   },
-  buildColumn({ suggestedPriority, field, indexPattern }) {
+  buildColumn({ suggestedPriority, field }) {
     let interval = autoInterval;
     let timeZone: string | undefined;
     if (field.aggregationRestrictions && field.aggregationRestrictions.date_histogram) {
-      interval = (field.aggregationRestrictions.date_histogram.calendar_interval ||
-        field.aggregationRestrictions.date_histogram.fixed_interval) as string;
+      interval = restrictedInterval(field.aggregationRestrictions) as string;
       timeZone = field.aggregationRestrictions.date_histogram.time_zone;
     }
     return {
@@ -99,6 +96,7 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
       newField.aggregationRestrictions.date_histogram
     ) {
       const restrictions = newField.aggregationRestrictions.date_histogram;
+
       return {
         ...column,
         params: {
@@ -108,38 +106,18 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
           // the restricted interval, we could carry it over directly. However as the current
           // UI does not allow to select multiples of an interval anyway, this is not included yet.
           // If the UI allows to pick more complicated intervals, this should be re-visited.
-          interval: (newField.aggregationRestrictions.date_histogram.calendar_interval ||
-            newField.aggregationRestrictions.date_histogram.fixed_interval) as string,
-        },
-      };
-    } else {
-      return {
-        ...column,
-        params: {
-          ...column.params,
-          // TODO remove this once it's possible to specify free intervals instead of picking from a list
-          interval: supportedIntervals.includes(column.params.interval)
-            ? column.params.interval
-            : supportedIntervals[0],
-          timeZone: undefined,
+          interval: restrictedInterval(newField.aggregationRestrictions) as string,
         },
       };
     }
+
+    return column;
   },
   onFieldChange: (oldColumn, indexPattern, field) => {
     return {
       ...oldColumn,
       label: field.name,
       sourceField: field.name,
-      params: {
-        ...oldColumn.params,
-        // If we have an "auto" interval but the field we're switching to doesn't support auto intervals
-        // we use the default custom interval instead
-        interval:
-          oldColumn.params.interval === 'auto' && !supportsAutoInterval(field.name, indexPattern)
-            ? defaultCustomInterval
-            : oldColumn.params.interval,
-      },
     };
   },
   toEsAggsConfig: (column, columnId) => ({
@@ -157,7 +135,7 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
       extended_bounds: {},
     },
   }),
-  paramEditor: ({ state, setState, currentColumn: currentColumn, layerId }) => {
+  paramEditor: ({ state, setState, currentColumn: currentColumn, layerId, dateRange }) => {
     const field =
       currentColumn &&
       state.indexPatterns[state.layers[layerId].indexPatternId].fields.find(
@@ -166,20 +144,35 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
     const intervalIsRestricted =
       field!.aggregationRestrictions && field!.aggregationRestrictions.date_histogram;
 
-    function intervalToNumeric(interval: string) {
-      return supportedIntervals.indexOf(interval);
-    }
+    const interval = parseInterval(currentColumn.params.interval);
 
-    function numericToInterval(i: number) {
-      return supportedIntervals[i];
-    }
+    // We force the interval value to 1 if it's empty, since that is the ES behavior,
+    // and the isValidInterval function doesn't handle the empty case properly. Fixing
+    // isValidInterval involves breaking changes in other areas.
+    const isValid = isValidInterval(
+      `${interval.value === '' ? '1' : interval.value}${interval.unit}`,
+      restrictedInterval(field!.aggregationRestrictions)
+    );
 
     function onChangeAutoInterval(ev: React.ChangeEvent<HTMLInputElement>) {
-      const interval = ev.target.checked ? defaultCustomInterval : autoInterval;
+      const value = ev.target.checked ? autoIntervalFromDateRange(dateRange) : autoInterval;
+      setState(updateColumnParam({ state, layerId, currentColumn, paramName: 'interval', value }));
+    }
+
+    const setInterval = (newInterval: typeof interval) => {
+      const isCalendarInterval = calendarOnlyIntervals.has(newInterval.unit);
+      const value = `${isCalendarInterval ? '1' : newInterval.value}${newInterval.unit || 'd'}`;
+
       setState(
-        updateColumnParam({ state, layerId, currentColumn, paramName: 'interval', value: interval })
+        updateColumnParam({
+          state,
+          layerId,
+          currentColumn,
+          value,
+          paramName: 'interval',
+        })
       );
-    }
+    };
 
     return (
       <EuiForm>
@@ -187,7 +180,7 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
           <EuiFormRow>
             <EuiSwitch
               label={i18n.translate('xpack.lens.indexPattern.dateHistogram.autoInterval', {
-                defaultMessage: 'Customize time intervals',
+                defaultMessage: 'Customize time interval',
               })}
               checked={currentColumn.params.interval !== autoInterval}
               onChange={onChangeAutoInterval}
@@ -196,8 +189,8 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
         )}
         {currentColumn.params.interval !== autoInterval && (
           <EuiFormRow
-            label={i18n.translate('xpack.lens.indexPattern.dateHistogram.interval', {
-              defaultMessage: 'Time intervals',
+            label={i18n.translate('xpack.lens.indexPattern.dateHistogram.minimumInterval', {
+              defaultMessage: 'Minimum interval',
             })}
           >
             {intervalIsRestricted ? (
@@ -209,33 +202,101 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
                 }}
               />
             ) : (
-              <FixedEuiRange
-                min={0}
-                max={supportedIntervals.length - 1}
-                step={1}
-                value={intervalToNumeric(currentColumn.params.interval)}
-                showTicks
-                ticks={supportedIntervals.map((interval, index) => ({
-                  label: interval,
-                  value: index,
-                }))}
-                onChange={(
-                  e: React.ChangeEvent<HTMLInputElement> | React.MouseEvent<HTMLButtonElement>
-                ) =>
-                  setState(
-                    updateColumnParam({
-                      state,
-                      layerId,
-                      currentColumn,
-                      paramName: 'interval',
-                      value: numericToInterval(Number((e.target as HTMLInputElement).value)),
-                    })
-                  )
-                }
-                aria-label={i18n.translate('xpack.lens.indexPattern.dateHistogram.interval', {
-                  defaultMessage: 'Time intervals',
-                })}
-              />
+              <>
+                <EuiFlexGroup>
+                  <EuiFlexItem>
+                    <EuiFieldNumber
+                      data-test-subj="lensDateHistogramValue"
+                      value={interval.value}
+                      disabled={calendarOnlyIntervals.has(interval.unit)}
+                      isInvalid={!isValid}
+                      onChange={e => {
+                        setInterval({
+                          ...interval,
+                          value: e.target.value,
+                        });
+                      }}
+                    />
+                  </EuiFlexItem>
+                  <EuiFlexItem>
+                    <EuiSelect
+                      data-test-subj="lensDateHistogramUnit"
+                      value={interval.unit}
+                      onChange={e => {
+                        setInterval({
+                          ...interval,
+                          unit: e.target.value,
+                        });
+                      }}
+                      isInvalid={!isValid}
+                      options={[
+                        {
+                          value: 'ms',
+                          text: i18n.translate(
+                            'xpack.lens.indexPattern.dateHistogram.milliseconds',
+                            {
+                              defaultMessage: 'milliseconds',
+                            }
+                          ),
+                        },
+                        {
+                          value: 's',
+                          text: i18n.translate('xpack.lens.indexPattern.dateHistogram.seconds', {
+                            defaultMessage: 'seconds',
+                          }),
+                        },
+                        {
+                          value: 'm',
+                          text: i18n.translate('xpack.lens.indexPattern.dateHistogram.minutes', {
+                            defaultMessage: 'minutes',
+                          }),
+                        },
+                        {
+                          value: 'h',
+                          text: i18n.translate('xpack.lens.indexPattern.dateHistogram.hours', {
+                            defaultMessage: 'hours',
+                          }),
+                        },
+                        {
+                          value: 'd',
+                          text: i18n.translate('xpack.lens.indexPattern.dateHistogram.days', {
+                            defaultMessage: 'days',
+                          }),
+                        },
+                        {
+                          value: 'w',
+                          text: i18n.translate('xpack.lens.indexPattern.dateHistogram.week', {
+                            defaultMessage: 'week',
+                          }),
+                        },
+                        {
+                          value: 'M',
+                          text: i18n.translate('xpack.lens.indexPattern.dateHistogram.month', {
+                            defaultMessage: 'month',
+                          }),
+                        },
+                        // Quarterly intervals appear to be unsupported by esaggs
+                        {
+                          value: 'y',
+                          text: i18n.translate('xpack.lens.indexPattern.dateHistogram.year', {
+                            defaultMessage: 'year',
+                          }),
+                        },
+                      ]}
+                    />
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+                {!isValid && (
+                  <>
+                    <EuiSpacer size="s" />
+                    <EuiTextColor color="danger" data-test-subj="lensDateHistogramError">
+                      {i18n.translate('xpack.lens.indexPattern.invalidInterval', {
+                        defaultMessage: 'Invalid interval value',
+                      })}
+                    </EuiTextColor>
+                  </>
+                )}
+              </>
             )}
           </EuiFormRow>
         )}
@@ -243,3 +304,26 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
     );
   },
 };
+
+function parseInterval(currentInterval: string) {
+  const interval = currentInterval || '';
+  const valueMatch = interval.match(/[\d]+/) || [];
+  const unitMatch = interval.match(/[\D]+/) || [];
+  const result = parseInt(valueMatch[0] || '', 10);
+
+  return {
+    value: isNaN(result) ? '' : result,
+    unit: unitMatch[0] || 'h',
+  };
+}
+
+function restrictedInterval(aggregationRestrictions?: AggregationRestrictions) {
+  if (!aggregationRestrictions || !aggregationRestrictions.date_histogram) {
+    return;
+  }
+
+  return (
+    aggregationRestrictions.date_histogram.calendar_interval ||
+    aggregationRestrictions.date_histogram.fixed_interval
+  );
+}
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/index.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/index.ts
index fdb5419588e7e8..6456250157148a 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/index.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/index.ts
@@ -4,20 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Storage } from 'ui/storage';
 import {
   UiSettingsClientContract,
   SavedObjectsClientContract,
   HttpServiceBase,
 } from 'src/core/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { termsOperation } from './terms';
 import { cardinalityOperation } from './cardinality';
 import { minOperation, averageOperation, sumOperation, maxOperation } from './metrics';
 import { dateHistogramOperation } from './date_histogram';
 import { countOperation } from './count';
 import { DimensionPriority, StateSetter, OperationMetadata } from '../../../types';
-import { BaseIndexPatternColumn, FieldBasedIndexPatternColumn } from './column_types';
+import { BaseIndexPatternColumn } from './column_types';
 import { IndexPatternPrivateState, IndexPattern, IndexPatternField } from '../../types';
+import { DateRange } from '../../../../common';
 
 // List of all operation definitions registered to this data source.
 // If you want to implement a new operation, add it to this array and
@@ -48,9 +49,10 @@ export interface ParamEditorProps<C extends BaseIndexPatternColumn> {
   columnId: string;
   layerId: string;
   uiSettings: UiSettingsClientContract;
-  storage: Storage;
+  storage: IStorageWrapper;
   savedObjectsClient: SavedObjectsClientContract;
   http: HttpServiceBase;
+  dateRange: DateRange;
 }
 
 interface BaseOperationDefinitionProps<C extends BaseIndexPatternColumn> {
@@ -140,26 +142,14 @@ interface FieldBasedOperationDefinition<C extends BaseIndexPatternColumn>
   onFieldChange: (oldColumn: C, indexPattern: IndexPattern, field: IndexPatternField) => C;
 }
 
-interface DocumentBasedOperationDefinition<C extends BaseIndexPatternColumn>
-  extends BaseOperationDefinitionProps<C> {
-  /**
-   * Returns the meta data of the operation if applied to documents of the given index pattern.
-   * Undefined if the operation is not applicable to the index pattern.
-   */
-  getPossibleOperationForDocument: (indexPattern: IndexPattern) => OperationMetadata | undefined;
-  buildColumn: (arg: BaseBuildColumnArgs) => C;
-}
-
 /**
  * Shape of an operation definition. If the type parameter of the definition
  * indicates a field based column, `getPossibleOperationForField` has to be
  * specified, otherwise `getPossibleOperationForDocument` has to be defined.
  */
-export type OperationDefinition<
-  C extends BaseIndexPatternColumn
-> = C extends FieldBasedIndexPatternColumn
-  ? FieldBasedOperationDefinition<C>
-  : DocumentBasedOperationDefinition<C>;
+export type OperationDefinition<C extends BaseIndexPatternColumn> = FieldBasedOperationDefinition<
+  C
+>;
 
 // Helper to to infer the column type out of the operation definition.
 // This is done to avoid it to have to list out the column types along with
@@ -185,9 +175,7 @@ export type OperationType = (typeof internalOperationDefinitions)[number]['type'
  * This is an operation definition of an unspecified column out of all possible
  * column types. It
  */
-export type GenericOperationDefinition =
-  | FieldBasedOperationDefinition<IndexPatternColumn>
-  | DocumentBasedOperationDefinition<IndexPatternColumn>;
+export type GenericOperationDefinition = FieldBasedOperationDefinition<IndexPatternColumn>;
 
 /**
  * List of all available operation definitions
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/terms.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/terms.test.tsx
index df5bfac6d03a47..e57745c11fc694 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/terms.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/terms.test.tsx
@@ -12,7 +12,7 @@ import {
   SavedObjectsClientContract,
   HttpServiceBase,
 } from 'src/core/public';
-import { Storage } from 'ui/storage';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { createMockedIndexPattern } from '../../mocks';
 import { TermsIndexPatternColumn } from './terms';
 import { termsOperation } from '.';
@@ -20,6 +20,14 @@ import { IndexPatternPrivateState } from '../../types';
 
 jest.mock('ui/new_platform');
 
+const defaultProps = {
+  storage: {} as IStorageWrapper,
+  uiSettings: {} as UiSettingsClientContract,
+  savedObjectsClient: {} as SavedObjectsClientContract,
+  dateRange: { fromDate: 'now-1d', toDate: 'now' },
+  http: {} as HttpServiceBase,
+};
+
 describe('terms', () => {
   let state: IndexPatternPrivateState;
   const InlineOptions = termsOperation.paramEditor!;
@@ -40,8 +48,6 @@ describe('terms', () => {
               label: 'Top value of category',
               dataType: 'string',
               isBucketed: true,
-
-              // Private
               operationType: 'terms',
               params: {
                 orderBy: { type: 'alphabetical' },
@@ -54,8 +60,7 @@ describe('terms', () => {
               label: 'Count',
               dataType: 'number',
               isBucketed: false,
-
-              // Private
+              sourceField: 'Records',
               operationType: 'count',
             },
           },
@@ -206,8 +211,7 @@ describe('terms', () => {
             label: 'Count',
             dataType: 'number',
             isBucketed: false,
-
-            // Private
+            sourceField: 'Records',
             operationType: 'count',
           },
         },
@@ -247,8 +251,7 @@ describe('terms', () => {
           label: 'Count',
           dataType: 'number',
           isBucketed: false,
-
-          // Private
+          sourceField: 'Records',
           operationType: 'count',
         },
       });
@@ -324,15 +327,12 @@ describe('terms', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultProps}
           state={state}
           setState={setStateSpy}
           columnId="col1"
           currentColumn={state.layers.first.columns.col1 as TermsIndexPatternColumn}
           layerId="first"
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
 
@@ -350,15 +350,12 @@ describe('terms', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultProps}
           state={state}
           setState={setStateSpy}
           columnId="col1"
           currentColumn={state.layers.first.columns.col1 as TermsIndexPatternColumn}
           layerId="first"
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
 
@@ -398,15 +395,12 @@ describe('terms', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultProps}
           state={state}
           setState={setStateSpy}
           columnId="col1"
           layerId="first"
           currentColumn={state.layers.first.columns.col1 as TermsIndexPatternColumn}
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
 
@@ -422,15 +416,12 @@ describe('terms', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultProps}
           state={state}
           setState={setStateSpy}
           columnId="col1"
           layerId="first"
           currentColumn={state.layers.first.columns.col1 as TermsIndexPatternColumn}
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
 
@@ -467,15 +458,12 @@ describe('terms', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultProps}
           state={state}
           setState={setStateSpy}
           columnId="col1"
           layerId="first"
           currentColumn={state.layers.first.columns.col1 as TermsIndexPatternColumn}
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
 
@@ -486,15 +474,12 @@ describe('terms', () => {
       const setStateSpy = jest.fn();
       const instance = shallow(
         <InlineOptions
+          {...defaultProps}
           state={state}
           setState={setStateSpy}
           columnId="col1"
           layerId="first"
           currentColumn={state.layers.first.columns.col1 as TermsIndexPatternColumn}
-          storage={{} as Storage}
-          uiSettings={{} as UiSettingsClientContract}
-          savedObjectsClient={{} as SavedObjectsClientContract}
-          http={{} as HttpServiceBase}
         />
       );
 
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/operations.test.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/operations.test.ts
index 82a93ee2a05e10..0161b93effc52c 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/operations.test.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/operations.test.ts
@@ -8,6 +8,7 @@ import { getOperationTypesForField, getAvailableOperationsByMetadata, buildColum
 import { AvgIndexPatternColumn, MinIndexPatternColumn } from './definitions/metrics';
 import { CountIndexPatternColumn } from './definitions/count';
 import { IndexPatternPrivateState } from '../types';
+import { documentField } from '../document_field';
 
 jest.mock('ui/new_platform');
 jest.mock('../loader');
@@ -179,6 +180,7 @@ describe('getOperationTypesForField', () => {
         columns: state.layers.first.columns,
         suggestedPriority: 0,
         op: 'count',
+        field: documentField,
       });
       expect(column.operationType).toEqual('count');
     });
@@ -216,7 +218,7 @@ describe('getOperationTypesForField', () => {
         indexPattern: expectedIndexPatterns[1],
         columns: state.layers.first.columns,
         suggestedPriority: 0,
-        asDocumentOperation: true,
+        field: documentField,
       }) as CountIndexPatternColumn;
       expect(column.operationType).toEqual('count');
     });
@@ -296,10 +298,6 @@ describe('getOperationTypesForField', () => {
                 "operationType": "sum",
                 "type": "field",
               },
-              Object {
-                "operationType": "count",
-                "type": "document",
-              },
             ],
           },
         ]
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/operations.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/operations.ts
index f2ab68612868c9..ecd0942eef7b48 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/operations.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/operations.ts
@@ -14,6 +14,7 @@ import {
   IndexPatternColumn,
 } from './definitions';
 import { IndexPattern, IndexPatternField } from '../types';
+import { documentField } from '../document_field';
 
 /**
  * Returns all available operation types as a list at runtime.
@@ -68,9 +69,21 @@ export function getOperationTypesForField(field: IndexPatternField) {
     .map(({ type }) => type);
 }
 
-type OperationFieldTuple =
-  | { type: 'field'; operationType: OperationType; field: string }
-  | { type: 'document'; operationType: OperationType };
+let documentOperations: Set<string>;
+
+export function isDocumentOperation(type: string) {
+  // This can't be done at the root level, because it breaks tests, thanks to mocking oddities
+  // so we do it here, and cache the result.
+  documentOperations =
+    documentOperations || new Set(getOperationTypesForField(documentField) as string[]);
+  return documentOperations.has(type);
+}
+
+interface OperationFieldTuple {
+  type: 'field';
+  operationType: OperationType;
+  field: string;
+}
 
 /**
  * Returns all possible operations (matches between operations and fields of the index
@@ -119,11 +132,6 @@ export function getAvailableOperationsByMetadata(indexPattern: IndexPattern) {
   };
 
   operationDefinitions.forEach(operationDefinition => {
-    addToMap(
-      { type: 'document', operationType: operationDefinition.type },
-      getPossibleOperationForDocument(operationDefinition, indexPattern)
-    );
-
     indexPattern.fields.forEach(field => {
       addToMap(
         {
@@ -139,15 +147,6 @@ export function getAvailableOperationsByMetadata(indexPattern: IndexPattern) {
   return Object.values(operationByMetadata);
 }
 
-function getPossibleOperationForDocument(
-  operationDefinition: GenericOperationDefinition,
-  indexPattern: IndexPattern
-): OperationMetadata | undefined {
-  return 'getPossibleOperationForDocument' in operationDefinition
-    ? operationDefinition.getPossibleOperationForDocument(indexPattern)
-    : undefined;
-}
-
 function getPossibleOperationForField(
   operationDefinition: GenericOperationDefinition,
   field: IndexPatternField
@@ -203,24 +202,18 @@ export function buildColumn({
   layerId,
   indexPattern,
   suggestedPriority,
-  asDocumentOperation,
 }: {
   op?: OperationType;
   columns: Partial<Record<string, IndexPatternColumn>>;
   suggestedPriority: DimensionPriority | undefined;
   layerId: string;
   indexPattern: IndexPattern;
-  field?: IndexPatternField;
-  asDocumentOperation?: boolean;
+  field: IndexPatternField;
 }): IndexPatternColumn {
   let operationDefinition: GenericOperationDefinition | undefined;
 
   if (op) {
     operationDefinition = operationDefinitionMap[op];
-  } else if (asDocumentOperation) {
-    operationDefinition = getDefinition(definition =>
-      Boolean(getPossibleOperationForDocument(definition, indexPattern))
-    );
   } else if (field) {
     operationDefinition = getDefinition(definition =>
       Boolean(getPossibleOperationForField(definition, field))
@@ -238,19 +231,14 @@ export function buildColumn({
     indexPattern,
   };
 
-  // check for the operation for field getter to determine whether
-  // this is a field based operation type
-  if ('getPossibleOperationForField' in operationDefinition) {
-    if (!field) {
-      throw new Error(`Invariant error: ${operationDefinition.type} operation requires field`);
-    }
-    return operationDefinition.buildColumn({
-      ...baseOptions,
-      field,
-    });
-  } else {
-    return operationDefinition.buildColumn(baseOptions);
+  if (!field) {
+    throw new Error(`Invariant error: ${operationDefinition.type} operation requires field`);
   }
+
+  return operationDefinition.buildColumn({
+    ...baseOptions,
+    field,
+  });
 }
 
 export { operationDefinitionMap } from './definitions';
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/plugin.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/plugin.tsx
index 9c4835437546e3..11bc52fc483785 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/plugin.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/plugin.tsx
@@ -4,17 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Registry } from '@kbn/interpreter/target/common';
 import { CoreSetup } from 'src/core/public';
 // The following dependencies on ui/* and src/legacy/core_plugins must be mocked when testing
 import chrome, { Chrome } from 'ui/chrome';
-import { Storage } from 'ui/storage';
 import { npSetup, npStart } from 'ui/new_platform';
-import { ExpressionFunction } from '../../../../../../src/legacy/core_plugins/interpreter/public';
-import { functionsRegistry } from '../../../../../../src/legacy/core_plugins/interpreter/public/registries';
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { getIndexPatternDatasource } from './indexpattern';
 import { renameColumns } from './rename_columns';
 import { autoDate } from './auto_date';
+import { ExpressionsSetup } from '../../../../../../src/plugins/expressions/public';
 
 // TODO these are intermediary types because interpreter is not typed yet
 // They can get replaced by references to the real interfaces as soon as they
@@ -22,22 +20,15 @@ import { autoDate } from './auto_date';
 
 export interface IndexPatternDatasourceSetupPlugins {
   chrome: Chrome;
-  interpreter: InterpreterSetup;
-}
-
-export interface InterpreterSetup {
-  functionsRegistry: Registry<
-    ExpressionFunction<string, unknown, unknown, unknown>,
-    ExpressionFunction<string, unknown, unknown, unknown>
-  >;
+  expressions: ExpressionsSetup;
 }
 
 class IndexPatternDatasourcePlugin {
   constructor() {}
 
-  setup(core: CoreSetup, { interpreter }: IndexPatternDatasourceSetupPlugins) {
-    interpreter.functionsRegistry.register(() => renameColumns);
-    interpreter.functionsRegistry.register(() => autoDate);
+  setup(core: CoreSetup, { expressions }: IndexPatternDatasourceSetupPlugins) {
+    expressions.registerFunction(renameColumns);
+    expressions.registerFunction(autoDate);
   }
 
   stop() {}
@@ -48,9 +39,7 @@ const plugin = new IndexPatternDatasourcePlugin();
 export const indexPatternDatasourceSetup = () => {
   plugin.setup(npSetup.core, {
     chrome,
-    interpreter: {
-      functionsRegistry,
-    },
+    expressions: npSetup.plugins.expressions,
   });
 
   return getIndexPatternDatasource({
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/rename_columns.test.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/rename_columns.test.ts
index 74de89d584d2ba..61823fd09c9677 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/rename_columns.test.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/rename_columns.test.ts
@@ -61,6 +61,25 @@ describe('rename_columns', () => {
     `);
   });
 
+  it('should replace "" with a visible value', () => {
+    const input: KibanaDatatable = {
+      type: 'kibana_datatable',
+      columns: [{ id: 'a', name: 'A' }],
+      rows: [{ a: '' }],
+    };
+
+    const idMap = {
+      a: {
+        id: 'a',
+        label: 'Austrailia',
+      },
+    };
+
+    expect(renameColumns.fn(input, { idMap: JSON.stringify(idMap) }, {}).rows[0].a).toEqual(
+      '(empty)'
+    );
+  });
+
   it('should keep columns which are not mapped', () => {
     const input: KibanaDatatable = {
       type: 'kibana_datatable',
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/rename_columns.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/rename_columns.ts
index 87e51cb62ba1de..66073c6a5e9d40 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/rename_columns.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/rename_columns.ts
@@ -54,9 +54,9 @@ export const renameColumns: ExpressionFunction<
 
         Object.entries(row).forEach(([id, value]) => {
           if (id in idMap) {
-            mappedRow[idMap[id].id] = value;
+            mappedRow[idMap[id].id] = sanitizeValue(value);
           } else {
-            mappedRow[id] = value;
+            mappedRow[id] = sanitizeValue(value);
           }
         });
 
@@ -91,3 +91,13 @@ function getColumnName(originalColumn: OriginalColumn, newColumn: KibanaDatatabl
 
   return originalColumn.label;
 }
+
+function sanitizeValue(value: unknown) {
+  if (value === '') {
+    return i18n.translate('xpack.lens.indexpattern.emptyTextColumnValue', {
+      defaultMessage: '(empty)',
+    });
+  }
+
+  return value;
+}
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/state_helpers.test.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/state_helpers.test.ts
index 9dbf671dffa90a..ad3d3f3816262e 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/state_helpers.test.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/state_helpers.test.ts
@@ -54,8 +54,7 @@ describe('state_helpers', () => {
                 label: 'Count',
                 dataType: 'number',
                 isBucketed: false,
-
-                // Private
+                sourceField: 'Records',
                 operationType: 'count',
               },
             },
@@ -102,8 +101,7 @@ describe('state_helpers', () => {
                 label: 'Count',
                 dataType: 'number',
                 isBucketed: false,
-
-                // Private
+                sourceField: 'Records',
                 operationType: 'count',
               },
             },
@@ -328,8 +326,7 @@ describe('state_helpers', () => {
                 label: 'Count',
                 dataType: 'number',
                 isBucketed: false,
-
-                // Private
+                sourceField: 'Records',
                 operationType: 'count',
               },
             },
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts
index 3bf3be41f4c89c..9ed50836333148 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts
@@ -20,25 +20,27 @@ export interface IndexPattern {
   >;
 }
 
+export type AggregationRestrictions = Partial<
+  Record<
+    string,
+    {
+      agg: string;
+      interval?: number;
+      fixed_interval?: string;
+      calendar_interval?: string;
+      delay?: string;
+      time_zone?: string;
+    }
+  >
+>;
+
 export interface IndexPatternField {
   name: string;
   type: string;
   esTypes?: string[];
   aggregatable: boolean;
   searchable: boolean;
-  aggregationRestrictions?: Partial<
-    Record<
-      string,
-      {
-        agg: string;
-        interval?: number;
-        fixed_interval?: string;
-        calendar_interval?: string;
-        delay?: string;
-        time_zone?: string;
-      }
-    >
-  >;
+  aggregationRestrictions?: AggregationRestrictions;
 }
 
 export interface IndexPatternLayer {
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/utils.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/utils.ts
index aab991a27856ad..fadee01e695d5c 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/utils.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/utils.ts
@@ -10,6 +10,15 @@ import {
   BaseIndexPatternColumn,
   FieldBasedIndexPatternColumn,
 } from './operations/definitions/column_types';
+import { DataType } from '../types';
+
+/**
+ * Normalizes the specified operation type. (e.g. document operations
+ * produce 'number')
+ */
+export function normalizeOperationDataType(type: DataType) {
+  return type === 'document' ? 'number' : type;
+}
 
 export function hasField(column: BaseIndexPatternColumn): column is FieldBasedIndexPatternColumn {
   return 'sourceField' in column;
diff --git a/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.test.ts b/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.test.ts
index 9b65cbefaf7996..15d36a7c311690 100644
--- a/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.test.ts
+++ b/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.test.ts
@@ -11,9 +11,9 @@ import {
   trackUiEvent,
   trackSuggestionEvent,
 } from './factory';
-import { Storage } from 'src/legacy/core_plugins/data/public/types';
 import { coreMock } from 'src/core/public/mocks';
 import { HttpServiceBase } from 'kibana/public';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 
 jest.useFakeTimers();
 
@@ -30,7 +30,7 @@ const createMockStorage = () => {
 };
 
 describe('Lens UI telemetry', () => {
-  let storage: jest.Mocked<Storage>;
+  let storage: jest.Mocked<IStorageWrapper>;
   let http: jest.Mocked<HttpServiceBase>;
   let dateSpy: jest.SpyInstance;
 
@@ -45,7 +45,6 @@ describe('Lens UI telemetry', () => {
     const fakeManager = new LensReportManager({
       http,
       storage,
-      basePath: '/basepath',
     });
     setReportManager(fakeManager);
   });
@@ -84,7 +83,7 @@ describe('Lens UI telemetry', () => {
 
     jest.runOnlyPendingTimers();
 
-    expect(http.post).toHaveBeenCalledWith(`/basepath/api/lens/telemetry`, {
+    expect(http.post).toHaveBeenCalledWith(`/api/lens/telemetry`, {
       body: JSON.stringify({
         events: {
           '2019-10-23': {
diff --git a/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.ts b/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.ts
index d264e9c77c4634..1a8ec604eda54d 100644
--- a/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.ts
+++ b/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.ts
@@ -7,7 +7,7 @@
 import moment from 'moment';
 import { HttpServiceBase } from 'src/core/public';
 
-import { Storage } from 'src/legacy/core_plugins/data/public/types';
+import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { BASE_API_URL } from '../../common';
 
 const STORAGE_KEY = 'lens-ui-telemetry';
@@ -43,23 +43,13 @@ export class LensReportManager {
   private events: Record<string, Record<string, number>> = {};
   private suggestionEvents: Record<string, Record<string, number>> = {};
 
-  private storage: Storage;
+  private storage: IStorageWrapper;
   private http: HttpServiceBase;
-  private basePath: string;
   private timer: ReturnType<typeof setInterval>;
 
-  constructor({
-    storage,
-    http,
-    basePath,
-  }: {
-    storage: Storage;
-    http: HttpServiceBase;
-    basePath: string;
-  }) {
+  constructor({ storage, http }: { storage: IStorageWrapper; http: HttpServiceBase }) {
     this.storage = storage;
     this.http = http;
-    this.basePath = basePath;
 
     this.readFromStorage();
 
@@ -96,7 +86,7 @@ export class LensReportManager {
     this.readFromStorage();
     if (Object.keys(this.events).length || Object.keys(this.suggestionEvents).length) {
       try {
-        await this.http.post(`${this.basePath}${BASE_API_URL}/telemetry`, {
+        await this.http.post(`${BASE_API_URL}/telemetry`, {
           body: JSON.stringify({
             events: this.events,
             suggestionEvents: this.suggestionEvents,
diff --git a/x-pack/legacy/plugins/lens/public/loader.test.tsx b/x-pack/legacy/plugins/lens/public/loader.test.tsx
new file mode 100644
index 00000000000000..f448849d1043cd
--- /dev/null
+++ b/x-pack/legacy/plugins/lens/public/loader.test.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiProgress } from '@elastic/eui';
+import { Loader } from './loader';
+import { mount } from 'enzyme';
+
+describe('loader', () => {
+  it('shows a loading indicator when loading', async () => {
+    const load = jest.fn(() => Promise.resolve());
+    const inst = mount(<Loader loadDeps={[]} load={load} />);
+
+    expect(inst.find(EuiProgress).length).toEqual(1);
+
+    await load();
+    inst.update();
+
+    expect(inst.find(EuiProgress).length).toEqual(0);
+  });
+
+  it('hides loading indicator when failed', async () => {
+    const load = jest.fn(() => Promise.reject());
+    const inst = mount(<Loader loadDeps={[]} load={load} />);
+
+    expect(inst.find(EuiProgress).length).toEqual(1);
+
+    await Promise.resolve();
+    inst.update();
+
+    expect(inst.find(EuiProgress).length).toEqual(0);
+  });
+
+  it('does not run load in parallel', async () => {
+    let count = 0;
+    let ranInParallel = false;
+    const load = jest.fn(() => {
+      if (count) {
+        ranInParallel = true;
+      }
+      ++count;
+      return Promise.resolve().then(() => --count);
+    });
+    const inst = mount(<Loader loadDeps={['bar']} load={load} />);
+    inst.setProps({ loadDeps: ['foo'] });
+    inst.update();
+
+    await Promise.resolve();
+    inst.update();
+
+    expect(load).toHaveBeenCalledTimes(2);
+    expect(ranInParallel).toBeFalsy();
+  });
+});
diff --git a/x-pack/legacy/plugins/lens/public/loader.tsx b/x-pack/legacy/plugins/lens/public/loader.tsx
new file mode 100644
index 00000000000000..ebbb006d837b04
--- /dev/null
+++ b/x-pack/legacy/plugins/lens/public/loader.tsx
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState, useEffect, useRef } from 'react';
+import { EuiProgress } from '@elastic/eui';
+
+/**
+ * Executes the specified load function any time loadDeps changes. Ensures the load
+ * function is never run in parallel. Shows a loading indicator while loading.
+ */
+export function Loader(props: { load: () => Promise<unknown>; loadDeps: unknown[] }) {
+  const [isProcessing, setIsProcessing] = useState(false);
+  const prevRequest = useRef<Promise<unknown> | undefined>(undefined);
+  const nextRequest = useRef<(() => void) | undefined>(undefined);
+
+  useEffect(function performLoad() {
+    if (prevRequest.current) {
+      nextRequest.current = performLoad;
+      return;
+    }
+
+    setIsProcessing(true);
+    prevRequest.current = props
+      .load()
+      .catch(() => {})
+      .then(() => {
+        const reload = nextRequest.current;
+        prevRequest.current = undefined;
+        nextRequest.current = undefined;
+
+        if (reload) {
+          reload();
+        } else {
+          setIsProcessing(false);
+        }
+      });
+  }, props.loadDeps);
+
+  if (!isProcessing) {
+    return null;
+  }
+
+  return <EuiProgress size="xs" color="accent" position="absolute" />;
+}
diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_expression.tsx b/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_expression.tsx
index 68de585771a798..e70a10576106c4 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_expression.tsx
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_expression.tsx
@@ -8,7 +8,10 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/types';
 import { FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
-import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/expressions/public/expressions';
+import {
+  IInterpreterRenderFunction,
+  IInterpreterRenderHandlers,
+} from '../../../../../../src/legacy/core_plugins/expressions/public/expressions';
 import { MetricConfig } from './types';
 import { LensMultiTable } from '../types';
 import { AutoScale } from './auto_scale';
@@ -76,12 +79,15 @@ export const getMetricChartRenderer = (
   formatFactory: FormatFactory
 ): IInterpreterRenderFunction<MetricChartProps> => ({
   name: 'lens_metric_chart_renderer',
-  displayName: 'Metric Chart',
-  help: 'Metric Chart Renderer',
+  displayName: 'Metric chart',
+  help: 'Metric chart renderer',
   validate: () => {},
   reuseDomNode: true,
-  render: async (domNode: Element, config: MetricChartProps, _handlers: unknown) => {
-    ReactDOM.render(<MetricChart {...config} formatFactory={formatFactory} />, domNode);
+  render: (domNode: Element, config: MetricChartProps, handlers: IInterpreterRenderHandlers) => {
+    ReactDOM.render(<MetricChart {...config} formatFactory={formatFactory} />, domNode, () => {
+      handlers.done();
+    });
+    handlers.onDestroy(() => ReactDOM.unmountComponentAtNode(domNode));
   },
 });
 
diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_suggestions.test.ts b/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_suggestions.test.ts
index 770d8594172f1d..c9bfadbefaf5f8 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_suggestions.test.ts
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_suggestions.test.ts
@@ -80,7 +80,9 @@ describe('metric_suggestions', () => {
           layerId: 'l1',
           changeType: 'unchanged',
         },
-      ] as TableSuggestion[]).map(table => expect(getSuggestions({ table })).toEqual([]))
+      ] as TableSuggestion[]).map(table =>
+        expect(getSuggestions({ table, keptLayerIds: ['l1'] })).toEqual([])
+      )
     );
   });
 
@@ -92,6 +94,7 @@ describe('metric_suggestions', () => {
         layerId: 'l1',
         changeType: 'unchanged',
       },
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -107,4 +110,32 @@ describe('metric_suggestions', () => {
       }
     `);
   });
+
+  test('does not suggest for multiple layers', () => {
+    const suggestions = getSuggestions({
+      table: {
+        columns: [numCol('bytes')],
+        isMultiRow: false,
+        layerId: 'l1',
+        changeType: 'unchanged',
+      },
+      keptLayerIds: ['l1', 'l2'],
+    });
+
+    expect(suggestions).toHaveLength(0);
+  });
+
+  test('does not suggest when the suggestion keeps a different layer', () => {
+    const suggestions = getSuggestions({
+      table: {
+        columns: [numCol('bytes')],
+        isMultiRow: false,
+        layerId: 'newer',
+        changeType: 'initial',
+      },
+      keptLayerIds: ['older'],
+    });
+
+    expect(suggestions).toHaveLength(0);
+  });
 });
diff --git a/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_suggestions.ts b/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_suggestions.ts
index f2b655a288270e..23df3f55f27770 100644
--- a/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_suggestions.ts
+++ b/x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_suggestions.ts
@@ -16,11 +16,14 @@ import chartMetricSVG from '../assets/chart_metric.svg';
 export function getSuggestions({
   table,
   state,
+  keptLayerIds,
 }: SuggestionRequest<State>): Array<VisualizationSuggestion<State>> {
   // We only render metric charts for single-row queries. We require a single, numeric column.
   if (
     table.isMultiRow ||
-    table.columns.length > 1 ||
+    keptLayerIds.length > 1 ||
+    (keptLayerIds.length && table.layerId !== keptLayerIds[0]) ||
+    table.columns.length !== 1 ||
     table.columns[0].operation.dataType !== 'number'
   ) {
     return [];
diff --git a/x-pack/legacy/plugins/lens/public/persistence/saved_object_store.ts b/x-pack/legacy/plugins/lens/public/persistence/saved_object_store.ts
index 5fa7e3f0aca4ac..460cd76e8390d5 100644
--- a/x-pack/legacy/plugins/lens/public/persistence/saved_object_store.ts
+++ b/x-pack/legacy/plugins/lens/public/persistence/saved_object_store.ts
@@ -6,8 +6,8 @@
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { SavedObjectAttributes } from 'src/core/server';
-import { Filter } from '@kbn/es-query';
 import { Query } from 'src/plugins/data/common';
+import { esFilters } from '../../../../../../src/plugins/data/public';
 
 export interface Document {
   id?: string;
@@ -22,7 +22,7 @@ export interface Document {
     datasourceStates: Record<string, unknown>;
     visualization: unknown;
     query: Query;
-    filters: Filter[];
+    filters: esFilters.Filter[];
   };
 }
 
diff --git a/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts b/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts
index 8c0b9cb25300d2..562d0f0ef6135f 100644
--- a/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts
+++ b/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts
@@ -20,7 +20,7 @@ visualizations.types.registerAlias({
     }),
   },
   title: i18n.translate('xpack.lens.visTypeAlias.title', {
-    defaultMessage: 'Lens Visualizations',
+    defaultMessage: 'Lens',
   }),
   description: i18n.translate('xpack.lens.visTypeAlias.description', {
     defaultMessage: `Lens is a simpler way to create basic visualizations`,
diff --git a/x-pack/legacy/plugins/lens/public/types.ts b/x-pack/legacy/plugins/lens/public/types.ts
index 1efa123f4f0a39..b66bb7bee8f8ad 100644
--- a/x-pack/legacy/plugins/lens/public/types.ts
+++ b/x-pack/legacy/plugins/lens/public/types.ts
@@ -6,28 +6,33 @@
 
 import { Ast } from '@kbn/interpreter/common';
 import { IconType } from '@elastic/eui/src/components/icon/icon';
-import { Filter } from '@kbn/es-query';
 import { CoreSetup } from 'src/core/public';
 import { Query } from 'src/plugins/data/common';
 import { SavedQuery } from 'src/legacy/core_plugins/data/public';
 import { KibanaDatatable } from '../../../../../src/legacy/core_plugins/interpreter/common';
 import { DragContextState } from './drag_drop';
 import { Document } from './persistence';
+import { DateRange } from '../common';
+import { esFilters } from '../../../../../src/plugins/data/public';
 
 // eslint-disable-next-line
 export interface EditorFrameOptions {}
 
 export type ErrorCallback = (e: { message: string }) => void;
 
+export interface PublicAPIProps<T> {
+  state: T;
+  setState: StateSetter<T>;
+  layerId: string;
+  dateRange: DateRange;
+}
+
 export interface EditorFrameProps {
   onError: ErrorCallback;
   doc?: Document;
-  dateRange: {
-    fromDate: string;
-    toDate: string;
-  };
+  dateRange: DateRange;
   query: Query;
-  filters: Filter[];
+  filters: esFilters.Filter[];
   savedQuery?: SavedQuery;
 
   // Frame loader (app or embeddable) is expected to call this when it loads and updates
@@ -99,12 +104,14 @@ export interface TableSuggestion {
  * * `unchanged` means the table is the same in the currently active configuration
  * * `reduced` means the table is a reduced version of the currently active table (some columns dropped, but not all of them)
  * * `extended` means the table is an extended version of the currently active table (added one or multiple additional columns)
+ * * `layers` means the change is a change to the layer structure, not to the table
  */
-export type TableChangeType = 'initial' | 'unchanged' | 'reduced' | 'extended';
+export type TableChangeType = 'initial' | 'unchanged' | 'reduced' | 'extended' | 'layers';
 
 export interface DatasourceSuggestion<T = unknown> {
   state: T;
   table: TableSuggestion;
+  keptLayerIds: string[];
 }
 
 export interface DatasourceMetaData {
@@ -138,7 +145,7 @@ export interface Datasource<T = unknown, P = unknown> {
   getDatasourceSuggestionsForField: (state: T, field: unknown) => Array<DatasourceSuggestion<T>>;
   getDatasourceSuggestionsFromCurrentState: (state: T) => Array<DatasourceSuggestion<T>>;
 
-  getPublicAPI: (state: T, setState: StateSetter<T>, layerId: string) => DatasourcePublicAPI;
+  getPublicAPI: (props: PublicAPIProps<T>) => DatasourcePublicAPI;
 }
 
 /**
@@ -171,8 +178,8 @@ export interface DatasourceDataPanelProps<T = unknown> {
   setState: StateSetter<T>;
   core: Pick<CoreSetup, 'http' | 'notifications' | 'uiSettings'>;
   query: Query;
-  dateRange: FramePublicAPI['dateRange'];
-  filters: Filter[];
+  dateRange: DateRange;
+  filters: esFilters.Filter[];
 }
 
 // The only way a visualization has to restrict the query building
@@ -200,7 +207,7 @@ export interface DatasourceLayerPanelProps {
   layerId: string;
 }
 
-export type DataType = 'string' | 'number' | 'date' | 'boolean' | 'ip';
+export type DataType = 'document' | 'string' | 'number' | 'date' | 'boolean' | 'ip';
 
 // An operation represents a column in a table, not any information
 // about how the column was created such as whether it is a sum or average.
@@ -257,6 +264,10 @@ export interface SuggestionRequest<T = unknown> {
    * State is only passed if the visualization is active.
    */
   state?: T;
+  /**
+   * The visualization needs to know which table is being suggested
+   */
+  keptLayerIds: string[];
 }
 
 /**
@@ -296,12 +307,9 @@ export interface VisualizationSuggestion<T = unknown> {
 export interface FramePublicAPI {
   datasourceLayers: Record<string, DatasourcePublicAPI>;
 
-  dateRange: {
-    fromDate: string;
-    toDate: string;
-  };
+  dateRange: DateRange;
   query: Query;
-  filters: Filter[];
+  filters: esFilters.Filter[];
 
   // Adds a new layer. This has a side effect of updating the datasource state
   addNewLayer: () => string;
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/__snapshots__/xy_expression.test.tsx.snap b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/__snapshots__/xy_expression.test.tsx.snap
index 473ee16ffe0c31..5089a3b8a3a228 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/__snapshots__/xy_expression.test.tsx.snap
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/__snapshots__/xy_expression.test.tsx.snap
@@ -150,12 +150,16 @@ exports[`xy_expression XYChart component it renders area 1`] = `
         Object {
           "Label A": 1,
           "Label B": 2,
+          "Label D": "Foo",
           "c": "I",
+          "d": "Foo",
         },
         Object {
           "Label A": 1,
           "Label B": 5,
+          "Label D": "Bar",
           "c": "J",
+          "d": "Bar",
         },
       ]
     }
@@ -164,7 +168,7 @@ exports[`xy_expression XYChart component it renders area 1`] = `
     key="0"
     splitSeriesAccessors={
       Array [
-        "Label D",
+        "d",
       ]
     }
     stackAccessors={Array []}
@@ -332,12 +336,16 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
         Object {
           "Label A": 1,
           "Label B": 2,
+          "Label D": "Foo",
           "c": "I",
+          "d": "Foo",
         },
         Object {
           "Label A": 1,
           "Label B": 5,
+          "Label D": "Bar",
           "c": "J",
+          "d": "Bar",
         },
       ]
     }
@@ -346,7 +354,7 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
     key="0"
     splitSeriesAccessors={
       Array [
-        "Label D",
+        "d",
       ]
     }
     stackAccessors={Array []}
@@ -514,12 +522,16 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
         Object {
           "Label A": 1,
           "Label B": 2,
+          "Label D": "Foo",
           "c": "I",
+          "d": "Foo",
         },
         Object {
           "Label A": 1,
           "Label B": 5,
+          "Label D": "Bar",
           "c": "J",
+          "d": "Bar",
         },
       ]
     }
@@ -528,7 +540,7 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
     key="0"
     splitSeriesAccessors={
       Array [
-        "Label D",
+        "d",
       ]
     }
     stackAccessors={Array []}
@@ -696,12 +708,16 @@ exports[`xy_expression XYChart component it renders line 1`] = `
         Object {
           "Label A": 1,
           "Label B": 2,
+          "Label D": "Foo",
           "c": "I",
+          "d": "Foo",
         },
         Object {
           "Label A": 1,
           "Label B": 5,
+          "Label D": "Bar",
           "c": "J",
+          "d": "Bar",
         },
       ]
     }
@@ -710,7 +726,7 @@ exports[`xy_expression XYChart component it renders line 1`] = `
     key="0"
     splitSeriesAccessors={
       Array [
-        "Label D",
+        "d",
       ]
     }
     stackAccessors={Array []}
@@ -878,12 +894,16 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
         Object {
           "Label A": 1,
           "Label B": 2,
+          "Label D": "Foo",
           "c": "I",
+          "d": "Foo",
         },
         Object {
           "Label A": 1,
           "Label B": 5,
+          "Label D": "Bar",
           "c": "J",
+          "d": "Bar",
         },
       ]
     }
@@ -892,7 +912,7 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
     key="0"
     splitSeriesAccessors={
       Array [
-        "Label D",
+        "d",
       ]
     }
     stackAccessors={
@@ -1064,12 +1084,16 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
         Object {
           "Label A": 1,
           "Label B": 2,
+          "Label D": "Foo",
           "c": "I",
+          "d": "Foo",
         },
         Object {
           "Label A": 1,
           "Label B": 5,
+          "Label D": "Bar",
           "c": "J",
+          "d": "Bar",
         },
       ]
     }
@@ -1078,7 +1102,7 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
     key="0"
     splitSeriesAccessors={
       Array [
-        "Label D",
+        "d",
       ]
     }
     stackAccessors={
@@ -1250,12 +1274,16 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
         Object {
           "Label A": 1,
           "Label B": 2,
+          "Label D": "Foo",
           "c": "I",
+          "d": "Foo",
         },
         Object {
           "Label A": 1,
           "Label B": 5,
+          "Label D": "Bar",
           "c": "J",
+          "d": "Bar",
         },
       ]
     }
@@ -1264,7 +1292,7 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
     key="0"
     splitSeriesAccessors={
       Array [
-        "Label D",
+        "d",
       ]
     }
     stackAccessors={
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/types.ts b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/types.ts
index de81cc208070af..f81eb9d72d6ae2 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/types.ts
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/types.ts
@@ -241,7 +241,7 @@ export const visualizationTypes: VisualizationType[] = [
     icon: 'visBarHorizontal',
     largeIcon: chartBarHorizontalSVG,
     label: i18n.translate('xpack.lens.xyVisualization.barHorizontalLabel', {
-      defaultMessage: 'Horizontal Bar',
+      defaultMessage: 'Horizontal bar',
     }),
   },
   {
@@ -249,7 +249,7 @@ export const visualizationTypes: VisualizationType[] = [
     icon: 'visBarVerticalStacked',
     largeIcon: chartBarStackedSVG,
     label: i18n.translate('xpack.lens.xyVisualization.stackedBarLabel', {
-      defaultMessage: 'Stacked Bar',
+      defaultMessage: 'Stacked bar',
     }),
   },
   {
@@ -257,7 +257,7 @@ export const visualizationTypes: VisualizationType[] = [
     icon: 'visBarHorizontalStacked',
     largeIcon: chartBarHorizontalStackedSVG,
     label: i18n.translate('xpack.lens.xyVisualization.stackedBarHorizontalLabel', {
-      defaultMessage: 'Stacked Horizontal Bar',
+      defaultMessage: 'Stacked horizontal bar',
     }),
   },
   {
@@ -281,7 +281,7 @@ export const visualizationTypes: VisualizationType[] = [
     icon: 'visAreaStacked',
     largeIcon: chartAreaStackedSVG,
     label: i18n.translate('xpack.lens.xyVisualization.stackedAreaLabel', {
-      defaultMessage: 'Stacked Area',
+      defaultMessage: 'Stacked area',
     }),
   },
 ];
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_config_panel.tsx b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_config_panel.tsx
index 322e1f1ea4a0ee..f59b1520dbbb43 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_config_panel.tsx
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_config_panel.tsx
@@ -20,6 +20,7 @@ import {
   EuiSpacer,
   EuiButtonEmpty,
   EuiPopoverFooter,
+  EuiToolTip,
 } from '@elastic/eui';
 import { State, SeriesType, LayerConfig, visualizationTypes } from './types';
 import { VisualizationProps, OperationMetadata } from '../types';
@@ -102,7 +103,8 @@ function LayerSettings({
           options={visualizationTypes
             .filter(t => isHorizontalSeries(t.id as SeriesType) === horizontalOnly)
             .map(t => ({
-              ...t,
+              id: t.id,
+              label: t.label,
               iconType: t.icon || 'empty',
             }))}
           idSelected={layer.seriesType}
@@ -234,7 +236,7 @@ export function XYConfigPanel(props: VisualizationProps<State>) {
           <EuiFormRow
             className="lnsConfigPanel__axis"
             label={i18n.translate('xpack.lens.xyChart.splitSeries', {
-              defaultMessage: 'Split series',
+              defaultMessage: 'Break down by',
             })}
           >
             <NativeRenderer
@@ -252,33 +254,44 @@ export function XYConfigPanel(props: VisualizationProps<State>) {
         </EuiPanel>
       ))}
 
-      <EuiButton
-        className="lnsConfigPanel__addLayerBtn"
-        fullWidth
-        size="s"
-        data-test-subj={`lnsXY_layer_add`}
-        aria-label={i18n.translate('xpack.lens.xyChart.addLayerButton', {
-          defaultMessage: 'Add layer',
-        })}
-        title={i18n.translate('xpack.lens.xyChart.addLayerButton', {
-          defaultMessage: 'Add layer',
-        })}
-        onClick={() => {
-          trackUiEvent('xy_layer_added');
-          const usedSeriesTypes = _.uniq(state.layers.map(layer => layer.seriesType));
-          setState({
-            ...state,
-            layers: [
-              ...state.layers,
-              newLayerState(
-                usedSeriesTypes.length === 1 ? usedSeriesTypes[0] : state.preferredSeriesType,
-                frame.addNewLayer()
-              ),
-            ],
-          });
-        }}
-        iconType="plusInCircleFilled"
-      />
+      <EuiFlexItem grow={true}>
+        <EuiToolTip
+          className="eui-fullWidth"
+          content={i18n.translate('xpack.lens.xyChart.addLayerTooltip', {
+            defaultMessage:
+              'Use multiple layers to combine chart types or visualize different index patterns.',
+          })}
+          position="bottom"
+        >
+          <EuiButton
+            className="lnsConfigPanel__addLayerBtn"
+            fullWidth
+            size="s"
+            data-test-subj={`lnsXY_layer_add`}
+            aria-label={i18n.translate('xpack.lens.xyChart.addLayerButton', {
+              defaultMessage: 'Add layer',
+            })}
+            title={i18n.translate('xpack.lens.xyChart.addLayerButton', {
+              defaultMessage: 'Add layer',
+            })}
+            onClick={() => {
+              trackUiEvent('xy_layer_added');
+              const usedSeriesTypes = _.uniq(state.layers.map(layer => layer.seriesType));
+              setState({
+                ...state,
+                layers: [
+                  ...state.layers,
+                  newLayerState(
+                    usedSeriesTypes.length === 1 ? usedSeriesTypes[0] : state.preferredSeriesType,
+                    frame.addNewLayer()
+                  ),
+                ],
+              });
+            }}
+            iconType="plusInCircleFilled"
+          />
+        </EuiToolTip>
+      </EuiFlexItem>
     </EuiForm>
   );
 }
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_expression.test.tsx b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_expression.test.tsx
index 58c321f34d0942..31f1870ee54b49 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_expression.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_expression.test.tsx
@@ -26,8 +26,9 @@ function sampleArgs() {
           },
           { id: 'b', name: 'b', formatHint: { id: 'number', params: { pattern: '000,0' } } },
           { id: 'c', name: 'c', formatHint: { id: 'string' } },
+          { id: 'd', name: 'ColD', formatHint: { id: 'string' } },
         ],
-        rows: [{ a: 1, b: 2, c: 'I' }, { a: 1, b: 5, c: 'J' }],
+        rows: [{ a: 1, b: 2, c: 'I', d: 'Foo' }, { a: 1, b: 5, c: 'J', d: 'Bar' }],
       },
     },
   };
@@ -338,8 +339,8 @@ describe('xy_expression', () => {
         <XYChart data={data} args={args} formatFactory={getFormatSpy} timeZone="UTC" />
       );
       expect(component.find(LineSeries).prop('data')).toEqual([
-        { 'Label A': 1, 'Label B': 2, c: 'I' },
-        { 'Label A': 1, 'Label B': 5, c: 'J' },
+        { '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' },
       ]);
     });
 
@@ -407,7 +408,6 @@ describe('xy_expression', () => {
         />
       );
 
-      expect(getFormatSpy).toHaveBeenCalledTimes(2);
       expect(getFormatSpy).toHaveBeenCalledWith({ id: 'number' });
     });
 
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_expression.tsx b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_expression.tsx
index 4529179debd268..c4cc81239a485f 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_expression.tsx
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_expression.tsx
@@ -19,7 +19,8 @@ import {
   Position,
 } from '@elastic/charts';
 import { I18nProvider } from '@kbn/i18n/react';
-import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/types';
+import { ExpressionFunction, KibanaDatatable } from 'src/legacy/core_plugins/interpreter/types';
+import { IInterpreterRenderHandlers } from 'src/legacy/core_plugins/expressions/public';
 import { EuiIcon, EuiText, IconType, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
@@ -98,18 +99,20 @@ export const getXyChartRenderer = (dependencies: {
   timeZone: string;
 }): IInterpreterRenderFunction<XYChartProps> => ({
   name: 'lens_xy_chart_renderer',
-  displayName: 'XY Chart',
+  displayName: 'XY chart',
   help: i18n.translate('xpack.lens.xyChart.renderer.help', {
-    defaultMessage: 'X/Y Chart Renderer',
+    defaultMessage: 'X/Y chart renderer',
   }),
   validate: () => {},
   reuseDomNode: true,
-  render: async (domNode: Element, config: XYChartProps, _handlers: unknown) => {
+  render: (domNode: Element, config: XYChartProps, handlers: IInterpreterRenderHandlers) => {
+    handlers.onDestroy(() => ReactDOM.unmountComponentAtNode(domNode));
     ReactDOM.render(
       <I18nProvider>
         <XYChartReportable {...config} {...dependencies} />
       </I18nProvider>,
-      domNode
+      domNode,
+      () => handlers.done()
     );
   },
 });
@@ -121,16 +124,18 @@ function getIconForSeriesType(seriesType: SeriesType): IconType {
 const MemoizedChart = React.memo(XYChart);
 
 export function XYChartReportable(props: XYChartRenderProps) {
-  const [isReady, setIsReady] = useState(false);
+  const [state, setState] = useState({
+    isReady: false,
+  });
 
   // It takes a cycle for the XY chart to render. This prevents
   // reporting from printing a blank chart placeholder.
   useEffect(() => {
-    setIsReady(true);
+    setState({ isReady: true });
   }, []);
 
   return (
-    <VisualizationContainer className="lnsXyExpression__container" isReady={isReady}>
+    <VisualizationContainer className="lnsXyExpression__container" isReady={state.isReady}>
       <MemoizedChart {...props} />
     </VisualizationContainer>
   );
@@ -229,38 +234,33 @@ export function XYChart({ data, args, formatFactory, timeZone }: XYChartRenderPr
           },
           index
         ) => {
-          if (!data.tables[layerId] || data.tables[layerId].rows.length === 0) {
+          if (
+            !data.tables[layerId] ||
+            data.tables[layerId].rows.length === 0 ||
+            data.tables[layerId].rows.every(row => typeof row[xAccessor] === 'undefined')
+          ) {
             return;
           }
 
           const columnToLabelMap = columnToLabel ? JSON.parse(columnToLabel) : {};
-
-          const rows = data.tables[layerId].rows.map(row => {
-            const newRow: typeof row = {};
-
-            // Remap data to { 'Count of documents': 5 }
-            Object.keys(row).forEach(key => {
-              if (columnToLabelMap[key]) {
-                newRow[columnToLabelMap[key]] = row[key];
-              } else {
-                newRow[key] = row[key];
-              }
-            });
-            return newRow;
-          });
-
           const splitAccessorLabel = 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: [splitAccessorLabel || splitAccessor],
+            splitSeriesAccessors: sanitized.splitAccessor ? [sanitized.splitAccessor] : [],
             stackAccessors: seriesType.includes('stacked') ? [xAccessor] : [],
             id: getSpecId(idForLegend),
             xAccessor,
             yAccessors,
-            data: rows,
+            data: sanitized.rows,
             xScaleType,
             yScaleType,
             enableHistogramMode: isHistogram && (seriesType.includes('stacked') || !splitAccessor),
@@ -282,3 +282,40 @@ export function XYChart({ data, args, formatFactory, timeZone }: XYChartRenderPr
     </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;
+    }),
+  };
+}
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_suggestions.test.ts b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_suggestions.test.ts
index a205fe433106aa..04ff720309d623 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_suggestions.test.ts
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_suggestions.test.ts
@@ -100,7 +100,9 @@ describe('xy_suggestions', () => {
           layerId: 'first',
           changeType: 'unchanged',
         },
-      ] as TableSuggestion[]).map(table => expect(getSuggestions({ table })).toEqual([]))
+      ] as TableSuggestion[]).map(table =>
+        expect(getSuggestions({ table, keptLayerIds: [] })).toEqual([])
+      )
     );
   });
 
@@ -113,6 +115,7 @@ describe('xy_suggestions', () => {
         layerId: 'first',
         changeType: 'unchanged',
       },
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -144,6 +147,7 @@ describe('xy_suggestions', () => {
         layerId: 'first',
         changeType: 'unchanged',
       },
+      keptLayerIds: [],
     });
 
     expect(suggestions).toHaveLength(0);
@@ -157,6 +161,7 @@ describe('xy_suggestions', () => {
         layerId: 'first',
         changeType: 'unchanged',
       },
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -184,6 +189,7 @@ describe('xy_suggestions', () => {
         changeType: 'unchanged',
         label: 'Datasource title',
       },
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -211,6 +217,7 @@ describe('xy_suggestions', () => {
           },
         ],
       },
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -225,6 +232,7 @@ describe('xy_suggestions', () => {
         layerId: 'first',
         changeType: 'reduced',
       },
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -254,6 +262,7 @@ describe('xy_suggestions', () => {
         changeType: 'unchanged',
       },
       state: currentState,
+      keptLayerIds: ['first'],
     });
 
     expect(suggestions).toHaveLength(1);
@@ -288,6 +297,7 @@ describe('xy_suggestions', () => {
         changeType: 'unchanged',
       },
       state: currentState,
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -328,6 +338,7 @@ describe('xy_suggestions', () => {
         changeType: 'unchanged',
       },
       state: currentState,
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -358,6 +369,7 @@ describe('xy_suggestions', () => {
         changeType: 'unchanged',
       },
       state: currentState,
+      keptLayerIds: [],
     });
 
     const suggestion = suggestions[suggestions.length - 1];
@@ -392,6 +404,7 @@ describe('xy_suggestions', () => {
         changeType: 'extended',
       },
       state: currentState,
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -430,6 +443,7 @@ describe('xy_suggestions', () => {
         changeType: 'extended',
       },
       state: currentState,
+      keptLayerIds: [],
     });
 
     expect(rest).toHaveLength(0);
@@ -454,6 +468,7 @@ describe('xy_suggestions', () => {
         layerId: 'first',
         changeType: 'unchanged',
       },
+      keptLayerIds: [],
     });
 
     expect(suggestionSubset(suggestion)).toMatchInlineSnapshot(`
@@ -490,6 +505,7 @@ describe('xy_suggestions', () => {
         layerId: 'first',
         changeType: 'unchanged',
       },
+      keptLayerIds: [],
     });
 
     expect(suggestionSubset(suggestion)).toMatchInlineSnapshot(`
@@ -525,6 +541,7 @@ describe('xy_suggestions', () => {
         layerId: 'first',
         changeType: 'unchanged',
       },
+      keptLayerIds: [],
     });
 
     expect(suggestionSubset(suggestion)).toMatchInlineSnapshot(`
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_suggestions.ts b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_suggestions.ts
index 7c7e9caddd31b7..33181b7f3a4678 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_suggestions.ts
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_suggestions.ts
@@ -19,11 +19,12 @@ import { generateId } from '../id_generator';
 import { getIconForSeries } from './state_helpers';
 
 const columnSortOrder = {
-  date: 0,
-  string: 1,
-  ip: 2,
-  boolean: 3,
-  number: 4,
+  document: 0,
+  date: 1,
+  string: 2,
+  ip: 3,
+  boolean: 4,
+  number: 5,
 };
 
 /**
@@ -34,6 +35,7 @@ const columnSortOrder = {
 export function getSuggestions({
   table,
   state,
+  keptLayerIds,
 }: SuggestionRequest<State>): Array<VisualizationSuggestion<State>> {
   if (
     // We only render line charts for multi-row queries. We require at least
@@ -47,7 +49,7 @@ export function getSuggestions({
     return [];
   }
 
-  const suggestions = getSuggestionForColumns(table, state);
+  const suggestions = getSuggestionForColumns(table, keptLayerIds, state);
 
   if (suggestions && suggestions instanceof Array) {
     return suggestions;
@@ -58,32 +60,35 @@ export function getSuggestions({
 
 function getSuggestionForColumns(
   table: TableSuggestion,
+  keptLayerIds: string[],
   currentState?: State
 ): VisualizationSuggestion<State> | Array<VisualizationSuggestion<State>> | undefined {
   const [buckets, values] = partition(table.columns, col => col.operation.isBucketed);
 
   if (buckets.length === 1 || buckets.length === 2) {
     const [x, splitBy] = getBucketMappings(table, currentState);
-    return getSuggestionsForLayer(
-      table.layerId,
-      table.changeType,
-      x,
-      values,
+    return getSuggestionsForLayer({
+      layerId: table.layerId,
+      changeType: table.changeType,
+      xValue: x,
+      yValues: values,
       splitBy,
       currentState,
-      table.label
-    );
+      tableLabel: table.label,
+      keptLayerIds,
+    });
   } else if (buckets.length === 0) {
     const [x, ...yValues] = prioritizeColumns(values);
-    return getSuggestionsForLayer(
-      table.layerId,
-      table.changeType,
-      x,
+    return getSuggestionsForLayer({
+      layerId: table.layerId,
+      changeType: table.changeType,
+      xValue: x,
       yValues,
-      undefined,
+      splitBy: undefined,
       currentState,
-      table.label
-    );
+      tableLabel: table.label,
+      keptLayerIds,
+    });
   }
 }
 
@@ -137,15 +142,25 @@ function prioritizeColumns(columns: TableSuggestionColumn[]) {
   );
 }
 
-function getSuggestionsForLayer(
-  layerId: string,
-  changeType: TableChangeType,
-  xValue: TableSuggestionColumn,
-  yValues: TableSuggestionColumn[],
-  splitBy?: TableSuggestionColumn,
-  currentState?: State,
-  tableLabel?: string
-): VisualizationSuggestion<State> | Array<VisualizationSuggestion<State>> {
+function getSuggestionsForLayer({
+  layerId,
+  changeType,
+  xValue,
+  yValues,
+  splitBy,
+  currentState,
+  tableLabel,
+  keptLayerIds,
+}: {
+  layerId: string;
+  changeType: TableChangeType;
+  xValue: TableSuggestionColumn;
+  yValues: TableSuggestionColumn[];
+  splitBy?: TableSuggestionColumn;
+  currentState?: State;
+  tableLabel?: string;
+  keptLayerIds: string[];
+}): VisualizationSuggestion<State> | Array<VisualizationSuggestion<State>> {
   const title = getSuggestionTitle(yValues, xValue, tableLabel);
   const seriesType: SeriesType = getSeriesType(currentState, layerId, xValue, changeType);
 
@@ -158,6 +173,7 @@ function getSuggestionsForLayer(
     splitBy,
     changeType,
     xValue,
+    keptLayerIds,
   };
 
   const isSameState = currentState && changeType === 'unchanged';
@@ -323,6 +339,7 @@ function buildSuggestion({
   splitBy,
   changeType,
   xValue,
+  keptLayerIds,
 }: {
   currentState: XYState | undefined;
   seriesType: SeriesType;
@@ -332,6 +349,7 @@ function buildSuggestion({
   splitBy: TableSuggestionColumn | undefined;
   layerId: string;
   changeType: TableChangeType;
+  keptLayerIds: string[];
 }) {
   const newLayer = {
     ...(getExistingLayer(currentState, layerId) || {}),
@@ -342,13 +360,16 @@ function buildSuggestion({
     accessors: yValues.map(col => col.columnId),
   };
 
+  const keptLayers = currentState
+    ? currentState.layers.filter(
+        layer => layer.layerId !== layerId && keptLayerIds.includes(layer.layerId)
+      )
+    : [];
+
   const state: State = {
     legend: currentState ? currentState.legend : { isVisible: true, position: Position.Right },
     preferredSeriesType: seriesType,
-    layers: [
-      ...(currentState ? currentState.layers.filter(layer => layer.layerId !== layerId) : []),
-      newLayer,
-    ],
+    layers: [...keptLayers, newLayer],
   };
 
   return {
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_visualization.test.ts b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_visualization.test.ts
index 5cd0791ae3da9e..db28e76f829464 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_visualization.test.ts
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_visualization.test.ts
@@ -47,7 +47,16 @@ describe('xy_visualization', () => {
     it('should show mixed xy chart when multilple series types', () => {
       const desc = xyVisualization.getDescription(mixedState('bar', 'line'));
 
-      expect(desc.label).toEqual('Mixed XY Chart');
+      expect(desc.label).toEqual('Mixed XY chart');
+    });
+
+    it('should show the preferredSeriesType if there are no layers', () => {
+      const desc = xyVisualization.getDescription(mixedState());
+
+      // 'test-file-stub' is a hack, but it at least means we aren't using
+      // a standard icon here.
+      expect(desc.icon).toEqual('test-file-stub');
+      expect(desc.label).toEqual('Bar chart');
     });
 
     it('should show mixed horizontal bar chart when multiple horizontal bar types', () => {
@@ -55,23 +64,23 @@ describe('xy_visualization', () => {
         mixedState('bar_horizontal', 'bar_horizontal_stacked')
       );
 
-      expect(desc.label).toEqual('Mixed Horizontal Bar Chart');
+      expect(desc.label).toEqual('Mixed horizontal bar chart');
     });
 
     it('should show bar chart when bar only', () => {
       const desc = xyVisualization.getDescription(mixedState('bar_horizontal', 'bar_horizontal'));
 
-      expect(desc.label).toEqual('Horizontal Bar Chart');
+      expect(desc.label).toEqual('Horizontal bar chart');
     });
 
     it('should show the chart description if not mixed', () => {
-      expect(xyVisualization.getDescription(mixedState('area')).label).toEqual('Area Chart');
-      expect(xyVisualization.getDescription(mixedState('line')).label).toEqual('Line Chart');
+      expect(xyVisualization.getDescription(mixedState('area')).label).toEqual('Area chart');
+      expect(xyVisualization.getDescription(mixedState('line')).label).toEqual('Line chart');
       expect(xyVisualization.getDescription(mixedState('area_stacked')).label).toEqual(
-        'Stacked Area Chart'
+        'Stacked area chart'
       );
       expect(xyVisualization.getDescription(mixedState('bar_horizontal_stacked')).label).toEqual(
-        'Stacked Horizontal Bar Chart'
+        'Stacked horizontal bar chart'
       );
     });
   });
@@ -110,7 +119,7 @@ describe('xy_visualization', () => {
             "position": "right",
           },
           "preferredSeriesType": "bar_stacked",
-          "title": "Empty XY Chart",
+          "title": "Empty XY chart",
         }
       `);
     });
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_visualization.tsx b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_visualization.tsx
index 0c9cb3b6216bb7..5ba77cb39d5f81 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_visualization.tsx
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_visualization.tsx
@@ -34,7 +34,11 @@ function getDescription(state?: State) {
   }
 
   if (!state.layers.length) {
-    return visualizationTypes.find(v => v.id === state.preferredSeriesType)!;
+    const visualizationType = visualizationTypes.find(v => v.id === state.preferredSeriesType)!;
+    return {
+      icon: visualizationType.largeIcon || visualizationType.icon,
+      label: visualizationType.label,
+    };
   }
 
   const visualizationType = visualizationTypes.find(t => t.id === state.layers[0].seriesType)!;
@@ -50,7 +54,7 @@ function getDescription(state?: State) {
         ? visualizationType.label
         : isHorizontalChart(state.layers)
         ? i18n.translate('xpack.lens.xyVisualization.mixedBarHorizontalLabel', {
-            defaultMessage: 'Mixed Horizontal Bar',
+            defaultMessage: 'Mixed horizontal bar',
           })
         : i18n.translate('xpack.lens.xyVisualization.mixedLabel', {
             defaultMessage: 'Mixed XY',
@@ -66,7 +70,7 @@ export const xyVisualization: Visualization<State, PersistableState> = {
   getDescription(state) {
     const { icon, label } = getDescription(state);
     const chartLabel = i18n.translate('xpack.lens.xyVisualization.chartLabel', {
-      defaultMessage: '{label} Chart',
+      defaultMessage: '{label} chart',
       values: { label },
     });
 
@@ -89,7 +93,7 @@ export const xyVisualization: Visualization<State, PersistableState> = {
   initialize(frame, state) {
     return (
       state || {
-        title: 'Empty XY Chart',
+        title: 'Empty XY chart',
         legend: { isVisible: true, position: Position.Right },
         preferredSeriesType: defaultSeriesType,
         layers: [
diff --git a/x-pack/legacy/plugins/lens/server/routes/existing_fields.test.ts b/x-pack/legacy/plugins/lens/server/routes/existing_fields.test.ts
index de2da49fd5c0e9..1647dcccaed3c6 100644
--- a/x-pack/legacy/plugins/lens/server/routes/existing_fields.test.ts
+++ b/x-pack/legacy/plugins/lens/server/routes/existing_fields.test.ts
@@ -10,7 +10,7 @@ describe('existingFields', () => {
   function field(name: string, parent?: string) {
     return {
       name,
-      parent,
+      subType: parent ? { multi: { parent } } : undefined,
       aggregatable: true,
       esTypes: [],
       readFromDocValues: true,
diff --git a/x-pack/legacy/plugins/lens/server/routes/existing_fields.ts b/x-pack/legacy/plugins/lens/server/routes/existing_fields.ts
index ed9de067fdc48e..ad1af966983fb3 100644
--- a/x-pack/legacy/plugins/lens/server/routes/existing_fields.ts
+++ b/x-pack/legacy/plugins/lens/server/routes/existing_fields.ts
@@ -11,10 +11,7 @@ import _ from 'lodash';
 import { IScopedClusterClient } from 'src/core/server';
 import { CoreSetup } from 'src/core/server';
 import { BASE_API_URL } from '../../common';
-import {
-  FieldDescriptor,
-  IndexPatternsService,
-} from '../../../../../../src/legacy/server/index_patterns/service';
+import { FieldDescriptor, IndexPatternsFetcher } from '../../../../../../src/plugins/data/server';
 
 /**
  * The number of docs to sample to determine field empty status.
@@ -42,11 +39,11 @@ export async function existingFieldsRoute(setup: CoreSetup) {
     async (context, req, res) => {
       const { indexPatternTitle } = req.params;
       const requestClient = context.core.elasticsearch.dataClient;
-      const indexPatternsService = new IndexPatternsService(requestClient.callAsCurrentUser);
+      const indexPatternsFetcher = new IndexPatternsFetcher(requestClient.callAsCurrentUser);
       const { fromDate, toDate, timeFieldName } = req.query;
 
       try {
-        const fields = await indexPatternsService.getFieldsForWildcard({
+        const fields = await indexPatternsFetcher.getFieldsForWildcard({
           pattern: indexPatternTitle,
           // TODO: Pull this from kibana advanced settings
           metaFields: ['_source', '_id', '_type', '_index', '_score'],
@@ -112,11 +109,14 @@ export function existingFields(
   docs: Array<{ _source: Document }>,
   fields: FieldDescriptor[]
 ): string[] {
-  const allFields = fields.map(field => ({
-    name: field.name,
-    parent: field.parent,
-    path: (field.parent || field.name).split('.'),
-  }));
+  const allFields = fields.map(field => {
+    const parent = field.subType && field.subType.multi && field.subType.multi.parent;
+    return {
+      name: field.name,
+      parent,
+      path: (parent || field.name).split('.'),
+    };
+  });
   const missingFields = new Set(allFields);
 
   for (const doc of docs) {
diff --git a/x-pack/legacy/plugins/lens/server/routes/field_stats.ts b/x-pack/legacy/plugins/lens/server/routes/field_stats.ts
index e7e378e6b20e41..ceefb492cdabe1 100644
--- a/x-pack/legacy/plugins/lens/server/routes/field_stats.ts
+++ b/x-pack/legacy/plugins/lens/server/routes/field_stats.ts
@@ -7,8 +7,8 @@
 import Boom from 'boom';
 import DateMath from '@elastic/datemath';
 import { schema } from '@kbn/config-schema';
-import { AggregationSearchResponseWithTotalHitsAsInt } from 'elasticsearch';
 import { CoreSetup } from 'src/core/server';
+import { ESSearchResponse } from '../../../apm/typings/elasticsearch';
 import { FieldStatsResponse, BASE_API_URL } from '../../common';
 
 const SHARD_SIZE = 5000;
@@ -135,9 +135,11 @@ export async function getNumberHistogram(
     },
   };
 
-  const minMaxResult = (await aggSearchWithBody(
-    searchBody
-  )) as AggregationSearchResponseWithTotalHitsAsInt<unknown, { body: { aggs: typeof searchBody } }>;
+  const minMaxResult = (await aggSearchWithBody(searchBody)) as ESSearchResponse<
+    unknown,
+    { body: { aggs: typeof searchBody } },
+    { restTotalHitsAsInt: true }
+  >;
 
   const minValue = minMaxResult.aggregations!.sample.min_value.value;
   const maxValue = minMaxResult.aggregations!.sample.max_value.value;
@@ -178,11 +180,10 @@ export async function getNumberHistogram(
       },
     },
   };
-  const histogramResult = (await aggSearchWithBody(
-    histogramBody
-  )) as AggregationSearchResponseWithTotalHitsAsInt<
+  const histogramResult = (await aggSearchWithBody(histogramBody)) as ESSearchResponse<
     unknown,
-    { body: { aggs: typeof histogramBody } }
+    { body: { aggs: typeof histogramBody } },
+    { restTotalHitsAsInt: true }
   >;
 
   return {
@@ -214,11 +215,10 @@ export async function getStringSamples(
       },
     },
   };
-  const topValuesResult = (await aggSearchWithBody(
-    topValuesBody
-  )) as AggregationSearchResponseWithTotalHitsAsInt<
+  const topValuesResult = (await aggSearchWithBody(topValuesBody)) as ESSearchResponse<
     unknown,
-    { body: { aggs: typeof topValuesBody } }
+    { body: { aggs: typeof topValuesBody } },
+    { restTotalHitsAsInt: true }
   >;
 
   return {
@@ -263,11 +263,10 @@ export async function getDateHistogram(
   const histogramBody = {
     histo: { date_histogram: { field: field.name, fixed_interval: fixedInterval } },
   };
-  const results = (await aggSearchWithBody(
-    histogramBody
-  )) as AggregationSearchResponseWithTotalHitsAsInt<
+  const results = (await aggSearchWithBody(histogramBody)) as ESSearchResponse<
     unknown,
-    { body: { aggs: typeof histogramBody } }
+    { body: { aggs: typeof histogramBody } },
+    { restTotalHitsAsInt: true }
   >;
 
   return {
diff --git a/x-pack/legacy/plugins/lens/server/usage/collectors.ts b/x-pack/legacy/plugins/lens/server/usage/collectors.ts
index 9a58026002ade7..94a7c8e0d85c1c 100644
--- a/x-pack/legacy/plugins/lens/server/usage/collectors.ts
+++ b/x-pack/legacy/plugins/lens/server/usage/collectors.ts
@@ -89,7 +89,11 @@ async function isTaskManagerReady(server: Server) {
 }
 
 async function getLatestTaskState(server: Server) {
-  const taskManager = server.plugins.task_manager!;
+  const taskManager = server.plugins.task_manager;
+
+  if (!taskManager) {
+    return null;
+  }
 
   try {
     const result = await taskManager.fetch({
diff --git a/x-pack/legacy/plugins/lens/server/usage/task.ts b/x-pack/legacy/plugins/lens/server/usage/task.ts
index ba74bcd2408864..3cb857a453e1d5 100644
--- a/x-pack/legacy/plugins/lens/server/usage/task.ts
+++ b/x-pack/legacy/plugins/lens/server/usage/task.ts
@@ -8,17 +8,13 @@ import moment from 'moment';
 import KbnServer, { Server } from 'src/legacy/server/kbn_server';
 import { CoreSetup } from 'src/core/server';
 import { CallClusterOptions } from 'src/legacy/core_plugins/elasticsearch';
-// This import has the side effect of allowing us to use the elasticsearch type
-// extensions below. Without this import, the compiler is unable to find these
-// in tests
-import {} from '../../../apm/typings/elasticsearch';
 import {
   SearchParams,
   DeleteDocumentByQueryParams,
   SearchResponse,
   DeleteDocumentByQueryResponse,
-  AggregationSearchResponseWithTotalHitsAsInt,
 } from 'elasticsearch';
+import { ESSearchResponse } from '../../../apm/typings/elasticsearch';
 import { XPackMainPlugin } from '../../../xpack_main/xpack_main';
 import { RunContext } from '../../../task_manager';
 import { getVisualizationCounts } from './visualization_counts';
@@ -49,7 +45,13 @@ export function initializeLensTelemetry(core: CoreSetup, { server }: { server: S
 }
 
 function registerLensTelemetryTask(core: CoreSetup, { server }: { server: Server }) {
-  const taskManager = server.plugins.task_manager!;
+  const taskManager = server.plugins.task_manager;
+
+  if (!taskManager) {
+    server.log(['debug', 'telemetry'], `Task manager is not available`);
+    return;
+  }
+
   taskManager.registerTaskDefinitions({
     [TELEMETRY_TASK_TYPE]: {
       title: 'Lens telemetry fetch task',
@@ -66,6 +68,11 @@ function scheduleTasks(server: Server) {
     status: { plugin: { kbnServer: KbnServer } };
   }).status.plugin;
 
+  if (!taskManager) {
+    server.log(['debug', 'telemetry'], `Task manager is not available`);
+    return;
+  }
+
   kbnServer.afterPluginsInit(() => {
     // The code block below can't await directly within "afterPluginsInit"
     // callback due to circular dependency The server isn't "ready" until
@@ -75,14 +82,14 @@ function scheduleTasks(server: Server) {
     // function block.
     (async () => {
       try {
-        await taskManager!.schedule({
+        await taskManager.schedule({
           id: TASK_ID,
           taskType: TELEMETRY_TASK_TYPE,
           state: { byDate: {}, suggestionsByDate: {}, saved: {}, runs: 0 },
           params: {},
         });
       } catch (e) {
-        server.log(['warning', 'telemetry'], `Error scheduling task, received ${e.message}`);
+        server.log(['debug', 'telemetry'], `Error scheduling task, received ${e.message}`);
       }
     })();
   });
@@ -135,11 +142,12 @@ export async function getDailyEvents(
     },
   };
 
-  const metrics: AggregationSearchResponseWithTotalHitsAsInt<
+  const metrics: ESSearchResponse<
     unknown,
     {
       body: { aggs: typeof aggs };
-    }
+    },
+    { restTotalHitsAsInt: true }
   > = await callCluster('search', {
     index: kibanaIndex,
     rest_total_hits_as_int: true,
diff --git a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
index ee9abb1d1f125e..b0bd05349a50cc 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
+++ b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`LicenseStatus component should display display warning is expired 1`] = `"<div class=\\"euiTextAlign euiTextAlign--center\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon--danger euiIcon-isLoading\\" focusable=\\"false\\"></svg></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h2 data-test-subj=\\"licenseText\\" class=\\"euiTitle euiTitle--medium\\">Your Platinum license has expired</h2></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiText euiText--medium\\" data-test-subj=\\"licenseSubText\\">Your license expired on <strong></strong></div></div>"`;
+exports[`LicenseStatus component should display display warning is expired 1`] = `"<div class=\\"euiTextAlign euiTextAlign--center\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon--danger euiIcon-isLoading\\" focusable=\\"false\\"></svg></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h1 data-test-subj=\\"licenseText\\" class=\\"euiTitle euiTitle--medium\\">Your Platinum license has expired</h1></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiText euiText--medium\\" data-test-subj=\\"licenseSubText\\">Your license expired on <strong></strong></div></div>"`;
 
-exports[`LicenseStatus component should display normally when license is active 1`] = `"<div class=\\"euiTextAlign euiTextAlign--center\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon--success euiIcon-isLoading\\" focusable=\\"false\\"></svg></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h2 data-test-subj=\\"licenseText\\" class=\\"euiTitle euiTitle--medium\\">Your Gold license is active</h2></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiText euiText--medium\\" data-test-subj=\\"licenseSubText\\">Your license will expire on <strong>October 12, 2099 7:00 PM EST</strong></div></div>"`;
+exports[`LicenseStatus component should display normally when license is active 1`] = `"<div class=\\"euiTextAlign euiTextAlign--center\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon--success euiIcon-isLoading\\" focusable=\\"false\\"></svg></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h1 data-test-subj=\\"licenseText\\" class=\\"euiTitle euiTitle--medium\\">Your Gold license is active</h1></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiText euiText--medium\\" data-test-subj=\\"licenseSubText\\">Your license will expire on <strong>October 12, 2099 7:00 PM EST</strong></div></div>"`;
diff --git a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
index 41b5d5a70ae677..9d5e91c2d5f16b 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
+++ b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
@@ -330,7 +330,11 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                             as="div"
                             autoFocus={true}
                             disabled={false}
-                            lockProps={Object {}}
+                            lockProps={
+                              Object {
+                                "style": undefined,
+                              }
+                            }
                             noFocusGuards={false}
                             persistentFocus={false}
                             returnFocus={true}
diff --git a/x-pack/legacy/plugins/license_management/public/sections/license_dashboard/license_status/license_status.js b/x-pack/legacy/plugins/license_management/public/sections/license_dashboard/license_status/license_status.js
index 9f6d1226e4dbf4..0b7867ba45e2a8 100644
--- a/x-pack/legacy/plugins/license_management/public/sections/license_dashboard/license_status/license_status.js
+++ b/x-pack/legacy/plugins/license_management/public/sections/license_dashboard/license_status/license_status.js
@@ -87,7 +87,7 @@ export class LicenseStatus extends React.PureComponent {
           <EuiFlexItem grow={false}>{icon}</EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiTitle size="m">
-              <h2 data-test-subj="licenseText">{title}</h2>
+              <h1 data-test-subj="licenseText">{title}</h1>
             </EuiTitle>
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/maps/common/constants.js b/x-pack/legacy/plugins/maps/common/constants.js
index 1fd1f4b43bbdad..942d0a21123c29 100644
--- a/x-pack/legacy/plugins/maps/common/constants.js
+++ b/x-pack/legacy/plugins/maps/common/constants.js
@@ -102,3 +102,12 @@ export const DRAW_TYPE = {
   BOUNDS: 'BOUNDS',
   POLYGON: 'POLYGON'
 };
+
+export const METRIC_TYPE = {
+  AVG: 'avg',
+  COUNT: 'count',
+  MAX: 'max',
+  MIN: 'min',
+  SUM: 'sum',
+  UNIQUE_COUNT: 'cardinality',
+};
diff --git a/x-pack/legacy/plugins/maps/index.js b/x-pack/legacy/plugins/maps/index.js
index 076fae1bb58825..739e98beec10f1 100644
--- a/x-pack/legacy/plugins/maps/index.js
+++ b/x-pack/legacy/plugins/maps/index.js
@@ -16,14 +16,15 @@ import { watchStatusAndLicenseToInitialize } from
   '../../server/lib/watch_status_and_license_to_initialize';
 import { initTelemetryCollection } from './server/maps_telemetry';
 import { i18n } from '@kbn/i18n';
-import { APP_ID, APP_ICON, createMapPath } from './common/constants';
+import { APP_ID, APP_ICON, createMapPath, MAP_SAVED_OBJECT_TYPE } from './common/constants';
 import { getAppTitle } from './common/i18n_getters';
 import _ from 'lodash';
 
 export function maps(kibana) {
 
   return new kibana.Plugin({
-    require: ['kibana', 'elasticsearch', 'xpack_main', 'tile_map', 'task_manager'],
+    // task_manager could be required, but is only used for telemetry
+    require: ['kibana', 'elasticsearch', 'xpack_main', 'tile_map'],
     id: APP_ID,
     configPrefix: 'xpack.maps',
     publicDir: resolve(__dirname, 'public'),
@@ -42,6 +43,7 @@ export function maps(kibana) {
         const mapConfig = serverConfig.get('map');
 
         return {
+          showMapVisualizationTypes: serverConfig.get('xpack.maps.showMapVisualizationTypes'),
           showMapsInspectorAdapter: serverConfig.get('xpack.maps.showMapsInspectorAdapter'),
           preserveDrawingBuffer: serverConfig.get('xpack.maps.preserveDrawingBuffer'),
           isEmsEnabled: mapConfig.includeElasticMapsService,
@@ -69,7 +71,7 @@ export function maps(kibana) {
         }
       },
       savedObjectsManagement: {
-        'map': {
+        [MAP_SAVED_OBJECT_TYPE]: {
           icon: APP_ICON,
           defaultSearchField: 'title',
           isImportableAndExportable: true,
@@ -91,6 +93,7 @@ export function maps(kibana) {
     config(Joi) {
       return Joi.object({
         enabled: Joi.boolean().default(true),
+        showMapVisualizationTypes: Joi.boolean().default(false),
         showMapsInspectorAdapter: Joi.boolean().default(false), // flag used in functional testing
         preserveDrawingBuffer: Joi.boolean().default(false), // flag used in functional testing
       }).default();
@@ -109,18 +112,18 @@ export function maps(kibana) {
       let routesInitialized = false;
 
       xpackMainPlugin.registerFeature({
-        id: 'maps',
+        id: APP_ID,
         name: i18n.translate('xpack.maps.featureRegistry.mapsFeatureName', {
           defaultMessage: 'Maps',
         }),
         icon: APP_ICON,
-        navLinkId: 'maps',
+        navLinkId: APP_ID,
         app: [APP_ID, 'kibana'],
-        catalogue: ['maps'],
+        catalogue: [APP_ID],
         privileges: {
           all: {
             savedObject: {
-              all: ['map', 'query'],
+              all: [MAP_SAVED_OBJECT_TYPE, 'query'],
               read: ['index-pattern']
             },
             ui: ['save', 'show', 'saveQuery'],
@@ -128,7 +131,7 @@ export function maps(kibana) {
           read: {
             savedObject: {
               all: [],
-              read: ['map', 'index-pattern', 'query']
+              read: [MAP_SAVED_OBJECT_TYPE, 'index-pattern', 'query']
             },
             ui: ['show'],
           },
@@ -155,7 +158,7 @@ export function maps(kibana) {
         {
           path: createMapPath('2c9c1f60-1909-11e9-919b-ffe5949a18d2'),
           label: sampleDataLinkLabel,
-          icon: 'gisApp'
+          icon: APP_ICON
         }
       ]);
       server.replacePanelInSampleDatasetDashboard({
@@ -174,7 +177,7 @@ export function maps(kibana) {
         {
           path: createMapPath('5dd88580-1906-11e9-919b-ffe5949a18d2'),
           label: sampleDataLinkLabel,
-          icon: 'gisApp'
+          icon: APP_ICON
         }
       ]);
       server.replacePanelInSampleDatasetDashboard({
@@ -182,7 +185,7 @@ export function maps(kibana) {
         dashboardId: '7adfa750-4c81-11e8-b3d7-01146121b73d',
         oldEmbeddableId: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
         embeddableId: '5dd88580-1906-11e9-919b-ffe5949a18d2',
-        embeddableType: 'map',
+        embeddableType: MAP_SAVED_OBJECT_TYPE,
         embeddableConfig: {
           isLayerTOCOpen: true
         },
@@ -193,7 +196,7 @@ export function maps(kibana) {
         {
           path: createMapPath('de71f4f0-1902-11e9-919b-ffe5949a18d2'),
           label: sampleDataLinkLabel,
-          icon: 'gisApp'
+          icon: APP_ICON
         }
       ]);
       server.replacePanelInSampleDatasetDashboard({
@@ -201,13 +204,13 @@ export function maps(kibana) {
         dashboardId: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
         oldEmbeddableId: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
         embeddableId: 'de71f4f0-1902-11e9-919b-ffe5949a18d2',
-        embeddableType: 'map',
+        embeddableType: MAP_SAVED_OBJECT_TYPE,
         embeddableConfig: {
           isLayerTOCOpen: false
         },
       });
 
-      server.injectUiAppVars('maps', async () => {
+      server.injectUiAppVars(APP_ID, async () => {
         return await server.getInjectedUiAppVars('kibana');
       });
     }
diff --git a/x-pack/legacy/plugins/maps/public/actions/map_actions.js b/x-pack/legacy/plugins/maps/public/actions/map_actions.js
index b1bb6914616067..33771a355ddd5b 100644
--- a/x-pack/legacy/plugins/maps/public/actions/map_actions.js
+++ b/x-pack/legacy/plugins/maps/public/actions/map_actions.js
@@ -14,16 +14,22 @@ import {
   getMapReady,
   getWaitingForMapReadyLayerListRaw,
   getTransientLayerId,
-  getTooltipState
+  getTooltipState,
+  getQuery,
 } from '../selectors/map_selectors';
 import { FLYOUT_STATE } from '../reducers/ui';
 import {
   cancelRequest,
   registerCancelCallback,
-  unregisterCancelCallback
+  unregisterCancelCallback,
+  getEventHandlers,
 } from '../reducers/non_serializable_instances';
 import { updateFlyout } from '../actions/ui_actions';
-import { FEATURE_ID_PROPERTY_NAME, SOURCE_DATA_ID_ORIGIN } from '../../common/constants';
+import {
+  FEATURE_ID_PROPERTY_NAME,
+  LAYER_TYPE,
+  SOURCE_DATA_ID_ORIGIN
+} from '../../common/constants';
 
 export const SET_SELECTED_LAYER = 'SET_SELECTED_LAYER';
 export const SET_TRANSIENT_LAYER = 'SET_TRANSIENT_LAYER';
@@ -455,6 +461,14 @@ export function startDataLoad(layerId, dataId, requestToken, meta = {}) {
       dispatch(cancelRequest(layer.getPrevRequestToken(dataId)));
     }
 
+    const eventHandlers = getEventHandlers(getState());
+    if (eventHandlers && eventHandlers.onDataLoad) {
+      eventHandlers.onDataLoad({
+        layerId,
+        dataId,
+      });
+    }
+
     dispatch({
       meta,
       type: LAYER_DATA_LOAD_STARTED,
@@ -479,9 +493,26 @@ export function updateSourceDataRequest(layerId, newData) {
 }
 
 export function endDataLoad(layerId, dataId, requestToken, data, meta) {
-  return async (dispatch) => {
+  return async (dispatch, getState) => {
     dispatch(unregisterCancelCallback(requestToken));
-    const features = data ? data.features : [];
+
+    const features = data && data.features ? data.features : [];
+
+    const eventHandlers = getEventHandlers(getState());
+    if (eventHandlers && eventHandlers.onDataLoadEnd) {
+      const layer = getLayerById(layerId, getState());
+      const resultMeta = {};
+      if (layer && layer.getType() === LAYER_TYPE.VECTOR) {
+        resultMeta.featuresCount = features.length;
+      }
+
+      eventHandlers.onDataLoadEnd({
+        layerId,
+        dataId,
+        resultMeta
+      });
+    }
+
     dispatch(cleanTooltipStateForLayer(layerId, features));
     dispatch({
       type: LAYER_DATA_LOAD_ENDED,
@@ -502,8 +533,18 @@ export function endDataLoad(layerId, dataId, requestToken, data, meta) {
 }
 
 export function onDataLoadError(layerId, dataId, requestToken, errorMessage) {
-  return async (dispatch) => {
+  return async (dispatch, getState) => {
     dispatch(unregisterCancelCallback(requestToken));
+
+    const eventHandlers = getEventHandlers(getState());
+    if (eventHandlers && eventHandlers.onDataLoadError) {
+      eventHandlers.onDataLoadError({
+        layerId,
+        dataId,
+        errorMessage,
+      });
+    }
+
     dispatch(cleanTooltipStateForLayer(layerId));
     dispatch({
       type: LAYER_DATA_LOAD_ERROR,
@@ -645,15 +686,25 @@ function removeLayerFromLayerList(layerId) {
   };
 }
 
-export function setQuery({ query, timeFilters, filters = [] }) {
+export function setQuery({ query, timeFilters, filters = [], refresh = false }) {
+  function generateQueryTimestamp() {
+    return (new Date()).toISOString();
+  }
   return async (dispatch, getState) => {
+    const prevQuery = getQuery(getState());
+    const prevTriggeredAt = (prevQuery && prevQuery.queryLastTriggeredAt)
+      ? prevQuery.queryLastTriggeredAt
+      : generateQueryTimestamp();
+
     dispatch({
       type: SET_QUERY,
       timeFilters,
       query: {
         ...query,
-        // ensure query changes to trigger re-fetch even when query is the same because "Refresh" clicked
-        queryLastTriggeredAt: (new Date()).toISOString(),
+        // ensure query changes to trigger re-fetch when "Refresh" clicked
+        queryLastTriggeredAt: refresh
+          ? generateQueryTimestamp()
+          : prevTriggeredAt,
       },
       filters,
     });
@@ -693,7 +744,10 @@ export function clearMissingStyleProperties(layerId) {
     if (!style) {
       return;
     }
-    const ordinalFields = await targetLayer.getOrdinalFields();
+
+    const dateFields = await targetLayer.getDateFields();
+    const numberFields = await targetLayer.getNumberFields();
+    const ordinalFields = [...dateFields, ...numberFields];
     const { hasChanges, nextStyleDescriptor } = style.getDescriptorWithMissingStylePropsRemoved(ordinalFields);
     if (hasChanges) {
       dispatch(updateLayerStyle(layerId, nextStyleDescriptor));
diff --git a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js
index b15b94a49cebc5..5dc08751347e41 100644
--- a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js
+++ b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js
@@ -44,7 +44,6 @@ describe('kibana.yml configured with map.tilemap.url', () => {
     expect(layers).toEqual([{
       alpha: 1,
       __dataRequests: [],
-      __injectedData: null,
       id: layers[0].id,
       applyGlobalQuery: true,
       label: null,
@@ -87,7 +86,6 @@ describe('EMS is enabled', () => {
     expect(layers).toEqual([{
       alpha: 1,
       __dataRequests: [],
-      __injectedData: null,
       id: layers[0].id,
       applyGlobalQuery: true,
       label: null,
diff --git a/x-pack/legacy/plugins/maps/public/angular/map.html b/x-pack/legacy/plugins/maps/public/angular/map.html
index 7c4f9cb018e33b..90d4ddbeb00928 100644
--- a/x-pack/legacy/plugins/maps/public/angular/map.html
+++ b/x-pack/legacy/plugins/maps/public/angular/map.html
@@ -11,7 +11,7 @@
         show-save-query="showSaveQuery"
         query="query"
         saved-query="savedQuery"
-        on-query-submit="updateQueryAndDispatch"
+        on-query-submit="onQuerySubmit"
         filters="filters"
         on-filters-updated="updateFiltersAndDispatch"
         index-patterns="indexPatterns"
diff --git a/x-pack/legacy/plugins/maps/public/angular/map_controller.js b/x-pack/legacy/plugins/maps/public/angular/map_controller.js
index d8f957bd381999..41c618d68a68e4 100644
--- a/x-pack/legacy/plugins/maps/public/angular/map_controller.js
+++ b/x-pack/legacy/plugins/maps/public/angular/map_controller.js
@@ -7,6 +7,7 @@
 import _ from 'lodash';
 import chrome from 'ui/chrome';
 import 'ui/directives/listen';
+import 'ui/directives/storage';
 import React from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
@@ -52,8 +53,9 @@ import {
   MAP_SAVED_OBJECT_TYPE,
   MAP_APP_PATH
 } from '../../common/constants';
-import { FilterStateStore } from '@kbn/es-query';
 import { start as data } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
+import { npStart } from 'ui/new_platform';
+import { esFilters } from '../../../../../../src/plugins/data/public';
 
 const { savedQueryService } = data.search.services;
 
@@ -62,7 +64,7 @@ const REACT_ANCHOR_DOM_ELEMENT_ID = 'react-maps-root';
 const app = uiModules.get(MAP_APP_PATH, []);
 
 app.controller('GisMapController', ($scope, $route, kbnUrl, localStorage, AppState, globalState) => {
-
+  const { filterManager } = npStart.plugins.data.query;
   const savedMap = $route.current.locals.map;
   let unsubscribe;
   let initialLayerListConfig;
@@ -98,7 +100,7 @@ app.controller('GisMapController', ($scope, $route, kbnUrl, localStorage, AppSta
     $scope.$evalAsync(() => {
       // appState
       $state.query = $scope.query;
-      $state.filters = data.filter.filterManager.getAppFilters();
+      $state.filters = filterManager.getAppFilters();
       $state.save();
 
       // globalState
@@ -107,7 +109,7 @@ app.controller('GisMapController', ($scope, $route, kbnUrl, localStorage, AppSta
         pause: $scope.refreshConfig.isPaused,
         value: $scope.refreshConfig.interval,
       };
-      globalState.filters = data.filter.filterManager.getGlobalFilters();
+      globalState.filters = filterManager.getGlobalFilters();
       globalState.save();
     });
   }
@@ -196,10 +198,10 @@ app.controller('GisMapController', ($scope, $route, kbnUrl, localStorage, AppSta
     }
   });
   /* End of Saved Queries */
-  async function onQueryChange({ filters, query, time }) {
+  async function onQueryChange({ filters, query, time, refresh }) {
     if (filters) {
-      await data.filter.filterManager.setFilters(filters); // Maps and merges filters
-      $scope.filters = data.filter.filterManager.getFilters();
+      filterManager.setFilters(filters); // Maps and merges filters
+      $scope.filters = filterManager.getFilters();
     }
     if (query) {
       $scope.query = query;
@@ -208,22 +210,24 @@ app.controller('GisMapController', ($scope, $route, kbnUrl, localStorage, AppSta
       $scope.time = time;
     }
     syncAppAndGlobalState();
-    dispatchSetQuery();
+    dispatchSetQuery(refresh);
   }
 
-  function dispatchSetQuery() {
+  function dispatchSetQuery(refresh) {
     store.dispatch(setQuery({
       filters: $scope.filters,
       query: $scope.query,
-      timeFilters: $scope.time
+      timeFilters: $scope.time,
+      refresh,
     }));
   }
 
   $scope.indexPatterns = [];
-  $scope.updateQueryAndDispatch = function ({ dateRange, query }) {
+  $scope.onQuerySubmit = function ({ dateRange, query }) {
     onQueryChange({
       query,
       time: dateRange,
+      refresh: true,
     });
   };
   $scope.updateFiltersAndDispatch = function (filters) {
@@ -243,7 +247,7 @@ app.controller('GisMapController', ($scope, $route, kbnUrl, localStorage, AppSta
 
   function addFilters(newFilters) {
     newFilters.forEach(filter => {
-      filter.$state = FilterStateStore.APP_STATE;
+      filter.$state = esFilters.FilterStateStore.APP_STATE;
     });
     $scope.updateFiltersAndDispatch([...$scope.filters, ...newFilters]);
   }
diff --git a/x-pack/legacy/plugins/maps/public/components/metric_editor.js b/x-pack/legacy/plugins/maps/public/components/metric_editor.js
index f3123d5645ccd3..03d364f3d84a9c 100644
--- a/x-pack/legacy/plugins/maps/public/components/metric_editor.js
+++ b/x-pack/legacy/plugins/maps/public/components/metric_editor.js
@@ -12,6 +12,7 @@ import { EuiFieldText, EuiFormRow } from '@elastic/eui';
 
 import { MetricSelect, METRIC_AGGREGATION_VALUES } from './metric_select';
 import { SingleFieldSelect } from './single_field_select';
+import { METRIC_TYPE } from '../../common/constants';
 
 export function MetricEditor({ fields, metricsFilter, metric, onChange, removeButton }) {
   const onAggChange = metricAggregationType => {
@@ -34,10 +35,12 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
   };
 
   let fieldSelect;
-  if (metric.type && metric.type !== 'count') {
-    const filterNumberFields = field => {
-      return field.type === 'number';
-    };
+  if (metric.type && metric.type !== METRIC_TYPE.COUNT) {
+    const filterField = metric.type !== METRIC_TYPE.UNIQUE_COUNT
+      ? field => {
+        return field.type === 'number';
+      }
+      : undefined;
     fieldSelect = (
       <EuiFormRow
         label={i18n.translate('xpack.maps.metricsEditor.selectFieldLabel', {
@@ -51,7 +54,7 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
           })}
           value={metric.field}
           onChange={onFieldChange}
-          filterField={filterNumberFields}
+          filterField={filterField}
           fields={fields}
           isClearable={false}
           compressed
diff --git a/x-pack/legacy/plugins/maps/public/components/metric_select.js b/x-pack/legacy/plugins/maps/public/components/metric_select.js
index 76a7e4bf845e48..d11ecdf94cccc7 100644
--- a/x-pack/legacy/plugins/maps/public/components/metric_select.js
+++ b/x-pack/legacy/plugins/maps/public/components/metric_select.js
@@ -8,37 +8,44 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { i18n } from '@kbn/i18n';
 import { EuiComboBox } from '@elastic/eui';
+import { METRIC_TYPE } from '../../common/constants';
 
 const AGG_OPTIONS = [
   {
     label: i18n.translate('xpack.maps.metricSelect.averageDropDownOptionLabel', {
       defaultMessage: 'Average',
     }),
-    value: 'avg',
+    value: METRIC_TYPE.AVG,
   },
   {
     label: i18n.translate('xpack.maps.metricSelect.countDropDownOptionLabel', {
       defaultMessage: 'Count',
     }),
-    value: 'count',
+    value: METRIC_TYPE.COUNT,
   },
   {
     label: i18n.translate('xpack.maps.metricSelect.maxDropDownOptionLabel', {
       defaultMessage: 'Max',
     }),
-    value: 'max',
+    value: METRIC_TYPE.MAX,
   },
   {
     label: i18n.translate('xpack.maps.metricSelect.minDropDownOptionLabel', {
       defaultMessage: 'Min',
     }),
-    value: 'min',
+    value: METRIC_TYPE.MIN,
   },
   {
     label: i18n.translate('xpack.maps.metricSelect.sumDropDownOptionLabel', {
       defaultMessage: 'Sum',
     }),
-    value: 'sum',
+    value: METRIC_TYPE.SUM,
+  },
+  {
+    label: i18n.translate('xpack.maps.metricSelect.cardinalityDropDownOptionLabel', {
+      defaultMessage: 'Unique count',
+    }),
+    value: METRIC_TYPE.UNIQUE_COUNT,
   },
 ];
 
diff --git a/x-pack/legacy/plugins/maps/public/components/metrics_editor.js b/x-pack/legacy/plugins/maps/public/components/metrics_editor.js
index 921466c13da91c..15ba43a9ae6bad 100644
--- a/x-pack/legacy/plugins/maps/public/components/metrics_editor.js
+++ b/x-pack/legacy/plugins/maps/public/components/metrics_editor.js
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButtonEmpty, EuiSpacer, EuiTextAlign } from '@elastic/eui';
 import { MetricEditor } from './metric_editor';
+import { METRIC_TYPE } from '../../common/constants';
 
 export function MetricsEditor({ fields, metrics, onChange, allowMultipleMetrics, metricsFilter }) {
   function renderMetrics() {
@@ -99,6 +100,6 @@ MetricsEditor.propTypes = {
 };
 
 MetricsEditor.defaultProps = {
-  metrics: [{ type: 'count' }],
+  metrics: [{ type: METRIC_TYPE.COUNT }],
   allowMultipleMetrics: true,
 };
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
index c3d4ff673e3d5b..4377fa47254835 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
@@ -6,7 +6,7 @@ exports[`LayerPanel is rendered 1`] = `
     Object {
       "appName": "maps",
       "data": undefined,
-      "store": Storage {
+      "storage": Storage {
         "clear": [Function],
         "get": [Function],
         "remove": [Function],
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
index b9ddc34ab6ab09..9423d32f5c5bf2 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
@@ -16,6 +16,8 @@ import {
 } from '@elastic/eui';
 import { MetricsEditor } from '../../../../components/metrics_editor';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { METRIC_TYPE } from '../../../../../common/constants';
+
 export class MetricsExpression extends Component {
 
   state = {
@@ -58,7 +60,7 @@ export class MetricsExpression extends Component {
   render() {
     const metricExpressions = this.props.metrics
       .filter(({ type, field }) => {
-        if (type === 'count') {
+        if (type === METRIC_TYPE.COUNT) {
           return true;
         }
 
@@ -69,7 +71,7 @@ export class MetricsExpression extends Component {
       })
       .map(({ type, field }) => {
         // do not use metric label so field and aggregation are not obscured.
-        if (type === 'count') {
+        if (type === METRIC_TYPE.COUNT) {
           return 'count';
         }
 
@@ -127,6 +129,6 @@ MetricsExpression.propTypes = {
 
 MetricsExpression.defaultProps = {
   metrics: [
-    { type: 'count' }
+    { type: METRIC_TYPE.COUNT }
   ]
 };
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.js
index 28afabc40bd75b..78cb8aa827e35b 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.js
@@ -30,8 +30,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
 
-import { Storage } from 'ui/storage';
 const localStorage = new Storage(window.localStorage);
 
 // This import will eventually become a dependency injected by the fully deangularized NP plugin.
@@ -154,7 +154,7 @@ export class LayerPanel extends React.Component {
       <KibanaContextProvider
         services={{
           appName: 'maps',
-          store: localStorage,
+          storage: localStorage,
           data: npStart.plugins.data,
           ...npStart.core,
         }}
diff --git a/x-pack/legacy/plugins/maps/public/embeddable/README.md b/x-pack/legacy/plugins/maps/public/embeddable/README.md
index 329ed930ac2926..ccd7899b1c9142 100644
--- a/x-pack/legacy/plugins/maps/public/embeddable/README.md
+++ b/x-pack/legacy/plugins/maps/public/embeddable/README.md
@@ -58,3 +58,21 @@ const renderTooltipContent = ({ addFilters, closeTooltip, features, isLocked, lo
 
 const mapEmbeddable = await factory.createFromState(state, input, parent, renderTooltipContent);
 ```
+
+
+#### Event handlers
+```
+const eventHandlers = {
+  onDataLoad: (layerId: string, dataId: string) => {
+    // take action on data load
+  },
+  onDataLoadEnd: (layerId: string, dataId: string, resultMeta: object) => {
+    // take action on data load end
+  },
+  onDataLoadError: (layerId: string, dataId: string, errorMessage: string) => {
+    // take action on data load error
+  },
+}
+
+const mapEmbeddable = await factory.createFromState(state, input, parent, renderTooltipContent, eventHandlers);
+```
diff --git a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.js b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.js
index ad190f46f6876e..53931d1953ab3e 100644
--- a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.js
+++ b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.js
@@ -11,7 +11,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import 'mapbox-gl/dist/mapbox-gl.css';
 
 import { Embeddable, APPLY_FILTER_TRIGGER } from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
-import { onlyDisabledFiltersChanged } from '../../../../../../src/legacy/core_plugins/data/public';
+import { onlyDisabledFiltersChanged } from '../../../../../../src/plugins/data/public';
 
 import { I18nContext } from 'ui/i18n';
 
@@ -31,14 +31,14 @@ import {
   setOpenTOCDetails,
 } from '../actions/ui_actions';
 import { getIsLayerTOCOpen, getOpenTOCDetails } from '../selectors/ui_selectors';
-import { getInspectorAdapters } from '../reducers/non_serializable_instances';
+import { getInspectorAdapters, setEventHandlers } from '../reducers/non_serializable_instances';
 import { getMapCenter, getMapZoom } from '../selectors/map_selectors';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
 
 export class MapEmbeddable extends Embeddable {
   type = MAP_SAVED_OBJECT_TYPE;
 
-  constructor(config, initialInput, parent, renderTooltipContent) {
+  constructor(config, initialInput, parent, renderTooltipContent, eventHandlers) {
     super(
       initialInput,
       {
@@ -50,6 +50,7 @@ export class MapEmbeddable extends Embeddable {
       parent);
 
     this._renderTooltipContent = renderTooltipContent;
+    this._eventHandlers = eventHandlers;
     this._layerList = config.layerList;
     this._store = createMapStore();
 
@@ -72,7 +73,7 @@ export class MapEmbeddable extends Embeddable {
     }
   }
 
-  _dispatchSetQuery({ query, timeRange, filters }) {
+  _dispatchSetQuery({ query, timeRange, filters, refresh }) {
     this._prevTimeRange = timeRange;
     this._prevQuery = query;
     this._prevFilters = filters;
@@ -80,6 +81,7 @@ export class MapEmbeddable extends Embeddable {
       filters: filters.filter(filter => !filter.meta.disabled),
       query,
       timeFilters: timeRange,
+      refresh,
     }));
   }
 
@@ -97,6 +99,7 @@ export class MapEmbeddable extends Embeddable {
    * @param {ContainerState} containerState
    */
   render(domNode) {
+    this._store.dispatch(setEventHandlers(this._eventHandlers));
     this._store.dispatch(setReadOnly(true));
     this._store.dispatch(disableScrollZoom());
 
@@ -165,7 +168,8 @@ export class MapEmbeddable extends Embeddable {
     this._dispatchSetQuery({
       query: this._prevQuery,
       timeRange: this._prevTimeRange,
-      filters: this._prevFilters
+      filters: this._prevFilters,
+      refresh: true
     });
   }
 
diff --git a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.js b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.js
index 21c289d9eb2814..f09726039b0c31 100644
--- a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.js
+++ b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.js
@@ -123,6 +123,7 @@ export class MapEmbeddableFactory extends EmbeddableFactory {
     input,
     parent,
     renderTooltipContent,
+    eventHandlers,
   ) {
     const layerList = state && state.layerList ? state.layerList : getInitialLayers();
     const indexPatterns = await this._getIndexPatterns(layerList);
@@ -137,7 +138,8 @@ export class MapEmbeddableFactory extends EmbeddableFactory {
       },
       input,
       parent,
-      renderTooltipContent
+      renderTooltipContent,
+      eventHandlers,
     );
   }
 
diff --git a/x-pack/legacy/plugins/maps/public/index.js b/x-pack/legacy/plugins/maps/public/index.js
index 5cd2288bf6a1ed..49d8646c6a251d 100644
--- a/x-pack/legacy/plugins/maps/public/index.js
+++ b/x-pack/legacy/plugins/maps/public/index.js
@@ -23,7 +23,6 @@ import routes from 'ui/routes';
 import 'ui/kbn_top_nav';
 import { uiModules } from 'ui/modules';
 import { docTitle } from 'ui/doc_title';
-import 'ui/autoload/styles';
 import 'ui/autoload/all';
 import 'react-vis/dist/style.css';
 
diff --git a/x-pack/legacy/plugins/maps/public/index_pattern_util.js b/x-pack/legacy/plugins/maps/public/index_pattern_util.js
index ca43826f307ebb..da75ced2d02af1 100644
--- a/x-pack/legacy/plugins/maps/public/index_pattern_util.js
+++ b/x-pack/legacy/plugins/maps/public/index_pattern_util.js
@@ -28,6 +28,7 @@ export function getTermsFields(fields) {
 export function getSourceFields(fields) {
   return fields.filter(field => {
     // Multi fields are not stored in _source and only exist in index.
-    return field.subType !== 'multi';
+    const isMultiField = field.subType && field.subType.multi;
+    return !isMultiField;
   });
 }
diff --git a/x-pack/legacy/plugins/maps/public/index_pattern_util.test.js b/x-pack/legacy/plugins/maps/public/index_pattern_util.test.js
new file mode 100644
index 00000000000000..aedff273f646b8
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/index_pattern_util.test.js
@@ -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.
+ */
+
+jest.mock('./kibana_services', () => ({}));
+
+import { getSourceFields } from './index_pattern_util';
+
+describe('getSourceFields', () => {
+  test('Should remove multi fields from field list', () => {
+    const fields = [
+      {
+        name: 'agent'
+      },
+      {
+        name: 'agent.keyword',
+        subType: {
+          multi: {
+            parent: 'agent'
+          }
+        }
+      }
+    ];
+    const sourceFields = getSourceFields(fields);
+    expect(sourceFields).toEqual([
+      { name: 'agent' }
+    ]);
+  });
+});
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 629fb3284ff114..10e528d19785b4 100644
--- a/x-pack/legacy/plugins/maps/public/layers/heatmap_layer.js
+++ b/x-pack/legacy/plugins/maps/public/layers/heatmap_layer.js
@@ -7,7 +7,7 @@
 import _ from 'lodash';
 import { AbstractLayer } from './layer';
 import { VectorLayer } from './vector_layer';
-import { HeatmapStyle } from './styles/heatmap_style';
+import { HeatmapStyle } from './styles/heatmap/heatmap_style';
 import { EMPTY_FEATURE_COLLECTION, LAYER_TYPE } from '../../common/constants';
 
 const SCALED_PROPERTY_NAME = '__kbn_heatmap_weight__';//unique name to store scaled value for weighting
diff --git a/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.js b/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.js
index 8d1d1439a967e3..9c9aa912f3a399 100644
--- a/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.js
+++ b/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.js
@@ -6,7 +6,7 @@
 
 
 import { ESTermSource } from '../sources/es_term_source';
-import { VectorStyle } from '../styles/vector_style';
+import { VectorStyle } from '../styles/vector/vector_style';
 
 export class InnerJoin {
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/layer.js b/x-pack/legacy/plugins/maps/public/layers/layer.js
index c1e45d9b7c7a82..6515ab608c2ea1 100644
--- a/x-pack/legacy/plugins/maps/public/layers/layer.js
+++ b/x-pack/legacy/plugins/maps/public/layers/layer.js
@@ -9,7 +9,6 @@ import { EuiIcon, EuiLoadingSpinner } from '@elastic/eui';
 import turf from 'turf';
 import turfBooleanContains from '@turf/boolean-contains';
 import { DataRequest } from './util/data_request';
-import { InjectedData } from './util/injected_data';
 import {
   MB_SOURCE_ID_LAYER_ID_PREFIX_DELIMITER,
   SOURCE_DATA_ID_ORIGIN
@@ -32,11 +31,6 @@ export class AbstractLayer {
     } else {
       this._dataRequests = [];
     }
-    if (this._descriptor.__injectedData) {
-      this._injectedData = new InjectedData(this._descriptor.__injectedData);
-    } else {
-      this._injectedData = null;
-    }
   }
 
   static getBoundDataForSource(mbMap, sourceId) {
@@ -48,7 +42,6 @@ export class AbstractLayer {
     const layerDescriptor = { ...options };
 
     layerDescriptor.__dataRequests = _.get(options, '__dataRequests', []);
-    layerDescriptor.__injectedData = _.get(options, '__injectedData', null);
     layerDescriptor.id = _.get(options, 'id', uuid());
     layerDescriptor.label = options.label && options.label.length > 0 ? options.label : null;
     layerDescriptor.minZoom = _.get(options, 'minZoom', 0);
@@ -287,10 +280,6 @@ export class AbstractLayer {
     return this._dataRequests.find(dataRequest => dataRequest.getDataId() === id);
   }
 
-  getInjectedData() {
-    return this._injectedData ? this._injectedData.getData() : null;
-  }
-
   isLayerLoading() {
     return this._dataRequests.some(dataRequest => dataRequest.isLoading());
   }
@@ -405,7 +394,11 @@ export class AbstractLayer {
     return [];
   }
 
-  async getOrdinalFields() {
+  async getDateFields() {
+    return [];
+  }
+
+  async getNumberFields() {
     return [];
   }
 
@@ -413,5 +406,9 @@ export class AbstractLayer {
     mbMap.setLayoutProperty(mbLayerId, 'visibility', this.isVisible() ? 'visible' : 'none');
   }
 
+  getType() {
+    return this._descriptor.type;
+  }
+
 }
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
index cf876a59d0be4f..59cfc7b486bdd9 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
@@ -35,9 +35,32 @@ export class GeojsonFileSource extends AbstractVectorSource {
     applyGlobalQuery: DEFAULT_APPLY_GLOBAL_QUERY
   }
 
-  static createDescriptor(name) {
+  static createDescriptor(geoJson, name) {
+    // Wrap feature as feature collection if needed
+    let featureCollection;
+
+    if (!geoJson) {
+      featureCollection = {
+        type: 'FeatureCollection',
+        features: []
+      };
+    } else if (geoJson.type === 'FeatureCollection') {
+      featureCollection = geoJson;
+    } else if (geoJson.type === 'Feature') {
+      featureCollection = {
+        type: 'FeatureCollection',
+        features: [geoJson]
+      };
+    } else { // Missing or incorrect type
+      featureCollection = {
+        type: 'FeatureCollection',
+        features: []
+      };
+    }
+
     return {
       type: GeojsonFileSource.type,
+      __featureCollection: featureCollection,
       name
     };
   }
@@ -85,16 +108,9 @@ export class GeojsonFileSource extends AbstractVectorSource {
         onPreviewSource(null);
         return;
       }
-      const sourceDescriptor = GeojsonFileSource.createDescriptor(name);
+      const sourceDescriptor = GeojsonFileSource.createDescriptor(geojsonFile, name);
       const source = new GeojsonFileSource(sourceDescriptor, inspectorAdapters);
-      const featureCollection = (geojsonFile.type === 'Feature')
-        ? {
-          type: 'FeatureCollection',
-          features: [{ ...geojsonFile }]
-        }
-        : geojsonFile;
-
-      onPreviewSource(source, { __injectedData: featureCollection });
+      onPreviewSource(source);
     };
   };
 
@@ -125,6 +141,22 @@ export class GeojsonFileSource extends AbstractVectorSource {
     );
   }
 
+  async getGeoJsonWithMeta() {
+    const copiedPropsFeatures = this._descriptor.__featureCollection.features
+      .map(feature => ({
+        type: 'Feature',
+        geometry: feature.geometry,
+        properties: feature.properties ? { ...feature.properties } : {}
+      }));
+    return {
+      data: {
+        type: 'FeatureCollection',
+        features: copiedPropsFeatures
+      },
+      meta: {}
+    };
+  }
+
   async getDisplayName() {
     return this._descriptor.name;
   }
@@ -136,8 +168,4 @@ export class GeojsonFileSource extends AbstractVectorSource {
   shouldBeIndexed() {
     return GeojsonFileSource.isIndexingSource;
   }
-
-  isInjectedData() {
-    return true;
-  }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.js
new file mode 100644
index 00000000000000..d9639144dfc529
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.js
@@ -0,0 +1,142 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { AbstractESSource } from './es_source';
+import { ESAggMetricTooltipProperty } from '../tooltips/es_aggmetric_tooltip_property';
+import { METRIC_TYPE } from '../../../common/constants';
+import _ from 'lodash';
+
+const COUNT_PROP_LABEL = 'count';
+const COUNT_PROP_NAME = 'doc_count';
+const AGG_DELIMITER = '_of_';
+
+export class AbstractESAggSource extends AbstractESSource {
+
+  static METRIC_SCHEMA_CONFIG = {
+    group: 'metrics',
+    name: 'metric',
+    title: 'Value',
+    min: 1,
+    max: Infinity,
+    aggFilter: [
+      METRIC_TYPE.AVG,
+      METRIC_TYPE.COUNT,
+      METRIC_TYPE.MAX,
+      METRIC_TYPE.MIN,
+      METRIC_TYPE.SUM,
+      METRIC_TYPE.UNIQUE_COUNT
+    ],
+    defaults: [
+      { schema: 'metric', type: METRIC_TYPE.COUNT }
+    ]
+  };
+
+  _formatMetricKey(metric) {
+    const aggType = metric.type;
+    const fieldName = metric.field;
+    return aggType !== METRIC_TYPE.COUNT ? `${aggType}${AGG_DELIMITER}${fieldName}` : COUNT_PROP_NAME;
+  }
+
+  _formatMetricLabel(metric) {
+    const aggType = metric.type;
+    const fieldName = metric.field;
+    return aggType !== METRIC_TYPE.COUNT ? `${aggType} of ${fieldName}` : COUNT_PROP_LABEL;
+  }
+
+  _getValidMetrics() {
+    const metrics = _.get(this._descriptor, 'metrics', []).filter(({ type, field }) => {
+      if (type === METRIC_TYPE.COUNT) {
+        return true;
+      }
+
+      if (field) {
+        return true;
+      }
+      return false;
+    });
+    if (metrics.length === 0) {
+      metrics.push({ type: METRIC_TYPE.COUNT });
+    }
+    return metrics;
+  }
+
+  getMetricFields() {
+    return this._getValidMetrics().map(metric => {
+      const metricKey = this._formatMetricKey(metric);
+      const metricLabel = metric.label ? metric.label : this._formatMetricLabel(metric);
+      const metricCopy = { ...metric };
+      delete metricCopy.label;
+      return {
+        ...metricCopy,
+        propertyKey: metricKey,
+        propertyLabel: metricLabel
+      };
+    });
+  }
+
+  async getNumberFields() {
+    return this.getMetricFields().map(({ propertyKey: name, propertyLabel: label }) => {
+      return { label, name };
+    });
+  }
+
+  getFieldNames() {
+    return this.getMetricFields().map(({ propertyKey }) => {
+      return propertyKey;
+    });
+  }
+
+  createMetricAggConfigs() {
+    return this.getMetricFields().map(metric => {
+      const metricAggConfig = {
+        id: metric.propertyKey,
+        enabled: true,
+        type: metric.type,
+        schema: 'metric',
+        params: {}
+      };
+      if (metric.type !== METRIC_TYPE.COUNT) {
+        metricAggConfig.params = { field: metric.field };
+      }
+      return metricAggConfig;
+    });
+  }
+
+  async filterAndFormatPropertiesToHtmlForMetricFields(properties) {
+    let indexPattern;
+    try {
+      indexPattern = await this._getIndexPattern();
+    } catch(error) {
+      console.warn(`Unable to find Index pattern ${this._descriptor.indexPatternId}, values are not formatted`);
+      return properties;
+    }
+
+    const metricFields = this.getMetricFields();
+    const tooltipProperties = [];
+    metricFields.forEach((metricField) => {
+      let value;
+      for (const key in properties) {
+        if (properties.hasOwnProperty(key) && metricField.propertyKey === key) {
+          value = properties[key];
+          break;
+        }
+      }
+
+      const tooltipProperty  = new ESAggMetricTooltipProperty(
+        metricField.propertyKey,
+        metricField.propertyLabel,
+        value,
+        indexPattern,
+        metricField
+      );
+      tooltipProperties.push(tooltipProperty);
+    });
+
+    return tooltipProperties;
+
+  }
+
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js
index e06568285dd6b5..c83f12ce992ff0 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js
@@ -20,8 +20,7 @@ export function convertToGeoJson({ table, renderAs }) {
   }
 
   const metricColumns = table.columns.filter(column => {
-    return column.aggConfig.type.type === 'metrics'
-      && column.aggConfig.type.dslName !== 'geo_centroid';
+    return column.aggConfig.type.type === 'metrics' && column.aggConfig.type.dslName !== 'geo_centroid';
   });
   const geocentroidColumn = table.columns.find(column => column.aggConfig.type.dslName === 'geo_centroid');
   if (!geocentroidColumn) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
index 8416ef5709e309..a8b52e586da28a 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
@@ -8,15 +8,14 @@ import React from 'react';
 import uuid from 'uuid/v4';
 
 import { VECTOR_SHAPE_TYPES } from '../vector_feature_types';
-import { AbstractESSource } from '../es_source';
 import { HeatmapLayer } from '../../heatmap_layer';
 import { VectorLayer } from '../../vector_layer';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggConfigs } from 'ui/agg_types';
 import { tabifyAggResponse } from 'ui/agg_response/tabify';
 import { convertToGeoJson } from './convert_to_geojson';
-import { VectorStyle } from '../../styles/vector_style';
-import { vectorStyles } from '../../styles/vector_style_defaults';
+import { VectorStyle } from '../../styles/vector/vector_style';
+import { vectorStyles } from '../../styles/vector/vector_style_defaults';
 import { RENDER_AS } from './render_as';
 import { CreateSourceEditor } from './create_source_editor';
 import { UpdateSourceEditor } from './update_source_editor';
@@ -24,23 +23,14 @@ import { GRID_RESOLUTION } from '../../grid_resolution';
 import { SOURCE_DATA_ID_ORIGIN, ES_GEO_GRID } from '../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
+import { AbstractESAggSource } from '../es_agg_source';
 
 const COUNT_PROP_LABEL = 'count';
 const COUNT_PROP_NAME = 'doc_count';
 const MAX_GEOTILE_LEVEL = 29;
 
 const aggSchemas = new Schemas([
-  {
-    group: 'metrics',
-    name: 'metric',
-    title: 'Value',
-    min: 1,
-    max: Infinity,
-    aggFilter: ['avg', 'count', 'max', 'min', 'sum'],
-    defaults: [
-      { schema: 'metric', type: 'count' }
-    ]
-  },
+  AbstractESAggSource.METRIC_SCHEMA_CONFIG,
   {
     group: 'buckets',
     name: 'segment',
@@ -51,7 +41,7 @@ const aggSchemas = new Schemas([
   }
 ]);
 
-export class ESGeoGridSource extends AbstractESSource {
+export class ESGeoGridSource extends AbstractESAggSource {
 
   static type = ES_GEO_GRID;
   static title = i18n.translate('xpack.maps.source.esGridTitle', {
@@ -133,12 +123,6 @@ export class ESGeoGridSource extends AbstractESSource {
     ];
   }
 
-  getFieldNames() {
-    return this.getMetricFields().map(({ propertyKey }) => {
-      return propertyKey;
-    });
-  }
-
   isGeoGridPrecisionAware() {
     return true;
   }
@@ -177,12 +161,6 @@ export class ESGeoGridSource extends AbstractESSource {
     }));
   }
 
-  async getNumberFields() {
-    return this.getMetricFields().map(({ propertyKey: name, propertyLabel: label }) => {
-      return { label, name };
-    });
-  }
-
   async getGeoJsonWithMeta(layerName, searchFilters, registerCancelCallback) {
     const indexPattern = await this._getIndexPattern();
     const searchSource  = await this._makeSearchSource(searchFilters, 0);
@@ -214,29 +192,8 @@ export class ESGeoGridSource extends AbstractESSource {
     return true;
   }
 
-  _formatMetricKey(metric) {
-    return metric.type !== 'count' ? `${metric.type}_of_${metric.field}` : COUNT_PROP_NAME;
-  }
-
-  _formatMetricLabel(metric) {
-    return metric.type !== 'count' ? `${metric.type} of ${metric.field}` : COUNT_PROP_LABEL;
-  }
-
   _makeAggConfigs(precision) {
-    const metricAggConfigs = this.getMetricFields().map(metric => {
-      const metricAggConfig = {
-        id: metric.propertyKey,
-        enabled: true,
-        type: metric.type,
-        schema: 'metric',
-        params: {}
-      };
-      if (metric.type !== 'count') {
-        metricAggConfig.params = { field: metric.field };
-      }
-      return metricAggConfig;
-    });
-
+    const metricAggConfigs = this.createMetricAggConfigs();
     return [
       ...metricAggConfigs,
       {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
index bed8236da1be8c..9ea5093724ed98 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
@@ -8,6 +8,7 @@ import React, { Fragment, Component } from 'react';
 
 import { RENDER_AS } from './render_as';
 import { MetricsEditor } from '../../../components/metrics_editor';
+import { METRIC_TYPE } from '../../../../common/constants';
 import { indexPatternService } from '../../../kibana_services';
 import { ResolutionEditor } from './resolution_editor';
 import { i18n } from '@kbn/i18n';
@@ -66,7 +67,7 @@ export class UpdateSourceEditor extends Component {
       this.props.renderAs === RENDER_AS.HEATMAP
         ? metric => {
           //these are countable metrics, where blending heatmap color blobs make sense
-          return ['count', 'sum'].includes(metric.value);
+          return [METRIC_TYPE.COUNT, METRIC_TYPE.SUM, METRIC_TYPE.UNIQUE_COUNT].includes(metric.value);
         }
         : null;
     const allowMultipleMetrics = this.props.renderAs !== RENDER_AS.HEATMAP;
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
index 4c081d386b3d7e..6cc6ab196f7d87 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
@@ -8,38 +8,26 @@ import React from 'react';
 import uuid from 'uuid/v4';
 
 import { VECTOR_SHAPE_TYPES } from '../vector_feature_types';
-import { AbstractESSource } from '../es_source';
 import { VectorLayer } from '../../vector_layer';
 import { CreateSourceEditor } from './create_source_editor';
 import { UpdateSourceEditor } from './update_source_editor';
-import { VectorStyle } from '../../styles/vector_style';
-import { vectorStyles } from '../../styles/vector_style_defaults';
+import { VectorStyle } from '../../styles/vector/vector_style';
+import { vectorStyles } from '../../styles/vector/vector_style_defaults';
 import { i18n } from '@kbn/i18n';
 import { SOURCE_DATA_ID_ORIGIN, ES_PEW_PEW } from '../../../../common/constants';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { convertToLines } from './convert_to_lines';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggConfigs } from 'ui/agg_types';
+import { AbstractESAggSource } from '../es_agg_source';
 
 const COUNT_PROP_LABEL = 'count';
 const COUNT_PROP_NAME = 'doc_count';
 const MAX_GEOTILE_LEVEL = 29;
 
-const aggSchemas = new Schemas([
-  {
-    group: 'metrics',
-    name: 'metric',
-    title: 'Value',
-    min: 1,
-    max: Infinity,
-    aggFilter: ['avg', 'count', 'max', 'min', 'sum'],
-    defaults: [
-      { schema: 'metric', type: 'count' }
-    ]
-  }
-]);
+const aggSchemas = new Schemas([AbstractESAggSource.METRIC_SCHEMA_CONFIG]);
 
-export class ESPewPewSource extends AbstractESSource {
+export class ESPewPewSource extends AbstractESAggSource {
 
   static type = ES_PEW_PEW;
   static title = i18n.translate('xpack.maps.source.pewPewTitle', {
@@ -96,12 +84,6 @@ export class ESPewPewSource extends AbstractESSource {
     return true;
   }
 
-  async getNumberFields() {
-    return this.getMetricFields().map(({ propertyKey: name, propertyLabel: label }) => {
-      return { label, name };
-    });
-  }
-
   async getSupportedShapeTypes() {
     return [VECTOR_SHAPE_TYPES.LINE];
   }
@@ -185,19 +167,7 @@ export class ESPewPewSource extends AbstractESSource {
 
   async getGeoJsonWithMeta(layerName, searchFilters, registerCancelCallback) {
     const indexPattern = await this._getIndexPattern();
-    const metricAggConfigs = this.getMetricFields().map(metric => {
-      const metricAggConfig = {
-        id: metric.propertyKey,
-        enabled: true,
-        type: metric.type,
-        schema: 'metric',
-        params: {}
-      };
-      if (metric.type !== 'count') {
-        metricAggConfig.params = { field: metric.field };
-      }
-      return metricAggConfig;
-    });
+    const metricAggConfigs = this.createMetricAggConfigs();
     const aggConfigs = new AggConfigs(indexPattern, metricAggConfigs, aggSchemas.all);
 
     const searchSource  = await this._makeSearchSource(searchFilters, 0);
@@ -251,14 +221,6 @@ export class ESPewPewSource extends AbstractESSource {
     };
   }
 
-  _formatMetricKey(metric) {
-    return metric.type !== 'count' ? `${metric.type}_of_${metric.field}` : COUNT_PROP_NAME;
-  }
-
-  _formatMetricLabel(metric) {
-    return metric.type !== 'count' ? `${metric.type} of ${metric.field}` : COUNT_PROP_LABEL;
-  }
-
   async _getGeoField() {
     const indexPattern = await this._getIndexPattern();
     const geoField = indexPattern.fields.getByName(this._descriptor.destGeoField);
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 7c248e332d403d..d9c48424bb77dc 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
@@ -512,9 +512,4 @@ export class ESSearchSource extends AbstractESSource {
       path: geoField.name,
     };
   }
-
-  _getRawFieldName(fieldName) {
-    // fieldName is rawFieldName for documents source since the source uses raw documents instead of aggregated metrics
-    return fieldName;
-  }
 }
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 0670474df89bb2..cc53ee27af4715 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
@@ -15,11 +15,9 @@ import { timefilter } from 'ui/timefilter';
 import _ from 'lodash';
 import { AggConfigs } from 'ui/agg_types';
 import { i18n } from '@kbn/i18n';
-import { ESAggMetricTooltipProperty } from '../tooltips/es_aggmetric_tooltip_property';
-
 import uuid from 'uuid/v4';
 import { copyPersistentState } from '../../reducers/util';
-import { ES_GEO_FIELD_TYPE } from '../../../common/constants';
+import { ES_GEO_FIELD_TYPE, METRIC_TYPE } from '../../../common/constants';
 import { DataRequestAbortError } from '../util/data_request';
 
 export class AbstractESSource extends AbstractVectorSource {
@@ -57,80 +55,6 @@ export class AbstractESSource extends AbstractVectorSource {
     return clonedDescriptor;
   }
 
-  _getValidMetrics() {
-    const metrics = _.get(this._descriptor, 'metrics', []).filter(({ type, field }) => {
-      if (type === 'count') {
-        return true;
-      }
-
-      if (field) {
-        return true;
-      }
-      return false;
-    });
-    if (metrics.length === 0) {
-      metrics.push({ type: 'count' });
-    }
-    return metrics;
-  }
-
-  _formatMetricKey() {
-    throw new Error('should implement');
-  }
-
-  _formatMetricLabel() {
-    throw new Error('should implement');
-  }
-
-  getMetricFields() {
-    return this._getValidMetrics().map(metric => {
-      const metricKey = this._formatMetricKey(metric);
-      const metricLabel = metric.label ? metric.label : this._formatMetricLabel(metric);
-      const metricCopy = { ...metric };
-      delete metricCopy.label;
-      return {
-        ...metricCopy,
-        propertyKey: metricKey,
-        propertyLabel: metricLabel
-      };
-    });
-  }
-
-  async filterAndFormatPropertiesToHtmlForMetricFields(properties) {
-    let indexPattern;
-    try {
-      indexPattern = await this._getIndexPattern();
-    } catch(error) {
-      console.warn(`Unable to find Index pattern ${this._descriptor.indexPatternId}, values are not formatted`);
-      return properties;
-    }
-
-
-    const metricFields = this.getMetricFields();
-    const tooltipProperties = [];
-    metricFields.forEach((metricField) => {
-      let value;
-      for (const key in properties) {
-        if (properties.hasOwnProperty(key) && metricField.propertyKey === key) {
-          value = properties[key];
-          break;
-        }
-      }
-
-      const tooltipProperty  = new ESAggMetricTooltipProperty(
-        metricField.propertyKey,
-        metricField.propertyLabel,
-        value,
-        indexPattern,
-        metricField
-      );
-      tooltipProperties.push(tooltipProperty);
-    });
-
-    return tooltipProperties;
-
-  }
-
 
   async _runEsQuery(requestName, searchSource, registerCancelCallback, requestDescription) {
     const abortController = new AbortController();
@@ -300,18 +224,13 @@ export class AbstractESSource extends AbstractVectorSource {
     return this._descriptor.id;
   }
 
-  _getRawFieldName(fieldName) {
+  async getFieldFormatter(fieldName) {
     const metricField = this.getMetricFields().find(({ propertyKey }) => {
       return propertyKey === fieldName;
     });
 
-    return metricField ? metricField.field : null;
-  }
-
-  async getFieldFormatter(fieldName) {
-    // fieldName could be an aggregation so it needs to be unpacked to expose raw field.
-    const rawFieldName = this._getRawFieldName(fieldName);
-    if (!rawFieldName) {
+    // Do not use field formatters for counting metrics
+    if (metricField && metricField.type === METRIC_TYPE.COUNT || metricField.type === METRIC_TYPE.UNIQUE_COUNT) {
       return null;
     }
 
@@ -322,7 +241,10 @@ export class AbstractESSource extends AbstractVectorSource {
       return null;
     }
 
-    const fieldFromIndexPattern = indexPattern.fields.getByName(rawFieldName);
+    const realFieldName = metricField
+      ? metricField.field
+      : fieldName;
+    const fieldFromIndexPattern = indexPattern.fields.getByName(realFieldName);
     if (!fieldFromIndexPattern) {
       return null;
     }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js
index 5d876dbbd011fe..7d1ccf7373cf61 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js
@@ -6,27 +6,17 @@
 
 import _ from 'lodash';
 
-import { AbstractESSource } from './es_source';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggConfigs } from 'ui/agg_types';
 import { i18n } from '@kbn/i18n';
 import { ESTooltipProperty } from '../tooltips/es_tooltip_property';
-import { ES_SIZE_LIMIT } from '../../../common/constants';
+import { ES_SIZE_LIMIT, METRIC_TYPE } from '../../../common/constants';
+import { AbstractESAggSource } from './es_agg_source';
 
 const TERMS_AGG_NAME = 'join';
 
 const aggSchemas = new Schemas([
-  {
-    group: 'metrics',
-    name: 'metric',
-    title: 'Value',
-    min: 1,
-    max: Infinity,
-    aggFilter: ['avg', 'count', 'max', 'min', 'sum'],
-    defaults: [
-      { schema: 'metric', type: 'count' }
-    ]
-  },
+  AbstractESAggSource.METRIC_SCHEMA_CONFIG,
   {
     group: 'buckets',
     name: 'segment',
@@ -54,7 +44,7 @@ export function extractPropertiesMap(rawEsData, propertyNames, countPropertyName
   return propertiesMap;
 }
 
-export class ESTermSource extends AbstractESSource {
+export class ESTermSource extends AbstractESAggSource {
 
   static type = 'ES_TERM_SOURCE';
 
@@ -81,12 +71,12 @@ export class ESTermSource extends AbstractESSource {
   }
 
   _formatMetricKey(metric) {
-    const metricKey = metric.type !== 'count' ? `${metric.type}_of_${metric.field}` : metric.type;
+    const metricKey = metric.type !== METRIC_TYPE.COUNT ? `${metric.type}_of_${metric.field}` : metric.type;
     return `__kbnjoin__${metricKey}_groupby_${this._descriptor.indexPatternTitle}.${this._descriptor.term}`;
   }
 
   _formatMetricLabel(metric) {
-    const metricLabel = metric.type !== 'count' ? `${metric.type} ${metric.field}` : 'count';
+    const metricLabel = metric.type !== METRIC_TYPE.COUNT ? `${metric.type} ${metric.field}` : 'count';
     return `${metricLabel} of ${this._descriptor.indexPatternTitle}:${this._descriptor.term}`;
   }
 
@@ -108,13 +98,13 @@ export class ESTermSource extends AbstractESSource {
 
     const metricPropertyNames = configStates
       .filter(configState => {
-        return configState.schema === 'metric' && configState.type !== 'count';
+        return configState.schema === 'metric' && configState.type !== METRIC_TYPE.COUNT;
       })
       .map(configState => {
         return configState.id;
       });
     const countConfigState = configStates.find(configState => {
-      return configState.type === 'count';
+      return configState.type === METRIC_TYPE.COUNT;
     });
     const countPropertyName = _.get(countConfigState, 'id');
     return {
@@ -128,7 +118,7 @@ export class ESTermSource extends AbstractESSource {
 
   _getRequestDescription(leftSourceName, leftFieldName) {
     const metrics = this._getValidMetrics().map(metric => {
-      return metric.type !== 'count' ? `${metric.type} ${metric.field}` : 'count';
+      return metric.type !== METRIC_TYPE.COUNT ? `${metric.type} ${metric.field}` : 'count';
     });
     const joinStatement = [];
     joinStatement.push(i18n.translate('xpack.maps.source.esJoin.joinLeftDescription', {
@@ -149,20 +139,7 @@ export class ESTermSource extends AbstractESSource {
   }
 
   _makeAggConfigs() {
-    const metricAggConfigs = this.getMetricFields().map(metric => {
-      const metricAggConfig = {
-        id: metric.propertyKey,
-        enabled: true,
-        type: metric.type,
-        schema: 'metric',
-        params: {}
-      };
-      if (metric.type !== 'count') {
-        metricAggConfig.params = { field: metric.field };
-      }
-      return metricAggConfig;
-    });
-
+    const metricAggConfigs = this.createMetricAggConfigs();
     return [
       ...metricAggConfigs,
       {
@@ -198,10 +175,4 @@ export class ESTermSource extends AbstractESSource {
       return null;
     }
   }
-
-  getFieldNames() {
-    return this.getMetricFields().map(({ propertyKey }) => {
-      return propertyKey;
-    });
-  }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/source.js b/x-pack/legacy/plugins/maps/public/layers/sources/source.js
index f96fc42f021784..3bee49cff6d18d 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/source.js
@@ -115,10 +115,6 @@ export class AbstractSource {
     return AbstractSource.isIndexingSource;
   }
 
-  isInjectedData() {
-    return false;
-  }
-
   supportsElasticsearchFilters() {
     return false;
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.js
index b3e8c1b019f28b..8f67d7618049b5 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.js
@@ -7,7 +7,7 @@
 
 import { VectorLayer } from '../vector_layer';
 import { TooltipProperty } from '../tooltips/tooltip_property';
-import { VectorStyle } from '../styles/vector_style';
+import { VectorStyle } from '../styles/vector/vector_style';
 import { AbstractSource } from './source';
 import * as topojson from 'topojson-client';
 import _ from 'lodash';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss b/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss
index 87c7bd1face64b..bd517f81517c23 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss
@@ -1,3 +1,3 @@
 @import './components/color_gradient';
 @import './components/static_dynamic_style_row';
-@import './components/vector/color/color_stops';
+@import './vector/components/color/color_stops';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/static_dynamic_style_row.js b/x-pack/legacy/plugins/maps/public/layers/styles/components/static_dynamic_style_row.js
index cfe7a0741a194c..5537bb90fa245b 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/static_dynamic_style_row.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/components/static_dynamic_style_row.js
@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { VectorStyle } from '../vector_style';
+import { VectorStyle } from '../vector/vector_style';
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/__snapshots__/heatmap_style_editor.test.js.snap b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/__snapshots__/heatmap_style_editor.test.js.snap
rename to x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/heatmap_constants.js b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_constants.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/heatmap_constants.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_constants.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/heatmap_style_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.js
similarity index 95%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/heatmap_style_editor.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.js
index 0aa20f29c341b4..a0f86dcf5130be 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/heatmap_style_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.js
@@ -8,7 +8,7 @@ import React from 'react';
 
 import { EuiFormRow, EuiSuperSelect } from '@elastic/eui';
 import { COLOR_GRADIENTS } from '../../color_utils';
-import { ColorGradient } from '../color_gradient';
+import { ColorGradient } from '../../components/color_gradient';
 import {
   DEFAULT_RGB_HEATMAP_COLOR_RAMP,
   DEFAULT_HEATMAP_COLOR_RAMP_NAME,
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/heatmap_style_editor.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/heatmap_style_editor.test.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/legend/heatmap_legend.js b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js
similarity index 88%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/legend/heatmap_legend.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js
index 74fce11abf0a6a..06709ba0ebf21b 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/heatmap/legend/heatmap_legend.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js
@@ -7,8 +7,8 @@
 import React from 'react';
 
 import { i18n } from '@kbn/i18n';
-import { ColorGradient } from '../../color_gradient';
-import { StyleLegendRow } from '../../style_legend_row';
+import { ColorGradient } from '../../../components/color_gradient';
+import { StyleLegendRow } from '../../../components/style_legend_row';
 import {
   DEFAULT_RGB_HEATMAP_COLOR_RAMP,
   DEFAULT_HEATMAP_COLOR_RAMP_NAME,
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap_style.js b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js
similarity index 90%
rename from x-pack/legacy/plugins/maps/public/layers/styles/heatmap_style.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js
index 5ccabe610a120f..e537da8a3e2e40 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap_style.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js
@@ -5,12 +5,12 @@
  */
 
 import React from 'react';
-import { GRID_RESOLUTION } from '../grid_resolution';
-import { AbstractStyle } from './abstract_style';
-import { HeatmapStyleEditor } from './components/heatmap/heatmap_style_editor';
-import { HeatmapLegend } from './components/heatmap/legend/heatmap_legend';
-import { DEFAULT_HEATMAP_COLOR_RAMP_NAME } from './components/heatmap/heatmap_constants';
-import { getColorRampStops } from './color_utils';
+import { GRID_RESOLUTION } from '../../grid_resolution';
+import { AbstractStyle } from '../abstract_style';
+import { HeatmapStyleEditor } from './components/heatmap_style_editor';
+import { HeatmapLegend } from './components/legend/heatmap_legend';
+import { DEFAULT_HEATMAP_COLOR_RAMP_NAME } from './components/heatmap_constants';
+import { getColorRampStops } from '../color_utils';
 import { i18n } from '@kbn/i18n';
 import { EuiIcon } from '@elastic/eui';
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/__snapshots__/vector_style_symbol_editor.test.js.snap b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/__snapshots__/vector_style_symbol_editor.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/__snapshots__/vector_style_symbol_editor.test.js.snap
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/__snapshots__/vector_style_symbol_editor.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/_color_stops.scss b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/_color_stops.scss
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/color_ramp_select.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_ramp_select.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/color_ramp_select.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_ramp_select.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/color_stops.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/color_stops.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/color_stops_utils.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_utils.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/color_stops_utils.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_utils.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/dynamic_color_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_selection.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/dynamic_color_selection.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_selection.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/static_color_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_selection.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/static_color_selection.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_selection.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/vector_style_color_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
similarity index 92%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/vector_style_color_editor.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
index c8950ffe71a1ef..a39db57dc4883b 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/color/vector_style_color_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../../static_dynamic_style_row';
+import { StaticDynamicStyleRow } from '../../../components/static_dynamic_style_row';
 import { DynamicColorSelection } from './dynamic_color_selection';
 import { StaticColorSelection } from './static_color_selection';
 import { getVectorStyleLabel } from '../get_vector_style_label';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/field_select.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_select.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/field_select.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_select.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/get_vector_style_label.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
similarity index 94%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/get_vector_style_label.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
index a39fabf20bae43..b6cc215ec6ded4 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/get_vector_style_label.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { vectorStyles } from '../../vector_style_defaults';
+import { vectorStyles } from '../vector_style_defaults';
 
 export function getVectorStyleLabel(styleName) {
   switch (styleName) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/__snapshots__/vector_icon.test.js.snap b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/__snapshots__/vector_icon.test.js.snap
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/circle_icon.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/circle_icon.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/circle_icon.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/circle_icon.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/line_icon.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/line_icon.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/line_icon.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/line_icon.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/polygon_icon.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/polygon_icon.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/polygon_icon.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/polygon_icon.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/style_property_legend_row.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/style_property_legend_row.js
similarity index 95%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/style_property_legend_row.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/style_property_legend_row.js
index 2f8a603c290ab6..4d091389a360e1 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/style_property_legend_row.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/style_property_legend_row.js
@@ -9,12 +9,12 @@ import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 
 import { styleOptionShapes, rangeShape } from '../style_option_shapes';
-import { VectorStyle } from '../../../vector_style';
-import { ColorGradient } from '../../color_gradient';
+import { VectorStyle } from '../../vector_style';
+import { ColorGradient } from '../../../components/color_gradient';
 import { CircleIcon } from './circle_icon';
 import { getVectorStyleLabel } from '../get_vector_style_label';
 import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
-import { StyleLegendRow } from '../../style_legend_row';
+import { StyleLegendRow } from '../../../components/style_legend_row';
 
 function getLineWidthIcons() {
   const defaultStyle = {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/symbol_icon.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/symbol_icon.js
similarity index 96%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/symbol_icon.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/symbol_icon.js
index a2f8d44604a0a8..d241226e577a80 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/symbol_icon.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/symbol_icon.js
@@ -7,7 +7,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
-import { getMakiSymbolSvg, styleSvg, buildSrcUrl } from '../../../symbol_utils';
+import { getMakiSymbolSvg, styleSvg, buildSrcUrl } from '../../symbol_utils';
 
 export class SymbolIcon extends Component {
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/vector_icon.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js
similarity index 98%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/vector_icon.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js
index 0f9e76c3e74d9f..5b86b885725521 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/vector_icon.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js
@@ -12,7 +12,7 @@ import { CircleIcon } from './circle_icon';
 import { LineIcon } from './line_icon';
 import { PolygonIcon } from './polygon_icon';
 import { SymbolIcon } from './symbol_icon';
-import { VectorStyle } from '../../../vector_style';
+import { VectorStyle } from '../../vector_style';
 import { getColorRampCenterColor } from '../../../color_utils';
 
 export class VectorIcon extends Component {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/vector_icon.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js
similarity index 98%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/vector_icon.test.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js
index 221b6268c55df7..1a16035fe6d338 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/vector_icon.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js
@@ -8,7 +8,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { VectorIcon } from './vector_icon';
-import { VectorStyle } from '../../../vector_style';
+import { VectorStyle } from '../../vector_style';
 
 let isPointsOnly = false;
 let isLinesOnly = false;
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/vector_style_legend.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/legend/vector_style_legend.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/orientation/dynamic_orientation_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_selection.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/orientation/dynamic_orientation_selection.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_selection.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/orientation/orientation_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
similarity index 92%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/orientation/orientation_editor.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
index bfe712d13d3afd..65efddae909333 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/orientation/orientation_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../../static_dynamic_style_row';
+import { StaticDynamicStyleRow } from '../../../components/static_dynamic_style_row';
 import { DynamicOrientationSelection } from './dynamic_orientation_selection';
 import { StaticOrientationSelection } from './static_orientation_selection';
 import { i18n } from '@kbn/i18n';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/orientation/static_orientation_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_selection.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/orientation/static_orientation_selection.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_selection.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/dynamic_size_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_selection.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/dynamic_size_selection.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_selection.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/size_range_selector.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js
similarity index 93%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/size_range_selector.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js
index 31b9b4f5ad6498..4279fbbe0fbb35 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/size_range_selector.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js
@@ -7,7 +7,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { ValidatedDualRange } from 'ui/validated_range';
-import { DEFAULT_MIN_SIZE, DEFAULT_MAX_SIZE } from '../../../vector_style_defaults';
+import { DEFAULT_MIN_SIZE, DEFAULT_MAX_SIZE } from '../../vector_style_defaults';
 import { i18n } from '@kbn/i18n';
 
 export function SizeRangeSelector({ minSize, maxSize, onChange, ...rest }) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/static_size_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_selection.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/static_size_selection.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_selection.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/vector_style_size_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
similarity index 92%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/vector_style_size_editor.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
index a03835f7a9501a..ffaaace680a43c 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/size/vector_style_size_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../../static_dynamic_style_row';
+import { StaticDynamicStyleRow } from '../../../components/static_dynamic_style_row';
 import  { DynamicSizeSelection } from './dynamic_size_selection';
 import  { StaticSizeSelection } from './static_size_selection';
 import { getVectorStyleLabel } from '../get_vector_style_label';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/style_option_shapes.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_option_shapes.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/style_option_shapes.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_option_shapes.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/vector_style_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
similarity index 89%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/vector_style_editor.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
index ce44b5861dfd0d..f624f4e661a14b 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/vector_style_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
@@ -16,18 +16,19 @@ import {
   getDefaultDynamicProperties,
   getDefaultStaticProperties,
   vectorStyles,
-} from '../../vector_style_defaults';
+} from '../vector_style_defaults';
 import { DEFAULT_FILL_COLORS, DEFAULT_LINE_COLORS } from '../../color_utils';
 import { VECTOR_SHAPE_TYPES } from '../../../sources/vector_feature_types';
-import { SYMBOLIZE_AS_ICON } from '../../vector_constants';
+import { SYMBOLIZE_AS_ICON } from '../vector_constants';
 import { i18n } from '@kbn/i18n';
-import { SYMBOL_OPTIONS } from '../../symbol_utils';
+import { SYMBOL_OPTIONS } from '../symbol_utils';
 
 import { EuiSpacer, EuiButtonGroup } from '@elastic/eui';
 
 export class VectorStyleEditor extends Component {
   state = {
-    ordinalFields: [],
+    dateFields: [],
+    numberFields: [],
     defaultDynamicProperties: getDefaultDynamicProperties(),
     defaultStaticProperties: getDefaultStaticProperties(),
     supportedFeatures: undefined,
@@ -50,13 +51,23 @@ export class VectorStyleEditor extends Component {
   }
 
   async _loadOrdinalFields() {
-    const ordinalFields = await this.props.layer.getOrdinalFields();
+
+    const dateFields = await this.props.layer.getDateFields();
     if (!this._isMounted) {
       return;
     }
-    if (!_.isEqual(ordinalFields, this.state.ordinalFields)) {
-      this.setState({ ordinalFields });
+    if (!_.isEqual(dateFields, this.state.dateFields)) {
+      this.setState({ dateFields });
+    }
+
+    const numberFields = await this.props.layer.getNumberFields();
+    if (!this._isMounted) {
+      return;
     }
+    if (!_.isEqual(numberFields, this.state.numberFields)) {
+      this.setState({ numberFields });
+    }
+
   }
 
   async _loadSupportedFeatures() {
@@ -96,6 +107,10 @@ export class VectorStyleEditor extends Component {
     }
   }
 
+  _getOrdinalFields() {
+    return [...this.state.dateFields, ...this.state.numberFields];
+  }
+
   _renderFillColor() {
     return (
       <VectorStyleColorEditor
@@ -103,7 +118,7 @@ export class VectorStyleEditor extends Component {
         swatches={DEFAULT_FILL_COLORS}
         handlePropertyChange={this.props.handlePropertyChange}
         styleDescriptor={this.props.styleProperties.fillColor}
-        ordinalFields={this.state.ordinalFields}
+        ordinalFields={this._getOrdinalFields()}
         defaultStaticStyleOptions={this.state.defaultStaticProperties.fillColor.options}
         defaultDynamicStyleOptions={this.state.defaultDynamicProperties.fillColor.options}
       />
@@ -117,7 +132,7 @@ export class VectorStyleEditor extends Component {
         swatches={DEFAULT_LINE_COLORS}
         handlePropertyChange={this.props.handlePropertyChange}
         styleDescriptor={this.props.styleProperties.lineColor}
-        ordinalFields={this.state.ordinalFields}
+        ordinalFields={this._getOrdinalFields()}
         defaultStaticStyleOptions={this.state.defaultStaticProperties.lineColor.options}
         defaultDynamicStyleOptions={this.state.defaultDynamicProperties.lineColor.options}
       />
@@ -130,7 +145,7 @@ export class VectorStyleEditor extends Component {
         styleProperty={vectorStyles.LINE_WIDTH}
         handlePropertyChange={this.props.handlePropertyChange}
         styleDescriptor={this.props.styleProperties.lineWidth}
-        ordinalFields={this.state.ordinalFields}
+        ordinalFields={this._getOrdinalFields()}
         defaultStaticStyleOptions={this.state.defaultStaticProperties.lineWidth.options}
         defaultDynamicStyleOptions={this.state.defaultDynamicProperties.lineWidth.options}
       />
@@ -143,7 +158,7 @@ export class VectorStyleEditor extends Component {
         styleProperty={vectorStyles.ICON_SIZE}
         handlePropertyChange={this.props.handlePropertyChange}
         styleDescriptor={this.props.styleProperties.iconSize}
-        ordinalFields={this.state.ordinalFields}
+        ordinalFields={this._getOrdinalFields()}
         defaultStaticStyleOptions={this.state.defaultStaticProperties.iconSize.options}
         defaultDynamicStyleOptions={this.state.defaultDynamicProperties.iconSize.options}
       />
@@ -159,7 +174,7 @@ export class VectorStyleEditor extends Component {
             styleProperty={vectorStyles.ICON_ORIENTATION}
             handlePropertyChange={this.props.handlePropertyChange}
             styleDescriptor={this.props.styleProperties.iconOrientation}
-            ordinalFields={this.state.ordinalFields}
+            ordinalFields={this.state.numberFields}
             defaultStaticStyleOptions={this.state.defaultStaticProperties.iconOrientation.options}
             defaultDynamicStyleOptions={this.state.defaultDynamicProperties.iconOrientation.options}
           />
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/vector_style_symbol_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_symbol_editor.js
similarity index 97%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/vector_style_symbol_editor.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_symbol_editor.js
index 268b1f39255b94..29be736b432f94 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/vector_style_symbol_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_symbol_editor.js
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
-import { SYMBOLIZE_AS_CIRCLE, SYMBOLIZE_AS_ICON } from '../../vector_constants';
+import { SYMBOLIZE_AS_CIRCLE, SYMBOLIZE_AS_ICON } from '../vector_constants';
 import { SymbolIcon } from './legend/symbol_icon';
 
 const SYMBOLIZE_AS_OPTIONS = [
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/vector_style_symbol_editor.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_symbol_editor.test.js
similarity index 93%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/vector/vector_style_symbol_editor.test.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_symbol_editor.test.js
index 4a2c227d84535f..44b864dea2e991 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/vector/vector_style_symbol_editor.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_symbol_editor.test.js
@@ -7,7 +7,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { SYMBOLIZE_AS_CIRCLE, SYMBOLIZE_AS_ICON } from '../../vector_constants';
+import { SYMBOLIZE_AS_CIRCLE, SYMBOLIZE_AS_ICON } from '../vector_constants';
 import { VectorStyleSymbolEditor } from './vector_style_symbol_editor';
 
 const symbolOptions = [
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
new file mode 100644
index 00000000000000..5c2122dfc4566e
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import { DynamicStyleProperty } from './dynamic_style_property';
+import _ from 'lodash';
+import { getComputedFieldName } from '../style_util';
+import { getColorRampStops } from '../../color_utils';
+
+
+export class DynamicColorProperty extends DynamicStyleProperty {
+
+
+  syncCircleColorWithMb(mbLayerId, mbMap, alpha) {
+    const color = this._getMbColor();
+    mbMap.setPaintProperty(mbLayerId, 'circle-color', color);
+    mbMap.setPaintProperty(mbLayerId, 'circle-opacity', alpha);
+  }
+
+  syncIconColorWithMb(mbLayerId, mbMap) {
+    const color = this._getMbColor();
+    mbMap.setPaintProperty(mbLayerId, 'icon-color', color);
+  }
+
+  syncHaloBorderColorWithMb(mbLayerId, mbMap) {
+    const color = this._getMbColor();
+    mbMap.setPaintProperty(mbLayerId, 'icon-halo-color', color);
+  }
+
+  syncCircleStrokeWithMb(pointLayerId, mbMap, alpha) {
+    const color = this._getMbColor();
+    mbMap.setPaintProperty(pointLayerId, 'circle-stroke-color', color);
+    mbMap.setPaintProperty(pointLayerId, 'circle-stroke-opacity', alpha);
+  }
+
+  syncFillColorWithMb(mbLayerId, mbMap, alpha) {
+    const color = this._getMbColor();
+    mbMap.setPaintProperty(mbLayerId, 'fill-color', color);
+    mbMap.setPaintProperty(mbLayerId, 'fill-opacity', alpha);
+  }
+
+  syncLineColorWithMb(mbLayerId, mbMap, alpha) {
+    const color = this._getMbColor();
+    mbMap.setPaintProperty(mbLayerId, 'line-color', color);
+    mbMap.setPaintProperty(mbLayerId, 'line-opacity', alpha);
+  }
+
+  _getMbColor() {
+    const isDynamicConfigComplete = _.has(this._options, 'field.name') && _.has(this._options, 'color');
+    if (!isDynamicConfigComplete) {
+      return null;
+    }
+
+    if (this._options.useCustomColorRamp && (!this._options.customColorRamp || !this._options.customColorRamp.length)) {
+      return null;
+    }
+
+    return this._getMBDataDrivenColor({
+      targetName: getComputedFieldName(this._styleName, this._options.field.name),
+      colorStops: this._getMBColorStops(),
+      isSteps: this._options.useCustomColorRamp,
+    });
+  }
+
+  _getMBDataDrivenColor({ targetName, colorStops, isSteps }) {
+    if (isSteps) {
+      const firstStopValue = colorStops[0];
+      const lessThenFirstStopValue = 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
+        ...colorStops
+      ];
+    }
+
+    return [
+      'interpolate',
+      ['linear'],
+      ['coalesce', ['feature-state', targetName], -1],
+      -1, 'rgba(0,0,0,0)',
+      ...colorStops
+    ];
+  }
+
+
+  _getMBColorStops() {
+
+    if (this._options.useCustomColorRamp) {
+      return this._options.customColorRamp.reduce((accumulatedStops, nextStop) => {
+        return [...accumulatedStops, nextStop.stop, nextStop.color];
+      }, []);
+    }
+
+    return getColorRampStops(this._options.color);
+  }
+
+}
+
+
+
+
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
new file mode 100644
index 00000000000000..2881ee422048bf
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import { DynamicStyleProperty } from './dynamic_style_property';
+import { getComputedFieldName } from '../style_util';
+import { vectorStyles } from '../vector_style_defaults';
+
+
+export class DynamicOrientationProperty extends DynamicStyleProperty {
+
+  syncIconRotationWithMb(symbolLayerId, mbMap) {
+    if (this._options.field && this._options.field.name) {
+      const targetName = getComputedFieldName(vectorStyles.ICON_ORIENTATION, this._options.field.name);
+      // Using property state instead of feature-state because layout properties do not support feature-state
+      mbMap.setLayoutProperty(symbolLayerId, 'icon-rotate', ['coalesce', ['get', targetName], 0]);
+    } else {
+      mbMap.setLayoutProperty(symbolLayerId, 'icon-rotate', 0);
+    }
+  }
+
+}
+
+
+
+
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
new file mode 100644
index 00000000000000..2758a440f57c5f
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import { DynamicStyleProperty } from './dynamic_style_property';
+import { getComputedFieldName } from '../style_util';
+import { HALF_LARGE_MAKI_ICON_SIZE, LARGE_MAKI_ICON_SIZE, SMALL_MAKI_ICON_SIZE } from '../symbol_utils';
+import { vectorStyles } from '../vector_style_defaults';
+import _ from 'lodash';
+
+export class DynamicSizeProperty extends DynamicStyleProperty {
+
+  syncHaloWidthWithMb(mbLayerId, mbMap) {
+    const haloWidth = this._getMbSize();
+    mbMap.setPaintProperty(mbLayerId, 'icon-halo-width', haloWidth);
+  }
+
+
+  syncIconImageAndSizeWithMb(symbolLayerId, mbMap, symbolId) {
+    if (this._isSizeDynamicConfigComplete(this._options)) {
+      const iconPixels = this._options.maxSize >= HALF_LARGE_MAKI_ICON_SIZE
+        ? LARGE_MAKI_ICON_SIZE
+        : SMALL_MAKI_ICON_SIZE;
+      mbMap.setLayoutProperty(symbolLayerId, 'icon-image', `${symbolId}-${iconPixels}`);
+
+      const halfIconPixels = iconPixels / 2;
+      const targetName = getComputedFieldName(vectorStyles.ICON_SIZE, this._options.field.name);
+      // 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, this._options.minSize / halfIconPixels,
+        1, this._options.maxSize / halfIconPixels
+      ]);
+    } else {
+      mbMap.setLayoutProperty(symbolLayerId, 'icon-image', null);
+      mbMap.setLayoutProperty(symbolLayerId, 'icon-size', null);
+    }
+  }
+
+  syncCircleStrokeWidthWithMb(mbLayerId, mbMap) {
+    const lineWidth = this._getMbSize();
+    mbMap.setPaintProperty(mbLayerId, 'circle-stroke-width', lineWidth);
+  }
+
+  syncCircleRadiusWithMb(mbLayerId, mbMap) {
+    const circleRadius = this._getMbSize();
+    mbMap.setPaintProperty(mbLayerId, 'circle-radius', circleRadius);
+  }
+
+  syncLineWidthWithMb(mbLayerId, mbMap) {
+    const lineWidth = this._getMbSize();
+    mbMap.setPaintProperty(mbLayerId, 'line-width', lineWidth);
+  }
+
+  _getMbSize() {
+    if (this._isSizeDynamicConfigComplete(this._options)) {
+      return this._getMbDataDrivenSize({
+        targetName: getComputedFieldName(this._styleName, this._options.field.name),
+        minSize: this._options.minSize,
+        maxSize: this._options.maxSize,
+      });
+    }
+    return null;
+  }
+
+  _getMbDataDrivenSize({ targetName, minSize, maxSize }) {
+    return   [
+      'interpolate',
+      ['linear'],
+      ['coalesce', ['feature-state', targetName], 0],
+      0, minSize,
+      1, maxSize
+    ];
+  }
+
+  _isSizeDynamicConfigComplete() {
+    return this._options.field && this._options.field.name && _.has(this._options, 'minSize') && _.has(this._options, 'maxSize');
+  }
+}
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
new file mode 100644
index 00000000000000..8200ede3e3523b
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import { AbstractStyleProperty } from './style_property';
+
+export class DynamicStyleProperty extends AbstractStyleProperty {
+    static type = 'DYNAMIC';
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_color_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_color_property.js
new file mode 100644
index 00000000000000..d4c44fca1bd082
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_color_property.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import { StaticStyleProperty } from './static_style_property';
+
+
+export class StaticColorProperty extends StaticStyleProperty {
+
+  syncCircleColorWithMb(mbLayerId, mbMap, alpha) {
+    mbMap.setPaintProperty(mbLayerId, 'circle-color', this._options.color);
+    mbMap.setPaintProperty(mbLayerId, 'circle-opacity', alpha);
+  }
+
+  syncFillColorWithMb(mbLayerId, mbMap, alpha) {
+    mbMap.setPaintProperty(mbLayerId, 'fill-color', this._options.color);
+    mbMap.setPaintProperty(mbLayerId, 'fill-opacity', alpha);
+  }
+
+  syncIconColorWithMb(mbLayerId, mbMap) {
+    mbMap.setPaintProperty(mbLayerId, 'icon-color', this._options.color);
+  }
+
+  syncHaloBorderColorWithMb(mbLayerId, mbMap) {
+    mbMap.setPaintProperty(mbLayerId, 'icon-halo-color', this._options.color);
+  }
+
+  syncLineColorWithMb(mbLayerId, mbMap, alpha) {
+    mbMap.setPaintProperty(mbLayerId, 'line-color', this._options.color);
+    mbMap.setPaintProperty(mbLayerId, 'line-opacity', alpha);
+  }
+
+  syncCircleStrokeWithMb(pointLayerId, mbMap, alpha) {
+    mbMap.setPaintProperty(pointLayerId, 'circle-stroke-color', this._options.color);
+    mbMap.setPaintProperty(pointLayerId, 'circle-stroke-opacity', alpha);
+  }
+
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_orientation_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_orientation_property.js
new file mode 100644
index 00000000000000..48a7bbd3f79df2
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_orientation_property.js
@@ -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 { StaticStyleProperty } from './static_style_property';
+
+
+export class StaticOrientationProperty extends StaticStyleProperty {
+
+  constructor(options, styleName) {
+    if (typeof options.orientation !== 'number') {
+      super({ orientation: 0 }, styleName);
+    } else {
+      super(options, styleName);
+    }
+  }
+
+  syncIconRotationWithMb(symbolLayerId, mbMap) {
+    mbMap.setLayoutProperty(symbolLayerId, 'icon-rotate', this._options.orientation);
+  }
+
+
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_size_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_size_property.js
new file mode 100644
index 00000000000000..37162d8cb0a3c1
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_size_property.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import { StaticStyleProperty } from './static_style_property';
+import { HALF_LARGE_MAKI_ICON_SIZE, LARGE_MAKI_ICON_SIZE, SMALL_MAKI_ICON_SIZE } from '../symbol_utils';
+
+
+export class StaticSizeProperty extends StaticStyleProperty {
+
+  constructor(options, styleName) {
+    if (typeof options.size !== 'number') {
+      super({ size: 1 }, styleName);
+    } else {
+      super(options, styleName);
+    }
+  }
+
+  syncHaloWidthWithMb(mbLayerId, mbMap) {
+    mbMap.setPaintProperty(mbLayerId, 'icon-halo-width', this._options.size);
+  }
+
+  syncIconImageAndSizeWithMb(symbolLayerId, mbMap, symbolId) {
+    const iconPixels = this._size >= HALF_LARGE_MAKI_ICON_SIZE ? LARGE_MAKI_ICON_SIZE : SMALL_MAKI_ICON_SIZE;
+    mbMap.setLayoutProperty(symbolLayerId, 'icon-image', `${symbolId}-${iconPixels}`);
+    const halfIconPixels = iconPixels / 2;
+    mbMap.setLayoutProperty(symbolLayerId, 'icon-size', this._options.size / halfIconPixels);
+  }
+
+  syncCircleStrokeWidthWithMb(mbLayerId, mbMap) {
+    mbMap.setPaintProperty(mbLayerId, 'circle-stroke-width', this._options.size);
+  }
+
+  syncCircleRadiusWithMb(mbLayerId, mbMap) {
+    mbMap.setPaintProperty(mbLayerId, 'circle-radius', this._options.size);
+  }
+
+  syncLineWidthWithMb(mbLayerId, mbMap) {
+    mbMap.setPaintProperty(mbLayerId, 'line-width', this._options.size);
+  }
+
+
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_style_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_style_property.js
new file mode 100644
index 00000000000000..448efc06899e56
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_style_property.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import { AbstractStyleProperty } from './style_property';
+
+export class StaticStyleProperty extends AbstractStyleProperty {
+  static type = 'STATIC';
+
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.js
new file mode 100644
index 00000000000000..7e9e27f83722dc
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export class AbstractStyleProperty {
+
+  constructor(options, styleName) {
+    this._options = options;
+    this._styleName = styleName;
+  }
+}
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
new file mode 100644
index 00000000000000..69caaca0801389
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.js
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+export function getComputedFieldName(styleName, fieldName) {
+  return `${getComputedFieldNamePrefix(fieldName)}__${styleName}`;
+}
+
+export function getComputedFieldNamePrefix(fieldName) {
+  return `__kbn__dynamic__${fieldName}`;
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/symbol_utils.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.js
similarity index 97%
rename from x-pack/legacy/plugins/maps/public/layers/styles/symbol_utils.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.js
index 22e1a6aea6a729..967d0e0bbd0969 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/symbol_utils.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.js
@@ -6,7 +6,7 @@
 
 import maki from '@elastic/maki';
 import xml2js from 'xml2js';
-import { parseXmlString } from '../../../common/parse_xml_string';
+import { parseXmlString } from '../../../../common/parse_xml_string';
 
 export const LARGE_MAKI_ICON_SIZE = 15;
 const LARGE_MAKI_ICON_SIZE_AS_STRING = LARGE_MAKI_ICON_SIZE.toString();
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/symbol_utils.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/symbol_utils.test.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector_constants.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_constants.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector_constants.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_constants.js
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
new file mode 100644
index 00000000000000..70ebba7e8d177c
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
@@ -0,0 +1,510 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { VectorStyleEditor } from './components/vector_style_editor';
+import { getDefaultProperties, vectorStyles } from './vector_style_defaults';
+import { AbstractStyle } from '../abstract_style';
+import { SOURCE_DATA_ID_ORIGIN, GEO_JSON_TYPE } from '../../../../common/constants';
+import { VectorIcon } from './components/legend/vector_icon';
+import { VectorStyleLegend } from './components/legend/vector_style_legend';
+import { VECTOR_SHAPE_TYPES } from '../../sources/vector_feature_types';
+import { SYMBOLIZE_AS_CIRCLE, SYMBOLIZE_AS_ICON } from './vector_constants';
+import { getMakiSymbolAnchor } from './symbol_utils';
+import { getComputedFieldName, getComputedFieldNamePrefix } from './style_util';
+import { StaticStyleProperty } from './properties/static_style_property';
+import { DynamicStyleProperty } from './properties/dynamic_style_property';
+import { DynamicSizeProperty } from './properties/dynamic_size_property';
+import { StaticSizeProperty } from './properties/static_size_property';
+import { StaticColorProperty } from './properties/static_color_property';
+import { DynamicColorProperty } from './properties/dynamic_color_property';
+import { StaticOrientationProperty } from './properties/static_orientation_property';
+import { DynamicOrientationProperty } from './properties/dynamic_orientation_property';
+
+const POINTS = [GEO_JSON_TYPE.POINT, GEO_JSON_TYPE.MULTI_POINT];
+const LINES = [GEO_JSON_TYPE.LINE_STRING, GEO_JSON_TYPE.MULTI_LINE_STRING];
+const POLYGONS = [GEO_JSON_TYPE.POLYGON, GEO_JSON_TYPE.MULTI_POLYGON];
+
+export class VectorStyle extends AbstractStyle {
+
+  static type = 'VECTOR';
+  static STYLE_TYPE = { 'DYNAMIC': DynamicStyleProperty.type, 'STATIC': StaticStyleProperty.type };
+
+  static getComputedFieldName = getComputedFieldName;
+  static getComputedFieldNamePrefix = getComputedFieldNamePrefix;
+
+  constructor(descriptor = {}, source) {
+    super();
+    this._source = source;
+    this._descriptor = {
+      ...descriptor,
+      ...VectorStyle.createDescriptor(descriptor.properties),
+    };
+
+    this._lineColorStyleProperty = this._makeColorProperty(this._descriptor.properties[vectorStyles.LINE_COLOR], vectorStyles.LINE_COLOR);
+    this._fillColorStyleProperty = this._makeColorProperty(this._descriptor.properties[vectorStyles.FILL_COLOR], vectorStyles.FILL_COLOR);
+    this._lineWidthStyleProperty = this._makeSizeProperty(this._descriptor.properties[vectorStyles.LINE_WIDTH], vectorStyles.LINE_WIDTH);
+    this._iconSizeStyleProperty = this._makeSizeProperty(this._descriptor.properties[vectorStyles.ICON_SIZE], vectorStyles.ICON_SIZE);
+    // eslint-disable-next-line max-len
+    this._iconOrientationProperty = this._makeOrientationProperty(this._descriptor.properties[vectorStyles.ICON_ORIENTATION], vectorStyles.ICON_ORIENTATION);
+  }
+
+  static createDescriptor(properties = {}) {
+    return {
+      type: VectorStyle.type,
+      properties: { ...getDefaultProperties(), ...properties }
+    };
+  }
+
+  static createDefaultStyleProperties(mapColors) {
+    return getDefaultProperties(mapColors);
+  }
+
+  static getDisplayName() {
+    return i18n.translate('xpack.maps.style.vector.displayNameLabel', {
+      defaultMessage: 'Vector style'
+    });
+  }
+
+  static description = '';
+
+  renderEditor({ layer, onStyleDescriptorChange }) {
+    const styleProperties = { ...this.getProperties() };
+    const handlePropertyChange = (propertyName, settings) => {
+      styleProperties[propertyName] = settings;//override single property, but preserve the rest
+      const vectorStyleDescriptor = VectorStyle.createDescriptor(styleProperties);
+      onStyleDescriptorChange(vectorStyleDescriptor);
+    };
+
+    return (
+      <VectorStyleEditor
+        handlePropertyChange={handlePropertyChange}
+        styleProperties={styleProperties}
+        layer={layer}
+        loadIsPointsOnly={this._getIsPointsOnly}
+        loadIsLinesOnly={this._getIsLinesOnly}
+      />
+    );
+  }
+
+  /*
+   * Changes to source descriptor and join descriptor will impact style properties.
+   * For instance, a style property may be dynamically tied to the value of an ordinal field defined
+   * by a join or a metric aggregation. The metric aggregation or join may be edited or removed.
+   * When this happens, the style will be linked to a no-longer-existing ordinal field.
+   * This method provides a way for a style to clean itself and return a descriptor that unsets any dynamic
+   * properties that are tied to missing oridinal fields
+   *
+   * This method does not update its descriptor. It just returns a new descriptor that the caller
+   * can then use to update store state via dispatch.
+   */
+  getDescriptorWithMissingStylePropsRemoved(nextOrdinalFields) {
+    const originalProperties = this.getProperties();
+    const updatedProperties = {};
+    Object.keys(originalProperties).forEach(propertyName => {
+      if (!this._isPropertyDynamic(propertyName)) {
+        return;
+      }
+
+      const fieldName = _.get(originalProperties[propertyName], 'options.field.name');
+      if (!fieldName) {
+        return;
+      }
+
+      const matchingOrdinalField = nextOrdinalFields.find(oridinalField => {
+        return fieldName === oridinalField.name;
+      });
+
+      if (matchingOrdinalField) {
+        return;
+      }
+
+      updatedProperties[propertyName] = {
+        type: VectorStyle.STYLE_TYPE.DYNAMIC,
+        options: {
+          ...originalProperties[propertyName].options
+        }
+      };
+      delete updatedProperties[propertyName].options.field;
+    });
+
+    if (Object.keys(updatedProperties).length === 0) {
+      return {
+        hasChanges: false,
+        nextStyleDescriptor: { ...this._descriptor },
+      };
+    }
+
+    return {
+      hasChanges: true,
+      nextStyleDescriptor: VectorStyle.createDescriptor({
+        ...originalProperties,
+        ...updatedProperties,
+      })
+    };
+  }
+
+  async pluckStyleMetaFromSourceDataRequest(sourceDataRequest) {
+    const features = _.get(sourceDataRequest.getData(), 'features', []);
+    if (features.length === 0) {
+      return {};
+    }
+
+    const scaledFields = this.getDynamicPropertiesArray()
+      .map(({ options }) => {
+        return {
+          name: options.field.name,
+          min: Infinity,
+          max: -Infinity
+        };
+      });
+
+    const supportedFeatures = await this._source.getSupportedShapeTypes();
+    const isSingleFeatureType = supportedFeatures.length === 1;
+
+    if (scaledFields.length === 0 && isSingleFeatureType) {
+      // no meta data to pull from source data request.
+      return {};
+    }
+
+    let hasPoints = false;
+    let hasLines = false;
+    let hasPolygons = false;
+    for (let i = 0; i < features.length; i++) {
+      const feature = features[i];
+      if (!hasPoints && POINTS.includes(feature.geometry.type)) {
+        hasPoints = true;
+      }
+      if (!hasLines && LINES.includes(feature.geometry.type)) {
+        hasLines = true;
+      }
+      if (!hasPolygons && POLYGONS.includes(feature.geometry.type)) {
+        hasPolygons = true;
+      }
+
+      for (let j = 0; j < scaledFields.length; j++) {
+        const scaledField = scaledFields[j];
+        const newValue = parseFloat(feature.properties[scaledField.name]);
+        if (!isNaN(newValue)) {
+          scaledField.min = Math.min(scaledField.min, newValue);
+          scaledField.max = Math.max(scaledField.max, newValue);
+        }
+      }
+    }
+
+    const featuresMeta = {
+      hasFeatureType: {
+        [VECTOR_SHAPE_TYPES.POINT]: hasPoints,
+        [VECTOR_SHAPE_TYPES.LINE]: hasLines,
+        [VECTOR_SHAPE_TYPES.POLYGON]: hasPolygons
+      }
+    };
+
+    scaledFields.forEach(({ min, max, name }) => {
+      if (min !== Infinity && max !== -Infinity) {
+        featuresMeta[name] = {
+          min,
+          max,
+          delta: max - min,
+        };
+      }
+    });
+
+    return featuresMeta;
+  }
+
+  getSourceFieldNames() {
+    const properties = this.getProperties();
+    const fieldNames = [];
+    Object.keys(properties).forEach(propertyName => {
+      if (!this._isPropertyDynamic(propertyName)) {
+        return;
+      }
+
+      const field = _.get(properties[propertyName], 'options.field', {});
+      if (field.origin === SOURCE_DATA_ID_ORIGIN && field.name) {
+        fieldNames.push(field.name);
+      }
+    });
+
+    return fieldNames;
+  }
+
+  getProperties() {
+    return this._descriptor.properties || {};
+  }
+
+  getDynamicPropertiesArray() {
+    const styles = this.getProperties();
+    return Object.keys(styles)
+      .map(styleName => {
+        const { type, options } = styles[styleName];
+        return {
+          styleName,
+          type,
+          options
+        };
+      })
+      .filter(({ styleName }) => {
+        return this._isPropertyDynamic(styleName);
+      });
+  }
+
+  _isPropertyDynamic(propertyName) {
+    const { type, options } = _.get(this._descriptor, ['properties', propertyName], {});
+    return type === VectorStyle.STYLE_TYPE.DYNAMIC && options.field && options.field.name;
+  }
+
+  _checkIfOnlyFeatureType = async (featureType) => {
+    const supportedFeatures = await this._source.getSupportedShapeTypes();
+
+    if (supportedFeatures.length === 1) {
+      return supportedFeatures[0] === featureType;
+    }
+
+    if (!this._descriptor.__styleMeta || !this._descriptor.__styleMeta.hasFeatureType) {
+      return false;
+    }
+
+    const featureTypes = Object.keys(this._descriptor.__styleMeta.hasFeatureType);
+    return featureTypes.reduce((isOnlySingleFeatureType, featureTypeKey) => {
+      const hasFeature = this._descriptor.__styleMeta.hasFeatureType[featureTypeKey];
+      return featureTypeKey === featureType
+        ? isOnlySingleFeatureType && hasFeature
+        : isOnlySingleFeatureType && !hasFeature;
+    }, true);
+  }
+
+  _getIsPointsOnly = async () => {
+    return this._checkIfOnlyFeatureType(VECTOR_SHAPE_TYPES.POINT);
+  }
+
+  _getIsLinesOnly = async () => {
+    return this._checkIfOnlyFeatureType(VECTOR_SHAPE_TYPES.LINE);
+  }
+
+  _getIsPolygonsOnly = async () => {
+    return this._checkIfOnlyFeatureType(VECTOR_SHAPE_TYPES.POLYGON);
+  }
+
+  _getFieldRange = (fieldName) => {
+    return _.get(this._descriptor, ['__styleMeta', fieldName]);
+  }
+
+  getIcon = () => {
+    const styles = this.getProperties();
+    const symbolId = this.arePointsSymbolizedAsCircles()
+      ? undefined
+      : this._descriptor.properties.symbol.options.symbolId;
+    return (
+      <VectorIcon
+        loadIsPointsOnly={this._getIsPointsOnly}
+        loadIsLinesOnly={this._getIsLinesOnly}
+        fillColor={styles.fillColor}
+        lineColor={styles.lineColor}
+        symbolId={symbolId}
+      />
+    );
+  }
+
+  getLegendDetails(getFieldLabel, getFieldFormatter) {
+    const styles = this.getProperties();
+    const styleProperties = Object.keys(styles).map(styleName => {
+      const { type, options } = styles[styleName];
+      return {
+        name: styleName,
+        type,
+        options,
+        range: options && options.field && options.field.name ? this._getFieldRange(options.field.name) : null,
+      };
+    });
+
+    return (
+      <VectorStyleLegend
+        styleProperties={styleProperties}
+        getFieldLabel={getFieldLabel}
+        getFieldFormatter={getFieldFormatter}
+      />
+    );
+  }
+
+  _getStyleFields() {
+    return this.getDynamicPropertiesArray()
+      .map(({ styleName, options }) => {
+        const name = options.field.name;
+
+        // "feature-state" data expressions are not supported with layout properties.
+        // To work around this limitation, some styling values must fall back to geojson property values.
+        let supportsFeatureState;
+        let isScaled;
+        if (styleName === 'iconSize'
+          && this._descriptor.properties.symbol.options.symbolizeAs === SYMBOLIZE_AS_ICON) {
+          supportsFeatureState = false;
+          isScaled = true;
+        } else if (styleName === 'iconOrientation') {
+          supportsFeatureState = false;
+          isScaled = false;
+        } else if ((styleName === vectorStyles.FILL_COLOR || styleName === vectorStyles.LINE_COLOR)
+          && options.useCustomColorRamp) {
+          supportsFeatureState = true;
+          isScaled = false;
+        } else {
+          supportsFeatureState = true;
+          isScaled = true;
+        }
+
+        return {
+          supportsFeatureState,
+          isScaled,
+          name,
+          range: this._getFieldRange(name),
+          computedName: VectorStyle.getComputedFieldName(styleName, name),
+        };
+      });
+  }
+
+  clearFeatureState(featureCollection, mbMap, sourceId) {
+    const tmpFeatureIdentifier = {
+      source: null,
+      id: null
+    };
+    for (let i = 0; i < featureCollection.features.length; i++) {
+      const feature = featureCollection.features[i];
+      tmpFeatureIdentifier.source = sourceId;
+      tmpFeatureIdentifier.id = feature.id;
+      mbMap.removeFeatureState(tmpFeatureIdentifier);
+    }
+  }
+
+  setFeatureState(featureCollection, mbMap, sourceId) {
+
+    if (!featureCollection) {
+      return;
+    }
+
+    const styleFields  = this._getStyleFields();
+    if (styleFields.length === 0) {
+      return;
+    }
+
+    const tmpFeatureIdentifier = {
+      source: null,
+      id: null
+    };
+    const tmpFeatureState = {};
+
+    //scale to [0,1] domain
+    for (let i = 0; i < featureCollection.features.length; i++) {
+      const feature = featureCollection.features[i];
+
+      for (let j = 0; j < styleFields.length; j++) {
+        const { supportsFeatureState, isScaled, name, range, computedName } = styleFields[j];
+        const value = parseFloat(feature.properties[name]);
+        let styleValue;
+        if (isScaled) {
+          if (isNaN(value) || !range) {//cannot scale
+            styleValue = -1;//put outside range
+          } else if (range.delta === 0) {//values are identical
+            styleValue = 1;//snap to end of color range
+          } else {
+            styleValue = (value - range.min) / range.delta;
+          }
+        } else {
+          if (isNaN(value)) {
+            styleValue = 0;
+          } else {
+            styleValue = value;
+          }
+        }
+
+        if (supportsFeatureState) {
+          tmpFeatureState[computedName] = styleValue;
+        } else {
+          feature.properties[computedName] = styleValue;
+        }
+      }
+      tmpFeatureIdentifier.source = sourceId;
+      tmpFeatureIdentifier.id = feature.id;
+      mbMap.setFeatureState(tmpFeatureIdentifier, tmpFeatureState);
+    }
+
+    const hasGeoJsonProperties = styleFields.some(({ supportsFeatureState }) => {
+      return !supportsFeatureState;
+    });
+    return hasGeoJsonProperties;
+  }
+
+  arePointsSymbolizedAsCircles() {
+    return this._descriptor.properties.symbol.options.symbolizeAs === SYMBOLIZE_AS_CIRCLE;
+  }
+
+  setMBPaintProperties({ alpha, mbMap, fillLayerId, lineLayerId }) {
+    this._fillColorStyleProperty.syncFillColorWithMb(fillLayerId, mbMap, alpha);
+    this._lineColorStyleProperty.syncLineColorWithMb(lineLayerId, mbMap, alpha);
+    this._lineWidthStyleProperty.syncLineWidthWithMb(lineLayerId, mbMap);
+  }
+
+  setMBPaintPropertiesForPoints({ alpha, mbMap, pointLayerId }) {
+    this._fillColorStyleProperty.syncCircleColorWithMb(pointLayerId, mbMap, alpha);
+    this._lineColorStyleProperty.syncCircleStrokeWithMb(pointLayerId, mbMap, alpha);
+    this._lineWidthStyleProperty.syncCircleStrokeWidthWithMb(pointLayerId, mbMap);
+    this._iconSizeStyleProperty.syncCircleRadiusWithMb(pointLayerId, mbMap);
+  }
+
+  setMBSymbolPropertiesForPoints({ mbMap, symbolLayerId, alpha }) {
+
+    const symbolId = this._descriptor.properties.symbol.options.symbolId;
+    mbMap.setLayoutProperty(symbolLayerId, 'icon-ignore-placement', true);
+    mbMap.setLayoutProperty(symbolLayerId, 'icon-anchor', getMakiSymbolAnchor(symbolId));
+    mbMap.setPaintProperty(symbolLayerId, 'icon-opacity', alpha);
+
+    // icon-color is only supported on SDF icons.
+    this._fillColorStyleProperty.syncIconColorWithMb(symbolLayerId, mbMap);
+    this._lineColorStyleProperty.syncHaloBorderColorWithMb(symbolLayerId, mbMap);
+    this._lineWidthStyleProperty.syncHaloWidthWithMb(symbolLayerId, mbMap);
+    this._iconSizeStyleProperty.syncIconImageAndSizeWithMb(symbolLayerId, mbMap, symbolId);
+    this._iconOrientationProperty.syncIconRotationWithMb(symbolLayerId, mbMap);
+
+  }
+
+  _makeSizeProperty(descriptor, styleName) {
+    if (!descriptor || !descriptor.options) {
+      return new StaticSizeProperty({ size: 0 }, styleName);
+    } else if (descriptor.type === StaticStyleProperty.type) {
+      return new StaticSizeProperty(descriptor.options, styleName);
+    } else if (descriptor.type === DynamicStyleProperty.type) {
+      return new DynamicSizeProperty(descriptor.options, styleName);
+    } else {
+      throw new Error(`${descriptor} not implemented`);
+    }
+  }
+
+  _makeColorProperty(descriptor, styleName) {
+    if (!descriptor || !descriptor.options) {
+      return new StaticColorProperty({ color: null }, styleName);
+    } else if (descriptor.type === StaticStyleProperty.type) {
+      return new StaticColorProperty(descriptor.options, styleName);
+    } else if (descriptor.type === DynamicStyleProperty.type) {
+      return new DynamicColorProperty(descriptor.options, styleName);
+    } else {
+      throw new Error(`${descriptor} not implemented`);
+    }
+  }
+
+  _makeOrientationProperty(descriptor, styleName) {
+    if (!descriptor || !descriptor.options) {
+      return new StaticOrientationProperty({ orientation: 0 }, styleName);
+    } else if (descriptor.type === StaticStyleProperty.type) {
+      return new StaticOrientationProperty(descriptor.options, styleName);
+    } else if (descriptor.type === DynamicStyleProperty.type) {
+      return new DynamicOrientationProperty(descriptor.options, styleName);
+    } else {
+      throw new Error(`${descriptor} not implemented`);
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector_style.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
similarity index 98%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector_style.test.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
index 7c993564018aa0..c0d76fadc01a5d 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector_style.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
@@ -5,8 +5,8 @@
  */
 
 import { VectorStyle } from './vector_style';
-import { DataRequest } from '../util/data_request';
-import { VECTOR_SHAPE_TYPES } from '../sources/vector_feature_types';
+import { DataRequest } from '../../util/data_request';
+import { VECTOR_SHAPE_TYPES } from '../../sources/vector_feature_types';
 
 describe('getDescriptorWithMissingStylePropsRemoved', () => {
   const fieldName = 'doIStillExist';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector_style_defaults.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
similarity index 99%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector_style_defaults.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
index dfd0c1ca1b86b4..ea4228430d13d0 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector_style_defaults.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
@@ -10,7 +10,7 @@ import {
   COLOR_GRADIENTS,
   DEFAULT_FILL_COLORS,
   DEFAULT_LINE_COLORS
-} from './color_utils';
+} from '../color_utils';
 
 const DEFAULT_ICON = 'airfield';
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector_style.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector_style.js
deleted file mode 100644
index f26f4df0b17537..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector_style.js
+++ /dev/null
@@ -1,639 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { getColorRampStops } from './color_utils';
-import { VectorStyleEditor } from './components/vector/vector_style_editor';
-import { getDefaultProperties, vectorStyles } from './vector_style_defaults';
-import { AbstractStyle } from './abstract_style';
-import { SOURCE_DATA_ID_ORIGIN, GEO_JSON_TYPE } from '../../../common/constants';
-import { VectorIcon } from './components/vector/legend/vector_icon';
-import { VectorStyleLegend } from './components/vector/legend/vector_style_legend';
-import { VECTOR_SHAPE_TYPES } from '../sources/vector_feature_types';
-import { SYMBOLIZE_AS_CIRCLE, SYMBOLIZE_AS_ICON } from './vector_constants';
-import {
-  getMakiSymbolAnchor,
-  LARGE_MAKI_ICON_SIZE,
-  SMALL_MAKI_ICON_SIZE,
-  HALF_LARGE_MAKI_ICON_SIZE
-} from './symbol_utils';
-
-export class VectorStyle extends AbstractStyle {
-
-  static type = 'VECTOR';
-  static STYLE_TYPE = { 'DYNAMIC': 'DYNAMIC', 'STATIC': 'STATIC' };
-
-  static getComputedFieldName(styleName, fieldName) {
-    return `${VectorStyle.getComputedFieldNamePrefix(fieldName)}__${styleName}`;
-  }
-
-  static getComputedFieldNamePrefix(fieldName) {
-    return `__kbn__dynamic__${fieldName}`;
-  }
-
-  constructor(descriptor = {}, source) {
-    super();
-    this._source = source;
-    this._descriptor = {
-      ...descriptor,
-      ...VectorStyle.createDescriptor(descriptor.properties),
-    };
-  }
-
-  static createDescriptor(properties = {}) {
-    return {
-      type: VectorStyle.type,
-      properties: { ...getDefaultProperties(), ...properties }
-    };
-  }
-
-  static createDefaultStyleProperties(mapColors) {
-    return getDefaultProperties(mapColors);
-  }
-
-  static getDisplayName() {
-    return i18n.translate('xpack.maps.style.vector.displayNameLabel', {
-      defaultMessage: 'Vector style'
-    });
-  }
-
-  static description = '';
-
-  renderEditor({ layer, onStyleDescriptorChange }) {
-    const styleProperties = { ...this.getProperties() };
-    const handlePropertyChange = (propertyName, settings) => {
-      styleProperties[propertyName] = settings;//override single property, but preserve the rest
-      const vectorStyleDescriptor = VectorStyle.createDescriptor(styleProperties);
-      onStyleDescriptorChange(vectorStyleDescriptor);
-    };
-
-    return (
-      <VectorStyleEditor
-        handlePropertyChange={handlePropertyChange}
-        styleProperties={styleProperties}
-        layer={layer}
-        loadIsPointsOnly={this._getIsPointsOnly}
-        loadIsLinesOnly={this._getIsLinesOnly}
-      />
-    );
-  }
-
-  /*
-   * Changes to source descriptor and join descriptor will impact style properties.
-   * For instance, a style property may be dynamically tied to the value of an ordinal field defined
-   * by a join or a metric aggregation. The metric aggregation or join may be edited or removed.
-   * When this happens, the style will be linked to a no-longer-existing ordinal field.
-   * This method provides a way for a style to clean itself and return a descriptor that unsets any dynamic
-   * properties that are tied to missing oridinal fields
-   *
-   * This method does not update its descriptor. It just returns a new descriptor that the caller
-   * can then use to update store state via dispatch.
-   */
-  getDescriptorWithMissingStylePropsRemoved(nextOrdinalFields) {
-    const originalProperties = this.getProperties();
-    const updatedProperties = {};
-    Object.keys(originalProperties).forEach(propertyName => {
-      if (!this._isPropertyDynamic(propertyName)) {
-        return;
-      }
-
-      const fieldName = _.get(originalProperties[propertyName], 'options.field.name');
-      if (!fieldName) {
-        return;
-      }
-
-      const matchingOrdinalField = nextOrdinalFields.find(oridinalField => {
-        return fieldName === oridinalField.name;
-      });
-
-      if (matchingOrdinalField) {
-        return;
-      }
-
-      updatedProperties[propertyName] = {
-        type: VectorStyle.STYLE_TYPE.DYNAMIC,
-        options: {
-          ...originalProperties[propertyName].options
-        }
-      };
-      delete updatedProperties[propertyName].options.field;
-    });
-
-    if (Object.keys(updatedProperties).length === 0) {
-      return {
-        hasChanges: false,
-        nextStyleDescriptor: { ...this._descriptor },
-      };
-    }
-
-    return {
-      hasChanges: true,
-      nextStyleDescriptor: VectorStyle.createDescriptor({
-        ...originalProperties,
-        ...updatedProperties,
-      })
-    };
-  }
-
-  async pluckStyleMetaFromSourceDataRequest(sourceDataRequest) {
-    const features = _.get(sourceDataRequest.getData(), 'features', []);
-    if (features.length === 0) {
-      return {};
-    }
-
-    const scaledFields = this.getDynamicPropertiesArray()
-      .map(({ options }) => {
-        return {
-          name: options.field.name,
-          min: Infinity,
-          max: -Infinity
-        };
-      });
-
-    const supportedFeatures = await this._source.getSupportedShapeTypes();
-    const isSingleFeatureType = supportedFeatures.length === 1;
-
-    if (scaledFields.length === 0 && isSingleFeatureType) {
-      // no meta data to pull from source data request.
-      return {};
-    }
-
-    let hasPoints = false;
-    let hasLines = false;
-    let hasPolygons = false;
-    for (let i = 0; i < features.length; i++) {
-      const feature = features[i];
-      if (!hasPoints && [GEO_JSON_TYPE.POINT, GEO_JSON_TYPE.MULTI_POINT].includes(feature.geometry.type)) {
-        hasPoints = true;
-      }
-      if (!hasLines && [GEO_JSON_TYPE.LINE_STRING, GEO_JSON_TYPE.MULTI_LINE_STRING].includes(feature.geometry.type)) {
-        hasLines = true;
-      }
-      if (!hasPolygons && [GEO_JSON_TYPE.POLYGON, GEO_JSON_TYPE.MULTI_POLYGON].includes(feature.geometry.type)) {
-        hasPolygons = true;
-      }
-
-      for (let j = 0; j < scaledFields.length; j++) {
-        const scaledField = scaledFields[j];
-        const newValue = parseFloat(feature.properties[scaledField.name]);
-        if (!isNaN(newValue)) {
-          scaledField.min = Math.min(scaledField.min, newValue);
-          scaledField.max = Math.max(scaledField.max, newValue);
-        }
-      }
-    }
-
-    const featuresMeta = {
-      hasFeatureType: {
-        [VECTOR_SHAPE_TYPES.POINT]: hasPoints,
-        [VECTOR_SHAPE_TYPES.LINE]: hasLines,
-        [VECTOR_SHAPE_TYPES.POLYGON]: hasPolygons
-      }
-    };
-
-    scaledFields.forEach(({ min, max, name }) => {
-      if (min !== Infinity && max !== -Infinity) {
-        featuresMeta[name] = {
-          min,
-          max,
-          delta: max - min,
-        };
-      }
-    });
-
-    return featuresMeta;
-  }
-
-  getSourceFieldNames() {
-    const properties = this.getProperties();
-    const fieldNames = [];
-    Object.keys(properties).forEach(propertyName => {
-      if (!this._isPropertyDynamic(propertyName)) {
-        return;
-      }
-
-      const field = _.get(properties[propertyName], 'options.field', {});
-      if (field.origin === SOURCE_DATA_ID_ORIGIN && field.name) {
-        fieldNames.push(field.name);
-      }
-    });
-
-    return fieldNames;
-  }
-
-  getProperties() {
-    return this._descriptor.properties || {};
-  }
-
-  getDynamicPropertiesArray() {
-    const styles = this.getProperties();
-    return Object.keys(styles)
-      .map(styleName => {
-        const { type, options } = styles[styleName];
-        return {
-          styleName,
-          type,
-          options
-        };
-      })
-      .filter(({ styleName }) => {
-        return this._isPropertyDynamic(styleName);
-      });
-  }
-
-  _isPropertyDynamic(propertyName) {
-    const { type, options } = _.get(this._descriptor, ['properties', propertyName], {});
-    return type === VectorStyle.STYLE_TYPE.DYNAMIC && options.field && options.field.name;
-  }
-
-  _checkIfOnlyFeatureType = async (featureType) => {
-    const supportedFeatures = await this._source.getSupportedShapeTypes();
-
-    if (supportedFeatures.length === 1) {
-      return supportedFeatures[0] === featureType;
-    }
-
-    if (!this._descriptor.__styleMeta || !this._descriptor.__styleMeta.hasFeatureType) {
-      return false;
-    }
-
-    const featureTypes = Object.keys(this._descriptor.__styleMeta.hasFeatureType);
-    return featureTypes.reduce((isOnlySingleFeatureType, featureTypeKey) => {
-      const hasFeature = this._descriptor.__styleMeta.hasFeatureType[featureTypeKey];
-      return featureTypeKey === featureType
-        ? isOnlySingleFeatureType && hasFeature
-        : isOnlySingleFeatureType && !hasFeature;
-    }, true);
-  }
-
-  _getIsPointsOnly = async () => {
-    return this._checkIfOnlyFeatureType(VECTOR_SHAPE_TYPES.POINT);
-  }
-
-  _getIsLinesOnly = async () => {
-    return this._checkIfOnlyFeatureType(VECTOR_SHAPE_TYPES.LINE);
-  }
-
-  _getIsPolygonsOnly = async () => {
-    return this._checkIfOnlyFeatureType(VECTOR_SHAPE_TYPES.POLYGON);
-  }
-
-  _getFieldRange = (fieldName) => {
-    return _.get(this._descriptor, ['__styleMeta', fieldName]);
-  }
-
-  getIcon = () => {
-    const styles = this.getProperties();
-    const symbolId = this.arePointsSymbolizedAsCircles()
-      ? undefined
-      : this._descriptor.properties.symbol.options.symbolId;
-    return (
-      <VectorIcon
-        loadIsPointsOnly={this._getIsPointsOnly}
-        loadIsLinesOnly={this._getIsLinesOnly}
-        fillColor={styles.fillColor}
-        lineColor={styles.lineColor}
-        symbolId={symbolId}
-      />
-    );
-  }
-
-  getLegendDetails(getFieldLabel, getFieldFormatter) {
-    const styles = this.getProperties();
-    const styleProperties = Object.keys(styles).map(styleName => {
-      const { type, options } = styles[styleName];
-      return {
-        name: styleName,
-        type,
-        options,
-        range: options && options.field && options.field.name ? this._getFieldRange(options.field.name) : null,
-      };
-    });
-
-    return (
-      <VectorStyleLegend
-        styleProperties={styleProperties}
-        getFieldLabel={getFieldLabel}
-        getFieldFormatter={getFieldFormatter}
-      />
-    );
-  }
-
-  _getStyleFields() {
-    return this.getDynamicPropertiesArray()
-      .map(({ styleName, options }) => {
-        const name = options.field.name;
-
-        // "feature-state" data expressions are not supported with layout properties.
-        // To work around this limitation, some styling values must fall back to geojson property values.
-        let supportsFeatureState;
-        let isScaled;
-        if (styleName === 'iconSize'
-          && this._descriptor.properties.symbol.options.symbolizeAs === SYMBOLIZE_AS_ICON) {
-          supportsFeatureState = false;
-          isScaled = true;
-        } else if (styleName === 'iconOrientation') {
-          supportsFeatureState = false;
-          isScaled = false;
-        } else if ((styleName === vectorStyles.FILL_COLOR || styleName === vectorStyles.LINE_COLOR)
-          && options.useCustomColorRamp) {
-          supportsFeatureState = true;
-          isScaled = false;
-        } else {
-          supportsFeatureState = true;
-          isScaled = true;
-        }
-
-        return {
-          supportsFeatureState,
-          isScaled,
-          name,
-          range: this._getFieldRange(name),
-          computedName: VectorStyle.getComputedFieldName(styleName, name),
-        };
-      });
-  }
-
-  clearFeatureState(featureCollection, mbMap, sourceId) {
-    const tmpFeatureIdentifier = {
-      source: null,
-      id: null
-    };
-    for (let i = 0; i < featureCollection.features.length; i++) {
-      const feature = featureCollection.features[i];
-      tmpFeatureIdentifier.source = sourceId;
-      tmpFeatureIdentifier.id = feature.id;
-      mbMap.removeFeatureState(tmpFeatureIdentifier);
-    }
-  }
-
-  setFeatureState(featureCollection, mbMap, sourceId) {
-
-    if (!featureCollection) {
-      return;
-    }
-
-    const styleFields  = this._getStyleFields();
-    if (styleFields.length === 0) {
-      return;
-    }
-
-    const tmpFeatureIdentifier = {
-      source: null,
-      id: null
-    };
-    const tmpFeatureState = {};
-
-    //scale to [0,1] domain
-    for (let i = 0; i < featureCollection.features.length; i++) {
-      const feature = featureCollection.features[i];
-
-      for (let j = 0; j < styleFields.length; j++) {
-        const { supportsFeatureState, isScaled, name, range, computedName } = styleFields[j];
-        const value = parseFloat(feature.properties[name]);
-        let styleValue;
-        if (isScaled) {
-          if (isNaN(value) || !range) {//cannot scale
-            styleValue = -1;//put outside range
-          } else if (range.delta === 0) {//values are identical
-            styleValue = 1;//snap to end of color range
-          } else {
-            styleValue = (value - range.min) / range.delta;
-          }
-        } else {
-          if (isNaN(value)) {
-            styleValue = 0;
-          } else {
-            styleValue = value;
-          }
-        }
-
-        if (supportsFeatureState) {
-          tmpFeatureState[computedName] = styleValue;
-        } else {
-          feature.properties[computedName] = styleValue;
-        }
-      }
-      tmpFeatureIdentifier.source = sourceId;
-      tmpFeatureIdentifier.id = feature.id;
-      mbMap.setFeatureState(tmpFeatureIdentifier, tmpFeatureState);
-    }
-
-    const hasGeoJsonProperties = styleFields.some(({ supportsFeatureState }) => {
-      return !supportsFeatureState;
-    });
-    return hasGeoJsonProperties;
-  }
-
-  _getMBDataDrivenColor({ targetName, colorStops, isSteps }) {
-    if (isSteps) {
-      const firstStopValue = colorStops[0];
-      const lessThenFirstStopValue = 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
-        ...colorStops
-      ];
-    }
-
-    return [
-      'interpolate',
-      ['linear'],
-      ['coalesce', ['feature-state', targetName], -1],
-      -1, 'rgba(0,0,0,0)',
-      ...colorStops
-    ];
-  }
-
-  _getMbDataDrivenSize({ targetName, minSize, maxSize }) {
-    return   [
-      'interpolate',
-      ['linear'],
-      ['coalesce', ['feature-state', targetName], 0],
-      0, minSize,
-      1, maxSize
-    ];
-  }
-
-  _getMBColor(styleName, styleDescriptor) {
-    const isStatic = styleDescriptor.type === VectorStyle.STYLE_TYPE.STATIC;
-    if (isStatic) {
-      return _.get(styleDescriptor, 'options.color', null);
-    }
-
-    const isDynamicConfigComplete = _.has(styleDescriptor, 'options.field.name')
-      && _.has(styleDescriptor, 'options.color');
-    if (!isDynamicConfigComplete) {
-      return null;
-    }
-
-    if (styleDescriptor.options.useCustomColorRamp &&
-      (!styleDescriptor.options.customColorRamp ||
-      !styleDescriptor.options.customColorRamp.length)) {
-      return null;
-    }
-
-    return this._getMBDataDrivenColor({
-      targetName: VectorStyle.getComputedFieldName(styleName, styleDescriptor.options.field.name),
-      colorStops: this._getMBColorStops(styleDescriptor),
-      isSteps: styleDescriptor.options.useCustomColorRamp,
-    });
-  }
-
-  _getMBColorStops(styleDescriptor) {
-    if (styleDescriptor.options.useCustomColorRamp) {
-      return styleDescriptor.options.customColorRamp.reduce((accumulatedStops, nextStop) => {
-        return [...accumulatedStops, nextStop.stop, nextStop.color];
-      }, []);
-    }
-
-    return getColorRampStops(styleDescriptor.options.color);
-  }
-
-  _isSizeDynamicConfigComplete(styleDescriptor) {
-    return _.has(styleDescriptor, 'options.field.name')
-      && _.has(styleDescriptor, 'options.minSize')
-      && _.has(styleDescriptor, 'options.maxSize');
-  }
-
-  _getMbSize(styleName, styleDescriptor) {
-    if (styleDescriptor.type === VectorStyle.STYLE_TYPE.STATIC) {
-      return styleDescriptor.options.size;
-    }
-
-    if (this._isSizeDynamicConfigComplete(styleDescriptor)) {
-      return this._getMbDataDrivenSize({
-        targetName: VectorStyle.getComputedFieldName(styleName, styleDescriptor.options.field.name),
-        minSize: styleDescriptor.options.minSize,
-        maxSize: styleDescriptor.options.maxSize,
-      });
-    }
-
-    return null;
-  }
-
-  setMBPaintProperties({ alpha, mbMap, fillLayerId, lineLayerId }) {
-    if (this._descriptor.properties.fillColor) {
-      const color = this._getMBColor(vectorStyles.FILL_COLOR, this._descriptor.properties.fillColor);
-      mbMap.setPaintProperty(fillLayerId, 'fill-color', color);
-      mbMap.setPaintProperty(fillLayerId, 'fill-opacity', alpha);
-    } else {
-      mbMap.setPaintProperty(fillLayerId, 'fill-color', null);
-      mbMap.setPaintProperty(fillLayerId, 'fill-opacity', 0);
-    }
-
-    if (this._descriptor.properties.lineColor) {
-      const color = this._getMBColor(vectorStyles.LINE_COLOR, this._descriptor.properties.lineColor);
-      mbMap.setPaintProperty(lineLayerId, 'line-color', color);
-      mbMap.setPaintProperty(lineLayerId, 'line-opacity', alpha);
-
-    } else {
-      mbMap.setPaintProperty(lineLayerId, 'line-color', null);
-      mbMap.setPaintProperty(lineLayerId, 'line-opacity', 0);
-    }
-
-    if (this._descriptor.properties.lineWidth) {
-      const lineWidth = this._getMbSize(vectorStyles.LINE_WIDTH, this._descriptor.properties.lineWidth);
-      mbMap.setPaintProperty(lineLayerId, 'line-width', lineWidth);
-    } else {
-      mbMap.setPaintProperty(lineLayerId, 'line-width', 0);
-    }
-  }
-
-  setMBPaintPropertiesForPoints({ alpha, mbMap, pointLayerId }) {
-    if (this._descriptor.properties.fillColor) {
-      const color = this._getMBColor(vectorStyles.FILL_COLOR, this._descriptor.properties.fillColor);
-      mbMap.setPaintProperty(pointLayerId, 'circle-color', color);
-      mbMap.setPaintProperty(pointLayerId, 'circle-opacity', alpha);
-    } else {
-      mbMap.setPaintProperty(pointLayerId, 'circle-color', null);
-      mbMap.setPaintProperty(pointLayerId, 'circle-opacity', 0);
-    }
-    if (this._descriptor.properties.lineColor) {
-      const color = this._getMBColor(vectorStyles.LINE_COLOR, this._descriptor.properties.lineColor);
-      mbMap.setPaintProperty(pointLayerId, 'circle-stroke-color', color);
-      mbMap.setPaintProperty(pointLayerId, 'circle-stroke-opacity', alpha);
-
-    } else {
-      mbMap.setPaintProperty(pointLayerId, 'circle-stroke-color', null);
-      mbMap.setPaintProperty(pointLayerId, 'circle-stroke-opacity', 0);
-    }
-    if (this._descriptor.properties.lineWidth) {
-      const lineWidth = this._getMbSize(vectorStyles.LINE_WIDTH, this._descriptor.properties.lineWidth);
-      mbMap.setPaintProperty(pointLayerId, 'circle-stroke-width', lineWidth);
-    } else {
-      mbMap.setPaintProperty(pointLayerId, 'circle-stroke-width', 0);
-    }
-    if (this._descriptor.properties.iconSize) {
-      const iconSize = this._getMbSize(vectorStyles.ICON_SIZE, this._descriptor.properties.iconSize);
-      mbMap.setPaintProperty(pointLayerId, 'circle-radius', iconSize);
-    } else {
-      mbMap.setPaintProperty(pointLayerId, 'circle-radius', 0);
-    }
-  }
-
-  async setMBSymbolPropertiesForPoints({ mbMap, symbolLayerId, alpha }) {
-    mbMap.setLayoutProperty(symbolLayerId, 'icon-ignore-placement', true);
-
-    const symbolId = this._descriptor.properties.symbol.options.symbolId;
-    mbMap.setLayoutProperty(symbolLayerId, 'icon-anchor', getMakiSymbolAnchor(symbolId));
-    const color = this._getMBColor(vectorStyles.FILL_COLOR, this._descriptor.properties.fillColor);
-    const haloColor = this._getMBColor(vectorStyles.LINE_COLOR, this._descriptor.properties.lineColor);
-    const haloWidth = this._getMbSize(vectorStyles.LINE_WIDTH, this._descriptor.properties.lineWidth);
-    // icon-color is only supported on SDF icons.
-    mbMap.setPaintProperty(symbolLayerId, 'icon-color', color);
-    mbMap.setPaintProperty(symbolLayerId, 'icon-halo-color', haloColor);
-    mbMap.setPaintProperty(symbolLayerId, 'icon-halo-width', haloWidth);
-    mbMap.setPaintProperty(symbolLayerId, 'icon-opacity', alpha);
-
-    // circle sizing is by radius
-    // to make icons be similiar in size to circles then have to deal with icon in half width measurements
-    const iconSize = this._descriptor.properties.iconSize;
-    if (iconSize.type === VectorStyle.STYLE_TYPE.STATIC) {
-      const iconPixels = iconSize.options.size >= HALF_LARGE_MAKI_ICON_SIZE
-        ? LARGE_MAKI_ICON_SIZE
-        : SMALL_MAKI_ICON_SIZE;
-      mbMap.setLayoutProperty(symbolLayerId, 'icon-image', `${symbolId}-${iconPixels}`);
-
-      const halfIconPixels = iconPixels / 2;
-      mbMap.setLayoutProperty(symbolLayerId, 'icon-size', iconSize.options.size / halfIconPixels);
-    } else if (this._isSizeDynamicConfigComplete(iconSize)) {
-      const iconPixels = iconSize.options.maxSize >= HALF_LARGE_MAKI_ICON_SIZE
-        ? LARGE_MAKI_ICON_SIZE
-        : SMALL_MAKI_ICON_SIZE;
-      mbMap.setLayoutProperty(symbolLayerId, 'icon-image', `${symbolId}-${iconPixels}`);
-
-      const halfIconPixels = iconPixels / 2;
-      const targetName = VectorStyle.getComputedFieldName(vectorStyles.ICON_SIZE, iconSize.options.field.name);
-      // 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, iconSize.options.minSize / halfIconPixels,
-        1, iconSize.options.maxSize / halfIconPixels
-      ]);
-    }
-
-    const iconOrientation = this._descriptor.properties.iconOrientation;
-    if (iconOrientation.type === VectorStyle.STYLE_TYPE.STATIC) {
-      mbMap.setLayoutProperty(symbolLayerId, 'icon-rotate', iconOrientation.options.orientation);
-    } else if (_.has(iconOrientation, 'options.field.name')) {
-      const targetName = VectorStyle.getComputedFieldName(vectorStyles.ICON_ORIENTATION, iconOrientation.options.field.name);
-      // Using property state instead of feature-state because layout properties do not support feature-state
-      mbMap.setLayoutProperty(symbolLayerId, 'icon-rotate', [
-        'coalesce', ['get', targetName], 0
-      ]);
-    }
-  }
-
-  arePointsSymbolizedAsCircles() {
-    return this._descriptor.properties.symbol.options.symbolizeAs === SYMBOLIZE_AS_CIRCLE;
-  }
-}
diff --git a/x-pack/legacy/plugins/maps/public/layers/tooltips/es_aggmetric_tooltip_property.js b/x-pack/legacy/plugins/maps/public/layers/tooltips/es_aggmetric_tooltip_property.js
index 11cbb36f495932..42629e192c27d2 100644
--- a/x-pack/legacy/plugins/maps/public/layers/tooltips/es_aggmetric_tooltip_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/tooltips/es_aggmetric_tooltip_property.js
@@ -6,6 +6,7 @@
 
 
 import { ESTooltipProperty } from './es_tooltip_property';
+import { METRIC_TYPE } from '../../../common/constants';
 
 export class ESAggMetricTooltipProperty extends ESTooltipProperty {
 
@@ -21,7 +22,7 @@ export class ESAggMetricTooltipProperty extends ESTooltipProperty {
     if (typeof this._rawValue === 'undefined') {
       return '-';
     }
-    if (this._metricField.type === 'count') {
+    if (this._metricField.type === METRIC_TYPE.COUNT || this._metricField.type === METRIC_TYPE.UNIQUE_COUNT) {
       return this._rawValue;
     }
     const indexPatternField = this._indexPattern.fields.getByName(this._metricField.field);
diff --git a/x-pack/legacy/plugins/maps/public/layers/tooltips/es_tooltip_property.js b/x-pack/legacy/plugins/maps/public/layers/tooltips/es_tooltip_property.js
index dae56d5526b0ac..446978a151d648 100644
--- a/x-pack/legacy/plugins/maps/public/layers/tooltips/es_tooltip_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/tooltips/es_tooltip_property.js
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { buildPhraseFilter } from '@kbn/es-query';
 import { TooltipProperty } from './tooltip_property';
 import _ from 'lodash';
-
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 export class ESTooltipProperty extends TooltipProperty {
 
   constructor(propertyKey, propertyName, rawValue, indexPattern) {
@@ -36,7 +35,7 @@ export class ESTooltipProperty extends TooltipProperty {
 
   async getESFilters() {
     return [
-      buildPhraseFilter(
+      esFilters.buildPhraseFilter(
         this._indexPattern.fields.getByName(this._propertyName),
         this._rawValue,
         this._indexPattern)
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/injected_data.js b/x-pack/legacy/plugins/maps/public/layers/util/injected_data.js
deleted file mode 100644
index 8c18819e9f8b57..00000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/util/injected_data.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-export class InjectedData {
-
-  constructor(data) {
-    this._descriptor = { data };
-  }
-
-  getData() {
-    return this._descriptor.data;
-  }
-
-  hasData() {
-    return !!this._descriptor.data;
-  }
-
-}
-
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.js b/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.js
index a8c63418635173..bf6f2bcf6f08bd 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.js
+++ b/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.js
@@ -7,6 +7,9 @@
 // Refresh only query is query where timestamps are different but query is the same.
 // Triggered by clicking "Refresh" button in QueryBar
 export function isRefreshOnlyQuery(prevQuery, newQuery) {
+  if (!prevQuery || !newQuery) {
+    return false;
+  }
   return prevQuery.queryLastTriggeredAt !== newQuery.queryLastTriggeredAt
     && prevQuery.language === newQuery.language
     && prevQuery.query === newQuery.query;
diff --git a/x-pack/legacy/plugins/maps/public/layers/vector_layer.js b/x-pack/legacy/plugins/maps/public/layers/vector_layer.js
index f2c8a05694cdd6..b2f45cb6206c68 100644
--- a/x-pack/legacy/plugins/maps/public/layers/vector_layer.js
+++ b/x-pack/legacy/plugins/maps/public/layers/vector_layer.js
@@ -7,7 +7,7 @@
 import turf from 'turf';
 import React from 'react';
 import { AbstractLayer } from './layer';
-import { VectorStyle } from './styles/vector_style';
+import { VectorStyle } from './styles/vector/vector_style';
 import { InnerJoin } from './joins/inner_join';
 import {
   GEO_JSON_TYPE,
@@ -132,18 +132,6 @@ export class VectorLayer extends AbstractLayer {
     return true;
   }
 
-  getInjectedData() {
-    const featureCollection = super.getInjectedData();
-    if (!featureCollection) {
-      return null;
-    }
-    // Set default visible property on data
-    featureCollection.features.forEach(
-      feature => _.set(feature, `properties.${FEATURE_VISIBLE_PROPERTY_NAME}`, true)
-    );
-    return featureCollection;
-  }
-
   getCustomIconAndTooltipContent() {
     const featureCollection = this._getSourceFeatureCollection();
 
@@ -195,7 +183,7 @@ export class VectorLayer extends AbstractLayer {
 
   getLegendDetails() {
     const getFieldLabel = async fieldName => {
-      const ordinalFields = await this.getOrdinalFields();
+      const ordinalFields = await this._getOrdinalFields();
       const field = ordinalFields.find(({ name }) => {
         return name === fieldName;
       });
@@ -253,15 +241,20 @@ export class VectorLayer extends AbstractLayer {
     return this._source.getDisplayName();
   }
 
-  async getOrdinalFields() {
+
+  async getDateFields() {
     const timeFields = await this._source.getDateFields();
-    const timeFieldOptions = timeFields.map(({ label, name }) => {
+    return timeFields.map(({ label, name }) => {
       return {
         label,
         name,
         origin: SOURCE_DATA_ID_ORIGIN
       };
     });
+  }
+
+
+  async getNumberFields() {
     const numberFields = await this._source.getNumberFields();
     const numberFieldOptions = numberFields.map(({ label, name }) => {
       return {
@@ -281,7 +274,14 @@ export class VectorLayer extends AbstractLayer {
       joinFields.push(...fields);
     });
 
-    return [...timeFieldOptions, ...numberFieldOptions, ...joinFields];
+    return [...numberFieldOptions, ...joinFields];
+  }
+
+  async _getOrdinalFields() {
+    return [
+      ... await this.getDateFields(),
+      ... await this.getNumberFields()
+    ];
   }
 
   getIndexPatternIds() {
@@ -498,16 +498,7 @@ export class VectorLayer extends AbstractLayer {
     startLoading, stopLoading, onLoadError, registerCancelCallback, dataFilters
   }) {
 
-    if (this._source.isInjectedData()) {
-      const featureCollection = this.getInjectedData();
-      return {
-        refreshed: false,
-        featureCollection
-      };
-    }
-
     const requestToken = Symbol(`layer-source-refresh:${ this.getId()} - source`);
-
     const searchFilters = this._getSearchFilters(dataFilters);
     const canSkip = await this._canSkipSourceUpdate(this._source, SOURCE_DATA_ID_ORIGIN, searchFilters);
     if (canSkip) {
@@ -582,12 +573,8 @@ export class VectorLayer extends AbstractLayer {
   }
 
   _getSourceFeatureCollection() {
-    if (this._source.isInjectedData()) {
-      return this.getInjectedData();
-    } else {
-      const sourceDataRequest = this.getSourceDataRequest();
-      return sourceDataRequest ? sourceDataRequest.getData() : null;
-    }
+    const sourceDataRequest = this.getSourceDataRequest();
+    return sourceDataRequest ? sourceDataRequest.getData() : null;
   }
 
   _syncFeatureCollectionWithMb(mbMap) {
diff --git a/x-pack/legacy/plugins/maps/public/reducers/non_serializable_instances.js b/x-pack/legacy/plugins/maps/public/reducers/non_serializable_instances.js
index 5fb09b8c87006a..a76330f4d17646 100644
--- a/x-pack/legacy/plugins/maps/public/reducers/non_serializable_instances.js
+++ b/x-pack/legacy/plugins/maps/public/reducers/non_serializable_instances.js
@@ -10,6 +10,7 @@ import { MapAdapter } from '../inspector/adapters/map_adapter';
 
 const REGISTER_CANCEL_CALLBACK = 'REGISTER_CANCEL_CALLBACK';
 const UNREGISTER_CANCEL_CALLBACK = 'UNREGISTER_CANCEL_CALLBACK';
+const SET_EVENT_HANDLERS = 'SET_EVENT_HANDLERS';
 
 function createInspectorAdapters() {
   const inspectorAdapters = {
@@ -27,6 +28,7 @@ export function nonSerializableInstances(state, action = {}) {
     return {
       inspectorAdapters: createInspectorAdapters(),
       cancelRequestCallbacks: new Map(), // key is request token, value is cancel callback
+      eventHandlers: {},
     };
   }
 
@@ -41,6 +43,12 @@ export function nonSerializableInstances(state, action = {}) {
       return {
         ...state,
       };
+    case SET_EVENT_HANDLERS: {
+      return {
+        ...state,
+        eventHandlers: action.eventHandlers
+      };
+    }
     default:
       return state;
 
@@ -57,6 +65,10 @@ export const getCancelRequestCallbacks = ({ nonSerializableInstances }) => {
   return nonSerializableInstances.cancelRequestCallbacks;
 };
 
+export const getEventHandlers = ({ nonSerializableInstances }) => {
+  return nonSerializableInstances.eventHandlers;
+};
+
 // Actions
 export const registerCancelCallback = (requestToken, callback) => {
   return {
@@ -86,3 +98,10 @@ export const cancelRequest = (requestToken) => {
     }
   };
 };
+
+export const setEventHandlers = (eventHandlers = {}) => {
+  return {
+    type: SET_EVENT_HANDLERS,
+    eventHandlers,
+  };
+};
diff --git a/x-pack/legacy/plugins/maps/public/register_vis_type_alias.js b/x-pack/legacy/plugins/maps/public/register_vis_type_alias.js
index 001bc5ca64fbd8..009cff317fcaf8 100644
--- a/x-pack/legacy/plugins/maps/public/register_vis_type_alias.js
+++ b/x-pack/legacy/plugins/maps/public/register_vis_type_alias.js
@@ -4,21 +4,35 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import chrome from 'ui/chrome';
 import { setup as visualizationsSetup } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy';
 import { i18n } from '@kbn/i18n';
 import { APP_ID, APP_ICON, MAP_BASE_URL } from '../common/constants';
 
+const showMapVisualizationTypes = chrome.getInjected('showMapVisualizationTypes', false);
+
+const description = i18n.translate('xpack.maps.visTypeAlias.description', {
+  defaultMessage: 'Create and style maps with multiple layers and indices.',
+});
+
+const legacyMapVisualizationWarning = i18n.translate('xpack.maps.visTypeAlias.legacyMapVizWarning', {
+  defaultMessage: `Use the Maps app instead of Coordinate Map and Region Map.
+The Maps app offers more functionality and is easier to use.`,
+});
+
 visualizationsSetup.types.registerAlias({
   aliasUrl: MAP_BASE_URL,
   name: APP_ID,
   title: i18n.translate('xpack.maps.visTypeAlias.title', {
     defaultMessage: 'Maps',
   }),
-  description: i18n.translate('xpack.maps.visTypeAlias.description', {
-    defaultMessage: `Create and style maps with multiple layers and indices.
-Use the Maps app instead of Coordinate Map and Region Map.
-The Maps app offers more functionality and is easier to use.`,
-  }),
+  description: showMapVisualizationTypes
+    ? `${description} ${legacyMapVisualizationWarning}`
+    : description,
   icon: APP_ICON,
   stage: 'production',
 });
+
+if (!showMapVisualizationTypes) {
+  visualizationsSetup.types.hideTypes(['region_map', 'tile_map']);
+}
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
index efcac8a9175ca7..4f561c9391d4d8 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
@@ -11,8 +11,8 @@ import { VectorTileLayer } from '../layers/vector_tile_layer';
 import { VectorLayer } from '../layers/vector_layer';
 import { HeatmapLayer } from '../layers/heatmap_layer';
 import { ALL_SOURCES } from '../layers/sources/all_sources';
-import { VectorStyle } from '../layers/styles/vector_style';
-import { HeatmapStyle } from '../layers/styles/heatmap_style';
+import { VectorStyle } from '../layers/styles/vector/vector_style';
+import { HeatmapStyle } from '../layers/styles/heatmap/heatmap_style';
 import { timefilter } from 'ui/timefilter';
 import { getInspectorAdapters } from '../reducers/non_serializable_instances';
 import { copyPersistentState, TRACKED_LAYER_DESCRIPTOR } from '../reducers/util';
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.js
index 5f6361a16aa005..c0ac5a781b796b 100644
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.js
+++ b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.js
@@ -9,7 +9,7 @@ import { TASK_ID, scheduleTask, registerMapsTelemetryTask } from './telemetry_ta
 
 export function initTelemetryCollection(server) {
   registerMapsTelemetryTask(server);
-  scheduleTask(server, server.plugins.task_manager);
+  scheduleTask(server);
   registerMapsUsageCollector(server);
 }
 
@@ -21,6 +21,11 @@ async function isTaskManagerReady(server) {
 async function fetch(server) {
   let docs;
   const taskManager = server.plugins.task_manager;
+
+  if (!taskManager) {
+    return null;
+  }
+
   try {
     ({ docs } = await taskManager.fetch({
       query: {
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.js
index 521c5ae71e14b9..3702bc8e29539d 100644
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.js
+++ b/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.js
@@ -10,7 +10,14 @@ const TELEMETRY_TASK_TYPE = 'maps_telemetry';
 
 export const TASK_ID = `Maps-${TELEMETRY_TASK_TYPE}`;
 
-export function scheduleTask(server, taskManager) {
+export function scheduleTask(server) {
+  const taskManager = server.plugins.task_manager;
+
+  if (!taskManager) {
+    server.log(['debug', 'telemetry'], `Task manager is not available`);
+    return;
+  }
+
   const { kbnServer } = server.plugins.xpack_main.status.plugin;
 
   kbnServer.afterPluginsInit(() => {
@@ -36,6 +43,12 @@ export function scheduleTask(server, taskManager) {
 
 export function registerMapsTelemetryTask(server) {
   const taskManager = server.plugins.task_manager;
+
+  if (!taskManager) {
+    server.log(['debug', 'telemetry'], `Task manager is not available`);
+    return;
+  }
+
   taskManager.registerTaskDefinitions({
     [TELEMETRY_TASK_TYPE]: {
       title: 'Maps telemetry fetch task',
diff --git a/x-pack/legacy/plugins/ml/common/types/fields.ts b/x-pack/legacy/plugins/ml/common/types/fields.ts
index ac9e8702e09458..9e1b992eec9075 100644
--- a/x-pack/legacy/plugins/ml/common/types/fields.ts
+++ b/x-pack/legacy/plugins/ml/common/types/fields.ts
@@ -10,6 +10,7 @@ import {
   KIBANA_AGGREGATION,
   ES_AGGREGATION,
 } from '../../common/constants/aggregation_types';
+import { MLCATEGORY } from '../../common/constants/field_types';
 
 export const EVENT_RATE_FIELD_ID = '__ml_event_rate_count__';
 export const METRIC_AGG_TYPE = 'metrics';
@@ -81,3 +82,10 @@ export interface AggFieldNamePair {
   };
   excludeFrequent?: string;
 }
+
+export const mlCategory: Field = {
+  id: MLCATEGORY,
+  name: MLCATEGORY,
+  type: ES_FIELD_TYPES.KEYWORD,
+  aggregatable: false,
+};
diff --git a/x-pack/legacy/plugins/ml/common/types/modules.ts b/x-pack/legacy/plugins/ml/common/types/modules.ts
index 18879304d7c7f2..9eb77d2140323a 100644
--- a/x-pack/legacy/plugins/ml/common/types/modules.ts
+++ b/x-pack/legacy/plugins/ml/common/types/modules.ts
@@ -80,3 +80,5 @@ export interface DataRecognizerConfigResponse {
     dashboard: KibanaObjectResponse;
   };
 }
+
+export type JobOverride = Partial<Job>;
diff --git a/x-pack/legacy/plugins/ml/common/util/job_utils.js b/x-pack/legacy/plugins/ml/common/util/job_utils.js
index 2bc8bfaff566ed..7b7a698cafb9c6 100644
--- a/x-pack/legacy/plugins/ml/common/util/job_utils.js
+++ b/x-pack/legacy/plugins/ml/common/util/job_utils.js
@@ -500,7 +500,7 @@ export function validateModelMemoryLimitUnits(job) {
 
   if (typeof job.analysis_limits !== 'undefined' && typeof job.analysis_limits.model_memory_limit !== 'undefined') {
     const mml = job.analysis_limits.model_memory_limit.toUpperCase();
-    const mmlSplit = mml.match(/\d+(\w+)/);
+    const mmlSplit = mml.match(/\d+(\w+)$/);
     const unit = (mmlSplit && mmlSplit.length === 2) ? mmlSplit[1] : null;
 
     if (ALLOWED_DATA_UNITS.indexOf(unit) === -1) {
diff --git a/x-pack/legacy/plugins/ml/public/components/anomalies_table/severity_cell/severity_cell.tsx b/x-pack/legacy/plugins/ml/public/components/anomalies_table/severity_cell/severity_cell.tsx
index c2d60f94e144d3..e74d1a73b3332b 100644
--- a/x-pack/legacy/plugins/ml/public/components/anomalies_table/severity_cell/severity_cell.tsx
+++ b/x-pack/legacy/plugins/ml/public/components/anomalies_table/severity_cell/severity_cell.tsx
@@ -36,7 +36,7 @@ export const SeverityCell: FC<SeverityCellProps> = memo(({ score, multiBucketImp
           <path
             d="M-6.708203932499369,-2.23606797749979H-2.23606797749979V-6.708203932499369H2.23606797749979V-2.23606797749979H6.708203932499369V2.23606797749979H2.23606797749979V6.708203932499369H-2.23606797749979V2.23606797749979H-6.708203932499369Z"
             transform="translate(8,8)"
-          ></path>
+          />
         </svg>
       </EuiFlexItem>
       <EuiFlexItem grow={false}>{severity}</EuiFlexItem>
diff --git a/x-pack/legacy/plugins/ml/public/components/chart_tooltip/__tests__/chart_tooltip.js b/x-pack/legacy/plugins/ml/public/components/chart_tooltip/__tests__/chart_tooltip.js
deleted file mode 100644
index a542b5284b70b2..00000000000000
--- a/x-pack/legacy/plugins/ml/public/components/chart_tooltip/__tests__/chart_tooltip.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-
-import { mlChartTooltipService } from '../chart_tooltip_service';
-
-describe('ML - mlChartTooltipService', () => {
-  it('service API duck typing', () => {
-    expect(mlChartTooltipService).to.be.an('object');
-    expect(mlChartTooltipService.show).to.be.a('function');
-    expect(mlChartTooltipService.hide).to.be.a('function');
-  });
-
-  it('should fail silently when target is not defined', () => {
-    mlChartTooltipService.element = {};
-    expect(() => {
-      mlChartTooltipService.show('', undefined);
-    }).to.not.throwError('Call to show() should fail silently.');
-  });
-});
diff --git a/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip.tsx b/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip.tsx
index 784deb260902ba..ea9bc4f0f92eed 100644
--- a/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip.tsx
+++ b/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip.tsx
@@ -12,7 +12,53 @@ import { TooltipValueFormatter } from '@elastic/charts';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { useObservable } from '../../../../../../../src/plugins/kibana_react/public/util/use_observable';
 
-import { chartTooltip$, mlChartTooltipService, ChartTooltipValue } from './chart_tooltip_service';
+import { chartTooltip$, ChartTooltipValue } from './chart_tooltip_service';
+
+type RefValue = HTMLElement | null;
+
+function useRefWithCallback() {
+  const chartTooltipState = useObservable(chartTooltip$);
+  const ref = useRef<RefValue>(null);
+
+  return (node: RefValue) => {
+    ref.current = node;
+
+    if (
+      node !== null &&
+      node.parentElement !== null &&
+      chartTooltipState !== undefined &&
+      chartTooltipState.isTooltipVisible
+    ) {
+      const parentBounding = node.parentElement.getBoundingClientRect();
+
+      const { targetPosition, offset } = chartTooltipState;
+
+      const contentWidth = document.body.clientWidth - parentBounding.left;
+      const tooltipWidth = node.clientWidth;
+
+      let left = targetPosition.left + offset.x - parentBounding.left;
+      if (left + tooltipWidth > contentWidth) {
+        // the tooltip is hanging off the side of the page,
+        // so move it to the other side of the target
+        const markerWidthAdjustment = 25;
+        left = left - (tooltipWidth + offset.x + markerWidthAdjustment);
+      }
+
+      const top = targetPosition.top + offset.y - parentBounding.top;
+
+      if (
+        chartTooltipState.tooltipPosition.left !== left ||
+        chartTooltipState.tooltipPosition.top !== top
+      ) {
+        // render the tooltip with adjusted position.
+        chartTooltip$.next({
+          ...chartTooltipState,
+          tooltipPosition: { left, top },
+        });
+      }
+    }
+  };
+}
 
 const renderHeader = (headerData?: ChartTooltipValue, formatter?: TooltipValueFormatter) => {
   if (!headerData) {
@@ -23,24 +69,18 @@ const renderHeader = (headerData?: ChartTooltipValue, formatter?: TooltipValueFo
 };
 
 export const ChartTooltip: FC = () => {
-  const chartTooltipElement = useRef(null);
-
-  mlChartTooltipService.element = chartTooltipElement.current;
-
   const chartTooltipState = useObservable(chartTooltip$);
+  const chartTooltipElement = useRefWithCallback();
 
   if (chartTooltipState === undefined || !chartTooltipState.isTooltipVisible) {
     return <div className="mlChartTooltip mlChartTooltip--hidden" ref={chartTooltipElement} />;
   }
 
   const { tooltipData, tooltipHeaderFormatter, tooltipPosition } = chartTooltipState;
+  const transform = `translate(${tooltipPosition.left}px, ${tooltipPosition.top}px)`;
 
   return (
-    <div
-      className="mlChartTooltip"
-      style={{ transform: tooltipPosition.transform }}
-      ref={chartTooltipElement}
-    >
+    <div className="mlChartTooltip" style={{ transform }} ref={chartTooltipElement}>
       {tooltipData.length > 0 && tooltipData[0].skipHeader === undefined && (
         <div className="mlChartTooltip__header">
           {renderHeader(tooltipData[0], tooltipHeaderFormatter)}
diff --git a/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.d.ts b/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.d.ts
index 2e80d577adeb6a..e6b0b6b4270bda 100644
--- a/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.d.ts
+++ b/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.d.ts
@@ -8,15 +8,19 @@ import { BehaviorSubject } from 'rxjs';
 
 import { TooltipValue, TooltipValueFormatter } from '@elastic/charts';
 
+export declare const getChartTooltipDefaultState: () => ChartTooltipState;
+
 export interface ChartTooltipValue extends TooltipValue {
   skipHeader?: boolean;
 }
 
 interface ChartTooltipState {
   isTooltipVisible: boolean;
+  offset: ToolTipOffset;
+  targetPosition: ClientRect;
   tooltipData: ChartTooltipValue[];
   tooltipHeaderFormatter?: TooltipValueFormatter;
-  tooltipPosition: { transform: string };
+  tooltipPosition: { left: number; top: number };
 }
 
 export declare const chartTooltip$: BehaviorSubject<ChartTooltipState>;
@@ -27,11 +31,10 @@ interface ToolTipOffset {
 }
 
 interface MlChartTooltipService {
-  element: HTMLElement | null;
   show: (
     tooltipData: ChartTooltipValue[],
-    target: HTMLElement | null,
-    offset: ToolTipOffset
+    target?: HTMLElement | null,
+    offset?: ToolTipOffset
   ) => void;
   hide: () => void;
 }
diff --git a/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.js b/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.js
index 2177ed9fa22889..8fe1e795df53a2 100644
--- a/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.js
+++ b/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.js
@@ -6,74 +6,32 @@
 
 import { BehaviorSubject } from 'rxjs';
 
-const doc = document.documentElement;
-
-const chartTooltipDefaultState = {
+export const getChartTooltipDefaultState = () => ({
   isTooltipVisible: false,
   tooltipData: [],
-  tooltipPosition: { transform: 'translate(0px, 0px)' }
-};
+  offset: { x: 0, y: 0 },
+  targetPosition: { left: 0, top: 0 },
+  tooltipPosition: { left: 0, top: 0 }
+});
 
-export const chartTooltip$ = new BehaviorSubject(chartTooltipDefaultState);
+export const chartTooltip$ = new BehaviorSubject(getChartTooltipDefaultState());
 
 export const mlChartTooltipService = {
-  element: null,
-};
-
-mlChartTooltipService.show = function (tooltipData, target, offset = { x: 0, y: 0 }) {
-  if (this.element === null || typeof target === 'undefined') {
-    return;
-  }
-
-  // side bar width
-  const euiNavDrawer = document.getElementsByClassName('euiNavDrawer');
-
-  if (euiNavDrawer.length === 0) {
-    return;
-  }
-
-  // enable the tooltip to render it in the DOM
-  // so the correct `tooltipWidth` gets returned.
-  const tooltipState = {
-    ...chartTooltipDefaultState,
-    isTooltipVisible: true,
-    tooltipData,
-  };
-  chartTooltip$.next(tooltipState);
-
-  const navOffset = euiNavDrawer[0].clientWidth; // Offset by width of side navbar
-  const contentWidth = document.body.clientWidth - navOffset;
-  const tooltipWidth = this.element.clientWidth;
-
-  const pos = target.getBoundingClientRect();
-  let left = pos.left + offset.x + 4 - navOffset;
-  if (left + tooltipWidth > contentWidth) {
-    // the tooltip is hanging off the side of the page,
-    // so move it to the other side of the target
-    const markerWidthAdjustment = 10;
-    left = left - (tooltipWidth + offset.x + markerWidthAdjustment);
+  show: (tooltipData, target, offset = { x: 0, y: 0 }) => {
+    if (typeof target !== 'undefined' && target !== null) {
+      chartTooltip$.next({
+        ...chartTooltip$.getValue(),
+        isTooltipVisible: true,
+        offset,
+        targetPosition: target.getBoundingClientRect(),
+        tooltipData,
+      });
+    }
+  },
+  hide: () => {
+    chartTooltip$.next({
+      ...getChartTooltipDefaultState(),
+      isTooltipVisible: false
+    });
   }
-
-  // Calculate top offset
-  const scrollTop = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0);
-  const topNavHeightAdjustment = 190;
-  const top = pos.top + offset.y + scrollTop - topNavHeightAdjustment;
-
-  // render the tooltip with adjusted position.
-  chartTooltip$.next({
-    ...tooltipState,
-    tooltipPosition: { transform: `translate(${left}px, ${top}px)` }
-  });
-
-};
-
-// When selecting multiple cells using dragSelect, we need to quickly
-// hide the tooltip with `noTransition`, otherwise, if the mouse pointer
-// enters the tooltip while dragging, it will cancel selecting multiple
-// swimlane cells which we'd like to avoid of course.
-mlChartTooltipService.hide = function () {
-  chartTooltip$.next({
-    ...chartTooltipDefaultState,
-    isTooltipVisible: false
-  });
 };
diff --git a/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.test.ts b/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.test.ts
new file mode 100644
index 00000000000000..aa1dbf92b0677a
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/components/chart_tooltip/chart_tooltip_service.test.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getChartTooltipDefaultState, mlChartTooltipService } from './chart_tooltip_service';
+
+describe('ML - mlChartTooltipService', () => {
+  it('service API duck typing', () => {
+    expect(typeof mlChartTooltipService).toBe('object');
+    expect(typeof mlChartTooltipService.show).toBe('function');
+    expect(typeof mlChartTooltipService.hide).toBe('function');
+  });
+
+  it('should fail silently when target is not defined', () => {
+    expect(() => {
+      mlChartTooltipService.show(getChartTooltipDefaultState().tooltipData, null);
+    }).not.toThrow('Call to show() should fail silently.');
+  });
+});
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/analytics.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/analytics.ts
index f99f9661f12ef2..385d50215cd21d 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/analytics.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/analytics.ts
@@ -29,6 +29,15 @@ interface RegressionAnalysis {
   };
 }
 
+export const SEARCH_SIZE = 1000;
+
+export enum INDEX_STATUS {
+  UNUSED,
+  LOADING,
+  LOADED,
+  ERROR,
+}
+
 export interface Eval {
   meanSquaredError: number | '';
   rSquared: number | '';
@@ -91,6 +100,16 @@ export const getPredictionFieldName = (analysis: AnalysisConfig) => {
   return predictionFieldName;
 };
 
+export const getPredictedFieldName = (resultsField: string, analysis: AnalysisConfig) => {
+  // default is 'ml'
+  const predictionFieldName = getPredictionFieldName(analysis);
+  const defaultPredictionField = `${getDependentVar(analysis)}_prediction`;
+  const predictedField = `${resultsField}.${
+    predictionFieldName ? predictionFieldName : defaultPredictionField
+  }`;
+  return predictedField;
+};
+
 export const isOutlierAnalysis = (arg: any): arg is OutlierAnalysis => {
   const keys = Object.keys(arg);
   return keys.length === 1 && keys[0] === ANALYSIS_CONFIG_TYPE.OUTLIER_DETECTION;
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/fields.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/fields.ts
index 4ae3e8513e5b4a..5621d77f664697 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/fields.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/fields.ts
@@ -5,6 +5,7 @@
  */
 
 import { getNestedProperty } from '../../util/object_utils';
+import { DataFrameAnalyticsConfig, getPredictedFieldName, getDependentVar } from './analytics';
 
 export type EsId = string;
 export type EsDocSource = Record<string, any>;
@@ -16,6 +17,7 @@ export interface EsDoc extends Record<string, any> {
 }
 
 export const MAX_COLUMNS = 20;
+export const DEFAULT_REGRESSION_COLUMNS = 8;
 
 const ML__ID_COPY = 'ml__id_copy';
 
@@ -68,6 +70,104 @@ export const sortColumns = (obj: EsDocSource, resultsField: string) => (a: strin
   return a.localeCompare(b);
 };
 
+export const sortRegressionResultsFields = (
+  a: string,
+  b: string,
+  jobConfig: DataFrameAnalyticsConfig
+) => {
+  const dependentVariable = getDependentVar(jobConfig.analysis);
+  const resultsField = jobConfig.dest.results_field;
+  const predictedField = getPredictedFieldName(resultsField, jobConfig.analysis);
+  if (a === `${resultsField}.is_training`) {
+    return -1;
+  }
+  if (b === `${resultsField}.is_training`) {
+    return 1;
+  }
+  if (a === predictedField) {
+    return -1;
+  }
+  if (b === predictedField) {
+    return 1;
+  }
+  if (a === dependentVariable) {
+    return -1;
+  }
+  if (b === dependentVariable) {
+    return 1;
+  }
+  return a.localeCompare(b);
+};
+
+// Used to sort columns:
+// Anchor on the left ml.is_training, <predictedField>, <actual>
+export const sortRegressionResultsColumns = (
+  obj: EsDocSource,
+  jobConfig: DataFrameAnalyticsConfig
+) => (a: string, b: string) => {
+  const dependentVariable = getDependentVar(jobConfig.analysis);
+  const resultsField = jobConfig.dest.results_field;
+  const predictedField = getPredictedFieldName(resultsField, jobConfig.analysis);
+
+  const typeofA = typeof obj[a];
+  const typeofB = typeof obj[b];
+
+  if (a === `${resultsField}.is_training`) {
+    return -1;
+  }
+
+  if (b === `${resultsField}.is_training`) {
+    return 1;
+  }
+
+  if (a === predictedField) {
+    return -1;
+  }
+
+  if (b === predictedField) {
+    return 1;
+  }
+
+  if (a === dependentVariable) {
+    return -1;
+  }
+
+  if (b === dependentVariable) {
+    return 1;
+  }
+
+  if (typeofA !== 'string' && typeofB === 'string') {
+    return 1;
+  }
+  if (typeofA === 'string' && typeofB !== 'string') {
+    return -1;
+  }
+  if (typeofA === 'string' && typeofB === 'string') {
+    return a.localeCompare(b);
+  }
+
+  const tokensA = a.split('.');
+  const prefixA = tokensA[0];
+  const tokensB = b.split('.');
+  const prefixB = tokensB[0];
+
+  if (prefixA === resultsField && tokensA.length > 1 && prefixB !== resultsField) {
+    tokensA.shift();
+    tokensA.shift();
+    if (tokensA.join('.') === b) return 1;
+    return tokensA.join('.').localeCompare(b);
+  }
+
+  if (prefixB === resultsField && tokensB.length > 1 && prefixA !== resultsField) {
+    tokensB.shift();
+    tokensB.shift();
+    if (tokensB.join('.') === a) return -1;
+    return a.localeCompare(tokensB.join('.'));
+  }
+
+  return a.localeCompare(b);
+};
+
 export function getFlattenedFields(obj: EsDocSource, resultsField: string): EsFieldName[] {
   const flatDocFields: EsFieldName[] = [];
   const newDocFields = Object.keys(obj);
@@ -84,6 +184,39 @@ export function getFlattenedFields(obj: EsDocSource, resultsField: string): EsFi
   return flatDocFields.filter(f => f !== ML__ID_COPY);
 }
 
+export const getDefaultRegressionFields = (
+  docs: EsDoc[],
+  jobConfig: DataFrameAnalyticsConfig
+): EsFieldName[] => {
+  const resultsField = jobConfig.dest.results_field;
+  if (docs.length === 0) {
+    return [];
+  }
+
+  const newDocFields = getFlattenedFields(docs[0]._source, resultsField);
+  return newDocFields
+    .filter(k => {
+      if (k === `${resultsField}.is_training`) {
+        return true;
+      }
+      // predicted value of dependent variable
+      if (k === getPredictedFieldName(resultsField, jobConfig.analysis)) {
+        return true;
+      }
+      // actual value of dependent variable
+      if (k === getDependentVar(jobConfig.analysis)) {
+        return true;
+      }
+      if (k.split('.')[0] === resultsField) {
+        return false;
+      }
+
+      return docs.some(row => row._source[k] !== null);
+    })
+    .sort((a, b) => sortRegressionResultsFields(a, b, jobConfig))
+    .slice(0, DEFAULT_REGRESSION_COLUMNS);
+};
+
 export const getDefaultSelectableFields = (docs: EsDoc[], resultsField: string): EsFieldName[] => {
   if (docs.length === 0) {
     return [];
@@ -99,14 +232,7 @@ export const getDefaultSelectableFields = (docs: EsDoc[], resultsField: string):
         return false;
       }
 
-      let value = false;
-      docs.forEach(row => {
-        const source = row._source;
-        if (source[k] !== null) {
-          value = true;
-        }
-      });
-      return value;
+      return docs.some(row => row._source[k] !== null);
     })
     .slice(0, MAX_COLUMNS);
 };
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/index.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/index.ts
index 774db35f2a52b3..112f828f9897eb 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/index.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/common/index.ts
@@ -21,12 +21,18 @@ export {
   getValuesFromResponse,
   loadEvalData,
   Eval,
+  getPredictedFieldName,
+  INDEX_STATUS,
+  SEARCH_SIZE,
 } from './analytics';
 
 export {
   getDefaultSelectableFields,
+  getDefaultRegressionFields,
   getFlattenedFields,
   sortColumns,
+  sortRegressionResultsColumns,
+  sortRegressionResultsFields,
   toggleSelectedField,
   EsId,
   EsDoc,
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.test.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.test.tsx
index ce39cecb5b5e69..92f438459128e7 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.test.tsx
@@ -6,6 +6,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
+import { DATA_FRAME_TASK_STATE } from '../../../analytics_management/components/analytics_list/common';
 
 jest.mock('../../../../../contexts/ui/use_ui_chrome_context');
 jest.mock('ui/new_platform');
@@ -20,7 +21,9 @@ jest.mock('react', () => {
 
 describe('Data Frame Analytics: <Exploration />', () => {
   test('Minimal initialization', () => {
-    const wrapper = shallow(<Exploration jobId="the-job-id" />);
+    const wrapper = shallow(
+      <Exploration jobId="the-job-id" jobStatus={DATA_FRAME_TASK_STATE.STOPPED} />
+    );
     // Without the jobConfig being loaded, the component will just return empty.
     expect(wrapper.text()).toMatch('');
     // TODO Once React 16.9 is available we can write tests covering asynchronous hooks.
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.tsx
index 95ec3346675474..11bb62dec1624e 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/exploration.tsx
@@ -50,10 +50,13 @@ import {
   EsFieldName,
   EsDoc,
   MAX_COLUMNS,
+  INDEX_STATUS,
 } from '../../../../common';
 
 import { getOutlierScoreFieldName } from './common';
-import { INDEX_STATUS, useExploreData } from './use_explore_data';
+import { useExploreData } from './use_explore_data';
+import { DATA_FRAME_TASK_STATE } from '../../../analytics_management/components/analytics_list/common';
+import { getTaskStateBadge } from '../../../analytics_management/components/analytics_list/columns';
 
 const customColorScaleFactory = (n: number) => (t: number) => {
   if (t < 1 / n) {
@@ -78,7 +81,7 @@ const ExplorationTitle: React.SFC<{ jobId: string }> = ({ jobId }) => (
   <EuiTitle size="xs">
     <span>
       {i18n.translate('xpack.ml.dataframe.analytics.exploration.jobIdTitle', {
-        defaultMessage: 'Job ID {jobId}',
+        defaultMessage: 'Outlier detection job ID {jobId}',
         values: { jobId },
       })}
     </span>
@@ -87,9 +90,10 @@ const ExplorationTitle: React.SFC<{ jobId: string }> = ({ jobId }) => (
 
 interface Props {
   jobId: string;
+  jobStatus: DATA_FRAME_TASK_STATE;
 }
 
-export const Exploration: FC<Props> = React.memo(({ jobId }) => {
+export const Exploration: FC<Props> = React.memo(({ jobId, jobStatus }) => {
   const [jobConfig, setJobConfig] = useState<DataFrameAnalyticsConfig | undefined>(undefined);
 
   const [pageIndex, setPageIndex] = useState(0);
@@ -378,7 +382,14 @@ export const Exploration: FC<Props> = React.memo(({ jobId }) => {
   if (status === INDEX_STATUS.LOADED && tableItems.length === 0) {
     return (
       <EuiPanel grow={false}>
-        <ExplorationTitle jobId={jobConfig.id} />
+        <EuiFlexGroup gutterSize="s">
+          <EuiFlexItem grow={false}>
+            <ExplorationTitle jobId={jobConfig.id} />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <span>{getTaskStateBadge(jobStatus)}</span>
+          </EuiFlexItem>
+        </EuiFlexGroup>
         <EuiCallOut
           title={i18n.translate('xpack.ml.dataframe.analytics.exploration.noDataCalloutTitle', {
             defaultMessage: 'Empty index query result.',
@@ -400,7 +411,14 @@ export const Exploration: FC<Props> = React.memo(({ jobId }) => {
     <EuiPanel grow={false}>
       <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" responsive={false}>
         <EuiFlexItem grow={false}>
-          <ExplorationTitle jobId={jobConfig.id} />
+          <EuiFlexGroup gutterSize="s">
+            <EuiFlexItem grow={false}>
+              <ExplorationTitle jobId={jobConfig.id} />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <span>{getTaskStateBadge(jobStatus)}</span>
+            </EuiFlexItem>
+          </EuiFlexGroup>
         </EuiFlexItem>
         <EuiFlexItem>
           <EuiFlexGroup alignItems="center" gutterSize="xs" responsive={false}>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/use_explore_data.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/use_explore_data.ts
index ee86156c50d4dc..2a07bc1251a311 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/use_explore_data.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/exploration/use_explore_data.ts
@@ -18,19 +18,12 @@ import {
   getFlattenedFields,
   DataFrameAnalyticsConfig,
   EsFieldName,
+  INDEX_STATUS,
+  SEARCH_SIZE,
 } from '../../../../common';
 
 import { getOutlierScoreFieldName } from './common';
 
-const SEARCH_SIZE = 1000;
-
-export enum INDEX_STATUS {
-  UNUSED,
-  LOADING,
-  LOADED,
-  ERROR,
-}
-
 type TableItem = Record<string, any>;
 
 interface LoadExploreDataArg {
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
index c7ea3421ac5dee..20ab6678da8204 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
@@ -8,12 +8,20 @@ import React, { FC, Fragment, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer, EuiStat, EuiTitle } from '@elastic/eui';
 import { ErrorCallout } from './error_callout';
-import { getValuesFromResponse, loadEvalData, Eval } from '../../../../common';
+import {
+  getValuesFromResponse,
+  getDependentVar,
+  getPredictionFieldName,
+  loadEvalData,
+  Eval,
+  DataFrameAnalyticsConfig,
+} from '../../../../common';
+import { getTaskStateBadge } from '../../../analytics_management/components/analytics_list/columns';
+import { DATA_FRAME_TASK_STATE } from '../../../analytics_management/components/analytics_list/common';
 
 interface Props {
-  jobId: string;
-  index: string;
-  dependentVariable: string;
+  jobConfig: DataFrameAnalyticsConfig;
+  jobStatus: DATA_FRAME_TASK_STATE;
 }
 
 const meanSquaredErrorText = i18n.translate(
@@ -30,23 +38,28 @@ const rSquaredText = i18n.translate(
 );
 const defaultEval: Eval = { meanSquaredError: '', rSquared: '', error: null };
 
-export const EvaluatePanel: FC<Props> = ({ jobId, index, dependentVariable }) => {
+export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus }) => {
   const [trainingEval, setTrainingEval] = useState<Eval>(defaultEval);
   const [generalizationEval, setGeneralizationEval] = useState<Eval>(defaultEval);
   const [isLoadingTraining, setIsLoadingTraining] = useState<boolean>(false);
   const [isLoadingGeneralization, setIsLoadingGeneralization] = useState<boolean>(false);
 
+  const index = jobConfig.dest.index;
+  const dependentVariable = getDependentVar(jobConfig.analysis);
+  const predictionFieldName = getPredictionFieldName(jobConfig.analysis);
+  // default is 'ml'
+  const resultsField = jobConfig.dest.results_field;
+
   const loadData = async () => {
     setIsLoadingGeneralization(true);
     setIsLoadingTraining(true);
-    // TODO: resultsField and predictionFieldName will need to be properly passed to this function
-    // once the results view is in use.
+
     const genErrorEval = await loadEvalData({
       isTraining: false,
       index,
       dependentVariable,
-      resultsField: 'ml',
-      predictionFieldName: undefined,
+      resultsField,
+      predictionFieldName,
     });
 
     if (genErrorEval.success === true && genErrorEval.eval) {
@@ -65,14 +78,13 @@ export const EvaluatePanel: FC<Props> = ({ jobId, index, dependentVariable }) =>
         error: genErrorEval.error,
       });
     }
-    // TODO: resultsField and predictionFieldName will need to be properly passed to this function
-    // once the results view is in use.
+
     const trainingErrorEval = await loadEvalData({
       isTraining: true,
       index,
       dependentVariable,
-      resultsField: 'ml',
-      predictionFieldName: undefined,
+      resultsField,
+      predictionFieldName,
     });
 
     if (trainingErrorEval.success === true && trainingErrorEval.eval) {
@@ -99,14 +111,21 @@ export const EvaluatePanel: FC<Props> = ({ jobId, index, dependentVariable }) =>
 
   return (
     <EuiPanel>
-      <EuiTitle size="xs">
-        <span>
-          {i18n.translate('xpack.ml.dataframe.analytics.regressionExploration.jobIdTitle', {
-            defaultMessage: 'Job ID {jobId}',
-            values: { jobId },
-          })}
-        </span>
-      </EuiTitle>
+      <EuiFlexGroup gutterSize="s">
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="xs">
+            <span>
+              {i18n.translate('xpack.ml.dataframe.analytics.regressionExploration.jobIdTitle', {
+                defaultMessage: 'Regression job ID {jobId}',
+                values: { jobId: jobConfig.id },
+              })}
+            </span>
+          </EuiTitle>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <span>{getTaskStateBadge(jobStatus)}</span>
+        </EuiFlexItem>
+      </EuiFlexGroup>
       <EuiSpacer size="m" />
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/regression_exploration.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/regression_exploration.tsx
index f6cb010c3f040f..7beea07f9502db 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/regression_exploration.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/regression_exploration.tsx
@@ -4,25 +4,107 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC, Fragment } from 'react';
-// import { i18n } from '@kbn/i18n';
-import { EuiSpacer } from '@elastic/eui';
-
+import React, { FC, Fragment, useState, useEffect } from 'react';
+import { EuiCallOut, EuiLoadingSpinner, EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { ml } from '../../../../../services/ml_api_service';
+import { DataFrameAnalyticsConfig } from '../../../../common';
 import { EvaluatePanel } from './evaluate_panel';
-// import { ResultsTable } from './results_table';
+import { ResultsTable } from './results_table';
+import { DATA_FRAME_TASK_STATE } from '../../../analytics_management/components/analytics_list/common';
+
+interface GetDataFrameAnalyticsResponse {
+  count: number;
+  data_frame_analytics: DataFrameAnalyticsConfig[];
+}
+
+const LoadingPanel: FC = () => (
+  <EuiPanel className="eui-textCenter">
+    <EuiLoadingSpinner size="xl" />
+  </EuiPanel>
+);
+
+export const ExplorationTitle: React.SFC<{ jobId: string }> = ({ jobId }) => (
+  <EuiTitle size="xs">
+    <span>
+      {i18n.translate('xpack.ml.dataframe.analytics.regressionExploration.jobIdTitle', {
+        defaultMessage: 'Regression job ID {jobId}',
+        values: { jobId },
+      })}
+    </span>
+  </EuiTitle>
+);
 
 interface Props {
   jobId: string;
-  destIndex: string;
-  dependentVariable: string;
+  jobStatus: DATA_FRAME_TASK_STATE;
 }
 
-export const RegressionExploration: FC<Props> = ({ jobId, destIndex, dependentVariable }) => {
+export const RegressionExploration: FC<Props> = ({ jobId, jobStatus }) => {
+  const [jobConfig, setJobConfig] = useState<DataFrameAnalyticsConfig | undefined>(undefined);
+  const [isLoadingJobConfig, setIsLoadingJobConfig] = useState<boolean>(false);
+  const [jobConfigErrorMessage, setJobConfigErrorMessage] = useState<undefined | string>(undefined);
+
+  const loadJobConfig = async () => {
+    setIsLoadingJobConfig(true);
+    try {
+      const analyticsConfigs: GetDataFrameAnalyticsResponse = await ml.dataFrameAnalytics.getDataFrameAnalytics(
+        jobId
+      );
+      if (
+        Array.isArray(analyticsConfigs.data_frame_analytics) &&
+        analyticsConfigs.data_frame_analytics.length > 0
+      ) {
+        setJobConfig(analyticsConfigs.data_frame_analytics[0]);
+        setIsLoadingJobConfig(false);
+      }
+    } catch (e) {
+      if (e.message !== undefined) {
+        setJobConfigErrorMessage(e.message);
+      } else {
+        setJobConfigErrorMessage(JSON.stringify(e));
+      }
+      setIsLoadingJobConfig(false);
+    }
+  };
+
+  useEffect(() => {
+    loadJobConfig();
+  }, []);
+
+  if (jobConfigErrorMessage !== undefined) {
+    return (
+      <EuiPanel grow={false}>
+        <ExplorationTitle jobId={jobId} />
+        <EuiSpacer />
+        <EuiCallOut
+          title={i18n.translate(
+            'xpack.ml.dataframe.analytics.regressionExploration.jobConfigurationFetchError',
+            {
+              defaultMessage:
+                'Unable to fetch results. An error occurred loading the job configuration data.',
+            }
+          )}
+          color="danger"
+          iconType="cross"
+        >
+          <p>{jobConfigErrorMessage}</p>
+        </EuiCallOut>
+      </EuiPanel>
+    );
+  }
+
   return (
     <Fragment>
-      <EvaluatePanel jobId={jobId} index={destIndex} dependentVariable={dependentVariable} />
+      {isLoadingJobConfig === true && jobConfig === undefined && <LoadingPanel />}
+      {isLoadingJobConfig === false && jobConfig !== undefined && (
+        <EvaluatePanel jobConfig={jobConfig} jobStatus={jobStatus} />
+      )}
       <EuiSpacer />
-      {/* <ResultsTable jobId={jobId} /> */}
+      {isLoadingJobConfig === true && jobConfig === undefined && <LoadingPanel />}
+      {isLoadingJobConfig === false && jobConfig !== undefined && (
+        <ResultsTable jobConfig={jobConfig} jobStatus={jobStatus} />
+      )}
     </Fragment>
   );
 };
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/results_table.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/results_table.tsx
new file mode 100644
index 00000000000000..5ba3b8ed45939b
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/results_table.tsx
@@ -0,0 +1,467 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Fragment, FC, useEffect, useState } from 'react';
+import moment from 'moment-timezone';
+
+import { i18n } from '@kbn/i18n';
+import {
+  EuiBadge,
+  EuiButtonIcon,
+  EuiCallOut,
+  EuiCheckbox,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiPanel,
+  EuiPopover,
+  EuiPopoverTitle,
+  EuiProgress,
+  EuiSpacer,
+  EuiText,
+  EuiToolTip,
+  Query,
+} from '@elastic/eui';
+
+import { Query as QueryType } from '../../../analytics_management/components/analytics_list/common';
+
+import {
+  ColumnType,
+  MlInMemoryTableBasic,
+  OnTableChangeArg,
+  SortingPropType,
+  SORT_DIRECTION,
+} from '../../../../../components/ml_in_memory_table';
+
+import { formatHumanReadableDateTimeSeconds } from '../../../../../util/date_utils';
+import { SavedSearchQuery } from '../../../../../contexts/kibana';
+
+import {
+  sortRegressionResultsColumns,
+  sortRegressionResultsFields,
+  toggleSelectedField,
+  DataFrameAnalyticsConfig,
+  EsFieldName,
+  EsDoc,
+  MAX_COLUMNS,
+  getPredictedFieldName,
+  INDEX_STATUS,
+  SEARCH_SIZE,
+} from '../../../../common';
+import { getTaskStateBadge } from '../../../analytics_management/components/analytics_list/columns';
+import { DATA_FRAME_TASK_STATE } from '../../../analytics_management/components/analytics_list/common';
+
+import { useExploreData, defaultSearchQuery } from './use_explore_data';
+import { ExplorationTitle } from './regression_exploration';
+
+const PAGE_SIZE_OPTIONS = [5, 10, 25, 50];
+
+interface Props {
+  jobConfig: DataFrameAnalyticsConfig;
+  jobStatus: DATA_FRAME_TASK_STATE;
+}
+
+export const ResultsTable: FC<Props> = React.memo(({ jobConfig, jobStatus }) => {
+  const [pageIndex, setPageIndex] = useState(0);
+  const [pageSize, setPageSize] = useState(25);
+  const [selectedFields, setSelectedFields] = useState([] as EsFieldName[]);
+  const [isColumnsPopoverVisible, setColumnsPopoverVisible] = useState(false);
+  const [searchQuery, setSearchQuery] = useState<SavedSearchQuery>(defaultSearchQuery);
+  const [searchError, setSearchError] = useState<any>(undefined);
+  const [searchString, setSearchString] = useState<string | undefined>(undefined);
+
+  function toggleColumnsPopover() {
+    setColumnsPopoverVisible(!isColumnsPopoverVisible);
+  }
+
+  function closeColumnsPopover() {
+    setColumnsPopoverVisible(false);
+  }
+
+  function toggleColumn(column: EsFieldName) {
+    if (tableItems.length > 0 && jobConfig !== undefined) {
+      // spread to a new array otherwise the component wouldn't re-render
+      setSelectedFields([...toggleSelectedField(selectedFields, column)]);
+    }
+  }
+
+  const {
+    errorMessage,
+    loadExploreData,
+    sortField,
+    sortDirection,
+    status,
+    tableItems,
+  } = useExploreData(jobConfig, selectedFields, setSelectedFields);
+
+  let docFields: EsFieldName[] = [];
+  let docFieldsCount = 0;
+  if (tableItems.length > 0) {
+    docFields = Object.keys(tableItems[0]);
+    docFields.sort((a, b) => sortRegressionResultsFields(a, b, jobConfig));
+    docFieldsCount = docFields.length;
+  }
+
+  const columns: ColumnType[] = [];
+
+  if (jobConfig !== undefined && selectedFields.length > 0 && tableItems.length > 0) {
+    columns.push(
+      ...selectedFields.sort(sortRegressionResultsColumns(tableItems[0], jobConfig)).map(k => {
+        const column: ColumnType = {
+          field: k,
+          name: k,
+          sortable: true,
+          truncateText: true,
+        };
+
+        const render = (d: any, fullItem: EsDoc) => {
+          if (Array.isArray(d) && d.every(item => typeof item === 'string')) {
+            // If the cells data is an array of strings, return as a comma separated list.
+            // The list will get limited to 5 items with `…` at the end if there's more in the original array.
+            return `${d.slice(0, 5).join(', ')}${d.length > 5 ? ', …' : ''}`;
+          } else if (Array.isArray(d)) {
+            // If the cells data is an array of e.g. objects, display a 'array' badge with a
+            // tooltip that explains that this type of field is not supported in this table.
+            return (
+              <EuiToolTip
+                content={i18n.translate(
+                  'xpack.ml.dataframe.analytics.regressionExploration.indexArrayToolTipContent',
+                  {
+                    defaultMessage:
+                      'The full content of this array based column cannot be displayed.',
+                  }
+                )}
+              >
+                <EuiBadge>
+                  {i18n.translate(
+                    'xpack.ml.dataframe.analytics.regressionExploration.indexArrayBadgeContent',
+                    {
+                      defaultMessage: 'array',
+                    }
+                  )}
+                </EuiBadge>
+              </EuiToolTip>
+            );
+          } else if (typeof d === 'object' && d !== null) {
+            // If the cells data is an object, display a 'object' badge with a
+            // tooltip that explains that this type of field is not supported in this table.
+            return (
+              <EuiToolTip
+                content={i18n.translate(
+                  'xpack.ml.dataframe.analytics.regressionExploration.indexObjectToolTipContent',
+                  {
+                    defaultMessage:
+                      'The full content of this object based column cannot be displayed.',
+                  }
+                )}
+              >
+                <EuiBadge>
+                  {i18n.translate(
+                    'xpack.ml.dataframe.analytics.regressionExploration.indexObjectBadgeContent',
+                    {
+                      defaultMessage: 'object',
+                    }
+                  )}
+                </EuiBadge>
+              </EuiToolTip>
+            );
+          }
+
+          return d;
+        };
+
+        let columnType;
+
+        if (tableItems.length > 0) {
+          columnType = typeof tableItems[0][k];
+        }
+
+        if (typeof columnType !== 'undefined') {
+          switch (columnType) {
+            case 'boolean':
+              column.dataType = 'boolean';
+              break;
+            case 'Date':
+              column.align = 'right';
+              column.render = (d: any) =>
+                formatHumanReadableDateTimeSeconds(moment(d).unix() * 1000);
+              break;
+            case 'number':
+              column.dataType = 'number';
+              column.render = render;
+              break;
+            default:
+              column.render = render;
+              break;
+          }
+        } else {
+          column.render = render;
+        }
+
+        return column;
+      })
+    );
+  }
+
+  useEffect(() => {
+    if (jobConfig !== undefined) {
+      const predictedFieldName = getPredictedFieldName(
+        jobConfig.dest.results_field,
+        jobConfig.analysis
+      );
+      const predictedFieldSelected = selectedFields.includes(predictedFieldName);
+
+      const field = predictedFieldSelected ? predictedFieldName : selectedFields[0];
+      const direction = predictedFieldSelected ? SORT_DIRECTION.DESC : SORT_DIRECTION.ASC;
+      loadExploreData({ field, direction, searchQuery });
+    }
+  }, [JSON.stringify(searchQuery)]);
+
+  useEffect(() => {
+    // by default set the sorting to descending on the prediction field (`<dependent_varible or prediction_field_name>_prediction`).
+    // if that's not available sort ascending on the first column.
+    // also check if the current sorting field is still available.
+    if (jobConfig !== undefined && columns.length > 0 && !selectedFields.includes(sortField)) {
+      const predictedFieldName = getPredictedFieldName(
+        jobConfig.dest.results_field,
+        jobConfig.analysis
+      );
+      const predictedFieldSelected = selectedFields.includes(predictedFieldName);
+
+      const field = predictedFieldSelected ? predictedFieldName : selectedFields[0];
+      const direction = predictedFieldSelected ? SORT_DIRECTION.DESC : SORT_DIRECTION.ASC;
+      loadExploreData({ field, direction, searchQuery });
+    }
+  }, [jobConfig, columns.length, sortField, sortDirection, tableItems.length]);
+
+  let sorting: SortingPropType = false;
+  let onTableChange;
+
+  if (columns.length > 0 && sortField !== '' && sortField !== undefined) {
+    sorting = {
+      sort: {
+        field: sortField,
+        direction: sortDirection,
+      },
+    };
+
+    onTableChange = ({
+      page = { index: 0, size: 10 },
+      sort = { field: sortField, direction: sortDirection },
+    }: OnTableChangeArg) => {
+      const { index, size } = page;
+      setPageIndex(index);
+      setPageSize(size);
+
+      if (sort.field !== sortField || sort.direction !== sortDirection) {
+        loadExploreData({ ...sort, searchQuery });
+      }
+    };
+  }
+
+  const pagination = {
+    initialPageIndex: pageIndex,
+    initialPageSize: pageSize,
+    totalItemCount: tableItems.length,
+    pageSizeOptions: PAGE_SIZE_OPTIONS,
+    hidePerPageOptions: false,
+  };
+
+  const onQueryChange = ({ query, error }: { query: QueryType; error: any }) => {
+    if (error) {
+      setSearchError(error.message);
+    } else {
+      try {
+        const esQueryDsl = Query.toESQuery(query);
+        setSearchQuery(esQueryDsl);
+        setSearchString(query.text);
+        setSearchError(undefined);
+      } catch (e) {
+        setSearchError(e.toString());
+      }
+    }
+  };
+
+  const search = {
+    onChange: onQueryChange,
+    defaultQuery: searchString,
+    box: {
+      incremental: false,
+      placeholder: i18n.translate(
+        'xpack.ml.dataframe.analytics.regressionExploration.searchBoxPlaceholder',
+        {
+          defaultMessage: 'E.g. avg>0.5',
+        }
+      ),
+    },
+    filters: [
+      {
+        type: 'field_value_toggle_group',
+        field: `${jobConfig.dest.results_field}.is_training`,
+        items: [
+          {
+            value: false,
+            name: i18n.translate(
+              'xpack.ml.dataframe.analytics.regressionExploration.isTestingLabel',
+              {
+                defaultMessage: 'Testing',
+              }
+            ),
+          },
+          {
+            value: true,
+            name: i18n.translate(
+              'xpack.ml.dataframe.analytics.regressionExploration.isTrainingLabel',
+              {
+                defaultMessage: 'Training',
+              }
+            ),
+          },
+        ],
+      },
+    ],
+  };
+
+  if (jobConfig === undefined) {
+    return null;
+  }
+
+  if (status === INDEX_STATUS.ERROR) {
+    return (
+      <EuiPanel grow={false}>
+        <EuiFlexGroup gutterSize="s">
+          <EuiFlexItem grow={false}>
+            <ExplorationTitle jobId={jobConfig.id} />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <span>{getTaskStateBadge(jobStatus)}</span>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+        <EuiCallOut
+          title={i18n.translate('xpack.ml.dataframe.analytics.regressionExploration.indexError', {
+            defaultMessage: 'An error occurred loading the index data.',
+          })}
+          color="danger"
+          iconType="cross"
+        >
+          <p>{errorMessage}</p>
+        </EuiCallOut>
+      </EuiPanel>
+    );
+  }
+
+  return (
+    <EuiPanel grow={false}>
+      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" responsive={false}>
+        <EuiFlexItem grow={false}>
+          <EuiFlexGroup gutterSize="s">
+            <EuiFlexItem grow={false}>
+              <ExplorationTitle jobId={jobConfig.id} />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <span>{getTaskStateBadge(jobStatus)}</span>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiFlexGroup alignItems="center" gutterSize="xs" responsive={false}>
+            <EuiFlexItem style={{ textAlign: 'right' }}>
+              {docFieldsCount > MAX_COLUMNS && (
+                <EuiText size="s">
+                  {i18n.translate(
+                    'xpack.ml.dataframe.analytics.regressionExploration.fieldSelection',
+                    {
+                      defaultMessage:
+                        '{selectedFieldsLength, number} of {docFieldsCount, number} {docFieldsCount, plural, one {field} other {fields}} selected',
+                      values: { selectedFieldsLength: selectedFields.length, docFieldsCount },
+                    }
+                  )}
+                </EuiText>
+              )}
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiText size="s">
+                <EuiPopover
+                  id="popover"
+                  button={
+                    <EuiButtonIcon
+                      iconType="gear"
+                      onClick={toggleColumnsPopover}
+                      aria-label={i18n.translate(
+                        'xpack.ml.dataframe.analytics.regressionExploration.selectColumnsAriaLabel',
+                        {
+                          defaultMessage: 'Select columns',
+                        }
+                      )}
+                    />
+                  }
+                  isOpen={isColumnsPopoverVisible}
+                  closePopover={closeColumnsPopover}
+                  ownFocus
+                >
+                  <EuiPopoverTitle>
+                    {i18n.translate(
+                      'xpack.ml.dataframe.analytics.regressionExploration.selectFieldsPopoverTitle',
+                      {
+                        defaultMessage: 'Select fields',
+                      }
+                    )}
+                  </EuiPopoverTitle>
+                  <div style={{ maxHeight: '400px', overflowY: 'scroll' }}>
+                    {docFields.map(d => (
+                      <EuiCheckbox
+                        key={d}
+                        id={d}
+                        label={d}
+                        checked={selectedFields.includes(d)}
+                        onChange={() => toggleColumn(d)}
+                        disabled={selectedFields.includes(d) && selectedFields.length === 1}
+                      />
+                    ))}
+                  </div>
+                </EuiPopover>
+              </EuiText>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      {status === INDEX_STATUS.LOADING && <EuiProgress size="xs" color="accent" />}
+      {status !== INDEX_STATUS.LOADING && (
+        <EuiProgress size="xs" color="accent" max={1} value={0} />
+      )}
+      {(columns.length > 0 || searchQuery !== defaultSearchQuery) && (
+        <Fragment>
+          <EuiFormRow
+            helpText={i18n.translate(
+              'xpack.ml.dataframe.analytics.regressionExploration.documentsShownHelpText',
+              {
+                defaultMessage: 'Showing first {searchSize} documents',
+                values: { searchSize: SEARCH_SIZE },
+              }
+            )}
+          >
+            <Fragment />
+          </EuiFormRow>
+          <EuiSpacer />
+          <MlInMemoryTableBasic
+            allowNeutralSort={false}
+            columns={columns}
+            compressed
+            hasActions={false}
+            isSelectable={false}
+            items={tableItems}
+            onTableChange={onTableChange}
+            pagination={pagination}
+            responsive={false}
+            search={search}
+            error={searchError}
+            sorting={sorting}
+          />
+        </Fragment>
+      )}
+    </EuiPanel>
+  );
+});
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/use_explore_data.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/use_explore_data.ts
new file mode 100644
index 00000000000000..3e7266eb89474b
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/use_explore_data.ts
@@ -0,0 +1,163 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 React, { useEffect, useState } from 'react';
+
+import { SearchResponse } from 'elasticsearch';
+
+import { SortDirection, SORT_DIRECTION } from '../../../../../components/ml_in_memory_table';
+
+import { ml } from '../../../../../services/ml_api_service';
+import { getNestedProperty } from '../../../../../util/object_utils';
+import { SavedSearchQuery } from '../../../../../contexts/kibana';
+
+import {
+  getDefaultRegressionFields,
+  getFlattenedFields,
+  DataFrameAnalyticsConfig,
+  EsFieldName,
+  getPredictedFieldName,
+  INDEX_STATUS,
+  SEARCH_SIZE,
+} from '../../../../common';
+
+export const defaultSearchQuery = {
+  match_all: {},
+};
+
+type TableItem = Record<string, any>;
+
+interface LoadExploreDataArg {
+  field: string;
+  direction: SortDirection;
+  searchQuery: SavedSearchQuery;
+}
+export interface UseExploreDataReturnType {
+  errorMessage: string;
+  loadExploreData: (arg: LoadExploreDataArg) => void;
+  sortField: EsFieldName;
+  sortDirection: SortDirection;
+  status: INDEX_STATUS;
+  tableItems: TableItem[];
+}
+
+interface SearchQuery {
+  query: SavedSearchQuery;
+  sort?: any;
+}
+
+export const useExploreData = (
+  jobConfig: DataFrameAnalyticsConfig | undefined,
+  selectedFields: EsFieldName[],
+  setSelectedFields: React.Dispatch<React.SetStateAction<EsFieldName[]>>
+): UseExploreDataReturnType => {
+  const [errorMessage, setErrorMessage] = useState('');
+  const [status, setStatus] = useState(INDEX_STATUS.UNUSED);
+  const [tableItems, setTableItems] = useState<TableItem[]>([]);
+  const [sortField, setSortField] = useState<string>('');
+  const [sortDirection, setSortDirection] = useState<SortDirection>(SORT_DIRECTION.ASC);
+
+  const loadExploreData = async ({ field, direction, searchQuery }: LoadExploreDataArg) => {
+    if (jobConfig !== undefined) {
+      setErrorMessage('');
+      setStatus(INDEX_STATUS.LOADING);
+
+      try {
+        const resultsField = jobConfig.dest.results_field;
+        const body: SearchQuery = {
+          query: searchQuery,
+        };
+
+        if (field !== undefined) {
+          body.sort = [
+            {
+              [field]: {
+                order: direction,
+              },
+            },
+          ];
+        }
+
+        const resp: SearchResponse<any> = await ml.esSearch({
+          index: jobConfig.dest.index,
+          size: SEARCH_SIZE,
+          body,
+        });
+
+        setSortField(field);
+        setSortDirection(direction);
+
+        const docs = resp.hits.hits;
+
+        if (docs.length === 0) {
+          setTableItems([]);
+          setStatus(INDEX_STATUS.LOADED);
+          return;
+        }
+
+        if (selectedFields.length === 0) {
+          const newSelectedFields = getDefaultRegressionFields(docs, jobConfig);
+          setSelectedFields(newSelectedFields);
+        }
+
+        // Create a version of the doc's source with flattened field names.
+        // This avoids confusion later on if a field name has dots in its name
+        // or is a nested fields when displaying it via EuiInMemoryTable.
+        const flattenedFields = getFlattenedFields(docs[0]._source, resultsField);
+        const transformedTableItems = docs.map(doc => {
+          const item: TableItem = {};
+          flattenedFields.forEach(ff => {
+            item[ff] = getNestedProperty(doc._source, ff);
+            if (item[ff] === undefined) {
+              // If the attribute is undefined, it means it was not a nested property
+              // but had dots in its actual name. This selects the property by its
+              // full name and assigns it to `item[ff]`.
+              item[ff] = doc._source[`"${ff}"`];
+            }
+            if (item[ff] === undefined) {
+              const parts = ff.split('.');
+              if (parts[0] === resultsField && parts.length >= 2) {
+                parts.shift();
+                if (doc._source[resultsField] !== undefined) {
+                  item[ff] = doc._source[resultsField][parts.join('.')];
+                }
+              }
+            }
+          });
+          return item;
+        });
+
+        setTableItems(transformedTableItems);
+        setStatus(INDEX_STATUS.LOADED);
+      } catch (e) {
+        if (e.message !== undefined) {
+          setErrorMessage(e.message);
+        } else {
+          setErrorMessage(JSON.stringify(e));
+        }
+        setTableItems([]);
+        setStatus(INDEX_STATUS.ERROR);
+      }
+    }
+  };
+
+  useEffect(() => {
+    if (jobConfig !== undefined) {
+      loadExploreData({
+        field: getPredictedFieldName(jobConfig.dest.results_field, jobConfig.analysis),
+        direction: SORT_DIRECTION.DESC,
+        searchQuery: defaultSearchQuery,
+      });
+    }
+  }, [jobConfig && jobConfig.id]);
+
+  return { errorMessage, loadExploreData, sortField, sortDirection, status, tableItems };
+};
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/directive.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/directive.tsx
index ca448aaa7b9388..4a28e0b0b881ee 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/directive.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/directive.tsx
@@ -53,8 +53,7 @@ module.directive('mlDataFrameAnalyticsExploration', ($injector: InjectorService)
             <Page
               jobId={globalState.ml.jobId}
               analysisType={globalState.ml.analysisType}
-              destIndex={globalState.ml.destIndex}
-              depVar={globalState.ml.depVar}
+              jobStatus={globalState.ml.jobStatus}
             />
           </KibanaContext.Provider>
         </I18nContext>,
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/page.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/page.tsx
index 0bbc3137041742..b3d13db0a35505 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/page.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_exploration/page.tsx
@@ -26,13 +26,13 @@ import { Exploration } from './components/exploration';
 import { RegressionExploration } from './components/regression_exploration';
 
 import { ANALYSIS_CONFIG_TYPE } from '../../common/analytics';
+import { DATA_FRAME_TASK_STATE } from '../analytics_management/components/analytics_list/common';
 
 export const Page: FC<{
   jobId: string;
-  analysisType: string;
-  destIndex: string;
-  depVar: string;
-}> = ({ jobId, analysisType, destIndex, depVar }) => (
+  analysisType: ANALYSIS_CONFIG_TYPE;
+  jobStatus: DATA_FRAME_TASK_STATE;
+}> = ({ jobId, analysisType, jobStatus }) => (
   <Fragment>
     <NavigationMenu tabId="data_frame_analytics" />
     <EuiPage data-test-subj="mlPageDataFrameAnalyticsExploration">
@@ -66,9 +66,11 @@ export const Page: FC<{
         </EuiPageContentHeader>
         <EuiPageContentBody>
           <EuiSpacer size="l" />
-          {analysisType === ANALYSIS_CONFIG_TYPE.OUTLIER_DETECTION && <Exploration jobId={jobId} />}
+          {analysisType === ANALYSIS_CONFIG_TYPE.OUTLIER_DETECTION && (
+            <Exploration jobId={jobId} jobStatus={jobStatus} />
+          )}
           {analysisType === ANALYSIS_CONFIG_TYPE.REGRESSION && (
-            <RegressionExploration jobId={jobId} destIndex={destIndex} dependentVariable={depVar} />
+            <RegressionExploration jobId={jobId} jobStatus={jobStatus} />
           )}
         </EuiPageContentBody>
       </EuiPageBody>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/actions.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/actions.tsx
index 7ad86c5d380cab..5e5283f9e6c49b 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/actions.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/actions.tsx
@@ -13,7 +13,7 @@ import {
   createPermissionFailureMessage,
 } from '../../../../../privilege/check_privilege';
 
-import { isOutlierAnalysis, getAnalysisType, getDependentVar } from '../../../../common/analytics';
+import { getAnalysisType } from '../../../../common/analytics';
 
 import { getResultsUrl, isDataFrameAnalyticsRunning, DataFrameAnalyticsListRow } from './common';
 import { stopAnalytics } from '../../services/analytics_service';
@@ -25,14 +25,11 @@ export const AnalyticsViewAction = {
   isPrimary: true,
   render: (item: DataFrameAnalyticsListRow) => {
     const analysisType = getAnalysisType(item.config.analysis);
-    const destIndex = item.config.dest.index;
-    const dependentVariable = getDependentVar(item.config.analysis);
+    const jobStatus = item.stats.state;
 
-    const url = getResultsUrl(item.id, analysisType, destIndex, dependentVariable);
-    // Disable 'View' link for regression until results view is complete
+    const url = getResultsUrl(item.id, analysisType, jobStatus);
     return (
       <EuiButtonEmpty
-        disabled={!isOutlierAnalysis(item.config.analysis)}
         onClick={() => (window.location.href = url)}
         size="xs"
         color="text"
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
index 99d1889b265edc..098c239e4f6ba5 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
@@ -5,7 +5,6 @@
  */
 
 import { DataFrameAnalyticsId, DataFrameAnalyticsConfig } from '../../../../common';
-import { ANALYSIS_CONFIG_TYPE } from '../../../../common/analytics';
 
 export enum DATA_FRAME_TASK_STATE {
   ANALYZING = 'analyzing',
@@ -118,17 +117,6 @@ export function isCompletedAnalyticsJob(stats: DataFrameAnalyticsStats) {
   return stats.state === DATA_FRAME_TASK_STATE.STOPPED && progress === 100;
 }
 
-export function getResultsUrl(
-  jobId: string,
-  analysisType: string,
-  destIndex: string = '',
-  dependentVariable: string = ''
-) {
-  const destIndexParam = `,destIndex:${destIndex}`;
-  const depVarParam = `,depVar:${dependentVariable}`;
-  const isRegression = analysisType === ANALYSIS_CONFIG_TYPE.REGRESSION;
-
-  return `ml#/data_frame_analytics/exploration?_g=(ml:(jobId:${jobId},analysisType:${analysisType}${
-    isRegression && destIndex !== '' ? destIndexParam : ''
-  }${isRegression && dependentVariable !== '' ? depVarParam : ''}))`;
+export function getResultsUrl(jobId: string, analysisType: string, status: DATA_FRAME_TASK_STATE) {
+  return `ml#/data_frame_analytics/exploration?_g=(ml:(jobId:${jobId},analysisType:${analysisType},jobStatus:${status}))`;
 }
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row_json_pane.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row_json_pane.tsx
index d0e23f96de0496..ac7fdcb1295313 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row_json_pane.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row_json_pane.tsx
@@ -28,6 +28,7 @@ export const ExpandedRowJsonPane: FC<Props> = ({ json }) => {
           readOnly={true}
           mode="json"
           style={{ width: '100%' }}
+          theme="textmate"
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>&nbsp;</EuiFlexItem>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
index 9a5344cd1f984a..daf21d57b05106 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx
@@ -127,6 +127,7 @@ export const CreateAnalyticsAdvancedEditor: FC<CreateAnalyticsFormProps> = ({ ac
                 fontSize: '12px',
                 maxLines: 20,
               }}
+              theme="textmate"
               aria-label={i18n.translate(
                 'xpack.ml.dataframe.analytics.create.advancedEditor.codeEditorAriaLabel',
                 {
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx
index 35a0e1c82cf335..ab8cc5a5982bb3 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx
@@ -17,6 +17,7 @@ import {
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 import { metadata } from 'ui/metadata';
 import { IndexPattern, INDEX_PATTERN_ILLEGAL_CHARACTERS } from 'ui/index_patterns';
@@ -46,19 +47,14 @@ const NUMERICAL_FIELD_TYPES = new Set([
   'scaled_float',
 ]);
 
+// List of system fields we want to ignore for the numeric field check.
+const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
+
 export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, state }) => {
   const { setFormState } = actions;
   const kibanaContext = useKibanaContext();
 
-  const {
-    form,
-    indexPatternsMap,
-    indexPatternsWithNumericFields,
-    indexPatternTitles,
-    isAdvancedEditorEnabled,
-    isJobCreated,
-    requestMessages,
-  } = state;
+  const { form, indexPatternsMap, isAdvancedEditorEnabled, isJobCreated, requestMessages } = state;
 
   const {
     createIndexPattern,
@@ -80,14 +76,44 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
     sourceIndex,
     sourceIndexNameEmpty,
     sourceIndexNameValid,
+    sourceIndexContainsNumericalFields,
+    sourceIndexFieldsCheckFailed,
     trainingPercent,
   } = form;
 
+  // Find out if index pattern contain numeric fields. Provides a hint in the form
+  // that an analytics jobs is not able to identify outliers if there are no numeric fields present.
+  const validateSourceIndexFields = async () => {
+    try {
+      const indexPattern: IndexPattern = await kibanaContext.indexPatterns.get(
+        indexPatternsMap[sourceIndex].value
+      );
+      const containsNumericalFields: boolean = indexPattern.fields.some(
+        ({ name, type }) => !OMIT_FIELDS.includes(name) && type === 'number'
+      );
+
+      setFormState({
+        sourceIndexContainsNumericalFields: containsNumericalFields,
+        sourceIndexFieldsCheckFailed: false,
+      });
+    } catch (e) {
+      setFormState({
+        sourceIndexFieldsCheckFailed: true,
+      });
+    }
+  };
+
   const loadDependentFieldOptions = async () => {
-    setFormState({ loadingDepFieldOptions: true, dependentVariable: '' });
+    setFormState({
+      loadingDepFieldOptions: true,
+      dependentVariable: '',
+      // Reset outlier detection sourceIndex checks to default values if we've switched to regression
+      sourceIndexFieldsCheckFailed: false,
+      sourceIndexContainsNumericalFields: true,
+    });
     try {
       const indexPattern: IndexPattern = await kibanaContext.indexPatterns.get(
-        indexPatternsMap[sourceIndex]
+        indexPatternsMap[sourceIndex].value
       );
 
       if (indexPattern !== undefined) {
@@ -109,14 +135,43 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
         });
       }
     } catch (e) {
-      // TODO: ensure error messages show up correctly
       setFormState({ loadingDepFieldOptions: false, dependentVariableFetchFail: true });
     }
   };
 
+  const getSourceIndexErrorMessages = () => {
+    const errors = [];
+    if (!sourceIndexNameEmpty && !sourceIndexNameValid) {
+      errors.push(
+        <Fragment>
+          <FormattedMessage
+            id="xpack.ml.dataframe.analytics.create.sourceIndexInvalidError"
+            defaultMessage="Invalid source index name, it cannot contain spaces or the characters: {characterList}"
+            values={{ characterList }}
+          />
+        </Fragment>
+      );
+    }
+
+    if (sourceIndexFieldsCheckFailed === true) {
+      errors.push(
+        <Fragment>
+          <FormattedMessage
+            id="xpack.ml.dataframe.analytics.create.sourceIndexFieldCheckError"
+            defaultMessage="There was a problem checking for numerical fields. Please refresh the page and try again."
+          />
+        </Fragment>
+      );
+    }
+
+    return errors;
+  };
+
   useEffect(() => {
     if (jobType === JOB_TYPES.REGRESSION && sourceIndexNameEmpty === false) {
       loadDependentFieldOptions();
+    } else if (jobType === JOB_TYPES.OUTLIER_DETECTION && sourceIndexNameEmpty === false) {
+      validateSourceIndexFields();
     }
   }, [sourceIndex, jobType, sourceIndexNameEmpty]);
 
@@ -201,32 +256,20 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
               isInvalid={(!jobIdEmpty && !jobIdValid) || jobIdExists}
             />
           </EuiFormRow>
-          {/* TODO: Does the source index message below apply for regression jobs as well? Same for all validation messages below */}
           <EuiFormRow
             label={i18n.translate('xpack.ml.dataframe.analytics.create.sourceIndexLabel', {
               defaultMessage: 'Source index',
             })}
             helpText={
               !sourceIndexNameEmpty &&
-              !indexPatternsWithNumericFields.includes(sourceIndex) &&
+              !sourceIndexContainsNumericalFields &&
               i18n.translate('xpack.ml.dataframe.analytics.create.sourceIndexHelpText', {
                 defaultMessage:
                   'This index pattern does not contain any numeric type fields. The analytics job may not be able to come up with any outliers.',
               })
             }
             isInvalid={!sourceIndexNameEmpty && !sourceIndexNameValid}
-            error={
-              !sourceIndexNameEmpty &&
-              !sourceIndexNameValid && [
-                <Fragment>
-                  {i18n.translate('xpack.ml.dataframe.analytics.create.sourceIndexInvalidError', {
-                    defaultMessage:
-                      'Invalid source index name, it cannot contain spaces or the characters: {characterList}',
-                    values: { characterList },
-                  })}
-                </Fragment>,
-              ]
-            }
+            error={getSourceIndexErrorMessages()}
           >
             <Fragment>
               {!isJobCreated && (
@@ -238,9 +281,11 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
                     }
                   )}
                   singleSelection={{ asPlainText: true }}
-                  options={indexPatternTitles.sort().map(d => ({ label: d }))}
+                  options={Object.values(indexPatternsMap).sort((a, b) =>
+                    a.label.localeCompare(b.label)
+                  )}
                   selectedOptions={
-                    indexPatternTitles.includes(sourceIndex) ? [{ label: sourceIndex }] : []
+                    indexPatternsMap[sourceIndex] !== undefined ? [{ label: sourceIndex }] : []
                   }
                   onChange={selectedOptions =>
                     setFormState({ sourceIndex: selectedOptions[0].label || '' })
@@ -323,6 +368,17 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
                     defaultMessage: 'Dependent variable',
                   }
                 )}
+                helpText={
+                  dependentVariableOptions.length === 0 &&
+                  dependentVariableFetchFail === false &&
+                  !sourceIndexNameEmpty &&
+                  i18n.translate(
+                    'xpack.ml.dataframe.analytics.create.dependentVariableOptionsNoNumericalFields',
+                    {
+                      defaultMessage: 'No numeric type fields were found for this index pattern.',
+                    }
+                  )
+                }
                 error={
                   dependentVariableFetchFail === true && [
                     <Fragment>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/actions.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/actions.ts
index f9d11605b167aa..a763bd9639bf3e 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/actions.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/actions.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { FormMessage, State } from './state';
+import { FormMessage, State, SourceIndexMap } from './state';
 
 export enum ACTION {
   ADD_REQUEST_MESSAGE,
@@ -48,8 +48,7 @@ export type Action =
   | {
       type: ACTION.SET_INDEX_PATTERN_TITLES;
       payload: {
-        indexPatternTitles: State['indexPatternTitles'];
-        indexPatternsWithNumericFields: State['indexPatternsWithNumericFields'];
+        indexPatternsMap: SourceIndexMap;
       };
     }
   | { type: ACTION.SET_IS_JOB_CREATED; isJobCreated: State['isJobCreated'] }
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
index 135f29adf1baed..037ec95ec17ccb 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
@@ -61,9 +61,8 @@ export const validateAdvancedEditor = (state: State): State => {
   const destinationIndexName = idx(jobConfig, _ => _.dest.index) || '';
   const destinationIndexNameEmpty = destinationIndexName === '';
   const destinationIndexNameValid = isValidIndexName(destinationIndexName);
-  const destinationIndexPatternTitleExists = state.indexPatternTitles.some(
-    name => destinationIndexName === name
-  );
+  const destinationIndexPatternTitleExists =
+    state.indexPatternsMap[destinationIndexName] !== undefined;
 
   let dependentVariableEmpty = false;
   if (isRegressionAnalysis(jobConfig.analysis)) {
@@ -207,9 +206,8 @@ export function reducer(state: State, action: Action): State {
         );
         newFormState.destinationIndexNameEmpty = newFormState.destinationIndex === '';
         newFormState.destinationIndexNameValid = isValidIndexName(newFormState.destinationIndex);
-        newFormState.destinationIndexPatternTitleExists = state.indexPatternTitles.some(
-          name => newFormState.destinationIndex === name
-        );
+        newFormState.destinationIndexPatternTitleExists =
+          state.indexPatternsMap[newFormState.destinationIndex] !== undefined;
       }
 
       if (action.payload.jobId !== undefined) {
@@ -244,9 +242,8 @@ export function reducer(state: State, action: Action): State {
         ...state,
         ...action.payload,
       };
-      newState.form.destinationIndexPatternTitleExists = newState.indexPatternTitles.some(
-        name => newState.form.destinationIndex === name
-      );
+      newState.form.destinationIndexPatternTitleExists =
+        newState.indexPatternsMap[newState.form.destinationIndex] !== undefined;
       return newState;
     }
 
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
index cddc3577413cf3..bce0a800098fdc 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
@@ -16,6 +16,11 @@ export type EsIndexName = string;
 export type DependentVariable = string;
 export type IndexPatternTitle = string;
 export type AnalyticsJobType = JOB_TYPES | undefined;
+type IndexPatternId = string;
+export type SourceIndexMap = Record<
+  IndexPatternTitle,
+  { label: IndexPatternTitle; value: IndexPatternId }
+>;
 
 export interface FormMessage {
   error?: string;
@@ -50,13 +55,13 @@ export interface State {
     sourceIndex: EsIndexName;
     sourceIndexNameEmpty: boolean;
     sourceIndexNameValid: boolean;
+    sourceIndexContainsNumericalFields: boolean;
+    sourceIndexFieldsCheckFailed: boolean;
     trainingPercent: number;
   };
   disabled: boolean;
   indexNames: EsIndexName[];
-  indexPatternsMap: any; // TODO: update type
-  indexPatternTitles: IndexPatternTitle[];
-  indexPatternsWithNumericFields: IndexPatternTitle[];
+  indexPatternsMap: SourceIndexMap;
   isAdvancedEditorEnabled: boolean;
   isJobCreated: boolean;
   isJobStarted: boolean;
@@ -91,6 +96,8 @@ export const getInitialState = (): State => ({
     sourceIndex: '',
     sourceIndexNameEmpty: true,
     sourceIndexNameValid: false,
+    sourceIndexContainsNumericalFields: true,
+    sourceIndexFieldsCheckFailed: false,
     trainingPercent: 80,
   },
   jobConfig: {},
@@ -99,8 +106,6 @@ export const getInitialState = (): State => ({
     !checkPermission('canStartStopDataFrameAnalytics'),
   indexNames: [],
   indexPatternsMap: {},
-  indexPatternTitles: [],
-  indexPatternsWithNumericFields: [],
   isAdvancedEditorEnabled: false,
   isJobCreated: false,
   isJobStarted: false,
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
index 18db5bf2205c17..34451e2d22ddaa 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
@@ -7,7 +7,9 @@
 import { useReducer } from 'react';
 
 import { i18n } from '@kbn/i18n';
+import { idx } from '@kbn/elastic-idx';
 
+import { SimpleSavedObject } from 'src/core/public';
 import { ml } from '../../../../../services/ml_api_service';
 import { useKibanaContext } from '../../../../../contexts/kibana';
 
@@ -24,8 +26,8 @@ import {
   getJobConfigFromFormState,
   EsIndexName,
   FormMessage,
-  IndexPatternTitle,
   State,
+  SourceIndexMap,
 } from './state';
 
 export interface CreateAnalyticsFormProps {
@@ -33,9 +35,6 @@ export interface CreateAnalyticsFormProps {
   state: State;
 }
 
-// List of system fields we want to ignore for the numeric field check.
-const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
-
 export function getErrorMessage(error: any) {
   if (typeof error === 'object' && typeof error.message === 'string') {
     return error.message;
@@ -66,11 +65,8 @@ export const useCreateAnalyticsForm = () => {
   const setAdvancedEditorRawString = (advancedEditorRawString: string) =>
     dispatch({ type: ACTION.SET_ADVANCED_EDITOR_RAW_STRING, advancedEditorRawString });
 
-  const setIndexPatternTitles = (payload: {
-    indexPatternTitles: IndexPatternTitle[];
-    indexPatternsWithNumericFields: IndexPatternTitle[];
-    indexPatternsMap: any; // TODO: update this type
-  }) => dispatch({ type: ACTION.SET_INDEX_PATTERN_TITLES, payload });
+  const setIndexPatternTitles = (payload: { indexPatternsMap: SourceIndexMap }) =>
+    dispatch({ type: ACTION.SET_INDEX_PATTERN_TITLES, payload });
 
   const setIsJobCreated = (isJobCreated: boolean) =>
     dispatch({ type: ACTION.SET_IS_JOB_CREATED, isJobCreated });
@@ -230,31 +226,16 @@ export const useCreateAnalyticsForm = () => {
 
     try {
       // Set the index pattern titles which the user can choose as the source.
-      const indexPatternTitles = await kibanaContext.indexPatterns.getTitles(true);
-      // Find out which index patterns contain numeric fields.
-      // This will be used to provide a hint in the form that an analytics jobs is not
-      // able to identify outliers if there are no numeric fields present.
-      const ids = await kibanaContext.indexPatterns.getIds(true);
-      const indexPatternsWithNumericFields: IndexPatternTitle[] = [];
-      const indexPatternsMap = {}; // TODO: add type, add to state to keep track of
-      ids
-        .filter(f => !!f)
-        .forEach(async id => {
-          const indexPattern = await kibanaContext.indexPatterns.get(id!);
-          if (
-            indexPattern.fields
-              .filter(f => !OMIT_FIELDS.includes(f.name))
-              .map(f => f.type)
-              .includes('number')
-          ) {
-            indexPatternsWithNumericFields.push(indexPattern.title);
-            // @ts-ignore TODO: fix this type
-            indexPatternsMap[indexPattern.title] = id;
-          }
-        });
+      const indexPatternsMap: SourceIndexMap = {};
+      const savedObjects = (await kibanaContext.indexPatterns.getCache()) || [];
+      savedObjects.forEach((obj: SimpleSavedObject<Record<string, any>>) => {
+        const title = idx(obj, _ => _.attributes.title);
+        if (title !== undefined) {
+          const id = idx(obj, _ => _.id) || '';
+          indexPatternsMap[title] = { label: title, value: id };
+        }
+      });
       setIndexPatternTitles({
-        indexPatternTitles,
-        indexPatternsWithNumericFields,
         indexPatternsMap,
       });
     } catch (e) {
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/route.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/route.ts
index f5ad63e4229112..d3e9277b646c34 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/route.ts
+++ b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/route.ts
@@ -12,7 +12,6 @@ import { checkGetJobsPrivilege } from '../../../privilege/check_privilege';
 import {
   loadCurrentIndexPattern,
   loadCurrentSavedSearch,
-  loadIndexPatterns,
   // @ts-ignore
 } from '../../../util/index_utils';
 import { getDataFrameAnalyticsBreadcrumbs } from '../../breadcrumbs';
@@ -26,7 +25,6 @@ uiRoutes.when('/data_frame_analytics/?', {
     CheckLicense: checkFullLicense,
     privileges: checkGetJobsPrivilege,
     indexPattern: loadCurrentIndexPattern,
-    indexPatterns: loadIndexPatterns,
     savedSearch: loadCurrentSavedSearch,
   },
 });
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/about_panel/welcome_content.js b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/about_panel/welcome_content.js
index 28c616d3e74a64..5e9cd19ab388ad 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/about_panel/welcome_content.js
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/file_based/components/about_panel/welcome_content.js
@@ -133,7 +133,7 @@ export function WelcomeContent() {
               values={{
                 githubLink: (
                   <EuiLink
-                    href="https://github.com/elastic/kibana/issues/new"
+                    href="https://github.com/elastic/kibana/issues/new/choose"
                     target="_blank"
                   >
                     GitHub
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/actions_panel/actions_panel.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
index c8295a1e3d8db3..fca2508cb5d14a 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
@@ -64,7 +64,7 @@ export const ActionsPanel: FC<Props> = ({ indexPattern }) => {
         </EuiText>
         <EuiSpacer size="m" />
         <EuiFlexGroup gutterSize="l" responsive={true} wrap={true}>
-          <DataRecognizer indexPattern={indexPattern} results={recognizerResults}></DataRecognizer>
+          <DataRecognizer indexPattern={indexPattern} results={recognizerResults} />
         </EuiFlexGroup>
         <EuiSpacer size="l" />
       </div>
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/boolean_content.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/boolean_content.tsx
index ea5b1e81b8bf5c..d1edf8950d8123 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/boolean_content.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/boolean_content.tsx
@@ -28,9 +28,6 @@ function getPercentLabel(valueCount: number, totalCount: number): string {
 
 export const BooleanContent: FC<FieldDataCardProps> = ({ config }) => {
   const { stats } = config;
-  if (stats === undefined) {
-    return null;
-  }
 
   const { count, sampleCount, trueCount, falseCount } = stats;
   const docsPercent = roundToDecimalPlace((count / sampleCount) * 100);
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/date_content.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/date_content.tsx
index 24dbb4167c77a5..7e20df04448416 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/date_content.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/date_content.tsx
@@ -19,9 +19,6 @@ const TIME_FORMAT = 'MMM D YYYY, HH:mm:ss.SSS';
 
 export const DateContent: FC<FieldDataCardProps> = ({ config }) => {
   const { stats } = config;
-  if (stats === undefined) {
-    return null;
-  }
 
   const { count, sampleCount, earliest, latest } = stats;
   const docsPercent = roundToDecimalPlace((count / sampleCount) * 100);
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/document_count_content.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/document_count_content.tsx
index a50f49df2fcd64..e9297796c97c17 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/document_count_content.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/document_count_content.tsx
@@ -17,9 +17,6 @@ const CHART_HEIGHT = 350;
 
 export const DocumentCountContent: FC<FieldDataCardProps> = ({ config }) => {
   const { stats } = config;
-  if (stats === undefined) {
-    return null;
-  }
 
   const { documentCounts, timeRangeEarliest, timeRangeLatest } = stats;
 
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/geo_point_content.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/geo_point_content.tsx
index faf39d2e42373c..df8c0a2f09ebbc 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/geo_point_content.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/geo_point_content.tsx
@@ -36,9 +36,6 @@ export const GeoPointContent: FC<FieldDataCardProps> = ({ config }) => {
   // }
 
   const { stats } = config;
-  if (stats === undefined) {
-    return null;
-  }
 
   const { count, sampleCount, cardinality, examples } = stats;
   const docsPercent = roundToDecimalPlace((count / sampleCount) * 100);
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/ip_content.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/ip_content.tsx
index eeffd1e87153c3..e27808ceb9a279 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/ip_content.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/ip_content.tsx
@@ -18,9 +18,6 @@ import { TopValues } from '../top_values';
 
 export const IpContent: FC<FieldDataCardProps> = ({ config }) => {
   const { stats, fieldFormat } = config;
-  if (stats === undefined) {
-    return null;
-  }
 
   const { count, sampleCount, cardinality } = stats;
   const docsPercent = roundToDecimalPlace((count / sampleCount) * 100);
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/keyword_content.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/keyword_content.tsx
index 92b3848a925112..2fde41cf5d018b 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/keyword_content.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/keyword_content.tsx
@@ -18,9 +18,6 @@ import { TopValues } from '../top_values';
 
 export const KeywordContent: FC<FieldDataCardProps> = ({ config }) => {
   const { stats, fieldFormat } = config;
-  if (stats === undefined) {
-    return null;
-  }
 
   const { count, sampleCount, cardinality } = stats;
   const docsPercent = roundToDecimalPlace((count / sampleCount) * 100);
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/number_content.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/number_content.tsx
index b756818c775a44..8fdf826de25f49 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/number_content.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/number_content.tsx
@@ -34,9 +34,6 @@ const DEFAULT_TOP_VALUES_THRESHOLD = 100;
 
 export const NumberContent: FC<FieldDataCardProps> = ({ config }) => {
   const { stats, fieldFormat } = config;
-  if (stats === undefined) {
-    return null;
-  }
 
   useEffect(() => {
     const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH);
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/other_content.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/other_content.tsx
index b2728168425e86..92f389ff88a737 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/other_content.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/other_content.tsx
@@ -16,9 +16,6 @@ import { ExamplesList } from '../examples_list';
 
 export const OtherContent: FC<FieldDataCardProps> = ({ config }) => {
   const { stats, type, aggregatable } = config;
-  if (stats === undefined) {
-    return null;
-  }
 
   const { count, sampleCount, cardinality, examples } = stats;
   const docsPercent = roundToDecimalPlace((count / sampleCount) * 100);
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/text_content.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/text_content.tsx
index 81fff60960a8d2..e0e3ea3ff4888d 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/text_content.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/content_types/text_content.tsx
@@ -15,9 +15,6 @@ import { ExamplesList } from '../examples_list';
 
 export const TextContent: FC<FieldDataCardProps> = ({ config }) => {
   const { stats } = config;
-  if (stats === undefined) {
-    return null;
-  }
 
   const { examples } = stats;
   const numExamples = examples.length;
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/field_data_card.tsx b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/field_data_card.tsx
index a3641a143faa02..d162d166e8f6bb 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/field_data_card.tsx
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/components/field_data_card/field_data_card.tsx
@@ -30,7 +30,11 @@ export interface FieldDataCardProps {
 }
 
 export const FieldDataCard: FC<FieldDataCardProps> = ({ config }) => {
-  const { fieldName, loading, type, existsInDocs } = config;
+  const { fieldName, loading, type, existsInDocs, stats } = config;
+
+  if (stats === undefined) {
+    return null;
+  }
 
   function getCardContent() {
     if (existsInDocs === false) {
diff --git a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/data_loader/data_loader.ts b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/data_loader/data_loader.ts
index 464be8a9157aec..f0bb998a276145 100644
--- a/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/data_loader/data_loader.ts
+++ b/x-pack/legacy/plugins/ml/public/datavisualizer/index_based/data_loader/data_loader.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore
-import { decorateQuery, luceneStringToDsl } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 
 import { toastNotifications } from 'ui/notify';
diff --git a/x-pack/legacy/plugins/ml/public/explorer/explorer.js b/x-pack/legacy/plugins/ml/public/explorer/explorer.js
index 694e61db0583e2..1acdd041c40522 100644
--- a/x-pack/legacy/plugins/ml/public/explorer/explorer.js
+++ b/x-pack/legacy/plugins/ml/public/explorer/explorer.js
@@ -1169,8 +1169,9 @@ export const Explorer = injectI18n(injectObservablesAsProps(
 
       return (
         <ExplorerPage jobSelectorProps={jobSelectorProps}>
-          <ChartTooltip />
           <div className="results-container">
+            {/* Make sure ChartTooltip is inside this plain wrapping div so positioning can be infered correctly. */}
+            <ChartTooltip />
 
             {noInfluencersConfigured === false &&
             influencers !== undefined &&
diff --git a/x-pack/legacy/plugins/ml/public/explorer/explorer_charts/explorer_chart_distribution.js b/x-pack/legacy/plugins/ml/public/explorer/explorer_charts/explorer_chart_distribution.js
index 82a4744f6aec80..588c3e3d6f1e9f 100644
--- a/x-pack/legacy/plugins/ml/public/explorer/explorer_charts/explorer_chart_distribution.js
+++ b/x-pack/legacy/plugins/ml/public/explorer/explorer_charts/explorer_chart_distribution.js
@@ -498,8 +498,8 @@ export const ExplorerChartDistribution = injectI18n(class ExplorerChartDistribut
       }
 
       mlChartTooltipService.show(tooltipData, circle, {
-        x: LINE_CHART_ANOMALY_RADIUS * 2,
-        y: 0
+        x: LINE_CHART_ANOMALY_RADIUS * 3,
+        y: LINE_CHART_ANOMALY_RADIUS * 2,
       });
     }
   }
diff --git a/x-pack/legacy/plugins/ml/public/explorer/explorer_charts/explorer_chart_single_metric.js b/x-pack/legacy/plugins/ml/public/explorer/explorer_charts/explorer_chart_single_metric.js
index 2d991172ed345b..be85af5a70c403 100644
--- a/x-pack/legacy/plugins/ml/public/explorer/explorer_charts/explorer_chart_single_metric.js
+++ b/x-pack/legacy/plugins/ml/public/explorer/explorer_charts/explorer_chart_single_metric.js
@@ -444,8 +444,8 @@ export const ExplorerChartSingleMetric = injectI18n(class ExplorerChartSingleMet
       }
 
       mlChartTooltipService.show(tooltipData, circle, {
-        x: LINE_CHART_ANOMALY_RADIUS * 2,
-        y: 0
+        x: LINE_CHART_ANOMALY_RADIUS * 3,
+        y: LINE_CHART_ANOMALY_RADIUS * 2,
       });
     }
   }
diff --git a/x-pack/legacy/plugins/ml/public/explorer/explorer_swimlane.js b/x-pack/legacy/plugins/ml/public/explorer/explorer_swimlane.js
index d49a1dc0523c4c..2ee725b6fda865 100644
--- a/x-pack/legacy/plugins/ml/public/explorer/explorer_swimlane.js
+++ b/x-pack/legacy/plugins/ml/public/explorer/explorer_swimlane.js
@@ -325,10 +325,10 @@ export const ExplorerSwimlane = injectI18n(class ExplorerSwimlane extends React.
         yAccessor: 'anomaly_score'
       });
 
-      const offsets = (target.className === 'sl-cell-inner' ? { x: 0, y: 0 } : { x: 2, y: 1 });
+      const offsets = (target.className === 'sl-cell-inner' ? { x: 6, y: 0 } : { x: 8, y: 1 });
       mlChartTooltipService.show(tooltipData, target, {
-        x: target.offsetWidth - offsets.x,
-        y: 10 + offsets.y
+        x: target.offsetWidth + offsets.x,
+        y: 6 + offsets.y
       });
     }
 
@@ -364,7 +364,7 @@ export const ExplorerSwimlane = injectI18n(class ExplorerSwimlane extends React.
             .on('mouseover', label => {
               mlChartTooltipService.show([{ skipHeader: true }, { name: swimlaneData.fieldName, value: label }], this, {
                 x: laneLabelWidth,
-                y: 8
+                y: 0
               });
             })
             .on('mouseout', () => {
diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/ml_job_editor/ml_job_editor.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/ml_job_editor/ml_job_editor.js
index 22d45a70075e9e..39cd21688dec50 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/ml_job_editor/ml_job_editor.js
+++ b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/ml_job_editor/ml_job_editor.js
@@ -21,6 +21,7 @@ export function MLJobEditor({
   mode = EDITOR_MODE.JSON,
   readOnly = false,
   syntaxChecking = true,
+  theme = 'textmate',
   onChange = () => {}
 }) {
   return (
@@ -32,6 +33,7 @@ export function MLJobEditor({
       readOnly={readOnly}
       wrapEnabled={true}
       showPrintMargin={false}
+      theme={theme}
       editorProps={{ $blockScrolling: true }}
       setOptions={{
         useWorker: syntaxChecking,
@@ -48,5 +50,7 @@ MLJobEditor.propTypes = {
   width: PropTypes.string,
   mode: PropTypes.string,
   readOnly: PropTypes.bool,
+  syntaxChecking: PropTypes.bool,
+  theme: PropTypes.string,
   onChange: PropTypes.func,
 };
diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/start_datafeed_modal.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/start_datafeed_modal.js
index 133adea7cff6e5..0c356959cd2af8 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/start_datafeed_modal.js
+++ b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/start_datafeed_modal.js
@@ -136,6 +136,7 @@ export class StartDatafeedModal extends Component {
             onClose={this.closeModal}
             style={{ width: '850px' }}
             maxWidth={false}
+            data-test-subj="mlStartDatafeedModal"
           >
             <EuiModalHeader>
               <EuiModalHeaderTitle>
@@ -178,6 +179,7 @@ export class StartDatafeedModal extends Component {
             <EuiModalFooter>
               <EuiButtonEmpty
                 onClick={this.closeModal}
+                data-test-subj="mlStartDatafeedModalCancelButton"
               >
                 <FormattedMessage
                   id="xpack.ml.jobsList.startDatafeedModal.cancelButtonLabel"
@@ -189,6 +191,7 @@ export class StartDatafeedModal extends Component {
                 onClick={this.save}
                 isDisabled={startDisabled}
                 fill
+                data-test-subj="mlStartDatafeedModalStartButton"
               >
                 <FormattedMessage
                   id="xpack.ml.jobsList.startDatafeedModal.startButtonLabel"
diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/time_range_selector/time_range_selector.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/time_range_selector/time_range_selector.js
index d7b2b5ddf18ea8..6142ddc78bd2f8 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/time_range_selector/time_range_selector.js
+++ b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/time_range_selector/time_range_selector.js
@@ -198,7 +198,7 @@ function TabStack({ title, items, switchState, switchFunc }) {
 
             return (
               <li key={i} className={className} >
-                <a onClick={() => switchFunc(item.index)}>{item.label}</a>
+                <a onClick={() => switchFunc(item.index)} onKeyUp={() => {}} >{item.label}</a>
                 {(item.body !== undefined) &&
                   <div className="body">
                     {item.body}
diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/utils.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/utils.js
index 3344d2d4ad4a5c..08c8993585da24 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/utils.js
+++ b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/utils.js
@@ -178,7 +178,7 @@ export function cloneJob(jobId) {
           mlJobService.tempJobCloningObjects.end = end;
         }
       } else {
-        // otherwise use the currentJob
+        // otherwise use the tempJobCloningObjects
         mlJobService.tempJobCloningObjects.job = job;
       }
       window.location.href = '#/jobs/new_job';
@@ -284,13 +284,13 @@ export function filterJobs(jobs, clauses) {
   return filteredJobs;
 }
 
-// check to see if a job has been stored in mlJobService.currentJob
+// check to see if a job has been stored in mlJobService.tempJobCloningObjects
 // if it has, return an object with the minimum properties needed for the
 // start datafeed modal.
 export function checkForAutoStartDatafeed() {
-  const job = mlJobService.currentJob;
+  const job = mlJobService.tempJobCloningObjects.job;
   if (job !== undefined) {
-    mlJobService.currentJob = undefined;
+    mlJobService.tempJobCloningObjects.job = undefined;
     const hasDatafeed = (typeof job.datafeed_config === 'object' && Object.keys(job.datafeed_config).length > 0);
     const datafeedId = hasDatafeed ? job.datafeed_config.datafeed_id : '';
     return {
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/advanced_job_creator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/advanced_job_creator.ts
index 4b79264779fe78..54e704767b9928 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/advanced_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/advanced_job_creator.ts
@@ -9,7 +9,7 @@ import { IndexPattern } from 'ui/index_patterns';
 
 import { JobCreator } from './job_creator';
 import { Field, Aggregation, SplitField } from '../../../../../common/types/fields';
-import { Job, Datafeed, Detector } from './configs';
+import { Job, Datafeed, Detector, CustomRule } from './configs';
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE } from './util/constants';
 import { getRichDetectors } from './util/general';
@@ -24,6 +24,7 @@ export interface RichDetector {
   partitionField: SplitField;
   excludeFrequent: string | null;
   description: string | null;
+  customRules: CustomRule[] | null;
 }
 
 export class AdvancedJobCreator extends JobCreator {
@@ -31,7 +32,6 @@ export class AdvancedJobCreator extends JobCreator {
   private _richDetectors: RichDetector[] = [];
   private _queryString: string;
 
-  // TODO - remove constructor if it isn't needed
   constructor(indexPattern: IndexPattern, savedSearch: SavedSearch, query: object) {
     super(indexPattern, savedSearch, query);
 
@@ -47,6 +47,9 @@ export class AdvancedJobCreator extends JobCreator {
     excludeFrequent: string | null,
     description: string | null
   ) {
+    // addDetector doesn't support adding new custom rules.
+    // this will be added in the future once it's supported in the UI
+    const customRules = null;
     const { detector, richDetector } = this._createDetector(
       agg,
       field,
@@ -54,7 +57,8 @@ export class AdvancedJobCreator extends JobCreator {
       overField,
       partitionField,
       excludeFrequent,
-      description
+      description,
+      customRules
     );
 
     this._addDetector(detector, agg, field);
@@ -71,6 +75,9 @@ export class AdvancedJobCreator extends JobCreator {
     description: string | null,
     index: number
   ) {
+    const customRules =
+      this._detectors[index] !== undefined ? this._detectors[index].custom_rules || null : null;
+
     const { detector, richDetector } = this._createDetector(
       agg,
       field,
@@ -78,7 +85,8 @@ export class AdvancedJobCreator extends JobCreator {
       overField,
       partitionField,
       excludeFrequent,
-      description
+      description,
+      customRules
     );
 
     this._editDetector(detector, agg, field, index);
@@ -95,7 +103,8 @@ export class AdvancedJobCreator extends JobCreator {
     overField: SplitField,
     partitionField: SplitField,
     excludeFrequent: string | null,
-    description: string | null
+    description: string | null,
+    customRules: CustomRule[] | null
   ): { detector: Detector; richDetector: RichDetector } {
     const detector: Detector = createBasicDetector(agg, field);
 
@@ -114,6 +123,9 @@ export class AdvancedJobCreator extends JobCreator {
     if (description !== null) {
       detector.detector_description = description;
     }
+    if (customRules !== null) {
+      detector.custom_rules = customRules;
+    }
 
     const richDetector: RichDetector = {
       agg,
@@ -123,6 +135,7 @@ export class AdvancedJobCreator extends JobCreator {
       partitionField,
       excludeFrequent,
       description,
+      customRules,
     };
 
     return { detector, richDetector };
@@ -166,7 +179,10 @@ export class AdvancedJobCreator extends JobCreator {
 
   public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
     this._overrideConfigs(job, datafeed);
-    const detectors = getRichDetectors(job, datafeed, true);
+    const detectors = getRichDetectors(job, datafeed, this.scriptFields, true);
+
+    // keep track of the custom rules for each detector
+    const customRules = this._detectors.map(d => d.custom_rules);
 
     this.removeAllDetectors();
     this._richDetectors.length = 0;
@@ -185,5 +201,12 @@ export class AdvancedJobCreator extends JobCreator {
         );
       }
     });
+
+    // re-apply custom rules
+    customRules.forEach((cr, i) => {
+      if (cr !== undefined) {
+        this._detectors[i].custom_rules = cr;
+      }
+    });
   }
 }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/job_creator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/job_creator.ts
index ee6f30ca4f0d38..aa16da08e3a3ad 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/job_creator.ts
@@ -8,6 +8,7 @@ import { SavedSearch } from 'src/legacy/core_plugins/kibana/public/discover/type
 import { IndexPattern } from 'ui/index_patterns';
 import { IndexPatternTitle } from '../../../../../common/types/kibana';
 import { ML_JOB_AGGREGATION } from '../../../../../common/constants/aggregation_types';
+import { ES_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/common';
 import { Job, Datafeed, Detector, JobId, DatafeedId, BucketSpan } from './configs';
 import { Aggregation, Field } from '../../../../../common/types/fields';
 import { createEmptyJob, createEmptyDatafeed } from './util/default_configs';
@@ -33,6 +34,7 @@ export class JobCreator {
   protected _subscribers: ProgressSubscriber[] = [];
   protected _aggs: Aggregation[] = [];
   protected _fields: Field[] = [];
+  protected _scriptFields: Field[] = [];
   protected _sparseData: boolean = false;
   private _stopAllRefreshPolls: {
     stop: boolean;
@@ -413,6 +415,14 @@ export class JobCreator {
     }
   }
 
+  public get indices(): string[] {
+    return this._datafeed_config.indices;
+  }
+
+  public get scriptFields(): Field[] {
+    return this._scriptFields;
+  }
+
   public get subscribers(): ProgressSubscriber[] {
     return this._subscribers;
   }
@@ -549,5 +559,16 @@ export class JobCreator {
       this.useDedicatedIndex = true;
     }
     this._sparseData = isSparseDataJob(job, datafeed);
+
+    if (this._datafeed_config.script_fields !== undefined) {
+      this._scriptFields = Object.keys(this._datafeed_config.script_fields).map(f => ({
+        id: f,
+        name: f,
+        type: ES_FIELD_TYPES.KEYWORD,
+        aggregatable: true,
+      }));
+    } else {
+      this._scriptFields = [];
+    }
   }
 }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/multi_metric_job_creator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/multi_metric_job_creator.ts
index 39958b6d8f0842..05a253a0962e9a 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/multi_metric_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/multi_metric_job_creator.ts
@@ -141,7 +141,7 @@ export class MultiMetricJobCreator extends JobCreator {
   public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
     this._overrideConfigs(job, datafeed);
     this.createdBy = CREATED_BY_LABEL.MULTI_METRIC;
-    const detectors = getRichDetectors(job, datafeed, false);
+    const detectors = getRichDetectors(job, datafeed, this.scriptFields, false);
 
     if (datafeed.aggregations !== undefined) {
       // if we've converting from a single metric job,
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/population_job_creator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/population_job_creator.ts
index 89611743a4404e..ac7161422628de 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/population_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/population_job_creator.ts
@@ -126,7 +126,7 @@ export class PopulationJobCreator extends JobCreator {
   public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
     this._overrideConfigs(job, datafeed);
     this.createdBy = CREATED_BY_LABEL.POPULATION;
-    const detectors = getRichDetectors(job, datafeed, false);
+    const detectors = getRichDetectors(job, datafeed, this.scriptFields, false);
 
     this.removeAllDetectors();
 
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/single_metric_job_creator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/single_metric_job_creator.ts
index 5c5b7bfe712a3e..aba3b08f330e84 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/single_metric_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/single_metric_job_creator.ts
@@ -186,7 +186,7 @@ export class SingleMetricJobCreator extends JobCreator {
   public cloneFromExistingJob(job: Job, datafeed: Datafeed) {
     this._overrideConfigs(job, datafeed);
     this.createdBy = CREATED_BY_LABEL.SINGLE_METRIC;
-    const detectors = getRichDetectors(job, datafeed, false);
+    const detectors = getRichDetectors(job, datafeed, this.scriptFields, false);
 
     this.removeAllDetectors();
 
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/util/general.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/util/general.ts
index 7178f637f6ebca..71535ab98c74f7 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/util/general.ts
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/util/general.ts
@@ -11,32 +11,98 @@ import {
   ML_JOB_AGGREGATION,
   SPARSE_DATA_AGGREGATIONS,
 } from '../../../../../../common/constants/aggregation_types';
-import { EVENT_RATE_FIELD_ID, AggFieldPair } from '../../../../../../common/types/fields';
+import { MLCATEGORY } from '../../../../../../common/constants/field_types';
+import {
+  EVENT_RATE_FIELD_ID,
+  Field,
+  AggFieldPair,
+  mlCategory,
+} from '../../../../../../common/types/fields';
 import { mlJobService } from '../../../../../services/job_service';
 import { JobCreatorType, isMultiMetricJobCreator, isPopulationJobCreator } from '../';
 import { CREATED_BY_LABEL, JOB_TYPE } from './constants';
 
+const getFieldByIdFactory = (scriptFields: Field[]) => (id: string) => {
+  let field = newJobCapsService.getFieldById(id);
+  // if no field could be found it may be a pretend field, like mlcategory or a script field
+  if (field === null) {
+    if (id === MLCATEGORY) {
+      field = mlCategory;
+    } else if (scriptFields.length) {
+      field = scriptFields.find(f => f.id === id) || null;
+    }
+  }
+  return field;
+};
+
 // populate the detectors with Field and Agg objects loaded from the job capabilities service
-export function getRichDetectors(job: Job, datafeed: Datafeed, advanced: boolean = false) {
+export function getRichDetectors(
+  job: Job,
+  datafeed: Datafeed,
+  scriptFields: Field[],
+  advanced: boolean = false
+) {
   const detectors = advanced ? getDetectorsAdvanced(job, datafeed) : getDetectors(job, datafeed);
+
+  const getFieldById = getFieldByIdFactory(scriptFields);
+
   return detectors.map(d => {
+    let field = null;
+    let byField = null;
+    let overField = null;
+    let partitionField = null;
+
+    if (d.field_name !== undefined) {
+      field = getFieldById(d.field_name);
+    }
+    if (d.by_field_name !== undefined) {
+      byField = getFieldById(d.by_field_name);
+    }
+    if (d.over_field_name !== undefined) {
+      overField = getFieldById(d.over_field_name);
+    }
+    if (d.partition_field_name !== undefined) {
+      partitionField = getFieldById(d.partition_field_name);
+    }
+
     return {
       agg: newJobCapsService.getAggById(d.function),
-      field: d.field_name !== undefined ? newJobCapsService.getFieldById(d.field_name) : null,
-      byField:
-        d.by_field_name !== undefined ? newJobCapsService.getFieldById(d.by_field_name) : null,
-      overField:
-        d.over_field_name !== undefined ? newJobCapsService.getFieldById(d.over_field_name) : null,
-      partitionField:
-        d.partition_field_name !== undefined
-          ? newJobCapsService.getFieldById(d.partition_field_name)
-          : null,
+      field,
+      byField,
+      overField,
+      partitionField,
       excludeFrequent: d.exclude_frequent || null,
       description: d.detector_description || null,
     };
   });
 }
 
+export function createFieldOptions(fields: Field[]) {
+  return fields
+    .filter(f => f.id !== EVENT_RATE_FIELD_ID)
+    .map(f => ({
+      label: f.name,
+    }))
+    .sort((a, b) => a.label.localeCompare(b.label));
+}
+
+export function createScriptFieldOptions(scriptFields: Field[]) {
+  return scriptFields.map(f => ({
+    label: f.id,
+  }));
+}
+
+export function createMlcategoryFieldOption(categorizationFieldName: string | null) {
+  if (categorizationFieldName === null) {
+    return [];
+  }
+  return [
+    {
+      label: MLCATEGORY,
+    },
+  ];
+}
+
 function getDetectorsAdvanced(job: Job, datafeed: Datafeed) {
   return processFieldlessAggs(job.analysis_config.detectors);
 }
@@ -146,33 +212,29 @@ export function isSparseDataJob(job: Job, datafeed: Datafeed): boolean {
 function stashCombinedJob(
   jobCreator: JobCreatorType,
   skipTimeRangeStep: boolean = false,
-  advanced: boolean = false,
   includeTimeRange: boolean = false
 ) {
   const combinedJob = {
     ...jobCreator.jobConfig,
     datafeed_config: jobCreator.datafeedConfig,
   };
-  if (advanced === true) {
-    mlJobService.currentJob = combinedJob;
-  } else {
-    mlJobService.tempJobCloningObjects.job = combinedJob;
 
-    // skip over the time picker step of the wizard
-    mlJobService.tempJobCloningObjects.skipTimeRangeStep = skipTimeRangeStep;
+  mlJobService.tempJobCloningObjects.job = combinedJob;
 
-    if (includeTimeRange === true) {
-      // auto select the start and end dates of the time picker
-      mlJobService.tempJobCloningObjects.start = jobCreator.start;
-      mlJobService.tempJobCloningObjects.end = jobCreator.end;
-    }
+  // skip over the time picker step of the wizard
+  mlJobService.tempJobCloningObjects.skipTimeRangeStep = skipTimeRangeStep;
+
+  if (includeTimeRange === true) {
+    // auto select the start and end dates of the time picker
+    mlJobService.tempJobCloningObjects.start = jobCreator.start;
+    mlJobService.tempJobCloningObjects.end = jobCreator.end;
   }
 }
 
 export function convertToMultiMetricJob(jobCreator: JobCreatorType) {
   jobCreator.createdBy = CREATED_BY_LABEL.MULTI_METRIC;
   jobCreator.modelPlot = false;
-  stashCombinedJob(jobCreator, true, false, true);
+  stashCombinedJob(jobCreator, true, true);
 
   window.location.href = window.location.href.replace(
     JOB_TYPE.SINGLE_METRIC,
@@ -182,7 +244,7 @@ export function convertToMultiMetricJob(jobCreator: JobCreatorType) {
 
 export function convertToAdvancedJob(jobCreator: JobCreatorType) {
   jobCreator.createdBy = null;
-  stashCombinedJob(jobCreator, true, false, false);
+  stashCombinedJob(jobCreator, true, true);
 
   let jobType = JOB_TYPE.SINGLE_METRIC;
   if (isMultiMetricJobCreator(jobCreator)) {
@@ -196,13 +258,13 @@ export function convertToAdvancedJob(jobCreator: JobCreatorType) {
 
 export function resetJob(jobCreator: JobCreatorType) {
   jobCreator.jobId = '';
-  stashCombinedJob(jobCreator, true, false, true);
+  stashCombinedJob(jobCreator, true, true);
 
   window.location.href = '#/jobs/new_job';
 }
 
 export function advancedStartDatafeed(jobCreator: JobCreatorType) {
-  stashCombinedJob(jobCreator, false, true, false);
+  stashCombinedJob(jobCreator, false, false);
   window.location.href = '#/jobs';
 }
 
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/common/json_editor_flyout/json_editor_flyout.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/common/json_editor_flyout/json_editor_flyout.tsx
index 8a14a92f868431..cf26d6f532d0db 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/common/json_editor_flyout/json_editor_flyout.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/common/json_editor_flyout/json_editor_flyout.tsx
@@ -18,7 +18,7 @@ import {
   EuiFlyoutBody,
   EuiSpacer,
 } from '@elastic/eui';
-import { Job, Datafeed } from '../../../../common/job_creator/configs';
+import { Datafeed } from '../../../../common/job_creator/configs';
 import { MLJobEditor } from '../../../../../jobs_list/components/ml_job_editor';
 import { isValidJson } from '../../../../../../../common/util/validation_utils';
 import { JobCreatorContext } from '../../job_creator_context';
@@ -52,26 +52,32 @@ export const JsonEditorFlyout: FC<Props> = ({ isDisabled, jobEditorMode, datafee
   const editJsonMode =
     jobEditorMode === EDITOR_MODE.HIDDEN || datafeedEditorMode === EDITOR_MODE.HIDDEN;
   const flyOutSize = editJsonMode ? 'm' : 'l';
+  const readOnlyMode =
+    jobEditorMode === EDITOR_MODE.READONLY && datafeedEditorMode === EDITOR_MODE.READONLY;
 
   function toggleJsonFlyout() {
     setSaveable(false);
     setShowJsonFlyout(!showJsonFlyout);
   }
 
-  function updateSavable(json: string, originalConfig: Job | Datafeed) {
+  function onJobChange(json: string) {
+    setJobConfigString(json);
     const valid = isValidJson(json);
     setSaveable(valid);
   }
 
-  function onJobChange(json: string) {
-    setJobConfigString(json);
-
-    updateSavable(json, jobCreator.jobConfig);
-  }
   function onDatafeedChange(json: string) {
     setDatafeedConfigString(json);
-
-    updateSavable(json, jobCreator.datafeedConfig);
+    let valid = isValidJson(json);
+    if (valid) {
+      // ensure that the user hasn't altered the indices list in the json.
+      const { indices }: Datafeed = JSON.parse(json);
+      const originalIndices = jobCreator.indices.sort();
+      valid =
+        originalIndices.length === indices.length &&
+        originalIndices.every((value, index) => value === indices[index]);
+    }
+    setSaveable(valid);
   }
 
   function onSave() {
@@ -130,14 +136,16 @@ export const JsonEditorFlyout: FC<Props> = ({ isDisabled, jobEditorMode, datafee
                   />
                 </EuiButtonEmpty>
               </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiButton onClick={onSave} fill isDisabled={saveable === false}>
-                  <FormattedMessage
-                    id="xpack.ml.newJob.wizard.jsonFlyout.saveButton"
-                    defaultMessage="Save"
-                  />
-                </EuiButton>
-              </EuiFlexItem>
+              {readOnlyMode === false && (
+                <EuiFlexItem grow={false}>
+                  <EuiButton onClick={onSave} fill isDisabled={saveable === false}>
+                    <FormattedMessage
+                      id="xpack.ml.newJob.wizard.jsonFlyout.saveButton"
+                      defaultMessage="Save"
+                    />
+                  </EuiButton>
+                </EuiFlexItem>
+              )}
             </EuiFlexGroup>
           </EuiFlyoutFooter>
         </EuiFlyout>
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/time_field/time_field.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/time_field/time_field.tsx
index 71e48a7afb3593..86005dd140fedd 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/time_field/time_field.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/time_field/time_field.tsx
@@ -15,7 +15,7 @@ import { Description } from './description';
 export const TimeField: FC = () => {
   const { jobCreator: jc, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
   const jobCreator = jc as AdvancedJobCreator;
-  const { fields } = newJobCapsService;
+  const { dateFields } = newJobCapsService;
   const [timeFieldName, setTimeFieldName] = useState(jobCreator.timeFieldName);
 
   useEffect(() => {
@@ -30,7 +30,7 @@ export const TimeField: FC = () => {
   return (
     <Description>
       <TimeFieldSelect
-        fields={fields}
+        fields={dateFields}
         changeHandler={setTimeFieldName}
         selectedField={timeFieldName}
       />
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/time_field/time_field_select.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/time_field/time_field_select.tsx
index 26508e13e7157f..3b1993f8e2c7e5 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/time_field/time_field_select.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/time_field/time_field_select.tsx
@@ -7,8 +7,8 @@
 import React, { FC } from 'react';
 import { EuiComboBox, EuiComboBoxOptionProps } from '@elastic/eui';
 
-import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../../../src/plugins/data/public';
+import { Field } from '../../../../../../../../common/types/fields';
+import { createFieldOptions } from '../../../../../common/job_creator/util/general';
 
 interface Props {
   fields: Field[];
@@ -17,18 +17,12 @@ interface Props {
 }
 
 export const TimeFieldSelect: FC<Props> = ({ fields, changeHandler, selectedField }) => {
-  const options: EuiComboBoxOptionProps[] = fields
-    .filter(f => f.id !== EVENT_RATE_FIELD_ID && f.type === ES_FIELD_TYPES.DATE)
-    .map(f => ({
-      label: f.name,
-    }))
-    .sort((a, b) => a.label.localeCompare(b.label));
+  const options: EuiComboBoxOptionProps[] = createFieldOptions(fields);
 
-  const selection: EuiComboBoxOptionProps[] = [
-    {
-      label: selectedField !== null ? selectedField : '',
-    },
-  ];
+  const selection: EuiComboBoxOptionProps[] = [];
+  if (selectedField !== null) {
+    selection.push({ label: selectedField });
+  }
 
   function onChange(selectedOptions: EuiComboBoxOptionProps[]) {
     const option = selectedOptions[0];
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/datafeed.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/datafeed.tsx
index 7490f05e433cfc..7e895ca2068495 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/datafeed.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/datafeed.tsx
@@ -37,7 +37,7 @@ export const DatafeedStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep }) =
       {isCurrentStep && (
         <Fragment>
           <EuiFlexGroup gutterSize="xl">
-            <EuiFlexItem>
+            <EuiFlexItem data-test-subj="mlAdvancedDatafeedQueryEditor">
               <QueryInput setIsValidQuery={setIsValidQuery} />
             </EuiFlexItem>
             <EuiFlexItem>
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/job_details_step/components/additional_section/additional_section.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/job_details_step/components/additional_section/additional_section.tsx
index 4efac7b9ebf1ae..ac2d57ea7c8a92 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/job_details_step/components/additional_section/additional_section.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/job_details_step/components/additional_section/additional_section.tsx
@@ -31,7 +31,7 @@ export const AdditionalSection: FC<Props> = ({ additionalExpanded, setAdditional
           <EuiFlexItem>
             <CalendarsSelection />
           </EuiFlexItem>
-          <EuiFlexItem></EuiFlexItem>
+          <EuiFlexItem />
         </EuiFlexGroup>
       </EuiAccordion>
     </Fragment>
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
index 142de85e97565f..5f93361982ea0d 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
@@ -15,16 +15,20 @@ import {
   EuiTextArea,
 } from '@elastic/eui';
 import { JobCreatorContext } from '../../../job_creator_context';
-import { AdvancedJobCreator, JobCreatorType } from '../../../../../common/job_creator';
+import { AdvancedJobCreator } from '../../../../../common/job_creator';
+import {
+  createFieldOptions,
+  createScriptFieldOptions,
+  createMlcategoryFieldOption,
+} from '../../../../../common/job_creator/util/general';
 import {
   Field,
   Aggregation,
   EVENT_RATE_FIELD_ID,
+  mlCategory,
 } from '../../../../../../../../common/types/fields';
 import { RichDetector } from '../../../../../common/job_creator/advanced_job_creator';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../../../src/plugins/data/public';
 import { ModalWrapper } from './modal_wrapper';
-import { MLCATEGORY } from '../../../../../../../../common/constants/field_types';
 import { detectorToString } from '../../../../../../../util/string_utils';
 import { createBasicDetector } from '../../../../../common/job_creator/util/default_configs';
 
@@ -55,13 +59,6 @@ const emptyOption: EuiComboBoxOptionProps = {
   label: '',
 };
 
-const mlCategory: Field = {
-  id: MLCATEGORY,
-  name: MLCATEGORY,
-  type: ES_FIELD_TYPES.KEYWORD,
-  aggregatable: false,
-};
-
 const excludeFrequentOptions: EuiComboBoxOptionProps[] = [{ label: 'all' }, { label: 'none' }];
 
 export const AdvancedDetectorModal: FC<Props> = ({
@@ -86,24 +83,33 @@ export const AdvancedDetectorModal: FC<Props> = ({
     createExcludeFrequentOption(detector.excludeFrequent)
   );
   const [descriptionOption, setDescriptionOption] = useState(detector.description || '');
-  const [fieldsEnabled, setFieldsEnabled] = useState(true);
+  const [splitFieldsEnabled, setSplitFieldsEnabled] = useState(true);
   const [excludeFrequentEnabled, setExcludeFrequentEnabled] = useState(true);
   const [fieldOptionEnabled, setFieldOptionEnabled] = useState(true);
   const { descriptionPlaceholder, setDescriptionPlaceholder } = useDetectorPlaceholder(detector);
 
-  // list of aggregation combobox options. filtering out any aggs with no fields.
+  const usingScriptFields = jobCreator.scriptFields.length > 0;
+  // list of aggregation combobox options.
+
   const aggOptions: EuiComboBoxOptionProps[] = aggs
-    .filter(a => a.fields !== undefined && a.fields.length)
+    .filter(agg => filterAggs(agg, usingScriptFields))
     .map(createAggOption);
 
   // fields available for the selected agg
-  const { currentFieldOptions, setCurrentFieldOptions } = useCurrentFieldOptions(detector.agg);
+  const { currentFieldOptions, setCurrentFieldOptions } = useCurrentFieldOptions(
+    detector.agg,
+    jobCreator.scriptFields
+  );
 
-  const allFieldOptions: EuiComboBoxOptionProps[] = fields
-    .filter(f => f.id !== EVENT_RATE_FIELD_ID)
-    .map(createFieldOption);
+  const allFieldOptions: EuiComboBoxOptionProps[] = [
+    ...createFieldOptions(fields),
+    ...createScriptFieldOptions(jobCreator.scriptFields),
+  ].sort(comboBoxOptionsSort);
 
-  const splitFieldOptions = [...allFieldOptions, ...createMlcategoryField(jobCreator)];
+  const splitFieldOptions: EuiComboBoxOptionProps[] = [
+    ...allFieldOptions,
+    ...createMlcategoryFieldOption(jobCreator.categorizationFieldName),
+  ].sort(comboBoxOptionsSort);
 
   const eventRateField = fields.find(f => f.id === EVENT_RATE_FIELD_ID);
 
@@ -120,7 +126,9 @@ export const AdvancedDetectorModal: FC<Props> = ({
     if (title === mlCategory.id) {
       return mlCategory;
     }
-    return fields.find(a => a.id === title) || null;
+    return (
+      fields.find(f => f.id === title) || jobCreator.scriptFields.find(f => f.id === title) || null
+    );
   }
 
   useEffect(() => {
@@ -131,20 +139,22 @@ export const AdvancedDetectorModal: FC<Props> = ({
     const partitionField = getField(partitionFieldOption.label);
 
     if (agg !== null) {
-      setFieldsEnabled(true);
       setCurrentFieldOptions(agg);
 
       if (isFieldlessAgg(agg) && eventRateField !== undefined) {
+        setSplitFieldsEnabled(true);
         setFieldOption(emptyOption);
         setFieldOptionEnabled(false);
         field = eventRateField;
       } else {
+        setSplitFieldsEnabled(field !== null);
         setFieldOptionEnabled(true);
-        // only enable exclude frequent if there is a by or over selected
-        setExcludeFrequentEnabled(byField !== null || overField !== null);
       }
+      // only enable exclude frequent if there is a by or over selected
+      setExcludeFrequentEnabled(byField !== null || overField !== null);
     } else {
-      setFieldsEnabled(false);
+      setSplitFieldsEnabled(false);
+      setFieldOptionEnabled(false);
     }
 
     const dtr: RichDetector = {
@@ -155,6 +165,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
       partitionField,
       excludeFrequent: excludeFrequentOption.label !== '' ? excludeFrequentOption.label : null,
       description: descriptionOption !== '' ? descriptionOption : null,
+      customRules: null,
     };
     setDetector(dtr);
     setDescriptionPlaceholder(dtr);
@@ -170,7 +181,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
 
   useEffect(() => {
     const agg = getAgg(aggOption.label);
-    setFieldsEnabled(aggOption.label !== '');
+    setSplitFieldsEnabled(aggOption.label !== '');
     if (agg !== null) {
       setFieldOptionEnabled(isFieldlessAgg(agg) === false);
 
@@ -193,7 +204,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
 
   function saveEnabled() {
     return (
-      fieldsEnabled &&
+      splitFieldsEnabled &&
       (fieldOptionEnabled === false || (fieldOptionEnabled === true && fieldOption.label !== ''))
     );
   }
@@ -202,18 +213,18 @@ export const AdvancedDetectorModal: FC<Props> = ({
     <ModalWrapper onCreateClick={onCreateClick} closeModal={closeModal} saveEnabled={saveEnabled()}>
       <Fragment>
         <EuiFlexGroup>
-          <EuiFlexItem>
+          <EuiFlexItem data-test-subj="mlAdvancedFunctionSelect">
             <AggDescription>
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
                 options={aggOptions}
-                selectedOptions={[aggOption]}
+                selectedOptions={createSelectedOptions(aggOption, aggOptions)}
                 onChange={onOptionChange(setAggOption)}
                 isClearable={true}
               />
             </AggDescription>
           </EuiFlexItem>
-          <EuiFlexItem>
+          <EuiFlexItem data-test-subj="mlAdvancedFieldSelect">
             <FieldDescription>
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
@@ -221,14 +232,14 @@ export const AdvancedDetectorModal: FC<Props> = ({
                 selectedOptions={createSelectedOptions(fieldOption, currentFieldOptions)}
                 onChange={onOptionChange(setFieldOption)}
                 isClearable={true}
-                isDisabled={fieldsEnabled === false || fieldOptionEnabled === false}
+                isDisabled={fieldOptionEnabled === false}
               />
             </FieldDescription>
           </EuiFlexItem>
         </EuiFlexGroup>
         <EuiHorizontalRule margin="l" />
         <EuiFlexGrid columns={2}>
-          <EuiFlexItem>
+          <EuiFlexItem data-test-subj="mlAdvancedByFieldSelect">
             <ByFieldDescription>
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
@@ -236,11 +247,11 @@ export const AdvancedDetectorModal: FC<Props> = ({
                 selectedOptions={createSelectedOptions(byFieldOption, splitFieldOptions)}
                 onChange={onOptionChange(setByFieldOption)}
                 isClearable={true}
-                isDisabled={fieldsEnabled === false}
+                isDisabled={splitFieldsEnabled === false}
               />
             </ByFieldDescription>
           </EuiFlexItem>
-          <EuiFlexItem>
+          <EuiFlexItem data-test-subj="mlAdvancedOverFieldSelect">
             <OverFieldDescription>
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
@@ -248,11 +259,11 @@ export const AdvancedDetectorModal: FC<Props> = ({
                 selectedOptions={createSelectedOptions(overFieldOption, splitFieldOptions)}
                 onChange={onOptionChange(setOverFieldOption)}
                 isClearable={true}
-                isDisabled={fieldsEnabled === false}
+                isDisabled={splitFieldsEnabled === false}
               />
             </OverFieldDescription>
           </EuiFlexItem>
-          <EuiFlexItem>
+          <EuiFlexItem data-test-subj="mlAdvancedPartitionFieldSelect">
             <PartitionFieldDescription>
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
@@ -260,19 +271,22 @@ export const AdvancedDetectorModal: FC<Props> = ({
                 selectedOptions={createSelectedOptions(partitionFieldOption, splitFieldOptions)}
                 onChange={onOptionChange(setPartitionFieldOption)}
                 isClearable={true}
-                isDisabled={fieldsEnabled === false}
+                isDisabled={splitFieldsEnabled === false}
               />
             </PartitionFieldDescription>
           </EuiFlexItem>
-          <EuiFlexItem>
+          <EuiFlexItem data-test-subj="mlAdvancedExcludeFrequentSelect">
             <ExcludeFrequentDescription>
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
                 options={excludeFrequentOptions}
-                selectedOptions={[excludeFrequentOption]}
+                selectedOptions={createSelectedOptions(
+                  excludeFrequentOption,
+                  excludeFrequentOptions
+                )}
                 onChange={onOptionChange(setExcludeFrequentOption)}
                 isClearable={true}
-                isDisabled={fieldsEnabled === false || excludeFrequentEnabled === false}
+                isDisabled={splitFieldsEnabled === false || excludeFrequentEnabled === false}
               />
             </ExcludeFrequentDescription>
           </EuiFlexItem>
@@ -287,6 +301,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
                 placeholder={descriptionPlaceholder}
                 value={descriptionOption}
                 onChange={e => setDescriptionOption(e.target.value)}
+                data-test-subj="mlAdvancedDetectorDescriptionInput"
               />
             </DescriptionDescription>
           </EuiFlexItem>
@@ -305,6 +320,13 @@ function createAggOption(agg: Aggregation | null): EuiComboBoxOptionProps {
   };
 }
 
+// get list of aggregations, filtering out any aggs with no fields,
+// unless script fields are being used, in which case list all fields, as it's not possible
+// to determine the type of a script field and so all aggs should be available.
+function filterAggs(agg: Aggregation, usingScriptFields: boolean) {
+  return agg.fields !== undefined && (usingScriptFields || agg.fields.length);
+}
+
 function createFieldOption(field: Field | null): EuiComboBoxOptionProps {
   if (field === null) {
     return emptyOption;
@@ -330,17 +352,6 @@ function isFieldlessAgg(agg: Aggregation) {
   return agg.fields && agg.fields.length === 1 && agg.fields[0].id === EVENT_RATE_FIELD_ID;
 }
 
-function createMlcategoryField(jobCreator: JobCreatorType): EuiComboBoxOptionProps[] {
-  if (jobCreator.categorizationFieldName === null) {
-    return [];
-  }
-  return [
-    {
-      label: MLCATEGORY,
-    },
-  ];
-}
-
 function useDetectorPlaceholder(detector: RichDetector) {
   const [descriptionPlaceholder, setDescriptionPlaceholderString] = useState(
     createDefaultDescription(detector)
@@ -354,22 +365,21 @@ function useDetectorPlaceholder(detector: RichDetector) {
 }
 
 // creates list of combobox options based on an aggregation's field list
-function createFieldOptionList(agg: Aggregation | null) {
-  return (agg !== null && agg.fields !== undefined ? agg.fields : [])
-    .filter(f => f.id !== EVENT_RATE_FIELD_ID)
-    .map(createFieldOption);
+function createFieldOptionsFromAgg(agg: Aggregation | null) {
+  return createFieldOptions(agg !== null && agg.fields !== undefined ? agg.fields : []);
 }
 
 // custom hook for storing combobox options based on an aggregation field list
-function useCurrentFieldOptions(aggregation: Aggregation | null) {
+function useCurrentFieldOptions(aggregation: Aggregation | null, scriptFields: Field[]) {
   const [currentFieldOptions, setCurrentFieldOptions] = useState(
-    createFieldOptionList(aggregation)
+    createFieldOptionsFromAgg(aggregation)
   );
+  const scriptFieldOptions = createScriptFieldOptions(scriptFields);
 
   return {
     currentFieldOptions,
     setCurrentFieldOptions: (agg: Aggregation | null) =>
-      setCurrentFieldOptions(createFieldOptionList(agg)),
+      setCurrentFieldOptions([...createFieldOptionsFromAgg(agg), ...scriptFieldOptions]),
   };
 }
 
@@ -389,8 +399,15 @@ function createDefaultDescription(dtr: RichDetector) {
 // if the options list only contains one option and nothing has been selected, set
 // selectedOptions list to be an empty array
 function createSelectedOptions(
-  option: EuiComboBoxOptionProps,
+  selectedOption: EuiComboBoxOptionProps,
   options: EuiComboBoxOptionProps[]
 ): EuiComboBoxOptionProps[] {
-  return options.length === 1 && options[0].label !== option.label ? [] : [option];
+  return (options.length === 1 && options[0].label !== selectedOption.label) ||
+    selectedOption.label === ''
+    ? []
+    : [selectedOption];
+}
+
+function comboBoxOptionsSort(a: EuiComboBoxOptionProps, b: EuiComboBoxOptionProps) {
+  return a.label.localeCompare(b.label);
 }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_detector_modal/modal_wrapper.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_detector_modal/modal_wrapper.tsx
index 8b85c658fcadfb..d1ee8a6be557a8 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_detector_modal/modal_wrapper.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_detector_modal/modal_wrapper.tsx
@@ -28,7 +28,11 @@ interface Props {
 export const ModalWrapper: FC<Props> = ({ onCreateClick, closeModal, saveEnabled, children }) => {
   return (
     <EuiOverlayMask>
-      <EuiModal onClose={closeModal} maxWidth={MAX_MODAL_WIDTH}>
+      <EuiModal
+        onClose={closeModal}
+        maxWidth={MAX_MODAL_WIDTH}
+        data-test-subj="mlCreateDetectorModal"
+      >
         <EuiModalHeader>
           <EuiModalHeaderTitle>
             <FormattedMessage
@@ -41,14 +45,19 @@ export const ModalWrapper: FC<Props> = ({ onCreateClick, closeModal, saveEnabled
         <EuiModalBody>{children}</EuiModalBody>
 
         <EuiModalFooter>
-          <EuiButtonEmpty onClick={closeModal}>
+          <EuiButtonEmpty onClick={closeModal} data-test-subj="mlCreateDetectorModalCancelButton">
             <FormattedMessage
               id="xpack.ml.newJob.wizard.pickFieldsStep.advancedDetectorModal.cancelButton"
               defaultMessage="Cancel"
             />
           </EuiButtonEmpty>
 
-          <EuiButton onClick={onCreateClick} isDisabled={saveEnabled === false} fill>
+          <EuiButton
+            onClick={onCreateClick}
+            isDisabled={saveEnabled === false}
+            fill
+            data-test-subj="mlCreateDetectorModalSaveButton"
+          >
             <FormattedMessage
               id="xpack.ml.newJob.wizard.pickFieldsStep.advancedDetectorModal.saveButton"
               defaultMessage="Save"
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/detector_list.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/detector_list.tsx
index 2500cf79535d92..f996a0e9728bae 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/detector_list.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/detector_list.tsx
@@ -18,11 +18,14 @@ import {
   EuiSpacer,
   EuiCallOut,
   EuiHorizontalRule,
+  EuiFormRow,
 } from '@elastic/eui';
 
 import { JobCreatorContext } from '../../../job_creator_context';
 import { AdvancedJobCreator } from '../../../../../common/job_creator';
+import { Validation } from '../../../../../common/job_validator';
 import { detectorToString } from '../../../../../../../util/string_utils';
+import { Detector } from '../../../../../common/job_creator/configs';
 
 interface Props {
   isActive: boolean;
@@ -31,14 +34,21 @@ interface Props {
 }
 
 export const DetectorList: FC<Props> = ({ isActive, onEditJob, onDeleteJob }) => {
-  const { jobCreator: jc, jobCreatorUpdated } = useContext(JobCreatorContext);
+  const { jobCreator: jc, jobCreatorUpdated, jobValidator, jobValidatorUpdated } = useContext(
+    JobCreatorContext
+  );
   const jobCreator = jc as AdvancedJobCreator;
   const [detectors, setDetectors] = useState(jobCreator.detectors);
+  const [validation, setValidation] = useState(jobValidator.duplicateDetectors);
 
   useEffect(() => {
     setDetectors(jobCreator.detectors);
   }, [jobCreatorUpdated]);
 
+  useEffect(() => {
+    setValidation(jobValidator.duplicateDetectors);
+  }, [jobValidatorUpdated]);
+
   const Buttons: FC<{ index: number }> = ({ index }) => {
     return (
       <EuiFlexGroup gutterSize="s">
@@ -53,6 +63,7 @@ export const DetectorList: FC<Props> = ({ isActive, onEditJob, onDeleteJob }) =>
                 defaultMessage: 'Edit',
               }
             )}
+            data-test-subj="mlAdvancedDetectorEditButton"
           />
         </EuiFlexItem>
         <EuiFlexItem>
@@ -66,6 +77,7 @@ export const DetectorList: FC<Props> = ({ isActive, onEditJob, onDeleteJob }) =>
                 defaultMessage: 'Delete',
               }
             )}
+            data-test-subj="mlAdvancedDetectorDeleteButton"
           />
         </EuiFlexItem>
       </EuiFlexGroup>
@@ -89,30 +101,35 @@ export const DetectorList: FC<Props> = ({ isActive, onEditJob, onDeleteJob }) =>
 
       <EuiFlexGrid columns={3}>
         {detectors.map((d, i) => (
-          <EuiFlexItem key={i}>
+          <EuiFlexItem key={i} data-test-subj={`mlAdvancedDetector ${i}`}>
             <EuiPanel paddingSize="m">
               <EuiFlexGroup>
                 <EuiFlexItem>
                   {d.detector_description !== undefined ? (
-                    <div style={{ fontWeight: 'bold' }}>{d.detector_description}</div>
+                    <div style={{ fontWeight: 'bold' }} data-test-subj="mlDetectorDescription">
+                      {d.detector_description}
+                    </div>
                   ) : (
-                    detectorToString(d)
+                    <StringifiedDetector detector={d} />
                   )}
                 </EuiFlexItem>
-                <EuiFlexItem grow={false} style={{ margin: '8px' }}>
-                  <Buttons index={i} />
-                </EuiFlexItem>
+                {isActive && (
+                  <EuiFlexItem grow={false} style={{ margin: '8px' }}>
+                    <Buttons index={i} />
+                  </EuiFlexItem>
+                )}
               </EuiFlexGroup>
               {d.detector_description !== undefined && (
                 <Fragment>
                   <EuiHorizontalRule margin="s" />
-                  {detectorToString(d)}
+                  <StringifiedDetector detector={d} />
                 </Fragment>
               )}
             </EuiPanel>
           </EuiFlexItem>
         ))}
       </EuiFlexGrid>
+      <DuplicateDetectorsWarning validation={validation} />
     </Fragment>
   );
 };
@@ -130,6 +147,7 @@ const NoDetectorsWarning: FC<{ show: boolean }> = ({ show }) => {
           defaultMessage: 'No detectors',
         })}
         iconType="alert"
+        data-test-subj="mlAdvancedNoDetectorsMessage"
       >
         <FormattedMessage
           id="xpack.ml.newJob.wizard.pickFieldsStep.noDetectorsCallout.message"
@@ -140,3 +158,21 @@ const NoDetectorsWarning: FC<{ show: boolean }> = ({ show }) => {
     </Fragment>
   );
 };
+
+const DuplicateDetectorsWarning: FC<{ validation: Validation }> = ({ validation }) => {
+  if (validation.valid === true) {
+    return null;
+  }
+  return (
+    <Fragment>
+      <EuiFormRow error={validation.message} isInvalid={validation.valid === false}>
+        <Fragment />
+      </EuiFormRow>
+      <EuiSpacer size="s" />
+    </Fragment>
+  );
+};
+
+const StringifiedDetector: FC<{ detector: Detector }> = ({ detector }) => {
+  return <div data-test-subj="mlDetectorIdentifier">{detectorToString(detector)}</div>;
+};
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selection.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selection.tsx
index a57858515b955f..cb3dbb59f894a7 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selection.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selection.tsx
@@ -27,6 +27,7 @@ const emptyRichDetector: RichDetector = {
   partitionField: null,
   excludeFrequent: null,
   description: null,
+  customRules: null,
 };
 
 export const AdvancedDetectors: FC<Props> = ({ setIsValid }) => {
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selector.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selector.tsx
index fd597875f27167..5bc38ca934165a 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selector.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selector.tsx
@@ -35,7 +35,7 @@ export const MetricSelector: FC<Props> = ({
       <EuiFlexGroup style={{ maxWidth: MAX_WIDTH }}>
         <EuiFlexItem>
           <EuiFormRow>
-            <EuiButton onClick={showModal}>
+            <EuiButton onClick={showModal} data-test-subj="mlAddDetectorButton">
               <FormattedMessage
                 id="xpack.ml.newJob.wizard.pickFieldsStep.addDetectorButton"
                 defaultMessage="Add detector"
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/settings.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/settings.tsx
index 429457792d55e2..bae9767a390770 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/settings.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/settings.tsx
@@ -44,7 +44,7 @@ export const AdvancedSettings: FC<Props> = ({ setIsValid }) => {
         <EuiFlexItem>
           <ModelMemoryLimitInput />
         </EuiFlexItem>
-        <EuiFlexItem></EuiFlexItem>
+        <EuiFlexItem />
       </EuiFlexGroup>
     </Fragment>
   );
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/agg_select/agg_select.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/agg_select/agg_select.tsx
index d205691fcb64b0..bda29b244a5b1b 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/agg_select/agg_select.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/agg_select/agg_select.tsx
@@ -82,6 +82,6 @@ export const AggSelect: FC<Props> = ({ fields, changeHandler, selectedOptions, r
   );
 };
 
-export function createLabel(pair: AggFieldPair | null): string {
-  return pair === null ? '' : `${pair.agg.title}(${pair.field.name})`;
+export function createLabel(pair: AggFieldPair): string {
+  return `${pair.agg.title}(${pair.field.name})`;
 }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/categorization_field/categorization_field.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/categorization_field/categorization_field.tsx
index 996fa8cd3f862d..f9edf79364c97d 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/categorization_field/categorization_field.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/categorization_field/categorization_field.tsx
@@ -19,7 +19,7 @@ import { Description } from './description';
 export const CategorizationField: FC = () => {
   const { jobCreator: jc, jobCreatorUpdate, jobCreatorUpdated } = useContext(JobCreatorContext);
   const jobCreator = jc as MultiMetricJobCreator | PopulationJobCreator | AdvancedJobCreator;
-  const { fields } = newJobCapsService;
+  const { catFields } = newJobCapsService;
   const [categorizationFieldName, setCategorizationFieldName] = useState(
     jobCreator.categorizationFieldName
   );
@@ -36,7 +36,7 @@ export const CategorizationField: FC = () => {
   return (
     <Description>
       <CategorizationFieldSelect
-        fields={fields}
+        fields={catFields}
         changeHandler={setCategorizationFieldName}
         selectedField={categorizationFieldName}
       />
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/categorization_field/categorization_field_select.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/categorization_field/categorization_field_select.tsx
index 226ce20c72da7b..f9fdba31a0ad41 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/categorization_field/categorization_field_select.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/categorization_field/categorization_field_select.tsx
@@ -4,11 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC } from 'react';
+import React, { FC, useContext } from 'react';
 import { EuiComboBox, EuiComboBoxOptionProps } from '@elastic/eui';
 
-import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../../common/types/fields';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../../../src/plugins/data/public';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { Field } from '../../../../../../../../common/types/fields';
+import {
+  createFieldOptions,
+  createScriptFieldOptions,
+} from '../../../../../common/job_creator/util/general';
 
 interface Props {
   fields: Field[];
@@ -17,19 +21,17 @@ interface Props {
 }
 
 export const CategorizationFieldSelect: FC<Props> = ({ fields, changeHandler, selectedField }) => {
-  const options: EuiComboBoxOptionProps[] = fields
-    .filter(f => f.id !== EVENT_RATE_FIELD_ID && f.type === ES_FIELD_TYPES.KEYWORD)
-    .map(f => ({
-      label: f.name,
-    }))
-    .sort((a, b) => a.label.localeCompare(b.label));
-
-  const selection: EuiComboBoxOptionProps[] = [
-    {
-      label: selectedField !== null ? selectedField : '',
-    },
+  const { jobCreator } = useContext(JobCreatorContext);
+  const options: EuiComboBoxOptionProps[] = [
+    ...createFieldOptions(fields),
+    ...createScriptFieldOptions(jobCreator.scriptFields),
   ];
 
+  const selection: EuiComboBoxOptionProps[] = [];
+  if (selectedField !== null) {
+    selection.push({ label: selectedField });
+  }
+
   function onChange(selectedOptions: EuiComboBoxOptionProps[]) {
     const option = selectedOptions[0];
     if (typeof option !== 'undefined') {
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/influencers/influencers_select.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/influencers/influencers_select.tsx
index b1f9c6dbcf555a..293202415ced0c 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/influencers/influencers_select.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/influencers/influencers_select.tsx
@@ -8,8 +8,12 @@ import React, { FC, useContext } from 'react';
 import { EuiComboBox, EuiComboBoxOptionProps } from '@elastic/eui';
 
 import { JobCreatorContext } from '../../../job_creator_context';
-import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../../common/types/fields';
-import { MLCATEGORY } from '../../../../../../../../common/constants/field_types';
+import { Field } from '../../../../../../../../common/types/fields';
+import {
+  createFieldOptions,
+  createScriptFieldOptions,
+  createMlcategoryFieldOption,
+} from '../../../../../common/job_creator/util/general';
 
 interface Props {
   fields: Field[];
@@ -19,18 +23,11 @@ interface Props {
 
 export const InfluencersSelect: FC<Props> = ({ fields, changeHandler, selectedInfluencers }) => {
   const { jobCreator } = useContext(JobCreatorContext);
-  const options: EuiComboBoxOptionProps[] = fields
-    .filter(f => f.id !== EVENT_RATE_FIELD_ID)
-    .map(f => ({
-      label: f.name,
-    }))
-    .sort((a, b) => a.label.localeCompare(b.label));
-
-  if (jobCreator.categorizationFieldName !== null) {
-    options.push({
-      label: MLCATEGORY,
-    });
-  }
+  const options: EuiComboBoxOptionProps[] = [
+    ...createFieldOptions(fields),
+    ...createScriptFieldOptions(jobCreator.scriptFields),
+    ...createMlcategoryFieldOption(jobCreator.categorizationFieldName),
+  ];
 
   const selection: EuiComboBoxOptionProps[] = selectedInfluencers.map(i => ({ label: i }));
 
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx
index f913b5a5720d6e..b0a5049924cbc8 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx
@@ -33,7 +33,7 @@ export const MultiMetricDetectors: FC<Props> = ({ setIsValid }) => {
   const jobCreator = jc as MultiMetricJobCreator;
 
   const { fields } = newJobCapsService;
-  const [selectedOptions, setSelectedOptions] = useState<DropDownProps>([{ label: '' }]);
+  const [selectedOptions, setSelectedOptions] = useState<DropDownProps>([]);
   const [aggFieldPairList, setAggFieldPairList] = useState<AggFieldPair[]>(
     jobCreator.aggFieldPairs
   );
@@ -57,7 +57,7 @@ export const MultiMetricDetectors: FC<Props> = ({ setIsValid }) => {
       if (typeof option !== 'undefined') {
         const newPair = { agg: option.agg, field: option.field };
         setAggFieldPairList([...aggFieldPairList, newPair]);
-        setSelectedOptions([{ label: '' }]);
+        setSelectedOptions([]);
       } else {
         setAggFieldPairList([]);
       }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/population_view/metric_selection.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/population_view/metric_selection.tsx
index 87d3e87d65536d..9a24381c9e35fd 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/population_view/metric_selection.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/population_view/metric_selection.tsx
@@ -36,7 +36,7 @@ export const PopulationDetectors: FC<Props> = ({ setIsValid }) => {
   const jobCreator = jc as PopulationJobCreator;
 
   const { fields } = newJobCapsService;
-  const [selectedOptions, setSelectedOptions] = useState<DropDownProps>([{ label: '' }]);
+  const [selectedOptions, setSelectedOptions] = useState<DropDownProps>([]);
   const [aggFieldPairList, setAggFieldPairList] = useState<AggFieldPair[]>(
     jobCreator.aggFieldPairs
   );
@@ -62,7 +62,7 @@ export const PopulationDetectors: FC<Props> = ({ setIsValid }) => {
       if (typeof option !== 'undefined') {
         const newPair = { agg: option.agg, field: option.field, by: { field: null, value: null } };
         setAggFieldPairList([...aggFieldPairList, newPair]);
-        setSelectedOptions([{ label: '' }]);
+        setSelectedOptions([]);
       } else {
         setAggFieldPairList([]);
       }
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx
index 45872faae4c09f..19ccca44dc0a51 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx
@@ -32,9 +32,9 @@ export const SingleMetricDetectors: FC<Props> = ({ setIsValid }) => {
   const jobCreator = jc as SingleMetricJobCreator;
 
   const { fields } = newJobCapsService;
-  const [selectedOptions, setSelectedOptions] = useState<DropDownProps>([
-    { label: createLabel(jobCreator.aggFieldPair) },
-  ]);
+  const [selectedOptions, setSelectedOptions] = useState<DropDownProps>(
+    jobCreator.aggFieldPair !== null ? [{ label: createLabel(jobCreator.aggFieldPair) }] : []
+  );
   const [aggFieldPair, setAggFieldPair] = useState<AggFieldPair | null>(jobCreator.aggFieldPair);
   const [lineChartsData, setLineChartData] = useState<LineChartData>({});
   const [loadingData, setLoadingData] = useState(false);
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/summary_count_field/summary_count_field_select.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/summary_count_field/summary_count_field_select.tsx
index d22d2ee1118050..2f240344e0ea56 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/summary_count_field/summary_count_field_select.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/summary_count_field/summary_count_field_select.tsx
@@ -4,10 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC } from 'react';
+import React, { FC, useContext } from 'react';
 import { EuiComboBox, EuiComboBoxOptionProps } from '@elastic/eui';
 
-import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../../common/types/fields';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { Field } from '../../../../../../../../common/types/fields';
+import {
+  createFieldOptions,
+  createScriptFieldOptions,
+} from '../../../../../common/job_creator/util/general';
 
 interface Props {
   fields: Field[];
@@ -16,19 +21,17 @@ interface Props {
 }
 
 export const SummaryCountFieldSelect: FC<Props> = ({ fields, changeHandler, selectedField }) => {
-  const options: EuiComboBoxOptionProps[] = fields
-    .filter(f => f.id !== EVENT_RATE_FIELD_ID)
-    .map(f => ({
-      label: f.name,
-    }))
-    .sort((a, b) => a.label.localeCompare(b.label));
-
-  const selection: EuiComboBoxOptionProps[] = [
-    {
-      label: selectedField !== null ? selectedField : '',
-    },
+  const { jobCreator } = useContext(JobCreatorContext);
+  const options: EuiComboBoxOptionProps[] = [
+    ...createFieldOptions(fields),
+    ...createScriptFieldOptions(jobCreator.scriptFields),
   ];
 
+  const selection: EuiComboBoxOptionProps[] = [];
+  if (selectedField !== null) {
+    selection.push({ label: selectedField });
+  }
+
   function onChange(selectedOptions: EuiComboBoxOptionProps[]) {
     const option = selectedOptions[0];
     if (typeof option !== 'undefined') {
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/validation_step/validation.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/validation_step/validation.tsx
index b60e225cdff4dd..a543dbaaf3c5d1 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/validation_step/validation.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/validation_step/validation.tsx
@@ -78,7 +78,7 @@ export const ValidationStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep })
           />
         </Fragment>
       )}
-      {isCurrentStep === false && <Fragment></Fragment>}
+      {isCurrentStep === false && <Fragment />}
     </Fragment>
   );
 };
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
index 017fdf901ef93a..682ed97020a7f2 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
@@ -52,6 +52,8 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
       ? WIZARD_STEPS.ADVANCED_CONFIGURE_DATAFEED
       : WIZARD_STEPS.TIME_RANGE;
 
+  let autoSetTimeRange = false;
+
   if (mlJobService.tempJobCloningObjects.job !== undefined) {
     // cloning a job
     const clonedJob = mlJobService.cloneJob(mlJobService.tempJobCloningObjects.job);
@@ -79,6 +81,10 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
       );
       mlJobService.tempJobCloningObjects.start = undefined;
       mlJobService.tempJobCloningObjects.end = undefined;
+    } else {
+      // if not start and end times are set and this is an advanced job,
+      // auto set the time range based on the index
+      autoSetTimeRange = isAdvancedJobCreator(jobCreator);
     }
   } else {
     // creating a new job
@@ -99,19 +105,22 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
       jobCreator.createdBy = null;
     }
 
-    if (isAdvancedJobCreator(jobCreator)) {
-      // for advanced jobs, load the full time range start and end times
-      // so they can be used for job validation and bucket span estimation
-      try {
-        jobCreator.autoSetTimeRange();
-      } catch (error) {
-        toastNotifications.addDanger({
-          title: i18n.translate('xpack.ml.newJob.wizard.autoSetJobCreatorTimeRange.error', {
-            defaultMessage: `Error retrieving beginning and end times of index`,
-          }),
-          text: error,
-        });
-      }
+    // auto set the time range if creating a new advanced job
+    autoSetTimeRange = isAdvancedJobCreator(jobCreator);
+  }
+
+  if (autoSetTimeRange && isAdvancedJobCreator(jobCreator)) {
+    // for advanced jobs, load the full time range start and end times
+    // so they can be used for job validation and bucket span estimation
+    try {
+      jobCreator.autoSetTimeRange();
+    } catch (error) {
+      toastNotifications.addDanger({
+        title: i18n.translate('xpack.ml.newJob.wizard.autoSetJobCreatorTimeRange.error', {
+          defaultMessage: `Error retrieving beginning and end times of index`,
+        }),
+        text: error,
+      });
     }
   }
 
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/edit_job.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/edit_job.tsx
new file mode 100644
index 00000000000000..7ec8cddfe3ed5d
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/edit_job.tsx
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useEffect, useState } from 'react';
+import {
+  EuiButton,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFlyout,
+  EuiFlyoutBody,
+  EuiFlyoutFooter,
+  EuiFlyoutHeader,
+  EuiForm,
+  EuiFormRow,
+  EuiSpacer,
+  EuiTitle,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { ModuleJobUI } from '../page';
+import { usePartialState } from '../../../../components/custom_hooks';
+import { composeValidators, maxLengthValidator } from '../../../../../common/util/validators';
+import { isJobIdValid } from '../../../../../common/util/job_utils';
+import { JOB_ID_MAX_LENGTH } from '../../../../../common/constants/validation';
+import { JobGroupsInput } from '../../common/components';
+import { JobOverride } from '../../../../../common/types/modules';
+
+interface EditJobProps {
+  job: ModuleJobUI;
+  jobOverride: JobOverride | undefined;
+  existingGroupIds: string[];
+  onClose: (job: JobOverride | null) => void;
+}
+
+/**
+ * Edit job flyout for overriding job configuration.
+ */
+export const EditJob: FC<EditJobProps> = ({ job, jobOverride, existingGroupIds, onClose }) => {
+  const [formState, setFormState] = usePartialState({
+    jobGroups: (jobOverride && jobOverride.groups) || job.config.groups,
+  });
+  const [validationResult, setValidationResult] = useState<Record<string, any>>({});
+
+  const groupValidator = composeValidators(
+    (value: string) => (isJobIdValid(value) ? null : { pattern: true }),
+    maxLengthValidator(JOB_ID_MAX_LENGTH)
+  );
+
+  const handleValidation = () => {
+    const jobGroupsValidationResult = formState.jobGroups
+      .map(group => groupValidator(group))
+      .filter(result => result !== null);
+
+    setValidationResult({
+      jobGroups: jobGroupsValidationResult,
+      formValid: jobGroupsValidationResult.length === 0,
+    });
+  };
+
+  useEffect(() => {
+    handleValidation();
+  }, [formState.jobGroups]);
+
+  const onSave = () => {
+    const result: JobOverride = {
+      job_id: job.id,
+      groups: formState.jobGroups,
+    };
+    onClose(result);
+  };
+
+  return (
+    <EuiFlyout onClose={() => onClose(null)}>
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2>
+            <FormattedMessage
+              id="xpack.ml.newJob.recognize.overrideConfigurationHeader"
+              defaultMessage="Override configuration for {jobID}"
+              values={{ jobID: job.id }}
+            />
+          </h2>
+        </EuiTitle>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <EuiSpacer size="m" />
+        <EuiForm>
+          <EuiFormRow fullWidth>
+            <JobGroupsInput
+              existingGroups={existingGroupIds}
+              selectedGroups={formState.jobGroups}
+              onChange={value => {
+                setFormState({
+                  jobGroups: value,
+                });
+              }}
+              validation={{
+                valid: !validationResult.jobGroups || validationResult.jobGroups.length === 0,
+                message: (
+                  <FormattedMessage
+                    id="xpack.ml.newJob.recognize.jobGroupAllowedCharactersDescription"
+                    defaultMessage="Job group names can contain lowercase alphanumeric (a-z and 0-9), hyphens or underscores; must start and end with an alphanumeric character"
+                  />
+                ),
+              }}
+            />
+          </EuiFormRow>
+        </EuiForm>
+        <EuiSpacer />
+      </EuiFlyoutBody>
+      <EuiFlyoutFooter>
+        <EuiFlexGroup justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty iconType="cross" onClick={() => onClose(null)} flush="left">
+              <FormattedMessage
+                id="xpack.ml.newJob.recognize.cancelJobOverrideLabel"
+                defaultMessage="Close"
+              />
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButton onClick={() => onSave()} fill disabled={!validationResult.formValid}>
+              <FormattedMessage
+                id="xpack.ml.newJob.recognize.saveJobOverrideLabel"
+                defaultMessage="Save"
+              />
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutFooter>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/job_item.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/job_item.tsx
new file mode 100644
index 00000000000000..ace8409734b742
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/job_item.tsx
@@ -0,0 +1,172 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, memo } from 'react';
+import {
+  EuiBadge,
+  EuiButtonIcon,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiLoadingSpinner,
+  EuiText,
+  EuiToolTip,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { ModuleJobUI } from '../page';
+import { SETUP_RESULTS_WIDTH } from './module_jobs';
+import { tabColor } from '../../../../../common/util/group_color_utils';
+import { JobOverride } from '../../../../../common/types/modules';
+
+interface JobItemProps {
+  job: ModuleJobUI;
+  jobPrefix: string;
+  jobOverride: JobOverride | undefined;
+  isSaving: boolean;
+  onEditRequest: (job: ModuleJobUI) => void;
+}
+
+export const JobItem: FC<JobItemProps> = memo(
+  ({ job, jobOverride, isSaving, jobPrefix, onEditRequest }) => {
+    const {
+      id,
+      config: { description, groups },
+      datafeedResult,
+      setupResult,
+    } = job;
+
+    const jobGroups = (jobOverride && jobOverride.groups) || groups;
+
+    return (
+      <EuiFlexGroup
+        alignItems="center"
+        gutterSize="s"
+        justifyContent="spaceBetween"
+        responsive={false}
+      >
+        <EuiFlexItem>
+          <EuiFlexGroup gutterSize="s">
+            <EuiFlexItem grow={false}>
+              <EuiText size="s" color="secondary">
+                {jobPrefix}
+                {id}
+              </EuiText>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiToolTip
+                position="right"
+                content={
+                  <FormattedMessage
+                    id="xpack.ml.newJob.recognize.job.overrideJobConfigurationLabel"
+                    defaultMessage="Override job configuration"
+                  />
+                }
+              >
+                <EuiButtonIcon
+                  aria-label={i18n.translate(
+                    'xpack.ml.newJob.recognize.job.overrideJobConfigurationLabel',
+                    {
+                      defaultMessage: 'Override job configuration',
+                    }
+                  )}
+                  iconType="pencil"
+                  onClick={() => onEditRequest(job)}
+                />
+              </EuiToolTip>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+
+          <EuiText size="s" color="subdued">
+            {description}
+          </EuiText>
+
+          <EuiFlexGroup wrap responsive={false} gutterSize="xs">
+            {jobGroups.map(group => (
+              <EuiFlexItem grow={false} key={group}>
+                <EuiBadge color={tabColor(group)}>{group}</EuiBadge>
+              </EuiFlexItem>
+            ))}
+          </EuiFlexGroup>
+
+          {setupResult && setupResult.error && (
+            <EuiText size="xs" color="danger">
+              {setupResult.error.msg}
+            </EuiText>
+          )}
+
+          {datafeedResult && datafeedResult.error && (
+            <EuiText size="xs" color="danger">
+              {datafeedResult.error.msg}
+            </EuiText>
+          )}
+        </EuiFlexItem>
+        <EuiFlexItem grow={false} style={{ width: SETUP_RESULTS_WIDTH }}>
+          {isSaving && <EuiLoadingSpinner size="m" />}
+          {setupResult && datafeedResult && (
+            <EuiFlexGroup
+              gutterSize="s"
+              wrap={false}
+              responsive={false}
+              justifyContent="spaceAround"
+            >
+              <EuiFlexItem grow={false}>
+                <EuiIcon
+                  type={setupResult.success ? 'check' : 'cross'}
+                  color={setupResult.success ? 'secondary' : 'danger'}
+                  size="m"
+                  aria-label={
+                    setupResult.success
+                      ? i18n.translate('xpack.ml.newJob.recognize.job.savedAriaLabel', {
+                          defaultMessage: 'Saved',
+                        })
+                      : i18n.translate('xpack.ml.newJob.recognize.job.saveFailedAriaLabel', {
+                          defaultMessage: 'Save failed',
+                        })
+                  }
+                />
+              </EuiFlexItem>
+
+              <EuiFlexItem grow={false}>
+                <EuiIcon
+                  type={datafeedResult.success ? 'check' : 'cross'}
+                  color={datafeedResult.success ? 'secondary' : 'danger'}
+                  size="m"
+                  aria-label={
+                    setupResult.success
+                      ? i18n.translate('xpack.ml.newJob.recognize.datafeed.savedAriaLabel', {
+                          defaultMessage: 'Saved',
+                        })
+                      : i18n.translate('xpack.ml.newJob.recognize.datafeed.saveFailedAriaLabel', {
+                          defaultMessage: 'Save failed',
+                        })
+                  }
+                />
+              </EuiFlexItem>
+
+              <EuiFlexItem grow={false}>
+                <EuiIcon
+                  type={datafeedResult.started ? 'check' : 'cross'}
+                  color={datafeedResult.started ? 'secondary' : 'danger'}
+                  size="m"
+                  aria-label={
+                    setupResult.success
+                      ? i18n.translate('xpack.ml.newJob.recognize.running.startedAriaLabel', {
+                          defaultMessage: 'Started',
+                        })
+                      : i18n.translate('xpack.ml.newJob.recognize.running.startFailedAriaLabel', {
+                          defaultMessage: 'Start failed',
+                        })
+                  }
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          )}
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  }
+);
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/job_settings_form.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/job_settings_form.tsx
index 617f6b31e7e537..bab45a7d77a3de 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/job_settings_form.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/job_settings_form.tsx
@@ -27,9 +27,8 @@ import {
   patternValidator,
 } from '../../../../../common/util/validators';
 import { JOB_ID_MAX_LENGTH } from '../../../../../common/constants/validation';
-import { isJobIdValid } from '../../../../../common/util/job_utils';
 import { usePartialState } from '../../../../components/custom_hooks';
-import { JobGroupsInput, TimeRangePicker, TimeRange } from '../../common/components';
+import { TimeRange, TimeRangePicker } from '../../common/components';
 
 export interface JobSettingsFormValues {
   jobPrefix: string;
@@ -37,15 +36,12 @@ export interface JobSettingsFormValues {
   useFullIndexData: boolean;
   timeRange: TimeRange;
   useDedicatedIndex: boolean;
-  jobGroups: string[];
 }
 
 interface JobSettingsFormProps {
   saveState: SAVE_STATE;
   onSubmit: (values: JobSettingsFormValues) => any;
   onChange: (values: JobSettingsFormValues) => any;
-  jobGroups: string[];
-  existingGroupIds: string[];
   jobs: ModuleJobUI[];
 }
 
@@ -53,9 +49,7 @@ export const JobSettingsForm: FC<JobSettingsFormProps> = ({
   onSubmit,
   onChange,
   saveState,
-  existingGroupIds,
   jobs,
-  jobGroups,
 }) => {
   const { from, to } = getTimeFilterRange();
   const { currentIndexPattern: indexPattern } = useKibanaContext();
@@ -64,10 +58,6 @@ export const JobSettingsForm: FC<JobSettingsFormProps> = ({
     patternValidator(/^([a-z0-9]+[a-z0-9\-_]*)?$/),
     maxLengthValidator(JOB_ID_MAX_LENGTH - Math.max(...jobs.map(({ id }) => id.length)))
   );
-  const groupValidator = composeValidators(
-    (value: string) => (isJobIdValid(value) ? null : { pattern: true }),
-    maxLengthValidator(JOB_ID_MAX_LENGTH)
-  );
 
   const [formState, setFormState] = usePartialState({
     jobPrefix: '',
@@ -78,7 +68,6 @@ export const JobSettingsForm: FC<JobSettingsFormProps> = ({
       end: to,
     },
     useDedicatedIndex: false,
-    jobGroups: [] as string[],
   });
   const [validationResult, setValidationResult] = useState<Record<string, any>>({});
 
@@ -90,29 +79,21 @@ export const JobSettingsForm: FC<JobSettingsFormProps> = ({
 
   const handleValidation = () => {
     const jobPrefixValidationResult = jobPrefixValidator(formState.jobPrefix);
-    const jobGroupsValidationResult = formState.jobGroups
-      .map(group => groupValidator(group))
-      .filter(result => result !== null);
 
     setValidationResult({
       jobPrefix: jobPrefixValidationResult,
-      jobGroups: jobGroupsValidationResult,
-      formValid: !jobPrefixValidationResult && jobGroupsValidationResult.length === 0,
+      formValid: !jobPrefixValidationResult,
     });
   };
 
   useEffect(() => {
     handleValidation();
-  }, [formState.jobPrefix, formState.jobGroups]);
+  }, [formState.jobPrefix]);
 
   useEffect(() => {
     onChange(formState);
   }, [formState]);
 
-  useEffect(() => {
-    setFormState({ jobGroups });
-  }, [jobGroups]);
-
   return (
     <>
       <EuiForm>
@@ -174,24 +155,6 @@ export const JobSettingsForm: FC<JobSettingsFormProps> = ({
             />
           </EuiFormRow>
         </EuiDescribedFormGroup>
-        <JobGroupsInput
-          existingGroups={existingGroupIds}
-          selectedGroups={formState.jobGroups}
-          onChange={value => {
-            setFormState({
-              jobGroups: value,
-            });
-          }}
-          validation={{
-            valid: !validationResult.jobGroups || validationResult.jobGroups.length === 0,
-            message: (
-              <FormattedMessage
-                id="xpack.ml.newJob.recognize.jobGroupAllowedCharactersDescription"
-                defaultMessage="Job group names can contain lowercase alphanumeric (a-z and 0-9), hyphens or underscores; must start and end with an alphanumeric character"
-              />
-            ),
-          }}
-        />
         <EuiSpacer size="l" />
         <EuiFormRow>
           <EuiSwitch
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/module_jobs.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/module_jobs.tsx
index 76028510172e1c..adae037305ff84 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/module_jobs.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/components/module_jobs.tsx
@@ -4,31 +4,68 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC } from 'react';
-import { i18n } from '@kbn/i18n';
+import React, { FC, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiHorizontalRule,
-  EuiIcon,
-  EuiLoadingSpinner,
   EuiSpacer,
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { ModuleJobUI, SAVE_STATE } from '../page';
+import { JobOverrides, ModuleJobUI, SAVE_STATE } from '../page';
+import { JobItem } from './job_item';
+import { EditJob } from './edit_job';
+import { JobOverride } from '../../../../../common/types/modules';
 
 interface ModuleJobsProps {
   jobs: ModuleJobUI[];
   jobPrefix: string;
   saveState: SAVE_STATE;
+  existingGroupIds: string[];
+  jobOverrides: JobOverrides;
+  onJobOverridesChange: (job: JobOverride) => void;
 }
 
-const SETUP_RESULTS_WIDTH = '200px';
+export const SETUP_RESULTS_WIDTH = '200px';
 
-export const ModuleJobs: FC<ModuleJobsProps> = ({ jobs, jobPrefix, saveState }) => {
+export const ModuleJobs: FC<ModuleJobsProps> = ({
+  jobs,
+  jobPrefix,
+  jobOverrides,
+  saveState,
+  existingGroupIds,
+  onJobOverridesChange,
+}) => {
   const isSaving = saveState === SAVE_STATE.SAVING;
+
+  const [jobToEdit, setJobToEdit] = useState<ModuleJobUI | null>(null);
+
+  const onFlyoutClose = (result: JobOverride | null) => {
+    setJobToEdit(null);
+
+    if (result === null) {
+      return;
+    }
+
+    onJobOverridesChange(result);
+  };
+
+  const getJobOverride = (job: ModuleJobUI): JobOverride | undefined => {
+    return jobOverrides[job.id];
+  };
+
+  const editJobFlyout =
+    jobToEdit !== null ? (
+      <EditJob
+        job={jobToEdit}
+        jobOverride={getJobOverride(jobToEdit)}
+        onClose={onFlyoutClose}
+        existingGroupIds={existingGroupIds}
+      />
+    ) : null;
+
   return (
     <>
       <EuiTitle size="s">
@@ -70,109 +107,26 @@ export const ModuleJobs: FC<ModuleJobsProps> = ({ jobs, jobPrefix, saveState })
       )}
 
       <ul>
-        {jobs.map(({ id, config: { description }, setupResult, datafeedResult }, i) => (
-          <li key={id}>
-            <EuiFlexGroup
-              alignItems="center"
-              gutterSize="s"
-              justifyContent="spaceBetween"
-              responsive={false}
-            >
+        {jobs.map((job, i) => (
+          <li key={job.id}>
+            <EuiFlexGroup>
               <EuiFlexItem>
-                <EuiText size="s" color="secondary">
-                  {jobPrefix}
-                  {id}
-                </EuiText>
-
-                <EuiText size="s" color="subdued">
-                  {description}
-                </EuiText>
-
-                {setupResult && setupResult.error && (
-                  <EuiText size="xs" color="danger">
-                    {setupResult.error.msg}
-                  </EuiText>
-                )}
-
-                {datafeedResult && datafeedResult.error && (
-                  <EuiText size="xs" color="danger">
-                    {datafeedResult.error.msg}
-                  </EuiText>
-                )}
-              </EuiFlexItem>
-              <EuiFlexItem grow={false} style={{ width: SETUP_RESULTS_WIDTH }}>
-                {isSaving && <EuiLoadingSpinner size="m" />}
-                {setupResult && datafeedResult && (
-                  <EuiFlexGroup
-                    gutterSize="s"
-                    wrap={false}
-                    responsive={false}
-                    justifyContent="spaceAround"
-                  >
-                    <EuiFlexItem grow={false}>
-                      <EuiIcon
-                        type={setupResult.success ? 'check' : 'cross'}
-                        color={setupResult.success ? 'secondary' : 'danger'}
-                        size="m"
-                        aria-label={
-                          setupResult.success
-                            ? i18n.translate('xpack.ml.newJob.recognize.job.savedAriaLabel', {
-                                defaultMessage: 'Saved',
-                              })
-                            : i18n.translate('xpack.ml.newJob.recognize.job.saveFailedAriaLabel', {
-                                defaultMessage: 'Save failed',
-                              })
-                        }
-                      />
-                    </EuiFlexItem>
-
-                    <EuiFlexItem grow={false}>
-                      <EuiIcon
-                        type={datafeedResult.success ? 'check' : 'cross'}
-                        color={datafeedResult.success ? 'secondary' : 'danger'}
-                        size="m"
-                        aria-label={
-                          setupResult.success
-                            ? i18n.translate('xpack.ml.newJob.recognize.datafeed.savedAriaLabel', {
-                                defaultMessage: 'Saved',
-                              })
-                            : i18n.translate(
-                                'xpack.ml.newJob.recognize.datafeed.saveFailedAriaLabel',
-                                {
-                                  defaultMessage: 'Save failed',
-                                }
-                              )
-                        }
-                      />
-                    </EuiFlexItem>
-
-                    <EuiFlexItem grow={false}>
-                      <EuiIcon
-                        type={datafeedResult.started ? 'check' : 'cross'}
-                        color={datafeedResult.started ? 'secondary' : 'danger'}
-                        size="m"
-                        aria-label={
-                          setupResult.success
-                            ? i18n.translate('xpack.ml.newJob.recognize.running.startedAriaLabel', {
-                                defaultMessage: 'Started',
-                              })
-                            : i18n.translate(
-                                'xpack.ml.newJob.recognize.running.startFailedAriaLabel',
-                                {
-                                  defaultMessage: 'Start failed',
-                                }
-                              )
-                        }
-                      />
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                )}
+                <JobItem
+                  jobPrefix={jobPrefix}
+                  job={job}
+                  jobOverride={getJobOverride(job)}
+                  isSaving={isSaving}
+                  onEditRequest={() => setJobToEdit(job)}
+                />
               </EuiFlexItem>
             </EuiFlexGroup>
+
             {i < jobs.length - 1 && <EuiHorizontalRule margin="s" />}
           </li>
         ))}
       </ul>
+
+      {editJobFlyout}
     </>
   );
 };
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/page.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/page.tsx
index 2c7600dcb99b20..f9a5230ef17d9f 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/page.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/recognize/page.tsx
@@ -21,12 +21,13 @@ import {
   EuiPanel,
 } from '@elastic/eui';
 import { toastNotifications } from 'ui/notify';
-import { merge, flatten } from 'lodash';
+import { merge } from 'lodash';
 import { ml } from '../../../services/ml_api_service';
 import { useKibanaContext } from '../../../contexts/kibana';
 import {
   DatafeedResponse,
   DataRecognizerConfigResponse,
+  JobOverride,
   JobResponse,
   KibanaObject,
   KibanaObjectResponse,
@@ -40,6 +41,7 @@ import { ModuleJobs } from './components/module_jobs';
 import { checkForSavedObjects } from './resolvers';
 import { JobSettingsForm, JobSettingsFormValues } from './components/job_settings_form';
 import { TimeRange } from '../common/components';
+import { JobId } from '../common/job_creator/configs';
 
 export interface ModuleJobUI extends ModuleJob {
   datafeedResult?: DatafeedResponse;
@@ -57,6 +59,8 @@ interface PageProps {
   existingGroupIds: string[];
 }
 
+export type JobOverrides = Record<JobId, JobOverride>;
+
 export enum SAVE_STATE {
   NOT_SAVED,
   SAVING,
@@ -69,7 +73,7 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
   // #region State
   const [jobPrefix, setJobPrefix] = useState<string>('');
   const [jobs, setJobs] = useState<ModuleJobUI[]>([]);
-  const [jobGroups, setJobGroups] = useState<string[]>([]);
+  const [jobOverrides, setJobOverrides] = useState<JobOverrides>({});
   const [kibanaObjects, setKibanaObjects] = useState<KibanaObjects>({});
   const [saveState, setSaveState] = useState<SAVE_STATE>(SAVE_STATE.NOT_SAVED);
   const [resultsUrl, setResultsUrl] = useState<string>('');
@@ -93,6 +97,9 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
   const displayQueryWarning = savedSearch.id !== undefined;
   const tempQuery = savedSearch.id === undefined ? undefined : combinedQuery;
 
+  /**
+   * Loads recognizer module configuration.
+   */
   const loadModule = async () => {
     try {
       const response: Module = await ml.getDataRecognizerModule({ moduleId });
@@ -101,9 +108,6 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
       const kibanaObjectsResult = await checkForSavedObjects(response.kibana as KibanaObjects);
       setKibanaObjects(kibanaObjectsResult);
 
-      setJobGroups([
-        ...new Set(flatten(response.jobs.map(({ config: { groups = [] } }) => groups))),
-      ]);
       setSaveState(SAVE_STATE.NOT_SAVED);
     } catch (e) {
       // eslint-disable-next-line no-console
@@ -134,11 +138,13 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
     loadModule();
   }, []);
 
+  /**
+   * Sets up recognizer module configuration.
+   */
   const save = async (formValues: JobSettingsFormValues) => {
     setSaveState(SAVE_STATE.SAVING);
     const {
       jobPrefix: resultJobPrefix,
-      jobGroups: resultJobGroups,
       startDatafeedAfterSave,
       useDedicatedIndex,
       useFullIndexData,
@@ -148,14 +154,17 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
     const resultTimeRange = await getTimeRange(useFullIndexData, timeRange);
 
     try {
+      let jobOverridesPayload: JobOverride[] | null = Object.values(jobOverrides);
+      jobOverridesPayload = jobOverridesPayload.length > 0 ? jobOverridesPayload : null;
+
       const response: DataRecognizerConfigResponse = await ml.setupDataRecognizerConfig({
         moduleId,
         prefix: resultJobPrefix,
-        groups: resultJobGroups,
         query: tempQuery,
         indexPatternName: indexPattern.title,
         useDedicatedIndex,
         startDatafeed: startDatafeedAfterSave,
+        ...(jobOverridesPayload !== null ? { jobOverrides: jobOverridesPayload } : {}),
         ...resultTimeRange,
       });
       const { datafeeds: datafeedsResponse, jobs: jobsResponse, kibana: kibanaResponse } = response;
@@ -208,6 +217,13 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
     }
   };
 
+  const onJobOverridesChange = (job: JobOverride) => {
+    setJobOverrides({
+      ...jobOverrides,
+      [job.job_id as string]: job,
+    });
+  };
+
   const isFormVisible = [SAVE_STATE.NOT_SAVED, SAVE_STATE.SAVING].includes(saveState);
 
   return (
@@ -271,10 +287,8 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
                   onChange={formValues => {
                     setJobPrefix(formValues.jobPrefix);
                   }}
-                  existingGroupIds={existingGroupIds}
                   saveState={saveState}
                   jobs={jobs}
-                  jobGroups={jobGroups}
                 />
               )}
               <CreateResultCallout
@@ -286,7 +300,14 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
           </EuiFlexItem>
           <EuiFlexItem grow={2}>
             <EuiPanel grow={false}>
-              <ModuleJobs jobs={jobs} jobPrefix={jobPrefix} saveState={saveState} />
+              <ModuleJobs
+                jobs={jobs}
+                jobPrefix={jobPrefix}
+                saveState={saveState}
+                existingGroupIds={existingGroupIds}
+                jobOverrides={jobOverrides}
+                onJobOverridesChange={onJobOverridesChange}
+              />
             </EuiPanel>
             {Object.keys(kibanaObjects).length > 0 && (
               <>
diff --git a/x-pack/legacy/plugins/ml/public/overview/components/analytics_panel/analytics_panel.tsx b/x-pack/legacy/plugins/ml/public/overview/components/analytics_panel/analytics_panel.tsx
index ff7c519829b7c5..fb08403b391ef6 100644
--- a/x-pack/legacy/plugins/ml/public/overview/components/analytics_panel/analytics_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/overview/components/analytics_panel/analytics_panel.tsx
@@ -19,7 +19,10 @@ import { AnalyticsTable } from './table';
 import { getAnalyticsFactory } from '../../../data_frame_analytics/pages/analytics_management/services/analytics_service';
 import { DataFrameAnalyticsListRow } from '../../../data_frame_analytics/pages/analytics_management/components/analytics_list/common';
 
-export const AnalyticsPanel: FC = () => {
+interface Props {
+  jobCreationDisabled: boolean;
+}
+export const AnalyticsPanel: FC<Props> = ({ jobCreationDisabled }) => {
   const [analytics, setAnalytics] = useState<DataFrameAnalyticsListRow[]>([]);
   const [errorMessage, setErrorMessage] = useState<any>(undefined);
   const [isInitialized, setIsInitialized] = useState(false);
@@ -67,7 +70,7 @@ export const AnalyticsPanel: FC = () => {
           title={
             <h2>
               {i18n.translate('xpack.ml.overview.analyticsList.createFirstJobMessage', {
-                defaultMessage: 'Create your first analytics job.',
+                defaultMessage: 'Create your first analytics job',
               })}
             </h2>
           }
@@ -81,7 +84,13 @@ export const AnalyticsPanel: FC = () => {
             </Fragment>
           }
           actions={
-            <EuiButton href="#/data_frame_analytics?" color="primary" fill iconType="plusInCircle">
+            <EuiButton
+              href="#/data_frame_analytics?"
+              color="primary"
+              fill
+              iconType="plusInCircle"
+              isDisabled={jobCreationDisabled}
+            >
               {i18n.translate('xpack.ml.overview.analyticsList.createJobButtonText', {
                 defaultMessage: 'Create job',
               })}
diff --git a/x-pack/legacy/plugins/ml/public/overview/components/anomaly_detection_panel/anomaly_detection_panel.tsx b/x-pack/legacy/plugins/ml/public/overview/components/anomaly_detection_panel/anomaly_detection_panel.tsx
index 72e17c4d090f4e..3c89e72ee49436 100644
--- a/x-pack/legacy/plugins/ml/public/overview/components/anomaly_detection_panel/anomaly_detection_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/overview/components/anomaly_detection_panel/anomaly_detection_panel.tsx
@@ -50,7 +50,11 @@ function getDefaultAnomalyScores(groups: Group[]): MaxScoresByGroup {
   return anomalyScores;
 }
 
-export const AnomalyDetectionPanel: FC = () => {
+interface Props {
+  jobCreationDisabled: boolean;
+}
+
+export const AnomalyDetectionPanel: FC<Props> = ({ jobCreationDisabled }) => {
   const [isLoading, setIsLoading] = useState(false);
   const [groups, setGroups] = useState<GroupsDictionary>({});
   const [groupsCount, setGroupsCount] = useState<number>(0);
@@ -156,7 +160,7 @@ export const AnomalyDetectionPanel: FC = () => {
           title={
             <h2>
               {i18n.translate('xpack.ml.overview.anomalyDetection.createFirstJobMessage', {
-                defaultMessage: 'Create your first anomaly detection job.',
+                defaultMessage: 'Create your first anomaly detection job',
               })}
             </h2>
           }
@@ -170,7 +174,13 @@ export const AnomalyDetectionPanel: FC = () => {
             </Fragment>
           }
           actions={
-            <EuiButton color="primary" href={createJobLink} fill iconType="plusInCircle">
+            <EuiButton
+              color="primary"
+              href={createJobLink}
+              fill
+              iconType="plusInCircle"
+              isDisabled={jobCreationDisabled}
+            >
               {i18n.translate('xpack.ml.overview.anomalyDetection.createJobButtonText', {
                 defaultMessage: 'Create job',
               })}
diff --git a/x-pack/legacy/plugins/ml/public/overview/components/content.tsx b/x-pack/legacy/plugins/ml/public/overview/components/content.tsx
index 98295fe0a1a499..a285d5c91a266e 100644
--- a/x-pack/legacy/plugins/ml/public/overview/components/content.tsx
+++ b/x-pack/legacy/plugins/ml/public/overview/components/content.tsx
@@ -9,15 +9,23 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { AnomalyDetectionPanel } from './anomaly_detection_panel';
 import { AnalyticsPanel } from './analytics_panel/';
 
+interface Props {
+  createAnomalyDetectionJobDisabled: boolean;
+  createAnalyticsJobDisabled: boolean;
+}
+
 // Fetch jobs and determine what to show
-export const OverviewContent: FC = () => (
+export const OverviewContent: FC<Props> = ({
+  createAnomalyDetectionJobDisabled,
+  createAnalyticsJobDisabled,
+}) => (
   <EuiFlexItem grow={3}>
     <EuiFlexGroup direction="column">
       <EuiFlexItem grow={false}>
-        <AnomalyDetectionPanel />
+        <AnomalyDetectionPanel jobCreationDisabled={createAnomalyDetectionJobDisabled} />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <AnalyticsPanel />
+        <AnalyticsPanel jobCreationDisabled={createAnalyticsJobDisabled} />
       </EuiFlexItem>
     </EuiFlexGroup>
   </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/ml/public/overview/components/sidebar.tsx b/x-pack/legacy/plugins/ml/public/overview/components/sidebar.tsx
index 5a25f9ad54aa14..496beb158f6984 100644
--- a/x-pack/legacy/plugins/ml/public/overview/components/sidebar.tsx
+++ b/x-pack/legacy/plugins/ml/public/overview/components/sidebar.tsx
@@ -17,7 +17,27 @@ const feedbackLink = 'https://www.elastic.co/community/';
 const transformsLink = `${chrome.getBasePath()}/app/kibana#/management/elasticsearch/transform`;
 const whatIsMachineLearningLink = 'https://www.elastic.co/what-is/elasticsearch-machine-learning';
 
-export const OverviewSideBar: FC = () => (
+interface Props {
+  createAnomalyDetectionJobDisabled: boolean;
+}
+
+function getCreateJobLink(createAnomalyDetectionJobDisabled: boolean) {
+  return createAnomalyDetectionJobDisabled === true ? (
+    <FormattedMessage
+      id="xpack.ml.overview.gettingStartedSectionCreateJob"
+      defaultMessage="creating a new job"
+    />
+  ) : (
+    <EuiLink href={createJobLink} target="blank">
+      <FormattedMessage
+        id="xpack.ml.overview.gettingStartedSectionCreateJob"
+        defaultMessage="creating a new job"
+      />
+    </EuiLink>
+  );
+}
+
+export const OverviewSideBar: FC<Props> = ({ createAnomalyDetectionJobDisabled }) => (
   <EuiFlexItem grow={1}>
     <EuiText className="mlOverview__sidebar">
       <h2>
@@ -41,14 +61,7 @@ export const OverviewSideBar: FC = () => (
                 />
               </EuiLink>
             ),
-            createJob: (
-              <EuiLink href={createJobLink} target="blank">
-                <FormattedMessage
-                  id="xpack.ml.overview.gettingStartedSectionCreateJob"
-                  defaultMessage="creating a new job"
-                />
-              </EuiLink>
-            ),
+            createJob: getCreateJobLink(createAnomalyDetectionJobDisabled),
             transforms: (
               <EuiLink href={transformsLink} target="blank">
                 <FormattedMessage
diff --git a/x-pack/legacy/plugins/ml/public/overview/overview_page.tsx b/x-pack/legacy/plugins/ml/public/overview/overview_page.tsx
index 39c3205d54eda5..eb8dde613e050d 100644
--- a/x-pack/legacy/plugins/ml/public/overview/overview_page.tsx
+++ b/x-pack/legacy/plugins/ml/public/overview/overview_page.tsx
@@ -6,19 +6,28 @@
 
 import React, { Fragment, FC } from 'react';
 import { EuiFlexGroup, EuiPage, EuiPageBody } from '@elastic/eui';
+import { checkPermission } from '../privilege/check_privilege';
+import { mlNodesAvailable } from '../ml_nodes_check/check_ml_nodes';
 import { NavigationMenu } from '../components/navigation_menu';
 import { OverviewSideBar } from './components/sidebar';
 import { OverviewContent } from './components/content';
 
 export const OverviewPage: FC = () => {
+  const disableCreateAnomalyDetectionJob = !checkPermission('canCreateJob') || !mlNodesAvailable();
+  const disableCreateAnalyticsButton =
+    !checkPermission('canCreateDataFrameAnalytics') ||
+    !checkPermission('canStartStopDataFrameAnalytics');
   return (
     <Fragment>
       <NavigationMenu tabId="overview" />
       <EuiPage data-test-subj="mlPageOverview">
         <EuiPageBody>
           <EuiFlexGroup>
-            <OverviewSideBar />
-            <OverviewContent />
+            <OverviewSideBar createAnomalyDetectionJobDisabled={disableCreateAnomalyDetectionJob} />
+            <OverviewContent
+              createAnomalyDetectionJobDisabled={disableCreateAnomalyDetectionJob}
+              createAnalyticsJobDisabled={disableCreateAnalyticsButton}
+            />
           </EuiFlexGroup>
         </EuiPageBody>
       </EuiPage>
diff --git a/x-pack/legacy/plugins/ml/public/overview/route.ts b/x-pack/legacy/plugins/ml/public/overview/route.ts
index 4f5ce7e453f9ad..c24b537796a00b 100644
--- a/x-pack/legacy/plugins/ml/public/overview/route.ts
+++ b/x-pack/legacy/plugins/ml/public/overview/route.ts
@@ -5,6 +5,7 @@
  */
 
 import uiRoutes from 'ui/routes';
+import { getMlNodeCount } from '../ml_nodes_check/check_ml_nodes';
 // @ts-ignore no declaration module
 import { checkFullLicense } from '../license/check_license';
 import { checkGetJobsPrivilege } from '../privilege/check_privilege';
@@ -19,5 +20,6 @@ uiRoutes.when('/overview/?', {
   resolve: {
     CheckLicense: checkFullLicense,
     privileges: checkGetJobsPrivilege,
+    mlNodeCount: getMlNodeCount,
   },
 });
diff --git a/x-pack/legacy/plugins/ml/public/services/__mocks__/cloudwatch_job_caps_response.json b/x-pack/legacy/plugins/ml/public/services/__mocks__/cloudwatch_job_caps_response.json
new file mode 100644
index 00000000000000..783b2d4e081bcb
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/services/__mocks__/cloudwatch_job_caps_response.json
@@ -0,0 +1,905 @@
+{
+  "cloudwatch-*": {
+    "aggs": [
+      {
+        "id": "count",
+        "title": "Count",
+        "kibanaName": "count",
+        "dslName": "count",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "high_count",
+        "title": "High count",
+        "kibanaName": "count",
+        "dslName": "count",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "low_count",
+        "title": "Low count",
+        "kibanaName": "count",
+        "dslName": "count",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "mean",
+        "title": "Mean",
+        "kibanaName": "avg",
+        "dslName": "avg",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "avg",
+          "min": "avg"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "high_mean",
+        "title": "High mean",
+        "kibanaName": "avg",
+        "dslName": "avg",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "avg",
+          "min": "avg"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "low_mean",
+        "title": "Low mean",
+        "kibanaName": "avg",
+        "dslName": "avg",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "avg",
+          "min": "avg"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "sum",
+        "title": "Sum",
+        "kibanaName": "sum",
+        "dslName": "sum",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "sum",
+          "min": "sum"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "high_sum",
+        "title": "High sum",
+        "kibanaName": "sum",
+        "dslName": "sum",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "sum",
+          "min": "sum"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "low_sum",
+        "title": "Low sum",
+        "kibanaName": "sum",
+        "dslName": "sum",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "sum",
+          "min": "sum"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "median",
+        "title": "Median",
+        "kibanaName": "median",
+        "dslName": "percentiles",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "high_median",
+        "title": "High median",
+        "kibanaName": "median",
+        "dslName": "percentiles",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "low_median",
+        "title": "Low median",
+        "kibanaName": "median",
+        "dslName": "percentiles",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "min",
+        "title": "Min",
+        "kibanaName": "min",
+        "dslName": "min",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "min",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "max",
+        "title": "Max",
+        "kibanaName": "max",
+        "dslName": "max",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "max"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "distinct_count",
+        "title": "Distinct count",
+        "kibanaName": "cardinality",
+        "dslName": "cardinality",
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "instance",
+          "region",
+          "sourcetype.keyword",
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "non_zero_count",
+        "title": "Non zero count",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "high_non_zero_count",
+        "title": "High non zero count",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "low_non_zero_count",
+        "title": "Low non zero count",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "high_distinct_count",
+        "title": "High distinct count",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "instance",
+          "region",
+          "sourcetype.keyword",
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "low_distinct_count",
+        "title": "Low distinct count",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "instance",
+          "region",
+          "sourcetype.keyword",
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "metric",
+        "title": "Metric",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "varp",
+        "title": "varp",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "high_varp",
+        "title": "High varp",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "low_varp",
+        "title": "Low varp",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "non_null_sum",
+        "title": "Non null sum",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "high_non_null_sum",
+        "title": "High non null sum",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "low_non_null_sum",
+        "title": "Low non null sum",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "rare",
+        "title": "Rare",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "freq_rare",
+        "title": "Freq rare",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "info_content",
+        "title": "Info content",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "high_info_content",
+        "title": "High info content",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "low_info_content",
+        "title": "Low info content",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      },
+      {
+        "id": "time_of_day",
+        "title": "Time of day",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "time_of_week",
+        "title": "Time of week",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        }
+      },
+      {
+        "id": "lat_long",
+        "title": "Lat long",
+        "kibanaName": null,
+        "dslName": null,
+        "type": "metrics",
+        "mlModelPlotAgg": {
+          "max": "max",
+          "min": "min"
+        },
+        "fieldIds": [
+          "CPUUtilization",
+          "DiskReadBytes",
+          "DiskReadOps",
+          "DiskWriteBytes",
+          "DiskWriteOps",
+          "NetworkIn",
+          "NetworkOut"
+        ]
+      }
+    ],
+    "fields": [
+      {
+        "id": "@timestamp",
+        "name": "@timestamp",
+        "type": "date",
+        "aggregatable": true,
+        "aggIds": []
+      },
+      {
+        "id": "CPUUtilization",
+        "name": "CPUUtilization",
+        "type": "double",
+        "aggregatable": true,
+        "aggIds": [
+          "mean",
+          "high_mean",
+          "low_mean",
+          "sum",
+          "high_sum",
+          "low_sum",
+          "median",
+          "high_median",
+          "low_median",
+          "min",
+          "max",
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count",
+          "metric",
+          "varp",
+          "high_varp",
+          "low_varp",
+          "non_null_sum",
+          "high_non_null_sum",
+          "low_non_null_sum",
+          "info_content",
+          "high_info_content",
+          "low_info_content",
+          "lat_long"
+        ]
+      },
+      {
+        "id": "DiskReadBytes",
+        "name": "DiskReadBytes",
+        "type": "double",
+        "aggregatable": true,
+        "aggIds": [
+          "mean",
+          "high_mean",
+          "low_mean",
+          "sum",
+          "high_sum",
+          "low_sum",
+          "median",
+          "high_median",
+          "low_median",
+          "min",
+          "max",
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count",
+          "metric",
+          "varp",
+          "high_varp",
+          "low_varp",
+          "non_null_sum",
+          "high_non_null_sum",
+          "low_non_null_sum",
+          "info_content",
+          "high_info_content",
+          "low_info_content",
+          "lat_long"
+        ]
+      },
+      {
+        "id": "DiskReadOps",
+        "name": "DiskReadOps",
+        "type": "double",
+        "aggregatable": true,
+        "aggIds": [
+          "mean",
+          "high_mean",
+          "low_mean",
+          "sum",
+          "high_sum",
+          "low_sum",
+          "median",
+          "high_median",
+          "low_median",
+          "min",
+          "max",
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count",
+          "metric",
+          "varp",
+          "high_varp",
+          "low_varp",
+          "non_null_sum",
+          "high_non_null_sum",
+          "low_non_null_sum",
+          "info_content",
+          "high_info_content",
+          "low_info_content",
+          "lat_long"
+        ]
+      },
+      {
+        "id": "DiskWriteBytes",
+        "name": "DiskWriteBytes",
+        "type": "double",
+        "aggregatable": true,
+        "aggIds": [
+          "mean",
+          "high_mean",
+          "low_mean",
+          "sum",
+          "high_sum",
+          "low_sum",
+          "median",
+          "high_median",
+          "low_median",
+          "min",
+          "max",
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count",
+          "metric",
+          "varp",
+          "high_varp",
+          "low_varp",
+          "non_null_sum",
+          "high_non_null_sum",
+          "low_non_null_sum",
+          "info_content",
+          "high_info_content",
+          "low_info_content",
+          "lat_long"
+        ]
+      },
+      {
+        "id": "DiskWriteOps",
+        "name": "DiskWriteOps",
+        "type": "double",
+        "aggregatable": true,
+        "aggIds": [
+          "mean",
+          "high_mean",
+          "low_mean",
+          "sum",
+          "high_sum",
+          "low_sum",
+          "median",
+          "high_median",
+          "low_median",
+          "min",
+          "max",
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count",
+          "metric",
+          "varp",
+          "high_varp",
+          "low_varp",
+          "non_null_sum",
+          "high_non_null_sum",
+          "low_non_null_sum",
+          "info_content",
+          "high_info_content",
+          "low_info_content",
+          "lat_long"
+        ]
+      },
+      {
+        "id": "instance",
+        "name": "instance",
+        "type": "keyword",
+        "aggregatable": true,
+        "aggIds": [
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count"
+        ]
+      },
+      {
+        "id": "NetworkIn",
+        "name": "NetworkIn",
+        "type": "double",
+        "aggregatable": true,
+        "aggIds": [
+          "mean",
+          "high_mean",
+          "low_mean",
+          "sum",
+          "high_sum",
+          "low_sum",
+          "median",
+          "high_median",
+          "low_median",
+          "min",
+          "max",
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count",
+          "metric",
+          "varp",
+          "high_varp",
+          "low_varp",
+          "non_null_sum",
+          "high_non_null_sum",
+          "low_non_null_sum",
+          "info_content",
+          "high_info_content",
+          "low_info_content",
+          "lat_long"
+        ]
+      },
+      {
+        "id": "NetworkOut",
+        "name": "NetworkOut",
+        "type": "double",
+        "aggregatable": true,
+        "aggIds": [
+          "mean",
+          "high_mean",
+          "low_mean",
+          "sum",
+          "high_sum",
+          "low_sum",
+          "median",
+          "high_median",
+          "low_median",
+          "min",
+          "max",
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count",
+          "metric",
+          "varp",
+          "high_varp",
+          "low_varp",
+          "non_null_sum",
+          "high_non_null_sum",
+          "low_non_null_sum",
+          "info_content",
+          "high_info_content",
+          "low_info_content",
+          "lat_long"
+        ]
+      },
+      {
+        "id": "region",
+        "name": "region",
+        "type": "keyword",
+        "aggregatable": true,
+        "aggIds": [
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count"
+        ]
+      },
+      {
+        "id": "sourcetype",
+        "name": "sourcetype",
+        "type": "text",
+        "aggregatable": false,
+        "aggIds": []
+      },
+      {
+        "id": "sourcetype.keyword",
+        "name": "sourcetype.keyword",
+        "type": "keyword",
+        "aggregatable": true,
+        "aggIds": [
+          "distinct_count",
+          "high_distinct_count",
+          "low_distinct_count"
+        ]
+      }
+    ]
+  }
+}
diff --git a/x-pack/legacy/plugins/ml/public/services/__mocks__/farequote_job_caps_response.json b/x-pack/legacy/plugins/ml/public/services/__mocks__/farequote_job_caps_response.json
deleted file mode 100644
index cff91d90e8ffca..00000000000000
--- a/x-pack/legacy/plugins/ml/public/services/__mocks__/farequote_job_caps_response.json
+++ /dev/null
@@ -1,528 +0,0 @@
-{
-  "farequote-*": {
-    "aggs": [
-      {
-        "id": "count",
-        "title": "Count",
-        "kibanaName": "count",
-        "dslName": "count",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "high_count",
-        "title": "High count",
-        "kibanaName": "count",
-        "dslName": "count",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "low_count",
-        "title": "Low count",
-        "kibanaName": "count",
-        "dslName": "count",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "mean",
-        "title": "Mean",
-        "kibanaName": "avg",
-        "dslName": "avg",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "avg",
-          "min": "avg"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "high_mean",
-        "title": "High mean",
-        "kibanaName": "avg",
-        "dslName": "avg",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "avg",
-          "min": "avg"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "low_mean",
-        "title": "Low mean",
-        "kibanaName": "avg",
-        "dslName": "avg",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "avg",
-          "min": "avg"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "sum",
-        "title": "Sum",
-        "kibanaName": "sum",
-        "dslName": "sum",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "sum",
-          "min": "sum"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "high_sum",
-        "title": "High sum",
-        "kibanaName": "sum",
-        "dslName": "sum",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "sum",
-          "min": "sum"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "low_sum",
-        "title": "Low sum",
-        "kibanaName": "sum",
-        "dslName": "sum",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "sum",
-          "min": "sum"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "median",
-        "title": "Median",
-        "kibanaName": "median",
-        "dslName": "percentiles",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "high_median",
-        "title": "High median",
-        "kibanaName": "median",
-        "dslName": "percentiles",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "low_median",
-        "title": "Low median",
-        "kibanaName": "median",
-        "dslName": "percentiles",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "min",
-        "title": "Min",
-        "kibanaName": "min",
-        "dslName": "min",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "min",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "max",
-        "title": "Max",
-        "kibanaName": "max",
-        "dslName": "max",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "max"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "distinct_count",
-        "title": "Distinct count",
-        "kibanaName": "cardinality",
-        "dslName": "cardinality",
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "airline",
-          "responsetime"
-        ]
-      },
-      {
-        "id": "non_zero_count",
-        "title": "Non zero count",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "high_non_zero_count",
-        "title": "High non zero count",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "low_non_zero_count",
-        "title": "Low non zero count",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "high_distinct_count",
-        "title": "High distinct count",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "low_distinct_count",
-        "title": "Low distinct count",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "metric",
-        "title": "Metric",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "varp",
-        "title": "varp",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "high_varp",
-        "title": "High varp",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "low_varp",
-        "title": "Low varp",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "non_null_sum",
-        "title": "Non null sum",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "high_non_null_sum",
-        "title": "High non null sum",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "low_non_null_sum",
-        "title": "Low non null sum",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "rare",
-        "title": "Rare",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "freq_rare",
-        "title": "Freq rare",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "info_content",
-        "title": "Info content",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "high_info_content",
-        "title": "High info content",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "low_info_content",
-        "title": "Low info content",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      },
-      {
-        "id": "time_of_day",
-        "title": "Time of day",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "time_of_week",
-        "title": "Time of week",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": []
-      },
-      {
-        "id": "lat_long",
-        "title": "Lat long",
-        "kibanaName": null,
-        "dslName": null,
-        "type": "metrics",
-        "mlModelPlotAgg": {
-          "max": "max",
-          "min": "min"
-        },
-        "fieldIds": [
-          "responsetime"
-        ]
-      }
-    ],
-    "fields": [
-      {
-        "id": "@timestamp",
-        "name": "@timestamp",
-        "type": "date",
-        "aggregatable": true,
-        "aggIds": []
-      },
-      {
-        "id": "airline",
-        "name": "airline",
-        "type": "keyword",
-        "aggregatable": true,
-        "aggIds": [
-          "distinct_count"
-        ]
-      },
-      {
-        "id": "responsetime",
-        "name": "responsetime",
-        "type": "float",
-        "aggregatable": true,
-        "aggIds": [
-          "mean",
-          "high_mean",
-          "low_mean",
-          "sum",
-          "high_sum",
-          "low_sum",
-          "median",
-          "high_median",
-          "low_median",
-          "min",
-          "max",
-          "distinct_count",
-          "high_distinct_count",
-          "low_distinct_count",
-          "metric",
-          "varp",
-          "high_varp",
-          "low_varp",
-          "non_null_sum",
-          "high_non_null_sum",
-          "low_non_null_sum",
-          "info_content",
-          "high_info_content",
-          "low_info_content",
-          "lat_long"
-        ]
-      }
-    ]
-  }
-}
diff --git a/x-pack/legacy/plugins/ml/public/services/field_format_service.js b/x-pack/legacy/plugins/ml/public/services/field_format_service.js
index ddcf156069639c..4d99ec3fe48d19 100644
--- a/x-pack/legacy/plugins/ml/public/services/field_format_service.js
+++ b/x-pack/legacy/plugins/ml/public/services/field_format_service.js
@@ -79,8 +79,11 @@ class FieldFormatService {
     // e.g. distinct_count(clientip) should be formatted as a count, not as an IP address.
     let fieldFormat = undefined;
     if (esAggName !== 'cardinality') {
-      const indexPatternFields = _.get(fullIndexPattern, 'fields', []);
-      fieldFormat = _.get(indexPatternFields, [fieldName, 'format']);
+      const fieldList = _.get(fullIndexPattern, 'fields', []);
+      const field = fieldList.getByName(fieldName);
+      if (field !== undefined) {
+        fieldFormat = field.format;
+      }
     }
 
     return fieldFormat;
@@ -99,13 +102,16 @@ class FieldFormatService {
         getIndexPatternById(indexPatternId)
           .then((indexPatternData) => {
             // Store the FieldFormat for each job by detector_index.
-            const fieldsByName = _.get(indexPatternData, 'fields', []);
+            const fieldList = _.get(indexPatternData, 'fields', []);
             _.each(detectors, (dtr) => {
               const esAgg = mlFunctionToESAggregation(dtr.function);
               // distinct_count detectors should fall back to the default
               // formatter as the values are just counts.
               if (dtr.field_name !== undefined && esAgg !== 'cardinality') {
-                formatsByDetector[dtr.detector_index] = _.get(fieldsByName, [dtr.field_name, 'format']);
+                const field = fieldList.getByName(dtr.field_name);
+                if (field !== undefined) {
+                  formatsByDetector[dtr.detector_index] = field.format;
+                }
               }
             });
 
diff --git a/x-pack/legacy/plugins/ml/public/services/job_service.d.ts b/x-pack/legacy/plugins/ml/public/services/job_service.d.ts
index d00c4c35225a42..383932c812216d 100644
--- a/x-pack/legacy/plugins/ml/public/services/job_service.d.ts
+++ b/x-pack/legacy/plugins/ml/public/services/job_service.d.ts
@@ -13,7 +13,6 @@ export interface ExistingJobsAndGroups {
 }
 
 declare interface JobService {
-  currentJob: any;
   createResultsUrlForJobs: (jobs: any[], target: string) => string;
   tempJobCloningObjects: {
     job: any;
diff --git a/x-pack/legacy/plugins/ml/public/services/job_service.js b/x-pack/legacy/plugins/ml/public/services/job_service.js
index 3d5f04fd627a94..27dcd0135ad77d 100644
--- a/x-pack/legacy/plugins/ml/public/services/job_service.js
+++ b/x-pack/legacy/plugins/ml/public/services/job_service.js
@@ -24,13 +24,11 @@ let datafeedIds = {};
 
 class JobService {
   constructor() {
-    // currentJob -> used to pass a job object between the job management page and
+    // tempJobCloningObjects -> used to pass a job object between the job management page and
     // and the advanced wizard.
     // if populated when loading the advanced wizard, the job is used for cloning.
     // if populated when loading the job management page, the start datafeed modal
     // is automatically opened.
-    this.currentJob = undefined;
-
     this.tempJobCloningObjects = {
       job: undefined,
       skipTimeRangeStep: false,
diff --git a/x-pack/legacy/plugins/ml/public/services/ml_api_service/index.js b/x-pack/legacy/plugins/ml/public/services/ml_api_service/index.js
index c6a60a9eff7daa..94c79fe470236d 100644
--- a/x-pack/legacy/plugins/ml/public/services/ml_api_service/index.js
+++ b/x-pack/legacy/plugins/ml/public/services/ml_api_service/index.js
@@ -292,7 +292,8 @@ export const ml = {
       'useDedicatedIndex',
       'startDatafeed',
       'start',
-      'end'
+      'end',
+      'jobOverrides',
     ]);
 
     return http({
diff --git a/x-pack/legacy/plugins/ml/public/services/new_job_capabilities._service.test.ts b/x-pack/legacy/plugins/ml/public/services/new_job_capabilities._service.test.ts
index fc8bb2407f75ab..91c945ea8ff296 100644
--- a/x-pack/legacy/plugins/ml/public/services/new_job_capabilities._service.test.ts
+++ b/x-pack/legacy/plugins/ml/public/services/new_job_capabilities._service.test.ts
@@ -9,40 +9,60 @@ import { IndexPattern } from 'ui/index_patterns';
 
 // there is magic happening here. starting the include name with `mock..`
 // ensures it can be lazily loaded by the jest.mock function below.
-import mockFarequoteResponse from './__mocks__/farequote_job_caps_response.json';
+import mockCloudwatchResponse from './__mocks__/cloudwatch_job_caps_response.json';
 
 jest.mock('./ml_api_service', () => ({
   ml: {
     jobs: {
-      newJobCaps: jest.fn(() => Promise.resolve(mockFarequoteResponse)),
+      newJobCaps: jest.fn(() => Promise.resolve(mockCloudwatchResponse)),
     },
   },
 }));
 
 const indexPattern = ({
-  id: 'farequote-*',
-  title: 'farequote-*',
+  id: 'cloudwatch-*',
+  title: 'cloudwatch-*',
 } as unknown) as IndexPattern;
 
 describe('new_job_capabilities_service', () => {
-  describe('farequote newJobCaps()', () => {
+  describe('cloudwatch newJobCaps()', () => {
     it('can construct job caps objects from endpoint json', async done => {
       await newJobCapsService.initializeFromIndexPattern(indexPattern);
       const { fields, aggs } = await newJobCapsService.newJobCaps;
 
-      const responseTimeField = fields.find(f => f.id === 'responsetime') || { aggs: [] };
-      const airlineField = fields.find(f => f.id === 'airline') || { aggs: [] };
+      const networkOutField = fields.find(f => f.id === 'NetworkOut') || { aggs: [] };
+      const regionField = fields.find(f => f.id === 'region') || { aggs: [] };
       const meanAgg = aggs.find(a => a.id === 'mean') || { fields: [] };
       const distinctCountAgg = aggs.find(a => a.id === 'distinct_count') || { fields: [] };
 
-      expect(fields).toHaveLength(4);
+      expect(fields).toHaveLength(12);
       expect(aggs).toHaveLength(35);
 
-      expect(responseTimeField.aggs).toHaveLength(25);
-      expect(airlineField.aggs).toHaveLength(1);
+      expect(networkOutField.aggs).toHaveLength(25);
+      expect(regionField.aggs).toHaveLength(3);
+
+      expect(meanAgg.fields).toHaveLength(7);
+      expect(distinctCountAgg.fields).toHaveLength(10);
+      done();
+    });
+
+    it('job caps including text fields', async done => {
+      await newJobCapsService.initializeFromIndexPattern(indexPattern, true, false);
+      const { fields, aggs } = await newJobCapsService.newJobCaps;
+
+      expect(fields).toHaveLength(13); // one more field
+      expect(aggs).toHaveLength(35);
+
+      done();
+    });
+
+    it('job caps excluding event rate', async done => {
+      await newJobCapsService.initializeFromIndexPattern(indexPattern, false, true);
+      const { fields, aggs } = await newJobCapsService.newJobCaps;
+
+      expect(fields).toHaveLength(11); // one less field
+      expect(aggs).toHaveLength(35);
 
-      expect(meanAgg.fields).toHaveLength(1);
-      expect(distinctCountAgg.fields).toHaveLength(2);
       done();
     });
   });
diff --git a/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts b/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts
index 890683793339a2..ded9aa410766e5 100644
--- a/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts
+++ b/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts
@@ -50,20 +50,25 @@ export function loadNewJobCapabilities(
 const categoryFieldTypes = [ES_FIELD_TYPES.TEXT, ES_FIELD_TYPES.KEYWORD, ES_FIELD_TYPES.IP];
 
 class NewJobCapsService {
-  private _fields: Field[];
-  private _aggs: Aggregation[];
-  private _includeEventRateField: boolean;
-
-  constructor(includeEventRateField = true) {
-    this._fields = [];
-    this._aggs = [];
-    this._includeEventRateField = includeEventRateField;
-  }
+  private _fields: Field[] = [];
+  private _catFields: Field[] = [];
+  private _dateFields: Field[] = [];
+  private _aggs: Aggregation[] = [];
+  private _includeEventRateField: boolean = true;
+  private _removeTextFields: boolean = true;
 
   public get fields(): Field[] {
     return this._fields;
   }
 
+  public get catFields(): Field[] {
+    return this._catFields;
+  }
+
+  public get dateFields(): Field[] {
+    return this._dateFields;
+  }
+
   public get aggs(): Aggregation[] {
     return this._aggs;
   }
@@ -79,16 +84,38 @@ class NewJobCapsService {
     return this._fields.filter(f => categoryFieldTypes.includes(f.type));
   }
 
-  public async initializeFromIndexPattern(indexPattern: IndexPattern) {
+  public async initializeFromIndexPattern(
+    indexPattern: IndexPattern,
+    includeEventRateField = true,
+    removeTextFields = true
+  ) {
     try {
+      this._includeEventRateField = includeEventRateField;
+      this._removeTextFields = removeTextFields;
+
       const resp = await ml.jobs.newJobCaps(indexPattern.title, indexPattern.type === 'rollup');
-      const { fields, aggs } = createObjects(resp, indexPattern.title);
+      const { fields: allFields, aggs } = createObjects(resp, indexPattern.title);
 
       if (this._includeEventRateField === true) {
-        addEventRateField(aggs, fields);
+        addEventRateField(aggs, allFields);
       }
 
+      const { fieldsPreferringKeyword, fieldsPreferringText } = processTextAndKeywordFields(
+        allFields
+      );
+      const catFields = fieldsPreferringText.filter(
+        f => f.type === ES_FIELD_TYPES.KEYWORD || f.type === ES_FIELD_TYPES.TEXT
+      );
+      const dateFields = fieldsPreferringText.filter(f => f.type === ES_FIELD_TYPES.DATE);
+      const fields = this._removeTextFields ? fieldsPreferringKeyword : allFields;
+
+      // set the main fields list to contain fields which have been filtered to prefer
+      // keyword fields over text fields.
+      // e.g. if foo.keyword and foo exist, don't add foo to the list.
       this._fields = fields;
+      // set the category fields to contain fields which have been filtered to prefer text fields.
+      this._catFields = catFields;
+      this._dateFields = dateFields;
       this._aggs = aggs;
     } catch (error) {
       console.error('Unable to load new job capabilities', error); // eslint-disable-line no-console
@@ -199,4 +226,25 @@ function addEventRateField(aggs: Aggregation[], fields: Field[]) {
   fields.splice(0, 0, eventRateField);
 }
 
+// create two lists, one removing text fields if there are keyword equivalents and vice versa
+function processTextAndKeywordFields(fields: Field[]) {
+  const keywordIds = fields.filter(f => f.type === ES_FIELD_TYPES.KEYWORD).map(f => f.id);
+  const textIds = fields.filter(f => f.type === ES_FIELD_TYPES.TEXT).map(f => f.id);
+
+  const fieldsPreferringKeyword = fields.filter(
+    f =>
+      f.type !== ES_FIELD_TYPES.TEXT ||
+      (f.type === ES_FIELD_TYPES.TEXT && keywordIds.includes(`${f.id}.keyword`) === false)
+  );
+
+  const fieldsPreferringText = fields.filter(
+    f =>
+      f.type !== ES_FIELD_TYPES.KEYWORD ||
+      (f.type === ES_FIELD_TYPES.KEYWORD &&
+        textIds.includes(f.id.replace(/\.keyword$/, '')) === false)
+  );
+
+  return { fieldsPreferringKeyword, fieldsPreferringText };
+}
+
 export const newJobCapsService = new NewJobCapsService();
diff --git a/x-pack/legacy/plugins/ml/public/timeseriesexplorer/_timeseriesexplorer.scss b/x-pack/legacy/plugins/ml/public/timeseriesexplorer/_timeseriesexplorer.scss
index aa172cf000d5fb..0dd32ceabdb055 100644
--- a/x-pack/legacy/plugins/ml/public/timeseriesexplorer/_timeseriesexplorer.scss
+++ b/x-pack/legacy/plugins/ml/public/timeseriesexplorer/_timeseriesexplorer.scss
@@ -26,6 +26,10 @@
     }
   }
 
+  .single-metric-request-callout {
+    margin: 0 $euiSize;
+  }
+
   .results-container {
     padding: $euiSize;
 
diff --git a/x-pack/legacy/plugins/ml/public/timeseriesexplorer/components/entity_control/entity_control.js b/x-pack/legacy/plugins/ml/public/timeseriesexplorer/components/entity_control/entity_control.js
index 0e82002904d519..7fb741096e32bf 100644
--- a/x-pack/legacy/plugins/ml/public/timeseriesexplorer/components/entity_control/entity_control.js
+++ b/x-pack/legacy/plugins/ml/public/timeseriesexplorer/components/entity_control/entity_control.js
@@ -6,12 +6,13 @@
 
 import PropTypes from 'prop-types';
 import React from 'react';
-import { injectI18n } from '@kbn/i18n/react';
+import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
 
 import {
   EuiComboBox,
   EuiFlexItem,
   EuiFormRow,
+  EuiToolTip,
 } from '@elastic/eui';
 
 function getEntityControlOptions(entity) {
@@ -29,6 +30,7 @@ export const EntityControl = injectI18n(
     static propTypes = {
       entity: PropTypes.object.isRequired,
       entityFieldValueChanged: PropTypes.func.isRequired,
+      forceSelection: PropTypes.bool.isRequired,
     };
 
     state = {
@@ -40,7 +42,7 @@ export const EntityControl = injectI18n(
     }
 
     componentDidUpdate() {
-      const { entity } = this.props;
+      const { entity, forceSelection } = this.props;
       const { selectedOptions } = this.state;
 
       const fieldValue = entity.fieldValue;
@@ -57,6 +59,10 @@ export const EntityControl = injectI18n(
           selectedOptions: undefined
         });
       }
+
+      if (forceSelection && this.inputRef) {
+        this.inputRef.focus();
+      }
     }
 
     onChange = (selectedOptions) => {
@@ -70,25 +76,45 @@ export const EntityControl = injectI18n(
     };
 
     render() {
-      const { entity, intl } = this.props;
+      const { entity, intl, forceSelection } = this.props;
       const { selectedOptions } = this.state;
       const options = getEntityControlOptions(entity);
 
+      const control = (<EuiComboBox
+        inputRef={input => {
+          if (input) {
+            this.inputRef = input;
+          }
+        }}
+        style={{ minWidth: '300px' }}
+        placeholder={intl.formatMessage({
+          id: 'xpack.ml.timeSeriesExplorer.enterValuePlaceholder',
+          defaultMessage: 'Enter value'
+        })}
+        singleSelection={{ asPlainText: true }}
+        options={options}
+        selectedOptions={selectedOptions}
+        onChange={this.onChange}
+        isClearable={false}
+      />);
+
+      const selectMessage = (<FormattedMessage
+        id="xpack.ml.timeSeriesExplorer.selectFieldMessage"
+        defaultMessage="Select {fieldName}"
+        values={{ fieldName: entity.fieldName }}
+      />);
+
       return (
         <EuiFlexItem grow={false}>
-          <EuiFormRow label={entity.fieldName}>
-            <EuiComboBox
-              style={{ minWidth: '300px' }}
-              placeholder={intl.formatMessage({
-                id: 'xpack.ml.timeSeriesExplorer.enterValuePlaceholder',
-                defaultMessage: 'Enter value'
-              })}
-              singleSelection={{ asPlainText: true }}
-              options={options}
-              selectedOptions={selectedOptions}
-              onChange={this.onChange}
-              isClearable={false}
-            />
+          <EuiFormRow
+            label={entity.fieldName}
+            helpText={forceSelection ? selectMessage : null}
+          >
+            <EuiToolTip
+              position="right"
+              content={forceSelection ? selectMessage : null}
+            >{control}
+            </EuiToolTip>
           </EuiFormRow>
         </EuiFlexItem>
       );
diff --git a/x-pack/legacy/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.js b/x-pack/legacy/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.js
index d335baa3a56d8b..73d1dd28180423 100644
--- a/x-pack/legacy/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/legacy/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.js
@@ -16,6 +16,7 @@ import PropTypes from 'prop-types';
 import React, { createRef, Fragment } from 'react';
 
 import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 import {
   EuiCheckbox,
@@ -26,6 +27,7 @@ import {
   EuiSelect,
   EuiSpacer,
   EuiText,
+  EuiCallOut,
 } from '@elastic/eui';
 
 import chrome from 'ui/chrome';
@@ -161,6 +163,8 @@ export class TimeSeriesExplorer extends React.Component {
 
   subscriptions = new Subscription();
 
+  _criteriaFields = null;
+
   constructor(props) {
     super(props);
     const { jobSelectService, unsubscribeFromGlobalState } = jobSelectServiceFactory(props.globalState);
@@ -216,17 +220,36 @@ export class TimeSeriesExplorer extends React.Component {
 
   tableFilter = (field, value, operator) => {
     const { entities } = this.state;
+    const entity = entities.find(({ fieldName }) => fieldName === field);
 
-    const entity = find(entities, { fieldName: field });
-    if (entity !== undefined) {
-      if (operator === '+' && entity.fieldValue !== value) {
-        entity.fieldValue = value;
-        this.saveSeriesPropertiesAndRefresh();
-      } else if (operator === '-' && entity.fieldValue === value) {
-        entity.fieldValue = '';
-        this.saveSeriesPropertiesAndRefresh();
-      }
+    if (entity === undefined) {
+      return;
+    }
+
+    const { appStateHandler } = this.props;
+
+    let resultValue = '';
+    if (operator === '+' && entity.fieldValue !== value) {
+      resultValue = value;
+    } else if (operator === '-' && entity.fieldValue === value) {
+      resultValue = '';
+    } else {
+      return;
     }
+
+    const resultEntities = {
+      ...entities.reduce((appStateEntities, appStateEntity) => {
+        appStateEntities[appStateEntity.fieldName] = appStateEntity.fieldValue;
+        return appStateEntities;
+      }, {}),
+      [entity.fieldName]: resultValue,
+    };
+
+    appStateHandler(APP_STATE_ACTION.SET_ENTITIES, resultEntities);
+
+    this.updateControlsForDetector(() => {
+      this.refresh();
+    });
   }
 
   contextChartSelectedInitCallDone = false;
@@ -296,7 +319,6 @@ export class TimeSeriesExplorer extends React.Component {
       const searchBounds = getBoundsRoundedToInterval(bounds, focusAggregationInterval, false);
 
       const {
-        criteriaFields,
         detectorId,
         entities,
         modelPlotEnabled,
@@ -310,7 +332,7 @@ export class TimeSeriesExplorer extends React.Component {
       });
 
       getFocusData(
-        criteriaFields,
+        this._criteriaFields,
         +detectorId,
         focusAggregationInterval,
         appStateHandler(APP_STATE_ACTION.GET_FORECAST_ID),
@@ -357,11 +379,11 @@ export class TimeSeriesExplorer extends React.Component {
 
   loadAnomaliesTableData = (earliestMs, latestMs) => {
     const { dateFormatTz } = this.props;
-    const { criteriaFields, selectedJob } = this.state;
+    const { selectedJob } = this.state;
 
     ml.results.getAnomaliesTableData(
       [selectedJob.job_id],
-      criteriaFields,
+      this._criteriaFields,
       [],
       interval$.getValue().val,
       severity$.getValue().val,
@@ -430,16 +452,17 @@ export class TimeSeriesExplorer extends React.Component {
 
           this.setState({
             entities: entities.map((entity) => {
-              if (firstRec.partition_field_name === entity.fieldName) {
-                entity.fieldValues = chain(resp.records).pluck('partition_field_value').uniq().value();
+              const newEntity = { ...entity };
+              if (firstRec.partition_field_name === newEntity.fieldName) {
+                newEntity.fieldValues = chain(resp.records).pluck('partition_field_value').uniq().value();
               }
-              if (firstRec.over_field_name === entity.fieldName) {
-                entity.fieldValues = chain(resp.records).pluck('over_field_value').uniq().value();
+              if (firstRec.over_field_name === newEntity.fieldName) {
+                newEntity.fieldValues = chain(resp.records).pluck('over_field_value').uniq().value();
               }
-              if (firstRec.by_field_name === entity.fieldName) {
-                entity.fieldValues = chain(resp.records).pluck('by_field_value').uniq().value();
+              if (firstRec.by_field_name === newEntity.fieldName) {
+                newEntity.fieldValues = chain(resp.records).pluck('by_field_value').uniq().value();
               }
-              return entity;
+              return newEntity;
             })
           }, callback);
         }
@@ -582,12 +605,7 @@ export class TimeSeriesExplorer extends React.Component {
         }
       };
 
-      // Only filter on the entity if the field has a value.
       const nonBlankEntities = filter(currentEntities, (entity) => { return entity.fieldValue.length > 0; });
-      stateUpdate.criteriaFields = [{
-        'fieldName': 'detector_index',
-        'fieldValue': +currentDetectorId }
-      ].concat(nonBlankEntities);
 
       if (modelPlotEnabled === false &&
         isSourceDataChartableForDetector(selectedJob, detectorIndex) === false &&
@@ -641,7 +659,7 @@ export class TimeSeriesExplorer extends React.Component {
       // across full time range for use in the swimlane.
       mlResultsService.getRecordMaxScoreByTime(
         selectedJob.job_id,
-        stateUpdate.criteriaFields,
+        this._criteriaFields,
         searchBounds.min.valueOf(),
         searchBounds.max.valueOf(),
         stateUpdate.contextAggregationInterval.expression
@@ -698,6 +716,10 @@ export class TimeSeriesExplorer extends React.Component {
     });
   }
 
+  /**
+   * Updates local state of detector related controls from the global state.
+   * @param callback to invoke after a state update.
+   */
   updateControlsForDetector = (callback = () => {}) => {
     const { appStateHandler } = this.props;
     const { detectorId, selectedJob } = this.state;
@@ -729,7 +751,26 @@ export class TimeSeriesExplorer extends React.Component {
       entities.push({ fieldName: byFieldName, fieldValue: byFieldValue });
     }
 
+    this.updateCriteriaFields(detectorIndex, entities);
+
     this.setState({ entities }, callback);
+  };
+
+  /**
+   * Updates criteria fields for API calls, e.g. getAnomaliesTableData
+   * @param detectorIndex
+   * @param entities
+   */
+  updateCriteriaFields(detectorIndex, entities) {
+    // Only filter on the entity if the field has a value.
+    const nonBlankEntities = filter(entities, (entity) => { return entity.fieldValue.length > 0; });
+    this._criteriaFields = [
+      {
+        fieldName: 'detector_index',
+        fieldValue: detectorIndex
+      },
+      ...nonBlankEntities
+    ];
   }
 
   loadForJobId(jobId, jobs) {
@@ -988,6 +1029,11 @@ export class TimeSeriesExplorer extends React.Component {
       zoomToFocusLoaded,
     } = this.state;
 
+    const fieldNamesWithEmptyValues = entities
+      .filter(({ fieldValue }) => !fieldValue)
+      .map(({ fieldName }) => fieldName);
+    const arePartitioningFieldsProvided = fieldNamesWithEmptyValues.length === 0;
+
     const chartProps = {
       modelPlotEnabled,
       contextChartData,
@@ -1050,9 +1096,32 @@ export class TimeSeriesExplorer extends React.Component {
     this.previousShowForecast = showForecast;
     this.previousShowModelBounds = showModelBounds;
 
+    /**
+     * Indicates if any of the previous controls is empty.
+     * @type {boolean}
+     */
+    let hasEmptyFieldValues = false;
+
     return (
       <TimeSeriesExplorerPage jobSelectorProps={jobSelectorProps} loading={loading} resizeRef={this.resizeRef}>
-        <ChartTooltip />
+
+        {fieldNamesWithEmptyValues.length > 0 && <EuiCallOut
+          className="single-metric-request-callout"
+          title={<FormattedMessage
+            id="xpack.ml.timeSeriesExplorer.singleMetricRequiredMessage"
+            /* eslint-disable-next-line max-len */
+            defaultMessage="To view a single metric you must select {missingValuesCount, plural, one {a value for {fieldName1}} other {values for {fieldName1} and {fieldName2}}}"
+            values={{
+              missingValuesCount: fieldNamesWithEmptyValues.length,
+              fieldName1: fieldNamesWithEmptyValues[0],
+              fieldName2: fieldNamesWithEmptyValues[1],
+            }}
+          />}
+          color="warning"
+          iconType="help"
+          size="s"
+        />}
+
         <div className="series-controls" data-test-subj="mlSingleMetricViewerSeriesControls">
           <EuiFlexGroup>
             <EuiFlexItem grow={false}>
@@ -1070,14 +1139,18 @@ export class TimeSeriesExplorer extends React.Component {
             </EuiFlexItem>
             {entities.map((entity) => {
               const entityKey = `${entity.fieldName}`;
+              const forceSelection = !hasEmptyFieldValues && !entity.fieldValue;
+              hasEmptyFieldValues = !hasEmptyFieldValues && forceSelection;
               return (
                 <EntityControl
                   entity={entity}
                   entityFieldValueChanged={this.entityFieldValueChanged}
+                  forceSelection={forceSelection}
                   key={entityKey}
                 />
               );
             })}
+            {arePartitioningFieldsProvided &&
             <EuiFlexItem style={{ textAlign: 'right' }}>
               <EuiFormRow hasEmptyLabelSpace style={{ maxWidth: '100%' }}>
                 <ForecastingModal
@@ -1088,7 +1161,7 @@ export class TimeSeriesExplorer extends React.Component {
                   className="forecast-controls"
                 />
               </EuiFormRow>
-            </EuiFlexItem>
+            </EuiFlexItem>}
           </EuiFlexGroup>
         </div>
 
@@ -1100,12 +1173,15 @@ export class TimeSeriesExplorer extends React.Component {
           />
         )}
 
-        {(jobs.length > 0 && loading === false && hasResults === false) && (
+        {(arePartitioningFieldsProvided && jobs.length > 0 && (fullRefresh === false || loading === false) && hasResults === false) && (
           <TimeseriesexplorerNoChartData dataNotChartable={dataNotChartable} entities={entities} />
         )}
 
-        {(jobs.length > 0 && loading === false && hasResults === true) && (
+        {(arePartitioningFieldsProvided && jobs.length > 0 && (fullRefresh === false || loading === false) && hasResults === true) && (
           <EuiText className="results-container">
+            {/* Make sure ChartTooltip is inside this plain wrapping element so positioning can be infered correctly. */}
+            <ChartTooltip />
+
             <span className="panel-title">
               {i18n.translate('xpack.ml.timeSeriesExplorer.singleTimeSeriesAnalysisTitle', {
                 defaultMessage: 'Single time series analysis of {functionLabel}',
diff --git a/x-pack/legacy/plugins/ml/public/util/chart_utils.test.js b/x-pack/legacy/plugins/ml/public/util/chart_utils.test.js
index aaec5e412c4cb3..6d13f1bc668089 100644
--- a/x-pack/legacy/plugins/ml/public/util/chart_utils.test.js
+++ b/x-pack/legacy/plugins/ml/public/util/chart_utils.test.js
@@ -14,19 +14,18 @@ jest.mock('ui/registry/field_formats', () => ({
 
 jest.mock('ui/timefilter', () => {
   const dateMath = require('@elastic/datemath');
-  const { dataPluginMock } = require('../../../../../../src/legacy/core_plugins/data/public/mocks');
-  const dataSetup = dataPluginMock.createSetup();
-  const { timefilter } = dataSetup.timefilter;
   let _time = undefined;
-  timefilter.setTime.mockImplementation((time) => {
-    _time = time;
-  });
-  timefilter.getActiveBounds.mockImplementation(() => {
-    return {
-      min: dateMath.parse(_time.from),
-      max: dateMath.parse(_time.to),
-    };
-  });
+  const timefilter = {
+    setTime: (time) => {
+      _time = time;
+    },
+    getActiveBounds: () => {
+      return {
+        min: dateMath.parse(_time.from),
+        max: dateMath.parse(_time.to),
+      };
+    }
+  };
   return {
     timefilter,
   };
diff --git a/x-pack/legacy/plugins/ml/public/util/custom_url_utils.test.ts b/x-pack/legacy/plugins/ml/public/util/custom_url_utils.test.ts
index 6eb33d92a85f74..d4556f085f4b2e 100644
--- a/x-pack/legacy/plugins/ml/public/util/custom_url_utils.test.ts
+++ b/x-pack/legacy/plugins/ml/public/util/custom_url_utils.test.ts
@@ -269,6 +269,43 @@ describe('ML - custom URL utils', () => {
       ); // eslint-disable-line max-len
     });
 
+    test('replaces tokens with nesting', () => {
+      const testUrlApache: KibanaUrlConfig = {
+        url_name: 'Raw data',
+        time_range: 'auto',
+        url_value:
+          'kibana#/dashboard/ml_http_access_explorer_ecs?_g=(time:(from:\u0027$earliest$\u0027,mode:absolute,to:\u0027$latest$\u0027))&_a=(description:\u0027\u0027,filters:!((\u0027$state\u0027:(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:event.dataset,negate:!f,params:(query:\u0027apache.access\u0027),type:phrase,value:\u0027apache.access\u0027),query:(match:(event.dataset:(query:\u0027apache.access\u0027,type:phrase)))),(\u0027$state\u0027:(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:http.response.status_code,negate:!f,params:(query:\u0027$http.response.status_code$\u0027),type:phrase,value:\u0027$http.response.status_code$\u0027),query:(match:(http.response.status_code:(query:\u0027$http.response.status_code$\u0027,type:phrase))))),query:(language:kuery,query:\u0027\u0027))', // eslint-disable-line max-len
+      };
+
+      const testRecord = {
+        job_id: 'farequote',
+        result_type: 'record',
+        probability: 6.533287347648861e-45,
+        record_score: 93.84475,
+        initial_record_score: 94.867922946384,
+        bucket_span: 300,
+        detector_index: 0,
+        is_interim: false,
+        timestamp: 1486656600000,
+        function: 'mean',
+        function_description: 'mean',
+        typical: [99.2329899996025],
+        actual: [274.7279901504516],
+        field_name: 'responsetime',
+        earliest: '2017-02-09T15:10:00.000Z',
+        latest: '2017-02-09T17:15:00.000Z',
+        http: {
+          response: {
+            status_code: 403,
+          },
+        },
+      };
+
+      expect(getUrlForRecord(testUrlApache, testRecord)).toBe(
+        "kibana#/dashboard/ml_http_access_explorer_ecs?_g=(time:(from:'2017-02-09T15:10:00.000Z',mode:absolute,to:'2017-02-09T17:15:00.000Z'))&_a=(description:\u0027\u0027,filters:!((\u0027$state\u0027:(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:event.dataset,negate:!f,params:(query:\u0027apache.access\u0027),type:phrase,value:\u0027apache.access\u0027),query:(match:(event.dataset:(query:\u0027apache.access\u0027,type:phrase)))),(\u0027$state\u0027:(store:appState),meta:(alias:!n,disabled:!f,index:\u0027INDEX_PATTERN_ID\u0027,key:http.response.status_code,negate:!f,params:(query:\u0027403\u0027),type:phrase,value:\u0027403\u0027),query:(match:(http.response.status_code:(query:\u0027403\u0027,type:phrase))))),query:(language:kuery,query:\u0027\u0027))"
+      ); // eslint-disable-line max-len
+    });
+
     test('returns expected URL for other type URL', () => {
       expect(getUrlForRecord(TEST_OTHER_URL, TEST_RECORD)).toBe(
         'http://airlinecodes.info/airline-code-AAL'
diff --git a/x-pack/legacy/plugins/ml/public/util/custom_url_utils.ts b/x-pack/legacy/plugins/ml/public/util/custom_url_utils.ts
index 61c0f3a159f142..7fda7a88d318ff 100644
--- a/x-pack/legacy/plugins/ml/public/util/custom_url_utils.ts
+++ b/x-pack/legacy/plugins/ml/public/util/custom_url_utils.ts
@@ -103,8 +103,8 @@ function isKibanaUrl(urlConfig: UrlConfig) {
 /**
  * Escape any double quotes in the value for correct use in KQL.
  */
-function escapeForKQL(value: string): string {
-  return value.replace(/\"/g, '\\"');
+function escapeForKQL(value: string | number): string {
+  return String(value).replace(/\"/g, '\\"');
 }
 
 // Builds a Kibana dashboard or Discover URL from the supplied config, with any
@@ -127,7 +127,7 @@ function buildKibanaUrl(urlConfig: UrlConfig, record: CustomUrlAnomalyRecordDoc)
   );
 
   const replaceSingleTokenValues = (str: string) =>
-    str.replace(/\$(\w+)\$/g, (match, name: string) => {
+    str.replace(/\$([^?&$\'"]+)\$/g, (match, name: string) => {
       // Use lodash get to allow nested JSON fields to be retrieved.
       let tokenValue: string | string[] | undefined = get(record, name);
       tokenValue = Array.isArray(tokenValue) ? tokenValue[0] : tokenValue;
diff --git a/x-pack/legacy/plugins/ml/public/util/index_utils.ts b/x-pack/legacy/plugins/ml/public/util/index_utils.ts
index 94d5b7f3b4c1aa..8a1cfda54a5f4b 100644
--- a/x-pack/legacy/plugins/ml/public/util/index_utils.ts
+++ b/x-pack/legacy/plugins/ml/public/util/index_utils.ts
@@ -70,7 +70,7 @@ export function loadCurrentIndexPattern(indexPatterns: IndexPatterns, $route: Re
   return fullIndexPatterns.get($route.current.params.index);
 }
 
-export function getIndexPatternById(id: string): IndexPattern {
+export function getIndexPatternById(id: string): Promise<IndexPattern> {
   if (fullIndexPatterns !== null) {
     return fullIndexPatterns.get(id);
   } else {
diff --git a/x-pack/legacy/plugins/ml/public/util/string_utils.js b/x-pack/legacy/plugins/ml/public/util/string_utils.js
index 7d97f0b1d3167f..cb1ccafc5e6050 100644
--- a/x-pack/legacy/plugins/ml/public/util/string_utils.js
+++ b/x-pack/legacy/plugins/ml/public/util/string_utils.js
@@ -20,7 +20,7 @@ import d3 from 'd3';
 // 'http://www.google.co.uk/#q=airline+code+AAL'.
 // If a corresponding key is not found in valuesByTokenName, then the String is not replaced.
 export function replaceStringTokens(str, valuesByTokenName, encodeForURI) {
-  return String(str).replace((/\$([^?&$\'"]{1,40})\$/g), (match, name) => {
+  return String(str).replace((/\$([^?&$\'"]+)\$/g), (match, name) => {
     // Use lodash get to allow nested JSON fields to be retrieved.
     let tokenValue = _.get(valuesByTokenName, name, null);
     if (encodeForURI === true && tokenValue !== null) {
diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/__tests__/data_recognizer.js b/x-pack/legacy/plugins/ml/server/models/data_recognizer/__tests__/data_recognizer.js
index 2ed0f9b2db734e..af5039fafdc604 100644
--- a/x-pack/legacy/plugins/ml/server/models/data_recognizer/__tests__/data_recognizer.js
+++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/__tests__/data_recognizer.js
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-
-
 import expect from '@kbn/expect';
 import { DataRecognizer } from '../data_recognizer';
 
@@ -36,10 +34,68 @@ describe('ML - data recognizer', () => {
     expect(ids.join()).to.equal(moduleIds.join());
   });
 
-
   it('getModule - load a single module', async () => {
     const module = await dr.getModule(moduleIds[0]);
     expect(module.id).to.equal(moduleIds[0]);
   });
 
+  describe('jobOverrides', () => {
+    it('should apply job overrides correctly', () => {
+      // arrange
+      const prefix = 'pre-';
+      const testJobId = 'test-job';
+      const moduleConfig = {
+        jobs: [
+          {
+            id: `${prefix}${testJobId}`,
+            config: {
+              groups: ['nginx'],
+              analysis_config: {
+                bucket_span: '1h'
+              },
+              analysis_limits: {
+                model_memory_limit: '256mb',
+                influencers: [
+                  'region'
+                ]
+              },
+              calendars: ['calendar-1'],
+            }
+          },
+        ],
+      };
+      const jobOverrides = [
+        {
+          analysis_limits: {
+            model_memory_limit: '512mb',
+            influencers: [],
+          }
+        },
+        {
+          job_id: testJobId,
+          groups: [],
+        },
+      ];
+      // act
+      dr.applyJobConfigOverrides(moduleConfig, jobOverrides, prefix);
+      // assert
+      expect(moduleConfig.jobs).to.eql([
+        {
+          config: {
+            analysis_config: {
+              bucket_span: '1h'
+            },
+            analysis_limits: {
+              model_memory_limit: '512mb',
+              influencers: [],
+            },
+            groups: [],
+            calendars: ['calendar-1'],
+          },
+          id: 'pre-test-job'
+        }
+      ]);
+    });
+  });
 });
+
diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/data_recognizer.js b/x-pack/legacy/plugins/ml/server/models/data_recognizer/data_recognizer.js
index 0b0d2c5adfea09..b5c897a5a3cc98 100644
--- a/x-pack/legacy/plugins/ml/server/models/data_recognizer/data_recognizer.js
+++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/data_recognizer.js
@@ -811,45 +811,78 @@ export class DataRecognizer {
   }
 
   applyJobConfigOverrides(moduleConfig, jobOverrides, jobPrefix = '') {
-    if(jobOverrides !== undefined && jobOverrides !== null) {
-      if (typeof jobOverrides !== 'object') {
-        throw Boom.badRequest(
-          `Incompatible jobOverrides type (${typeof jobOverrides}). It needs to be an object or array of objects.`
-        );
+    if (jobOverrides === undefined || jobOverrides === null) {
+      return;
+    }
+
+    if (typeof jobOverrides !== 'object') {
+      throw Boom.badRequest(
+        `Incompatible jobOverrides type (${typeof jobOverrides}). It needs to be an object or array of objects.`
+      );
+    }
+
+    // jobOverrides could be a single object or an array of objects.
+    // if single, convert to an array
+    const overrides = Array.isArray(jobOverrides) ? jobOverrides : [jobOverrides];
+    const { jobs } = moduleConfig;
+
+    // separate all the overrides.
+    // the overrides which don't contain a job id will be applied to all jobs in the module
+    const generalOverrides = [];
+    const jobSpecificOverrides = [];
+
+    overrides.forEach(override => {
+      if (override.job_id === undefined) {
+        generalOverrides.push(override);
+      } else {
+        jobSpecificOverrides.push(override);
       }
+    });
 
-      // jobOverrides could be a single object or an array of objects.
-      // if single, convert to an array
-      const overrides = Array.isArray(jobOverrides) ? jobOverrides : [jobOverrides];
-      const { jobs } = moduleConfig;
+    function processArrayValues(source, update) {
+      if (typeof source !== 'object' || typeof update !== 'object') {
+        return;
+      }
 
-      // separate all the overrides.
-      // the overrides which don't contain a job id will be applied to all jobs in the module
-      const generalOverrides = [];
-      const jobSpecificOverrides = [];
-      overrides.forEach(o => {
-        if (o.job_id === undefined) {
-          generalOverrides.push(o);
+      Object.keys(source).forEach(key => {
+        const sourceValue = source[key];
+        const updateValue = update[key];
+
+        if (
+          typeof sourceValue !== 'object' ||
+          sourceValue === null ||
+          typeof updateValue !== 'object' ||
+          updateValue === null
+        ) {
+          return;
+        }
+
+        if (Array.isArray(sourceValue) && Array.isArray(updateValue)) {
+          source[key] = updateValue;
         } else {
-          jobSpecificOverrides.push(o);
+          processArrayValues(sourceValue, updateValue);
         }
       });
+    }
 
-      generalOverrides.forEach(o => {
-        jobs.forEach(({ config }) => merge(config, o));
+    generalOverrides.forEach(generalOverride => {
+      jobs.forEach(job => {
+        merge(job.config, generalOverride);
+        processArrayValues(job.config, generalOverride);
       });
+    });
 
-      jobSpecificOverrides.forEach(o => {
-        // for each override, find the relevant job.
-        // note, the job id already has the prefix prepended to it
-        const job = jobs.find(j => j.id === `${jobPrefix}${o.job_id}`);
-        if (job !== undefined) {
-          // delete the job_id in the override as this shouldn't be overridden
-          delete o.job_id;
-          merge(job.config, o);
-        }
-      });
-    }
+    jobSpecificOverrides.forEach(jobSpecificOverride => {
+      // for each override, find the relevant job.
+      // note, the job id already has the prefix prepended to it
+      const job = jobs.find(j => j.id === `${jobPrefix}${jobSpecificOverride.job_id}`);
+      if (job !== undefined) {
+        // delete the job_id in the override as this shouldn't be overridden
+        delete jobSpecificOverride.job_id;
+        merge(job.config, jobSpecificOverride);
+        processArrayValues(job.config, jobSpecificOverride);
+      }
+    });
   }
 
   applyDatafeedConfigOverrides(moduleConfig, datafeedOverrides, jobPrefix = '') {
diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json
index ead765e4747206..26b404ff331c6b 100644
--- a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json
+++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json
@@ -1,3 +1,3 @@
 {
-  "icon": "loggingApp"
+  "icon": "logsApp"
 }
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/field_service.ts b/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
index df4a2c059f1eff..d7c26bda77d20d 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
@@ -136,7 +136,8 @@ async function combineFieldsAndAggs(
   const numericalFields = getNumericalFields(fields);
   const ipFields = getIpFields(fields);
 
-  const mix = mixFactory(rollupFields);
+  const isRollup = Object.keys(rollupFields).length > 0;
+  const mix = mixFactory(isRollup, rollupFields);
 
   aggs.forEach(a => {
     if (a.type === METRIC_AGG_TYPE && a.fields !== undefined) {
@@ -165,7 +166,7 @@ async function combineFieldsAndAggs(
 
   return {
     aggs,
-    fields: filterFields(fields),
+    fields: isRollup ? filterFields(fields) : fields,
   };
 }
 
@@ -178,9 +179,7 @@ function filterFields(fields: Field[]): Field[] {
 
 // returns a mix function that is used to cross-reference aggs and fields.
 // wrapped in a provider to allow filtering based on rollup job capabilities
-function mixFactory(rollupFields: RollupFields) {
-  const isRollup = Object.keys(rollupFields).length > 0;
-
+function mixFactory(isRollup: boolean, rollupFields: RollupFields) {
   return function mix(field: Field, agg: Aggregation): void {
     if (
       isRollup === false ||
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts b/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
index 87653a1e3f47de..2c8f8a8f82fb8a 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
@@ -66,7 +66,9 @@ describe('job_service - job_caps', () => {
       expect(response).toEqual(farequoteJobCapsEmpty);
       done();
     });
+  });
 
+  describe('cloudwatch newJobCaps()', () => {
     it('can get rollup job caps for rollup index pattern', async done => {
       const indexPattern = 'cloud_roll_index';
       const isRollup = true;
diff --git a/x-pack/legacy/plugins/monitoring/common/__tests__/format_timestamp_to_duration.js b/x-pack/legacy/plugins/monitoring/common/__tests__/format_timestamp_to_duration.js
index 6a44693418091d..917c9b4a20b130 100644
--- a/x-pack/legacy/plugins/monitoring/common/__tests__/format_timestamp_to_duration.js
+++ b/x-pack/legacy/plugins/monitoring/common/__tests__/format_timestamp_to_duration.js
@@ -23,22 +23,22 @@ describe('formatTimestampToDuration', () => {
       expect(formatTimestampToDuration(fiftyNineSeconds, CALCULATE_DURATION_SINCE, getTestTime())).to.be('59 seconds');
 
       const fiveMins = getTestTime().subtract(5, 'minutes').subtract(30, 'seconds');
-      expect(formatTimestampToDuration(fiveMins, CALCULATE_DURATION_SINCE, getTestTime())).to.be('5 min');
+      expect(formatTimestampToDuration(fiveMins, CALCULATE_DURATION_SINCE, getTestTime())).to.be('6 mins');
 
       const sixHours = getTestTime().subtract(6, 'hours').subtract(30, 'minutes');
-      expect(formatTimestampToDuration(sixHours, CALCULATE_DURATION_SINCE, getTestTime())).to.be('6 hrs 30 min');
+      expect(formatTimestampToDuration(sixHours, CALCULATE_DURATION_SINCE, getTestTime())).to.be('6 hrs 30 mins');
 
       const sevenDays = getTestTime().subtract(7, 'days').subtract(6, 'hours').subtract(18, 'minutes');
-      expect(formatTimestampToDuration(sevenDays, CALCULATE_DURATION_SINCE, getTestTime())).to.be('7 days 6 hrs 18 min');
+      expect(formatTimestampToDuration(sevenDays, CALCULATE_DURATION_SINCE, getTestTime())).to.be('7 days 6 hrs 18 mins');
 
       const eightWeeks = getTestTime().subtract(8, 'weeks').subtract(7, 'days').subtract(6, 'hours').subtract(18, 'minutes');
       expect(formatTimestampToDuration(eightWeeks, CALCULATE_DURATION_SINCE, getTestTime())).to.be('2 months 2 days');
 
       const oneHour = getTestTime().subtract(1, 'hour'); // should trim 0 min
-      expect(formatTimestampToDuration(oneHour, CALCULATE_DURATION_SINCE, getTestTime())).to.be('1 hrs');
+      expect(formatTimestampToDuration(oneHour, CALCULATE_DURATION_SINCE, getTestTime())).to.be('1 hr');
 
       const oneDay = getTestTime().subtract(1, 'day'); // should trim 0 hrs
-      expect(formatTimestampToDuration(oneDay, CALCULATE_DURATION_SINCE, getTestTime())).to.be('1 days');
+      expect(formatTimestampToDuration(oneDay, CALCULATE_DURATION_SINCE, getTestTime())).to.be('1 day');
 
       const twoMonths = getTestTime().subtract(2, 'month'); // should trim 0 days
       expect(formatTimestampToDuration(twoMonths, CALCULATE_DURATION_SINCE, getTestTime())).to.be('2 months');
@@ -52,22 +52,22 @@ describe('formatTimestampToDuration', () => {
       expect(formatTimestampToDuration(fiftyNineSeconds, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('59 seconds');
 
       const fiveMins = getTestTime().add(10, 'minutes');
-      expect(formatTimestampToDuration(fiveMins, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('10 min');
+      expect(formatTimestampToDuration(fiveMins, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('10 mins');
 
       const sixHours = getTestTime().add(6, 'hours').add(30, 'minutes');
-      expect(formatTimestampToDuration(sixHours, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('6 hrs 30 min');
+      expect(formatTimestampToDuration(sixHours, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('6 hrs 30 mins');
 
       const sevenDays = getTestTime().add(7, 'days').add(6, 'hours').add(18, 'minutes');
-      expect(formatTimestampToDuration(sevenDays, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('7 days 6 hrs 18 min');
+      expect(formatTimestampToDuration(sevenDays, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('7 days 6 hrs 18 mins');
 
       const eightWeeks = getTestTime().add(8, 'weeks').add(7, 'days').add(6, 'hours').add(18, 'minutes');
       expect(formatTimestampToDuration(eightWeeks, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('2 months 2 days');
 
       const oneHour = getTestTime().add(1, 'hour'); // should trim 0 min
-      expect(formatTimestampToDuration(oneHour, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('1 hrs');
+      expect(formatTimestampToDuration(oneHour, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('1 hr');
 
       const oneDay = getTestTime().add(1, 'day'); // should trim 0 hrs
-      expect(formatTimestampToDuration(oneDay, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('1 days');
+      expect(formatTimestampToDuration(oneDay, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('1 day');
 
       const twoMonths = getTestTime().add(2, 'month'); // should trim 0 days
       expect(formatTimestampToDuration(twoMonths, CALCULATE_DURATION_UNTIL, getTestTime())).to.be('2 months');
diff --git a/x-pack/legacy/plugins/monitoring/common/format_timestamp_to_duration.js b/x-pack/legacy/plugins/monitoring/common/format_timestamp_to_duration.js
index 4cf5618bc93dbf..939931ac8eb37c 100644
--- a/x-pack/legacy/plugins/monitoring/common/format_timestamp_to_duration.js
+++ b/x-pack/legacy/plugins/monitoring/common/format_timestamp_to_duration.js
@@ -48,7 +48,7 @@ export function formatTimestampToDuration(timestamp, calculationFlag, initialTim
   }
 
   return duration
-    .replace(/ 0 min$/, '')
+    .replace(/ 0 mins$/, '')
     .replace(/ 0 hrs$/, '')
     .replace(/ 0 days$/, ''); // See https://github.com/jsmreese/moment-duration-format/issues/64
 }
diff --git a/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.js b/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.js
index 9d5ebd274ea9ec..5443d6cbee6b59 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.js
@@ -35,6 +35,7 @@ export class ChartTarget extends React.Component {
   componentWillUnmount() {
     this.shutdownChart();
     window.removeEventListener('resize', this._handleResize);
+    this.componentUnmounted = true;
   }
 
   filterByShow(seriesToShow) {
@@ -62,7 +63,6 @@ export class ChartTarget extends React.Component {
 
   componentDidMount() {
     this.renderChart();
-    window.addEventListener('resize', this._handleResize, false);
   }
 
   componentDidUpdate() {
@@ -94,6 +94,9 @@ export class ChartTarget extends React.Component {
     const data = this.filterData(series, this.props.seriesToShow);
 
     this.plot = $.plot(target, data, await this.getOptions());
+    if (this.componentUnmounted || !this.plot) {
+      return;
+    }
 
     this._handleResize = () => {
       if (!this.plot) { return; }
@@ -110,6 +113,8 @@ export class ChartTarget extends React.Component {
       }
     };
 
+    window.addEventListener('resize', this._handleResize, false);
+
     this.handleMouseLeave = () => {
       eventBus.trigger('thorPlotLeave', []);
     };
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap
index b108746a422bb2..4affadd1275301 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Logs should render a link to filter by cluster uuid 1`] = `
 <EuiCallOut
-  iconType="loggingApp"
+  iconType="logsApp"
   size="m"
   title="Want to see more log entries?"
 >
@@ -26,7 +26,7 @@ exports[`Logs should render a link to filter by cluster uuid 1`] = `
 
 exports[`Logs should render a link to filter by cluster uuid and index uuid 1`] = `
 <EuiCallOut
-  iconType="loggingApp"
+  iconType="logsApp"
   size="m"
   title="Want to see more log entries?"
 >
@@ -50,7 +50,7 @@ exports[`Logs should render a link to filter by cluster uuid and index uuid 1`]
 
 exports[`Logs should render a link to filter by cluster uuid and node uuid 1`] = `
 <EuiCallOut
-  iconType="loggingApp"
+  iconType="logsApp"
   size="m"
   title="Want to see more log entries?"
 >
@@ -275,7 +275,7 @@ exports[`Logs should render normally 1`] = `
     size="m"
   />
   <EuiCallOut
-    iconType="loggingApp"
+    iconType="logsApp"
     size="m"
     title="Want to see more log entries?"
   >
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js b/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js
index c59a3d595b14fc..50e3cbd9af6c94 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js
@@ -169,7 +169,7 @@ export class Logs extends PureComponent {
         title={i18n.translate('xpack.monitoring.logs.listing.calloutTitle', {
           defaultMessage: 'Want to see more log entries?'
         })}
-        iconType="loggingApp"
+        iconType="logsApp"
       >
         <p>
           <FormattedMessage
diff --git a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap
index cda5a9ffe657c0..ea5ff3876245cf 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap
@@ -1298,7 +1298,7 @@ exports[`Flyout kibana part two should show instructions to migrate to metricbea
                           "link": <React.Fragment>
                              
                             <ForwardRef
-                              href="https://www.elastic.co/guide/en/kibana/reference/current/configuring-metricbeat.html"
+                              href="https://www.elastic.co/guide/en/kibana/reference/current/monitoring-metricbeat.html"
                               target="_blank"
                             >
                               <FormattedMessage
@@ -1365,7 +1365,7 @@ exports[`Flyout kibana part two should show instructions to migrate to metricbea
                           "link": <React.Fragment>
                              
                             <ForwardRef
-                              href="https://www.elastic.co/guide/en/kibana/reference/current/configuring-metricbeat.html"
+                              href="https://www.elastic.co/guide/en/kibana/reference/current/monitoring-metricbeat.html"
                               target="_blank"
                             >
                               <FormattedMessage
diff --git a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js
index 34c4d14bdf21b0..3a6a3d3ff3cd6b 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/flyout.js
@@ -25,7 +25,7 @@ import {
   EuiCheckbox,
 } from '@elastic/eui';
 import { getInstructionSteps } from '../instruction_steps';
-import { Storage } from 'ui/storage';
+import { Storage } from '../../../../../../../../src/plugins/kibana_utils/public';
 import { STORAGE_KEY, ELASTICSEARCH_SYSTEM_ID, KIBANA_SYSTEM_ID } from '../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
diff --git a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/kibana/enable_metricbeat_instructions.js b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/kibana/enable_metricbeat_instructions.js
index be4bdf9f2ac1d7..990629aa42978a 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/kibana/enable_metricbeat_instructions.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/kibana/enable_metricbeat_instructions.js
@@ -20,7 +20,7 @@ export function getKibanaInstructionsForEnablingMetricbeat(product, _meta, {
   esMonitoringUrl,
 }) {
   const securitySetup = getSecurityStep(
-    `${ELASTIC_WEBSITE_URL}guide/en/kibana/reference/${DOC_LINK_VERSION}/configuring-metricbeat.html`
+    `${ELASTIC_WEBSITE_URL}guide/en/kibana/reference/${DOC_LINK_VERSION}/monitoring-metricbeat.html`
   );
 
   const installMetricbeatStep = {
diff --git a/x-pack/legacy/plugins/monitoring/public/components/no_data/no_data.js b/x-pack/legacy/plugins/monitoring/public/components/no_data/no_data.js
index e50e49eec9f6eb..f2f27499d113c3 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/no_data/no_data.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/no_data/no_data.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useState } from 'react';
+import React, { Fragment, useState } from 'react';
 import PropTypes from 'prop-types';
 import {
   EuiSpacer,
@@ -43,7 +43,7 @@ function NoDataMessage(props) {
 
 export function NoData(props) {
   const [isLoading, setIsLoading] = useState(false);
-  const [useInternalCollection, setUseInternalCollection] = useState(false);
+  const [useInternalCollection, setUseInternalCollection] = useState(props.isOnCloud);
 
   async function startSetup() {
     setIsLoading(true);
@@ -64,15 +64,19 @@ export function NoData(props) {
             <EuiSpacer size="m" />
             <NoDataMessage {...props} />
             <CheckerErrors errors={props.errors} />
-            <EuiHorizontalRule size="half" />
-            <EuiButtonEmpty isDisabled={props.isCollectionEnabledUpdated} onClick={() => setUseInternalCollection(false)}>
-              <EuiTextColor color="default">
-                <FormattedMessage
-                  id="xpack.monitoring.noData.setupMetricbeatInstead"
-                  defaultMessage="Or, set up with Metricbeat (recommended)"
-                />
-              </EuiTextColor>
-            </EuiButtonEmpty>
+            { !props.isOnCloud ? (
+              <Fragment>
+                <EuiHorizontalRule size="half" />
+                <EuiButtonEmpty isDisabled={props.isCollectionEnabledUpdated} onClick={() => setUseInternalCollection(false)}>
+                  <EuiTextColor color="default">
+                    <FormattedMessage
+                      id="xpack.monitoring.noData.setupMetricbeatInstead"
+                      defaultMessage="Or, set up with Metricbeat (recommended)"
+                    />
+                  </EuiTextColor>
+                </EuiButtonEmpty>
+              </Fragment>
+            ) : null }
           </EuiPageContent>
         </EuiPageBody>
       </EuiPage>
diff --git a/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.js b/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.js
index 3e7d182f1514c5..7da419719e70c7 100644
--- a/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.js
+++ b/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.js
@@ -7,6 +7,7 @@
 import { ajaxErrorHandlersProvider } from './ajax_error_handler';
 import { get, contains } from 'lodash';
 import chrome from 'ui/chrome';
+import { i18n } from '@kbn/i18n';
 
 function isOnPage(hash) {
   return contains(window.location.hash, hash);
@@ -80,7 +81,7 @@ export const updateSetupModeData = async (uuid, fetchWithoutClusterUuid = false)
   const oldData = setupModeState.data;
   const data = await fetchCollectionData(uuid, fetchWithoutClusterUuid);
   setupModeState.data = data;
-  if (get(data, '_meta.isOnCloud', false)) {
+  if (chrome.getInjected('isOnCloud')) {
     return toggleSetupMode(false); // eslint-disable-line no-use-before-define
   }
   notifySetupModeDataChange(oldData);
@@ -139,15 +140,17 @@ export const setSetupModeMenuItem = () => {
   }
 
   const globalState = angularState.injector.get('globalState');
-  const navItems = globalState.inSetupMode
-    ? []
-    : [{
+  const navItems = [];
+  if (!globalState.inSetupMode && !chrome.getInjected('isOnCloud')) {
+    navItems.push({
       id: 'enter',
-      label: 'Enter Setup Mode',
-      description: 'Enter setup',
+      label: i18n.translate('xpack.monitoring.setupMode.enter', {
+        defaultMessage: 'Enter Setup Mode'
+      }),
       run: () => toggleSetupMode(true),
       testId: 'enterSetupMode'
-    }];
+    });
+  }
 
   angularState.scope.topNavMenu = [...navItems];
   // LOL angular
diff --git a/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.test.js b/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.test.js
index b5878c7ec51818..4e3a8045048ae6 100644
--- a/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.test.js
+++ b/x-pack/legacy/plugins/monitoring/public/lib/setup_mode.test.js
@@ -4,13 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  toggleSetupMode,
-  initSetupModeState,
-  getSetupModeState,
-  updateSetupModeData,
-  setSetupModeMenuItem
-} from './setup_mode';
+let toggleSetupMode;
+let initSetupModeState;
+let getSetupModeState;
+let updateSetupModeData;
+let setSetupModeMenuItem;
 
 jest.mock('./ajax_error_handler', () => ({
   ajaxErrorHandlersProvider: err => {
@@ -52,16 +50,31 @@ function waitForSetupModeData(action) {
   process.nextTick(action);
 }
 
+function setModules() {
+  jest.resetModules();
+  injectorModulesMock.globalState.inSetupMode = false;
+
+  const setupMode = require('./setup_mode');
+  toggleSetupMode = setupMode.toggleSetupMode;
+  initSetupModeState = setupMode.initSetupModeState;
+  getSetupModeState = setupMode.getSetupModeState;
+  updateSetupModeData = setupMode.updateSetupModeData;
+  setSetupModeMenuItem = setupMode.setSetupModeMenuItem;
+}
+
 describe('setup_mode', () => {
-  describe('setup', () => {
-    afterEach(async () => {
-      try {
-        toggleSetupMode(false);
-      } catch (err) {
-        // Do nothing...
+  beforeEach(async () => {
+    jest.doMock('ui/chrome', () => ({
+      getInjected: (key) => {
+        if (key === 'isOnCloud') {
+          return false;
+        }
       }
-    });
+    }));
+    setModules();
+  });
 
+  describe('setup', () => {
     it('should require angular state', async () => {
       let error;
       try {
@@ -99,21 +112,25 @@ describe('setup_mode', () => {
   describe('in setup mode', () => {
     afterEach(async () => {
       data = {};
-      toggleSetupMode(false);
     });
 
     it('should enable it through clicking top nav item', async () => {
       initSetupModeState(angularStateMock.scope, angularStateMock.injector);
+      setSetupModeMenuItem();
+      expect(injectorModulesMock.globalState.inSetupMode).toBe(false);
       await angularStateMock.scope.topNavMenu[0].run();
       expect(injectorModulesMock.globalState.inSetupMode).toBe(true);
     });
 
     it('should not fetch data if on cloud', async (done) => {
-      data = {
-        _meta: {
-          isOnCloud: true
+      jest.doMock('ui/chrome', () => ({
+        getInjected: (key) => {
+          if (key === 'isOnCloud') {
+            return true;
+          }
         }
-      };
+      }));
+      setModules();
       initSetupModeState(angularStateMock.scope, angularStateMock.injector);
       await toggleSetupMode(true);
       waitForSetupModeData(() => {
diff --git a/x-pack/legacy/plugins/monitoring/public/monitoring.js b/x-pack/legacy/plugins/monitoring/public/monitoring.js
index e0b504780c838c..ff47d6ecf7b7fe 100644
--- a/x-pack/legacy/plugins/monitoring/public/monitoring.js
+++ b/x-pack/legacy/plugins/monitoring/public/monitoring.js
@@ -7,6 +7,7 @@
 import uiRoutes from 'ui/routes';
 import chrome from 'ui/chrome';
 import 'ui/kbn_top_nav';
+import 'ui/directives/storage';
 import 'ui/autoload/all';
 import 'plugins/monitoring/filters';
 import 'plugins/monitoring/services/clusters';
diff --git a/x-pack/legacy/plugins/monitoring/public/views/no_data/controller.js b/x-pack/legacy/plugins/monitoring/public/views/no_data/controller.js
index 0ecd6c83265fff..f364b70fd934fc 100644
--- a/x-pack/legacy/plugins/monitoring/public/views/no_data/controller.js
+++ b/x-pack/legacy/plugins/monitoring/public/views/no_data/controller.js
@@ -5,6 +5,7 @@
  */
 
 import React from 'react';
+import chrome from 'ui/chrome';
 import {
   ClusterSettingsChecker,
   NodeSettingsChecker,
@@ -99,7 +100,12 @@ export class NoDataController extends MonitoringViewBaseController {
 
     this.renderReact(
       <I18nContext>
-        <NoData {...props} enabler={enabler} changePath={this.changePath} />
+        <NoData
+          {...props}
+          enabler={enabler}
+          changePath={this.changePath}
+          isOnCloud={chrome.getInjected('isOnCloud')}
+        />
       </I18nContext>
     );
   }
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/__snapshots__/get_metrics.test.js.snap b/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/__snapshots__/get_metrics.test.js.snap
index b70a128f2464cf..842372f6330867 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/__snapshots__/get_metrics.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/__snapshots__/get_metrics.test.js.snap
@@ -4,7 +4,7 @@ exports[`getMetrics and getSeries should return metrics with derivative metric 1
 Object {
   "cluster_search_request_rate": Array [
     Object {
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "data": Array [
         Array [
           1498968000000,
@@ -388,7 +388,7 @@ exports[`getMetrics and getSeries should return metrics with metric containing c
 Object {
   "cluster_index_latency": Array [
     Object {
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "data": Array [
         Array [
           1498968000000,
@@ -767,7 +767,7 @@ exports[`getMetrics and getSeries should return metrics with metric that uses de
 Object {
   "kibana_max_response_times": Array [
     Object {
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "data": Array [
         Array [
           1498968000000,
@@ -1143,7 +1143,7 @@ exports[`getMetrics and getSeries should return metrics with non-derivative metr
 Object {
   "node_cpu_utilization": Array [
     Object {
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "data": Array [
         Array [
           1498968000000,
@@ -1518,7 +1518,7 @@ exports[`getMetrics and getSeries should return metrics with object structure fo
 Object {
   "index_1": Array [
     Object {
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "data": Array [
         Array [
           1498968000000,
@@ -1887,7 +1887,7 @@ Object {
       },
     },
     Object {
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "data": Array [
         Array [
           1498968000000,
@@ -2256,7 +2256,7 @@ Object {
       },
     },
     Object {
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "data": Array [
         Array [
           1498968000000,
@@ -2625,7 +2625,7 @@ Object {
       },
     },
     Object {
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "data": Array [
         Array [
           1498968000000,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/get_collection_status.js b/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
index a49da8ba60200a..cd5781ccf53446 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
@@ -547,7 +547,6 @@ export const getCollectionStatus = async (req, indexPatterns, clusterUuid, nodeU
   status._meta = {
     secondsAgo: NUMBER_OF_SECONDS_AGO_TO_LOOK,
     liveClusterUuid,
-    isOnCloud: get(req.server.plugins, 'cloud.config.isCloudEnabled', false)
   };
 
   return status;
diff --git a/x-pack/legacy/plugins/monitoring/ui_exports.js b/x-pack/legacy/plugins/monitoring/ui_exports.js
index a10b83086f738b..0976292be576b1 100644
--- a/x-pack/legacy/plugins/monitoring/ui_exports.js
+++ b/x-pack/legacy/plugins/monitoring/ui_exports.js
@@ -5,6 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { get } from 'lodash';
 import { resolve } from 'path';
 
 /**
@@ -28,7 +29,8 @@ export const getUiExports = () => ({
   injectDefaultVars(server) {
     const config = server.config();
     return {
-      monitoringUiEnabled: config.get('xpack.monitoring.ui.enabled')
+      monitoringUiEnabled: config.get('xpack.monitoring.ui.enabled'),
+      isOnCloud: get(server.plugins, 'cloud.config.isCloudEnabled', false)
     };
   },
   hacks: [ 'plugins/monitoring/hacks/toggle_app_link_in_nav' ],
diff --git a/x-pack/legacy/plugins/oss_telemetry/index.js b/x-pack/legacy/plugins/oss_telemetry/index.js
index 01bbd9359783a0..eeee9e18f9112b 100644
--- a/x-pack/legacy/plugins/oss_telemetry/index.js
+++ b/x-pack/legacy/plugins/oss_telemetry/index.js
@@ -11,7 +11,7 @@ import { PLUGIN_ID } from './constants';
 export const ossTelemetry = (kibana) => {
   return new kibana.Plugin({
     id: PLUGIN_ID,
-    require: ['elasticsearch', 'xpack_main', 'task_manager'],
+    require: ['elasticsearch', 'xpack_main'],
     configPrefix: 'xpack.oss_telemetry',
 
     init(server) {
diff --git a/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.ts b/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.ts
index 2bbecf99b97c3f..63640c87f80a67 100644
--- a/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/get_usage_collector.ts
@@ -14,7 +14,11 @@ async function isTaskManagerReady(server: HapiServer) {
 }
 
 async function fetch(server: HapiServer) {
-  const taskManager = server.plugins.task_manager!;
+  const taskManager = server.plugins.task_manager;
+
+  if (!taskManager) {
+    return null;
+  }
 
   let docs;
   try {
diff --git a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/index.ts b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/index.ts
index de3a17a79afb67..eaa8cc74058212 100644
--- a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/index.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/index.ts
@@ -11,6 +11,11 @@ import { visualizationsTaskRunner } from './visualizations/task_runner';
 export function registerTasks(server: HapiServer) {
   const taskManager = server.plugins.task_manager;
 
+  if (!taskManager) {
+    server.log(['debug', 'telemetry'], `Task manager is not available`);
+    return;
+  }
+
   taskManager.registerTaskDefinitions({
     [VIS_TELEMETRY_TASK]: {
       title: 'X-Pack telemetry calculator for Visualizations',
@@ -43,7 +48,7 @@ export function scheduleTasks(server: HapiServer) {
           state: { stats: {}, runs: 0 },
         });
       } catch (e) {
-        server.log(['warning', 'telemetry'], `Error scheduling task, received ${e.message}`);
+        server.log(['debug', 'telemetry'], `Error scheduling task, received ${e.message}`);
       }
     })();
   });
diff --git a/x-pack/legacy/plugins/reporting/common/cancellation_token.ts b/x-pack/legacy/plugins/reporting/common/cancellation_token.ts
index 11425c3002d97e..c03f9ee7328cb8 100644
--- a/x-pack/legacy/plugins/reporting/common/cancellation_token.ts
+++ b/x-pack/legacy/plugins/reporting/common/cancellation_token.ts
@@ -7,11 +7,11 @@
 import { isFunction } from 'lodash';
 
 export class CancellationToken {
-  private isCancelled: boolean;
+  private _isCancelled: boolean;
   private _callbacks: Function[];
 
   constructor() {
-    this.isCancelled = false;
+    this._isCancelled = false;
     this._callbacks = [];
   }
 
@@ -20,7 +20,7 @@ export class CancellationToken {
       throw new Error('Expected callback to be a function');
     }
 
-    if (this.isCancelled) {
+    if (this._isCancelled) {
       callback();
       return;
     }
@@ -29,7 +29,11 @@ export class CancellationToken {
   };
 
   public cancel = () => {
-    this.isCancelled = true;
+    this._isCancelled = true;
     this._callbacks.forEach(callback => callback());
   };
+
+  public isCancelled() {
+    return this._isCancelled;
+  }
 }
diff --git a/x-pack/legacy/plugins/reporting/common/constants.ts b/x-pack/legacy/plugins/reporting/common/constants.ts
index 6f1f43fe11fe51..723320e74bfbd8 100644
--- a/x-pack/legacy/plugins/reporting/common/constants.ts
+++ b/x-pack/legacy/plugins/reporting/common/constants.ts
@@ -6,6 +6,8 @@
 
 export const PLUGIN_ID = 'reporting';
 
+export const BROWSER_TYPE = 'chromium';
+
 export const JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY =
   'xpack.reporting.jobCompletionNotifications';
 
diff --git a/x-pack/legacy/plugins/reporting/common/get_absolute_url.ts b/x-pack/legacy/plugins/reporting/common/get_absolute_url.ts
index 299cde58891d39..79c5a274d8c77a 100644
--- a/x-pack/legacy/plugins/reporting/common/get_absolute_url.ts
+++ b/x-pack/legacy/plugins/reporting/common/get_absolute_url.ts
@@ -5,12 +5,11 @@
  */
 
 import url from 'url';
-// @ts-ignore
 import { oncePerServer } from '../server/lib/once_per_server';
-import { ConfigObject, KbnServer } from '../types';
+import { ServerFacade } from '../types';
 
-function getAbsoluteUrlFn(server: KbnServer) {
-  const config: ConfigObject = server.config();
+function getAbsoluteUrlFn(server: ServerFacade) {
+  const config = server.config();
 
   return function getAbsoluteUrl({
     basePath = config.get('server.basePath'),
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
index e933056c79441e..887f4dbb11be73 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
@@ -5,14 +5,14 @@
  */
 // @ts-ignore
 import { cryptoFactory } from '../../../server/lib/crypto';
-import { CryptoFactory, JobDocPayload, KbnServer } from '../../../types';
+import { CryptoFactory, JobDocPayload, ServerFacade } from '../../../types';
 
 export const decryptJobHeaders = async ({
   job,
   server,
 }: {
   job: JobDocPayload;
-  server: KbnServer;
+  server: ServerFacade;
 }) => {
   const crypto: CryptoFactory = cryptoFactory(server);
   const decryptedHeaders: string = await crypto.decrypt(job.headers);
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
index 04959712a117a7..9522d6c087a892 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { ConditionalHeaders, ConfigObject, JobDocPayload, KbnServer } from '../../../types';
+import { ConditionalHeaders, JobDocPayload, ServerFacade } from '../../../types';
 
 export const getConditionalHeaders = ({
   job,
@@ -12,9 +12,9 @@ export const getConditionalHeaders = ({
 }: {
   job: JobDocPayload;
   filteredHeaders: Record<string, string>;
-  server: KbnServer;
+  server: ServerFacade;
 }) => {
-  const config: ConfigObject = server.config();
+  const config = server.config();
   const [hostname, port, basePath, protocol] = [
     config.get('xpack.reporting.kibanaServer.hostname') || config.get('server.host'),
     config.get('xpack.reporting.kibanaServer.port') || config.get('server.port'),
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
index 00cdd0410fac23..749ab3c50f1c06 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.ts
@@ -5,7 +5,7 @@
  */
 
 import { UI_SETTINGS_CUSTOM_PDF_LOGO } from '../../../common/constants';
-import { ConditionalHeaders, KbnServer } from '../../../types';
+import { ConditionalHeaders, ServerFacade } from '../../../types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types'; // Logo is PDF only
 
 export const getCustomLogo = async ({
@@ -15,7 +15,7 @@ export const getCustomLogo = async ({
 }: {
   job: JobDocPayloadPDF;
   conditionalHeaders: ConditionalHeaders;
-  server: KbnServer;
+  server: ServerFacade;
 }) => {
   const serverBasePath: string = server.config().get('server.basePath');
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
index e1ca599b38d41e..3b828520734217 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
@@ -12,7 +12,7 @@ import {
 } from 'url';
 import { getAbsoluteUrlFactory } from '../../../common/get_absolute_url';
 import { validateUrls } from '../../../common/validate_urls';
-import { KbnServer } from '../../../types';
+import { ServerFacade } from '../../../types';
 import { JobDocPayloadPNG } from '../../png/types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 
@@ -26,7 +26,7 @@ export async function getFullUrls({
   ...mergeValues // pass-throughs
 }: {
   job: JobDocPayloadPNG | JobDocPayloadPDF;
-  server: KbnServer;
+  server: ServerFacade;
 }) {
   const getAbsoluteUrl = getAbsoluteUrlFactory(server);
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.ts
index 44a9ed5a8ee511..a0aa4d973298db 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.ts
@@ -5,7 +5,7 @@
  */
 import { omit } from 'lodash';
 import { KBN_SCREENSHOT_HEADER_BLACKLIST } from '../../../common/constants';
-import { JobDocPayload, KbnServer } from '../../../types';
+import { JobDocPayload, ServerFacade } from '../../../types';
 
 export const omitBlacklistedHeaders = ({
   job,
@@ -14,7 +14,7 @@ export const omitBlacklistedHeaders = ({
 }: {
   job: JobDocPayload;
   decryptedHeaders: Record<string, string>;
-  server: KbnServer;
+  server: ServerFacade;
 }) => {
   const filteredHeaders: Record<string, string> = omit(
     decryptedHeaders,
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts
index 17c540e8072112..0cb83352d4606a 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/create_layout.ts
@@ -3,13 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { KbnServer } from '../../../types';
+import { ServerFacade } from '../../../types';
 import { LayoutTypes } from '../constants';
 import { Layout, LayoutParams } from './layout';
 import { PreserveLayout } from './preserve_layout';
 import { PrintLayout } from './print_layout';
 
-export function createLayout(server: KbnServer, layoutParams?: LayoutParams): Layout {
+export function createLayout(server: ServerFacade, layoutParams?: LayoutParams): Layout {
   if (layoutParams && layoutParams.id === LayoutTypes.PRESERVE_LAYOUT) {
     return new PreserveLayout(layoutParams.dimensions);
   }
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
index 9d672318000c13..44361181e32628 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print_layout.ts
@@ -7,7 +7,7 @@ import path from 'path';
 import { EvaluateFn, SerializableOrJSHandle } from 'puppeteer';
 import { LevelLogger } from '../../../server/lib';
 import { HeadlessChromiumDriver } from '../../../server/browsers/chromium/driver';
-import { KbnServer } from '../../../types';
+import { ServerFacade } from '../../../types';
 import { LayoutTypes } from '../constants';
 import { getDefaultLayoutSelectors, Layout, LayoutSelectorDictionary, Size } from './layout';
 import { CaptureConfig } from './types';
@@ -20,7 +20,7 @@ export class PrintLayout extends Layout {
   public readonly groupCount = 2;
   private captureConfig: CaptureConfig;
 
-  constructor(server: KbnServer) {
+  constructor(server: ServerFacade) {
     super(LayoutTypes.PRINT);
     this.captureConfig = server.config().get('xpack.reporting.capture');
   }
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts
index 9713adc76a5fad..30bbac61b02480 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/index.ts
@@ -6,8 +6,7 @@
 
 import * as Rx from 'rxjs';
 import { first, mergeMap } from 'rxjs/operators';
-import { KbnServer } from '../../../../types';
-import { HeadlessChromiumDriverFactory } from '../../../../server/browsers/chromium/driver_factory';
+import { ServerFacade, CaptureConfig } from '../../../../types';
 import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers/chromium/driver';
 import {
   ElementsPositionAndAttribute,
@@ -27,16 +26,15 @@ import { getElementPositionAndAttributes } from './get_element_position_data';
 import { getScreenshots } from './get_screenshots';
 import { skipTelemetry } from './skip_telemetry';
 
-// NOTE: Typescript does not throw an error if this interface has errors!
 interface ScreenshotResults {
   timeRange: TimeRange;
   screenshots: Screenshot[];
 }
 
-export function screenshotsObservableFactory(server: KbnServer) {
-  const browserDriverFactory: HeadlessChromiumDriverFactory = server.plugins.reporting.browserDriverFactory; // prettier-ignore
+export function screenshotsObservableFactory(server: ServerFacade) {
   const config = server.config();
-  const captureConfig = config.get('xpack.reporting.capture');
+  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
+  const { browserDriverFactory } = server.plugins.reporting!;
 
   return function screenshotsObservable({
     logger,
@@ -50,6 +48,7 @@ export function screenshotsObservableFactory(server: KbnServer) {
       browserTimezone,
     });
 
+    // @ts-ignore this needs to be refactored to use less random type declaration and instead rely on structures that work with inference
     return create$.pipe(
       mergeMap(({ driver$, exit$ }) => {
         const screenshot$ = driver$.pipe(
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts
index b49b52e18ded75..df0d591ff913c5 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/wait_for_render.ts
@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { CaptureConfig } from '../../../../types';
 import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers/chromium/driver';
 import { LevelLogger } from '../../../../server/lib';
 import { LayoutInstance } from '../../layouts/layout';
 
 export const waitForRenderComplete = async (
-  captureConfig: any,
+  captureConfig: CaptureConfig,
   browser: HeadlessBrowser,
   layout: LayoutInstance,
   logger: LevelLogger
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts
index 952547790adbb6..b1713e1753eea2 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/create_job.ts
@@ -4,19 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
 import { oncePerServer } from '../../../server/lib/once_per_server';
 import { cryptoFactory } from '../../../server/lib/crypto';
-import { KbnServer, ConditionalHeaders, CreateJobFactory } from '../../../types';
+import { ConditionalHeaders, CreateJobFactory, ServerFacade, RequestFacade } from '../../../types';
 import { JobParamsDiscoverCsv, ESQueueCreateJobFnDiscoverCsv } from '../types';
 
-function createJobFn(server: KbnServer) {
+function createJobFn(server: ServerFacade) {
   const crypto = cryptoFactory(server);
 
   return async function createJob(
     jobParams: JobParamsDiscoverCsv,
     headers: ConditionalHeaders,
-    request: Request
+    request: RequestFacade
   ) {
     const serializedEncryptedHeaders = await crypto.encrypt(headers);
 
@@ -36,5 +35,5 @@ function createJobFn(server: KbnServer) {
 }
 
 export const createJobFactory: CreateJobFactory = oncePerServer(createJobFn as (
-  server: KbnServer
+  server: ServerFacade
 ) => ESQueueCreateJobFnDiscoverCsv);
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/__tests__/hit_iterator.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/__tests__/hit_iterator.ts
new file mode 100644
index 00000000000000..c439c2bbf60ebe
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/__tests__/hit_iterator.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import sinon from 'sinon';
+import { CancellationToken } from '../../../../../common/cancellation_token';
+import { Logger, ScrollConfig } from '../../../../../types';
+import { createHitIterator } from '../hit_iterator';
+
+const mockLogger = {
+  error: new Function(),
+  debug: new Function(),
+  warning: new Function(),
+} as Logger;
+const debugLogStub = sinon.stub(mockLogger, 'debug');
+const warnLogStub = sinon.stub(mockLogger, 'warning');
+const errorLogStub = sinon.stub(mockLogger, 'error');
+const mockCallEndpoint = sinon.stub();
+const mockSearchRequest = {};
+const mockConfig: ScrollConfig = { duration: '2s', size: 123 };
+let realCancellationToken = new CancellationToken();
+let isCancelledStub: sinon.SinonStub;
+
+describe('hitIterator', function() {
+  beforeEach(() => {
+    debugLogStub.resetHistory();
+    warnLogStub.resetHistory();
+    errorLogStub.resetHistory();
+    mockCallEndpoint.resetHistory();
+    mockCallEndpoint.resetBehavior();
+    mockCallEndpoint.resolves({ _scroll_id: '123blah', hits: { hits: ['you found me'] } });
+    mockCallEndpoint.onCall(11).resolves({ _scroll_id: '123blah', hits: {} });
+
+    isCancelledStub = sinon.stub(realCancellationToken, 'isCancelled');
+    isCancelledStub.returns(false);
+  });
+
+  afterEach(() => {
+    realCancellationToken = new CancellationToken();
+  });
+
+  it('iterates hits', async () => {
+    // Begin
+    const hitIterator = createHitIterator(mockLogger);
+    const iterator = hitIterator(
+      mockConfig,
+      mockCallEndpoint,
+      mockSearchRequest,
+      realCancellationToken
+    );
+
+    while (true) {
+      const { done: iterationDone, value: hit } = await iterator.next();
+      if (iterationDone) {
+        break;
+      }
+      expect(hit).to.be('you found me');
+    }
+
+    expect(mockCallEndpoint.callCount).to.be(13);
+    expect(debugLogStub.callCount).to.be(13);
+    expect(warnLogStub.callCount).to.be(0);
+    expect(errorLogStub.callCount).to.be(0);
+  });
+
+  it('stops searches after cancellation', async () => {
+    // Setup
+    isCancelledStub.onFirstCall().returns(false);
+    isCancelledStub.returns(true);
+
+    // Begin
+    const hitIterator = createHitIterator(mockLogger);
+    const iterator = hitIterator(
+      mockConfig,
+      mockCallEndpoint,
+      mockSearchRequest,
+      realCancellationToken
+    );
+
+    while (true) {
+      const { done: iterationDone, value: hit } = await iterator.next();
+      if (iterationDone) {
+        break;
+      }
+      expect(hit).to.be('you found me');
+    }
+
+    expect(mockCallEndpoint.callCount).to.be(3);
+    expect(debugLogStub.callCount).to.be(3);
+    expect(warnLogStub.callCount).to.be(1);
+    expect(errorLogStub.callCount).to.be(0);
+
+    expect(warnLogStub.firstCall.lastArg).to.be(
+      'Any remaining scrolling searches have been cancelled by the cancellation token.'
+    );
+  });
+
+  it('handles time out', async () => {
+    // Setup
+    mockCallEndpoint.onCall(2).resolves({ status: 404 });
+
+    // Begin
+    const hitIterator = createHitIterator(mockLogger);
+    const iterator = hitIterator(
+      mockConfig,
+      mockCallEndpoint,
+      mockSearchRequest,
+      realCancellationToken
+    );
+
+    let errorThrown = false;
+    try {
+      while (true) {
+        const { done: iterationDone, value: hit } = await iterator.next();
+        if (iterationDone) {
+          break;
+        }
+        expect(hit).to.be('you found me');
+      }
+    } catch (err) {
+      expect(err).to.eql(
+        new Error('Expected _scroll_id in the following Elasticsearch response: {"status":404}')
+      );
+      errorThrown = true;
+    }
+
+    expect(mockCallEndpoint.callCount).to.be(4);
+    expect(debugLogStub.callCount).to.be(4);
+    expect(warnLogStub.callCount).to.be(0);
+    expect(errorLogStub.callCount).to.be(1);
+    expect(errorThrown).to.be(true);
+  });
+});
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.js b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.js
deleted file mode 100644
index 5ad61825687215..00000000000000
--- a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-async function parseResponse(request) {
-  const response = await request;
-  if (!response._scroll_id) {
-    throw new Error(i18n.translate('xpack.reporting.exportTypes.csv.hitIterator.expectedScrollIdErrorMessage', {
-      defaultMessage: 'Expected {scrollId} in the following Elasticsearch response: {response}',
-      values: { response: JSON.stringify(response), scrollId: '_scroll_id' }
-    }));
-  }
-
-  if (!response.hits) {
-    throw new Error(i18n.translate('xpack.reporting.exportTypes.csv.hitIterator.expectedHitsErrorMessage', {
-      defaultMessage: 'Expected {hits} in the following Elasticsearch response: {response}',
-      values: { response: JSON.stringify(response), hits: 'hits' }
-    }));
-  }
-
-  return {
-    scrollId: response._scroll_id,
-    hits: response.hits.hits
-  };
-}
-
-export function createHitIterator(logger) {
-  return async function* hitIterator(scrollSettings, callEndpoint, searchRequest, cancellationToken) {
-    logger.debug('executing search request');
-    function search(index, body) {
-      return parseResponse(callEndpoint('search', {
-        index,
-        body,
-        scroll: scrollSettings.duration,
-        size: scrollSettings.size
-      }));
-    }
-
-    function scroll(scrollId) {
-      logger.debug('executing scroll request');
-      return parseResponse(callEndpoint('scroll', {
-        scrollId,
-        scroll: scrollSettings.duration
-      }));
-    }
-
-    function clearScroll(scrollId) {
-      logger.debug('executing clearScroll request');
-      return callEndpoint('clearScroll', {
-        scrollId: [ scrollId ]
-      });
-    }
-
-    let { scrollId, hits } = await search(searchRequest.index, searchRequest.body);
-    try {
-      while(hits.length && !cancellationToken.isCancelled) {
-        for(const hit of hits) {
-          yield hit;
-        }
-
-        ({ scrollId, hits } = await scroll(scrollId));
-      }
-    } finally {
-      await clearScroll(scrollId);
-    }
-  };
-}
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts
new file mode 100644
index 00000000000000..68836c01369e3f
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/server/lib/hit_iterator.ts
@@ -0,0 +1,97 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { SearchParams, SearchResponse } from 'elasticsearch';
+
+import { i18n } from '@kbn/i18n';
+import { CancellationToken, ScrollConfig, Logger } from '../../../../types';
+
+async function parseResponse(request: SearchResponse<any>) {
+  const response = await request;
+  if (!response || !response._scroll_id) {
+    throw new Error(
+      i18n.translate('xpack.reporting.exportTypes.csv.hitIterator.expectedScrollIdErrorMessage', {
+        defaultMessage: 'Expected {scrollId} in the following Elasticsearch response: {response}',
+        values: { response: JSON.stringify(response), scrollId: '_scroll_id' },
+      })
+    );
+  }
+
+  if (!response.hits) {
+    throw new Error(
+      i18n.translate('xpack.reporting.exportTypes.csv.hitIterator.expectedHitsErrorMessage', {
+        defaultMessage: 'Expected {hits} in the following Elasticsearch response: {response}',
+        values: { response: JSON.stringify(response), hits: 'hits' },
+      })
+    );
+  }
+
+  return {
+    scrollId: response._scroll_id,
+    hits: response.hits.hits,
+  };
+}
+
+export function createHitIterator(logger: Logger) {
+  return async function* hitIterator(
+    scrollSettings: ScrollConfig,
+    callEndpoint: Function,
+    searchRequest: SearchParams,
+    cancellationToken: CancellationToken
+  ) {
+    logger.debug('executing search request');
+    function search(index: string | boolean | string[] | undefined, body: object) {
+      return parseResponse(
+        callEndpoint('search', {
+          index,
+          body,
+          scroll: scrollSettings.duration,
+          size: scrollSettings.size,
+        })
+      );
+    }
+
+    function scroll(scrollId: string | undefined) {
+      logger.debug('executing scroll request');
+      return parseResponse(
+        callEndpoint('scroll', {
+          scrollId,
+          scroll: scrollSettings.duration,
+        })
+      );
+    }
+
+    function clearScroll(scrollId: string | undefined) {
+      logger.debug('executing clearScroll request');
+      return callEndpoint('clearScroll', {
+        scrollId: [scrollId],
+      });
+    }
+
+    try {
+      let { scrollId, hits } = await search(searchRequest.index, searchRequest.body);
+      try {
+        while (hits && hits.length && !cancellationToken.isCancelled()) {
+          for (const hit of hits) {
+            yield hit;
+          }
+
+          ({ scrollId, hits } = await scroll(scrollId));
+
+          if (cancellationToken.isCancelled()) {
+            logger.warning(
+              'Any remaining scrolling searches have been cancelled by the cancellation token.'
+            );
+          }
+        }
+      } finally {
+        await clearScroll(scrollId);
+      }
+    } catch (err) {
+      logger.error(err);
+      throw err;
+    }
+  };
+}
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
index 3906c2bb1449d4..09f32833915b62 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/types.d.ts
@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
-import { JobDocPayload, JobParamPostPayload, ConditionalHeaders } from '../../types';
+import { JobDocPayload, JobParamPostPayload, ConditionalHeaders, RequestFacade } from '../../types';
 
 export interface JobParamPostPayloadDiscoverCsv extends JobParamPostPayload {
   state?: {
@@ -30,5 +29,5 @@ export interface JobDocPayloadDiscoverCsv extends JobDocPayload {
 export type ESQueueCreateJobFnDiscoverCsv = (
   jobParams: JobParamsDiscoverCsv,
   headers: ConditionalHeaders,
-  request: Request
+  request: RequestFacade
 ) => Promise<JobParamsDiscoverCsv>;
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
index 07fdf42a151713..0bcfc6f1ca07cc 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts
@@ -5,12 +5,10 @@
  */
 
 import { notFound, notImplemented } from 'boom';
-import { Request } from 'hapi';
 import { get } from 'lodash';
-
 import { PLUGIN_ID, CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../../common/constants';
 import { cryptoFactory, LevelLogger, oncePerServer } from '../../../../server/lib';
-import { KbnServer } from '../../../../types';
+import { ServerFacade, RequestFacade } from '../../../../types';
 import {
   SavedObject,
   SavedObjectServiceError,
@@ -32,10 +30,10 @@ interface VisData {
 type CreateJobFn = (
   jobParams: JobParamsPanelCsv,
   headers: any,
-  req: Request
+  req: RequestFacade
 ) => Promise<JobDocPayloadPanelCsv>;
 
-function createJobFn(server: KbnServer): CreateJobFn {
+function createJobFn(server: ServerFacade): CreateJobFn {
   const crypto = cryptoFactory(server);
   const logger = LevelLogger.createForServer(server, [
     PLUGIN_ID,
@@ -46,7 +44,7 @@ function createJobFn(server: KbnServer): CreateJobFn {
   return async function createJob(
     jobParams: JobParamsPanelCsv,
     headers: any,
-    req: Request
+    req: RequestFacade
   ): Promise<JobDocPayloadPanelCsv> {
     const { savedObjectType, savedObjectId } = jobParams;
     const serializedEncryptedHeaders = await crypto.encrypt(headers);
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
index ece5217a56205e..9d4bcf1e4b27a0 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/execute_job.ts
@@ -4,11 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
 import { i18n } from '@kbn/i18n';
-
 import { cryptoFactory, LevelLogger, oncePerServer } from '../../../server/lib';
-import { JobDocOutputExecuted, KbnServer, ExecuteImmediateJobFactory } from '../../../types';
+import {
+  JobDocOutputExecuted,
+  ServerFacade,
+  ExecuteImmediateJobFactory,
+  RequestFacade,
+} from '../../../types';
 import {
   CONTENT_TYPE_CSV,
   CSV_FROM_SAVEDOBJECT_JOB_TYPE,
@@ -20,10 +23,10 @@ import { createGenerateCsv } from './lib';
 type ExecuteJobFn = (
   jobId: string | null,
   job: JobDocPayloadPanelCsv,
-  realRequest?: Request
+  realRequest?: RequestFacade
 ) => Promise<JobDocOutputExecuted>;
 
-function executeJobFactoryFn(server: KbnServer): ExecuteJobFn {
+function executeJobFactoryFn(server: ServerFacade): ExecuteJobFn {
   const crypto = cryptoFactory(server);
   const logger = LevelLogger.createForServer(server, [
     PLUGIN_ID,
@@ -34,7 +37,7 @@ function executeJobFactoryFn(server: KbnServer): ExecuteJobFn {
   return async function executeJob(
     jobId: string | null,
     job: JobDocPayloadPanelCsv,
-    realRequest?: Request
+    realRequest?: RequestFacade
   ): Promise<JobDocOutputExecuted> {
     // There will not be a jobID for "immediate" generation.
     // jobID is only for "queued" jobs
@@ -46,7 +49,7 @@ function executeJobFactoryFn(server: KbnServer): ExecuteJobFn {
 
     jobLogger.debug(`Execute job generating [${visType}] csv`);
 
-    let requestObject: Request | FakeRequest;
+    let requestObject: RequestFacade | FakeRequest;
     if (isImmediate && realRequest) {
       jobLogger.info(`Executing job from immediate API`);
       requestObject = realRequest;
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
index aafad4674a1b25..6a4c6df5e1acec 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv.ts
@@ -5,16 +5,14 @@
  */
 
 import { badRequest } from 'boom';
-import { Request } from 'hapi';
-import { KbnServer, Logger } from '../../../../types';
-import { SearchPanel, VisPanel, JobParamsPanelCsv } from '../../types';
-import { FakeRequest } from '../../types';
+import { ServerFacade, RequestFacade, Logger } from '../../../../types';
+import { SearchPanel, VisPanel, JobParamsPanelCsv, FakeRequest } from '../../types';
 import { generateCsvSearch } from './generate_csv_search';
 
 export function createGenerateCsv(logger: Logger) {
   return async function generateCsv(
-    request: Request | FakeRequest,
-    server: KbnServer,
+    request: RequestFacade | FakeRequest,
+    server: ServerFacade,
     visType: string,
     panel: VisPanel | SearchPanel,
     jobParams: JobParamsPanelCsv
@@ -27,7 +25,7 @@ export function createGenerateCsv(logger: Logger) {
     switch (visType) {
       case 'search':
         return await generateCsvSearch(
-          request as Request,
+          request as RequestFacade,
           server,
           logger,
           panel as SearchPanel,
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
index da2c184d2d6e03..2e2c8635fca5f0 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts
@@ -4,15 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
-
 import { buildEsQuery } from '@kbn/es-query';
 // @ts-ignore no module definition
 import { createGenerateCsv } from '../../../csv/server/lib/generate_csv';
-
 import { CancellationToken } from '../../../../common/cancellation_token';
-
-import { KbnServer, Logger } from '../../../../types';
+import { ServerFacade, RequestFacade, Logger } from '../../../../types';
 import {
   IndexPatternSavedObject,
   SavedSearchObjectAttributes,
@@ -50,8 +46,8 @@ const getUiSettings = async (config: any) => {
 };
 
 export async function generateCsvSearch(
-  req: Request,
-  server: KbnServer,
+  req: RequestFacade,
+  server: ServerFacade,
   logger: Logger,
   searchPanel: SearchPanel,
   jobParams: JobParamsDiscoverCsv
@@ -140,7 +136,7 @@ export async function generateCsvSearch(
     },
   };
   const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
-  const callCluster = (...params: any[]) => callWithRequest(req, ...params);
+  const callCluster = (...params: [string, object]) => callWithRequest(req, ...params);
   const config = server.config();
   const uiSettings = await getUiSettings(uiConfig);
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/get_job_params_from_request.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/get_job_params_from_request.ts
index 2041b1253ee51b..774e430d593cd0 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/get_job_params_from_request.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/get_job_params_from_request.ts
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
+import { RequestFacade } from '../../../../types';
 import { JobParamsPostPayloadPanelCsv, JobParamsPanelCsv } from '../../types';
 
 export function getJobParamsFromRequest(
-  request: Request,
+  request: RequestFacade,
   opts: { isImmediate: boolean }
 ): Partial<JobParamsPanelCsv> {
   const { savedObjectType, savedObjectId } = request.params;
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
index aa681210fc740c..f8692c336b2921 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/types.d.ts
@@ -5,11 +5,11 @@
  */
 
 import { CancellationToken } from '../../common/cancellation_token';
-import { JobParamPostPayload, JobDocPayload, KbnServer } from '../../types';
+import { JobParamPostPayload, JobDocPayload, ServerFacade } from '../../types';
 
 export interface FakeRequest {
   headers: any;
-  server: KbnServer;
+  server: ServerFacade;
 }
 
 export interface JobParamsPostPayloadPanelCsv extends JobParamPostPayload {
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
index 2ee1e7a874355b..4176a1351d6542 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/create_job/index.ts
@@ -4,20 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
-import { KbnServer, ConditionalHeaders, CreateJobFactory } from '../../../../types';
+import {
+  ServerFacade,
+  RequestFacade,
+  ConditionalHeaders,
+  CreateJobFactory,
+} from '../../../../types';
 import { validateUrls } from '../../../../common/validate_urls';
 import { cryptoFactory } from '../../../../server/lib/crypto';
 import { oncePerServer } from '../../../../server/lib/once_per_server';
 import { JobParamsPNG, ESQueueCreateJobFnPNG } from '../../types';
 
-function createJobFn(server: KbnServer) {
+function createJobFn(server: ServerFacade) {
   const crypto = cryptoFactory(server);
 
   return async function createJob(
     { objectType, title, relativeUrl, browserTimezone, layout }: JobParamsPNG,
     headers: ConditionalHeaders,
-    request: Request
+    request: RequestFacade
   ) {
     const serializedEncryptedHeaders = await crypto.encrypt(headers);
 
@@ -37,5 +41,5 @@ function createJobFn(server: KbnServer) {
 }
 
 export const createJobFactory: CreateJobFactory = oncePerServer(createJobFn as (
-  server: KbnServer
+  server: ServerFacade
 ) => ESQueueCreateJobFnPNG);
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
index 3d09d2dae42a16..5980f1884ab2ff 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
@@ -7,7 +7,7 @@
 import * as Rx from 'rxjs';
 import { toArray, mergeMap } from 'rxjs/operators';
 import { LevelLogger } from '../../../../server/lib';
-import { KbnServer, ConditionalHeaders } from '../../../../types';
+import { ServerFacade, ConditionalHeaders } from '../../../../types';
 import { oncePerServer } from '../../../../server/lib/once_per_server';
 import { screenshotsObservableFactory } from '../../../common/lib/screenshots';
 import { PreserveLayout } from '../../../common/layouts/preserve_layout';
@@ -21,7 +21,7 @@ interface UrlScreenshot {
   screenshots: ScreenshotData[];
 }
 
-function generatePngObservableFn(server: KbnServer) {
+function generatePngObservableFn(server: ServerFacade) {
   const screenshotsObservable = screenshotsObservableFactory(server);
   const captureConcurrency = 1;
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/png/types.d.ts
index f0590f98da3625..c7ea2bdfba59fa 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/types.d.ts
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
 import { LayoutInstance } from '../common/layouts/layout';
-import { ConditionalHeaders, KbnServer, JobDocPayload } from '../../types';
+import { ConditionalHeaders, JobDocPayload, RequestFacade } from '../../types';
 
 // Job params: structure of incoming user request data
 export interface JobParamsPNG {
@@ -30,5 +29,5 @@ export interface JobDocPayloadPNG extends JobDocPayload {
 export type ESQueueCreateJobFnPNG = (
   jobParams: JobParamsPNG,
   headers: ConditionalHeaders,
-  request: Request
+  request: RequestFacade
 ) => Promise<JobParamsPNG>;
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
index e57e18eff1b674..0d2243acfef9bb 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/lib/generate_pdf.ts
@@ -8,7 +8,7 @@ import * as Rx from 'rxjs';
 import { toArray, mergeMap } from 'rxjs/operators';
 import { groupBy } from 'lodash';
 import { LevelLogger } from '../../../../server/lib';
-import { KbnServer, ConditionalHeaders } from '../../../../types';
+import { ServerFacade, ConditionalHeaders } from '../../../../types';
 // @ts-ignore untyped module
 import { pdf } from './pdf';
 import { oncePerServer } from '../../../../server/lib/once_per_server';
@@ -38,7 +38,7 @@ const getTimeRange = (urlScreenshots: UrlScreenshot[]) => {
   return null;
 };
 
-function generatePdfObservableFn(server: KbnServer) {
+function generatePdfObservableFn(server: ServerFacade) {
   const screenshotsObservable = screenshotsObservableFactory(server);
   const captureConcurrency = 1;
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
index a27b4aed487602..d1e5e58f0f0a5d 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
 import { LayoutInstance } from '../common/layouts/layout';
-import { ConditionalHeaders, KbnServer, JobDocPayload } from '../../types';
+import { ConditionalHeaders, JobDocPayload, ServerFacade, RequestFacade } from '../../types';
 
 // Job params: structure of incoming user request data, after being parsed from RISON
 export interface JobParamsPDF {
@@ -32,7 +31,7 @@ export interface JobDocPayloadPDF extends JobDocPayload {
 export type ESQueueCreateJobFnPDF = (
   jobParams: JobParamsPDF,
   headers: ConditionalHeaders,
-  request: Request
+  request: RequestFacade
 ) => Promise<JobParamsPDF>;
 
-export type CreateJobFactoryPDF = (server: KbnServer) => ESQueueCreateJobFnPDF;
+export type CreateJobFactoryPDF = (server: ServerFacade) => ESQueueCreateJobFnPDF;
diff --git a/x-pack/legacy/plugins/reporting/index.js b/x-pack/legacy/plugins/reporting/index.js
index 95c792d9d51712..1fe83124e2b453 100644
--- a/x-pack/legacy/plugins/reporting/index.js
+++ b/x-pack/legacy/plugins/reporting/index.js
@@ -5,7 +5,7 @@
  */
 
 import { resolve } from 'path';
-import { PLUGIN_ID, UI_SETTINGS_CUSTOM_PDF_LOGO } from './common/constants';
+import { PLUGIN_ID, BROWSER_TYPE, UI_SETTINGS_CUSTOM_PDF_LOGO } from './common/constants';
 import { mirrorPluginStatus } from '../../server/lib/mirror_plugin_status';
 import { registerRoutes } from './server/routes';
 import {
@@ -16,13 +16,8 @@ import {
   runValidations,
 } from './server/lib';
 import { config as appConfig } from './server/config/config';
-import {
-  CHROMIUM,
-  createBrowserDriverFactory,
-  getDefaultChromiumSandboxDisabled,
-} from './server/browsers';
+import { createBrowserDriverFactory, getDefaultChromiumSandboxDisabled } from './server/browsers';
 import { logConfiguration } from './log_configuration';
-
 import { getReportingUsageCollector } from './server/usage';
 import { i18n } from '@kbn/i18n';
 
@@ -116,7 +111,7 @@ export const reporting = (kibana) => {
           settleTime: Joi.number().integer().default(1000), //deprecated
           concurrency: Joi.number().integer().default(appConfig.concurrency), //deprecated
           browser: Joi.object({
-            type: Joi.any().valid(CHROMIUM).default(CHROMIUM),
+            type: Joi.any().valid(BROWSER_TYPE).default(BROWSER_TYPE),
             autoDownload: Joi.boolean().when('$dist', {
               is: true,
               then: Joi.default(false),
@@ -182,22 +177,23 @@ export const reporting = (kibana) => {
       }).default();
     },
 
+    // TODO: Decouple Hapi: Build a server facade object based on the server to
+    // pass through to the libs. Do not pass server directly
     init: async function (server) {
       let isCollectorReady = false;
       const isReady = () => isCollectorReady;
       // Register a function with server to manage the collection of usage stats
       server.usage.collectorSet.register(getReportingUsageCollector(server, isReady));
 
-      const logger = LevelLogger.createForServer(server, [PLUGIN_ID], true);
+      const logger = LevelLogger.createForServer(server, [PLUGIN_ID]);
       const [exportTypesRegistry, browserFactory] = await Promise.all([
         exportTypesRegistryFactory(server),
         createBrowserDriverFactory(server),
       ]);
       server.expose('exportTypesRegistry', exportTypesRegistry);
 
-      const config = server.config();
-      logConfiguration(config, logger);
-      runValidations(server, config, logger, browserFactory);
+      logConfiguration(server, logger);
+      runValidations(server, logger, browserFactory);
 
       const { xpack_main: xpackMainPlugin } = server.plugins;
       mirrorPluginStatus(xpackMainPlugin, this);
diff --git a/x-pack/legacy/plugins/reporting/log_configuration.js b/x-pack/legacy/plugins/reporting/log_configuration.js
index ef4dab2ee3be74..94ff90f5944d0e 100644
--- a/x-pack/legacy/plugins/reporting/log_configuration.js
+++ b/x-pack/legacy/plugins/reporting/log_configuration.js
@@ -9,7 +9,9 @@ import { promisify } from 'util';
 
 const getos = promisify(getosSync);
 
-export async function logConfiguration(config, logger) {
+export async function logConfiguration(server, logger) {
+  const config = server.config();
+
   const browserType = config.get('xpack.reporting.capture.browser.type');
   logger.debug(`Browser type: ${browserType}`);
 
diff --git a/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_info_button.test.tsx.snap b/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_info_button.test.tsx.snap
index a34d0388a5e3f6..54489f18a93d23 100644
--- a/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_info_button.test.tsx.snap
+++ b/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_info_button.test.tsx.snap
@@ -87,7 +87,11 @@ Array [
                 as="div"
                 autoFocus={true}
                 disabled={false}
-                lockProps={Object {}}
+                lockProps={
+                  Object {
+                    "style": undefined,
+                  }
+                }
                 noFocusGuards={false}
                 persistentFocus={false}
                 returnFocus={true}
@@ -496,7 +500,11 @@ Array [
                 as="div"
                 autoFocus={true}
                 disabled={false}
-                lockProps={Object {}}
+                lockProps={
+                  Object {
+                    "style": undefined,
+                  }
+                }
                 noFocusGuards={false}
                 persistentFocus={false}
                 returnFocus={true}
diff --git a/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap b/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
index 4e861a5b8d1d5a..3a8d2bc13249e7 100644
--- a/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
+++ b/x-pack/legacy/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
@@ -112,6 +112,11 @@ Array [
                       data-test-subj="tableHeaderCell_object_title_0"
                       role="columnheader"
                       scope="col"
+                      style={
+                        Object {
+                          "width": undefined,
+                        }
+                      }
                     >
                       <div
                         className="euiTableCellContent"
@@ -134,6 +139,11 @@ Array [
                       data-test-subj="tableHeaderCell_created_at_1"
                       role="columnheader"
                       scope="col"
+                      style={
+                        Object {
+                          "width": undefined,
+                        }
+                      }
                     >
                       <div
                         className="euiTableCellContent"
@@ -156,6 +166,11 @@ Array [
                       data-test-subj="tableHeaderCell_status_2"
                       role="columnheader"
                       scope="col"
+                      style={
+                        Object {
+                          "width": undefined,
+                        }
+                      }
                     >
                       <div
                         className="euiTableCellContent"
@@ -176,6 +191,11 @@ Array [
                       className="euiTableHeaderCell"
                       role="columnheader"
                       scope="col"
+                      style={
+                        Object {
+                          "width": undefined,
+                        }
+                      }
                     >
                       <div
                         className="euiTableCellContent euiTableCellContent--alignRight"
@@ -205,6 +225,11 @@ Array [
                       <td
                         className="euiTableRowCell euiTableRowCell--isMobileFullWidth"
                         colSpan={4}
+                        style={
+                          Object {
+                            "width": undefined,
+                          }
+                        }
                       >
                         <div
                           className="euiTableCellContent euiTableCellContent--alignCenter"
@@ -362,6 +387,11 @@ Array [
                     data-test-subj="tableHeaderCell_object_title_0"
                     role="columnheader"
                     scope="col"
+                    style={
+                      Object {
+                        "width": undefined,
+                      }
+                    }
                   >
                     <div
                       className="euiTableCellContent"
@@ -384,6 +414,11 @@ Array [
                     data-test-subj="tableHeaderCell_created_at_1"
                     role="columnheader"
                     scope="col"
+                    style={
+                      Object {
+                        "width": undefined,
+                      }
+                    }
                   >
                     <div
                       className="euiTableCellContent"
@@ -406,6 +441,11 @@ Array [
                     data-test-subj="tableHeaderCell_status_2"
                     role="columnheader"
                     scope="col"
+                    style={
+                      Object {
+                        "width": undefined,
+                      }
+                    }
                   >
                     <div
                       className="euiTableCellContent"
@@ -426,6 +466,11 @@ Array [
                     className="euiTableHeaderCell"
                     role="columnheader"
                     scope="col"
+                    style={
+                      Object {
+                        "width": undefined,
+                      }
+                    }
                   >
                     <div
                       className="euiTableCellContent euiTableCellContent--alignRight"
@@ -455,6 +500,11 @@ Array [
                     <td
                       className="euiTableRowCell euiTableRowCell--isMobileFullWidth"
                       colSpan={4}
+                      style={
+                        Object {
+                          "width": undefined,
+                        }
+                      }
                     >
                       <div
                         className="euiTableCellContent euiTableCellContent--alignCenter"
diff --git a/x-pack/legacy/plugins/reporting/reporting.d.ts b/x-pack/legacy/plugins/reporting/reporting.d.ts
new file mode 100644
index 00000000000000..d4a7943f6d067a
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/reporting.d.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ReportingPlugin } from './types';
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/browser_types.ts b/x-pack/legacy/plugins/reporting/server/browsers/browser_types.ts
deleted file mode 100644
index 0d67678c183ada..00000000000000
--- a/x-pack/legacy/plugins/reporting/server/browsers/browser_types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const CHROMIUM = 'chromium';
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/browsers.ts b/x-pack/legacy/plugins/reporting/server/browsers/browsers.ts
deleted file mode 100644
index ff9dece504ea67..00000000000000
--- a/x-pack/legacy/plugins/reporting/server/browsers/browsers.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as chromium from './chromium';
-
-export type BrowserType = keyof typeof BROWSERS_BY_TYPE;
-
-export const BROWSERS_BY_TYPE = {
-  chromium,
-};
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
index 50bed7a8edb645..ca26f7d41c12a8 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
@@ -13,7 +13,7 @@ import {
   ConsoleMessage,
   Request as PuppeteerRequest,
 } from 'puppeteer';
-import rimraf from 'rimraf';
+import del from 'del';
 import * as Rx from 'rxjs';
 import { ignoreElements, mergeMap, tap } from 'rxjs/operators';
 import { InnerSubscriber } from 'rxjs/internal/InnerSubscriber';
@@ -166,20 +166,16 @@ export class HeadlessChromiumDriverFactory {
         this.logger.debug(`deleting chromium user data directory at [${userDataDir}]`);
         // the unsubscribe function isn't `async` so we're going to make our best effort at
         // deleting the userDataDir and if it fails log an error.
-        rimraf(userDataDir, err => {
-          if (err) {
-            return this.logger.error(
-              `error deleting user data directory at [${userDataDir}]: [${err}]`
-            );
-          }
+        del(userDataDir).catch(error => {
+          this.logger.error(`error deleting user data directory at [${userDataDir}]: [${error}]`);
         });
       });
     });
   }
 
   getBrowserLogger(page: Page): Rx.Observable<ConsoleMessage> {
-    return Rx.fromEvent(page as NodeJS.EventEmitter, 'console').pipe(
-      tap((line: ConsoleMessage) => {
+    return Rx.fromEvent<ConsoleMessage>(page, 'console').pipe(
+      tap(line => {
         if (line.type() === 'error') {
           this.logger.error(line.text(), ['headless-browser-console']);
         } else {
@@ -189,14 +185,14 @@ export class HeadlessChromiumDriverFactory {
     );
   }
 
-  getProcessLogger(browser: Browser): Rx.Observable<string> {
+  getProcessLogger(browser: Browser) {
     const childProcess = browser.process();
     // NOTE: The browser driver can not observe stdout and stderr of the child process
     // Puppeteer doesn't give a handle to the original ChildProcess object
     // See https://github.com/GoogleChrome/puppeteer/issues/1292#issuecomment-521470627
 
     // just log closing of the process
-    const processClose$: Rx.Observable<string> = Rx.fromEvent(childProcess, 'close').pipe(
+    const processClose$ = Rx.fromEvent<void>(childProcess, 'close').pipe(
       tap(() => {
         this.logger.debug('child process closed', ['headless-browser-process']);
       })
@@ -205,17 +201,15 @@ export class HeadlessChromiumDriverFactory {
     return processClose$; // ideally, this would also merge with observers for stdout and stderr
   }
 
-  getPageExit(browser: Browser, page: Page): Rx.Observable<never> {
-    const pageError$: Rx.Observable<never> = Rx.fromEvent(page, 'error').pipe(
-      mergeMap((err: Error) => Rx.throwError(err))
-    );
+  getPageExit(browser: Browser, page: Page) {
+    const pageError$ = Rx.fromEvent<Error>(page, 'error').pipe(mergeMap(err => Rx.throwError(err)));
 
-    const uncaughtExceptionPageError$: Rx.Observable<never> = Rx.fromEvent(page, 'pageerror').pipe(
-      mergeMap((err: Error) => Rx.throwError(err))
+    const uncaughtExceptionPageError$ = Rx.fromEvent<Error>(page, 'pageerror').pipe(
+      mergeMap(err => Rx.throwError(err))
     );
 
-    const pageRequestFailed$: Rx.Observable<never> = Rx.fromEvent(page, 'requestfailed').pipe(
-      mergeMap((req: PuppeteerRequest) => {
+    const pageRequestFailed$ = Rx.fromEvent<PuppeteerRequest>(page, 'requestfailed').pipe(
+      mergeMap(req => {
         const failure = req.failure && req.failure();
         if (failure) {
           return Rx.throwError(
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts b/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
index de4312ea1bef40..a253988b01952e 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts
@@ -4,44 +4,43 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { BROWSERS_BY_TYPE, BrowserType } from './browsers';
 import { ensureBrowserDownloaded } from './download';
 import { installBrowser } from './install';
 import { LevelLogger } from '../lib/level_logger';
-import { KbnServer } from '../../types';
-import { PLUGIN_ID } from '../../common/constants';
+import { ServerFacade, CaptureConfig } from '../../types';
+import { PLUGIN_ID, BROWSER_TYPE } from '../../common/constants';
+import { chromium } from './index';
 import { HeadlessChromiumDriverFactory } from './chromium/driver_factory';
 
 export async function createBrowserDriverFactory(
-  server: KbnServer
+  server: ServerFacade
 ): Promise<HeadlessChromiumDriverFactory> {
   const config = server.config();
   const logger = LevelLogger.createForServer(server, [PLUGIN_ID, 'browser-driver']);
 
-  const DATA_DIR = config.get('path.data');
-  const CAPTURE_CONFIG = config.get('xpack.reporting.capture');
-  const BROWSER_TYPE: BrowserType = CAPTURE_CONFIG.browser.type;
-  const BROWSER_AUTO_DOWNLOAD = CAPTURE_CONFIG.browser.autoDownload;
-  const BROWSER_CONFIG = CAPTURE_CONFIG.browser[BROWSER_TYPE];
-  const NETWORK_POLICY = CAPTURE_CONFIG.networkPolicy;
-  const REPORTING_TIMEOUT = config.get('xpack.reporting.queue.timeout');
+  const dataDir: string = config.get('path.data');
+  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
+  const browserType = captureConfig.browser.type;
+  const browserAutoDownload = captureConfig.browser.autoDownload;
+  const browserConfig = captureConfig.browser[BROWSER_TYPE];
+  const networkPolicy = captureConfig.networkPolicy;
+  const reportingTimeout: number = config.get('xpack.reporting.queue.timeout');
 
-  if (BROWSER_CONFIG.disableSandbox) {
+  if (browserConfig.disableSandbox) {
     logger.warning(`Enabling the Chromium sandbox provides an additional layer of protection.`);
   }
-  if (BROWSER_AUTO_DOWNLOAD) {
-    await ensureBrowserDownloaded(BROWSER_TYPE);
+  if (browserAutoDownload) {
+    await ensureBrowserDownloaded(browserType);
   }
 
   try {
-    const browser = BROWSERS_BY_TYPE[BROWSER_TYPE]; // NOTE: unecessary indirection: this is always a Chromium browser object, as of PhantomJS removal
-    const { binaryPath } = await installBrowser(logger, browser, DATA_DIR);
-    return browser.createDriverFactory(
+    const { binaryPath } = await installBrowser(logger, chromium, dataDir);
+    return chromium.createDriverFactory(
       binaryPath,
       logger,
-      BROWSER_CONFIG,
-      REPORTING_TIMEOUT,
-      NETWORK_POLICY
+      browserConfig,
+      reportingTimeout,
+      networkPolicy
     );
   } catch (error) {
     if (error.cause && ['EACCES', 'EEXIST'].includes(error.cause.code)) {
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/download/clean.ts b/x-pack/legacy/plugins/reporting/server/browsers/download/clean.ts
index 394b76d772531d..4355a6a0a17732 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/download/clean.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/download/clean.ts
@@ -7,8 +7,7 @@
 import { readdirSync } from 'fs';
 import { resolve as resolvePath } from 'path';
 
-import { fromNode as fcb } from 'bluebird';
-import rimraf from 'rimraf';
+import del from 'del';
 
 import { log, asyncMap } from './util';
 
@@ -32,7 +31,7 @@ export async function clean(dir: string, expectedPaths: string[]) {
     const path = resolvePath(dir, filename);
     if (!expectedPaths.includes(path)) {
       log(`Deleting unexpected file ${path}`);
-      await fcb(cb => rimraf(path, cb));
+      await del(path);
     }
   });
 }
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts b/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts
index d322566f9aa1df..c79d2c263b2e19 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/download/ensure_downloaded.ts
@@ -7,7 +7,8 @@
 import { resolve as resolvePath } from 'path';
 import { existsSync } from 'fs';
 
-import { BROWSERS_BY_TYPE, BrowserType } from '../browsers';
+import { chromium } from '../index';
+import { BrowserType } from '../types';
 
 import { md5 } from './checksum';
 import { asyncMap } from './util';
@@ -21,7 +22,7 @@ import { clean } from './clean';
  * @return {Promise<undefined>}
  */
 export async function ensureBrowserDownloaded(browserType: BrowserType) {
-  await ensureDownloaded([BROWSERS_BY_TYPE[browserType]]);
+  await ensureDownloaded([chromium]);
 }
 
 /**
@@ -29,7 +30,7 @@ export async function ensureBrowserDownloaded(browserType: BrowserType) {
  * @return {Promise<undefined>}
  */
 export async function ensureAllBrowsersDownloaded() {
-  await ensureDownloaded(Object.values(BROWSERS_BY_TYPE));
+  await ensureDownloaded([chromium]);
 }
 
 /**
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/index.ts
index 3f97a1368246bd..a5ecc405bf9c59 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/index.ts
@@ -3,8 +3,13 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import * as chromiumDefinition from './chromium';
 
 export { ensureAllBrowsersDownloaded } from './download';
 export { createBrowserDriverFactory } from './create_browser_driver_factory';
 export { getDefaultChromiumSandboxDisabled } from './default_chromium_sandbox_disabled';
-export { CHROMIUM } from './browser_types';
+
+export const chromium = {
+  paths: chromiumDefinition.paths,
+  createDriverFactory: chromiumDefinition.createDriverFactory,
+};
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts b/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts
new file mode 100644
index 00000000000000..43cbb0f13a5a7f
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/browsers/types.d.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export type BrowserType = 'chromium';
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts b/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
index 9519b7170d76f9..a7e81093c136a5 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_queue.ts
@@ -5,7 +5,7 @@
  */
 
 import { PLUGIN_ID } from '../../common/constants';
-import { KbnServer } from '../../types';
+import { ServerFacade, QueueConfig } from '../../types';
 // @ts-ignore
 import { Esqueue } from './esqueue';
 import { createWorkerFactory } from './create_worker';
@@ -14,8 +14,8 @@ import { LevelLogger } from './level_logger';
 // @ts-ignore
 import { createTaggedLogger } from './create_tagged_logger'; // TODO remove createTaggedLogger once esqueue is removed
 
-function createQueueFn(server: KbnServer): Esqueue {
-  const queueConfig = server.config().get('xpack.reporting.queue');
+function createQueueFn(server: ServerFacade): Esqueue {
+  const queueConfig: QueueConfig = server.config().get('xpack.reporting.queue');
   const index = server.config().get('xpack.reporting.index');
 
   const queueOptions = {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts b/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
index 28997ce0a388dd..afad8f096a8bb9 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_worker.test.ts
@@ -5,7 +5,7 @@
  */
 
 import * as sinon from 'sinon';
-import { KbnServer } from '../../types';
+import { ServerFacade } from '../../types';
 import { createWorkerFactory } from './create_worker';
 // @ts-ignore
 import { Esqueue } from './esqueue';
@@ -24,13 +24,13 @@ const executeJobFactoryStub = sinon.stub();
 
 const getMockServer = (
   exportTypes: any[] = [{ executeJobFactory: executeJobFactoryStub }]
-): KbnServer => {
+): ServerFacade => {
   return ({
     log: sinon.stub(),
     expose: sinon.stub(),
     config: () => ({ get: configGetStub }),
     plugins: { reporting: { exportTypesRegistry: { getAll: () => exportTypes } } },
-  } as unknown) as KbnServer;
+  } as unknown) as ServerFacade;
 };
 
 describe('Create Worker', () => {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts b/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
index 0e53fe23a4f296..7166659487c9bd 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
@@ -7,42 +7,50 @@
 import { PLUGIN_ID } from '../../common/constants';
 import {
   ESQueueInstance,
+  QueueConfig,
+  ExportTypeDefinition,
   ESQueueWorkerExecuteFn,
-  ExportType,
+  ImmediateExecuteFn,
   JobDoc,
+  JobDocPayload,
   JobSource,
-  KbnServer,
+  ServerFacade,
 } from '../../types';
 // @ts-ignore untyped dependency
 import { events as esqueueEvents } from './esqueue';
 import { LevelLogger } from './level_logger';
 import { oncePerServer } from './once_per_server';
 
-function createWorkerFn(server: KbnServer) {
+function createWorkerFn(server: ServerFacade) {
   const config = server.config();
-  const queueConfig = config.get('xpack.reporting.queue');
-  const kibanaName = config.get('server.name');
-  const kibanaId = config.get('server.uuid');
-  const exportTypesRegistry = server.plugins.reporting.exportTypesRegistry;
   const logger = LevelLogger.createForServer(server, [PLUGIN_ID, 'queue-worker']);
+  const queueConfig: QueueConfig = config.get('xpack.reporting.queue');
+  const kibanaName: string = config.get('server.name');
+  const kibanaId: string = config.get('server.uuid');
+  const { exportTypesRegistry } = server.plugins.reporting!;
 
   // Once more document types are added, this will need to be passed in
   return function createWorker(queue: ESQueueInstance) {
     // export type / execute job map
-    const jobExectors: Map<string, ESQueueWorkerExecuteFn> = new Map();
+    const jobExecutors: Map<string, ESQueueWorkerExecuteFn | ImmediateExecuteFn> = new Map();
 
-    for (const exportType of exportTypesRegistry.getAll() as ExportType[]) {
-      const executeJob = exportType.executeJobFactory(server);
-      jobExectors.set(exportType.jobType, executeJob);
+    for (const exportType of exportTypesRegistry.getAll() as ExportTypeDefinition[]) {
+      const executeJobFactory = exportType.executeJobFactory(server);
+      jobExecutors.set(exportType.jobType, executeJobFactory);
     }
 
-    const workerFn = (job: JobSource, jobdoc: JobDoc, cancellationToken: any) => {
+    const workerFn = (job: JobSource, jobdoc: JobDocPayload | JobDoc, cancellationToken?: any) => {
       // pass the work to the jobExecutor
-      const jobExecutor = jobExectors.get(job._source.jobtype);
-      if (!jobExecutor) {
+      if (!jobExecutors.get(job._source.jobtype)) {
         throw new Error(`Unable to find a job executor for the claimed job: [${job._id}]`);
       }
-      return jobExecutor(job._id, jobdoc, cancellationToken);
+      if (job._id) {
+        const jobExecutor = jobExecutors.get(job._source.jobtype) as ESQueueWorkerExecuteFn;
+        return jobExecutor(job._id, jobdoc as JobDoc, cancellationToken);
+      } else {
+        const jobExecutor = jobExecutors.get(job._source.jobtype) as ImmediateExecuteFn;
+        return jobExecutor(null, jobdoc as JobDocPayload, cancellationToken);
+      }
     };
     const workerOptions = {
       kibanaName,
diff --git a/x-pack/legacy/plugins/reporting/server/lib/crypto.ts b/x-pack/legacy/plugins/reporting/server/lib/crypto.ts
index 60e558479af5ef..dbc01fc947f8b6 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/crypto.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/crypto.ts
@@ -6,9 +6,9 @@
 
 import nodeCrypto from '@elastic/node-crypto';
 import { oncePerServer } from './once_per_server';
-import { KbnServer } from '../../types';
+import { ServerFacade } from '../../types';
 
-function cryptoFn(server: KbnServer) {
+function cryptoFn(server: ServerFacade) {
   const encryptionKey = server.config().get('xpack.reporting.encryptionKey');
   return nodeCrypto({ encryptionKey });
 }
diff --git a/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts b/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
index ec0ffdf51733e1..c264c0ca7e0ebf 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
@@ -4,12 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
 import { get } from 'lodash';
 // @ts-ignore
 import { events as esqueueEvents } from './esqueue';
 import { oncePerServer } from './once_per_server';
-import { KbnServer, Logger, ConditionalHeaders } from '../../types';
+import {
+  ServerFacade,
+  RequestFacade,
+  Logger,
+  CaptureConfig,
+  QueueConfig,
+  ConditionalHeaders,
+} from '../../types';
 
 interface ConfirmedJob {
   id: string;
@@ -18,13 +24,13 @@ interface ConfirmedJob {
   _primary_term: number;
 }
 
-function enqueueJobFn(server: KbnServer) {
-  const jobQueue = server.plugins.reporting.queue;
+function enqueueJobFn(server: ServerFacade) {
   const config = server.config();
-  const queueConfig = config.get('xpack.reporting.queue');
-  const browserType = config.get('xpack.reporting.capture.browser.type');
-  const maxAttempts = config.get('xpack.reporting.capture.maxAttempts');
-  const exportTypesRegistry = server.plugins.reporting.exportTypesRegistry;
+  const captureConfig: CaptureConfig = config.get('xpack.reporting.capture');
+  const browserType = captureConfig.browser.type;
+  const maxAttempts = captureConfig.maxAttempts;
+  const queueConfig: QueueConfig = config.get('xpack.reporting.queue');
+  const { exportTypesRegistry, queue: jobQueue } = server.plugins.reporting!;
 
   return async function enqueueJob(
     parentLogger: Logger,
@@ -32,7 +38,7 @@ function enqueueJobFn(server: KbnServer) {
     jobParams: object,
     user: string,
     headers: ConditionalHeaders,
-    request: Request
+    request: RequestFacade
   ) {
     const logger = parentLogger.clone(['queue-job']);
     const exportType = exportTypesRegistry.getById(exportTypeId);
diff --git a/x-pack/legacy/plugins/reporting/server/lib/export_types_registry.ts b/x-pack/legacy/plugins/reporting/server/lib/export_types_registry.ts
index 21f954fe739d70..35c97f1db10dcd 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/export_types_registry.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/export_types_registry.ts
@@ -6,7 +6,7 @@
 
 import { resolve as pathResolve } from 'path';
 import glob from 'glob';
-import { KbnServer } from '../../types';
+import { ServerFacade } from '../../types';
 import { PLUGIN_ID } from '../../common/constants';
 import { oncePerServer } from './once_per_server';
 import { LevelLogger } from './level_logger';
@@ -26,7 +26,7 @@ function scan(pattern: string) {
 }
 
 const pattern = pathResolve(__dirname, '../../export_types/*/server/index.[jt]s');
-async function exportTypesRegistryFn(server: KbnServer) {
+async function exportTypesRegistryFn(server: ServerFacade) {
   const logger = LevelLogger.createForServer(server, [PLUGIN_ID, 'exportTypes']);
   const exportTypesRegistry = new ExportTypesRegistry();
   const files: string[] = (await scan(pattern)) as string[];
diff --git a/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts b/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts
index d4fa35908917d1..d73a5b73fecd0a 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/once_per_server.ts
@@ -5,10 +5,10 @@
  */
 
 import { memoize, MemoizedFunction } from 'lodash';
-import { KbnServer } from '../../types';
+import { ServerFacade } from '../../types';
 
-type ServerFn = (server: KbnServer) => any;
-type Memo = ((server: KbnServer) => any) & MemoizedFunction;
+type ServerFn = (server: ServerFacade) => any;
+type Memo = ((server: ServerFacade) => any) & MemoizedFunction;
 
 /**
  * allow this function to be called multiple times, but
@@ -22,7 +22,7 @@ type Memo = ((server: KbnServer) => any) & MemoizedFunction;
  * @return {any}
  */
 export function oncePerServer(fn: ServerFn) {
-  const memoized: Memo = memoize(function(server: KbnServer) {
+  const memoized: Memo = memoize(function(server: ServerFacade) {
     if (arguments.length !== 1) {
       throw new TypeError('This function expects to be called with a single argument');
     }
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
index f785fac58d4863..e0382c02053456 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/index.ts
@@ -4,18 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ConfigObject, KbnServer, Logger } from '../../../types';
+import { ServerFacade, Logger } from '../../../types';
 import { validateBrowser } from './validate_browser';
 import { validateConfig } from './validate_config';
 import { validateMaxContentLength } from './validate_max_content_length';
 
-export async function runValidations(
-  server: KbnServer,
-  config: ConfigObject,
-  logger: Logger,
-  browserFactory: any
-) {
+export async function runValidations(server: ServerFacade, logger: Logger, browserFactory: any) {
   try {
+    const config = server.config();
     await Promise.all([
       validateBrowser(server, browserFactory, logger),
       validateConfig(config, logger),
diff --git a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
index 7d011e6c0886ef..031709c85284cb 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Browser } from 'puppeteer';
-import { KbnServer, Logger } from '../../../types';
-import { CHROMIUM } from '../../browsers/browser_types';
+import { BROWSER_TYPE } from '../../../common/constants';
+import { ServerFacade, Logger } from '../../../types';
 import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_factory';
 
 /*
@@ -13,11 +13,11 @@ import { HeadlessChromiumDriverFactory } from '../../browsers/chromium/driver_fa
  * to the locally running Kibana instance.
  */
 export const validateBrowser = async (
-  server: KbnServer,
+  server: ServerFacade,
   browserFactory: HeadlessChromiumDriverFactory,
   logger: Logger
 ) => {
-  if (browserFactory.type === CHROMIUM) {
+  if (browserFactory.type === BROWSER_TYPE) {
     return browserFactory
       .test({ viewport: { width: 800, height: 600 } }, logger)
       .then((browser: Browser | null) => {
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
index 9dc1e9d12e308b..9c7e0a5f27786d 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_jobparams.ts
@@ -6,28 +6,33 @@
 
 import boom from 'boom';
 import Joi from 'joi';
-import { Request, ResponseToolkit } from 'hapi';
 import rison from 'rison-node';
 import { API_BASE_URL } from '../../common/constants';
-import { KbnServer } from '../../types';
-import { getRouteConfigFactoryReportingPre } from './lib/route_config_factories';
+import { ServerFacade, RequestFacade, ReportingResponseToolkit } from '../../types';
+import {
+  getRouteConfigFactoryReportingPre,
+  GetRouteConfigFactoryFn,
+  RouteConfigFactory,
+} from './lib/route_config_factories';
 import { HandlerErrorFunction, HandlerFunction } from './types';
 
 const BASE_GENERATE = `${API_BASE_URL}/generate`;
 
 export function registerGenerateFromJobParams(
-  server: KbnServer,
+  server: ServerFacade,
   handler: HandlerFunction,
   handleError: HandlerErrorFunction
 ) {
-  const getRouteConfig = getRouteConfigFactoryReportingPre(server);
+  const getRouteConfig = () => {
+    const getOriginalRouteConfig: GetRouteConfigFactoryFn = getRouteConfigFactoryReportingPre(
+      server
+    );
+    const routeConfigFactory: RouteConfigFactory = getOriginalRouteConfig(
+      ({ params: { exportType } }) => exportType
+    );
 
-  // generate report
-  server.route({
-    path: `${BASE_GENERATE}/{exportType}`,
-    method: 'POST',
-    config: {
-      ...getRouteConfig(request => request.params.exportType),
+    return {
+      ...routeConfigFactory,
       validate: {
         params: Joi.object({
           exportType: Joi.string().required(),
@@ -41,8 +46,15 @@ export function registerGenerateFromJobParams(
           jobParams: Joi.string().default(null),
         }).default(),
       },
-    },
-    handler: async (request: Request, h: ResponseToolkit) => {
+    };
+  };
+
+  // generate report
+  server.route({
+    path: `${BASE_GENERATE}/{exportType}`,
+    method: 'POST',
+    options: getRouteConfig(),
+    handler: async (request: RequestFacade, h: ReportingResponseToolkit) => {
       let jobParamsRison: string | null;
 
       if (request.payload) {
@@ -73,11 +85,10 @@ export function registerGenerateFromJobParams(
     },
   });
 
-  // show error about GET method to user
+  // Get route to generation endpoint: show error about GET method to user
   server.route({
     path: `${BASE_GENERATE}/{p*}`,
     method: 'GET',
-    config: getRouteConfig(),
     handler: () => {
       const err = boom.methodNotAllowed('GET is not allowed');
       err.output.headers.allow = 'POST';
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts
index baadbc99e82f77..ec0a56f8de442b 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject.ts
@@ -4,41 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request, ResponseToolkit } from 'hapi';
 import { get } from 'lodash';
-
 import { API_BASE_GENERATE_V1, CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../common/constants';
-import { KbnServer } from '../../types';
+import { ServerFacade, RequestFacade, ReportingResponseToolkit } from '../../types';
 import { HandlerErrorFunction, HandlerFunction, QueuedJobPayload } from './types';
-import { getRouteOptions } from './lib/route_config_factories';
+import { getRouteOptionsCsv } from './lib/route_config_factories';
 import { getJobParamsFromRequest } from '../../export_types/csv_from_savedobject/server/lib/get_job_params_from_request';
 
-/*
- * 1. Build `jobParams` object: job data that execution will need to reference in various parts of the lifecycle
- * 2. Pass the jobParams and other common params to `handleRoute`, a shared function to enqueue the job with the params
- * 3. Ensure that details for a queued job were returned
- */
-const getJobFromRouteHandler = async (
-  handleRoute: HandlerFunction,
-  handleRouteError: HandlerErrorFunction,
-  request: Request,
-  h: ResponseToolkit
-): Promise<QueuedJobPayload> => {
-  let result: QueuedJobPayload;
-  try {
-    const jobParams = getJobParamsFromRequest(request, { isImmediate: false });
-    result = await handleRoute(CSV_FROM_SAVEDOBJECT_JOB_TYPE, jobParams, request, h);
-  } catch (err) {
-    throw handleRouteError(CSV_FROM_SAVEDOBJECT_JOB_TYPE, err);
-  }
-
-  if (get(result, 'source.job') == null) {
-    throw new Error(`The Export handler is expected to return a result with job info! ${result}`);
-  }
-
-  return result;
-};
-
 /*
  * This function registers API Endpoints for queuing Reporting jobs. The API inputs are:
  * - saved object type and ID
@@ -49,18 +21,38 @@ const getJobFromRouteHandler = async (
  *     - local (transient) changes the user made to the saved object
  */
 export function registerGenerateCsvFromSavedObject(
-  server: KbnServer,
+  server: ServerFacade,
   handleRoute: HandlerFunction,
   handleRouteError: HandlerErrorFunction
 ) {
-  const routeOptions = getRouteOptions(server);
+  const routeOptions = getRouteOptionsCsv(server);
 
   server.route({
     path: `${API_BASE_GENERATE_V1}/csv/saved-object/{savedObjectType}:{savedObjectId}`,
     method: 'POST',
     options: routeOptions,
-    handler: async (request: Request, h: ResponseToolkit) => {
-      return getJobFromRouteHandler(handleRoute, handleRouteError, request, h);
+    handler: async (request: RequestFacade, h: ReportingResponseToolkit) => {
+      /*
+       * 1. Build `jobParams` object: job data that execution will need to reference in various parts of the lifecycle
+       * 2. Pass the jobParams and other common params to `handleRoute`, a shared function to enqueue the job with the params
+       * 3. Ensure that details for a queued job were returned
+       */
+
+      let result: QueuedJobPayload;
+      try {
+        const jobParams = getJobParamsFromRequest(request, { isImmediate: false });
+        result = await handleRoute(CSV_FROM_SAVEDOBJECT_JOB_TYPE, jobParams, request, h);
+      } catch (err) {
+        throw handleRouteError(CSV_FROM_SAVEDOBJECT_JOB_TYPE, err);
+      }
+
+      if (get(result, 'source.job') == null) {
+        throw new Error(
+          `The Export handler is expected to return a result with job info! ${result}`
+        );
+      }
+
+      return result;
     },
   });
 }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
index 8321cf16820c03..557f7c37020386 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generate_from_savedobject_immediate.ts
@@ -4,24 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request, ResponseObject, ResponseToolkit } from 'hapi';
-
 import { API_BASE_GENERATE_V1 } from '../../common/constants';
 import { createJobFactory, executeJobFactory } from '../../export_types/csv_from_savedobject';
 import {
-  KbnServer,
+  ServerFacade,
+  RequestFacade,
+  ResponseFacade,
+  ReportingResponseToolkit,
   Logger,
   JobDocPayload,
   JobIDForImmediate,
   JobDocOutputExecuted,
 } from '../../types';
-import { getRouteOptions } from './lib/route_config_factories';
+import { getRouteOptionsCsv } from './lib/route_config_factories';
 import { getJobParamsFromRequest } from '../../export_types/csv_from_savedobject/server/lib/get_job_params_from_request';
 
-interface KibanaResponse extends ResponseObject {
-  isBoom: boolean;
-}
-
 /*
  * This function registers API Endpoints for immediate Reporting jobs. The API inputs are:
  * - saved object type and ID
@@ -32,10 +29,10 @@ interface KibanaResponse extends ResponseObject {
  *     - local (transient) changes the user made to the saved object
  */
 export function registerGenerateCsvFromSavedObjectImmediate(
-  server: KbnServer,
+  server: ServerFacade,
   parentLogger: Logger
 ) {
-  const routeOptions = getRouteOptions(server);
+  const routeOptions = getRouteOptionsCsv(server);
 
   /*
    * CSV export with the `immediate` option does not queue a job with Reporting's ESQueue to run the job async. Instead, this does:
@@ -46,7 +43,7 @@ export function registerGenerateCsvFromSavedObjectImmediate(
     path: `${API_BASE_GENERATE_V1}/immediate/csv/saved-object/{savedObjectType}:{savedObjectId}`,
     method: 'POST',
     options: routeOptions,
-    handler: async (request: Request, h: ResponseToolkit) => {
+    handler: async (request: RequestFacade, h: ReportingResponseToolkit) => {
       const logger = parentLogger.clone(['savedobject-csv']);
       const jobParams = getJobParamsFromRequest(request, { isImmediate: true });
       const createJobFn = createJobFactory(server);
@@ -78,7 +75,7 @@ export function registerGenerateCsvFromSavedObjectImmediate(
         .type(jobOutputContentType);
 
       // Set header for buffer download, not streaming
-      const { isBoom } = response as KibanaResponse;
+      const { isBoom } = response as ResponseFacade;
       if (isBoom == null) {
         response.header('accept-ranges', 'none');
       }
diff --git a/x-pack/legacy/plugins/reporting/server/routes/index.ts b/x-pack/legacy/plugins/reporting/server/routes/index.ts
index cbfd096e7100bb..118d6b3d43c17a 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/index.ts
@@ -5,9 +5,8 @@
  */
 
 import boom from 'boom';
-import { Request, ResponseToolkit } from 'hapi';
 import { API_BASE_URL } from '../../common/constants';
-import { KbnServer, Logger } from '../../types';
+import { ServerFacade, RequestFacade, ReportingResponseToolkit, Logger } from '../../types';
 import { enqueueJobFactory } from '../lib/enqueue_job';
 import { registerGenerateFromJobParams } from './generate_from_jobparams';
 import { registerGenerateCsvFromSavedObject } from './generate_from_savedobject';
@@ -15,9 +14,10 @@ import { registerGenerateCsvFromSavedObjectImmediate } from './generate_from_sav
 import { registerJobs } from './jobs';
 import { registerLegacy } from './legacy';
 
-export function registerRoutes(server: KbnServer, logger: Logger) {
+export function registerRoutes(server: ServerFacade, logger: Logger) {
   const config = server.config();
   const DOWNLOAD_BASE_URL = config.get('server.basePath') + `${API_BASE_URL}/jobs/download`;
+  // @ts-ignore
   const { errors: esErrors } = server.plugins.elasticsearch.getCluster('admin');
   const enqueueJob = enqueueJobFactory(server);
 
@@ -27,8 +27,8 @@ export function registerRoutes(server: KbnServer, logger: Logger) {
   async function handler(
     exportTypeId: string,
     jobParams: any,
-    request: Request,
-    h: ResponseToolkit
+    request: RequestFacade,
+    h: ReportingResponseToolkit
   ) {
     // @ts-ignore
     const user = request.pre.user;
diff --git a/x-pack/legacy/plugins/reporting/server/routes/jobs.ts b/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
index 1acc40fd0a55b0..58a212aa0d7fbe 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/jobs.ts
@@ -5,10 +5,8 @@
  */
 
 import boom from 'boom';
-import { RequestQuery } from 'hapi';
-import { Request, ResponseToolkit } from 'hapi';
 import { API_BASE_URL } from '../../common/constants';
-import { JobDoc, KbnServer } from '../../types';
+import { JobDoc, ServerFacade, RequestFacade, ReportingResponseToolkit } from '../../types';
 // @ts-ignore
 import { jobsQueryFactory } from '../lib/jobs_query';
 // @ts-ignore
@@ -20,13 +18,7 @@ import {
 
 const MAIN_ENTRY = `${API_BASE_URL}/jobs`;
 
-type ListQuery = RequestQuery & {
-  page: string;
-  size: string;
-  ids?: string; // optional field forbids us from extending RequestQuery
-};
-
-export function registerJobs(server: KbnServer) {
+export function registerJobs(server: ServerFacade) {
   const jobsQuery = jobsQueryFactory(server);
   const getRouteConfig = getRouteConfigFactoryManagementPre(server);
   const getRouteConfigDownload = getRouteConfigFactoryDownloadPre(server);
@@ -35,9 +27,9 @@ export function registerJobs(server: KbnServer) {
   server.route({
     path: `${MAIN_ENTRY}/list`,
     method: 'GET',
-    config: getRouteConfig(),
-    handler: (request: Request) => {
-      const { page: queryPage, size: querySize, ids: queryIds } = request.query as ListQuery;
+    options: getRouteConfig(),
+    handler: (request: RequestFacade) => {
+      const { page: queryPage, size: querySize, ids: queryIds } = request.query;
       const page = parseInt(queryPage, 10) || 0;
       const size = Math.min(100, parseInt(querySize, 10) || 10);
       const jobIds = queryIds ? queryIds.split(',') : null;
@@ -57,8 +49,8 @@ export function registerJobs(server: KbnServer) {
   server.route({
     path: `${MAIN_ENTRY}/count`,
     method: 'GET',
-    config: getRouteConfig(),
-    handler: (request: Request) => {
+    options: getRouteConfig(),
+    handler: (request: RequestFacade) => {
       const results = jobsQuery.count(request.pre.management.jobTypes, request.pre.user);
       return results;
     },
@@ -68,8 +60,8 @@ export function registerJobs(server: KbnServer) {
   server.route({
     path: `${MAIN_ENTRY}/output/{docId}`,
     method: 'GET',
-    config: getRouteConfig(),
-    handler: (request: Request) => {
+    options: getRouteConfig(),
+    handler: (request: RequestFacade) => {
       const { docId } = request.params;
 
       return jobsQuery.get(request.pre.user, docId, { includeContent: true }).then(
@@ -94,8 +86,8 @@ export function registerJobs(server: KbnServer) {
   server.route({
     path: `${MAIN_ENTRY}/info/{docId}`,
     method: 'GET',
-    config: getRouteConfig(),
-    handler: (request: Request) => {
+    options: getRouteConfig(),
+    handler: (request: RequestFacade) => {
       const { docId } = request.params;
 
       return jobsQuery.get(request.pre.user, docId).then(
@@ -127,8 +119,8 @@ export function registerJobs(server: KbnServer) {
   server.route({
     path: `${MAIN_ENTRY}/download/{docId}`,
     method: 'GET',
-    config: getRouteConfigDownload(),
-    handler: async (request: Request, h: ResponseToolkit) => {
+    options: getRouteConfigDownload(),
+    handler: async (request: RequestFacade, h: ReportingResponseToolkit) => {
       const { docId } = request.params;
 
       let response = await jobResponseHandler(
diff --git a/x-pack/legacy/plugins/reporting/server/routes/legacy.ts b/x-pack/legacy/plugins/reporting/server/routes/legacy.ts
index 24caf8003b7d74..011ac4a02bbf9e 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/legacy.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/legacy.ts
@@ -4,31 +4,34 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request, ResponseToolkit } from 'hapi';
 import querystring from 'querystring';
 import { API_BASE_URL } from '../../common/constants';
-import { KbnServer } from '../../types';
-import { getRouteConfigFactoryReportingPre } from './lib/route_config_factories';
+import { ServerFacade, RequestFacade, ReportingResponseToolkit } from '../../types';
+import {
+  getRouteConfigFactoryReportingPre,
+  GetRouteConfigFactoryFn,
+} from './lib/route_config_factories';
 import { HandlerErrorFunction, HandlerFunction } from './types';
 
-const getStaticFeatureConfig = (getRouteConfig: any, featureId: any) =>
+const getStaticFeatureConfig = (getRouteConfig: GetRouteConfigFactoryFn, featureId: string) =>
   getRouteConfig(() => featureId);
+
 const BASE_GENERATE = `${API_BASE_URL}/generate`;
 
 export function registerLegacy(
-  server: KbnServer,
+  server: ServerFacade,
   handler: HandlerFunction,
   handleError: HandlerErrorFunction
 ) {
   const getRouteConfig = getRouteConfigFactoryReportingPre(server);
 
-  function createLegacyPdfRoute({ path, objectType }: { path: string; objectType: any }) {
+  function createLegacyPdfRoute({ path, objectType }: { path: string; objectType: string }) {
     const exportTypeId = 'printablePdf';
     server.route({
       path,
       method: 'POST',
-      config: getStaticFeatureConfig(getRouteConfig, exportTypeId),
-      handler: async (request: Request, h: ResponseToolkit) => {
+      options: getStaticFeatureConfig(getRouteConfig, exportTypeId),
+      handler: async (request: RequestFacade, h: ReportingResponseToolkit) => {
         const message = `The following URL is deprecated and will stop working in the next major version: ${request.url.path}`;
         server.log(['warning', 'reporting', 'deprecation'], message);
 
diff --git a/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts b/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts
index e09db6e536feec..29ded68d403c58 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/lib/route_config_factories.ts
@@ -4,18 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
 import Joi from 'joi';
-import { KbnServer } from '../../../types';
+import { CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common/constants';
+import { ServerFacade, RequestFacade } from '../../../types';
 // @ts-ignore
 import { authorizedUserPreRoutingFactory } from './authorized_user_pre_routing';
 // @ts-ignore
 import { reportingFeaturePreRoutingFactory } from './reporting_feature_pre_routing';
-import { CSV_FROM_SAVEDOBJECT_JOB_TYPE } from '../../../common/constants';
 
 const API_TAG = 'api';
 
-interface RouteConfigFactory {
+export interface RouteConfigFactory {
   tags?: string[];
   pre: any[];
   response?: {
@@ -23,10 +22,14 @@ interface RouteConfigFactory {
   };
 }
 
-type GetFeatureFunction = (request: Request) => any;
+type GetFeatureFunction = (request: RequestFacade) => any;
 type PreRoutingFunction = (getFeatureId?: GetFeatureFunction) => any;
 
-export function getRouteConfigFactoryReportingPre(server: KbnServer) {
+export type GetRouteConfigFactoryFn = (
+  getFeatureId?: GetFeatureFunction | undefined
+) => RouteConfigFactory;
+
+export function getRouteConfigFactoryReportingPre(server: ServerFacade): GetRouteConfigFactoryFn {
   const authorizedUserPreRouting: PreRoutingFunction = authorizedUserPreRoutingFactory(server);
   const reportingFeaturePreRouting: PreRoutingFunction = reportingFeaturePreRoutingFactory(server);
 
@@ -43,7 +46,7 @@ export function getRouteConfigFactoryReportingPre(server: KbnServer) {
   };
 }
 
-export function getRouteOptions(server: KbnServer) {
+export function getRouteOptionsCsv(server: ServerFacade) {
   const getRouteConfig = getRouteConfigFactoryReportingPre(server);
   return {
     ...getRouteConfig(() => CSV_FROM_SAVEDOBJECT_JOB_TYPE),
@@ -64,7 +67,7 @@ export function getRouteOptions(server: KbnServer) {
   };
 }
 
-export function getRouteConfigFactoryManagementPre(server: KbnServer) {
+export function getRouteConfigFactoryManagementPre(server: ServerFacade): GetRouteConfigFactoryFn {
   const authorizedUserPreRouting = authorizedUserPreRoutingFactory(server);
   const reportingFeaturePreRouting = reportingFeaturePreRoutingFactory(server);
   const managementPreRouting = reportingFeaturePreRouting(() => 'management');
@@ -84,7 +87,7 @@ export function getRouteConfigFactoryManagementPre(server: KbnServer) {
 // TOC at the end of the PDF, but it's sending multiple cookies and causing our auth to fail with a 401.
 // Additionally, the range-request doesn't alleviate any performance issues on the server as the entire
 // download is loaded into memory.
-export function getRouteConfigFactoryDownloadPre(server: KbnServer) {
+export function getRouteConfigFactoryDownloadPre(server: ServerFacade): GetRouteConfigFactoryFn {
   const getManagementRouteConfig = getRouteConfigFactoryManagementPre(server);
   return (): RouteConfigFactory => ({
     ...getManagementRouteConfig(),
diff --git a/x-pack/legacy/plugins/reporting/server/routes/types.d.ts b/x-pack/legacy/plugins/reporting/server/routes/types.d.ts
index 6004811d8a2b4b..0b6a9708c7d1ac 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/types.d.ts
@@ -4,14 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request, ResponseToolkit } from 'hapi';
-import { JobDocPayload } from '../../types';
+import { RequestFacade, ReportingResponseToolkit, JobDocPayload } from '../../types';
 
 export type HandlerFunction = (
   exportType: any,
   jobParams: any,
-  request: Request,
-  h: ResponseToolkit
+  request: RequestFacade,
+  h: ReportingResponseToolkit
 ) => any;
 
 export type HandlerErrorFunction = (exportType: any, err: Error) => any;
diff --git a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts
index 63614a18e829bb..226355f5edc615 100644
--- a/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts
+++ b/x-pack/legacy/plugins/reporting/test_helpers/create_mock_server.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { memoize } from 'lodash';
-import { KbnServer } from '../types';
+import { ServerFacade } from '../types';
 
-export const createMockServer = ({ settings = {} }: any): KbnServer => {
+export const createMockServer = ({ settings = {} }: any): ServerFacade => {
   const mockServer = {
     expose: () => {
       ' ';
@@ -41,5 +41,5 @@ export const createMockServer = ({ settings = {} }: any): KbnServer => {
     return key in settings ? settings[key] : defaultSettings[key];
   });
 
-  return (mockServer as unknown) as KbnServer;
+  return (mockServer as unknown) as ServerFacade;
 };
diff --git a/x-pack/legacy/plugins/reporting/types.d.ts b/x-pack/legacy/plugins/reporting/types.d.ts
index 19c08e59400af2..731d0f084a7185 100644
--- a/x-pack/legacy/plugins/reporting/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/types.d.ts
@@ -4,14 +4,26 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
+import { ResponseObject } from 'hapi';
+import { EventEmitter } from 'events';
+import { Legacy } from 'kibana';
+import { XPackMainPlugin } from '../xpack_main/xpack_main';
+import { ElasticsearchPlugin } from '../../../../src/legacy/core_plugins/elasticsearch';
+import { HeadlessChromiumDriverFactory } from './server/browsers/chromium/driver_factory';
+import { BrowserType } from './server/browsers/types';
 
-interface UiSettings {
-  get: (value: string) => string;
-}
-
-type SavedObjectClient = any;
+type Job = EventEmitter & { id: string };
 
+export interface ReportingPlugin {
+  queue: {
+    addJob: (type: string, payload: object, options: object) => Job;
+  };
+  exportTypesRegistry: {
+    getById: (id: string) => ExportTypeDefinition;
+    getAll: () => ExportTypeDefinition[];
+  };
+  browserDriverFactory: HeadlessChromiumDriverFactory;
+}
 export interface NetworkPolicyRule {
   allow: boolean;
   protocol: string;
@@ -23,30 +35,61 @@ export interface NetworkPolicy {
   rules: NetworkPolicyRule[];
 }
 
-// these types shoud be in core kibana and are only here temporarily
-export interface KbnServer {
-  info: { protocol: string };
-  config: () => ConfigObject;
-  expose: () => void;
-  plugins: Record<string, any>;
-  route: any;
-  log: any;
-  fieldFormatServiceFactory: (uiConfig: any) => any;
-  savedObjects: {
-    getScopedSavedObjectsClient: (fakeRequest: {
-      headers: object;
-      getBasePath: () => string;
-    }) => SavedObjectClient;
+// Tracks which parts of the legacy plugin system are being used
+export type ServerFacade = Legacy.Server & {
+  plugins: {
+    reporting?: ReportingPlugin;
+    xpack_main?: XPackMainPlugin & {
+      status?: any;
+    };
   };
-  uiSettingsServiceFactory: ({
-    savedObjectsClient,
-  }: {
-    savedObjectsClient: SavedObjectClient;
-  }) => UiSettings;
+};
+
+interface ListQuery {
+  page: string;
+  size: string;
+  ids?: string; // optional field forbids us from extending RequestQuery
+}
+interface GenerateQuery {
+  jobParams: string;
+}
+interface GenerateExportTypePayload {
+  jobParams: string;
+}
+interface DownloadParams {
+  docId: string;
 }
 
-export interface ConfigObject {
-  get: (path?: string) => any;
+// Tracks which parts of the legacy plugin system are being used
+interface ReportingRequest {
+  query: ListQuery & GenerateQuery;
+  params: DownloadParams;
+  payload: GenerateExportTypePayload;
+  pre: {
+    management: {
+      jobTypes: any;
+    };
+    user: any;
+  };
+}
+
+export type RequestFacade = ReportingRequest & Legacy.Request;
+
+export type ResponseFacade = ResponseObject & {
+  isBoom: boolean;
+};
+
+export type ReportingResponseToolkit = Legacy.ResponseToolkit;
+
+export interface CaptureConfig {
+  browser: {
+    type: BrowserType;
+    autoDownload: boolean;
+    chromium: BrowserConfig;
+  };
+  maxAttempts: number;
+  networkPolicy: NetworkPolicy;
+  loadDelay: number;
 }
 
 export interface BrowserConfig {
@@ -61,6 +104,19 @@ export interface BrowserConfig {
   };
 }
 
+export interface QueueConfig {
+  indexInterval: string;
+  pollEnabled: boolean;
+  pollInterval: number;
+  pollIntervalErrorMultiplier: number;
+  timeout: number;
+}
+
+export interface ScrollConfig {
+  duration: string;
+  size: number;
+}
+
 export interface ElementPosition {
   boundingClientRect: {
     // modern browsers support x/y, but older ones don't
@@ -152,7 +208,7 @@ export interface ESQueueWorker {
 export type ESQueueCreateJobFn = (
   jobParams: object,
   headers: ConditionalHeaders,
-  request: Request
+  request: RequestFacade
 ) => Promise<object>;
 
 export type ESQueueWorkerExecuteFn = (jobId: string, job: JobDoc, cancellationToken: any) => void;
@@ -161,7 +217,7 @@ export type JobIDForImmediate = null;
 export type ImmediateExecuteFn = (
   jobId: JobIDForImmediate,
   jobDocPayload: JobDocPayload,
-  request: Request
+  request: RequestFacade
 ) => Promise<JobDocOutputExecuted>;
 
 export interface ESQueueWorkerOptions {
@@ -179,9 +235,9 @@ export interface ESQueueInstance {
   ) => ESQueueWorker;
 }
 
-export type CreateJobFactory = (server: KbnServer) => ESQueueCreateJobFn;
-export type ExecuteJobFactory = (server: KbnServer) => ESQueueWorkerExecuteFn;
-export type ExecuteImmediateJobFactory = (server: KbnServer) => ImmediateExecuteFn;
+export type CreateJobFactory = (server: ServerFacade) => ESQueueCreateJobFn;
+export type ExecuteJobFactory = (server: ServerFacade) => ESQueueWorkerExecuteFn;
+export type ExecuteImmediateJobFactory = (server: ServerFacade) => ImmediateExecuteFn;
 
 export interface ExportTypeDefinition {
   id: string;
@@ -193,16 +249,11 @@ export interface ExportTypeDefinition {
   validLicenses: string[];
 }
 
-// Note: this seems to be nearly a duplicate of ExportTypeDefinition
-export interface ExportType {
-  jobType: string;
-  createJobFactory: any;
-  executeJobFactory: (server: KbnServer) => ESQueueWorkerExecuteFn;
-}
-
 export interface ExportTypesRegistry {
   register: (exportTypeDefinition: ExportTypeDefinition) => void;
 }
 
+export { CancellationToken } from './common/cancellation_token';
+
 // Prefer to import this type using: `import { LevelLogger } from 'relative/path/server/lib';`
 export { LevelLogger as Logger } from './server/lib/level_logger';
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/job_create.js b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/job_create.js
index 3e7d5603ca95b4..1d7d0c1dd8deaf 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/job_create.js
+++ b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/job_create.js
@@ -549,7 +549,7 @@ export class JobCreateUi extends Component {
       <Fragment>
         <EuiPageContent>
           <EuiPageContentHeader>
-            <EuiTitle size="m">
+            <EuiTitle size="l">
               <h1>
                 <FormattedMessage
                   id="xpack.rollupJobs.createTitle"
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js
index c9959b5f643192..b3b52bbaf77e0e 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js
+++ b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_date_histogram.js
@@ -195,12 +195,12 @@ export class StepDateHistogramUi extends Component {
         <EuiFlexGroup justifyContent="spaceBetween">
           <EuiFlexItem grow={false}>
             <EuiTitle data-test-subj="rollupJobCreateDateHistogramTitle">
-              <h3>
+              <h2>
                 <FormattedMessage
                   id="xpack.rollupJobs.create.stepDateHistogramTitle"
                   defaultMessage="Date histogram"
                 />
-              </h3>
+              </h2>
             </EuiTitle>
           </EuiFlexItem>
 
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_histogram.js b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_histogram.js
index 991280b4e10de3..38aac71c86a233 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_histogram.js
+++ b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_histogram.js
@@ -82,12 +82,12 @@ export class StepHistogramUi extends Component {
         <EuiFlexGroup justifyContent="spaceBetween">
           <EuiFlexItem grow={false}>
             <EuiTitle data-test-subj="rollupJobCreateHistogramTitle">
-              <h3>
+              <h2>
                 <FormattedMessage
                   id="xpack.rollupJobs.create.stepHistogramTitle"
                   defaultMessage="Histogram (optional)"
                 />
-              </h3>
+              </h2>
             </EuiTitle>
 
             <EuiSpacer size="s" />
@@ -179,12 +179,12 @@ export class StepHistogramUi extends Component {
         <EuiDescribedFormGroup
           title={(
             <EuiTitle size="s">
-              <h4>
+              <h3>
                 <FormattedMessage
                   id="xpack.rollupJobs.create.stepHistogram.sectionHistogramIntervalTitle"
                   defaultMessage="Histogram interval"
                 />
-              </h4>
+              </h3>
             </EuiTitle>
           )}
           description={(
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js
index c3cf39bec5fadc..75c70ab6ce20ab 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js
+++ b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_logistics.js
@@ -233,12 +233,12 @@ export class StepLogisticsUi extends Component {
         <EuiFlexGroup justifyContent="spaceBetween">
           <EuiFlexItem grow={false}>
             <EuiTitle data-test-subj="rollupJobCreateLogisticsTitle">
-              <h3>
+              <h2>
                 <FormattedMessage
                   id="xpack.rollupJobs.create.stepLogisticsTitle"
                   defaultMessage="Logistics"
                 />
-              </h3>
+              </h2>
             </EuiTitle>
 
             <EuiSpacer size="s" />
@@ -276,12 +276,12 @@ export class StepLogisticsUi extends Component {
           <EuiDescribedFormGroup
             title={
               <EuiTitle size="s">
-                <h4>
+                <h3>
                   <FormattedMessage
                     id="xpack.rollupJobs.create.stepLogistics.sectionIdTitle"
                     defaultMessage="Name"
                   />
-                </h4>
+                </h3>
               </EuiTitle>
             }
             description={
@@ -316,12 +316,12 @@ export class StepLogisticsUi extends Component {
           <EuiDescribedFormGroup
             title={
               <EuiTitle size="s">
-                <h4>
+                <h3>
                   <FormattedMessage
                     id="xpack.rollupJobs.create.stepLogistics.sectionDataFlowTitle"
                     defaultMessage="Data flow"
                   />
-                </h4>
+                </h3>
               </EuiTitle>
             }
             description={
@@ -393,12 +393,12 @@ export class StepLogisticsUi extends Component {
           <EuiDescribedFormGroup
             title={
               <EuiTitle size="s">
-                <h4>
+                <h3>
                   <FormattedMessage
                     id="xpack.rollupJobs.create.stepLogistics.sectionScheduleTitle"
                     defaultMessage="Schedule"
                   />
-                </h4>
+                </h3>
               </EuiTitle>
             }
             description={
@@ -415,12 +415,12 @@ export class StepLogisticsUi extends Component {
           <EuiDescribedFormGroup
             title={
               <EuiTitle size="xs">
-                <h5>
+                <h4>
                   <FormattedMessage
                     id="xpack.rollupJobs.create.stepLogistics.sectionPageSizeTitle"
                     defaultMessage="How many documents do you want to roll up at a time?"
                   />
-                </h5>
+                </h4>
               </EuiTitle>
             }
             description={
@@ -456,12 +456,12 @@ export class StepLogisticsUi extends Component {
           <EuiDescribedFormGroup
             title={
               <EuiTitle size="xs">
-                <h5>
+                <h4>
                   <FormattedMessage
                     id="xpack.rollupJobs.create.stepLogistics.sectionDelayTitle"
                     defaultMessage="How long should the rollup job wait before rolling up new data?"
                   />
-                </h5>
+                </h4>
               </EuiTitle>
             }
             description={
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_metrics.js b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_metrics.js
index 7fd4052bd45f1a..1ccdcceabe47a3 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_metrics.js
+++ b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_metrics.js
@@ -358,12 +358,12 @@ export class StepMetricsUi extends Component {
         <EuiFlexGroup justifyContent="spaceBetween">
           <EuiFlexItem grow={false}>
             <EuiTitle data-test-subj="rollupJobCreateMetricsTitle">
-              <h3>
+              <h2>
                 <FormattedMessage
                   id="xpack.rollupJobs.create.stepMetricsTitle"
                   defaultMessage="Metrics (optional)"
                 />
-              </h3>
+              </h2>
             </EuiTitle>
 
             <EuiSpacer size="s"/>
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_review.js b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_review.js
index 213a1938432fc0..1f3172d8ee8489 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_review.js
+++ b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_review.js
@@ -104,13 +104,13 @@ export class StepReviewUi extends Component {
     return (
       <Fragment>
         <EuiTitle data-test-subj="rollupJobCreateReviewTitle">
-          <h3>
+          <h2>
             <FormattedMessage
               id="xpack.rollupJobs.create.stepReviewTitle"
               defaultMessage="Review details for '{jobId}'"
               values={{ jobId: job.id }}
             />
-          </h3>
+          </h2>
         </EuiTitle>
 
         {this.renderTabs()}
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_terms.js b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_terms.js
index d4a07dd3124834..6ea8607aa9632d 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_terms.js
+++ b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/step_terms.js
@@ -81,12 +81,12 @@ export class StepTermsUi extends Component {
         <EuiFlexGroup justifyContent="spaceBetween">
           <EuiFlexItem grow={false}>
             <EuiTitle data-test-subj="rollupJobCreateTermsTitle">
-              <h3>
+              <h2>
                 <FormattedMessage
                   id="xpack.rollupJobs.create.stepTermsTitle"
                   defaultMessage="Terms (optional)"
                 />
-              </h3>
+              </h2>
             </EuiTitle>
 
             <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/searchprofiler/index.js b/x-pack/legacy/plugins/searchprofiler/index.js
deleted file mode 100644
index 107edeb1f408df..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { resolve } from 'path';
-import { profileRoute } from './server/routes/profile';
-
-// License
-import Boom from 'boom';
-import { checkLicense } from './server/lib/check_license';
-import { mirrorPluginStatus } from '../../server/lib/mirror_plugin_status';
-
-
-export const searchprofiler = (kibana) => {
-  return new kibana.Plugin({
-    require: ['elasticsearch', 'xpack_main'],
-    id: 'searchprofiler',
-    configPrefix: 'xpack.searchprofiler',
-    publicDir: resolve(__dirname, 'public'),
-
-    uiExports: {
-      devTools: ['plugins/searchprofiler/app'],
-      hacks: ['plugins/searchprofiler/register'],
-      home: ['plugins/searchprofiler/register_feature'],
-      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-    },
-    init: function (server) {
-      const thisPlugin = this;
-      const xpackMainPlugin = server.plugins.xpack_main;
-      mirrorPluginStatus(xpackMainPlugin, thisPlugin);
-      xpackMainPlugin.status.once('green', () => {
-        // Register a function that is called whenever the xpack info changes,
-        // to re-compute the license check results for this plugin
-        xpackMainPlugin.info.feature(thisPlugin.id).registerLicenseCheckResultsGenerator(checkLicense);
-      });
-
-      // Add server routes and initialize the plugin here
-      const commonRouteConfig = {
-        pre: [
-          function forbidApiAccess() {
-            const licenseCheckResults = xpackMainPlugin.info.feature(thisPlugin.id).getLicenseCheckResults();
-            if (licenseCheckResults.showAppLink && licenseCheckResults.enableAppLink) {
-              return null;
-            } else {
-              throw Boom.forbidden(licenseCheckResults.message);
-            }
-          }
-        ]
-      };
-      profileRoute(server, commonRouteConfig);
-    }
-
-  });
-};
diff --git a/x-pack/legacy/plugins/searchprofiler/index.ts b/x-pack/legacy/plugins/searchprofiler/index.ts
new file mode 100644
index 00000000000000..5de6ba710235bc
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/index.ts
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { resolve } from 'path';
+import Boom from 'boom';
+
+import { CoreSetup } from 'src/core/server';
+import { Server } from 'src/legacy/server/kbn_server';
+import { LegacySetup } from './server/np_ready/types';
+import { plugin } from './server/np_ready';
+
+export const searchprofiler = (kibana: any) => {
+  const publicSrc = resolve(__dirname, 'public');
+
+  return new kibana.Plugin({
+    require: ['elasticsearch', 'xpack_main'],
+    id: 'searchprofiler',
+    configPrefix: 'xpack.searchprofiler',
+    publicDir: publicSrc,
+
+    uiExports: {
+      // NP Ready
+      devTools: [`${publicSrc}/legacy`],
+      styleSheetPaths: `${publicSrc}/np_ready/application/index.scss`,
+      // Legacy
+      hacks: ['plugins/searchprofiler/register'],
+      home: ['plugins/searchprofiler/register_feature'],
+    },
+    init(server: Server) {
+      const serverPlugin = plugin();
+      const thisPlugin = this;
+
+      const commonRouteConfig = {
+        pre: [
+          function forbidApiAccess() {
+            const licenseCheckResults = server.plugins.xpack_main.info
+              .feature(thisPlugin.id)
+              .getLicenseCheckResults();
+            if (licenseCheckResults.showAppLink && licenseCheckResults.enableAppLink) {
+              return null;
+            } else {
+              throw Boom.forbidden(licenseCheckResults.message);
+            }
+          },
+        ],
+      };
+
+      const legacySetup: LegacySetup = {
+        route: (args: Parameters<typeof server.route>[0]) => server.route(args),
+        plugins: {
+          __LEGACY: {
+            thisPlugin,
+            xpackMain: server.plugins.xpack_main,
+            elasticsearch: server.plugins.elasticsearch,
+            commonRouteConfig,
+          },
+        },
+      };
+      serverPlugin.setup({} as CoreSetup, legacySetup);
+    },
+  });
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/__tests__/app_util.js b/x-pack/legacy/plugins/searchprofiler/public/__tests__/app_util.js
deleted file mode 100644
index 164e7394dead71..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/__tests__/app_util.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { checkForParseErrors } from '../app_util.js';
-
-describe('checkForParseErrors', function () {
-  it('returns false from bad JSON', function () {
-    const json = '{"foo": {"bar": {"baz": "buzz}}}';
-    const result = checkForParseErrors(json);
-    expect(result.status).to.be(false);
-  });
-
-  it('returns true from good JSON', function () {
-    const json = '{"foo": {"bar": {"baz": "buzz"}}}';
-    const result = checkForParseErrors(json);
-    expect(result.status).to.be(true);
-  });
-});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/app.js b/x-pack/legacy/plugins/searchprofiler/public/app.js
deleted file mode 100644
index 1c7598ab982bcb..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/app.js
+++ /dev/null
@@ -1,193 +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.
- */
-
-
-// K5 imports
-import { uiModules } from 'ui/modules';
-import { i18n } from '@kbn/i18n';
-import uiRoutes from 'ui/routes';
-import 'ui/capabilities/route_setup';
-import { toastNotifications } from 'ui/notify';
-import { formatAngularHttpError } from 'ui/notify/lib';
-
-// License
-import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
-
-// Our imports
-import $ from 'jquery';
-import _ from 'lodash';
-import 'ace';
-import 'angular-ui-ace';
-import 'plugins/searchprofiler/directives';
-import './components/searchprofiler_tabs_directive';
-import { Range } from './range';
-import { nsToPretty } from 'plugins/searchprofiler/filters/ns_to_pretty';
-import { msToPretty } from 'plugins/searchprofiler/filters/ms_to_pretty';
-import { checkForParseErrors } from 'plugins/searchprofiler/app_util.js';
-import { initializeEditor } from 'plugins/searchprofiler/editor';
-
-// Styles and templates
-import 'ui/autoload/all';
-import template from './templates/index.html';
-import { defaultQuery } from './templates/default_query';
-
-uiRoutes.when('/dev_tools/searchprofiler', {
-  template: template,
-  requireUICapability: 'dev_tools.show',
-  controller: $scope => {
-    $scope.registerLicenseLinkLabel = i18n.translate('xpack.searchProfiler.registerLicenseLinkLabel',
-      { defaultMessage: 'register a license' });
-    $scope.trialLicense = i18n.translate('xpack.searchProfiler.trialLicenseTitle',
-      { defaultMessage: 'Trial' });
-    $scope.basicLicense = i18n.translate('xpack.searchProfiler.basicLicenseTitle',
-      { defaultMessage: 'Basic' });
-    $scope.goldLicense = i18n.translate('xpack.searchProfiler.goldLicenseTitle',
-      { defaultMessage: 'Gold' });
-    $scope.platinumLicense = i18n.translate('xpack.searchProfiler.platinumLicenseTitle',
-      { defaultMessage: 'Platinum' });
-  },
-});
-
-uiModules
-  .get('app/searchprofiler', ['ui.ace'])
-  .controller('profileViz', profileVizController)
-  .filter('nsToPretty', () => nsToPretty)
-  .filter('msToPretty', () => msToPretty)
-  .factory('HighlightService', () => {
-    const service = {
-      details: null
-    };
-    return service;
-  });
-
-function profileVizController($scope, $timeout, $http, HighlightService) {
-  $scope.title = 'Search Profile';
-  $scope.description = 'Search profiling and visualization';
-  $scope.profileResponse = [];
-  $scope.highlight = HighlightService;
-  $scope.index = '_all';
-  $scope.query = '';
-
-  // TODO this map controls which tab is active, but due to how
-  // the tab directive works, we cannot use a single variable to hold the state.
-  // Instead we have to map the tab name to true/false, and make sure only one
-  // state is active.  This should be refactored if possible, as it could be trappy!
-  $scope.activeTab = {
-    search: true
-  };
-  $scope.markers = [];
-  $scope.licenseEnabled = xpackInfo.get('features.searchprofiler.enableAppLink');
-
-
-  const editor = initializeEditor({
-    el: $('#SearchProfilerInput')[0],
-    licenseEnabled: $scope.licenseEnabled,
-  });
-
-  editor.on('change', () => {
-    // Do a safe apply/trigger digest
-    $timeout(() => {
-      $scope.query = editor.getValue();
-    });
-  });
-
-  editor.setValue(defaultQuery, 1);
-
-  $scope.hasQuery = () => Boolean($scope.query);
-
-  $scope.profile = () => {
-    const  { query } = $scope;
-    if (!$scope.licenseEnabled) {
-      return;
-    }
-    // Reset right detail panel
-    $scope.resetHighlightPanel();
-    let json = checkForParseErrors(query);
-    if (json.status === false) {
-      toastNotifications.addError(json.error, {
-        title: i18n.translate('xpack.searchProfiler.errorToastTitle', {
-          defaultMessage: 'JSON parse error',
-        }),
-      });
-      return;
-    }
-    json = json.parsed;
-
-    // If we can find the start of a profile JSON output, just try to render it
-    // without executing
-    if (json.profile && json.profile.shards) {
-      $scope.renderProfile(json.profile.shards);
-    } else {
-      // Otherwise it's (probably) a regular search, execute remotely
-      const requestBody = { query };
-      if ($scope.index == null || $scope.index === '') {
-        requestBody.index = '_all';
-      } else {
-        requestBody.index = $scope.index;
-      }
-      if (!$scope.type === '') {
-        requestBody.type = $scope.type;
-      }
-      $scope.executeRemoteQuery(requestBody);
-    }
-  };
-
-  $scope.executeRemoteQuery = requestBody => {
-    $http.post('../api/searchprofiler/profile', requestBody).then(resp => {
-      if (!resp.data.ok) {
-        toastNotifications.addDanger(resp.data.err.msg);
-
-        try {
-          const regex = /line=([0-9]+) col=([0-9]+)/g;
-          const [ , row, column ] = regex.exec(resp.data.err.msg);
-
-          $scope.markers.push($scope.ace.session.addMarker(
-            new Range(row - 1, 0, row - 1, column), 'errorMarker', 'fullLine'));
-        } catch (e) {
-          // Best attempt, not a big deal if we can't highlight the line
-        }
-
-        return;
-      }
-
-      $scope.renderProfile(resp.data.resp.profile.shards);
-    }).catch(reason => toastNotifications.addDanger(formatAngularHttpError(reason)));
-  };
-
-  $scope.renderProfile = data => {
-    for (const shard of data) {
-      shard.id = shard.id.match(/\[([^\]\[]*?)\]/g);
-      shard.id = _.map(shard.id, id => {
-        return id.replace('[', '').replace(']', '');
-      });
-    }
-    $scope.profileResponse = data;
-
-    const hasAggregations = data[0].aggregations != null && data[0].aggregations.length > 0;
-    if (!hasAggregations) {
-      // No aggs, reset back to search panel
-      $scope.activateTab('search');
-    }
-  };
-
-  $scope.activateTab = tab => {
-    // Reset right detail panel
-    $scope.resetHighlightPanel();
-    // Reset active tab map
-    $scope.activeTab = {};
-    if (tab === 'aggregations') {
-      $scope.activeTab.aggregations = true;
-    } else {
-      // Everything has a search, so default to this
-      $scope.activeTab.search = true;
-    }
-  };
-
-  $scope.resetHighlightPanel = () => {
-    $scope.highlight.details = null;
-  };
-
-}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/app_util.js b/x-pack/legacy/plugins/searchprofiler/public/app_util.js
deleted file mode 100644
index 18eef2259bd6ac..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/app_util.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-// Convert triple quotes into regular quotes and escape internal quotes.
-function collapseLiteralStrings(data) {
-  return data.replace(/"""(?:\s*\r?\n)?((?:.|\r?\n)*?)(?:\r?\n\s*)?"""/g, function (match, literal) {
-    return JSON.stringify(literal);
-  });
-}
-
-export function checkForParseErrors(json) {
-  const sanitizedJson = collapseLiteralStrings(json);
-  try {
-    const parsedJson = JSON.parse(sanitizedJson);
-    return { status: true, parsed: parsedJson };
-  } catch (error) {
-    return { status: false, error };
-  }
-}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/components/searchprofiler_tabs.js b/x-pack/legacy/plugins/searchprofiler/public/components/searchprofiler_tabs.js
deleted file mode 100644
index 5394e56cef70ad..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/components/searchprofiler_tabs.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-
-import _ from 'lodash';
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import {
-  EuiTabs,
-  EuiTab
-} from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-
-function hasSearch(profileResponse) {
-  const aggs = _.get(profileResponse, '[0].searches', []);
-  return aggs.length > 0;
-}
-
-function hasAggregations(profileResponse) {
-  const aggs = _.get(profileResponse, '[0].aggregations', []);
-  return aggs.length > 0;
-}
-
-
-function handleClick(activateTab, tabName) {
-  activateTab(tabName);
-}
-
-export function SearchProfilerTabs(props) {
-  return (
-    <EuiTabs>
-      <EuiTab
-        isSelected={props.activeTab.search}
-        disabled={!hasSearch(props.profileResponse)}
-        onClick={() => handleClick(props.activateTab, 'search')}
-      >
-        <FormattedMessage
-          id="xpack.searchProfiler.queryProfileTabTitle"
-          defaultMessage="Query Profile"
-        />
-      </EuiTab>
-      <EuiTab
-        isSelected={props.activeTab.aggregations}
-        disabled={!hasAggregations(props.profileResponse)}
-        onClick={() => handleClick(props.activateTab, 'aggregations')}
-      >
-        <FormattedMessage
-          id="xpack.searchProfiler.aggregationProfileTabTitle"
-          defaultMessage="Aggregation Profile"
-        />
-      </EuiTab>
-    </EuiTabs>
-  );
-}
-
-SearchProfilerTabs.propTypes = {
-  activeTab: PropTypes.any.isRequired,
-  activateTab: PropTypes.func.isRequired,
-  profileResponse: PropTypes.array.isRequired,
-};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/components/searchprofiler_tabs_directive.js b/x-pack/legacy/plugins/searchprofiler/public/components/searchprofiler_tabs_directive.js
deleted file mode 100644
index 6cfeb97f05ebd4..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/components/searchprofiler_tabs_directive.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import 'ngreact';
-
-import { wrapInI18nContext } from 'ui/i18n';
-import { uiModules } from 'ui/modules';
-const module = uiModules.get('apps/searchprofiler', ['react']);
-
-import { SearchProfilerTabs } from './searchprofiler_tabs';
-
-module.directive('searchProfilerTabs', function (reactDirective) {
-  return reactDirective(
-    wrapInI18nContext(SearchProfilerTabs),
-    undefined,
-    { restrict: 'E' }
-  );
-});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/_directives.scss b/x-pack/legacy/plugins/searchprofiler/public/directives/_directives.scss
deleted file mode 100644
index 7f4f44748aa937..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/_directives.scss
+++ /dev/null
@@ -1,135 +0,0 @@
-.prfDevTool__panel {
-  border-bottom: $euiBorderThin;
-}
-
-.prfDevTool__panelBody {
-  margin-top: $euiSizeS;
-  margin-left: $euiSizeL;
-}
-
-// Profile details treeview
-.prfDevTool__shardDetailsWrapper {
-  display: flex;
-  flex-direction: row-reverse;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.prfDevTool__shardDetails--dim small {
-  color: $euiColorDarkShade;
-}
-
-.prfDevTool__shardBody {
-  margin-top: $euiSize;
-}
-
-.prfDevTool__shardDetails {
-  line-height: 1;
-  overflow-wrap: break-word;
-
-  &:disabled {
-    text-decoration: none !important;
-    cursor: default;
-  }
-}
-
-.prfDevTool__shard {
-  border: none;
-}
-
-.prfDevTool__index {
-  width: 100%;
-  padding: $euiSize $euiSizeS;
-}
-
-.prfDevTool__tvRow--last {
-  cursor: pointer;
-}
-
-.prfDevTool__tvRow,
-.prfDevTool__tvHeader {
-  display: table;
-  width: 100%;
-  table-layout: fixed;
-}
-
-.prfDevTool__tvHeader {
-  @include euiFontSizeXS;
-  color: $euiColorDarkShade;
-}
-
-.prfDevTool__cell {
-  display: table-cell;
-  vertical-align: middle;
-  text-align: center;
-  padding: $euiSizeXS;
-
-  &:first-of-type {
-    padding-left: 0;
-  }
-
-  &:last-of-type {
-    padding-right: 0;
-  }
-}
-
-.prfDevTool__detail {
-  font-size: $euiFontSizeS;
-  padding-left: $euiSizeL - 3px; // Alignment is weird
-  margin-bottom: $euiSizeS;
-  display: flex;
-  justify-content: space-between;
-
-  .euiLink {
-    flex-shrink: 0;
-  }
-}
-
-.prfDevTool__description {
-  text-align: left;
-}
-
-.prfDevTool__time,
-.prfDevTool__totalTime,
-.prfDevTool__percentage {
-  width: $euiSize * 5.5;
-}
-
-// BADGES (and those used for progress)
-
-.prfDevTool__badge {
-  border: none;
-  display: block;
-  // Force text to always be dark on top of white -> pink color
-  color: lightOrDarkTheme($euiColorDarkestShade, $euiColorLightestShade);
-}
-
-.prfDevTool__progress--percent {
-  @include prfDevToolProgress;
-  width: $euiSize * 4;
-}
-
-.prfDevTool__progress--time {
-  @include prfDevToolProgress(#FFAFAF);
-  background-color: #F5F5F5; // Must be light at all times
-  width: $euiSize * 15.5;
-  // Force text to always be dark on top of white -> pink color
-  color: lightOrDarkTheme($euiColorDarkestShade, $euiColorLightestShade);
-}
-
-// Breakdown table
-.prfDevTool__breakdown {
-  width:100%;
-}
-
-.prfDevTool__flyoutSubtitle {
-  margin-bottom: $euiSizeS;
-  display: inline-block;
-}
-
-@include euiBreakpoint('xs', 's') {
-  .prfDevTool__shardDetailsWrapper {
-    flex-direction: column;
-    align-items: flex-start;
-  }
-}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/_index.scss b/x-pack/legacy/plugins/searchprofiler/public/directives/_index.scss
deleted file mode 100644
index 69a53dbafe2899..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import 'mixins';
-@import 'directives';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/highlight_details/index.html b/x-pack/legacy/plugins/searchprofiler/public/directives/highlight_details/index.html
deleted file mode 100644
index f58515390ded2d..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/highlight_details/index.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="euiFlyoutHeader euiFlyoutHeader--hasBorder">
-  <h2 id="flyoutTitle">
-    <small class="prfDevTool__flyoutSubtitle">{{detailRow.indexName}}</small> <br>
-    <strong>[{{detailRow.shardID}}][{{detailRow.shardNumber}}]</strong>
-  </h2>
-</div>
-
-<div class="euiFlyoutBody">
-  <div class="euiFlyoutBody__overflow">
-    <div class="euiText">
-      <dl>
-        <dt
-          i18n-id="xpack.searchProfiler.highlightDetails.typeTitle"
-          i18n-default-message="Type"
-        ></dt>
-        <dd>{{detailRow.query_type}}</dd>
-        <dt
-          i18n-id="xpack.searchProfiler.highlightDetails.descriptionTitle"
-          i18n-default-message="Description"
-        ></dt>
-        <dd><code>{{detailRow.lucene}}</code></dd>
-        <dt>
-          <span
-            tooltip="{{:: 'xpack.searchProfiler.highlightDetails.totalTimeTooltip' | i18n: { defaultMessage: 'The total time spent at this query component, inclusive of children' } }}"
-            tooltip-placement="left"
-            i18n-id="xpack.searchProfiler.highlightDetails.totalTimeTitle"
-            i18n-default-message="Total Time"
-          ></span>
-        </dt>
-        <dd>{{detailRow.time | msToPretty:3 }}</dd>
-        <dt>
-          <span
-            tooltip="{{:: 'xpack.searchProfiler.highlightDetails.selfTimeTooltip' | i18n: { defaultMessage: 'The time spent by this query component alone, exclusive of children' } }}"
-            tooltip-placement="left"
-            i18n-id="xpack.searchProfiler.highlightDetails.selfTimeTitle"
-            i18n-default-message="Self Time"
-          ></span>
-        </dt>
-        <dd>{{detailRow.selfTime | msToPretty:3 }}</dd>
-      </dl>
-    </div>
-    <br>
-    <h3><strong
-    i18n-id="xpack.searchProfiler.highlightDetails.timingBreakdownTitle"
-    i18n-default-message="Timing Breakdown"
-    ></strong></h3>
-    <br>
-    <table class="prfDevTool__breakdown" width="100%">
-      <tr ng-repeat="breakdown in detailRow.breakdown">
-        <td class="prfDevTool__cell prfDevTool__description"><span tooltip="{{breakdown.tip}}" tooltip-placement="left">{{breakdown.key}}</span></td>
-        <td class="prfDevTool__cell prfDevTool__time">
-          <span class="euiBadge prfDevTool__badge" ng-style="{'background-color': breakdown.color}">
-            {{breakdown.time | nsToPretty: 1}}
-          </span>
-        </td>
-        <td class="prfDevTool__cell prfDevTool__percentage">
-          <span class="euiBadge euiBadge--default prfDevTool__progress--percent" style="--prfDevToolProgressPercentage: {{breakdown.relative}}%">
-            <span class="prfDevTool__progress--percent-ie" ng-style="{'width': breakdown.relative + '%'}"></span>
-            <span class="prfDevTool__progressText">{{breakdown.relative}}%</span>
-          </span>
-        </td>
-      </tr>
-    </table>
-  </div>
-</div>
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/highlight_details/index.js b/x-pack/legacy/plugins/searchprofiler/public/directives/highlight_details/index.js
deleted file mode 100644
index 717778ed3f4a4d..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/highlight_details/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import template from 'plugins/searchprofiler/directives/highlight_details/index.html';
-import { uiModules } from 'ui/modules';
-
-const uiModule = uiModules.get('app/searchprofiler/directives', []);
-uiModule.directive('highlightdetails', HighlightService => {
-  return {
-    restrict: 'E',
-    scope: {
-      data: '@'
-    },
-    template: template,
-    link: $scope => {
-
-      function render(data) {
-        if (!data) {
-          return;
-        }
-        data.breakdown = _.filter(data.breakdown, o => o.key.indexOf('_count') === -1);
-        $scope.detailRow = data;
-      }
-
-      $scope.$watch(() => {
-        return HighlightService.details;
-      }, render);
-
-    }
-  };
-});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/index.js b/x-pack/legacy/plugins/searchprofiler/public/directives/index.js
deleted file mode 100644
index 4bd4146a1a0fe3..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import 'plugins/searchprofiler/directives/profile_tree';
-import 'plugins/searchprofiler/directives/highlight_details';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/breakdown.js b/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/breakdown.js
deleted file mode 100644
index 1d88310dafbfd6..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/breakdown.js
+++ /dev/null
@@ -1,76 +0,0 @@
-export const breakdown = {
-  advance:0,
-  advance_count:0,
-  build_scorer:6273,
-  build_scorer_count:2,
-  create_weight:1852,
-  create_weight_count:1,
-  match:0,
-  match_count:0,
-  next_doc:2593093,
-  next_doc_count:27958,
-  score:2525502,
-  score_count:27948
-};
-
-export const normalized = [ { key: 'next_doc',
-    time: 2593093,
-    relative: '50.6',
-    color: '#fad2d2',
-    tip: 'The time taken to advance the iterator to the next matching document.' },
-  { key: 'score',
-    time: 2525502,
-    relative: '49.3',
-    color: '#fad2d2',
-    tip: 'The time taken in actually scoring the document against the query.' },
-  { key: 'next_doc_count',
-    time: 27958,
-    relative: 0,
-    color: '#f5f5f5',
-    tip: '' },
-  { key: 'score_count',
-    time: 27948,
-    relative: 0,
-    color: '#f5f5f5',
-    tip: '' },
-  { key: 'build_scorer',
-    time: 6273,
-    relative: '0.1',
-    color: '#f5f5f5',
-    tip: 'The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc.' },
-  { key: 'create_weight',
-    time: 1852,
-    relative: '0.0',
-    color: '#f5f5f5',
-    tip: 'The time taken to create the Weight object, which holds temporary information during scoring.' },
-  { key: 'build_scorer_count',
-    time: 2,
-    relative: 0,
-    color: '#f5f5f5',
-    tip: '' },
-  { key: 'create_weight_count',
-    time: 1,
-    relative: 0,
-    color: '#f5f5f5',
-    tip: '' },
-  { key: 'advance',
-    time: 0,
-    relative: '0.0',
-    color: '#f5f5f5',
-    tip: 'The time taken to advance the iterator to the next document.' },
-  { key: 'advance_count',
-    time: 0,
-    relative: 0,
-    color: '#f5f5f5',
-    tip: '' },
-  { key: 'match',
-    time: 0,
-    relative: '0.0',
-    color: '#f5f5f5',
-    tip: 'The time taken to execute a secondary, more precise scoring phase (used by phrase queries).' },
-  { key: 'match_count',
-    time: 0,
-    relative: 0,
-    color: '#f5f5f5',
-    tip: '' },
-  ];
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/flatten_times.js b/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/flatten_times.js
deleted file mode 100644
index c2017f472bc0ba..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/flatten_times.js
+++ /dev/null
@@ -1,405 +0,0 @@
-/* eslint quotes: 0 */
-export const flatTimes = [
-  {
-    id:"f1e689b1-dafe-4c2b-9a4d-9bd8f1a53803",
-    childrenIds:[
-      "3339dca6-c34a-49f3-a534-27e46f238bcd",
-      "9b75ecdd-a1da-45eb-8d13-5bc5f472dba3",
-      "ddf5aa3e-4b22-4332-9d5e-79a6ae0cc9cb"
-    ],
-    lucene:"hour:1 hour:2 #MatchNoDocsQuery[\"User requested \"match_none\" query.\"]",
-    time:0.447365,
-    selfTime:0.057085,
-    timePercentage:"100.00",
-    query_type:"BooleanQuery",
-    absoluteColor:"#ffafaf",
-    depth:0,
-    hasChildren:true,
-    breakdown:[
-      {
-        key:"create_weight",
-        time:401690,
-        relative:"89.8",
-        color:"#feb6b6",
-        tip:"The time taken to create the Weight object, which holds temporary information during scoring."
-      },
-      {
-        key:"build_scorer",
-        time:45672,
-        relative:"10.2",
-        color:"#f6eeee",
-        tip:"The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc."
-      },
-      {
-        key:"build_scorer_count",
-        time:2,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"create_weight_count",
-        time:1,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"next_doc",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to advance the iterator to the next matching document."
-      },
-      {
-        key:"match",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to execute a secondary, more precise scoring phase (used by phrase queries)."
-      },
-      {
-        key:"match_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"next_doc_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"score_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"score",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken in actually scoring the document against the query."
-      },
-      {
-        key:"advance",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to advance the iterator to the next document."
-      },
-      {
-        key:"advance_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      }
-    ]
-  },
-  {
-    id:"3339dca6-c34a-49f3-a534-27e46f238bcd",
-    parentId:"f1e689b1-dafe-4c2b-9a4d-9bd8f1a53803",
-    childrenIds:[
-
-    ],
-    lucene:"hour:1",
-    time:0.192502,
-    selfTime:0.192502,
-    timePercentage:"43.03",
-    query_type:"TermQuery",
-    absoluteColor:"#f9d7d7",
-    depth:1,
-    breakdown:[
-      {
-        key:"create_weight",
-        time:190989,
-        relative:"99.2",
-        color:"#ffb0b0",
-        tip:"The time taken to create the Weight object, which holds temporary information during scoring."
-      },
-      {
-        key:"build_scorer",
-        time:1510,
-        relative:"0.8",
-        color:"#f5f4f4",
-        tip:"The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc."
-      },
-      {
-        key:"build_scorer_count",
-        time:2,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"create_weight_count",
-        time:1,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"next_doc",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to advance the iterator to the next matching document."
-      },
-      {
-        key:"match",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to execute a secondary, more precise scoring phase (used by phrase queries)."
-      },
-      {
-        key:"match_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"next_doc_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"score_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"score",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken in actually scoring the document against the query."
-      },
-      {
-        key:"advance",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to advance the iterator to the next document."
-      },
-      {
-        key:"advance_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      }
-    ]
-  },
-  {
-    id:"9b75ecdd-a1da-45eb-8d13-5bc5f472dba3",
-    parentId:"f1e689b1-dafe-4c2b-9a4d-9bd8f1a53803",
-    childrenIds:[
-
-    ],
-    lucene:"hour:2",
-    time:0.162608,
-    selfTime:0.162608,
-    timePercentage:"36.35",
-    query_type:"TermQuery",
-    absoluteColor:"#f9dcdc",
-    depth:1,
-    breakdown:[
-      {
-        key:"create_weight",
-        time:162016,
-        relative:"99.6",
-        color:"#ffafaf",
-        tip:"The time taken to create the Weight object, which holds temporary information during scoring."
-      },
-      {
-        key:"build_scorer",
-        time:589,
-        relative:"0.4",
-        color:"#f5f5f5",
-        tip:"The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc."
-      },
-      {
-        key:"build_scorer_count",
-        time:2,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"create_weight_count",
-        time:1,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"next_doc",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to advance the iterator to the next matching document."
-      },
-      {
-        key:"match",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to execute a secondary, more precise scoring phase (used by phrase queries)."
-      },
-      {
-        key:"match_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"next_doc_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"score_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"score",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken in actually scoring the document against the query."
-      },
-      {
-        key:"advance",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to advance the iterator to the next document."
-      },
-      {
-        key:"advance_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      }
-    ]
-  },
-  {
-    id:"ddf5aa3e-4b22-4332-9d5e-79a6ae0cc9cb",
-    parentId:"f1e689b1-dafe-4c2b-9a4d-9bd8f1a53803",
-    childrenIds:[
-
-    ],
-    lucene:"MatchNoDocsQuery[\"User requested \"match_none\" query.\"]",
-    time:0.03517,
-    selfTime:0.03517,
-    timePercentage:"7.86",
-    query_type:"MatchNoDocsQuery",
-    absoluteColor:"#f6efef",
-    depth:1,
-    breakdown:[
-      {
-        key:"build_scorer",
-        time:32522,
-        relative:"92.5",
-        color:"#feb4b4",
-        tip:"The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc."
-      },
-      {
-        key:"create_weight",
-        time:2645,
-        relative:"7.5",
-        color:"#f6f0f0",
-        tip:"The time taken to create the Weight object, which holds temporary information during scoring."
-      },
-      {
-        key:"build_scorer_count",
-        time:2,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"create_weight_count",
-        time:1,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"next_doc",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to advance the iterator to the next matching document."
-      },
-      {
-        key:"match",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to execute a secondary, more precise scoring phase (used by phrase queries)."
-      },
-      {
-        key:"match_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"next_doc_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"score_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      },
-      {
-        key:"score",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken in actually scoring the document against the query."
-      },
-      {
-        key:"advance",
-        time:0,
-        relative:"0.0",
-        color:"#f5f5f5",
-        tip:"The time taken to advance the iterator to the next document."
-      },
-      {
-        key:"advance_count",
-        time:0,
-        relative:0,
-        color:"#f5f5f5",
-        tip:""
-      }
-    ]
-  }
-];
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/normalize_indices.js b/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/normalize_indices.js
deleted file mode 100644
index fee12c17e7d580..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/normalize_indices.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*eslint-disable */
-export const inputIndices = JSON.parse('{"test":{"shards":[{"id":["F-R7QxH4S42fMnPfmFUKMQ","test","0"],"searches":[{"query":null,"rewrite_time":2656,"collector":[{"name":"MultiCollector","reason":"search_multi","time":"0.1815780000ms","children":[{"name":"SimpleTopScoreDocCollector","reason":"search_top_hits","time":"0.02393700000ms"},{"name":"ProfilingAggregator: [org.elasticsearch.search.profile.aggregation.ProfilingAggregator@43c8a536]","reason":"aggregation","time":"0.1140000000ms"}]}],"flat":[{"id":"af697413-f76b-458e-b265-f4930dbdee2a","childrenIds":[],"lucene":"name:george","time":0.219343,"selfTime":0.219343,"timePercentage":"100.00","query_type":"TermQuery","absoluteColor":"#ffafaf","depth":0,"breakdown":[{"key":"create_weight","time":160673,"relative":"73.3","color":"#fcc2c2","tip":"The time taken to create the Weight object, which holds temporary information during scoring."},{"key":"build_scorer","time":50157,"relative":"22.9","color":"#f7e5e5","tip":"The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc."},{"key":"score","time":5783,"relative":"2.6","color":"#f5f3f3","tip":"The time taken in actually scoring the document against the query."},{"key":"next_doc","time":2718,"relative":"1.2","color":"#f5f4f4","tip":"The time taken to advance the iterator to the next matching document."},{"key":"build_scorer_count","time":5,"relative":0,"color":"#f5f5f5","tip":""},{"key":"next_doc_count","time":4,"relative":0,"color":"#f5f5f5","tip":""},{"key":"score_count","time":2,"relative":0,"color":"#f5f5f5","tip":""},{"key":"create_weight_count","time":1,"relative":0,"color":"#f5f5f5","tip":""},{"key":"match","time":0,"relative":"0.0","color":"#f5f5f5","tip":"The time taken to execute a secondary, more precise scoring phase (used by phrase queries)."},{"key":"match_count","time":0,"relative":0,"color":"#f5f5f5","tip":""},{"key":"advance","time":0,"relative":"0.0","color":"#f5f5f5","tip":"The time taken to advance the iterator to the next document."},{"key":"advance_count","time":0,"relative":0,"color":"#f5f5f5","tip":""}]}]}],"aggregations":[{"type":"org.elasticsearch.search.aggregations.metrics.stats.StatsAggregator","description":"stats","time":"0.03053500000ms","breakdown":{"reduce":0,"build_aggregation":9447,"build_aggregation_count":1,"initialize":5589,"initialize_count":1,"reduce_count":0,"collect":15495,"collect_count":2}}],"time":{"searches":0.219343,"aggregations":0},"color":{"searches":0,"aggregations":0},"relative":{"searches":0,"aggregations":0},"rewrite_time":2656}],"time":{"searches":0.219343,"aggregations":0},"name":"test"}}');
-
-export const normalizedIndices = JSON.parse('[{"shards":[{"id":["F-R7QxH4S42fMnPfmFUKMQ","test","0"],"searches":[{"query":null,"rewrite_time":2656,"collector":[{"name":"MultiCollector","reason":"search_multi","time":"0.1815780000ms","children":[{"name":"SimpleTopScoreDocCollector","reason":"search_top_hits","time":"0.02393700000ms"},{"name":"ProfilingAggregator: [org.elasticsearch.search.profile.aggregation.ProfilingAggregator@43c8a536]","reason":"aggregation","time":"0.1140000000ms"}]}],"flat":[{"id":"af697413-f76b-458e-b265-f4930dbdee2a","childrenIds":[],"lucene":"name:george","time":0.219343,"selfTime":0.219343,"timePercentage":"100.00","query_type":"TermQuery","absoluteColor":"#ffafaf","depth":0,"breakdown":[{"key":"create_weight","time":160673,"relative":"73.3","color":"#fcc2c2","tip":"The time taken to create the Weight object, which holds temporary information during scoring."},{"key":"build_scorer","time":50157,"relative":"22.9","color":"#f7e5e5","tip":"The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc."},{"key":"score","time":5783,"relative":"2.6","color":"#f5f3f3","tip":"The time taken in actually scoring the document against the query."},{"key":"next_doc","time":2718,"relative":"1.2","color":"#f5f4f4","tip":"The time taken to advance the iterator to the next matching document."},{"key":"build_scorer_count","time":5,"relative":0,"color":"#f5f5f5","tip":""},{"key":"next_doc_count","time":4,"relative":0,"color":"#f5f5f5","tip":""},{"key":"score_count","time":2,"relative":0,"color":"#f5f5f5","tip":""},{"key":"create_weight_count","time":1,"relative":0,"color":"#f5f5f5","tip":""},{"key":"match","time":0,"relative":"0.0","color":"#f5f5f5","tip":"The time taken to execute a secondary, more precise scoring phase (used by phrase queries)."},{"key":"match_count","time":0,"relative":0,"color":"#f5f5f5","tip":""},{"key":"advance","time":0,"relative":"0.0","color":"#f5f5f5","tip":"The time taken to advance the iterator to the next document."},{"key":"advance_count","time":0,"relative":0,"color":"#f5f5f5","tip":""}]}]}],"aggregations":[{"type":"org.elasticsearch.search.aggregations.metrics.stats.StatsAggregator","description":"stats","time":"0.03053500000ms","breakdown":{"reduce":0,"build_aggregation":9447,"build_aggregation_count":1,"initialize":5589,"initialize_count":1,"reduce_count":0,"collect":15495,"collect_count":2}}],"time":{"searches":0.219343,"aggregations":0},"color":{"searches":"#ffafaf","aggregations":0},"relative":{"searches":"100.00","aggregations":0},"rewrite_time":2656}],"time":{"searches":0.219343,"aggregations":0},"name":"test"}]');
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/profile_tree.js b/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/profile_tree.js
deleted file mode 100644
index 6da9a452e5e3c9..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/profile_tree.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import *  as util from '../util.js';
-import { normalized, breakdown } from './fixtures/breakdown.js';
-import { inputTimes, normalizedTimes } from './fixtures/normalize_times.js';
-import { inputIndices, normalizedIndices } from './fixtures/normalize_indices.js';
-import { flatTimes } from './fixtures/flatten_times.js';
-
-describe('normalizeBreakdown', function () {
-  it('returns correct breakdown', function () {
-    const result = util.normalizeBreakdown(breakdown);
-    expect(result).to.eql(normalized);
-  });
-});
-
-describe('normalizeTimes', function () {
-  it('returns correct normalization', function () {
-    const totalTime = 0.447365;
-
-    // Deep clone the object to preserve the original
-    const input = JSON.parse(JSON.stringify(inputTimes));
-    util.normalizeTimes(input, totalTime, 0);
-
-    // Modifies in place, so inputTimes will change
-    expect(input).to.eql(normalizedTimes);
-  });
-});
-
-describe('flattenResults', function () {
-  it('returns correct flattening', function () {
-    // Deep clone the object to preserve the original
-    const input = JSON.parse(JSON.stringify(normalizedTimes));
-    const flat = [];
-    util.flattenResults(input, flat, 0, []);
-    expect(JSON.parse(JSON.stringify(flat))).to.eql(flatTimes);
-  });
-});
-
-describe('normalizeIndices', function () {
-  it('returns correct ordering', function () {
-    // Deep clone the object to preserve the original
-    const input = JSON.parse(JSON.stringify(inputIndices));
-    const result = util.normalizeIndices(input, [], 'searches');
-    expect(result).to.eql(normalizedIndices);
-  });
-});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/index.html b/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/index.html
deleted file mode 100644
index e6994a07aa6d16..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/index.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<div class="prfDevTool__panel prfDevTool__index" ng-repeat="index in profileResponse">
-  <div class="prfDevTool__shardDetailsWrapper">
-    <div class="prfDevTool__shardDetails--dim">
-      <span
-        tooltip-placement="bottom"
-        tooltip="{{:: 'xpack.searchProfiler.profileTree.cumulativeTimeTooltip' | i18n: { defaultMessage: 'The cumulative time of all shards in the index. Note: this is not wall-clock time, as shards can execute in parallel.' } }}">
-        <small>{{:: 'xpack.searchProfiler.profileTree.cumulativeTimeTitle' | i18n: { defaultMessage: "Cumulative Time:" } }}</small> {{ index.time[target] | msToPretty: 3 }}
-      </span>
-    </div>
-    <div class="prfDevTool__shardDetails">
-      <h3>
-        <b
-          i18n-id="xpack.searchProfiler.profileTree.indexTitle"
-          i18n-default-message="Index:"
-        ></b>
-        {{index.name}}
-      </h3>
-    </div>
-  </div>
-
-  <div ng-repeat="shard in index.shards">
-
-    <div class="prfDevTool__panel prfDevTool__shard">
-      <div class="prfDevTool__shardBody">
-        <div class="prfDevTool__shardDetailsWrapper">
-          <div class="prfDevTool__shardDetails--dim">
-            <span class="euiBadge euiBadge--default prfDevTool__progress--time" style="--prfDevToolProgressPercentage: {{shard.relative[target]}}%">
-              <span class="prfDevTool__progress--percent-ie" ng-style="{'width': shard.relative[target] + '%'}"></span>
-              <span class="prfDevTool__progressText">{{shard.time[target] | msToPretty: 3}}</span>
-            </span>
-          </div>
-          <button class="euiLink prfDevTool__shardDetails" ng-click="shardVisibility = !shardVisibility">
-            <icon type="'arrowRight'" ng-if="!shardVisibility" />
-            <icon type="'arrowDown'" ng-if="shardVisibility" />
-            [{{shard.id[0]}}][{{shard.id[2]}}]
-          </button>
-        </div>
-
-        <div class="treeviewwrapper"
-            ng-repeat="search in shard[target]"
-            ng-hide="!shardVisibility"
-            ng-class="{'prfDevTool__panelBody' : shardVisibility}">
-
-          <div class="prfDevTool__tvHeader">
-            <div
-              class="prfDevTool__cell prfDevTool__description"
-              i18n-id="xpack.searchProfiler.profileTree.header.typeTitle"
-              i18n-default-message="Type and description"
-            ></div>
-            <div
-              class="prfDevTool__cell prfDevTool__time"
-              i18n-id="xpack.searchProfiler.profileTree.header.selfTimeTitle"
-              i18n-default-message="Self time"
-            ></div>
-            <div
-              class="prfDevTool__cell prfDevTool__totalTime"
-              i18n-id="xpack.searchProfiler.profileTree.header.totalTimeTitle"
-              i18n-default-message="Total time"
-            ></div>
-            <div class="prfDevTool__cell prfDevTool__percentage"></div>
-          </div>
-
-          <div
-            ng-repeat="row in search.flat"
-            ng-show="row.depth === 0 ? true : visible[row.parentId].visible"
-            ng-class="row.id == getHighlightedRow() ? 'prfDevTool__tvRow--last' : ''"
-            style="padding-left:{{row.depth * 32}}px;"
-          >
-
-            <div class="prfDevTool__tvRow">
-              <div class="prfDevTool__cell prfDevTool__description">
-                <button class="euiLink prfDevTool__shardDetails" ng-disabled="!row.hasChildren" ng-click="row.hasChildren && toggle(row.id)">
-                  <icon type="'arrowRight'" ng-if="row.hasChildren && !visible[row.id].visible" />
-                  <icon type="'arrowDown'" ng-if="row.hasChildren && visible[row.id].visible" />
-                  <!-- Use dot icon for alignment if arrow isn't there -->
-                  <icon type="'dot'" color="'subdued'" ng-if="!row.hasChildren" />
-                  {{row.query_type}}
-                </button>
-              </div>
-              <div class="prfDevTool__cell prfDevTool__time">
-                <span class="euiBadge prfDevTool__badge" ng-style="{'background-color': row.absoluteColor}">
-                  {{row.selfTime | msToPretty: 1}}
-                </span>
-              </div>
-              <div class="prfDevTool__cell prfDevTool__totalTime">
-                <span class="euiBadge prfDevTool__badge" ng-style="{'background-color': row.absoluteColor}">
-                  {{row.time | msToPretty: 1}}
-                </span>
-              </div>
-              <div class="prfDevTool__cell prfDevTool__percentage">
-                <span class="euiBadge euiBadge--default prfDevTool__progress--percent" style="--prfDevToolProgressPercentage: {{row.timePercentage}}%">
-                  <span class="prfDevTool__progress--percent-ie" ng-style="{'width': row.timePercentage + '%'}"></span>
-                  <span class="prfDevTool__progressText">{{row.timePercentage}}%</span>
-                </span>
-              </div>
-            </div>
-
-            <div class="prfDevTool__tvRow">
-              <span class='prfDevTool__detail'>
-                <code class="euiCode"
-                  tooltip-placement="top"
-                  tooltip="{{row.lucene.length > 120 ? row.lucene : ''}}">
-                {{row.lucene | limitTo : 120}}{{row.lucene.length > 120 ? '...' : ''}}
-              </code>
-                <button class="euiLink euiLink--small euiLink--primary" ng-click="updateDetail(row, index.name, shard.id[0], shard.id[2])">
-                  View details
-                </button>
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/index.js b/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/index.js
deleted file mode 100644
index b212439e98394a..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/index.js
+++ /dev/null
@@ -1,172 +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 template from 'plugins/searchprofiler/directives/profile_tree/index.html';
-import {
-  closeNode,
-  normalizeIndices,
-  calcTimes,
-  normalizeTimes,
-  flattenResults
-} from 'plugins/searchprofiler/directives/profile_tree/util';
-import { uiModules } from 'ui/modules';
-
-const uiModule = uiModules.get('app/searchprofiler/directives', []);
-uiModule.directive('profiletree',  HighlightService => {
-  return {
-    restrict: 'E',
-    scope: {
-      data: '=',
-      target: '@'
-    },
-    template: template,
-    link: $scope => {
-      $scope.visible = {
-        'foo': {}
-      };
-      $scope.indexVisibility = {};
-      $scope.highlightedRow = null;
-
-      $scope.updateDetail = (row, indexName, shardID, shardNumber) => {
-        HighlightService.details = row;
-        HighlightService.details.indexName = indexName;
-        HighlightService.details.shardID = shardID;
-        HighlightService.details.shardNumber = shardNumber;
-        HighlightService.details.highlightedRow = row.id;
-      };
-
-      $scope.getHighlightedRow = () => {
-        if (HighlightService.details) {
-          return HighlightService.details.highlightedRow;
-        }
-        return null;
-      };
-
-      $scope.toggle = id => {
-        // If the branch is open and toggled close, we need to
-        // also close the children
-        if ($scope.visible[id].visible === true) {
-          closeNode($scope.visible, id);
-        } else {
-          // Otherwise just toggle on
-          $scope.visible[id].visible = true;
-        }
-      };
-
-      function render(data) {
-        if (data.length === 0) {
-          return;
-        }
-
-        $scope.visible = {};
-        let indices = {};
-
-        for (const shard of data) {
-          initShardTargets(shard);
-
-          if ($scope.target === 'searches') {
-            shard.time[$scope.target] = collectSearchTimes(shard);
-          } else if ($scope.target === 'aggregations') {
-            shard.time[$scope.target] = collectAggTimes(shard);
-          }
-          if (!indices[shard.id[1]]) {
-            indices[shard.id[1]] = {
-              shards: [],
-              time: {
-                searches: 0,
-                aggregations: 0
-              },
-              name: shard.id[1]
-            };
-          }
-          indices[shard.id[1]].shards.push(shard);
-          indices[shard.id[1]].time[$scope.target] += shard.time[$scope.target];
-        }
-        data = null;
-        const finalIndices = normalizeIndices(indices, $scope.indexVisibility, $scope.target);
-        indices = null;
-
-        $scope.profileResponse = finalIndices;
-      }
-
-      function collectSearchTimes(shard) {
-        if (shard.searches == null) {
-          return 0;
-        }
-        shard.rewrite_time = 0;
-
-        let shardTime = 0;
-        for (const search of shard.searches) {
-          shard.rewrite_time += search.rewrite_time;
-          const totalTime = calcTimes(search.query);
-          shardTime += totalTime;
-          normalizeTimes(search.query, totalTime, 0);
-
-          const flat = [];
-          flattenResults(search.query, flat, 0, $scope.visible);
-          search.flat = flat;
-          search.query = null;
-        }
-        return shardTime;
-      }
-
-      function collectAggTimes(shard) {
-        if (shard.aggregations == null) {
-          return 0;
-        }
-        let shardTime = 0;
-        for (const agg of shard.aggregations) {
-          const totalTime = calcTimes([agg]);
-          shardTime += totalTime;
-        }
-        for (const agg of shard.aggregations) {
-          normalizeTimes([agg], shardTime, 0);
-
-          const flat = [];
-          flattenResults([agg], flat, 0, $scope.visible);
-          agg.flat = flat;
-        }
-        return shardTime;
-      }
-
-      // TODO the addition of aggregation profiling made the mutability of
-      // `shards` a liability.  Previously we set things directly on the shards
-      // tree because it was the only source of data.  Now we have agg data,
-      // so final, accumulated stats need to be saved on a per-target basis
-      //
-      // In the future, we should really remove this setup and create two immutable
-      // result sets that are generated from a single (also immutable) input set of
-      // `shards` data
-      //
-      // Particularly important if/when we add a third target
-      function initShardTargets(shard) {
-        if (!shard.time) {
-          shard.time = {
-            searches: 0,
-            aggregations: 0
-          };
-        }
-
-        if (!shard.color) {
-          shard.color = {
-            searches: 0,
-            aggregations: 0
-          };
-        }
-
-        if (!shard.relative) {
-          shard.relative = {
-            searches: 0,
-            aggregations: 0
-          };
-        }
-      }
-
-      $scope.$watch('data', render);
-
-    }
-  };
-});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/util.js b/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/util.js
deleted file mode 100644
index 6190d299dcf10d..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/util.js
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import uuid from 'uuid';
-import tinycolor from 'tinycolor2';
-import _ from 'lodash';
-
-const comparator = (v1, v2) => {
-  if (v1 < v2) {
-    return 1;
-  }
-  return (v1 > v2) ? -1 : 0;
-};
-
-function getToolTip(key) {
-  switch (key) {
-    case 'build_scorer':
-      return 'The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc.';
-    case 'create_weight':
-      return 'The time taken to create the Weight object, which holds temporary information during scoring.';
-    case 'next_doc':
-      return 'The time taken to advance the iterator to the next matching document.';
-    case 'score':
-      return 'The time taken in actually scoring the document against the query.';
-    case 'match':
-      return 'The time taken to execute a secondary, more precise scoring phase (used by phrase queries).';
-    case 'advance':
-      return 'The time taken to advance the iterator to the next document.';
-    default:
-      return '';
-  }
-}
-
-export function timeInMilliseconds(data) {
-  if (data.time_in_nanos) {
-    return data.time_in_nanos / 1000000;
-  }
-
-  if (typeof data.time === 'string') {
-    return data.time.replace('ms', '');
-  }
-
-  return data.time;
-}
-
-export function calcTimes(data, parentId) {
-  if (data == null) {
-    return;
-  }
-
-  let totalTime = 0;
-  //First pass to collect total
-  for (const child of data) {
-    totalTime += timeInMilliseconds(child);
-
-    child.id = uuid.v4();
-    child.parentId = parentId;
-    child.childrenIds = [];
-    child.breakdown = normalizeBreakdown(child.breakdown);
-
-    let childrenTime = 0;
-    if (child.children != null && child.children.length !== 0) {
-      childrenTime = calcTimes(child.children, child.id);
-      child.hasChildren = true;
-
-      // Save the IDs of our children, has to be called after calcTimes recursion above
-      for (const c of child.children) {
-        child.childrenIds.push(c.id);
-      }
-    }
-    child.selfTime = (timeInMilliseconds(child) - childrenTime);
-  }
-  return totalTime;
-}
-
-export function normalizeBreakdown(breakdown) {
-  const final = [];
-  const total = Object.keys(breakdown).reduce((partialTotal, currentKey) => {
-    if (currentKey.indexOf('_count') === -1) {
-      partialTotal += breakdown[currentKey];
-    }
-    return partialTotal;
-  }, 0);
-  Object.keys(breakdown).sort().forEach(key => {
-    let relative = 0;
-    if (key.indexOf('_count') === -1) {
-      relative = ((breakdown[key] / total) * 100).toFixed(1);
-    }
-    final.push({
-      key: key,
-      time: breakdown[key],
-      relative: relative,
-      color: tinycolor.mix('#F5F5F5', '#FFAFAF', relative).toHexString(),
-      tip: getToolTip(key)
-    });
-  });
-
-  // Sort by time descending and then key ascending
-  return final.sort((a, b) => {
-    if (comparator(a.time, b.time) !== 0) {
-      return comparator(a.time, b.time);
-    }
-
-    return -1 * comparator(a.key, b.key);
-  });
-}
-
-export function normalizeTimes(data, totalTime, depth) {
-  //Second pass to normalize
-  for (const child of data) {
-    child.timePercentage = ((timeInMilliseconds(child) / totalTime) * 100).toFixed(2);
-    child.absoluteColor = tinycolor.mix('#F5F5F5', '#FFAFAF', child.timePercentage).toHexString();
-    child.depth = depth;
-
-    if (child.children != null && child.children.length !== 0) {
-      normalizeTimes(child.children, totalTime, depth + 1);
-    }
-  }
-
-  data.sort((a, b) => comparator(timeInMilliseconds(a), timeInMilliseconds(b)));
-}
-
-export function normalizeIndices(indices, visibility, target) {
-  // Sort the shards per-index
-  let sortQueryComponents;
-  if (target === 'searches') {
-    sortQueryComponents = (a, b) => {
-      const aTime = _.sum(a.searches, (search) => {
-        return search.flat[0].time;
-      });
-      const bTime = _.sum(b.searches, (search) => {
-        return search.flat[0].time;
-      });
-
-      return comparator(aTime, bTime);
-    };
-  } else if (target === 'aggregations') {
-    sortQueryComponents = (a, b) => {
-      const aTime = _.sum(a.aggregations, (agg) => {
-        return agg.flat[0].time;
-      });
-      const bTime = _.sum(b.aggregations, (agg) => {
-        return agg.flat[0].time;
-      });
-
-      return comparator(aTime, bTime);
-    };
-  }
-  const sortedIndices = [];
-  for (const [key, index] of Object.entries(indices)) {
-    index.shards.sort(sortQueryComponents);
-    for (const shard of index.shards) {
-      shard.relative[target] = ((shard.time[target] / index.time[target]) * 100).toFixed(2);
-      shard.color[target] = tinycolor.mix('#F5F5F5', '#FFAFAF', shard.relative[target]).toHexString();
-    }
-    sortedIndices.push(index);
-    visibility[key] = false;
-  }
-
-  // And now sort the indices themselves
-  sortedIndices.sort((a, b) => comparator(a.time, b.time));
-  return sortedIndices;
-}
-
-export function flattenResults(data, accumulator, depth, visibleMap) {
-  if (data == null) {
-    return;
-  }
-
-  for (const child of data) {
-
-    // For bwc of older profile responses
-    if (!child.description) {
-      child.description = child.lucene;
-      child.lucene = null;
-
-      child.type = child.query_type;
-      child.query_type = null;
-    }
-    accumulator.push({
-      id: child.id,
-      parentId: child.parentId,
-      childrenIds: child.childrenIds,
-      lucene: child.description,
-      time: timeInMilliseconds(child),
-      selfTime: child.selfTime,
-      timePercentage: child.timePercentage,
-      query_type: child.type.split('.').pop(),
-      absoluteColor: child.absoluteColor,
-      depth: depth,
-      hasChildren: child.hasChildren,
-      breakdown: child.breakdown
-    });
-
-    visibleMap[child.id] = {
-      visible: child.timePercentage > 20,
-      children: child.children
-    };
-
-    if (child.children != null && child.children.length !== 0) {
-      flattenResults(child.children, accumulator, depth + 1, visibleMap);
-    }
-  }
-}
-
-export function closeNode(visibleMap, id) {
-  visibleMap[id].visible = false;
-
-  if (visibleMap[id].children == null || visibleMap[id].children.length === 0) {
-    return;
-  }
-
-  for (const child of visibleMap[id].children) {
-    closeNode(visibleMap, child.id);
-  }
-}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/editor/index.ts b/x-pack/legacy/plugins/searchprofiler/public/editor/index.ts
deleted file mode 100644
index 45562385c2e691..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/editor/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import ace from 'brace';
-import { installXJsonMode } from './x_json_mode';
-
-export function initializeEditor({
-  el,
-  licenseEnabled,
-  initialContent,
-}: {
-  el: HTMLDivElement;
-  licenseEnabled: boolean;
-  initialContent: string;
-}) {
-  const editor: ace.Editor = ace.acequire('ace/ace').edit(el);
-
-  installXJsonMode(editor);
-  editor.$blockScrolling = Infinity;
-
-  if (!licenseEnabled) {
-    editor.setReadOnly(true);
-    editor.container.style.pointerEvents = 'none';
-    editor.container.style.opacity = '0.5';
-    editor.renderer.setStyle('disabled');
-    editor.blur();
-  }
-
-  return editor;
-}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/filters/__tests__/ns_to_pretty.js b/x-pack/legacy/plugins/searchprofiler/public/filters/__tests__/ns_to_pretty.js
deleted file mode 100644
index 85208495fc18e2..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/filters/__tests__/ns_to_pretty.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { nsToPretty } from '../ns_to_pretty.js';
-
-describe('nsToPretty', function () {
-  it('returns correct time for ns', function () {
-    const result = nsToPretty(500, 1);
-    expect(result).to.eql('500.0ns');
-  });
-
-  it('returns correct time for µs', function () {
-    const result = nsToPretty(5000, 1);
-    expect(result).to.eql('5.0µs');
-  });
-
-  it('returns correct time for ms', function () {
-    const result = nsToPretty(5000000, 1);
-    expect(result).to.eql('5.0ms');
-  });
-
-  it('returns correct time for s', function () {
-    const result = nsToPretty(5000000000, 1);
-    expect(result).to.eql('5.0s');
-  });
-
-  it('returns correct time for min', function () {
-    const result = nsToPretty(5000000000 * 60, 1);
-    expect(result).to.eql('5.0min');
-  });
-
-  it('returns correct time for hr', function () {
-    const result = nsToPretty(3.6e+12 * 5, 1);
-    expect(result).to.eql('5.0hr');
-  });
-
-  it('returns correct time for day', function () {
-    const result = nsToPretty(3.6e+12 * 24 * 5, 1);
-    expect(result).to.eql('5.0d');
-  });
-
-  it('returns correct time for precision', function () {
-    const result = nsToPretty(500, 5);
-    expect(result).to.eql('500.00000ns');
-  });
-});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/filters/ms_to_pretty.js b/x-pack/legacy/plugins/searchprofiler/public/filters/ms_to_pretty.js
deleted file mode 100644
index aa088ffc46c596..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/filters/ms_to_pretty.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export function msToPretty(ms, precision) {
-  if (!precision) {
-    precision = 1;
-  }
-  ms = Number(ms);
-  if (ms < 1000) {
-    return ms.toFixed(precision) + 'ms';
-  }
-
-  ms /= 1000;
-  if (ms < 60) {
-    return ms.toFixed(precision) + 's';
-  }
-
-  ms /= 60;
-  if (ms < 60) {
-    return ms.toFixed(precision) + 'min';
-  }
-
-  ms /= 60;
-  if (ms < 24) {
-    return ms.toFixed(precision) + 'hr';
-  }
-
-  ms /= 24;
-  return ms.toFixed(precision) + 'd';
-}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/filters/ns_to_pretty.js b/x-pack/legacy/plugins/searchprofiler/public/filters/ns_to_pretty.js
deleted file mode 100644
index 74737ed8e30d4b..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/filters/ns_to_pretty.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { msToPretty } from './ms_to_pretty';
-
-export function nsToPretty(ns, precision) {
-  if (!precision) {
-    precision = 1;
-  }
-  const units = ['ns', 'µs'];
-
-  for (const unit of units) {
-    if (ns < 1000) {
-      return ns.toFixed(precision) + unit;
-    }
-    ns /= 1000;
-  }
-  return msToPretty(ns, precision);
-}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/index.scss b/x-pack/legacy/plugins/searchprofiler/public/index.scss
deleted file mode 100644
index 2db81310a8db48..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/index.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-// Import the EUI global scope so we can use EUI constants
-@import 'src/legacy/ui/public/styles/_styling_constants';
-
-// Search profiler plugin styles
-
-// Prefix all styles with "prfDevTool" to avoid conflicts.
-// Examples
-//   prfDevTool__
-//   prfDevTool__cell
-//   prfDevTool__shardDetails
-
-@import 'directives/index';
-@import 'templates/index';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/searchprofiler/public/legacy.ts b/x-pack/legacy/plugins/searchprofiler/public/legacy.ts
new file mode 100644
index 00000000000000..61dabe8ac7b05c
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/legacy.ts
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable @kbn/eslint/no-restricted-paths */
+import { npSetup } from 'ui/new_platform';
+import { I18nContext } from 'ui/i18n';
+import uiRoutes from 'ui/routes';
+import 'ui/capabilities/route_setup';
+// @ts-ignore
+import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
+// @ts-ignore
+import { formatAngularHttpError } from 'ui/notify/lib';
+import 'ui/autoload/all';
+/* eslint-enable @kbn/eslint/no-restricted-paths */
+
+import { ApplicationSetup } from 'src/core/public';
+import { plugin } from './np_ready';
+
+const pluginInstance = plugin({} as any);
+
+const template = `<kbn-dev-tools-app class="prfDevTool" data-test-subj="searchProfiler">
+  <div id="searchProfilerAppRoot" data-ng-init="startReactApp()" />
+</kbn-dev-tools-app>`;
+
+uiRoutes.when('/dev_tools/searchprofiler', {
+  template,
+  requireUICapability: 'dev_tools.show',
+  controller: $scope => {
+    $scope.startReactApp = () => {
+      const el = document.querySelector<HTMLElement>('#searchProfilerAppRoot');
+      if (!el) {
+        const errorMessage = 'Could not mount Searchprofiler App!';
+        npSetup.core.fatalErrors.add(errorMessage);
+        throw new Error(errorMessage);
+      }
+
+      const coreApplicationSetupShim: ApplicationSetup = {
+        register(app: any) {
+          const unmount = app.mount();
+          $scope.$on('$destroy', () => unmount());
+        },
+        registerMountContext: {} as any,
+      };
+
+      pluginInstance.setup(
+        {
+          ...npSetup.core,
+          application: coreApplicationSetupShim,
+        },
+        {
+          __LEGACY: {
+            I18nContext,
+            licenseEnabled: xpackInfo.get('features.searchprofiler.enableAppLink'),
+            notifications: npSetup.core.notifications.toasts,
+            formatAngularHttpError,
+            el,
+          },
+        }
+      );
+    };
+  },
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/boot.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/boot.tsx
new file mode 100644
index 00000000000000..fa02124f8a2454
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/boot.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 { render, unmountComponentAtNode } from 'react-dom';
+import React from 'react';
+import { HttpStart as Http, ToastsSetup } from 'src/core/public';
+import { App } from '.';
+
+export interface Dependencies {
+  el: HTMLElement;
+  http: Http;
+  licenseEnabled: boolean;
+  I18nContext: any;
+  notifications: ToastsSetup;
+  formatAngularHttpError: any;
+}
+
+export type AppDependencies = Omit<Dependencies, 'el'>;
+
+export function boot(deps: Dependencies): () => void {
+  const { el, ...rest } = deps;
+  render(<App {...rest} />, deps.el);
+  return () => unmountComponentAtNode(deps.el);
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/highlight_details_flyout.test.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/highlight_details_flyout.test.tsx
new file mode 100644
index 00000000000000..cf8052cbf35806
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/highlight_details_flyout.test.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { registerTestBed } from '../../../../../../../../test_utils';
+import { HighlightDetailsFlyout, Props } from '.';
+
+describe('Highlight Details Flyout', () => {
+  it('renders', async () => {
+    const props: Props = {
+      onClose: () => {},
+      shard: {
+        aggregations: [],
+        id: ['test', 'test', 'test'],
+        searches: [],
+        color: '#fff',
+        time: 123,
+        relative: 100,
+      },
+      operation: {
+        parent: null,
+        breakdown: [
+          {
+            color: 'test',
+            key: 'test',
+            relative: 100,
+            tip: 'test',
+            time: 100,
+          },
+          {
+            color: 'test',
+            key: 'test',
+            relative: 100,
+            tip: 'test',
+            time: 100,
+          },
+          {
+            color: 'test',
+            key: 'test',
+            relative: 100,
+            tip: 'test',
+            time: 100,
+          },
+        ],
+        lucene: 'test',
+        query_type: 'test',
+        selfTime: 100,
+        time: 100,
+        children: [],
+        timePercentage: 100,
+        hasChildren: false,
+        visible: true,
+        absoluteColor: '123',
+      },
+      indexName: 'test',
+    };
+
+    const init = registerTestBed(HighlightDetailsFlyout);
+    await init(props);
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/highlight_details_flyout.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/highlight_details_flyout.tsx
new file mode 100644
index 00000000000000..6ba39d15b83411
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/highlight_details_flyout.tsx
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiFlyout,
+  EuiFlyoutHeader,
+  EuiFlyoutBody,
+  EuiIconTip,
+  EuiText,
+  EuiCodeBlock,
+} from '@elastic/eui';
+
+import { msToPretty } from '../../utils';
+import { HighlightDetailsTable } from './highlight_details_table';
+import { Operation, Shard } from '../../types';
+
+export interface Props {
+  operation: Operation;
+  shard: Shard;
+  indexName: string;
+  onClose: () => void;
+}
+
+const FlyoutEntry = ({
+  title,
+  body,
+}: {
+  title: string | JSX.Element;
+  body: string | JSX.Element;
+}) => (
+  <>
+    <dt>{title}</dt>
+    <dd>{body}</dd>
+  </>
+);
+
+export const HighlightDetailsFlyout = ({ indexName, operation, shard, onClose }: Props) => {
+  return (
+    <EuiFlyout className="prfDevTool__details" onClose={() => onClose()}>
+      <EuiFlyoutHeader hasBorder={true}>
+        <EuiText size="s">{indexName}</EuiText>
+        <EuiText>
+          [{/* shard id */ shard.id[0]}][{/* shard number */ shard.id[2]}]
+        </EuiText>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <EuiText>
+          <dl>
+            {/* Type Entry */}
+            <FlyoutEntry
+              title={i18n.translate('xpack.searchProfiler.highlightDetails.typeTitle', {
+                defaultMessage: 'Type',
+              })}
+              body={operation.query_type!}
+            />
+            {/* Description Entry */}
+            <FlyoutEntry
+              title={i18n.translate('xpack.searchProfiler.highlightDetails.descriptionTitle', {
+                defaultMessage: 'Description',
+              })}
+              body={<EuiCodeBlock paddingSize="s">{operation.lucene!}</EuiCodeBlock>}
+            />
+            {/* Total Time Entry */}
+            <FlyoutEntry
+              title={
+                <>
+                  {i18n.translate('xpack.searchProfiler.highlightDetails.totalTimeTitle', {
+                    defaultMessage: 'Total time',
+                  })}{' '}
+                  <EuiIconTip
+                    type="iInCircle"
+                    color="subdued"
+                    content={i18n.translate(
+                      'xpack.searchProfiler.highlightDetails.totalTimeTooltip',
+                      {
+                        defaultMessage:
+                          'The total time spent at this query component, inclusive of children',
+                      }
+                    )}
+                  />
+                </>
+              }
+              body={msToPretty(operation.time, 3)}
+            />
+            {/* Self Time Entry */}
+            <FlyoutEntry
+              title={
+                <>
+                  {i18n.translate('xpack.searchProfiler.highlightDetails.selfTimeTitle', {
+                    defaultMessage: 'Self time',
+                  })}{' '}
+                  <EuiIconTip
+                    type="iInCircle"
+                    color="subdued"
+                    content={i18n.translate(
+                      'xpack.searchProfiler.highlightDetails.selfTimeTooltip',
+                      {
+                        defaultMessage:
+                          'The time spent by this query component alone, exclusive of children',
+                      }
+                    )}
+                  />
+                </>
+              }
+              body={msToPretty(operation.selfTime || 0, 3)}
+            />
+            {/* Breakdown Table Entry */}
+            <FlyoutEntry
+              title={i18n.translate('xpack.searchProfiler.highlightDetails.timingBreakdownTitle', {
+                defaultMessage: 'Timing breakdown',
+              })}
+              body={<HighlightDetailsTable breakdown={operation.breakdown} />}
+            />
+          </dl>
+        </EuiText>
+      </EuiFlyoutBody>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/highlight_details_table.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/highlight_details_table.tsx
new file mode 100644
index 00000000000000..4bfa7365de1efa
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/highlight_details_table.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 { EuiBasicTable, EuiToolTip, EuiBadge } from '@elastic/eui';
+
+import { BreakdownItem } from '../../types';
+import { nsToPretty } from '../../utils';
+import { PercentageBadge } from '../percentage_badge';
+
+interface Props {
+  breakdown: BreakdownItem[];
+}
+
+export const HighlightDetailsTable = ({ breakdown }: Props) => {
+  const columns = [
+    {
+      name: 'Description',
+      render: (item: BreakdownItem) => (
+        <EuiToolTip position="left" content={item.tip}>
+          <span>{item.key}</span>
+        </EuiToolTip>
+      ),
+    },
+    {
+      name: 'Time',
+      render: (item: BreakdownItem) => (
+        <EuiBadge style={{ backgroundColor: item.color }}>
+          <span>{nsToPretty(item.time, 1)}</span>
+        </EuiBadge>
+      ),
+    },
+    {
+      name: 'Percentage',
+      render: (item: BreakdownItem) => (
+        <PercentageBadge timePercentage={item.relative as number} label={item.relative + '%'} />
+      ),
+    },
+  ];
+
+  return <EuiBasicTable items={breakdown} columns={columns} />;
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/index.ts
new file mode 100644
index 00000000000000..36ae010fabfa48
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/highlight_details_flyout/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { HighlightDetailsFlyout, Props } from './highlight_details_flyout';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/index.ts
new file mode 100644
index 00000000000000..db1fea0033db5c
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { SearchProfilerTabs } from './searchprofiler_tabs';
+export { LicenseWarningNotice } from './license_warning_notice';
+export { ProfileTree, OnHighlightChangeArgs } from './profile_tree';
+export { HighlightDetailsFlyout } from './highlight_details_flyout';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/license_warning_notice.test.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/license_warning_notice.test.ts
new file mode 100644
index 00000000000000..ebe7a00737868f
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/license_warning_notice.test.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { registerTestBed } from '../../../../../../../test_utils';
+
+import { LicenseWarningNotice } from './license_warning_notice';
+
+describe('License Error Notice', () => {
+  it('renders', async () => {
+    const init = registerTestBed(LicenseWarningNotice);
+    await init({});
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/license_warning_notice.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/license_warning_notice.tsx
new file mode 100644
index 00000000000000..da9991529e7d44
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/license_warning_notice.tsx
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiCallOut, EuiText, EuiLink, EuiCode } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+export const LicenseWarningNotice = () => {
+  const registerLicenseLinkLabel = i18n.translate('xpack.searchProfiler.registerLicenseLinkLabel', {
+    defaultMessage: 'register a license',
+  });
+
+  const trialLicense = i18n.translate('xpack.searchProfiler.trialLicenseTitle', {
+    defaultMessage: 'Trial',
+  });
+
+  const basicLicense = i18n.translate('xpack.searchProfiler.basicLicenseTitle', {
+    defaultMessage: 'Basic',
+  });
+
+  const goldLicense = i18n.translate('xpack.searchProfiler.goldLicenseTitle', {
+    defaultMessage: 'Gold',
+  });
+
+  const platinumLicense = i18n.translate('xpack.searchProfiler.platinumLicenseTitle', {
+    defaultMessage: 'Platinum',
+  });
+
+  return (
+    <div className="prfDevTool__licenseWarning__container">
+      <EuiCallOut
+        title={i18n.translate('xpack.searchProfiler.licenseErrorMessageTitle', {
+          defaultMessage: 'License error',
+        })}
+        color="warning"
+        iconType="alert"
+        style={{ padding: '16px' }}
+      >
+        <EuiText size="s">
+          <p>
+            <FormattedMessage
+              id="xpack.searchProfiler.licenseErrorMessageDescription"
+              defaultMessage="The Profiler Visualization requires an active license ({licenseTypeList} or {platinumLicenseType}), but none were found in your cluster."
+              values={{
+                licenseTypeList: (
+                  <>
+                    <EuiCode>{trialLicense}</EuiCode>, <EuiCode>{basicLicense}</EuiCode>,{' '}
+                    <EuiCode>{goldLicense}</EuiCode>
+                  </>
+                ),
+                platinumLicenseType: <EuiCode>{platinumLicense}</EuiCode>,
+              }}
+            />
+          </p>
+          <p>
+            <FormattedMessage
+              id="xpack.searchProfiler.registerLicenseDescription"
+              defaultMessage="Please {registerLicenseLink} to continue using the Search Profiler"
+              values={{
+                registerLicenseLink: (
+                  <EuiLink href="https://www.elastic.co/subscriptions" rel="noopener">
+                    {registerLicenseLinkLabel}
+                  </EuiLink>
+                ),
+              }}
+            />
+          </p>
+        </EuiText>
+      </EuiCallOut>
+    </div>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/percentage_badge.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/percentage_badge.tsx
new file mode 100644
index 00000000000000..4b53b2e3c18c56
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/percentage_badge.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiBadge } from '@elastic/eui';
+import classNames from 'classnames';
+
+interface Props {
+  timePercentage: number;
+  label: string;
+  valueType?: 'percent' | 'time';
+}
+
+/**
+ * This component has IE specific provision for rendering the percentage portion of the badge correctly.
+ *
+ * This component uses CSS vars injected against the DOM element and resolves this in CSS to calculate
+ * how far the percent bar should be drawn.
+ */
+export const PercentageBadge = ({ timePercentage, label, valueType = 'percent' }: Props) => {
+  return (
+    <EuiBadge
+      className={classNames({
+        'prfDevTool__percentBadge__progress--percent': valueType === 'percent',
+        'prfDevTool__percentBadge__progress--time': valueType === 'time',
+        'euiTextAlign--center': true,
+      })}
+      style={{ '--prfDevToolProgressPercentage': timePercentage + '%' } as any}
+    >
+      <span className="prfDevTool__progress--percent-ie" style={{ width: timePercentage + '%' }} />
+      <span className="prfDevTool__progressText">{label}</span>
+    </EuiBadge>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/breakdown.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/breakdown.ts
new file mode 100644
index 00000000000000..a65af9a7a3ff3e
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/breakdown.ts
@@ -0,0 +1,68 @@
+export const breakdown = {
+  advance: 0,
+  advance_count: 0,
+  build_scorer: 6273,
+  build_scorer_count: 2,
+  create_weight: 1852,
+  create_weight_count: 1,
+  match: 0,
+  match_count: 0,
+  next_doc: 2593093,
+  next_doc_count: 27958,
+  score: 2525502,
+  score_count: 27948,
+};
+
+export const normalized = [
+  {
+    key: 'next_doc',
+    time: 2593093,
+    relative: '50.6',
+    color: '#fad2d2',
+    tip: 'The time taken to advance the iterator to the next matching document.',
+  },
+  {
+    key: 'score',
+    time: 2525502,
+    relative: '49.3',
+    color: '#fad2d2',
+    tip: 'The time taken in actually scoring the document against the query.',
+  },
+  { key: 'next_doc_count', time: 27958, relative: 0, color: '#f5f5f5', tip: '' },
+  { key: 'score_count', time: 27948, relative: 0, color: '#f5f5f5', tip: '' },
+  {
+    key: 'build_scorer',
+    time: 6273,
+    relative: '0.1',
+    color: '#f5f5f5',
+    tip:
+      'The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc.',
+  },
+  {
+    key: 'create_weight',
+    time: 1852,
+    relative: '0.0',
+    color: '#f5f5f5',
+    tip:
+      'The time taken to create the Weight object, which holds temporary information during scoring.',
+  },
+  { key: 'build_scorer_count', time: 2, relative: 0, color: '#f5f5f5', tip: '' },
+  { key: 'create_weight_count', time: 1, relative: 0, color: '#f5f5f5', tip: '' },
+  {
+    key: 'advance',
+    time: 0,
+    relative: '0.0',
+    color: '#f5f5f5',
+    tip: 'The time taken to advance the iterator to the next document.',
+  },
+  { key: 'advance_count', time: 0, relative: 0, color: '#f5f5f5', tip: '' },
+  {
+    key: 'match',
+    time: 0,
+    relative: '0.0',
+    color: '#f5f5f5',
+    tip:
+      'The time taken to execute a secondary, more precise scoring phase (used by phrase queries).',
+  },
+  { key: 'match_count', time: 0, relative: 0, color: '#f5f5f5', tip: '' },
+];
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/normalize_indices.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/normalize_indices.ts
new file mode 100644
index 00000000000000..bd8e44d82379ba
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/normalize_indices.ts
@@ -0,0 +1,8 @@
+/*eslint-disable */
+export const inputIndices = JSON.parse(
+  '{"test":{"shards":[{"id":["F-R7QxH4S42fMnPfmFUKMQ","test","0"],"searches":[{"query":null,"rewrite_time":2656,"collector":[{"name":"MultiCollector","reason":"search_multi","time":"0.1815780000ms","children":[{"name":"SimpleTopScoreDocCollector","reason":"search_top_hits","time":"0.02393700000ms"},{"name":"ProfilingAggregator: [org.elasticsearch.search.profile.aggregation.ProfilingAggregator@43c8a536]","reason":"aggregation","time":"0.1140000000ms"}]}],"flat":[{"id":"af697413-f76b-458e-b265-f4930dbdee2a","childrenIds":[],"lucene":"name:george","time":0.219343,"selfTime":0.219343,"timePercentage":"100.00","query_type":"TermQuery","absoluteColor":"#ffafaf","depth":0,"breakdown":[{"key":"create_weight","time":160673,"relative":"73.3","color":"#fcc2c2","tip":"The time taken to create the Weight object, which holds temporary information during scoring."},{"key":"build_scorer","time":50157,"relative":"22.9","color":"#f7e5e5","tip":"The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc."},{"key":"score","time":5783,"relative":"2.6","color":"#f5f3f3","tip":"The time taken in actually scoring the document against the query."},{"key":"next_doc","time":2718,"relative":"1.2","color":"#f5f4f4","tip":"The time taken to advance the iterator to the next matching document."},{"key":"build_scorer_count","time":5,"relative":0,"color":"#f5f5f5","tip":""},{"key":"next_doc_count","time":4,"relative":0,"color":"#f5f5f5","tip":""},{"key":"score_count","time":2,"relative":0,"color":"#f5f5f5","tip":""},{"key":"create_weight_count","time":1,"relative":0,"color":"#f5f5f5","tip":""},{"key":"match","time":0,"relative":"0.0","color":"#f5f5f5","tip":"The time taken to execute a secondary, more precise scoring phase (used by phrase queries)."},{"key":"match_count","time":0,"relative":0,"color":"#f5f5f5","tip":""},{"key":"advance","time":0,"relative":"0.0","color":"#f5f5f5","tip":"The time taken to advance the iterator to the next document."},{"key":"advance_count","time":0,"relative":0,"color":"#f5f5f5","tip":""}]}]}],"aggregations":[{"type":"org.elasticsearch.search.aggregations.metrics.stats.StatsAggregator","description":"stats","time":"0.03053500000ms","breakdown":{"reduce":0,"build_aggregation":9447,"build_aggregation_count":1,"initialize":5589,"initialize_count":1,"reduce_count":0,"collect":15495,"collect_count":2}}],"time":0.219343,"color":0,"relative":0,"rewrite_time":2656}],"time":0.219343,"name":"test"}}'
+);
+
+export const normalizedIndices = JSON.parse(
+  '[{"shards":[{"id":["F-R7QxH4S42fMnPfmFUKMQ","test","0"],"searches":[{"query":null,"rewrite_time":2656,"collector":[{"name":"MultiCollector","reason":"search_multi","time":"0.1815780000ms","children":[{"name":"SimpleTopScoreDocCollector","reason":"search_top_hits","time":"0.02393700000ms"},{"name":"ProfilingAggregator: [org.elasticsearch.search.profile.aggregation.ProfilingAggregator@43c8a536]","reason":"aggregation","time":"0.1140000000ms"}]}],"flat":[{"id":"af697413-f76b-458e-b265-f4930dbdee2a","childrenIds":[],"lucene":"name:george","time":0.219343,"selfTime":0.219343,"timePercentage":"100.00","query_type":"TermQuery","absoluteColor":"#ffafaf","depth":0,"breakdown":[{"key":"create_weight","time":160673,"relative":"73.3","color":"#fcc2c2","tip":"The time taken to create the Weight object, which holds temporary information during scoring."},{"key":"build_scorer","time":50157,"relative":"22.9","color":"#f7e5e5","tip":"The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc."},{"key":"score","time":5783,"relative":"2.6","color":"#f5f3f3","tip":"The time taken in actually scoring the document against the query."},{"key":"next_doc","time":2718,"relative":"1.2","color":"#f5f4f4","tip":"The time taken to advance the iterator to the next matching document."},{"key":"build_scorer_count","time":5,"relative":0,"color":"#f5f5f5","tip":""},{"key":"next_doc_count","time":4,"relative":0,"color":"#f5f5f5","tip":""},{"key":"score_count","time":2,"relative":0,"color":"#f5f5f5","tip":""},{"key":"create_weight_count","time":1,"relative":0,"color":"#f5f5f5","tip":""},{"key":"match","time":0,"relative":"0.0","color":"#f5f5f5","tip":"The time taken to execute a secondary, more precise scoring phase (used by phrase queries)."},{"key":"match_count","time":0,"relative":0,"color":"#f5f5f5","tip":""},{"key":"advance","time":0,"relative":"0.0","color":"#f5f5f5","tip":"The time taken to advance the iterator to the next document."},{"key":"advance_count","time":0,"relative":0,"color":"#f5f5f5","tip":""}]}]}],"aggregations":[{"type":"org.elasticsearch.search.aggregations.metrics.stats.StatsAggregator","description":"stats","time":"0.03053500000ms","breakdown":{"reduce":0,"build_aggregation":9447,"build_aggregation_count":1,"initialize":5589,"initialize_count":1,"reduce_count":0,"collect":15495,"collect_count":2}}],"time":0.219343,"color":"#ffafaf","relative":"100.00","rewrite_time":2656}],"time":0.219343,"name":"test"}]'
+);
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/normalize_times.js b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/normalize_times.ts
similarity index 100%
rename from x-pack/legacy/plugins/searchprofiler/public/directives/profile_tree/__tests__/fixtures/normalize_times.js
rename to x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/normalize_times.ts
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/processed_search_response.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/processed_search_response.ts
new file mode 100644
index 00000000000000..ede36ba2b01699
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/processed_search_response.ts
@@ -0,0 +1,344 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { produce } from 'immer';
+
+const shard1 = {
+  id: ['L22w_FX2SbqlQYOP5QrYDg', '.kibana_1', '0'],
+  searches: [],
+  aggregations: [],
+  time: 0.058419,
+  color: '#ffafaf',
+  relative: '100.00',
+  rewrite_time: 14670,
+};
+
+const searchRoot = {
+  query: null,
+  rewrite_time: 14670,
+  collector: [
+    {
+      name: 'CancellableCollector',
+      reason: 'search_cancelled',
+      time_in_nanos: 14706,
+      children: [
+        {
+          name: 'SimpleTopScoreDocCollector',
+          reason: 'search_top_hits',
+          time_in_nanos: 7851,
+        },
+      ],
+    },
+  ],
+  treeRoot: null,
+};
+
+const search1 = {
+  type: 'ConstantScoreQuery',
+  description: 'ConstantScore(DocValuesFieldExistsQuery [field=_primary_term])',
+  time_in_nanos: 58419,
+  breakdown: [
+    {
+      key: 'build_scorer',
+      time: 40061,
+      relative: '68.7',
+      color: '#fcc5c5',
+      tip:
+        'The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc.',
+    },
+    {
+      key: 'create_weight',
+      time: 8238,
+      relative: '14.1',
+      color: '#f6ebeb',
+      tip:
+        'The time taken to create the Weight object, which holds temporary information during scoring.',
+    },
+    {
+      key: 'next_doc',
+      time: 5767,
+      relative: '9.9',
+      color: '#f6eeee',
+      tip: 'The time taken to advance the iterator to the next matching document.',
+    },
+    {
+      key: 'advance',
+      time: 2849,
+      relative: '4.9',
+      color: '#f5f2f2',
+      tip: 'The time taken to advance the iterator to the next document.',
+    },
+    {
+      key: 'score',
+      time: 1431,
+      relative: '2.5',
+      color: '#f5f3f3',
+      tip: 'The time taken in actually scoring the document against the query.',
+    },
+    {
+      key: 'next_doc_count',
+      time: 24,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'score_count',
+      time: 24,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'build_scorer_count',
+      time: 16,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'advance_count',
+      time: 8,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'create_weight_count',
+      time: 1,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'compute_max_score',
+      time: 0,
+      relative: '0.0',
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'compute_max_score_count',
+      time: 0,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'match',
+      time: 0,
+      relative: '0.0',
+      color: '#f5f5f5',
+      tip:
+        'The time taken to execute a secondary, more precise scoring phase (used by phrase queries).',
+    },
+    {
+      key: 'match_count',
+      time: 0,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'set_min_competitive_score',
+      time: 0,
+      relative: '0.0',
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'set_min_competitive_score_count',
+      time: 0,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'shallow_advance',
+      time: 0,
+      relative: '0.0',
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'shallow_advance_count',
+      time: 0,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+  ],
+  children: [
+    /* See search1Child */
+  ],
+  hasChildren: true,
+  selfTime: 0.028784999999999998,
+  timePercentage: '100.00',
+  absoluteColor: '#ffafaf',
+  depth: 0,
+  parent: null,
+  time: 0.058419,
+  lucene: 'ConstantScore(DocValuesFieldExistsQuery [field=_primary_term])',
+  query_type: 'ConstantScoreQuery',
+  visible: true,
+};
+
+const search1Child = {
+  type: 'DocValuesFieldExistsQuery',
+  description: 'DocValuesFieldExistsQuery [field=_primary_term]',
+  time_in_nanos: 29634,
+  breakdown: [
+    {
+      key: 'build_scorer',
+      time: 24059,
+      relative: '81.3',
+      color: '#fdbcbc',
+      tip:
+        'The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc.',
+    },
+    {
+      key: 'next_doc',
+      time: 2434,
+      relative: '8.2',
+      color: '#f6efef',
+      tip: 'The time taken to advance the iterator to the next matching document.',
+    },
+    {
+      key: 'create_weight',
+      time: 1586,
+      relative: '5.4',
+      color: '#f6f1f1',
+      tip:
+        'The time taken to create the Weight object, which holds temporary information during scoring.',
+    },
+    {
+      key: 'advance',
+      time: 1506,
+      relative: '5.1',
+      color: '#f6f1f1',
+      tip: 'The time taken to advance the iterator to the next document.',
+    },
+    {
+      key: 'next_doc_count',
+      time: 24,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'build_scorer_count',
+      time: 16,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'advance_count',
+      time: 8,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'create_weight_count',
+      time: 1,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'compute_max_score',
+      time: 0,
+      relative: '0.0',
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'compute_max_score_count',
+      time: 0,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'match',
+      time: 0,
+      relative: '0.0',
+      color: '#f5f5f5',
+      tip:
+        'The time taken to execute a secondary, more precise scoring phase (used by phrase queries).',
+    },
+    {
+      key: 'match_count',
+      time: 0,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'score',
+      time: 0,
+      relative: '0.0',
+      color: '#f5f5f5',
+      tip: 'The time taken in actually scoring the document against the query.',
+    },
+    {
+      key: 'score_count',
+      time: 0,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'set_min_competitive_score',
+      time: 0,
+      relative: '0.0',
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'set_min_competitive_score_count',
+      time: 0,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'shallow_advance',
+      time: 0,
+      relative: '0.0',
+      color: '#f5f5f5',
+      tip: '',
+    },
+    {
+      key: 'shallow_advance_count',
+      time: 0,
+      relative: 0,
+      color: '#f5f5f5',
+      tip: '',
+    },
+  ],
+  selfTime: 0.029634,
+  timePercentage: '50.73',
+  absoluteColor: '#fad1d1',
+  depth: 1,
+  parent: search1,
+  time: 0.029634,
+  lucene: 'DocValuesFieldExistsQuery [field=_primary_term]',
+  query_type: 'DocValuesFieldExistsQuery',
+  visible: true,
+};
+(search1.children[0] as any) = search1Child;
+(searchRoot.treeRoot as any) = search1;
+(shard1.searches[0] as any) = searchRoot;
+
+export const processedResponseWithFirstShard = produce<any>(null, () => [
+  {
+    shards: [shard1],
+    time: 0.058419,
+    name: '.kibana_1',
+    visible: false,
+  },
+]);
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/search_response.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/search_response.ts
new file mode 100644
index 00000000000000..b4483cc0fc58e0
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/fixtures/search_response.ts
@@ -0,0 +1,308 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 searchResponse: any = [
+  {
+    id: '[L22w_FX2SbqlQYOP5QrYDg] [.apm-agent-configuration] [0]',
+    searches: [
+      {
+        query: [
+          {
+            type: 'MatchAllDocsQuery',
+            description: '*:*',
+            time_in_nanos: 1971,
+            breakdown: {
+              set_min_competitive_score_count: 0,
+              match_count: 0,
+              shallow_advance_count: 0,
+              set_min_competitive_score: 0,
+              next_doc: 0,
+              match: 0,
+              next_doc_count: 0,
+              score_count: 0,
+              compute_max_score_count: 0,
+              compute_max_score: 0,
+              advance: 0,
+              advance_count: 0,
+              score: 0,
+              build_scorer_count: 0,
+              create_weight: 1970,
+              shallow_advance: 0,
+              create_weight_count: 1,
+              build_scorer: 0,
+            },
+          },
+        ],
+        rewrite_time: 908,
+        collector: [
+          {
+            name: 'CancellableCollector',
+            reason: 'search_cancelled',
+            time_in_nanos: 1176,
+            children: [
+              { name: 'SimpleTopScoreDocCollector', reason: 'search_top_hits', time_in_nanos: 517 },
+            ],
+          },
+        ],
+      },
+    ],
+    aggregations: [],
+  },
+  {
+    id: '[L22w_FX2SbqlQYOP5QrYDg] [.kibana_1] [0]',
+    searches: [
+      {
+        query: [
+          {
+            type: 'ConstantScoreQuery',
+            description: 'ConstantScore(DocValuesFieldExistsQuery [field=_primary_term])',
+            time_in_nanos: 58419,
+            breakdown: {
+              set_min_competitive_score_count: 0,
+              match_count: 0,
+              shallow_advance_count: 0,
+              set_min_competitive_score: 0,
+              next_doc: 5767,
+              match: 0,
+              next_doc_count: 24,
+              score_count: 24,
+              compute_max_score_count: 0,
+              compute_max_score: 0,
+              advance: 2849,
+              advance_count: 8,
+              score: 1431,
+              build_scorer_count: 16,
+              create_weight: 8238,
+              shallow_advance: 0,
+              create_weight_count: 1,
+              build_scorer: 40061,
+            },
+            children: [
+              {
+                type: 'DocValuesFieldExistsQuery',
+                description: 'DocValuesFieldExistsQuery [field=_primary_term]',
+                time_in_nanos: 29634,
+                breakdown: {
+                  set_min_competitive_score_count: 0,
+                  match_count: 0,
+                  shallow_advance_count: 0,
+                  set_min_competitive_score: 0,
+                  next_doc: 2434,
+                  match: 0,
+                  next_doc_count: 24,
+                  score_count: 0,
+                  compute_max_score_count: 0,
+                  compute_max_score: 0,
+                  advance: 1506,
+                  advance_count: 8,
+                  score: 0,
+                  build_scorer_count: 16,
+                  create_weight: 1586,
+                  shallow_advance: 0,
+                  create_weight_count: 1,
+                  build_scorer: 24059,
+                },
+              },
+            ],
+          },
+        ],
+        rewrite_time: 14670,
+        collector: [
+          {
+            name: 'CancellableCollector',
+            reason: 'search_cancelled',
+            time_in_nanos: 14706,
+            children: [
+              {
+                name: 'SimpleTopScoreDocCollector',
+                reason: 'search_top_hits',
+                time_in_nanos: 7851,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+    aggregations: [],
+  },
+  {
+    id: '[L22w_FX2SbqlQYOP5QrYDg] [.kibana_task_manager_1] [0]',
+    searches: [
+      {
+        query: [
+          {
+            type: 'ConstantScoreQuery',
+            description: 'ConstantScore(DocValuesFieldExistsQuery [field=_primary_term])',
+            time_in_nanos: 30013,
+            breakdown: {
+              set_min_competitive_score_count: 0,
+              match_count: 0,
+              shallow_advance_count: 0,
+              set_min_competitive_score: 0,
+              next_doc: 1497,
+              match: 0,
+              next_doc_count: 5,
+              score_count: 3,
+              compute_max_score_count: 0,
+              compute_max_score: 0,
+              advance: 1058,
+              advance_count: 3,
+              score: 309,
+              build_scorer_count: 6,
+              create_weight: 6727,
+              shallow_advance: 0,
+              create_weight_count: 1,
+              build_scorer: 20404,
+            },
+            children: [
+              {
+                type: 'DocValuesFieldExistsQuery',
+                description: 'DocValuesFieldExistsQuery [field=_primary_term]',
+                time_in_nanos: 19795,
+                breakdown: {
+                  set_min_competitive_score_count: 0,
+                  match_count: 0,
+                  shallow_advance_count: 0,
+                  set_min_competitive_score: 0,
+                  next_doc: 600,
+                  match: 0,
+                  next_doc_count: 5,
+                  score_count: 0,
+                  compute_max_score_count: 0,
+                  compute_max_score: 0,
+                  advance: 378,
+                  advance_count: 3,
+                  score: 0,
+                  build_scorer_count: 6,
+                  create_weight: 1121,
+                  shallow_advance: 0,
+                  create_weight_count: 1,
+                  build_scorer: 17681,
+                },
+              },
+            ],
+          },
+        ],
+        rewrite_time: 10713,
+        collector: [
+          {
+            name: 'CancellableCollector',
+            reason: 'search_cancelled',
+            time_in_nanos: 4924,
+            children: [
+              {
+                name: 'SimpleTopScoreDocCollector',
+                reason: 'search_top_hits',
+                time_in_nanos: 2223,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+    aggregations: [],
+  },
+  {
+    id: '[L22w_FX2SbqlQYOP5QrYDg] [.security-7] [0]',
+    searches: [
+      {
+        query: [
+          {
+            type: 'MatchAllDocsQuery',
+            description: '*:*',
+            time_in_nanos: 13254,
+            breakdown: {
+              set_min_competitive_score_count: 6,
+              match_count: 0,
+              shallow_advance_count: 0,
+              set_min_competitive_score: 3016,
+              next_doc: 1442,
+              match: 0,
+              next_doc_count: 10,
+              score_count: 10,
+              compute_max_score_count: 0,
+              compute_max_score: 0,
+              advance: 1313,
+              advance_count: 6,
+              score: 1169,
+              build_scorer_count: 12,
+              create_weight: 1132,
+              shallow_advance: 0,
+              create_weight_count: 1,
+              build_scorer: 5137,
+            },
+          },
+        ],
+        rewrite_time: 755,
+        collector: [
+          {
+            name: 'CancellableCollector',
+            reason: 'search_cancelled',
+            time_in_nanos: 18172,
+            children: [
+              {
+                name: 'SimpleTopScoreDocCollector',
+                reason: 'search_top_hits',
+                time_in_nanos: 12507,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+    aggregations: [],
+  },
+  {
+    id: '[L22w_FX2SbqlQYOP5QrYDg] [kibana_sample_data_logs] [0]',
+    searches: [
+      {
+        query: [
+          {
+            type: 'MatchAllDocsQuery',
+            description: '*:*',
+            time_in_nanos: 12764,
+            breakdown: {
+              set_min_competitive_score_count: 4,
+              match_count: 0,
+              shallow_advance_count: 0,
+              set_min_competitive_score: 2685,
+              next_doc: 1831,
+              match: 0,
+              next_doc_count: 10,
+              score_count: 10,
+              compute_max_score_count: 0,
+              compute_max_score: 0,
+              advance: 1621,
+              advance_count: 4,
+              score: 835,
+              build_scorer_count: 8,
+              create_weight: 972,
+              shallow_advance: 0,
+              create_weight_count: 1,
+              build_scorer: 4783,
+            },
+          },
+        ],
+        rewrite_time: 691,
+        collector: [
+          {
+            name: 'CancellableCollector',
+            reason: 'search_cancelled',
+            time_in_nanos: 17700,
+            children: [
+              {
+                name: 'SimpleTopScoreDocCollector',
+                reason: 'search_top_hits',
+                time_in_nanos: 12839,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+    aggregations: [],
+  },
+];
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/init_data.test.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/init_data.test.ts
new file mode 100644
index 00000000000000..6cd19947a26bc3
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/init_data.test.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ShardSerialized } from '../../../types';
+import { initDataFor } from '../init_data';
+
+import { searchResponse } from './fixtures/search_response';
+import { processedResponseWithFirstShard } from './fixtures/processed_search_response';
+
+describe('ProfileTree init data', () => {
+  test('provides the expected result', () => {
+    const input: ShardSerialized[] = searchResponse as any;
+    const actual = initDataFor('searches')(input);
+
+    expect(actual[0].name).toEqual(processedResponseWithFirstShard[0].name);
+    const expectedFirstShard = processedResponseWithFirstShard[0].shards[0];
+    expect(actual[0].shards[0]).toEqual(expectedFirstShard);
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/profile_tree.test.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/profile_tree.test.tsx
new file mode 100644
index 00000000000000..ca95ac97e260a9
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/profile_tree.test.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { registerTestBed } from '../../../../../../../../../test_utils';
+import { searchResponse } from './fixtures/search_response';
+import { ProfileTree, Props } from '../profile_tree';
+
+describe('ProfileTree', () => {
+  it('renders', async () => {
+    const props: Props = {
+      onHighlight: () => {},
+      target: 'searches',
+      data: searchResponse,
+    };
+    const init = registerTestBed(ProfileTree);
+    await init(props);
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/unsafe_utils.test.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/unsafe_utils.test.ts
new file mode 100644
index 00000000000000..17c7051f09769c
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/unsafe_utils.test.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import * as util from '../unsafe_utils';
+import { normalized, breakdown } from './fixtures/breakdown';
+import { inputTimes, normalizedTimes } from './fixtures/normalize_times';
+import { inputIndices, normalizedIndices } from './fixtures/normalize_indices';
+
+describe('normalizeBreakdown', function() {
+  it('returns correct breakdown', function() {
+    const result = util.normalizeBreakdown(breakdown);
+    expect(result).to.eql(normalized);
+  });
+});
+
+describe('normalizeTimes', function() {
+  it('returns correct normalization', function() {
+    const totalTime = 0.447365;
+
+    // Deep clone the object to preserve the original
+    const input = JSON.parse(JSON.stringify(inputTimes));
+    util.normalizeTimes(input, totalTime, 0);
+
+    // Modifies in place, so inputTimes will change
+    expect(input).to.eql(normalizedTimes);
+  });
+});
+
+describe('normalizeIndices', function() {
+  it('returns correct ordering', function() {
+    // Deep clone the object to preserve the original
+    const input = JSON.parse(JSON.stringify(inputIndices));
+    util.normalizeIndices(input, 'searches');
+    const result = util.sortIndices(input);
+    expect(result).to.eql(normalizedIndices);
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/utils.test.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/utils.test.ts
new file mode 100644
index 00000000000000..3a3d606434241a
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/__tests__/utils.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 { hasVisibleChild } from '../utils';
+
+describe('Profile Tree utils', () => {
+  describe('#hasVisibleChild', () => {
+    it('base case no children', () => {
+      const op: any = { children: [] };
+      expect(hasVisibleChild(op)).toBe(false);
+    });
+
+    it('base case with children', () => {
+      const op: any = { children: [{ visible: false }, { visible: false }, { visible: true }] };
+      expect(hasVisibleChild(op)).toBe(true);
+    });
+
+    it('is robust', () => {
+      const op: any = {};
+      expect(hasVisibleChild(op)).toBe(false);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/highlight_context.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/highlight_context.tsx
new file mode 100644
index 00000000000000..f781d01352f854
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/highlight_context.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, createContext, useState } from 'react';
+import { Operation, Shard } from '../../types';
+
+const HighlightContext = createContext<{
+  selectedRow: string;
+  setStore: (args: OnHighlightChangeArgs & { id: string }) => void;
+}>(null as any);
+
+export interface OnHighlightChangeArgs {
+  indexName: string;
+  shard: Shard;
+  operation: Operation;
+}
+
+type OnHighlightChangeHandler = (data: OnHighlightChangeArgs) => void;
+
+export const HighlightContextProvider = ({
+  children,
+  onHighlight,
+}: {
+  children: React.ReactNode;
+  onHighlight: OnHighlightChangeHandler;
+}) => {
+  const [selectedRow, setSelectedRow] = useState<string>('');
+  return (
+    <HighlightContext.Provider
+      value={{
+        selectedRow,
+        setStore: ({ id, ...onHighlightChangeArgs }: OnHighlightChangeArgs & { id: string }) => {
+          onHighlight(onHighlightChangeArgs);
+          setSelectedRow(id);
+        },
+      }}
+    >
+      {children}
+    </HighlightContext.Provider>
+  );
+};
+
+export const useHighlightContext = () => {
+  const ctx = useContext(HighlightContext);
+  if (ctx == null) {
+    throw new Error(`useHighlightContext must be called inside HighlightContext`);
+  }
+  return ctx;
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/index.ts
new file mode 100644
index 00000000000000..78efd2cb6687f0
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/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 { ProfileTree } from './profile_tree';
+export { OnHighlightChangeArgs } from './highlight_context';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/index_details.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/index_details.tsx
new file mode 100644
index 00000000000000..20ea7c636ee74f
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/index_details.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 { i18n } from '@kbn/i18n';
+import { EuiText, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+import { msToPretty } from '../../utils';
+import { Index } from '../../types';
+
+export interface Props {
+  index: Index;
+}
+
+export const IndexDetails = ({ index }: Props) => {
+  const { time, name } = index;
+  return (
+    <EuiFlexGroup justifyContent="spaceBetween" gutterSize="none" direction="row">
+      {/* Index Title group */}
+      <EuiFlexItem grow={false}>
+        <EuiText className="prfDevTool__profileTree__shardDetails">
+          <h3>
+            <b>
+              {i18n.translate('xpack.searchProfiler.profileTree.indexTitle', {
+                defaultMessage: 'Index:',
+              })}
+            </b>
+            {' ' + name}
+          </h3>
+        </EuiText>
+      </EuiFlexItem>
+      {/* Time details group */}
+      <EuiFlexItem grow={false} className="prfDevTool__profileTree__indexDetails">
+        <EuiText className="prfDevTool__profileTree__shardDetails--dim">
+          <EuiToolTip
+            position="bottom"
+            content={i18n.translate('xpack.searchProfiler.profileTree.cumulativeTimeTooltip', {
+              defaultMessage:
+                'The cumulative time of all shards in the index. Note: this is not wall-clock time, as shards can execute in parallel.',
+            })}
+          >
+            <small>
+              {i18n.translate('xpack.searchProfiler.profileTree.cumulativeTimeTitle', {
+                defaultMessage: 'Cumulative time:',
+              })}
+            </small>
+          </EuiToolTip>
+          {' ' + msToPretty(time, 3)}
+        </EuiText>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/init_data.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/init_data.ts
new file mode 100644
index 00000000000000..d7990b1204b217
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/init_data.ts
@@ -0,0 +1,114 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { produce } from 'immer';
+import { flow } from 'fp-ts/lib/function';
+import { Targets, Shard, ShardSerialized } from '../../types';
+import { calcTimes, normalizeTimes, initTree, normalizeIndices, sortIndices } from './unsafe_utils';
+import { IndexMap } from './types';
+
+/**
+ * Functions prefixed with "mutate" change values by reference. Be careful when using these!
+ *
+ * It's recommended to us immer's `produce` functions to ensure immutability.
+ */
+
+export function mutateAggsTimesTree(shard: Shard) {
+  if (shard.aggregations == null) {
+    shard.time = 0;
+  }
+  let shardTime = 0;
+  for (const agg of shard.aggregations!) {
+    const totalTime = calcTimes([agg]);
+    shardTime += totalTime;
+  }
+  for (const agg of shard.aggregations!) {
+    normalizeTimes([agg], shardTime, 0);
+    initTree([agg], 0);
+  }
+  shard.time = shardTime;
+}
+
+export function mutateSearchTimesTree(shard: Shard) {
+  if (shard.searches == null) {
+    shard.time = 0;
+  }
+  shard.rewrite_time = 0;
+
+  let shardTime = 0;
+  for (const search of shard.searches!) {
+    shard.rewrite_time += search.rewrite_time!;
+    const totalTime = calcTimes(search.query!);
+    shardTime += totalTime;
+    normalizeTimes(search.query!, totalTime, 0);
+    initTree(search.query!, 0);
+    search.treeRoot = search.query![0];
+    search.query = null as any;
+  }
+  shard.time = shardTime;
+}
+
+const initShards = (data: ShardSerialized[]) =>
+  produce<ShardSerialized[], Shard[]>(data, draft => {
+    return draft.map(s => {
+      const idMatch = s.id.match(/\[([^\]\[]*?)\]/g) || [];
+      const ids = idMatch.map(id => {
+        return id.replace('[', '').replace(']', '');
+      });
+      return {
+        ...s,
+        id: ids,
+        time: 0,
+        color: '',
+        relative: 0,
+      };
+    });
+  });
+
+export const calculateShardValues = (target: Targets) => (data: Shard[]) =>
+  produce<Shard[]>(data, draft => {
+    for (const shard of draft) {
+      if (target === 'searches') {
+        mutateSearchTimesTree(shard);
+      } else if (target === 'aggregations') {
+        mutateAggsTimesTree(shard);
+      }
+    }
+  });
+
+export const initIndices = (data: Shard[]) =>
+  produce<Shard[], IndexMap>(data, doNotChange => {
+    const indices: IndexMap = {};
+
+    for (const shard of doNotChange) {
+      if (!indices[shard.id[1]]) {
+        indices[shard.id[1]] = {
+          shards: [],
+          time: 0,
+          name: shard.id[1],
+          visible: false,
+        };
+      }
+      indices[shard.id[1]].shards.push(shard);
+      indices[shard.id[1]].time += shard.time;
+    }
+
+    return indices;
+  });
+
+export const normalize = (target: Targets) => (data: IndexMap) =>
+  produce<IndexMap>(data, draft => {
+    normalizeIndices(draft, target);
+  });
+
+export const initDataFor = (target: Targets) =>
+  flow(
+    initShards,
+    calculateShardValues(target),
+    initIndices,
+    normalize(target),
+    sortIndices
+  );
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/profile_tree.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/profile_tree.tsx
new file mode 100644
index 00000000000000..ea24abbdb56db2
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/profile_tree.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+
+import { IndexDetails } from './index_details';
+import { ShardDetails } from './shard_details';
+import { initDataFor } from './init_data';
+import { Targets, ShardSerialized } from '../../types';
+import { HighlightContextProvider, OnHighlightChangeArgs } from './highlight_context';
+
+export interface Props {
+  target: Targets;
+  data: ShardSerialized[] | null;
+  onHighlight: (args: OnHighlightChangeArgs) => void;
+}
+
+export const ProfileTree = memo(({ data, target, onHighlight }: Props) => {
+  if (!data || data.length === 0) {
+    return null;
+  }
+
+  const sortedIndices = initDataFor(target)(data);
+
+  return (
+    <HighlightContextProvider onHighlight={onHighlight}>
+      <EuiFlexGroup
+        className="prfDevTool__profileTree__container"
+        gutterSize="none"
+        direction="column"
+      >
+        {sortedIndices.map(index => (
+          <EuiFlexItem key={index.name} grow={false}>
+            <EuiFlexGroup
+              className="prfDevTool__profileTree__panel prfDevTool__profileTree__index"
+              gutterSize="none"
+              key={index.name}
+              direction="column"
+            >
+              <EuiFlexItem grow={false}>
+                <IndexDetails index={index} />
+              </EuiFlexItem>
+              <EuiSpacer size="s" />
+              <EuiFlexItem grow={false}>
+                {index.shards.map(shard => (
+                  <ShardDetails
+                    key={shard.id[1]}
+                    index={index}
+                    shard={shard}
+                    operations={shard[target]!}
+                  />
+                ))}
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        ))}
+      </EuiFlexGroup>
+    </HighlightContextProvider>
+  );
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/index.ts
new file mode 100644
index 00000000000000..ea9874d559b378
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ShardDetails } from './shard_details';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/shard_details.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/shard_details.tsx
new file mode 100644
index 00000000000000..eca2d1994f8c56
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/shard_details.tsx
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiText, EuiLink, EuiIcon } from '@elastic/eui';
+
+import { Index, Operation, Shard } from '../../../types';
+import { msToPretty } from '../../../utils';
+import { ShardDetailTree } from './shard_details_tree';
+import { PercentageBadge } from '../../percentage_badge';
+
+interface Props {
+  index: Index;
+  shard: Shard;
+  operations: Operation[];
+}
+
+export const ShardDetails = ({ index, shard, operations }: Props) => {
+  const { relative, time } = shard;
+
+  const [shardVisibility, setShardVisibility] = useState<boolean>(false);
+
+  return (
+    <>
+      <EuiFlexGroup justifyContent="spaceBetween" gutterSize="none" direction="row">
+        <EuiFlexItem grow={false} className="prfDevTool__profileTree__shard__header-flex-item">
+          <EuiLink
+            className="prfDevTool__profileTree__shardDetails"
+            onClick={() => setShardVisibility(!shardVisibility)}
+          >
+            <EuiIcon type={shardVisibility ? 'arrowDown' : 'arrowRight'} />[{shard.id[0]}][
+            {shard.id[2]}]
+          </EuiLink>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false} className="prfDevTool__profileTree__shard__header-flex-item">
+          <EuiText className="prfDevTool__shardDetails--dim">
+            <PercentageBadge
+              timePercentage={relative as number}
+              label={msToPretty(time as number, 3)}
+              valueType={'time'}
+            />
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      {shardVisibility
+        ? operations.map((data, idx) => (
+            <ShardDetailTree key={idx} index={index} shard={shard} data={data} />
+          ))
+        : null}
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/shard_details_tree.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/shard_details_tree.tsx
new file mode 100644
index 00000000000000..d3b0a1a5a6355d
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/shard_details_tree.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiText, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { ShardDetailsTreeNode } from './shard_details_tree_node';
+import { Index, Operation, Shard } from '../../../types';
+
+export interface Props {
+  data: Operation;
+  index: Index;
+  shard: Shard;
+}
+
+export const ShardDetailTree = ({ data, index, shard }: Props) => {
+  const renderOperations = (operation: Operation): JSX.Element => {
+    const nextOperation = operation.treeRoot || operation;
+    return <ShardDetailsTreeNode shard={shard} index={index} operation={nextOperation} />;
+  };
+
+  return (
+    <div className="prfDevTool__profileTree__panelBody">
+      <EuiFlexGroup responsive={false} gutterSize="none" direction="column">
+        {/* Setting grow to false here is important for IE11. Don't change without testing first! */}
+        <EuiFlexItem grow={false}>
+          <div className="prfDevTool__profileTree__tvHeader">
+            <EuiText size="s" className="euiTextAlign--left prfDevTool__profileTree__cell">
+              {i18n.translate('xpack.searchProfiler.profileTree.header.typeTitle', {
+                defaultMessage: 'Type and description',
+              })}
+            </EuiText>
+            <EuiText
+              size="s"
+              className="prfDevTool__profileTree__cell prfDevTool__profileTree__time"
+            >
+              {i18n.translate('xpack.searchProfiler.profileTree.header.selfTimeTitle', {
+                defaultMessage: 'Self time',
+              })}
+            </EuiText>
+            <EuiText
+              size="s"
+              className="prfDevTool__profileTree__cell prfDevTool__profileTree__time"
+            >
+              {i18n.translate('xpack.searchProfiler.profileTree.header.totalTimeTitle', {
+                defaultMessage: 'Total time',
+              })}
+            </EuiText>
+            <div className="prfDevTool__profileTree__cell prfDevTool__profileTree__percentage" />
+          </div>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>{renderOperations(data)}</EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/shard_details_tree_node.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/shard_details_tree_node.tsx
new file mode 100644
index 00000000000000..75da10f8aca2ef
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/shard_details/shard_details_tree_node.tsx
@@ -0,0 +1,114 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState } from 'react';
+import { EuiLink, EuiBadge, EuiCodeBlock, EuiIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { hasVisibleChild } from '../utils';
+import { useHighlightTreeNode } from '../use_highlight_tree_node';
+import { msToPretty } from '../../../utils';
+
+import { PercentageBadge } from '../../percentage_badge';
+
+import { Index, Operation, Shard } from '../../../types';
+
+export interface Props {
+  index: Index;
+  shard: Shard;
+  operation: Operation;
+}
+
+const TAB_WIDTH_PX = 32;
+
+const limitString = (string: string, limit: number) =>
+  `${string.slice(0, limit)}${string.length > limit ? '...' : ''}`;
+
+/**
+ * This is a component that recursively iterates over data to render out a tree like
+ * structure in a flatly.
+ */
+export const ShardDetailsTreeNode = ({ operation, index, shard }: Props) => {
+  const [childrenVisible, setChildrenVisible] = useState(hasVisibleChild(operation));
+  const { highlight, isHighlighted, id } = useHighlightTreeNode();
+
+  const renderTimeRow = (op: Operation) => (
+    <div className="prfDevTool__profileTree__tvRow">
+      <div className="prfDevTool__profileTree__cell euiTextAlign--left">
+        {op.hasChildren ? (
+          <EuiLink
+            className="prfDevTool__profileTree__shardDetails"
+            disabled={!op.hasChildren}
+            onClick={() => setChildrenVisible(!childrenVisible)}
+          >
+            <EuiIcon type={childrenVisible ? 'arrowDown' : 'arrowRight'} />
+
+            {' ' + op.query_type}
+          </EuiLink>
+        ) : (
+          <>
+            <EuiIcon type="dot" />
+            {' ' + op.query_type}
+          </>
+        )}
+      </div>
+      {/* Self Time Badge */}
+      <div className="prfDevTool__profileTree__cell prfDevTool__profileTree__time euiTextAlign--center">
+        <EuiBadge
+          className="prfDevTool__profileTree__badge euiTextAlign--center"
+          style={{ backgroundColor: op.absoluteColor }}
+        >
+          {msToPretty(op.selfTime || 0, 1)}
+        </EuiBadge>
+      </div>
+      {/* Total Time Badge */}
+      <div className="prfDevTool__profileTree__cell prfDevTool__profileTree__totalTime">
+        <EuiBadge
+          className="prfDevTool__profileTree__badge euiTextAlign--center"
+          style={{ backgroundColor: op.absoluteColor }}
+        >
+          {msToPretty(op.time, 1)}
+        </EuiBadge>
+      </div>
+      {/* Time percentage Badge */}
+      <div className="prfDevTool__profileTree__cell prfDevTool__profileTree__percentage">
+        <PercentageBadge timePercentage={op.timePercentage} label={op.timePercentage + '%'} />
+      </div>
+    </div>
+  );
+
+  return (
+    <>
+      <div
+        key={id}
+        className={isHighlighted() ? 'prfDevTool__tvRow--last' : ''}
+        style={{ paddingLeft: operation.depth! * TAB_WIDTH_PX + 'px' }}
+      >
+        {renderTimeRow(operation)}
+        <div className="prfDevTool__profileTree__tvRow">
+          <span className="prfDevTool__detail">
+            <EuiCodeBlock paddingSize="none">
+              {limitString(operation.lucene || '', 120)}
+            </EuiCodeBlock>
+            <EuiLink
+              type="button"
+              onClick={() => highlight({ indexName: index.name, operation, shard })}
+            >
+              {i18n.translate('xpack.searchProfiler.profileTree.body.viewDetailsLabel', {
+                defaultMessage: 'View details',
+              })}
+            </EuiLink>
+          </span>
+        </div>
+      </div>
+      {childrenVisible &&
+        operation.hasChildren &&
+        operation.children.flatMap((childOp, idx) => (
+          <ShardDetailsTreeNode key={idx} operation={childOp} index={index} shard={shard} />
+        ))}
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/types.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/types.ts
new file mode 100644
index 00000000000000..d38e895f66bbcb
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/types.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 { Index } from '../../types';
+
+export type IndexMap = Record<string, Index>;
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/unsafe_utils.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/unsafe_utils.ts
new file mode 100644
index 00000000000000..fc21c5da37764c
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/unsafe_utils.ts
@@ -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 { produce } from 'immer';
+import { i18n } from '@kbn/i18n';
+import tinycolor from 'tinycolor2';
+import _ from 'lodash';
+
+import { BreakdownItem, Index, Operation, Shard, Targets } from '../../types';
+import { IndexMap } from './types';
+
+export const comparator = (v1: number, v2: number) => {
+  if (v1 < v2) {
+    return 1;
+  }
+  return v1 > v2 ? -1 : 0;
+};
+
+function getToolTip(key: string) {
+  switch (key) {
+    case 'build_scorer':
+      return i18n.translate('xpack.searchProfiler.buildScorerTimeDescription', {
+        defaultMessage:
+          'The time taken to create the Scoring object, which is later used to execute the actual scoring of each doc.',
+      });
+    case 'create_weight':
+      return i18n.translate('xpack.searchProfiler.createWeightTimeDescription', {
+        defaultMessage:
+          'The time taken to create the Weight object, which holds temporary information during scoring.',
+      });
+    case 'next_doc':
+      return i18n.translate('xpack.searchProfiler.nextDocTimeDescription', {
+        defaultMessage: 'The time taken to advance the iterator to the next matching document.',
+      });
+    case 'score':
+      return i18n.translate('xpack.searchProfiler.scoreTimeDescription', {
+        defaultMessage: 'The time taken in actually scoring the document against the query.',
+      });
+    case 'match':
+      return i18n.translate('xpack.searchProfiler.matchTimeDescription', {
+        defaultMessage:
+          'The time taken to execute a secondary, more precise scoring phase (used by phrase queries).',
+      });
+    case 'advance':
+      return i18n.translate('xpack.searchProfiler.advanceTimeDescription', {
+        defaultMessage: 'The time taken to advance the iterator to the next document.',
+      });
+    default:
+      return '';
+  }
+}
+
+export function timeInMilliseconds(data: any) {
+  if (data.time_in_nanos) {
+    return data.time_in_nanos / 1000000;
+  }
+
+  if (typeof data.time === 'string') {
+    return data.time.replace('ms', '');
+  }
+
+  return data.time;
+}
+
+export function calcTimes(data: any[], parentId?: string) {
+  let totalTime = 0;
+  // First pass to collect total
+  for (const child of data) {
+    totalTime += timeInMilliseconds(child);
+
+    child.breakdown = normalizeBreakdown(child.breakdown);
+
+    let childrenTime = 0;
+    if (child.children != null && child.children.length !== 0) {
+      childrenTime = calcTimes(child.children, child.id)!;
+      child.hasChildren = true;
+    }
+    child.selfTime = timeInMilliseconds(child) - childrenTime;
+  }
+  return totalTime;
+}
+
+export function normalizeBreakdown(breakdown: Record<string, number>) {
+  const final: BreakdownItem[] = [];
+  const total = Object.keys(breakdown).reduce((partialTotal, currentKey) => {
+    if (currentKey.indexOf('_count') === -1) {
+      partialTotal += breakdown[currentKey];
+    }
+    return partialTotal;
+  }, 0);
+  Object.keys(breakdown)
+    .sort()
+    .forEach(key => {
+      let relative = 0;
+      if (key.indexOf('_count') === -1) {
+        relative = ((breakdown[key] / total) * 100).toFixed(1) as any;
+      }
+      final.push({
+        key,
+        time: breakdown[key],
+        relative,
+        color: tinycolor.mix('#F5F5F5', '#FFAFAF', relative).toHexString(),
+        tip: getToolTip(key),
+      });
+    });
+
+  // Sort by time descending and then key ascending
+  return final.sort((a, b) => {
+    if (comparator(a.time, b.time) !== 0) {
+      return comparator(a.time, b.time);
+    }
+
+    return -1 * comparator(a.key as any, b.key as any);
+  });
+}
+
+export function normalizeTimes(data: any[], totalTime: number, depth: number) {
+  // Second pass to normalize
+  for (const child of data) {
+    child.timePercentage = ((timeInMilliseconds(child) / totalTime) * 100).toFixed(2);
+    child.absoluteColor = tinycolor.mix('#F5F5F5', '#FFAFAF', child.timePercentage).toHexString();
+    child.depth = depth;
+
+    if (child.children != null && child.children.length !== 0) {
+      normalizeTimes(child.children, totalTime, depth + 1);
+    }
+  }
+
+  data.sort((a, b) => comparator(timeInMilliseconds(a), timeInMilliseconds(b)));
+}
+
+export function normalizeIndices(indices: IndexMap, target: Targets) {
+  // Sort the shards per-index
+  let sortQueryComponents;
+  if (target === 'searches') {
+    sortQueryComponents = (a: Shard, b: Shard) => {
+      const aTime = _.sum(a.searches!, search => {
+        return search.treeRoot!.time;
+      });
+      const bTime = _.sum(b.searches!, search => {
+        return search.treeRoot!.time;
+      });
+
+      return comparator(aTime, bTime);
+    };
+  } else if (target === 'aggregations') {
+    sortQueryComponents = (a: Shard, b: Shard) => {
+      const aTime = _.sum(a.aggregations!, agg => {
+        return agg.treeRoot!.time;
+      });
+      const bTime = _.sum(b.aggregations!, agg => {
+        return agg.treeRoot!.time;
+      });
+
+      return comparator(aTime, bTime);
+    };
+  }
+  for (const index of Object.values(indices)) {
+    index.shards.sort(sortQueryComponents);
+    for (const shard of index.shards) {
+      shard.relative = ((shard.time / index.time) * 100).toFixed(2);
+      shard.color = tinycolor.mix('#F5F5F5', '#FFAFAF', shard.relative as any).toHexString();
+    }
+  }
+}
+
+export function initTree<T>(data: Operation[], depth = 0, parent: Operation | null = null) {
+  for (const child of data) {
+    // For bwc of older profile responses
+    if (!child.description) {
+      child.description = child.lucene!;
+      child.lucene = null;
+
+      child.type = child.query_type!;
+      child.query_type = null;
+    }
+
+    // Use named function for tests.
+    child.parent = parent;
+    child.time = timeInMilliseconds(child);
+    child.lucene = child.description;
+    child.query_type = child.type!.split('.').pop()!;
+    child.visible = child.timePercentage > 20;
+    child.depth = depth;
+
+    if (child.children != null && child.children.length !== 0) {
+      initTree(child.children, depth + 1, child);
+    }
+  }
+}
+
+export function closeNode<T = any>(node: Operation) {
+  const closeDraft = (draft: Operation) => {
+    draft.visible = false;
+
+    if (draft.children == null || draft.children.length === 0) {
+      return;
+    }
+
+    for (const child of draft.children) {
+      closeDraft(child);
+    }
+  };
+  return produce<Operation>(node, draft => {
+    closeDraft(draft);
+  });
+}
+
+export const sortIndices = (data: IndexMap) =>
+  produce<IndexMap, Index[]>(data, doNotChange => {
+    const sortedIndices: Index[] = [];
+    for (const index of Object.values(doNotChange)) {
+      sortedIndices.push(index);
+    }
+    // And now sort the indices themselves
+    sortedIndices.sort((a, b) => comparator(a.time, b.time));
+    return sortedIndices;
+  });
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/use_highlight_tree_node.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/use_highlight_tree_node.ts
new file mode 100644
index 00000000000000..6e6f16a2cb683a
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/use_highlight_tree_node.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useRef } from 'react';
+import uuid from 'uuid';
+
+import { useHighlightContext, OnHighlightChangeArgs } from './highlight_context';
+
+export const useHighlightTreeNode = () => {
+  const idRef = useRef<string>(uuid.v4());
+  const { selectedRow, setStore } = useHighlightContext();
+
+  const highlight = (value: OnHighlightChangeArgs) => {
+    setStore({ id: idRef.current, ...value });
+  };
+
+  const isHighlighted = () => {
+    return selectedRow === idRef.current;
+  };
+
+  return {
+    id: idRef.current,
+    highlight,
+    isHighlighted,
+  };
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/utils.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/utils.ts
new file mode 100644
index 00000000000000..d0bedd873a1bd2
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/profile_tree/utils.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Operation } from '../../types';
+
+export const hasVisibleChild = ({ children }: Operation) => {
+  return Boolean(children && children.some(child => child.visible));
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/searchprofiler_tabs.test.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/searchprofiler_tabs.test.ts
new file mode 100644
index 00000000000000..8ee43e28bcd2c5
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/searchprofiler_tabs.test.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 { registerTestBed } from '../../../../../../../test_utils';
+
+import { SearchProfilerTabs, Props } from './searchprofiler_tabs';
+
+describe('Search Profiler Tabs', () => {
+  it('renders', async () => {
+    const props: Props = {
+      activateTab: () => {},
+      activeTab: null,
+      has: {
+        aggregations: true,
+        searches: true,
+      },
+    };
+    const init = registerTestBed(SearchProfilerTabs);
+    await init(props);
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/searchprofiler_tabs.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/searchprofiler_tabs.tsx
new file mode 100644
index 00000000000000..19224e7099fd66
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/components/searchprofiler_tabs.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { EuiTabs, EuiTab } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { Targets } from '../types';
+
+export interface Props {
+  activeTab: Targets | null;
+  activateTab: (target: Targets) => void;
+  has: {
+    searches: boolean;
+    aggregations: boolean;
+  };
+}
+
+export const SearchProfilerTabs = ({ activeTab, activateTab, has }: Props) => {
+  return (
+    <EuiTabs>
+      <EuiTab
+        isSelected={activeTab === 'searches'}
+        disabled={!has.searches}
+        onClick={() => activateTab('searches')}
+      >
+        {i18n.translate('xpack.searchProfiler.queryProfileTabTitle', {
+          defaultMessage: 'Query Profile',
+        })}
+      </EuiTab>
+      <EuiTab
+        isSelected={activeTab === 'aggregations'}
+        disabled={!has.aggregations}
+        onClick={() => activateTab('aggregations')}
+      >
+        {i18n.translate('xpack.searchProfiler.aggregationProfileTabTitle', {
+          defaultMessage: 'Aggregation Profile',
+        })}
+      </EuiTab>
+    </EuiTabs>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/index.ts
new file mode 100644
index 00000000000000..1830a34e93d309
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/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 { Main } from './main';
+export { ProfileQueryEditor } from './profile_query_editor';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/empty_tree_placeholder.test.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/empty_tree_placeholder.test.tsx
new file mode 100644
index 00000000000000..4f17d0b4304f64
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/empty_tree_placeholder.test.tsx
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { registerTestBed } from '../../../../../../../../../test_utils';
+import { EmptyTreePlaceHolder } from '.';
+
+describe('EmptyTreePlaceholder', () => {
+  it('renders', async () => {
+    const init = registerTestBed(EmptyTreePlaceHolder);
+    await init();
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/empty_tree_placeholder.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/empty_tree_placeholder.tsx
new file mode 100644
index 00000000000000..bf27620dcac181
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/empty_tree_placeholder.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiText } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+export const EmptyTreePlaceHolder = () => {
+  return (
+    <div className="prfDevTool__main__emptyTreePlaceholder">
+      <EuiText color="subdued">
+        {/* TODO: translations */}
+        <h1>
+          {i18n.translate('xpack.searchProfiler.emptyProfileTreeTitle', {
+            defaultMessage: 'Nothing to see here yet.',
+          })}
+        </h1>
+        <p>
+          {i18n.translate('xpack.searchProfiler.emptyProfileTreeDescription', {
+            defaultMessage:
+              'Enter a query and press the "Profile" button or provide profile data in the editor.',
+          })}
+        </p>
+      </EuiText>
+    </div>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/index.ts
new file mode 100644
index 00000000000000..e8b7450ed96453
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/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 { EmptyTreePlaceHolder } from './empty_tree_placeholder';
+export { ProfileLoadingPlaceholder } from './profile_loading_placeholder';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/profile_loading_placeholder.test.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/profile_loading_placeholder.test.tsx
new file mode 100644
index 00000000000000..9b3348b4cab4b2
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/profile_loading_placeholder.test.tsx
@@ -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 { registerTestBed } from '../../../../../../../../../test_utils';
+import { ProfileLoadingPlaceholder } from '.';
+
+describe('Profile Loading Placeholder', () => {
+  it('renders', async () => {
+    const init = registerTestBed(ProfileLoadingPlaceholder);
+    await init();
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/profile_loading_placeholder.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/profile_loading_placeholder.tsx
new file mode 100644
index 00000000000000..fb09c6cddf70a4
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/components/profile_loading_placeholder.tsx
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiText } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+export const ProfileLoadingPlaceholder = () => {
+  return (
+    <div className="prfDevTool__main__emptyTreePlaceholder">
+      <EuiText color="subdued">
+        <h1>
+          {i18n.translate('xpack.searchProfiler.profilingLoaderText', {
+            defaultMessage: 'Profiling...',
+          })}
+        </h1>
+      </EuiText>
+    </div>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/index.ts
new file mode 100644
index 00000000000000..509a15c0c71a52
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { Main } from './main';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/main.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/main.tsx
new file mode 100644
index 00000000000000..7f5d223949e610
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/main/main.tsx
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback } from 'react';
+import _ from 'lodash';
+
+import {
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+} from '@elastic/eui';
+import { ProfileQueryEditor } from '../';
+
+import {
+  SearchProfilerTabs,
+  ProfileTree,
+  HighlightDetailsFlyout,
+  LicenseWarningNotice,
+} from '../../components';
+
+import { useAppContext } from '../../contexts/app_context';
+
+import { EmptyTreePlaceHolder, ProfileLoadingPlaceholder } from './components';
+import { Targets, ShardSerialized } from '../../types';
+import { useProfilerActionContext, useProfilerReadContext } from '../../contexts/profiler_context';
+
+function hasSearch(profileResponse: ShardSerialized[]) {
+  const aggs = _.get(profileResponse, '[0].searches', []);
+  return aggs.length > 0;
+}
+
+function hasAggregations(profileResponse: ShardSerialized[]) {
+  const aggs = _.get(profileResponse, '[0].aggregations', []);
+  return aggs.length > 0;
+}
+
+export const Main = () => {
+  const { licenseEnabled } = useAppContext();
+
+  const {
+    activeTab,
+    currentResponse,
+    highlightDetails,
+    pristine,
+    profiling,
+  } = useProfilerReadContext();
+  const dispatch = useProfilerActionContext();
+
+  const setActiveTab = useCallback(
+    (target: Targets) => dispatch({ type: 'setActiveTab', value: target }),
+    [dispatch]
+  );
+
+  const onHighlight = useCallback(value => dispatch({ type: 'setHighlightDetails', value }), [
+    dispatch,
+  ]);
+
+  const renderLicenseWarning = () => {
+    return !licenseEnabled ? (
+      <>
+        <LicenseWarningNotice />
+        <EuiSpacer size="s" />
+      </>
+    ) : null;
+  };
+
+  const renderProfileTreeArea = () => {
+    if (profiling) {
+      return <ProfileLoadingPlaceholder />;
+    }
+
+    if (activeTab) {
+      return (
+        <div className="prfDevTool__main__profiletree">
+          <ProfileTree onHighlight={onHighlight} target={activeTab} data={currentResponse} />
+        </div>
+      );
+    }
+
+    if (licenseEnabled && pristine) {
+      return <EmptyTreePlaceHolder />;
+    }
+
+    return null;
+  };
+
+  return (
+    <>
+      <EuiPage className="prfDevTool__page">
+        <EuiPageBody className="prfDevTool__page__pageBody">
+          {renderLicenseWarning()}
+          <EuiPageContent className="prfDevTool__page__pageBodyContent">
+            <EuiPageContentBody className="prfDevTool__page__pageBodyContentBody">
+              <EuiFlexGroup
+                responsive={false}
+                gutterSize="s"
+                direction="row"
+                className="prfDevTool__page__bodyGroup"
+              >
+                <EuiFlexItem>
+                  <ProfileQueryEditor />
+                </EuiFlexItem>
+                <EuiFlexItem grow={3}>
+                  <EuiFlexGroup className="prfDevTool__main" gutterSize="none" direction="column">
+                    <SearchProfilerTabs
+                      activeTab={activeTab}
+                      activateTab={setActiveTab}
+                      has={{
+                        aggregations: Boolean(currentResponse && hasAggregations(currentResponse)),
+                        searches: Boolean(currentResponse && hasSearch(currentResponse)),
+                      }}
+                    />
+                    {renderProfileTreeArea()}
+                  </EuiFlexGroup>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+              {highlightDetails ? (
+                <HighlightDetailsFlyout
+                  {...highlightDetails}
+                  onClose={() => dispatch({ type: 'setHighlightDetails', value: null })}
+                />
+              ) : null}
+            </EuiPageContentBody>
+          </EuiPageContent>
+        </EuiPageBody>
+      </EuiPage>
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/profile_query_editor.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/profile_query_editor.tsx
new file mode 100644
index 00000000000000..b879f15b729982
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/containers/profile_query_editor.tsx
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, { useRef, memo, useCallback } from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiForm,
+  EuiFieldText,
+  EuiFormRow,
+  EuiButton,
+  EuiText,
+  EuiFlexGroup,
+  EuiSpacer,
+  EuiFlexItem,
+} from '@elastic/eui';
+import { Editor, EditorInstance } from '../editor';
+import { useRequestProfile } from '../hooks';
+import { useAppContext } from '../contexts/app_context';
+import { useProfilerActionContext } from '../contexts/profiler_context';
+
+const DEFAULT_INDEX_VALUE = '_all';
+
+const INITIAL_EDITOR_VALUE = `{
+  "query":{
+    "match_all" : {}
+  }
+}`;
+
+/**
+ * This component should only need to render once.
+ *
+ * Drives state changes for mine via profiler action context.
+ */
+export const ProfileQueryEditor = memo(() => {
+  const editorRef = useRef<EditorInstance>(null as any);
+  const indexInputRef = useRef<HTMLInputElement>(null as any);
+
+  const dispatch = useProfilerActionContext();
+
+  const { licenseEnabled, notifications } = useAppContext();
+  const requestProfile = useRequestProfile();
+
+  const handleProfileClick = async () => {
+    dispatch({ type: 'setProfiling', value: true });
+    try {
+      const { current: editor } = editorRef;
+      const { data: result, error } = await requestProfile({
+        query: editorRef.current.getValue(),
+        index: indexInputRef.current.value,
+      });
+      if (error) {
+        notifications.addDanger(error);
+        editor.focus();
+        return;
+      }
+      if (result === null) {
+        return;
+      }
+      dispatch({ type: 'setCurrentResponse', value: result });
+    } finally {
+      dispatch({ type: 'setProfiling', value: false });
+    }
+  };
+
+  const onEditorReady = useCallback(editorInstance => (editorRef.current = editorInstance), []);
+
+  return (
+    <EuiFlexGroup
+      responsive={false}
+      className="prfDevTool__sense"
+      gutterSize="none"
+      direction="column"
+    >
+      {/* Form */}
+      <EuiFlexItem grow={false}>
+        <EuiForm>
+          <EuiFlexGroup direction="row" gutterSize="s">
+            <EuiFlexItem>
+              <EuiFormRow
+                label={i18n.translate('xpack.searchProfiler.formIndexLabel', {
+                  defaultMessage: 'Index',
+                })}
+              >
+                <EuiFieldText
+                  disabled={!licenseEnabled}
+                  inputRef={ref => {
+                    if (ref) {
+                      indexInputRef.current = ref;
+                      ref.value = DEFAULT_INDEX_VALUE;
+                    }
+                  }}
+                />
+              </EuiFormRow>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiForm>
+      </EuiFlexItem>
+
+      {/* Editor */}
+      <EuiFlexItem grow={10}>
+        <Editor
+          onEditorReady={onEditorReady}
+          licenseEnabled={licenseEnabled}
+          initialValue={INITIAL_EDITOR_VALUE}
+        />
+      </EuiFlexItem>
+
+      {/* Button */}
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup
+          className="prfDevTool__profileButtonContainer"
+          gutterSize="none"
+          direction="row"
+        >
+          <EuiFlexItem grow={5}>
+            <EuiSpacer size="s" />
+          </EuiFlexItem>
+          <EuiFlexItem grow={5}>
+            <EuiButton fill disabled={!licenseEnabled} onClick={() => handleProfileClick()}>
+              <EuiText>
+                {i18n.translate('xpack.searchProfiler.formProfileButtonLabel', {
+                  defaultMessage: 'Profile',
+                })}
+              </EuiText>
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/contexts/app_context.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/contexts/app_context.tsx
new file mode 100644
index 00000000000000..7f8a6cf01dcb27
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/contexts/app_context.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, createContext } from 'react';
+import { HttpSetup, ToastsSetup } from 'kibana/public';
+
+export interface ContextValue {
+  http: HttpSetup;
+  notifications: ToastsSetup;
+  licenseEnabled: boolean;
+  formatAngularHttpError: (error: any) => string;
+}
+
+const AppContext = createContext<ContextValue>(null as any);
+
+export const AppContextProvider = ({
+  children,
+  value,
+}: {
+  children: React.ReactNode;
+  value: ContextValue;
+}) => {
+  return <AppContext.Provider value={value}>{children}</AppContext.Provider>;
+};
+
+export const useAppContext = () => {
+  const ctx = useContext(AppContext);
+  if (ctx == null) {
+    throw new Error(`useAppContext must be called inside AppContextProvider`);
+  }
+  return ctx;
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/contexts/profiler_context.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/contexts/profiler_context.tsx
new file mode 100644
index 00000000000000..ad46c61b6cd49d
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/contexts/profiler_context.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, createContext, Dispatch } from 'react';
+import { useStore, State, Action } from '../store';
+
+const ProfilerReadContext = createContext<State>(null as any);
+const ProfilerActionContext = createContext<Dispatch<Action>>(null as any);
+
+export const ProfileContextProvider = ({ children }: { children: React.ReactNode }) => {
+  const { dispatch, state } = useStore();
+  return (
+    <ProfilerReadContext.Provider value={state}>
+      <ProfilerActionContext.Provider value={dispatch}>{children}</ProfilerActionContext.Provider>
+    </ProfilerReadContext.Provider>
+  );
+};
+
+export const useProfilerReadContext = () => {
+  const ctx = useContext(ProfilerReadContext);
+  if (ctx == null) {
+    throw new Error(`useProfilerReadContext must be called inside ProfilerReadContext`);
+  }
+  return ctx;
+};
+
+export const useProfilerActionContext = () => {
+  const ctx = useContext(ProfilerActionContext);
+  if (ctx == null) {
+    throw new Error(`useProfilerActionContext must be called inside ProfilerActionContext`);
+  }
+  return ctx;
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/editor.test.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/editor.test.tsx
new file mode 100644
index 00000000000000..d6702ef080ab73
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/editor.test.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import 'brace';
+import 'brace/mode/json';
+
+jest.mock('./worker', () => {
+  return { workerModule: { id: 'ace/mode/json_worker', src: '' } };
+});
+
+import { registerTestBed } from '../../../../../../../test_utils';
+import { Editor, Props } from '.';
+
+describe('Editor Component', () => {
+  it('renders', async () => {
+    const props: Props = {
+      initialValue: '',
+      licenseEnabled: true,
+      onEditorReady: e => {},
+    };
+    // Ignore the warning about Worker not existing for now...
+    const init = registerTestBed(Editor);
+    await init(props);
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/editor.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/editor.tsx
new file mode 100644
index 00000000000000..014336f379059a
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/editor.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo, useRef, useEffect, useState } from 'react';
+import { Editor as AceEditor } from 'brace';
+
+import { initializeEditor } from './init_editor';
+import { useUIAceKeyboardMode } from './use_ui_ace_keyboard_mode';
+
+interface EditorShim {
+  getValue(): string;
+  focus(): void;
+}
+
+export type EditorInstance = EditorShim;
+
+export interface Props {
+  licenseEnabled: boolean;
+  initialValue: string;
+  onEditorReady: (editor: EditorShim) => void;
+}
+
+const createEditorShim = (aceEditor: AceEditor): EditorShim => {
+  return {
+    getValue() {
+      return aceEditor.getValue();
+    },
+    focus() {
+      aceEditor.focus();
+    },
+  };
+};
+
+export const Editor = memo(({ licenseEnabled, initialValue, onEditorReady }: Props) => {
+  const containerRef = useRef<HTMLDivElement>(null as any);
+  const editorInstanceRef = useRef<AceEditor>(null as any);
+
+  const [textArea, setTextArea] = useState<HTMLTextAreaElement | null>(null);
+
+  if (licenseEnabled) {
+    useUIAceKeyboardMode(textArea);
+  }
+
+  useEffect(() => {
+    const divEl = containerRef.current;
+    editorInstanceRef.current = initializeEditor({ el: divEl, licenseEnabled });
+    editorInstanceRef.current.setValue(initialValue, 1);
+    setTextArea(containerRef.current!.querySelector('textarea'));
+
+    onEditorReady(createEditorShim(editorInstanceRef.current));
+  }, [initialValue, onEditorReady, licenseEnabled]);
+
+  return <div data-test-subj="searchProfilerEditor" ref={containerRef} />;
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/index.ts
new file mode 100644
index 00000000000000..f17f37923ae837
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { Editor, Props, EditorInstance } from './editor';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/init_editor.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/init_editor.ts
new file mode 100644
index 00000000000000..e5aad16bc4af20
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/init_editor.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 ace from 'brace';
+import { installXJsonMode } from './x_json_mode';
+
+export function initializeEditor({
+  el,
+  licenseEnabled,
+}: {
+  el: HTMLDivElement;
+  licenseEnabled: boolean;
+}) {
+  const editor: ace.Editor = ace.acequire('ace/ace').edit(el);
+
+  installXJsonMode(editor);
+  editor.$blockScrolling = Infinity;
+
+  if (!licenseEnabled) {
+    editor.setReadOnly(true);
+    editor.container.style.pointerEvents = 'none';
+    editor.container.style.opacity = '0.5';
+    const textArea = editor.container.querySelector('textarea');
+    if (textArea) {
+      textArea.setAttribute('tabindex', '-1');
+    }
+    editor.renderer.setStyle('disabled');
+    editor.blur();
+  }
+
+  return editor;
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/use_ui_ace_keyboard_mode.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/use_ui_ace_keyboard_mode.tsx
new file mode 100644
index 00000000000000..edf31c2e7c07f8
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/use_ui_ace_keyboard_mode.tsx
@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ * Copied from Console plugin
+ */
+
+import React, { useEffect, useRef } from 'react';
+import * as ReactDOM from 'react-dom';
+import { keyCodes, EuiText } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+const OverlayText = () => (
+  // The point of this element is for accessibility purposes, so ignore eslint error
+  // in this case
+  //
+  // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
+  <>
+    <EuiText size="s">
+      {i18n.translate('xpack.searchProfiler.aceAccessibilityOverlayInstructionEnter', {
+        defaultMessage: 'Press Enter to start editing.',
+      })}
+    </EuiText>
+    <EuiText size="s">
+      {i18n.translate('xpack.searchProfiler.aceAccessibilityOverlayInstructionExit', {
+        defaultMessage: `When you are done, press Escape to stop editing.`,
+      })}
+    </EuiText>
+  </>
+);
+
+export function useUIAceKeyboardMode(aceTextAreaElement: HTMLTextAreaElement | null) {
+  const overlayMountNode = useRef<HTMLDivElement | null>(null);
+  const autoCompleteVisibleRef = useRef<boolean>(false);
+
+  useEffect(() => {
+    function onDismissOverlay(event: KeyboardEvent) {
+      if (event.keyCode === keyCodes.ENTER) {
+        event.preventDefault();
+        aceTextAreaElement!.focus();
+      }
+    }
+
+    function enableOverlay() {
+      if (overlayMountNode.current) {
+        overlayMountNode.current.focus();
+      }
+    }
+
+    const isAutoCompleteVisible = () => {
+      const autoCompleter = document.querySelector<HTMLDivElement>('.ace_autocomplete');
+      if (!autoCompleter) {
+        return false;
+      }
+      // The autoComplete is just hidden when it's closed, not removed from the DOM.
+      return autoCompleter.style.display !== 'none';
+    };
+
+    const documentKeyDownListener = () => {
+      autoCompleteVisibleRef.current = isAutoCompleteVisible();
+    };
+
+    const aceKeydownListener = (event: KeyboardEvent) => {
+      if (event.keyCode === keyCodes.ESCAPE && !autoCompleteVisibleRef.current) {
+        event.preventDefault();
+        event.stopPropagation();
+        enableOverlay();
+      }
+    };
+
+    if (aceTextAreaElement) {
+      // We don't control HTML elements inside of ace so we imperatively create an element
+      // that acts as a container and insert it just before ace's textarea element
+      // so that the overlay lives at the correct spot in the DOM hierarchy.
+      overlayMountNode.current = document.createElement('div');
+      overlayMountNode.current.className = 'kbnUiAceKeyboardHint';
+      overlayMountNode.current.setAttribute('role', 'application');
+      overlayMountNode.current.tabIndex = 0;
+      overlayMountNode.current.addEventListener('focus', enableOverlay);
+      overlayMountNode.current.addEventListener('keydown', onDismissOverlay);
+
+      ReactDOM.render(<OverlayText />, overlayMountNode.current);
+
+      aceTextAreaElement.parentElement!.insertBefore(overlayMountNode.current, aceTextAreaElement);
+      aceTextAreaElement.setAttribute('tabindex', '-1');
+
+      // Order of events:
+      // 1. Document capture event fires first and we check whether an autocomplete menu is open on keydown
+      //    (not ideal because this is scoped to the entire document).
+      // 2. Ace changes it's state (like hiding or showing autocomplete menu)
+      // 3. We check what button was pressed and whether autocomplete was visible then determine
+      //    whether it should act like a dismiss or if we should display an overlay.
+      document.addEventListener('keydown', documentKeyDownListener, { capture: true });
+      aceTextAreaElement.addEventListener('keydown', aceKeydownListener);
+    }
+    return () => {
+      if (aceTextAreaElement) {
+        document.removeEventListener('keydown', documentKeyDownListener);
+        aceTextAreaElement.removeEventListener('keydown', aceKeydownListener);
+        const textAreaContainer = aceTextAreaElement.parentElement;
+        if (textAreaContainer && textAreaContainer.contains(overlayMountNode.current!)) {
+          textAreaContainer.removeChild(overlayMountNode.current!);
+        }
+      }
+    };
+  }, [aceTextAreaElement]);
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/editor/worker/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/worker/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/searchprofiler/public/editor/worker/index.ts
rename to x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/worker/index.ts
diff --git a/x-pack/legacy/plugins/searchprofiler/public/editor/worker/worker.d.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/worker/worker.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/searchprofiler/public/editor/worker/worker.d.ts
rename to x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/worker/worker.d.ts
diff --git a/x-pack/legacy/plugins/searchprofiler/public/editor/worker/worker.js b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/worker/worker.js
similarity index 100%
rename from x-pack/legacy/plugins/searchprofiler/public/editor/worker/worker.js
rename to x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/worker/worker.js
diff --git a/x-pack/legacy/plugins/searchprofiler/public/editor/x_json_highlight_rules.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/x_json_highlight_rules.ts
similarity index 100%
rename from x-pack/legacy/plugins/searchprofiler/public/editor/x_json_highlight_rules.ts
rename to x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/x_json_highlight_rules.ts
diff --git a/x-pack/legacy/plugins/searchprofiler/public/editor/x_json_mode.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/x_json_mode.ts
similarity index 100%
rename from x-pack/legacy/plugins/searchprofiler/public/editor/x_json_mode.ts
rename to x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/x_json_mode.ts
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/hooks/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/hooks/index.ts
new file mode 100644
index 00000000000000..a9fa5fee994e0f
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/hooks/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { useRequestProfile } from './use_request_profile';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/hooks/use_request_profile.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/hooks/use_request_profile.ts
new file mode 100644
index 00000000000000..34b49be7dc39c6
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/hooks/use_request_profile.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+
+import { useAppContext } from '../contexts/app_context';
+import { checkForParseErrors } from '../utils';
+import { ShardSerialized } from '../types';
+
+interface Args {
+  query: string;
+  index: string;
+}
+
+interface ReturnValue {
+  data: ShardSerialized[] | null;
+  error?: string;
+}
+
+export const useRequestProfile = () => {
+  const { http, notifications, formatAngularHttpError, licenseEnabled } = useAppContext();
+  return async ({ query, index }: Args): Promise<ReturnValue> => {
+    if (!licenseEnabled) {
+      return { data: null };
+    }
+    const { error, parsed } = checkForParseErrors(query);
+    if (error) {
+      notifications.addError(error, {
+        title: i18n.translate('xpack.searchProfiler.errorToastTitle', {
+          defaultMessage: 'JSON parse error',
+        }),
+      });
+      return { data: null };
+    }
+    // Shortcut the network request if we have json with shards already...
+    if (parsed.profile && parsed.profile.shards) {
+      return { data: parsed.profile.shards };
+    }
+
+    const payload: Record<string, any> = { query };
+
+    if (index == null || index === '') {
+      payload.index = '_all';
+    } else {
+      payload.index = index;
+    }
+
+    try {
+      const resp = await http.post('../api/searchprofiler/profile', {
+        body: JSON.stringify(payload),
+        headers: { 'Content-Type': 'application/json' },
+      });
+
+      if (!resp.ok) {
+        return { data: null, error: resp.err.msg };
+      }
+
+      return { data: resp.resp.profile.shards };
+    } catch (e) {
+      try {
+        // Is this a known error type?
+        const errorString = formatAngularHttpError(e);
+        notifications.addError(e, { title: errorString });
+      } catch (_) {
+        // Otherwise just report the original error
+        notifications.addError(e, {
+          title: i18n.translate('xpack.searchProfiler.errorSomethingWentWrongTitle', {
+            defaultMessage: 'Something went wrong',
+          }),
+        });
+      }
+      return { data: null };
+    }
+  };
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/index.scss b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/index.scss
new file mode 100644
index 00000000000000..e04e81c023196a
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/index.scss
@@ -0,0 +1,12 @@
+// Import the EUI global scope so we can use EUI constants
+@import 'src/legacy/ui/public/styles/_styling_constants';
+
+// Search profiler plugin styles
+
+// Prefix all styles with "prfDevTool" to avoid conflicts.
+// Examples
+//   prfDevTool__
+//   prfDevTool__cell
+//   prfDevTool__shardDetails
+
+@import 'styles/index';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/index.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/index.tsx
new file mode 100644
index 00000000000000..d29f193ce9d90d
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/index.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { Main } from './containers';
+import { AppContextProvider } from './contexts/app_context';
+import { ProfileContextProvider } from './contexts/profiler_context';
+
+import { AppDependencies } from './boot';
+
+export function App({
+  I18nContext,
+  licenseEnabled,
+  notifications,
+  http,
+  formatAngularHttpError,
+}: AppDependencies) {
+  return (
+    <I18nContext>
+      <AppContextProvider value={{ licenseEnabled, notifications, http, formatAngularHttpError }}>
+        <ProfileContextProvider>
+          <Main />
+        </ProfileContextProvider>
+      </AppContextProvider>
+    </I18nContext>
+  );
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/store/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/store/index.ts
new file mode 100644
index 00000000000000..5e30e07a7b8b73
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/store/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 { useStore, State } from './store';
+export { Action } from './reducer';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/store/reducer.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/store/reducer.ts
new file mode 100644
index 00000000000000..dac9dab9bd092f
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/store/reducer.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { produce } from 'immer';
+import { Reducer } from 'react';
+import { State } from './store';
+
+import { OnHighlightChangeArgs } from '../components/profile_tree';
+import { ShardSerialized, Targets } from '../types';
+
+export type Action =
+  | { type: 'setPristine'; value: boolean }
+  | { type: 'setProfiling'; value: boolean }
+  | { type: 'setHighlightDetails'; value: OnHighlightChangeArgs | null }
+  | { type: 'setActiveTab'; value: Targets | null }
+  | { type: 'setCurrentResponse'; value: ShardSerialized[] | null };
+
+export const reducer: Reducer<State, Action> = (state, action) =>
+  produce<State>(state, draft => {
+    if (action.type === 'setPristine') {
+      draft.pristine = action.value;
+      return;
+    }
+
+    if (action.type === 'setProfiling') {
+      draft.profiling = action.value;
+      if (draft.profiling) {
+        draft.currentResponse = null;
+        draft.highlightDetails = null;
+      }
+      return;
+    }
+
+    if (action.type === 'setHighlightDetails') {
+      draft.highlightDetails = action.value;
+      return;
+    }
+
+    if (action.type === 'setActiveTab') {
+      draft.activeTab = action.value;
+      return;
+    }
+
+    if (action.type === 'setCurrentResponse') {
+      draft.currentResponse = action.value;
+      if (draft.currentResponse) {
+        // Default to the searches tab
+        draft.activeTab = 'searches';
+      }
+      return;
+    }
+
+    throw new Error(`Unknown action: ${action}`);
+  });
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/store/store.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/store/store.ts
new file mode 100644
index 00000000000000..7b5a1ce93583d6
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/store/store.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 { useReducer } from 'react';
+import { reducer } from './reducer';
+import { ShardSerialized, Targets } from '../types';
+import { OnHighlightChangeArgs } from '../components/profile_tree';
+
+export interface State {
+  profiling: boolean;
+  pristine: boolean;
+  highlightDetails: OnHighlightChangeArgs | null;
+  activeTab: Targets | null;
+  currentResponse: ShardSerialized[] | null;
+}
+
+export const initialState: State = {
+  profiling: false,
+  pristine: false,
+  highlightDetails: null,
+  activeTab: null,
+  currentResponse: null,
+};
+
+export const useStore = () => {
+  const [state, dispatch] = useReducer(reducer, initialState);
+  return {
+    state,
+    dispatch,
+  };
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/_index.scss b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/_index.scss
new file mode 100644
index 00000000000000..a72d079354f897
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/_index.scss
@@ -0,0 +1,83 @@
+@import '@elastic/eui/src/components/header/variables';
+@import '@elastic/eui/src/components/panel/mixins';
+
+@import 'mixins';
+
+@import 'components/highlight_details_flyout';
+@import 'components/profile_tree';
+@import 'components/percentage_badge';
+
+@import 'containers/main';
+@import 'containers/profile_query_editor';
+
+#searchProfilerAppRoot {
+  height: 100%;
+  display: flex;
+  flex: 1 1 auto;
+}
+
+.prfDevTool__licenseWarning {
+  &__container {
+    max-width: 1000px;
+  }
+}
+
+
+.prfDevTool__page {
+  height: 100%;
+  display: flex;
+  flex: 1 1 auto;
+
+  &__body {
+    height: 100%;
+    flex: 1 1 auto;
+  }
+
+  &__pageBody {
+    height: 100%;
+    flex: 1 1 auto;
+  }
+
+  &__pageBodyContent {
+    height: 100%;
+  }
+
+  &__pageBodyContentBody {
+    height: 100%;
+  }
+
+  &__pageContentBodyContent {
+    height: 100%;
+  }
+
+  &__bodyGroup {
+    height: 100%;
+  }
+}
+
+.prfDevTool {
+  height: calc(100vh - #{$euiHeaderChildSize});
+  overflow: hidden;
+
+  .devApp__container {
+    height: 100%;
+    overflow: hidden;
+    flex-shrink: 1;
+  }
+
+  &__container {
+    overflow: hidden;
+  }
+}
+
+.prfDevTool__detail {
+  font-size: $euiFontSizeS;
+  padding-left: $euiSizeL - 3px; // Alignment is weird
+  margin-bottom: $euiSizeS;
+  display: flex;
+  justify-content: space-between;
+
+  .euiLink {
+    flex-shrink: 0;
+  }
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/directives/_mixins.scss b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/_mixins.scss
similarity index 100%
rename from x-pack/legacy/plugins/searchprofiler/public/directives/_mixins.scss
rename to x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/_mixins.scss
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/components/_highlight_details_flyout.scss b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/components/_highlight_details_flyout.scss
new file mode 100644
index 00000000000000..4b36e9833979d8
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/components/_highlight_details_flyout.scss
@@ -0,0 +1,8 @@
+.prfDevTool__flyoutSubtitle {
+  margin-bottom: $euiSizeS;
+  display: inline-block;
+}
+
+.prfDevTool__details {
+  max-width: map-get($euiBreakpoints, 's');
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/components/_percentage_badge.scss b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/components/_percentage_badge.scss
new file mode 100644
index 00000000000000..204ca3da17574b
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/components/_percentage_badge.scss
@@ -0,0 +1,14 @@
+.prfDevTool__percentBadge {
+  &__progress--percent {
+    @include prfDevToolProgress;
+    width: $badgeSize;
+  }
+
+  &__progress--time {
+    @include prfDevToolProgress(#FFAFAF);
+    background-color: #F5F5F5; // Must be light at all times
+    // Width of 3 badges, with the last child not having padding on the left
+    width: ($badgeSize * 3) - ($euiSizeXS * .75);
+    // Force text to always be dark on top of white -> pink color
+  }
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/components/_profile_tree.scss b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/components/_profile_tree.scss
new file mode 100644
index 00000000000000..cc4d334f58fd33
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/components/_profile_tree.scss
@@ -0,0 +1,99 @@
+
+$badgeSize: $euiSize * 5.5;
+
+// Profile details treeview
+
+.prfDevTool__profileTree {
+
+  &__container {
+    height: 100%;
+  }
+
+  &__shardDetails--dim small {
+    color: $euiColorDarkShade;
+  }
+
+  &__shardDetails {
+    line-height: 1;
+    overflow-wrap: break-word;
+
+    h3 {
+      font-size: $euiSize;
+    }
+
+    &:disabled {
+      text-decoration: none !important;
+      cursor: default;
+    }
+  }
+
+  &__shard {
+    border: none;
+
+    &__header-flex-item {
+      align-self: center;
+    }
+  }
+
+  &__index {
+    width: 100%;
+    padding: $euiSize $euiSizeS;
+  }
+
+  &__indexDetails {
+    align-self: center;
+  }
+
+  &__tvRow--last {
+    cursor: pointer;
+  }
+
+  &__tvRow,
+  &__tvHeader {
+    display: table;
+    width: 100%;
+    table-layout: fixed;
+  }
+
+  &__tvHeader {
+    @include euiFontSizeXS;
+    color: $euiColorDarkShade;
+  }
+
+  &__time,
+  &__totalTime,
+  &__percentage {
+    width: $badgeSize;
+  }
+
+  // BADGES (and those used for progress)
+  &__badge {
+    border: none;
+    display: block;
+    // Force text to always be dark on top of white -> pink color
+    color: lightOrDarkTheme($euiColorDarkestShade, $euiColorLightestShade);
+  }
+
+  &__panel {
+    border-bottom: $euiBorderThin;
+  }
+
+  &__panelBody {
+    margin-top: $euiSizeS;
+    margin-left: $euiSizeL;
+  }
+
+  &__cell {
+    display: table-cell;
+    vertical-align: middle;
+    padding: $euiSizeXS;
+
+    &:first-of-type {
+      padding-left: 0;
+    }
+
+    &:last-of-type {
+      padding-right: 0;
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/containers/_main.scss b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/containers/_main.scss
new file mode 100644
index 00000000000000..09bcddef02cc34
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/containers/_main.scss
@@ -0,0 +1,62 @@
+
+@include euiBreakpoint('xs', 's') {
+  .prfDevTool__shardDetailsWrapper {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+}
+
+.prfDevTool__main {
+  height: 100%;
+  order: 2;
+  margin-left: $euiSize;
+  display: flex;
+  overflow: hidden;
+  flex-direction: column;
+
+  // Make only the tab content scroll
+  .search-profiler-tabs {
+    flex-shrink: 0;
+  }
+
+  &__profiletree {
+    height: 100%;
+    overflow-y: auto;
+    flex-grow: 1;
+  }
+
+  &__emptyTreePlaceholder {
+    h1 {
+      font-size: $euiSizeL;
+      color: $euiColorMediumShade;
+    }
+    p {
+      font-size: $euiSize;
+      color: $euiColorMediumShade;
+    }
+    h1, p {
+      cursor: default;
+      user-select: none;
+    }
+    // Slight offset from the top.
+    margin: 5% 0 auto;
+    text-align: center;
+  }
+}
+
+@include euiPanel('prfDevTool__main');
+
+@include euiBreakpoint('xs', 's') {
+  .prfDevTool__container {
+    flex-direction: column;
+  }
+
+  .prfDevTool__main {
+    flex: 0 0 auto;
+  }
+
+  .prfDevTool__main {
+    margin: $euiSize 0;
+  }
+}
+
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/containers/_profile_query_editor.scss b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/containers/_profile_query_editor.scss
new file mode 100644
index 00000000000000..035ff16c990bb1
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/styles/containers/_profile_query_editor.scss
@@ -0,0 +1,25 @@
+
+.prfDevTool__sense {
+  order: 1;
+  // To anchor ace editor
+  position: relative;
+
+  // Ace Editor overrides
+  .ace_editor {
+    min-height: $euiSize * 10;
+    flex-grow: 1;
+    margin-bottom: $euiSize;
+    margin-top: $euiSize;
+    outline: solid 1px $euiColorLightShade;
+  }
+
+  .errorMarker {
+    position: absolute;
+    background: rgba($euiColorDanger, .5);
+    z-index: 20;
+  }
+}
+
+.prfDevTool__profileButtonContainer {
+  flex-shrink: 1;
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/types.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/types.ts
new file mode 100644
index 00000000000000..2b4dc01c45d6fc
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/types.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface BreakdownItem {
+  tip: string;
+  key: string;
+  time: number;
+  color: string;
+  relative: number;
+}
+
+export type Targets = 'searches' | 'aggregations';
+
+export interface Shard {
+  id: string[];
+  relative: number | string;
+  time: number;
+  color: string;
+  aggregations?: Operation[];
+  searches?: Operation[];
+  rewrite_time?: number;
+}
+
+export interface Index {
+  name: string;
+  time: number;
+  shards: Shard[];
+  visible: boolean;
+}
+
+export interface ShardSerialized {
+  id: string;
+  searches: Operation[];
+  aggregations: Operation[];
+}
+
+export interface Operation {
+  description?: string;
+  hasChildren: boolean;
+  visible: boolean;
+  selfTime: number;
+  timePercentage: number;
+  absoluteColor: string;
+  time: number;
+
+  parent: Operation | null;
+  children: Operation[];
+
+  // Only exists on top level
+  treeRoot?: Operation;
+
+  depth?: number;
+
+  // BWC
+  type?: string;
+
+  lucene: string | null;
+  query_type: string | null;
+
+  // Searches
+  query?: any[];
+  rewrite_time?: number;
+
+  // Aggregations
+  breakdown?: any;
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/check_for_json_errors.test.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/check_for_json_errors.test.ts
new file mode 100644
index 00000000000000..9dece5a39e96c3
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/check_for_json_errors.test.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { checkForParseErrors } from '.';
+
+describe('checkForParseErrors', function() {
+  it('returns error from bad JSON', function() {
+    const json = '{"foo": {"bar": {"baz": "buzz}}}';
+    const result = checkForParseErrors(json);
+    expect(result.error.message).to.be(`Unexpected end of JSON input`);
+  });
+
+  it('returns parsed value from good JSON', function() {
+    const json = '{"foo": {"bar": {"baz": "buzz"}}}';
+    const result = checkForParseErrors(json);
+    expect(!!result.parsed).to.be(true);
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/check_for_json_errors.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/check_for_json_errors.ts
new file mode 100644
index 00000000000000..4267fd0d2f9019
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/check_for_json_errors.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// Convert triple quotes into regular quotes and escape internal quotes.
+function collapseLiteralStrings(data: string) {
+  return data.replace(/"""(?:\s*\r?\n)?((?:.|\r?\n)*?)(?:\r?\n\s*)?"""/g, function(match, literal) {
+    return JSON.stringify(literal);
+  });
+}
+
+export function checkForParseErrors(json: string) {
+  const sanitizedJson = collapseLiteralStrings(json);
+  try {
+    const parsedJson = JSON.parse(sanitizedJson);
+    return { parsed: parsedJson, error: null };
+  } catch (error) {
+    return { error, parsed: null };
+  }
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/index.ts
new file mode 100644
index 00000000000000..556a03fc96fe35
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { checkForParseErrors } from './check_for_json_errors';
+export { msToPretty } from './ms_to_pretty';
+export { nsToPretty } from './ns_to_pretty';
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/ms_to_pretty.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/ms_to_pretty.ts
new file mode 100644
index 00000000000000..3df47cfdeb1770
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/ms_to_pretty.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export function msToPretty(ms: number, precision: number) {
+  if (!precision) {
+    precision = 1;
+  }
+  ms = Number(ms);
+  if (ms < 1000) {
+    return ms.toFixed(precision) + 'ms';
+  }
+
+  ms /= 1000;
+  if (ms < 60) {
+    return ms.toFixed(precision) + 's';
+  }
+
+  ms /= 60;
+  if (ms < 60) {
+    return ms.toFixed(precision) + 'min';
+  }
+
+  ms /= 60;
+  if (ms < 24) {
+    return ms.toFixed(precision) + 'hr';
+  }
+
+  ms /= 24;
+  return ms.toFixed(precision) + 'd';
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/ns_to_pretty.test.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/ns_to_pretty.test.ts
new file mode 100644
index 00000000000000..6c0e1124af176c
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/ns_to_pretty.test.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { nsToPretty } from './ns_to_pretty';
+
+describe('nsToPretty', function() {
+  it('returns correct time for ns', function() {
+    const result = nsToPretty(500, 1);
+    expect(result).to.eql('500.0ns');
+  });
+
+  it('returns correct time for µs', function() {
+    const result = nsToPretty(5000, 1);
+    expect(result).to.eql('5.0µs');
+  });
+
+  it('returns correct time for ms', function() {
+    const result = nsToPretty(5000000, 1);
+    expect(result).to.eql('5.0ms');
+  });
+
+  it('returns correct time for s', function() {
+    const result = nsToPretty(5000000000, 1);
+    expect(result).to.eql('5.0s');
+  });
+
+  it('returns correct time for min', function() {
+    const result = nsToPretty(5000000000 * 60, 1);
+    expect(result).to.eql('5.0min');
+  });
+
+  it('returns correct time for hr', function() {
+    const result = nsToPretty(3.6e12 * 5, 1);
+    expect(result).to.eql('5.0hr');
+  });
+
+  it('returns correct time for day', function() {
+    const result = nsToPretty(3.6e12 * 24 * 5, 1);
+    expect(result).to.eql('5.0d');
+  });
+
+  it('returns correct time for precision', function() {
+    const result = nsToPretty(500, 5);
+    expect(result).to.eql('500.00000ns');
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/ns_to_pretty.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/ns_to_pretty.ts
new file mode 100644
index 00000000000000..bf0b487566f6fe
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/utils/ns_to_pretty.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { msToPretty } from './ms_to_pretty';
+
+export function nsToPretty(ns: number, precision: number) {
+  if (!precision) {
+    precision = 1;
+  }
+  const units = ['ns', 'µs'];
+
+  for (const unit of units) {
+    if (ns < 1000) {
+      return ns.toFixed(precision) + unit;
+    }
+    ns /= 1000;
+  }
+  return msToPretty(ns, precision);
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/index.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/index.ts
new file mode 100644
index 00000000000000..3d77f703b42cd4
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PluginInitializerContext } from 'src/core/public';
+import { SearchProfilerUIPlugin } from './plugin';
+
+export function plugin(ctx: PluginInitializerContext) {
+  return new SearchProfilerUIPlugin(ctx);
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/plugin.ts b/x-pack/legacy/plugins/searchprofiler/public/np_ready/plugin.ts
new file mode 100644
index 00000000000000..ff98e706abf5cd
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/public/np_ready/plugin.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  Plugin,
+  CoreStart,
+  CoreSetup,
+  PluginInitializerContext,
+  ToastsStart,
+} from 'src/core/public';
+
+import { boot } from './application/boot';
+
+export class SearchProfilerUIPlugin implements Plugin {
+  constructor(ctx: PluginInitializerContext) {}
+
+  async setup(
+    core: CoreSetup,
+    plugins: {
+      __LEGACY: {
+        I18nContext: any;
+        licenseEnabled: boolean;
+        notifications: ToastsStart;
+        formatAngularHttpError: any;
+        el: HTMLElement;
+      };
+    }
+  ) {
+    const { http } = core;
+    const {
+      __LEGACY: { I18nContext, licenseEnabled, notifications, formatAngularHttpError, el },
+    } = plugins;
+    core.application.register({
+      id: 'searchprofiler',
+      title: 'SearchProfiler',
+      mount(ctx, params) {
+        return boot({
+          http,
+          licenseEnabled,
+          el,
+          I18nContext,
+          notifications,
+          formatAngularHttpError,
+        });
+      },
+    });
+  }
+
+  async start(core: CoreStart, plugins: any) {}
+
+  async stop() {}
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/range.js b/x-pack/legacy/plugins/searchprofiler/public/range.js
deleted file mode 100644
index d52ed783d9720a..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/range.js
+++ /dev/null
@@ -1,257 +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.
- */
-
-
-// Pulled from Ace because I can't for the life of me
-// figure out how to import it.  This needs to be fixed TODO
-
-const comparePoints = function (p1, p2) {
-  return p1.row - p2.row || p1.column - p2.column;
-};
-
-export function Range(startRow, startColumn, endRow, endColumn) {
-  this.start = {
-    row: startRow,
-    column: startColumn
-  };
-
-  this.end = {
-    row: endRow,
-    column: endColumn
-  };
-}
-
-(function () {
-  this.isEqual = function (range) {
-    return this.start.row === range.start.row &&
-            this.end.row === range.end.row &&
-            this.start.column === range.start.column &&
-            this.end.column === range.end.column;
-  };
-  this.toString = function () {
-    return ('Range: [' + this.start.row + '/' + this.start.column +
-            '] -> [' + this.end.row + '/' + this.end.column + ']');
-  };
-
-  this.contains = function (row, column) {
-    return this.compare(row, column) === 0;
-  };
-  this.compareRange = function (range) {
-    let cmp;
-    const end = range.end;
-    const start = range.start;
-
-    cmp = this.compare(end.row, end.column);
-    if (cmp === 1) {
-      cmp = this.compare(start.row, start.column);
-      if (cmp === 1) {
-        return 2;
-      } else if (cmp === 0) {
-        return 1;
-      } else {
-        return 0;
-      }
-    } else if (cmp === -1) {
-      return -2;
-    } else {
-      cmp = this.compare(start.row, start.column);
-      if (cmp === -1) {
-        return -1;
-      } else if (cmp === 1) {
-        return 42;
-      } else {
-        return 0;
-      }
-    }
-  };
-  this.comparePoint = function (p) {
-    return this.compare(p.row, p.column);
-  };
-  this.containsRange = function (range) {
-    return this.comparePoint(range.start) === 0 && this.comparePoint(range.end) === 0;
-  };
-  this.intersects = function (range) {
-    const cmp = this.compareRange(range);
-    return (cmp === -1 || cmp === 0 || cmp === 1);
-  };
-  this.isEnd = function (row, column) {
-    return this.end.row === row && this.end.column === column;
-  };
-  this.isStart = function (row, column) {
-    return this.start.row === row && this.start.column === column;
-  };
-  this.setStart = function (row, column) {
-    if (typeof row === 'object') {
-      this.start.column = row.column;
-      this.start.row = row.row;
-    } else {
-      this.start.row = row;
-      this.start.column = column;
-    }
-  };
-  this.setEnd = function (row, column) {
-    if (typeof row === 'object') {
-      this.end.column = row.column;
-      this.end.row = row.row;
-    } else {
-      this.end.row = row;
-      this.end.column = column;
-    }
-  };
-  this.inside = function (row, column) {
-    if (this.compare(row, column) === 0) {
-      if (this.isEnd(row, column) || this.isStart(row, column)) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-    return false;
-  };
-  this.insideStart = function (row, column) {
-    if (this.compare(row, column) === 0) {
-      if (this.isEnd(row, column)) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-    return false;
-  };
-  this.insideEnd = function (row, column) {
-    if (this.compare(row, column) === 0) {
-      if (this.isStart(row, column)) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-    return false;
-  };
-  this.compare = function (row, column) {
-    if (!this.isMultiLine()) {
-      if (row === this.start.row) {
-        if (column < this.start.column) {
-          return -1;
-        }
-        return column > this.end.column ? 1 : 0;
-      }
-    }
-
-    if (row < this.start.row) {
-      return -1;
-    }
-
-
-    if (row > this.end.row) {
-      return 1;
-    }
-
-    if (this.start.row === row) {
-      return column >= this.start.column ? 0 : -1;
-    }
-
-    if (this.end.row === row) {
-      return column <= this.end.column ? 0 : 1;
-    }
-
-    return 0;
-  };
-  this.compareStart = function (row, column) {
-    if (this.start.row === row && this.start.column === column) {
-      return -1;
-    } else {
-      return this.compare(row, column);
-    }
-  };
-  this.compareEnd = function (row, column) {
-    if (this.end.row === row && this.end.column === column) {
-      return 1;
-    } else {
-      return this.compare(row, column);
-    }
-  };
-  this.compareInside = function (row, column) {
-    if (this.end.row === row && this.end.column === column) {
-      return 1;
-    } else if (this.start.row === row && this.start.column === column) {
-      return -1;
-    } else {
-      return this.compare(row, column);
-    }
-  };
-  this.clipRows = function (firstRow, lastRow) {
-    let end;
-    let start;
-    if (this.end.row > lastRow) {
-      end = { row: lastRow + 1, column: 0 };
-    } else if (this.end.row < firstRow) {
-      end = { row: firstRow, column: 0 };
-    }
-
-    if (this.start.row > lastRow) {
-      start = { row: lastRow + 1, column: 0 };
-    } else if (this.start.row < firstRow) {
-      start = { row: firstRow, column: 0 };
-    }
-    return Range.fromPoints(start || this.start, end || this.end);
-  };
-  this.extend = function (row, column) {
-    const cmp = this.compare(row, column);
-
-    if (cmp === 0) {
-      return this;
-    }
-    let start;
-    let end;
-    if (cmp === -1) {
-      start = { row: row, column: column };
-    } else {
-      end = { row: row, column: column };
-    }
-    return Range.fromPoints(start || this.start, end || this.end);
-  };
-
-  this.isEmpty = function () {
-    return (this.start.row === this.end.row && this.start.column === this.end.column);
-  };
-  this.isMultiLine = function () {
-    return (this.start.row !== this.end.row);
-  };
-  this.clone = function () {
-    return Range.fromPoints(this.start, this.end);
-  };
-  this.collapseRows = function () {
-    if (this.end.column === 0) {
-      return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row - 1), 0);
-    }
-    return new Range(this.start.row, 0, this.end.row, 0);
-  };
-  this.toScreenRange = function (session) {
-    const screenPosStart = session.documentToScreenPosition(this.start);
-    const screenPosEnd = session.documentToScreenPosition(this.end);
-
-    return new Range(
-      screenPosStart.row, screenPosStart.column,
-      screenPosEnd.row, screenPosEnd.column
-    );
-  };
-  this.moveBy = function (row, column) {
-    this.start.row += row;
-    this.start.column += column;
-    this.end.row += row;
-    this.end.column += column;
-  };
-
-}).call(Range.prototype);
-Range.fromPoints = function (start, end) {
-  return new Range(start.row, start.column, end.row, end.column);
-};
-Range.comparePoints = comparePoints;
-
-Range.comparePoints = function (p1, p2) {
-  return p1.row - p2.row || p1.column - p2.column;
-};
diff --git a/x-pack/legacy/plugins/searchprofiler/public/templates/_index.scss b/x-pack/legacy/plugins/searchprofiler/public/templates/_index.scss
deleted file mode 100644
index 495452735ac83e..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/templates/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'templates';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/searchprofiler/public/templates/_templates.scss b/x-pack/legacy/plugins/searchprofiler/public/templates/_templates.scss
deleted file mode 100644
index 9acd5cf32051ec..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/templates/_templates.scss
+++ /dev/null
@@ -1,103 +0,0 @@
-@import '@elastic/eui/src/components/header/variables';
-@import '@elastic/eui/src/components/panel/mixins';
-
-.prfDevTool {
-  height: calc(100vh - #{$euiHeaderChildSize});
-  overflow: hidden;
-
-  .devApp__container {
-  overflow: hidden;
-  flex-shrink: 1;
-  }
-}
-
-.prfDevTool__container {
-  display: flex;
-  flex: 1 1 auto;
-  padding: $euiSize;
-  overflow: hidden;
-
-  // SASSTODO/EUITODO/HACK: Reset font styles of headers
-  h1, h2, h3, h4, h5, h6 {
-    font: inherit;
-  }
-}
-
-@include euiPanel('prfDevTool__main');
-
-.prfDevTool__main {
-  flex: 3;
-  order: 2;
-  margin-left: $euiSize;
-  display: flex;
-  overflow: hidden;
-  flex-direction: column;
-
-  // Make only the tab content scroll
-  search-profiler-tabs {
-    flex-shrink: 0;
-  }
-
-  profiletree {
-    overflow-y: auto;
-    flex-grow: 1;
-  }
-}
-
-.prfDevTool__details {
-  max-width: map-get($euiBreakpoints, 's');
-}
-
-highlightdetails {
-  flex-grow: 1;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  height: 100%;
-}
-
-.prfDevTool__sense {
-  flex: 1;
-  order: 1;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-
-  > * {
-    flex-shrink: 0;
-  }
-
-  .kuiTextInput {
-    width: 100%;
-  }
-
-  // Ace Editor overrides
-  .ace_editor {
-    min-height: $euiSize * 10;
-    flex-grow: 1;
-    margin-bottom: $euiSize;
-    margin-top: $euiSize;
-    outline: solid 1px $euiColorLightShade;
-  }
-
-  .errorMarker {
-    position: absolute;
-    background: rgba($euiColorDanger, .5);
-    z-index: 20;
-  }
-}
-
-@include euiBreakpoint('xs', 's') {
-  .prfDevTool__container {
-    flex-direction: column;
-  }
-
-  .prfDevTool__sense,
-  .prfDevTool__main {
-    flex: 0 0 auto;
-  }
-
-  .prfDevTool__main {
-    margin: $euiSize 0;
-  }
-}
diff --git a/x-pack/legacy/plugins/searchprofiler/public/templates/default_query.js b/x-pack/legacy/plugins/searchprofiler/public/templates/default_query.js
deleted file mode 100644
index afab7e808eb1a2..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/templates/default_query.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const defaultQuery = `{
-  "query":{
-    "match_all" : {}
-  }
-}`;
diff --git a/x-pack/legacy/plugins/searchprofiler/public/templates/index.html b/x-pack/legacy/plugins/searchprofiler/public/templates/index.html
deleted file mode 100644
index a2874af17817e2..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/public/templates/index.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<kbn-dev-tools-app class="prfDevTool" data-test-subj="searchProfiler">
-  <div class="prfDevTool__container" ng-controller="profileViz">
-    <div class="prfDevTool__main">
-
-      <search-profiler-tabs
-        profile-response="profileResponse"
-        activate-tab="activateTab"
-        active-tab="activeTab"
-      >
-      </search-profiler-tabs>
-
-      <profileTree ng-if="activeTab.search" data="profileResponse" target="searches"></profileTree>
-      <profileTree ng-if="activeTab.aggregations" data="profileResponse" target="aggregations"></profileTree>
-
-      <!-- License error notice -->
-      <div class="euiCallout euiCallOut--warning" style="padding: 16px" ng-hide="licenseEnabled">
-        <h2
-          class="kuiTitle kuiVerticalRhythmSmall"
-          i18n-id="xpack.searchProfiler.licenseErrorMessageTitle"
-          i18n-default-message="{warningIcon} License error"
-          i18n-values="{ html_warningIcon: '<span class=\'kuiIcon fa-warning kuiIcon--error\'></span>' }"
-        ></h2>
-
-        <p
-          class="kuiText kuiVerticalRhythmSmall"
-          i18n-id="xpack.searchProfiler.licenseErrorMessageDescription"
-          i18n-default-message="The Profiler Visualization requires an active license ({licenseTypeList} or {platinumLicenseType}), but none were found in your cluster."
-          i18n-values="{
-            html_licenseTypeList: '<code>' + trialLicense + '</code>, <code>' + basicLicense + '</code>, <code>' + goldLicense + '</code>',
-            html_platinumLicenseType: '<code>' + platinumLicense + '</code>',
-          }"
-        ></p>
-
-        <p
-          class="kuiText kuiVerticalRhythmSmall"
-          i18n-id="xpack.searchProfiler.registerLicenseDescription"
-          i18n-default-message="Please {registerLicenseLink} to continue using the Search Profiler"
-          i18n-values="{
-            html_registerLicenseLink: '<a class=\'kuiLink\' href=\'https://www.elastic.co/subscriptions\' rel=\'noopener\'>' + registerLicenseLinkLabel + '</a>',
-          }"
-        ></p>
-      </div>
-    </div>
-
-    <div class="prfDevTool__sense">
-      <!-- Form -->
-      <div class="kuiFieldGroup">
-        <div class="kuiFieldGroupSection">
-          <div class="kuiVerticalRhythmSmall">
-            <label
-              class="euiFormLabel"
-              for="searchProfilerIndexInput"
-              i18n-id="xpack.searchProfiler.formIndexLabel"
-              i18n-default-message="Index"
-            ></label>
-          </div>
-
-          <div class="kuiVerticalRhythmSmall">
-            <input
-              id="searchProfilerIndexInput"
-              class="kuiTextInput"
-              type="text"
-              ng-model="index"
-              ng-disabled="!licenseEnabled"
-            ></input>
-          </div>
-        </div>
-
-        <div class="kuiFieldGroupSection">
-          <div class="kuiVerticalRhythmSmall">
-            <label
-              class="euiFormLabel"
-              for="searchProfilerTypeInput"
-              i18n-id="xpack.searchProfiler.formTypeLabel"
-              i18n-default-message="Type"
-            ></label>
-          </div>
-
-          <div class="kuiVerticalRhythmSmall">
-            <input
-              id="searchProfilerTypeInput"
-              class="kuiTextInput"
-              type="text"
-              ng-model="type"
-              ng-disabled="!licenseEnabled"
-            ></input>
-          </div>
-        </div>
-      </div>
-
-      <!-- Code editor -->
-      <div id="SearchProfilerInput" data-test-subj="searchProfilerEditor" class="ace_editor"></div>
-
-      <!-- Actions -->
-      <div><button
-        class="kuiButton kuiButton--primary"
-        style="float:right;"
-        ng-click="profile()"
-        ng-disabled="!licenseEnabled || !hasQuery()"
-        i18n-id="xpack.searchProfiler.formProfileButtonLabel"
-        i18n-default-message="Profile"
-      >
-      </button></div>
-    </div>
-
-    <aside class="prfDevTool__details euiFlyout euiFlyout--medium" ng-show="highlight.details && licenseEnabled">
-      <highlightdetails></highlightdetails>
-      <div class="euiFlyoutFooter">
-        <button class="kuiButton kuiButton--primary prfDevTool__detailsCloseBtn" ng-click="resetHighlightPanel()">close</button>
-      </div>
-    </aside>
-  </div>
-</kbn-dev-tools-app>
diff --git a/x-pack/legacy/plugins/searchprofiler/server/lib/__tests__/check_license.js b/x-pack/legacy/plugins/searchprofiler/server/lib/__tests__/check_license.js
deleted file mode 100644
index f1e19b61cbe2b0..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/server/lib/__tests__/check_license.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { set } from 'lodash';
-import { checkLicense } from '../check_license';
-
-describe('check_license', function () {
-
-  let mockLicenseInfo;
-  beforeEach(() => mockLicenseInfo = {});
-
-  describe('license information is not available', () => {
-    beforeEach(() => mockLicenseInfo.isAvailable = () => false);
-
-    it('should set showLinks to true', () => {
-      expect(checkLicense(mockLicenseInfo).showAppLink).to.be(true);
-    });
-
-    it('should set enableLinks to false', () => {
-      expect(checkLicense(mockLicenseInfo).enableAppLink).to.be(false);
-    });
-  });
-
-  describe('license information is available', () => {
-    beforeEach(() => {
-      mockLicenseInfo.isAvailable = () => true;
-      set(mockLicenseInfo, 'license.getType', () => 'basic');
-    });
-
-    describe('& license is trial, standard, gold, platinum', () => {
-      beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
-
-      describe('& license is active', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
-
-        it ('should set showLinks to true', () => {
-          expect(checkLicense(mockLicenseInfo).showAppLink).to.be(true);
-        });
-
-        it ('should set enableLinks to true', () => {
-          expect(checkLicense(mockLicenseInfo).enableAppLink).to.be(true);
-        });
-      });
-
-      describe('& license is expired', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false));
-
-        it ('should set showLinks to true', () => {
-          expect(checkLicense(mockLicenseInfo).showAppLink).to.be(true);
-        });
-
-        it ('should set enableLinks to false', () => {
-          expect(checkLicense(mockLicenseInfo).enableAppLink).to.be(false);
-        });
-      });
-    });
-
-    describe('& license is basic', () => {
-      beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => false));
-
-      describe('& license is active', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
-
-        it ('should set showLinks to false', () => {
-          expect(checkLicense(mockLicenseInfo).showAppLink).to.be(false);
-        });
-      });
-
-      describe('& license is expired', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false));
-
-        it ('should set showLinks to false', () => {
-          expect(checkLicense(mockLicenseInfo).showAppLink).to.be(false);
-        });
-      });
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/searchprofiler/server/lib/check_license.js b/x-pack/legacy/plugins/searchprofiler/server/lib/check_license.js
deleted file mode 100644
index 1093daaafe18a8..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/server/lib/check_license.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-export function checkLicense(xpackLicenseInfo) {
-
-  if (!xpackLicenseInfo || !xpackLicenseInfo.isAvailable()) {
-    return {
-      showAppLink: true,
-      enableAppLink: false,
-      message: i18n.translate('xpack.searchProfiler.unavailableLicenseInformationMessage', {
-        defaultMessage: 'Search Profiler is unavailable - license information is not available at this time.',
-      }),
-    };
-  }
-
-  const isLicenseActive = xpackLicenseInfo.license.isActive();
-  let message;
-  if (!isLicenseActive) {
-    message = i18n.translate('xpack.searchProfiler.licenseHasExpiredMessage', {
-      defaultMessage: 'Search Profiler is unavailable - license has expired.',
-    });
-  }
-
-  if (xpackLicenseInfo.license.isOneOf([ 'trial', 'basic', 'standard', 'gold', 'platinum' ])) {
-    return {
-      showAppLink: true,
-      enableAppLink: isLicenseActive,
-      message
-    };
-  }
-
-  message = i18n.translate('xpack.searchProfiler.upgradeLicenseMessage', {
-    defaultMessage:
-      'Search Profiler is unavailable for the current {licenseInfo} license. Please upgrade your license.',
-    values: { licenseInfo: xpackLicenseInfo.license.getType() }
-  });
-  return {
-    showAppLink: false,
-    enableAppLink: false,
-    message
-  };
-}
diff --git a/x-pack/legacy/plugins/searchprofiler/server/np_ready/index.ts b/x-pack/legacy/plugins/searchprofiler/server/np_ready/index.ts
new file mode 100644
index 00000000000000..9253a0d6b15242
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/server/np_ready/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { SearchProfilerServerPlugin } from './plugin';
+
+export const plugin = () => {
+  return new SearchProfilerServerPlugin();
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/server/np_ready/lib/check_license.test.ts b/x-pack/legacy/plugins/searchprofiler/server/np_ready/lib/check_license.test.ts
new file mode 100644
index 00000000000000..f473533fbd48ae
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/server/np_ready/lib/check_license.test.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { set } from 'lodash';
+import { checkLicense } from './check_license';
+
+describe('check_license', () => {
+  let mockLicenseInfo: any;
+  beforeEach(() => (mockLicenseInfo = {}));
+
+  describe('license information is not available', () => {
+    beforeEach(() => (mockLicenseInfo.isAvailable = () => false));
+
+    it('should set showLinks to true', () => {
+      expect(checkLicense(mockLicenseInfo).showAppLink).to.be(true);
+    });
+
+    it('should set enableLinks to false', () => {
+      expect(checkLicense(mockLicenseInfo).enableAppLink).to.be(false);
+    });
+  });
+
+  describe('license information is available', () => {
+    beforeEach(() => {
+      mockLicenseInfo.isAvailable = () => true;
+      set(mockLicenseInfo, 'license.getType', () => 'basic');
+    });
+
+    describe('& license is trial, standard, gold, platinum', () => {
+      beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
+
+      describe('& license is active', () => {
+        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
+
+        it('should set showLinks to true', () => {
+          expect(checkLicense(mockLicenseInfo).showAppLink).to.be(true);
+        });
+
+        it('should set enableLinks to true', () => {
+          expect(checkLicense(mockLicenseInfo).enableAppLink).to.be(true);
+        });
+      });
+
+      describe('& license is expired', () => {
+        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false));
+
+        it('should set showLinks to true', () => {
+          expect(checkLicense(mockLicenseInfo).showAppLink).to.be(true);
+        });
+
+        it('should set enableLinks to false', () => {
+          expect(checkLicense(mockLicenseInfo).enableAppLink).to.be(false);
+        });
+      });
+    });
+
+    describe('& license is basic', () => {
+      beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => false));
+
+      describe('& license is active', () => {
+        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
+
+        it('should set showLinks to false', () => {
+          expect(checkLicense(mockLicenseInfo).showAppLink).to.be(false);
+        });
+      });
+
+      describe('& license is expired', () => {
+        beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false));
+
+        it('should set showLinks to false', () => {
+          expect(checkLicense(mockLicenseInfo).showAppLink).to.be(false);
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/searchprofiler/server/np_ready/lib/check_license.ts b/x-pack/legacy/plugins/searchprofiler/server/np_ready/lib/check_license.ts
new file mode 100644
index 00000000000000..e41925da3e2688
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/server/np_ready/lib/check_license.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { XPackInfo } from '../../../../xpack_main/server/lib/xpack_info';
+
+export function checkLicense(
+  xpackLicenseInfo: XPackInfo
+): { showAppLink: boolean; enableAppLink: boolean; message: string | undefined } {
+  if (!xpackLicenseInfo || !xpackLicenseInfo.isAvailable()) {
+    return {
+      showAppLink: true,
+      enableAppLink: false,
+      message: i18n.translate('xpack.searchProfiler.unavailableLicenseInformationMessage', {
+        defaultMessage:
+          'Search Profiler is unavailable - license information is not available at this time.',
+      }),
+    };
+  }
+
+  const isLicenseActive = xpackLicenseInfo.license.isActive();
+  let message: string | undefined;
+  if (!isLicenseActive) {
+    message = i18n.translate('xpack.searchProfiler.licenseHasExpiredMessage', {
+      defaultMessage: 'Search Profiler is unavailable - license has expired.',
+    });
+  }
+
+  if (xpackLicenseInfo.license.isOneOf(['trial', 'basic', 'standard', 'gold', 'platinum'])) {
+    return {
+      showAppLink: true,
+      enableAppLink: isLicenseActive,
+      message,
+    };
+  }
+
+  message = i18n.translate('xpack.searchProfiler.upgradeLicenseMessage', {
+    defaultMessage:
+      'Search Profiler is unavailable for the current {licenseInfo} license. Please upgrade your license.',
+    values: { licenseInfo: xpackLicenseInfo.license.getType() },
+  });
+  return {
+    showAppLink: false,
+    enableAppLink: false,
+    message,
+  };
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/server/np_ready/lib/index.ts b/x-pack/legacy/plugins/searchprofiler/server/np_ready/lib/index.ts
new file mode 100644
index 00000000000000..f2c070fd44b6e6
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/server/np_ready/lib/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { checkLicense } from './check_license';
diff --git a/x-pack/legacy/plugins/searchprofiler/server/np_ready/plugin.ts b/x-pack/legacy/plugins/searchprofiler/server/np_ready/plugin.ts
new file mode 100644
index 00000000000000..e00e2829f980d2
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/server/np_ready/plugin.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup, Plugin } from 'src/core/server';
+import { LegacySetup } from './types';
+import { checkLicense } from './lib';
+// @ts-ignore
+import { mirrorPluginStatus } from '../../../../server/lib/mirror_plugin_status';
+
+import * as profileRoute from './routes/profile';
+
+export class SearchProfilerServerPlugin implements Plugin {
+  async setup(
+    core: CoreSetup,
+    {
+      route,
+      plugins: {
+        __LEGACY: { thisPlugin, elasticsearch, xpackMain, commonRouteConfig },
+      },
+    }: LegacySetup
+  ) {
+    mirrorPluginStatus(xpackMain, thisPlugin);
+    (xpackMain as any).status.once('green', () => {
+      // Register a function that is called whenever the xpack info changes,
+      // to re-compute the license check results for this plugin
+      xpackMain.info.feature(thisPlugin.id).registerLicenseCheckResultsGenerator(checkLicense);
+    });
+
+    profileRoute.register({ elasticsearch }, route, commonRouteConfig);
+  }
+
+  async start() {}
+
+  stop(): void {}
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/server/np_ready/routes/profile.ts b/x-pack/legacy/plugins/searchprofiler/server/np_ready/routes/profile.ts
new file mode 100644
index 00000000000000..082307b5a7a2be
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/server/np_ready/routes/profile.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import Joi from 'joi';
+import { RequestShim, ServerShim, RegisterRoute } from '../types';
+
+export const handler = async (server: ServerShim, request: RequestShim) => {
+  const { callWithRequest } = server.elasticsearch.getCluster('data');
+  let parsed = request.payload.query;
+  parsed.profile = true;
+  parsed = JSON.stringify(parsed, null, 2);
+
+  const body = {
+    index: request.payload.index,
+    body: parsed,
+  };
+  try {
+    const resp = await callWithRequest(request, 'search', body);
+    return {
+      ok: true,
+      resp,
+    };
+  } catch (err) {
+    return {
+      ok: false,
+      err,
+    };
+  }
+};
+
+export const register = (server: ServerShim, route: RegisterRoute, commonConfig: any) => {
+  route({
+    path: '/api/searchprofiler/profile',
+    method: 'POST',
+    config: {
+      ...commonConfig,
+      validate: {
+        payload: Joi.object()
+          .keys({
+            query: Joi.object().required(),
+            index: Joi.string().required(),
+            type: Joi.string().optional(),
+          })
+          .required(),
+      },
+    },
+    handler: req => {
+      return handler(server, { headers: req.headers, payload: req.payload as any });
+    },
+  });
+};
diff --git a/x-pack/legacy/plugins/searchprofiler/server/np_ready/types.ts b/x-pack/legacy/plugins/searchprofiler/server/np_ready/types.ts
new file mode 100644
index 00000000000000..7862aa386785bd
--- /dev/null
+++ b/x-pack/legacy/plugins/searchprofiler/server/np_ready/types.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ServerRoute } from 'hapi';
+import { ElasticsearchPlugin, Request } from 'src/legacy/core_plugins/elasticsearch';
+import { XPackMainPlugin } from '../../../xpack_main/xpack_main';
+
+export type RegisterRoute = (args: ServerRoute & { config: any }) => void;
+
+export interface LegacyPlugins {
+  __LEGACY: {
+    thisPlugin: any;
+    elasticsearch: ElasticsearchPlugin;
+    xpackMain: XPackMainPlugin;
+    commonRouteConfig: any;
+  };
+}
+
+export interface LegacySetup {
+  route: RegisterRoute;
+  plugins: LegacyPlugins;
+}
+
+export interface ServerShim {
+  elasticsearch: ElasticsearchPlugin;
+}
+
+export interface RequestShim extends Request {
+  payload: any;
+}
diff --git a/x-pack/legacy/plugins/searchprofiler/server/routes/profile.js b/x-pack/legacy/plugins/searchprofiler/server/routes/profile.js
deleted file mode 100644
index b1ba7527b69dd8..00000000000000
--- a/x-pack/legacy/plugins/searchprofiler/server/routes/profile.js
+++ /dev/null
@@ -1,51 +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 Joi from 'joi';
-
-export function profileRoute(server, commonRouteConfig) {
-
-  server.route({
-    path: '/api/searchprofiler/profile',
-    method: 'POST',
-    config: {
-      ...commonRouteConfig,
-      validate: {
-        payload: Joi.object().keys({
-          query: Joi.object().required(),
-          index: Joi.string().required(),
-          type: Joi.string().optional()
-        }).required()    //Joi validation
-      }
-    },
-    handler: async (request) => {
-
-      const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
-      let parsed = request.payload.query;
-      parsed.profile = true;
-      parsed = JSON.stringify(parsed, null, 2);
-
-      const body = {
-        index: request.payload.index,
-        type: request.payload.type,
-        body: parsed
-      };
-      try {
-        const resp = await callWithRequest(request, 'search', body);
-        return {
-          ok: true,
-          resp: resp
-        };
-      } catch (err) {
-        return {
-          ok: false,
-          err: err
-        };
-      }
-    }
-  });
-
-}
diff --git a/x-pack/legacy/plugins/security/public/components/authentication_state_page/authentication_state_page.tsx b/x-pack/legacy/plugins/security/public/components/authentication_state_page/authentication_state_page.tsx
index f28696eb840633..2e02275b396117 100644
--- a/x-pack/legacy/plugins/security/public/components/authentication_state_page/authentication_state_page.tsx
+++ b/x-pack/legacy/plugins/security/public/components/authentication_state_page/authentication_state_page.tsx
@@ -5,32 +5,26 @@
  */
 
 import { EuiIcon, EuiSpacer, EuiTitle } from '@elastic/eui';
-import React, { Component } from 'react';
+import React from 'react';
 
 interface Props {
   title: React.ReactNode;
 }
 
-export class AuthenticationStatePage extends Component<Props, {}> {
-  public render() {
-    return (
-      <div className="secAuthenticationStatePage">
-        <header className="secAuthenticationStatePage__header">
-          <div className="secAuthenticationStatePage__content eui-textCenter">
-            <EuiSpacer size="xxl" />
-            <span className="secAuthenticationStatePage__logo">
-              <EuiIcon type="logoKibana" size="xxl" />
-            </span>
-            <EuiTitle size="l" className="secAuthenticationStatePage__title">
-              <h1>{this.props.title}</h1>
-            </EuiTitle>
-            <EuiSpacer size="xl" />
-          </div>
-        </header>
-        <div className="secAuthenticationStatePage__content eui-textCenter">
-          {this.props.children}
-        </div>
+export const AuthenticationStatePage: React.SFC<Props> = props => (
+  <div className="secAuthenticationStatePage">
+    <header className="secAuthenticationStatePage__header">
+      <div className="secAuthenticationStatePage__content eui-textCenter">
+        <EuiSpacer size="xxl" />
+        <span className="secAuthenticationStatePage__logo">
+          <EuiIcon type="logoKibana" size="xxl" />
+        </span>
+        <EuiTitle size="l" className="secAuthenticationStatePage__title">
+          <h1>{props.title}</h1>
+        </EuiTitle>
+        <EuiSpacer size="xl" />
       </div>
-    );
-  }
-}
+    </header>
+    <div className="secAuthenticationStatePage__content eui-textCenter">{props.children}</div>
+  </div>
+);
diff --git a/x-pack/legacy/plugins/security/public/components/management/change_password_form/change_password_form.tsx b/x-pack/legacy/plugins/security/public/components/management/change_password_form/change_password_form.tsx
index 9521cbdc58a788..61c0b77decd565 100644
--- a/x-pack/legacy/plugins/security/public/components/management/change_password_form/change_password_form.tsx
+++ b/x-pack/legacy/plugins/security/public/components/management/change_password_form/change_password_form.tsx
@@ -314,7 +314,7 @@ export class ChangePasswordForm extends Component<Props, State> {
   };
 
   private handleChangePasswordFailure = (error: Record<string, any>) => {
-    if (error.body && error.body.statusCode === 401) {
+    if (error.body && error.body.statusCode === 403) {
       this.setState({ currentPasswordError: true });
     } else {
       toastNotifications.addDanger(
diff --git a/x-pack/legacy/plugins/security/public/components/session_expiration_warning/index.ts b/x-pack/legacy/plugins/security/public/components/session_expiration_warning/index.ts
deleted file mode 100644
index 0aa0c1f9fb0791..00000000000000
--- a/x-pack/legacy/plugins/security/public/components/session_expiration_warning/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { SessionExpirationWarning } from './session_expiration_warning';
diff --git a/x-pack/legacy/plugins/security/public/components/session_expiration_warning/session_expiration_warning.test.tsx b/x-pack/legacy/plugins/security/public/components/session_expiration_warning/session_expiration_warning.test.tsx
deleted file mode 100644
index abc5a970eec9ab..00000000000000
--- a/x-pack/legacy/plugins/security/public/components/session_expiration_warning/session_expiration_warning.test.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import React from 'react';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { SessionExpirationWarning } from './session_expiration_warning';
-
-describe('SessionExpirationWarning', () => {
-  it('fires its callback when the OK button is clicked', () => {
-    const handler = jest.fn();
-    const wrapper = mountWithIntl(<SessionExpirationWarning onRefreshSession={handler} />);
-
-    expect(handler).toBeCalledTimes(0);
-    wrapper.find('EuiButton[data-test-subj="refreshSessionButton"]').simulate('click');
-    expect(handler).toBeCalledTimes(1);
-  });
-});
diff --git a/x-pack/legacy/plugins/security/public/components/session_expiration_warning/session_expiration_warning.tsx b/x-pack/legacy/plugins/security/public/components/session_expiration_warning/session_expiration_warning.tsx
deleted file mode 100644
index 2b957e9b251a7f..00000000000000
--- a/x-pack/legacy/plugins/security/public/components/session_expiration_warning/session_expiration_warning.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { EuiButton } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-interface Props {
-  onRefreshSession: () => void;
-}
-
-export const SessionExpirationWarning = (props: Props) => {
-  return (
-    <>
-      <p>
-        <FormattedMessage
-          id="xpack.security.components.sessionExpiration.logoutNotification"
-          defaultMessage="You will soon be logged out due to inactivity. Click OK to resume."
-        />
-      </p>
-      <div className="eui-textRight">
-        <EuiButton
-          size="s"
-          color="warning"
-          onClick={props.onRefreshSession}
-          data-test-subj="refreshSessionButton"
-        >
-          <FormattedMessage
-            id="xpack.security.components.sessionExpiration.okButtonText"
-            defaultMessage="OK"
-          />
-        </EuiButton>
-      </div>
-    </>
-  );
-};
diff --git a/x-pack/legacy/plugins/security/public/hacks/on_session_timeout.js b/x-pack/legacy/plugins/security/public/hacks/on_session_timeout.js
index 0f1787820a2f24..81b14ee7d8bf41 100644
--- a/x-pack/legacy/plugins/security/public/hacks/on_session_timeout.js
+++ b/x-pack/legacy/plugins/security/public/hacks/on_session_timeout.js
@@ -4,15 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
 import _ from 'lodash';
-import { i18n } from '@kbn/i18n';
 import { uiModules } from 'ui/modules';
 import { isSystemApiRequest } from 'ui/system_api';
 import { Path } from 'plugins/xpack_main/services/path';
-import { toastNotifications } from 'ui/notify';
-import 'plugins/security/services/auto_logout';
-import { SessionExpirationWarning } from '../components/session_expiration_warning';
+import { npSetup } from 'ui/new_platform';
 
 /**
  * Client session timeout is decreased by this number so that Kibana server
@@ -20,65 +16,19 @@ import { SessionExpirationWarning } from '../components/session_expiration_warni
  * user session up (invalidate access tokens, redirect to logout portal etc.).
  * @type {number}
  */
-const SESSION_TIMEOUT_GRACE_PERIOD_MS = 5000;
 
 const module = uiModules.get('security', []);
 module.config(($httpProvider) => {
   $httpProvider.interceptors.push((
-    $timeout,
     $q,
-    $injector,
-    sessionTimeout,
-    Private,
-    autoLogout
   ) => {
 
-    function refreshSession() {
-      // Make a simple request to keep the session alive
-      $injector.get('es').ping();
-      clearNotifications();
-    }
-
     const isUnauthenticated = Path.isUnauthenticated();
-    const notificationLifetime = 60 * 1000;
-    const notificationOptions = {
-      color: 'warning',
-      text: (
-        <SessionExpirationWarning onRefreshSession={refreshSession} />
-      ),
-      title: i18n.translate('xpack.security.hacks.warningTitle', {
-        defaultMessage: 'Warning'
-      }),
-      toastLifeTimeMs: Math.min(
-        (sessionTimeout - SESSION_TIMEOUT_GRACE_PERIOD_MS),
-        notificationLifetime
-      ),
-    };
-
-    let pendingNotification;
-    let activeNotification;
-    let pendingSessionExpiration;
-
-    function clearNotifications() {
-      if (pendingNotification) $timeout.cancel(pendingNotification);
-      if (pendingSessionExpiration) clearTimeout(pendingSessionExpiration);
-      if (activeNotification) toastNotifications.remove(activeNotification);
-    }
-
-    function scheduleNotification() {
-      pendingNotification = $timeout(showNotification, Math.max(sessionTimeout - notificationLifetime, 0));
-    }
-
-    function showNotification() {
-      activeNotification = toastNotifications.add(notificationOptions);
-      pendingSessionExpiration = setTimeout(() => autoLogout(), notificationOptions.toastLifeTimeMs);
-    }
 
     function interceptorFactory(responseHandler) {
       return function interceptor(response) {
-        if (!isUnauthenticated && !isSystemApiRequest(response.config) && sessionTimeout !== null) {
-          clearNotifications();
-          scheduleNotification();
+        if (!isUnauthenticated && !isSystemApiRequest(response.config)) {
+          npSetup.plugins.security.sessionTimeout.extend();
         }
         return responseHandler(response);
       };
diff --git a/x-pack/legacy/plugins/security/public/views/account/components/account_management_page.tsx b/x-pack/legacy/plugins/security/public/views/account/components/account_management_page.tsx
index e66b37f8cfe5a9..94a42166fbb9eb 100644
--- a/x-pack/legacy/plugins/security/public/views/account/components/account_management_page.tsx
+++ b/x-pack/legacy/plugins/security/public/views/account/components/account_management_page.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { EuiPage, EuiPageBody, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
-import React, { Component } from 'react';
+import React from 'react';
 import { getUserDisplayName, AuthenticatedUser } from '../../../../common/model';
 import { ChangePassword } from './change_password';
 import { PersonalInfo } from './personal_info';
@@ -13,28 +13,20 @@ interface Props {
   user: AuthenticatedUser;
 }
 
-export class AccountManagementPage extends Component<Props, {}> {
-  constructor(props: Props) {
-    super(props);
-  }
+export const AccountManagementPage: React.SFC<Props> = props => (
+  <EuiPage>
+    <EuiPageBody restrictWidth>
+      <EuiPanel>
+        <EuiText data-test-subj={'userDisplayName'}>
+          <h1>{getUserDisplayName(props.user)}</h1>
+        </EuiText>
 
-  public render() {
-    return (
-      <EuiPage>
-        <EuiPageBody restrictWidth>
-          <EuiPanel>
-            <EuiText data-test-subj={'userDisplayName'}>
-              <h1>{getUserDisplayName(this.props.user)}</h1>
-            </EuiText>
+        <EuiSpacer size="xl" />
 
-            <EuiSpacer size="xl" />
+        <PersonalInfo user={props.user} />
 
-            <PersonalInfo user={this.props.user} />
-
-            <ChangePassword user={this.props.user} />
-          </EuiPanel>
-        </EuiPageBody>
-      </EuiPage>
-    );
-  }
-}
+        <ChangePassword user={props.user} />
+      </EuiPanel>
+    </EuiPageBody>
+  </EuiPage>
+);
diff --git a/x-pack/legacy/plugins/security/public/views/logged_out/logged_out.tsx b/x-pack/legacy/plugins/security/public/views/logged_out/logged_out.tsx
index 3fb902e54fa5c0..369b531e8ddf80 100644
--- a/x-pack/legacy/plugins/security/public/views/logged_out/logged_out.tsx
+++ b/x-pack/legacy/plugins/security/public/views/logged_out/logged_out.tsx
@@ -11,7 +11,6 @@ import { AuthenticationStatePage } from 'plugins/security/components/authenticat
 import template from 'plugins/security/views/logged_out/logged_out.html';
 import React from 'react';
 import { render } from 'react-dom';
-import 'ui/autoload/styles';
 import chrome from 'ui/chrome';
 import { I18nContext } from 'ui/i18n';
 
diff --git a/x-pack/legacy/plugins/security/public/views/login/components/disabled_login_form/disabled_login_form.tsx b/x-pack/legacy/plugins/security/public/views/login/components/disabled_login_form/disabled_login_form.tsx
index 1b28023b6e3e07..012c16c57716e5 100644
--- a/x-pack/legacy/plugins/security/public/views/login/components/disabled_login_form/disabled_login_form.tsx
+++ b/x-pack/legacy/plugins/security/public/views/login/components/disabled_login_form/disabled_login_form.tsx
@@ -5,24 +5,20 @@
  */
 
 import { EuiPanel, EuiText } from '@elastic/eui';
-import React, { Component, ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 
 interface Props {
   title: ReactNode;
   message: ReactNode;
 }
 
-export class DisabledLoginForm extends Component<Props, {}> {
-  public render() {
-    return (
-      <EuiPanel>
-        <EuiText color="danger" style={{ textAlign: 'center' }}>
-          <p>{this.props.title}</p>
-        </EuiText>
-        <EuiText style={{ textAlign: 'center' }}>
-          <p>{this.props.message}</p>
-        </EuiText>
-      </EuiPanel>
-    );
-  }
-}
+export const DisabledLoginForm: React.SFC<Props> = props => (
+  <EuiPanel>
+    <EuiText color="danger" style={{ textAlign: 'center' }}>
+      <p>{props.title}</p>
+    </EuiText>
+    <EuiText style={{ textAlign: 'center' }}>
+      <p>{props.message}</p>
+    </EuiText>
+  </EuiPanel>
+);
diff --git a/x-pack/legacy/plugins/security/public/views/login/login.tsx b/x-pack/legacy/plugins/security/public/views/login/login.tsx
index d8a3116740b54c..8b452e4c4fdf53 100644
--- a/x-pack/legacy/plugins/security/public/views/login/login.tsx
+++ b/x-pack/legacy/plugins/security/public/views/login/login.tsx
@@ -12,7 +12,6 @@ import { LoginPage } from 'plugins/security/views/login/components';
 import template from 'plugins/security/views/login/login.html';
 import React from 'react';
 import { render } from 'react-dom';
-import 'ui/autoload/styles';
 import chrome from 'ui/chrome';
 import { I18nContext } from 'ui/i18n';
 import { parse } from 'url';
diff --git a/x-pack/legacy/plugins/security/public/views/overwritten_session/overwritten_session.tsx b/x-pack/legacy/plugins/security/public/views/overwritten_session/overwritten_session.tsx
index f3ea175e53ec4e..76088443212b24 100644
--- a/x-pack/legacy/plugins/security/public/views/overwritten_session/overwritten_session.tsx
+++ b/x-pack/legacy/plugins/security/public/views/overwritten_session/overwritten_session.tsx
@@ -8,7 +8,6 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButton } from '@elastic/eui';
 import React from 'react';
 import { render } from 'react-dom';
-import 'ui/autoload/styles';
 import chrome from 'ui/chrome';
 import { I18nContext } from 'ui/i18n';
 import { AuthenticatedUser } from '../../../common/model';
diff --git a/x-pack/legacy/plugins/security/server/routes/api/v1/__tests__/users.js b/x-pack/legacy/plugins/security/server/routes/api/v1/__tests__/users.js
index 8444efe8790e71..83dfa778f1b505 100644
--- a/x-pack/legacy/plugins/security/server/routes/api/v1/__tests__/users.js
+++ b/x-pack/legacy/plugins/security/server/routes/api/v1/__tests__/users.js
@@ -81,7 +81,7 @@ describe('User routes', () => {
           .resolves(AuthenticationResult.succeeded({}));
       });
 
-      it('returns 401 if old password is wrong.', async () => {
+      it('returns 403 if old password is wrong.', async () => {
         loginStub.resolves(AuthenticationResult.failed(new Error('Something went wrong.')));
 
         const response = await changePasswordRoute.handler(request);
@@ -89,13 +89,13 @@ describe('User routes', () => {
         sinon.assert.notCalled(clusterStub.callWithRequest);
         expect(response.isBoom).to.be(true);
         expect(response.output.payload).to.eql({
-          statusCode: 401,
+          statusCode: 403,
           error: 'Unauthorized',
           message: 'Something went wrong.'
         });
       });
 
-      it('returns 401 if user can authenticate with new password.', async () => {
+      it(`returns 401 if user can't authenticate with new password.`, async () => {
         loginStub
           .withArgs(
             sinon.match.instanceOf(KibanaRequest),
diff --git a/x-pack/legacy/plugins/security/server/routes/api/v1/users.js b/x-pack/legacy/plugins/security/server/routes/api/v1/users.js
index 9cb2ad799a211c..1d47dc88753486 100644
--- a/x-pack/legacy/plugins/security/server/routes/api/v1/users.js
+++ b/x-pack/legacy/plugins/security/server/routes/api/v1/users.js
@@ -108,7 +108,7 @@ export function initUsersApi({ authc: { login }, config }, server) {
             return Boom.unauthorized(authenticationResult.error);
           }
         } catch(err) {
-          return Boom.unauthorized(err);
+          throw Boom.forbidden(err);
         }
       }
 
diff --git a/x-pack/legacy/plugins/siem/common/graphql/shared/schema.gql.ts b/x-pack/legacy/plugins/siem/common/graphql/shared/schema.gql.ts
index 937b8771ac89b4..d043c1587d3c34 100644
--- a/x-pack/legacy/plugins/siem/common/graphql/shared/schema.gql.ts
+++ b/x-pack/legacy/plugins/siem/common/graphql/shared/schema.gql.ts
@@ -14,8 +14,6 @@ export const sharedSchema = gql`
     to: Float!
     "The beginning of the timerange"
     from: Float!
-    "The default browser set time zone"
-    timezone: String
   }
 
   type CursorType {
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx
index 11b604571378b1..c513f7a4512401 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx
@@ -5,7 +5,7 @@
  */
 
 import { defaultTo, noop } from 'lodash/fp';
-import * as React from 'react';
+import React, { useCallback } from 'react';
 import { DragDropContext, DropResult, DragStart } from 'react-beautiful-dnd';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
@@ -59,22 +59,25 @@ const onDragEndHandler = ({
  */
 export const DragDropContextWrapperComponent = React.memo<Props>(
   ({ browserFields, children, dataProviders, dispatch }) => {
-    function onDragEnd(result: DropResult) {
-      enableScrolling();
-
-      if (dataProviders != null) {
-        onDragEndHandler({
-          browserFields,
-          result,
-          dataProviders,
-          dispatch,
-        });
-      }
-
-      if (!draggableIsField(result)) {
-        document.body.classList.remove(IS_DRAGGING_CLASS_NAME);
-      }
-    }
+    const onDragEnd = useCallback(
+      (result: DropResult) => {
+        enableScrolling();
+
+        if (dataProviders != null) {
+          onDragEndHandler({
+            browserFields,
+            result,
+            dataProviders,
+            dispatch,
+          });
+        }
+
+        if (!draggableIsField(result)) {
+          document.body.classList.remove(IS_DRAGGING_CLASS_NAME);
+        }
+      },
+      [browserFields, dataProviders]
+    );
     return (
       <DragDropContext onDragEnd={onDragEnd} onDragStart={onDragStart}>
         {children}
diff --git a/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.tsx b/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.tsx
index dc7f2185c26b72..ec6646fc760856 100644
--- a/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.tsx
@@ -17,7 +17,7 @@ import {
   EuiSpacer,
   EuiToolTip,
 } from '@elastic/eui';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import styled, { injectGlobal } from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
@@ -101,7 +101,7 @@ export const StatefulEditDataProvider = React.memo<Props>(
     const [updatedValue, setUpdatedValue] = useState<string | number>(value);
 
     /** Focuses the Value input if it is visible, falling back to the Save button if it's not */
-    function focusInput() {
+    const focusInput = () => {
       const elements = document.getElementsByClassName(VALUE_INPUT_CLASS_NAME);
 
       if (elements.length > 0) {
@@ -113,25 +113,25 @@ export const StatefulEditDataProvider = React.memo<Props>(
           (saveElements[0] as HTMLElement).focus();
         }
       }
-    }
+    };
 
-    function onFieldSelected(selectedField: EuiComboBoxOptionProps[]) {
+    const onFieldSelected = useCallback((selectedField: EuiComboBoxOptionProps[]) => {
       setUpdatedField(selectedField);
 
       focusInput();
-    }
+    }, []);
 
-    function onOperatorSelected(operatorSelected: EuiComboBoxOptionProps[]) {
+    const onOperatorSelected = useCallback((operatorSelected: EuiComboBoxOptionProps[]) => {
       setUpdatedOperator(operatorSelected);
 
       focusInput();
-    }
+    }, []);
 
-    function onValueChange(e: React.ChangeEvent<HTMLInputElement>) {
+    const onValueChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
       setUpdatedValue(e.target.value);
-    }
+    }, []);
 
-    function disableScrolling() {
+    const disableScrolling = () => {
       const x =
         window.pageXOffset !== undefined
           ? window.pageXOffset
@@ -143,11 +143,11 @@ export const StatefulEditDataProvider = React.memo<Props>(
           : (document.documentElement || document.body.parentNode || document.body).scrollTop;
 
       window.onscroll = () => window.scrollTo(x, y);
-    }
+    };
 
-    function enableScrolling() {
+    const enableScrolling = () => {
       window.onscroll = () => noop;
-    }
+    };
 
     useEffect(() => {
       disableScrolling();
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embeddable.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embeddable.test.tsx.snap
new file mode 100644
index 00000000000000..f343316d88c46c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embeddable.test.tsx.snap
@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Embeddable it renders 1`] = `
+<Component>
+  <Embeddable>
+    <p>
+      Test content
+    </p>
+  </Embeddable>
+</Component>
+`;
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embeddable_header.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embeddable_header.test.tsx.snap
new file mode 100644
index 00000000000000..e88693b292a5dc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embeddable_header.test.tsx.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EmbeddableHeader it renders 1`] = `
+<Component>
+  <EmbeddableHeader
+    title="Test title"
+  />
+</Component>
+`;
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embedded_map.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embedded_map.test.tsx.snap
index 1f23686adca0e8..bf0dfd9417875a 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embedded_map.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/embedded_map.test.tsx.snap
@@ -1,19 +1,34 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`EmbeddedMap renders correctly against snapshot 1`] = `
-<Fragment>
+<Embeddable>
+  <EmbeddableHeader
+    title="Network map"
+  >
+    <EuiText
+      size="xs"
+    >
+      <EuiLink
+        href="undefinedguide/en/siem/guide/undefined/conf-map-ui.html"
+        target="_blank"
+      >
+        Map configuration help
+      </EuiLink>
+    </EuiText>
+  </EmbeddableHeader>
   <InPortal
     node={<div />}
   >
     <MapToolTip />
   </InPortal>
-  <Styled(EuiFlexGroup)>
+  <EmbeddableMap
+    maintainRatio={true}
+  >
     <Loader
       data-test-subj="loading-panel"
       overlay={true}
       size="xl"
     />
-  </Styled(EuiFlexGroup)>
-  <EuiSpacer />
-</Fragment>
+  </EmbeddableMap>
+</Embeddable>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap
index 1aa3b087ac0d04..fb896059460b90 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap
@@ -15,43 +15,41 @@ exports[`IndexPatternsMissingPrompt renders correctly against snapshot 1`] = `
   body={
     <React.Fragment>
       <p>
-        An ECS compliant Kibana index pattern must be configured to view event data on the map. When using beats, you can run the following setup commands to create the required Kibana index patterns, otherwise you can configure them manually within Kibana settings.
+        <FormattedMessage
+          defaultMessage="An ECS compliant Kibana index pattern must be configured to view events on the map. When using {beats}, you can run the {setup} command on your hosts to automatically create the index patterns. For example: {example}."
+          id="xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorDescription1"
+          values={
+            Object {
+              "beats": <a
+                href="https://www.elastic.coguide/en/beats/libbeat/current/getting-started.html"
+                rel="noopener noreferrer"
+                target="_blank"
+              >
+                beats
+              </a>,
+              "example": <EuiCode>
+                ./packetbeat setup
+              </EuiCode>,
+              "setup": <EuiCode>
+                setup
+              </EuiCode>,
+            }
+          }
+        />
       </p>
       <p>
-        <ForwardRef
-          href="https://www.elastic.co/guide/en/beats/auditbeat/current/load-kibana-dashboards.html"
-          target="blank"
-        >
-          auditbeat-*
-        </ForwardRef>
-        , 
-        <ForwardRef
-          href="https://www.elastic.co/guide/en/beats/filebeat/current/load-kibana-dashboards.html"
-          target="blank"
-        >
-          filebeat-*
-        </ForwardRef>
-        , 
-        <ForwardRef
-          href="https://www.elastic.co/guide/en/beats/packetbeat/current/load-kibana-dashboards.html"
-          target="blank"
-        >
-          packetbeat-*
-        </ForwardRef>
-        , 
-        <ForwardRef
-          href="https://www.elastic.co/guide/en/beats/winlogbeat/current/load-kibana-dashboards.html"
-          target="blank"
-        >
-          winlogbeat-*
-        </ForwardRef>
+        <FormattedMessage
+          defaultMessage="You can also configure them manually in Kibana."
+          id="xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorDescription2"
+          values={Object {}}
+        />
       </p>
     </React.Fragment>
   }
   iconType="gisApp"
   title={
     <h2>
-      Required Index Patterns Not Configured
+      Required index patterns not configured
     </h2>
   }
   titleSize="xs"
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/actions/apply_siem_filter_action.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/actions/apply_siem_filter_action.test.tsx
deleted file mode 100644
index bbbbd91513831e..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/actions/apply_siem_filter_action.test.tsx
+++ /dev/null
@@ -1,173 +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 { Filter } from '@kbn/es-query';
-import { get } from 'lodash/fp';
-
-import { ApplySiemFilterAction, ActionContext } from './apply_siem_filter_action';
-// @ts-ignore Missing type defs as maps moves to Typescript
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../../maps/common/constants';
-import {
-  EmbeddableInput,
-  EmbeddableOutput,
-  IEmbeddable,
-} from '../../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
-
-import { siemFilterManager } from '../../search_bar';
-
-interface MockSiemFilterManager {
-  addFilters: (filters: Filter[]) => void;
-}
-const mockSiemFilterManager: MockSiemFilterManager = siemFilterManager as MockSiemFilterManager;
-jest.mock('../../search_bar', () => ({
-  siemFilterManager: {
-    addFilters: jest.fn(),
-  },
-}));
-const mockAddFilters = jest.fn();
-mockSiemFilterManager.addFilters = mockAddFilters;
-
-// Using type narrowing to remove all the any's -- https://github.com/elastic/kibana/pull/43965/files#r318796100
-const isEmbeddable = (
-  embeddable: unknown
-): embeddable is IEmbeddable<EmbeddableInput, EmbeddableOutput> => {
-  return get('type', embeddable) != null;
-};
-
-// Partial actions for testing that even though the types are there, JavaScript
-// could circumvent the types and call execute() and isCompatible() without a filter array
-interface PartialAction {
-  execute: ({ embeddable }: { embeddable: ActionContext['embeddable'] }) => Promise<string>;
-  isCompatible: ({ embeddable }: { embeddable: ActionContext['embeddable'] }) => Promise<boolean>;
-}
-
-// Using type narrowing to remove all the any's
-const isPartialFilterAction = (embeddable: unknown): embeddable is PartialAction => {
-  return embeddable instanceof ApplySiemFilterAction;
-};
-
-describe('ApplySiemFilterAction', () => {
-  test('it has APPLY_SIEM_FILTER_ACTION_ID type and id', () => {
-    const action = new ApplySiemFilterAction();
-    expect(action.id).toBe('APPLY_SIEM_FILTER_ACTION_ID');
-    expect(action.type).toBe('APPLY_SIEM_FILTER_ACTION_ID');
-  });
-
-  test('it has expected display name', () => {
-    const action = new ApplySiemFilterAction();
-    expect(action.getDisplayName()).toMatchInlineSnapshot(`"Apply filter"`);
-  });
-
-  describe('#isCompatible', () => {
-    test('when embeddable type is MAP_SAVED_OBJECT_TYPE and filters exist, returns true', async () => {
-      const action = new ApplySiemFilterAction();
-      const embeddable = {
-        type: MAP_SAVED_OBJECT_TYPE,
-      };
-      if (isEmbeddable(embeddable)) {
-        const result = await action.isCompatible({
-          embeddable,
-          filters: [],
-        });
-        expect(result).toBe(true);
-      } else {
-        throw new Error('Invalid embeddable in unit test');
-      }
-    });
-
-    test('when embeddable type is MAP_SAVED_OBJECT_TYPE and filters do not exist, returns false', async () => {
-      const action = new ApplySiemFilterAction();
-      const embeddable = {
-        type: MAP_SAVED_OBJECT_TYPE,
-      };
-      if (isEmbeddable(embeddable) && isPartialFilterAction(action)) {
-        const result = await action.isCompatible({
-          embeddable,
-        });
-        expect(result).toBe(false);
-      } else {
-        throw new Error('Invalid embeddable or filter in unit test');
-      }
-    });
-
-    test('when embeddable type is not MAP_SAVED_OBJECT_TYPE, returns false', async () => {
-      const action = new ApplySiemFilterAction();
-      const embeddable = {
-        type: 'defaultEmbeddable',
-      };
-      if (isEmbeddable(embeddable)) {
-        const result = await action.isCompatible({
-          embeddable,
-          filters: [],
-        });
-        expect(result).toBe(false);
-      } else {
-        throw new Error('Invalid embeddable in unit test');
-      }
-    });
-  });
-
-  describe('#execute', () => {
-    test('it throws an error when triggerContext not set', async () => {
-      const action = new ApplySiemFilterAction();
-      const embeddable = {
-        type: MAP_SAVED_OBJECT_TYPE,
-      };
-      if (isPartialFilterAction(action) && isEmbeddable(embeddable)) {
-        await expect(
-          action.execute({
-            embeddable,
-          })
-        ).rejects.toThrow('Applying a filter requires a filter as context');
-      } else {
-        throw new Error('Invalid embeddable or filter in unit test');
-      }
-    });
-
-    test('it calls applyFilterQueryFromKueryExpression() with valid expression', async () => {
-      const action = new ApplySiemFilterAction();
-      const embeddable = {
-        type: MAP_SAVED_OBJECT_TYPE,
-        getInput: () => ({
-          query: { query: '' },
-        }),
-      };
-      const filters: Filter[] = [
-        {
-          query: {
-            match: {
-              'host.name': {
-                query: 'zeek-newyork-sha-aa8df15',
-                type: 'phrase',
-              },
-            },
-          },
-          meta: {
-            disabled: false,
-            negate: false,
-            alias: '',
-          },
-        },
-      ];
-      if (isEmbeddable(embeddable)) {
-        await action.execute({
-          embeddable,
-          filters,
-        });
-
-        expect(mockAddFilters.mock.calls[0][0]).toEqual([
-          {
-            meta: { alias: '', disabled: false, negate: false },
-            query: {
-              match: { 'host.name': { query: 'zeek-newyork-sha-aa8df15', type: 'phrase' } },
-            },
-          },
-        ]);
-      } else {
-        throw new Error('Invalid embeddable in unit test');
-      }
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/actions/apply_siem_filter_action.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/actions/apply_siem_filter_action.tsx
deleted file mode 100644
index 52368be60c5169..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/actions/apply_siem_filter_action.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Filter } from '@kbn/es-query';
-import { i18n } from '@kbn/i18n';
-import { IAction } from 'src/plugins/ui_actions/public';
-import { IEmbeddable } from '../../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
-// @ts-ignore Missing type defs as maps moves to Typescript
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../../maps/common/constants';
-import { siemFilterManager } from '../../search_bar';
-
-export const APPLY_SIEM_FILTER_ACTION_ID = 'APPLY_SIEM_FILTER_ACTION_ID';
-
-export interface ActionContext {
-  embeddable: IEmbeddable;
-  filters: Filter[];
-}
-
-export class ApplySiemFilterAction implements IAction<ActionContext> {
-  public readonly type = APPLY_SIEM_FILTER_ACTION_ID;
-  public id = APPLY_SIEM_FILTER_ACTION_ID;
-
-  public getDisplayName() {
-    return i18n.translate('xpack.siem.components.embeddables.actions.applySiemFilterActionTitle', {
-      defaultMessage: 'Apply filter',
-    });
-  }
-
-  public getIconType() {
-    return undefined;
-  }
-
-  public async isCompatible(context: ActionContext): Promise<boolean> {
-    return context.embeddable.type === MAP_SAVED_OBJECT_TYPE && context.filters !== undefined;
-  }
-
-  public async execute({ embeddable, filters }: ActionContext) {
-    if (!filters) {
-      throw new TypeError('Applying a filter requires a filter as context');
-    }
-    siemFilterManager.addFilters(filters);
-  }
-}
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.test.tsx
new file mode 100644
index 00000000000000..49f5306dc1b60a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.test.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import React from 'react';
+
+import '../../mock/ui_settings';
+import { TestProviders } from '../../mock';
+import { Embeddable } from './embeddable';
+
+jest.mock('../../lib/settings/use_kibana_ui_setting');
+
+describe('Embeddable', () => {
+  test('it renders', () => {
+    const wrapper = shallow(
+      <TestProviders>
+        <Embeddable>
+          <p>{'Test content'}</p>
+        </Embeddable>
+      </TestProviders>
+    );
+
+    expect(toJson(wrapper)).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.tsx
new file mode 100644
index 00000000000000..b9a2d01ee0a705
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiPanel } from '@elastic/eui';
+import React from 'react';
+import styled from 'styled-components';
+
+const Panel = styled(EuiPanel)`
+  overflow: hidden;
+`;
+Panel.displayName = 'Panel';
+
+export interface EmbeddableProps {
+  children: React.ReactNode;
+}
+
+export const Embeddable = React.memo<EmbeddableProps>(({ children }) => (
+  <section className="siemEmbeddable">
+    <Panel paddingSize="none">{children}</Panel>
+  </section>
+));
+Embeddable.displayName = 'Embeddable';
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.test.tsx
new file mode 100644
index 00000000000000..4536da3ba7b97a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.test.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { mount, shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import React from 'react';
+
+import '../../mock/ui_settings';
+import { TestProviders } from '../../mock';
+import { EmbeddableHeader } from './embeddable_header';
+
+jest.mock('../../lib/settings/use_kibana_ui_setting');
+
+describe('EmbeddableHeader', () => {
+  test('it renders', () => {
+    const wrapper = shallow(
+      <TestProviders>
+        <EmbeddableHeader title="Test title" />
+      </TestProviders>
+    );
+
+    expect(toJson(wrapper)).toMatchSnapshot();
+  });
+
+  test('it renders the title', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <EmbeddableHeader title="Test title" />
+      </TestProviders>
+    );
+
+    expect(
+      wrapper
+        .find('[data-test-subj="header-embeddable-title"]')
+        .first()
+        .exists()
+    ).toBe(true);
+  });
+
+  test('it renders supplements when children provided', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <EmbeddableHeader title="Test title">
+          <p>{'Test children'}</p>
+        </EmbeddableHeader>
+      </TestProviders>
+    );
+
+    expect(
+      wrapper
+        .find('[data-test-subj="header-embeddable-supplements"]')
+        .first()
+        .exists()
+    ).toBe(true);
+  });
+
+  test('it DOES NOT render supplements when children not provided', () => {
+    const wrapper = mount(
+      <TestProviders>
+        <EmbeddableHeader title="Test title" />
+      </TestProviders>
+    );
+
+    expect(
+      wrapper
+        .find('[data-test-subj="header-embeddable-supplements"]')
+        .first()
+        .exists()
+    ).toBe(false);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.tsx
new file mode 100644
index 00000000000000..dbd9e3f763f928
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable_header.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
+import React from 'react';
+import styled, { css } from 'styled-components';
+
+const Header = styled.header.attrs({
+  className: 'siemEmbeddable__header',
+})`
+  ${({ theme }) => css`
+    border-bottom: ${theme.eui.euiBorderThin};
+    padding: ${theme.eui.paddingSizes.m};
+  `}
+`;
+Header.displayName = 'Header';
+
+export interface EmbeddableHeaderProps {
+  children?: React.ReactNode;
+  title: string | React.ReactNode;
+}
+
+export const EmbeddableHeader = React.memo<EmbeddableHeaderProps>(({ children, title }) => (
+  <Header>
+    <EuiFlexGroup alignItems="center" gutterSize="m">
+      <EuiFlexItem>
+        <EuiTitle size="xxxs">
+          <h6 data-test-subj="header-embeddable-title">{title}</h6>
+        </EuiTitle>
+      </EuiFlexItem>
+
+      {children && (
+        <EuiFlexItem data-test-subj="header-embeddable-supplements" grow={false}>
+          {children}
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
+  </Header>
+));
+EmbeddableHeader.displayName = 'EmbeddableHeader';
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.tsx
index e07909d20e437b..b9c28105e99d15 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.tsx
@@ -4,45 +4,78 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
-import { Filter } from '@kbn/es-query';
+import { EuiLink, EuiText } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
-import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
 import { createPortalNode, InPortal } from 'react-reverse-portal';
 import { Query } from 'src/plugins/data/common';
+import styled, { css } from 'styled-components';
+import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
+import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
 
-import styled from 'styled-components';
-import { start } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
 import { EmbeddablePanel } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
-
+import { start } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
+import { DEFAULT_INDEX_KEY } from '../../../common/constants';
 import { getIndexPatternTitleIdMapping } from '../../hooks/api/helpers';
 import { useIndexPatterns } from '../../hooks/use_index_patterns';
-import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
-import { DEFAULT_INDEX_KEY } from '../../../common/constants';
-import { useKibanaPlugins } from '../../lib/compose/kibana_plugins';
 import { useKibanaCore } from '../../lib/compose/kibana_core';
-import { useStateToaster } from '../toasters';
+import { useKibanaPlugins } from '../../lib/compose/kibana_plugins';
+import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
 import { Loader } from '../loader';
+import { useStateToaster } from '../toasters';
+import { Embeddable } from './embeddable';
+import { EmbeddableHeader } from './embeddable_header';
+import { createEmbeddable, displayErrorToast, setupEmbeddablesAPI } from './embedded_map_helpers';
 import { IndexPatternsMissingPrompt } from './index_patterns_missing_prompt';
-import { MapEmbeddable, SetQuery } from './types';
+import { MapToolTip } from './map_tool_tip/map_tool_tip';
 import * as i18n from './translations';
+import { MapEmbeddable, SetQuery } from './types';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
-import { createEmbeddable, displayErrorToast, setupEmbeddablesAPI } from './embedded_map_helpers';
-import { MapToolTip } from './map_tool_tip/map_tool_tip';
+interface EmbeddableMapProps {
+  maintainRatio?: boolean;
+}
 
-const EmbeddableWrapper = styled(EuiFlexGroup)`
-  position: relative;
-  height: 400px;
-  margin: 0;
+const EmbeddableMap = styled.div.attrs({
+  className: 'siemEmbeddable__map',
+})<EmbeddableMapProps>`
+  ${({ maintainRatio, theme }) => css`
+    .embPanel {
+      border: none;
+      box-shadow: none;
+    }
+
+    .mapToolbarOverlay__button {
+      display: none;
+    }
+
+    ${maintainRatio &&
+      css`
+        padding-top: calc(3 / 4 * 100%); //4:3 (standard) ratio
+        position: relative;
+
+        @media only screen and (min-width: ${theme.eui.euiBreakpoints.m}) {
+          padding-top: calc(9 / 32 * 100%); //32:9 (ultra widescreen) ratio
+        }
 
-  .mapToolbarOverlay__button {
-    display: none;
-  }
+        @media only screen and (min-width: 1441px) and (min-height: 901px) {
+          padding-top: calc(9 / 21 * 100%); //21:9 (ultrawide) ratio
+        }
+
+        .embPanel {
+          bottom: 0;
+          left: 0;
+          position: absolute;
+          right: 0;
+          top: 0;
+        }
+      `}
+  `}
 `;
+EmbeddableMap.displayName = 'EmbeddableMap';
 
 export interface EmbeddedMapProps {
   query: Query;
-  filters: Filter[];
+  filters: esFilters.Filter[];
   startDate: number;
   endDate: number;
   setQuery: SetQuery;
@@ -68,20 +101,21 @@ export const EmbeddedMap = React.memo<EmbeddedMapProps>(
     const plugins = useKibanaPlugins();
     const core = useKibanaCore();
 
+    // Setup embeddables API (i.e. detach extra actions) useEffect
+    useEffect(() => {
+      try {
+        setupEmbeddablesAPI(plugins);
+      } catch (e) {
+        displayErrorToast(i18n.ERROR_CONFIGURING_EMBEDDABLES_API, e.message, dispatchToaster);
+        setIsLoading(false);
+        setIsError(true);
+      }
+    }, []);
+
     // Initial Load useEffect
     useEffect(() => {
       let isSubscribed = true;
       async function setupEmbeddable() {
-        // Configure Embeddables API
-        try {
-          setupEmbeddablesAPI(plugins);
-        } catch (e) {
-          displayErrorToast(i18n.ERROR_CONFIGURING_EMBEDDABLES_API, e.message, dispatchToaster);
-          setIsLoading(false);
-          setIsError(true);
-          return false;
-        }
-
         // Ensure at least one `siem:defaultIndex` index pattern exists before trying to import
         const matchingIndexPatterns = kibanaIndexPatterns.filter(ip =>
           siemDefaultIndices.includes(ip.attributes.title)
@@ -151,11 +185,23 @@ export const EmbeddedMap = React.memo<EmbeddedMapProps>(
     }, [startDate, endDate]);
 
     return isError ? null : (
-      <>
+      <Embeddable>
+        <EmbeddableHeader title={i18n.EMBEDDABLE_HEADER_TITLE}>
+          <EuiText size="xs">
+            <EuiLink
+              href={`${ELASTIC_WEBSITE_URL}guide/en/siem/guide/${DOC_LINK_VERSION}/conf-map-ui.html`}
+              target="_blank"
+            >
+              {i18n.EMBEDDABLE_HEADER_HELP}
+            </EuiLink>
+          </EuiText>
+        </EmbeddableHeader>
+
         <InPortal node={portalNode}>
           <MapToolTip />
         </InPortal>
-        <EmbeddableWrapper>
+
+        <EmbeddableMap maintainRatio={!isIndexError}>
           {embeddable != null ? (
             <EmbeddablePanel
               data-test-subj="embeddable-panel"
@@ -173,9 +219,8 @@ export const EmbeddedMap = React.memo<EmbeddedMapProps>(
           ) : (
             <Loader data-test-subj="loading-panel" overlay size="xl" />
           )}
-        </EmbeddableWrapper>
-        <EuiSpacer />
-      </>
+        </EmbeddableMap>
+      </Embeddable>
     );
   }
 );
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map_helpers.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map_helpers.test.tsx
index 68bab4e5d61a1a..2ad38bae3ccef2 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map_helpers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map_helpers.test.tsx
@@ -45,10 +45,9 @@ describe('embedded_map_helpers', () => {
   });
 
   describe('setupEmbeddablesAPI', () => {
-    test('attaches SIEM_FILTER_ACTION, and detaches extra UI actions', () => {
+    test('detaches extra UI actions', () => {
       setupEmbeddablesAPI((npStart.plugins as unknown) as PluginsStart);
-      expect(npStart.plugins.uiActions.registerAction).toHaveBeenCalledTimes(1);
-      expect(npStart.plugins.uiActions.detachAction).toHaveBeenCalledTimes(3);
+      expect(npStart.plugins.uiActions.detachAction).toHaveBeenCalledTimes(2);
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map_helpers.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map_helpers.tsx
index 3494a13656f8ac..a50cfa98fc977a 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map_helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map_helpers.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import uuid from 'uuid';
 import React from 'react';
 import { OutPortal, PortalNode } from 'react-reverse-portal';
@@ -13,16 +12,10 @@ import { PluginsStart } from 'ui/new_platform/new_platform';
 
 import { ActionToaster, AppToast } from '../toasters';
 import {
-  APPLY_FILTER_TRIGGER,
   CONTEXT_MENU_TRIGGER,
   PANEL_BADGE_TRIGGER,
-  APPLY_FILTER_ACTION,
   ViewMode,
 } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
-import {
-  APPLY_SIEM_FILTER_ACTION_ID,
-  ApplySiemFilterAction,
-} from './actions/apply_siem_filter_action';
 import {
   IndexPatternMapping,
   MapEmbeddable,
@@ -34,6 +27,7 @@ import { getLayerList } from './map_config';
 // @ts-ignore Missing type defs as maps moves to Typescript
 import { MAP_SAVED_OBJECT_TYPE } from '../../../../maps/common/constants';
 import * as i18n from './translations';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 /**
  * Displays an error toast for the provided title and message
@@ -64,23 +58,14 @@ export const displayErrorToast = (
  * Temporary Embeddables API configuration override until ability to edit actions is addressed:
  * https://github.com/elastic/kibana/issues/43643
  *
- * @param applyFilterQueryFromKueryExpression function for updating KQL as provided by NetworkFilter
+ * @param plugins new platform plugins
  *
- * @throws Error if action is already registered
+ * @throws Error if trigger/action doesn't exist
  */
 export const setupEmbeddablesAPI = (plugins: PluginsStart) => {
   try {
-    const actions = plugins.uiActions.getTriggerActions(APPLY_FILTER_TRIGGER);
-    const actionLoaded = actions.some(a => a.id === APPLY_SIEM_FILTER_ACTION_ID);
-    if (!actionLoaded) {
-      const siemFilterAction = new ApplySiemFilterAction();
-      plugins.uiActions.registerAction(siemFilterAction);
-      plugins.uiActions.attachAction(APPLY_FILTER_TRIGGER, siemFilterAction.id);
-
-      plugins.uiActions.detachAction(CONTEXT_MENU_TRIGGER, 'CUSTOM_TIME_RANGE');
-      plugins.uiActions.detachAction(PANEL_BADGE_TRIGGER, 'CUSTOM_TIME_RANGE_BADGE');
-      plugins.uiActions.detachAction(APPLY_FILTER_TRIGGER, APPLY_FILTER_ACTION);
-    }
+    plugins.uiActions.detachAction(CONTEXT_MENU_TRIGGER, 'CUSTOM_TIME_RANGE');
+    plugins.uiActions.detachAction(PANEL_BADGE_TRIGGER, 'CUSTOM_TIME_RANGE_BADGE');
   } catch (e) {
     throw e;
   }
@@ -89,17 +74,19 @@ export const setupEmbeddablesAPI = (plugins: PluginsStart) => {
 /**
  * Creates MapEmbeddable with provided initial configuration
  *
+ * @param filters any existing global filters
  * @param indexPatterns list of index patterns to configure layers for
  * @param query initial query constraints as Query
  * @param startDate
  * @param endDate
  * @param setQuery function as provided by the GlobalTime component for reacting to refresh
  * @param portalNode wrapper for MapToolTip so it is not rendered in the embeddables component tree
+ * @param embeddableApi
  *
  * @throws Error if EmbeddableFactory does not exist
  */
 export const createEmbeddable = async (
-  filters: Filter[],
+  filters: esFilters.Filter[],
   indexPatterns: IndexPatternMapping[],
   query: Query,
   startDate: number,
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx
index 709725b853dd2a..e71398455ee883 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx
@@ -4,69 +4,58 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
-import { EuiButton, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
-
+import { EuiButton, EuiCode, EuiEmptyPrompt } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
 import * as React from 'react';
 import chrome from 'ui/chrome';
+import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
 
 import * as i18n from './translations';
 
-interface DocMapping {
-  beat: string;
-  docLink: string;
-}
-
-export const IndexPatternsMissingPrompt = React.memo(() => {
-  const beatsSetupDocMapping: DocMapping[] = [
-    {
-      beat: 'auditbeat',
-      docLink: `${ELASTIC_WEBSITE_URL}/guide/en/beats/auditbeat/${DOC_LINK_VERSION}/load-kibana-dashboards.html`,
-    },
-    {
-      beat: 'filebeat',
-      docLink: `${ELASTIC_WEBSITE_URL}/guide/en/beats/filebeat/${DOC_LINK_VERSION}/load-kibana-dashboards.html`,
-    },
-    {
-      beat: 'packetbeat',
-      docLink: `${ELASTIC_WEBSITE_URL}/guide/en/beats/packetbeat/${DOC_LINK_VERSION}/load-kibana-dashboards.html`,
-    },
-    {
-      beat: 'winlogbeat',
-      docLink: `${ELASTIC_WEBSITE_URL}/guide/en/beats/winlogbeat/${DOC_LINK_VERSION}/load-kibana-dashboards.html`,
-    },
-  ];
-
-  return (
-    <EuiEmptyPrompt
-      iconType="gisApp"
-      title={<h2>{i18n.ERROR_TITLE}</h2>}
-      titleSize="xs"
-      body={
-        <>
-          <p>{i18n.ERROR_DESCRIPTION}</p>
+export const IndexPatternsMissingPrompt = React.memo(() => (
+  <EuiEmptyPrompt
+    iconType="gisApp"
+    title={<h2>{i18n.ERROR_TITLE}</h2>}
+    titleSize="xs"
+    body={
+      <>
+        <p>
+          <FormattedMessage
+            defaultMessage="An ECS compliant Kibana index pattern must be configured to view events on the map. When using {beats}, you can run the {setup} command on your hosts to automatically create the index patterns. For example: {example}."
+            id="xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorDescription1"
+            values={{
+              beats: (
+                <a
+                  href={`${ELASTIC_WEBSITE_URL}guide/en/beats/libbeat/${DOC_LINK_VERSION}/getting-started.html`}
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  {'beats'}
+                </a>
+              ),
+              setup: <EuiCode>{'setup'}</EuiCode>,
+              example: <EuiCode>{'./packetbeat setup'}</EuiCode>,
+            }}
+          />
+        </p>
 
-          <p>
-            {beatsSetupDocMapping
-              .map<React.ReactNode>(v => (
-                <EuiLink key={v.beat} href={v.docLink} target="blank">
-                  {`${v.beat}-*`}
-                </EuiLink>
-              ))
-              .reduce((acc, v) => [acc, ', ', v])}
-          </p>
-        </>
-      }
-      actions={
-        <EuiButton
-          href={`${chrome.getBasePath()}/app/kibana#/management/kibana/index_patterns`}
-          color="primary"
-          target="_blank"
-          fill
-        >
-          {i18n.ERROR_BUTTON}
-        </EuiButton>
-      }
-    />
-  );
-});
+        <p>
+          <FormattedMessage
+            defaultMessage="You can also configure them manually in Kibana."
+            id="xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorDescription2"
+          />
+        </p>
+      </>
+    }
+    actions={
+      <EuiButton
+        href={`${chrome.getBasePath()}/app/kibana#/management/kibana/index_patterns`}
+        color="primary"
+        target="_blank"
+        fill
+      >
+        {i18n.ERROR_BUTTON}
+      </EuiButton>
+    }
+  />
+));
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/line_tool_tip_content.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/line_tool_tip_content.test.tsx.snap
index 29656a91eff720..05f507ec3a775b 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/line_tool_tip_content.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/line_tool_tip_content.test.tsx.snap
@@ -24,13 +24,13 @@ exports[`LineToolTipContent renders correctly against snapshot 1`] = `
     contextId="contextId"
     destinationBytes={
       Array [
-        undefined,
+        "testPropValue",
       ]
     }
     eventId="map-line-tooltip-contextId"
     sourceBytes={
       Array [
-        undefined,
+        "testPropValue",
       ]
     }
   />
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/point_tool_tip_content.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/point_tool_tip_content.test.tsx.snap
index 855760b29d2e6d..2a17a2aae84973 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/point_tool_tip_content.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/point_tool_tip_content.test.tsx.snap
@@ -3,7 +3,6 @@
 exports[`PointToolTipContent renders correctly against snapshot 1`] = `
 <Component>
   <PointToolTipContent
-    addFilters={[MockFunction]}
     closeTooltip={[MockFunction]}
     contextId="contextId"
     featureProps={
@@ -11,15 +10,9 @@ exports[`PointToolTipContent renders correctly against snapshot 1`] = `
         Object {
           "_propertyKey": "host.name",
           "_rawValue": "testPropValue",
-          "getESFilters": [Function],
         },
       ]
     }
-    featurePropsFilters={
-      Object {
-        "host.name": Object {},
-      }
-    }
   />
 </Component>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
index 3f563550428f83..0bbcd4a7dcbdb3 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx
@@ -9,13 +9,17 @@ import toJson from 'enzyme-to-json';
 import * as React from 'react';
 import { LineToolTipContent } from './line_tool_tip_content';
 import { FeatureProperty } from '../types';
+import { SUM_OF_DESTINATION_BYTES, SUM_OF_SOURCE_BYTES } from '../map_config';
 
 describe('LineToolTipContent', () => {
   const mockFeatureProps: FeatureProperty[] = [
     {
-      _propertyKey: 'host.name',
+      _propertyKey: SUM_OF_DESTINATION_BYTES,
+      _rawValue: 'testPropValue',
+    },
+    {
+      _propertyKey: SUM_OF_SOURCE_BYTES,
       _rawValue: 'testPropValue',
-      getESFilters: () => new Promise(resolve => setTimeout(resolve)),
     },
   ];
 
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.tsx
index 5103c37c86c237..7cdf3a545a2d6d 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.tsx
@@ -28,8 +28,11 @@ interface LineToolTipContentProps {
 
 export const LineToolTipContent = React.memo<LineToolTipContentProps>(
   ({ contextId, featureProps }) => {
-    const lineProps = featureProps.reduce<Record<string, string>>(
-      (acc, f) => ({ ...acc, ...{ [f._propertyKey]: f._rawValue } }),
+    const lineProps = featureProps.reduce<Record<string, string[]>>(
+      (acc, f) => ({
+        ...acc,
+        ...{ [f._propertyKey]: Array.isArray(f._rawValue) ? f._rawValue : [f._rawValue] },
+      }),
       {}
     );
 
@@ -44,9 +47,9 @@ export const LineToolTipContent = React.memo<LineToolTipContentProps>(
         </EuiFlexItem>
         <SourceDestinationArrows
           contextId={contextId}
-          destinationBytes={[lineProps[SUM_OF_DESTINATION_BYTES]]}
+          destinationBytes={lineProps[SUM_OF_DESTINATION_BYTES]}
           eventId={`map-line-tooltip-${contextId}`}
-          sourceBytes={[lineProps[SUM_OF_SOURCE_BYTES]]}
+          sourceBytes={lineProps[SUM_OF_SOURCE_BYTES]}
         />
         <EuiFlexItem>
           <FlowBadge color="hollow">
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.tsx
index 8b9a86408ec068..b26ad1f9ffba1d 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.tsx
@@ -34,7 +34,6 @@ export const MapToolTip = React.memo<MapToolTipProps>(
     const [isError, setIsError] = useState<boolean>(false);
     const [featureIndex, setFeatureIndex] = useState<number>(0);
     const [featureProps, setFeatureProps] = useState<FeatureProperty[]>([]);
-    const [featurePropsFilters, setFeaturePropsFilters] = useState<Record<string, object>>({});
     const [featureGeometry, setFeatureGeometry] = useState<FeatureGeometry | null>(null);
     const [, setLayerName] = useState<string>('');
 
@@ -67,20 +66,7 @@ export const MapToolTip = React.memo<MapToolTipProps>(
               getLayerName(layerId),
             ]);
 
-            // Fetch ES filters in advance while loader is present to prevent lag when user clicks to add filter
-            const featurePropsPromises = await Promise.all(
-              featureProperties.map(property => property.getESFilters())
-            );
-            const featurePropsESFilters = featureProperties.reduce(
-              (acc, property, index) => ({
-                ...acc,
-                [property._propertyKey]: featurePropsPromises[index],
-              }),
-              {}
-            );
-
             setFeatureProps(featureProperties);
-            setFeaturePropsFilters(featurePropsESFilters);
             setFeatureGeometry(featureGeo);
             setLayerName(layerNameString);
           } catch (e) {
@@ -135,8 +121,6 @@ export const MapToolTip = React.memo<MapToolTipProps>(
               <PointToolTipContent
                 contextId={`${features[featureIndex].layerId}-${features[featureIndex].id}-${featureIndex}`}
                 featureProps={featureProps}
-                featurePropsFilters={featurePropsFilters}
-                addFilters={addFilters}
                 closeTooltip={closeTooltip}
               />
             )}
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
index 296935be34dfea..567f091e78cb56 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx
@@ -24,13 +24,17 @@ describe('PointToolTipContent', () => {
     {
       _propertyKey: 'host.name',
       _rawValue: 'testPropValue',
-      getESFilters: () => new Promise(resolve => setTimeout(resolve)),
     },
   ];
-  const mockFeaturePropsFilters: Record<string, object> = { 'host.name': {} };
+
+  const mockFeaturePropsArrayValue: FeatureProperty[] = [
+    {
+      _propertyKey: 'host.name',
+      _rawValue: ['testPropValue1', 'testPropValue2'],
+    },
+  ];
 
   test('renders correctly against snapshot', () => {
-    const addFilters = jest.fn();
     const closeTooltip = jest.fn();
 
     const wrapper = shallow(
@@ -38,8 +42,6 @@ describe('PointToolTipContent', () => {
         <PointToolTipContent
           contextId={'contextId'}
           featureProps={mockFeatureProps}
-          featurePropsFilters={mockFeaturePropsFilters}
-          addFilters={addFilters}
           closeTooltip={closeTooltip}
         />
       </TestProviders>
@@ -47,31 +49,30 @@ describe('PointToolTipContent', () => {
     expect(toJson(wrapper)).toMatchSnapshot();
   });
 
-  test('tooltip closes when filter for value hover action is clicked', () => {
-    const addFilters = jest.fn();
+  test('renders array filter correctly', () => {
     const closeTooltip = jest.fn();
 
     const wrapper = mount(
       <TestProviders>
         <PointToolTipContent
           contextId={'contextId'}
-          featureProps={mockFeatureProps}
-          featurePropsFilters={mockFeaturePropsFilters}
-          addFilters={addFilters}
+          featureProps={mockFeaturePropsArrayValue}
           closeTooltip={closeTooltip}
         />
       </TestProviders>
     );
-    wrapper
-      .find(`[data-test-subj="hover-actions-${mockFeatureProps[0]._propertyKey}"]`)
-      .first()
-      .simulate('mouseenter');
-    wrapper
-      .find(`[data-test-subj="add-to-filter-${mockFeatureProps[0]._propertyKey}"]`)
-      .first()
-      .simulate('click');
-    expect(closeTooltip).toHaveBeenCalledTimes(1);
-    expect(addFilters).toHaveBeenCalledTimes(1);
+    expect(wrapper.find('[data-test-subj="add-to-kql-host.name"]').prop('filter')).toEqual({
+      meta: {
+        alias: null,
+        disabled: false,
+        key: 'host.name',
+        negate: false,
+        params: { query: 'testPropValue1' },
+        type: 'phrase',
+        value: 'testPropValue1',
+      },
+      query: { match: { 'host.name': { query: 'testPropValue1', type: 'phrase' } } },
+    });
   });
 
   describe('#getRenderedFieldValue', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.tsx
index e2d21f00cb6a8b..c747c44fd8ccae 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.tsx
@@ -5,11 +5,11 @@
  */
 
 import React from 'react';
-import { EuiIcon, EuiToolTip } from '@elastic/eui';
-import * as i18n from '../translations';
 import { sourceDestinationFieldMappings } from '../map_config';
-import { WithHoverActions } from '../../with_hover_actions';
-import { HoverActionsContainer } from '../../page/add_to_kql';
+import {
+  AddFilterToGlobalSearchBar,
+  createFilter,
+} from '../../page/add_filter_to_global_search_bar';
 import { getEmptyTagValue, getOrEmptyTagFromValue } from '../../empty_value';
 import { DescriptionListStyled } from '../../page';
 import { FeatureProperty } from '../types';
@@ -19,51 +19,34 @@ import { DefaultFieldRenderer } from '../../field_renderers/field_renderers';
 interface PointToolTipContentProps {
   contextId: string;
   featureProps: FeatureProperty[];
-  featurePropsFilters: Record<string, object>;
-  addFilters?(filter: object): void;
   closeTooltip?(): void;
 }
 
 export const PointToolTipContent = React.memo<PointToolTipContentProps>(
-  ({ contextId, featureProps, featurePropsFilters, addFilters, closeTooltip }) => {
-    const featureDescriptionListItems = featureProps.map(property => ({
-      title: sourceDestinationFieldMappings[property._propertyKey],
-      description: (
-        <WithHoverActions
-          data-test-subj={`hover-actions-${property._propertyKey}`}
-          hoverContent={
-            <HoverActionsContainer>
-              <EuiToolTip content={i18n.FILTER_FOR_VALUE}>
-                <EuiIcon
-                  data-test-subj={`add-to-filter-${property._propertyKey}`}
-                  type="filter"
-                  onClick={() => {
-                    if (closeTooltip != null && addFilters != null) {
-                      closeTooltip();
-                      addFilters(featurePropsFilters[property._propertyKey]);
-                    }
-                  }}
-                />
-              </EuiToolTip>
-            </HoverActionsContainer>
-          }
-          render={() =>
-            property._rawValue != null ? (
+  ({ contextId, featureProps, closeTooltip }) => {
+    const featureDescriptionListItems = featureProps.map(
+      ({ _propertyKey: key, _rawValue: value }) => ({
+        title: sourceDestinationFieldMappings[key],
+        description: (
+          <AddFilterToGlobalSearchBar
+            filter={createFilter(key, Array.isArray(value) ? value[0] : value)}
+            onFilterAdded={closeTooltip}
+            data-test-subj={`add-to-kql-${key}`}
+          >
+            {value != null ? (
               <DefaultFieldRenderer
-                rowItems={
-                  Array.isArray(property._rawValue) ? property._rawValue : [property._rawValue]
-                }
-                attrName={property._propertyKey}
-                idPrefix={`map-point-tooltip-${contextId}-${property._propertyKey}-${property._rawValue}`}
-                render={item => getRenderedFieldValue(property._propertyKey, item)}
+                rowItems={Array.isArray(value) ? value : [value]}
+                attrName={key}
+                idPrefix={`map-point-tooltip-${contextId}-${key}-${value}`}
+                render={item => getRenderedFieldValue(key, item)}
               />
             ) : (
               getEmptyTagValue()
-            )
-          }
-        />
-      ),
-    }));
+            )}
+          </AddFilterToGlobalSearchBar>
+        ),
+      })
+    );
 
     return <DescriptionListStyled listItems={featureDescriptionListItems} />;
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/translations.ts b/x-pack/legacy/plugins/siem/public/components/embeddables/translations.ts
index 373bd1d054a43b..958619bee19d35 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/translations.ts
@@ -6,6 +6,20 @@
 
 import { i18n } from '@kbn/i18n';
 
+export const EMBEDDABLE_HEADER_TITLE = i18n.translate(
+  'xpack.siem.components.embeddables.embeddedMap.embeddableHeaderTitle',
+  {
+    defaultMessage: 'Network map',
+  }
+);
+
+export const EMBEDDABLE_HEADER_HELP = i18n.translate(
+  'xpack.siem.components.embeddables.embeddedMap.embeddableHeaderHelp',
+  {
+    defaultMessage: 'Map configuration help',
+  }
+);
+
 export const MAP_TITLE = i18n.translate(
   'xpack.siem.components.embeddables.embeddedMap.embeddablePanelTitle',
   {
@@ -51,15 +65,7 @@ export const ERROR_CREATING_EMBEDDABLE = i18n.translate(
 export const ERROR_TITLE = i18n.translate(
   'xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorTitle',
   {
-    defaultMessage: 'Required Index Patterns Not Configured',
-  }
-);
-
-export const ERROR_DESCRIPTION = i18n.translate(
-  'xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorDescription',
-  {
-    defaultMessage:
-      'An ECS compliant Kibana index pattern must be configured to view event data on the map. When using beats, you can run the following setup commands to create the required Kibana index patterns, otherwise you can configure them manually within Kibana settings.',
+    defaultMessage: 'Required index patterns not configured',
   }
 );
 
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/types.ts b/x-pack/legacy/plugins/siem/public/components/embeddables/types.ts
index 3a13753ba25e46..10412ecdb50131 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/types.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter as ESFilterType } from '@kbn/es-query';
 import { Query } from 'src/plugins/data/common';
 import { TimeRange } from 'src/plugins/data/public';
 import {
@@ -14,9 +13,10 @@ import {
   EmbeddableFactory,
 } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
 import { inputsModel } from '../../store/inputs';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 export interface MapEmbeddableInput extends EmbeddableInput {
-  filters: ESFilterType[];
+  filters: esFilters.Filter[];
   query: Query;
   refreshConfig: {
     isPaused: boolean;
@@ -51,8 +51,7 @@ export interface LoadFeatureProps {
 
 export interface FeatureProperty {
   _propertyKey: string;
-  _rawValue: string;
-  getESFilters(): Promise<object>;
+  _rawValue: string | string[];
 }
 
 export interface FeatureGeometry {
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/stateful_event_details.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/stateful_event_details.tsx
index cb677368298782..c614fd52316bce 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/stateful_event_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/stateful_event_details.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, { useCallback, useState } from 'react';
 
 import { BrowserFields } from '../../containers/source';
 import { ColumnHeader } from '../timeline/body/column_headers/column_header';
@@ -27,6 +27,7 @@ export const StatefulEventDetails = React.memo<Props>(
   ({ browserFields, columnHeaders, data, id, onUpdateColumns, timelineId, toggleColumn }) => {
     const [view, setView] = useState<View>('table-view');
 
+    const handleSetView = useCallback(newView => setView(newView), []);
     return (
       <EventDetails
         browserFields={browserFields}
@@ -34,7 +35,7 @@ export const StatefulEventDetails = React.memo<Props>(
         data={data}
         id={id}
         onUpdateColumns={onUpdateColumns}
-        onViewSelected={newView => setView(newView)}
+        onViewSelected={handleSetView}
         timelineId={timelineId}
         toggleColumn={toggleColumn}
         view={view}
diff --git a/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.tsx b/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.tsx
index 13f0666b31212c..6b79a6402586e8 100644
--- a/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiPanel } from '@elastic/eui';
-import { Filter, getEsQueryConfig } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/es-query';
 import { getOr, isEmpty, isEqual } from 'lodash/fp';
 import React from 'react';
 import styled from 'styled-components';
@@ -31,6 +31,7 @@ import { TimelineRefetch } from '../timeline/refetch_timeline';
 import { isCompactFooter } from '../timeline/timeline';
 import { ManageTimelineContext } from '../timeline/timeline_context';
 import * as i18n from './translations';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 const DEFAULT_EVENTS_VIEWER_HEIGHT = 500;
 
@@ -44,7 +45,7 @@ interface Props {
   columns: ColumnHeader[];
   dataProviders: DataProvider[];
   end: number;
-  filters: Filter[];
+  filters: esFilters.Filter[];
   height?: number;
   id: string;
   indexPattern: StaticIndexPattern;
diff --git a/x-pack/legacy/plugins/siem/public/components/events_viewer/index.tsx b/x-pack/legacy/plugins/siem/public/components/events_viewer/index.tsx
index 0ecfb15a67f3bb..5681588cb44b71 100644
--- a/x-pack/legacy/plugins/siem/public/components/events_viewer/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/events_viewer/index.tsx
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { isEqual } from 'lodash/fp';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 import { Query } from 'src/plugins/data/common';
@@ -19,6 +18,7 @@ import { ColumnHeader } from '../timeline/body/column_headers/column_header';
 import { DataProvider } from '../timeline/data_providers/data_provider';
 import { Sort } from '../timeline/body/sort';
 import { OnChangeItemsPerPage } from '../timeline/events';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 import { EventsViewer } from './events_viewer';
 import { InputsModelId } from '../../store/inputs/constants';
@@ -33,7 +33,7 @@ interface StateReduxProps {
   activePage?: number;
   columns: ColumnHeader[];
   dataProviders?: DataProvider[];
-  filters: Filter[];
+  filters: esFilters.Filter[];
   isLive: boolean;
   itemsPerPage?: number;
   itemsPerPageOptions?: number[];
@@ -102,32 +102,40 @@ const StatefulEventsViewerComponent = React.memo<Props>(
       };
     }, []);
 
-    const onChangeItemsPerPage: OnChangeItemsPerPage = itemsChangedPerPage =>
-      updateItemsPerPage({ id, itemsPerPage: itemsChangedPerPage });
-
-    const toggleColumn = (column: ColumnHeader) => {
-      const exists = columns.findIndex(c => c.id === column.id) !== -1;
+    const onChangeItemsPerPage: OnChangeItemsPerPage = useCallback(
+      itemsChangedPerPage => updateItemsPerPage({ id, itemsPerPage: itemsChangedPerPage }),
+      [id, updateItemsPerPage]
+    );
 
-      if (!exists && upsertColumn != null) {
-        upsertColumn({
-          column,
-          id,
-          index: 1,
-        });
-      }
+    const toggleColumn = useCallback(
+      (column: ColumnHeader) => {
+        const exists = columns.findIndex(c => c.id === column.id) !== -1;
+
+        if (!exists && upsertColumn != null) {
+          upsertColumn({
+            column,
+            id,
+            index: 1,
+          });
+        }
+
+        if (exists && removeColumn != null) {
+          removeColumn({
+            columnId: column.id,
+            id,
+          });
+        }
+      },
+      [columns, id, upsertColumn, removeColumn]
+    );
 
-      if (exists && removeColumn != null) {
-        removeColumn({
-          columnId: column.id,
-          id,
-        });
-      }
-    };
+    const handleOnMouseEnter = useCallback(() => setShowInspect(true), []);
+    const handleOnMouseLeave = useCallback(() => setShowInspect(false), []);
 
     return (
       <WithSource sourceId="default">
         {({ indexPattern, browserFields }) => (
-          <div onMouseEnter={() => setShowInspect(true)} onMouseLeave={() => setShowInspect(false)}>
+          <div onMouseEnter={handleOnMouseEnter} onMouseLeave={handleOnMouseLeave}>
             <EventsViewer
               browserFields={browserFields}
               columns={columns}
diff --git a/x-pack/legacy/plugins/siem/public/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap
index 928f62cffd7205..6ae92689664807 100644
--- a/x-pack/legacy/plugins/siem/public/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap
@@ -35,8 +35,7 @@ exports[`Field Renderers #autonomousSystemRenderer it renders correctly against
 
 exports[`Field Renderers #dateRenderer it renders correctly against snapshot 1`] = `
 <Component>
-  <FormattedDate
-    fieldName="firstSeen"
+  <FormattedRelativePreferenceDate
     value="2019-02-07T17:19:41.636Z"
   />
 </Component>
diff --git a/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx b/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx
index 6306dc0d288cf0..0fd63bc3f2bf27 100644
--- a/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.test.tsx
@@ -60,16 +60,14 @@ describe('Field Renderers', () => {
   describe('#dateRenderer', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(
-        <TestProviders>{dateRenderer('firstSeen', mockData.complete.source!)}</TestProviders>
+        <TestProviders>{dateRenderer(mockData.complete.source!.firstSeen)}</TestProviders>
       );
 
       expect(toJson(wrapper)).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when invalid field provided', () => {
-      const wrapper = mount(
-        <TestProviders>{dateRenderer('geo.spark_plug', mockData.complete.source!)}</TestProviders>
-      );
+      const wrapper = mount(<TestProviders>{dateRenderer(null)}</TestProviders>);
       expect(wrapper.text()).toEqual(getEmptyValue());
     });
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.tsx b/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.tsx
index c7912777c653b9..5df961dfceeb50 100644
--- a/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/field_renderers/field_renderers.tsx
@@ -10,21 +10,20 @@ import { getOr } from 'lodash/fp';
 import React, { Fragment, useState } from 'react';
 import { pure } from 'recompose';
 
-import {
-  AutonomousSystem,
-  FlowTarget,
-  HostEcsFields,
-  IpOverviewData,
-  Overview,
-} from '../../graphql/types';
+import styled from 'styled-components';
+import { AutonomousSystem, FlowTarget, HostEcsFields, IpOverviewData } from '../../graphql/types';
 import { escapeDataProviderId } from '../drag_and_drop/helpers';
 import { DefaultDraggable } from '../draggables';
 import { getEmptyTagValue } from '../empty_value';
-import { FormattedDate } from '../formatted_date';
+import { FormattedRelativePreferenceDate } from '../formatted_date';
 import { HostDetailsLink, ReputationLink, VirusTotalLink, WhoIsLink } from '../links';
 import { Spacer } from '../page';
 import * as i18n from '../page/network/ip_overview/translations';
 
+const DraggableContainerFlexGroup = styled(EuiFlexGroup)`
+  flex-grow: unset;
+`;
+
 export const IpOverviewId = 'ip-overview';
 
 /** The default max-height of the popover used to show "+n More" items (e.g. `+9 More`) */
@@ -53,8 +52,8 @@ export const locationRenderer = (fieldNames: string[], data: IpOverviewData): Re
     getEmptyTagValue()
   );
 
-export const dateRenderer = (fieldName: string, data: Overview): React.ReactElement => (
-  <FormattedDate value={getOr(null, fieldName, data)} fieldName={fieldName} />
+export const dateRenderer = (timestamp?: string | null): React.ReactElement => (
+  <FormattedRelativePreferenceDate value={timestamp} />
 );
 
 export const autonomousSystemRenderer = (
@@ -182,7 +181,7 @@ export const DefaultFieldRenderer = pure<DefaultFieldRendererProps>(
       });
 
       return draggables.length > 0 ? (
-        <EuiFlexGroup alignItems="center" gutterSize="none">
+        <DraggableContainerFlexGroup alignItems="center" gutterSize="none" component="span">
           {draggables}{' '}
           {
             <DefaultFieldRendererOverflow
@@ -193,7 +192,7 @@ export const DefaultFieldRenderer = pure<DefaultFieldRendererProps>(
               moreMaxHeight={moreMaxHeight}
             />
           }
-        </EuiFlexGroup>
+        </DraggableContainerFlexGroup>
       ) : (
         getEmptyTagValue()
       );
@@ -247,7 +246,7 @@ export const DefaultFieldRendererOverflow = React.memo<DefaultFieldRendererOverf
   ({ idPrefix, moreMaxHeight, overflowIndexStart = 5, render, rowItems }) => {
     const [isOpen, setIsOpen] = useState(false);
     return (
-      <>
+      <EuiFlexItem grow={false}>
         {rowItems.length > overflowIndexStart && (
           <EuiPopover
             id="popover"
@@ -272,10 +271,10 @@ export const DefaultFieldRendererOverflow = React.memo<DefaultFieldRendererOverf
               rowItems={rowItems}
               moreMaxHeight={moreMaxHeight}
               overflowIndexStart={overflowIndexStart}
-            ></MoreContainer>
+            />
           </EuiPopover>
         )}
-      </>
+      </EuiFlexItem>
     );
   }
 );
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.test.tsx
index 6406c4609a266d..0a8fd9b54f4aab 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.test.tsx
@@ -112,7 +112,7 @@ describe('getCategoryColumns', () => {
 
     expect(
       wrapper.find(`.field-browser-category-pane-${selectedCategoryId}-${timelineId}`).first()
-    ).toHaveStyleRule('font-weight', 'bold');
+    ).toHaveStyleRule('font-weight', 'bold', { modifier: '.euiText' });
   });
 
   test('it does NOT render an un-selected category with bold text', () => {
@@ -135,7 +135,7 @@ describe('getCategoryColumns', () => {
 
     expect(
       wrapper.find(`.field-browser-category-pane-${notTheSelectedCategoryId}-${timelineId}`).first()
-    ).toHaveStyleRule('font-weight', 'normal');
+    ).toHaveStyleRule('font-weight', 'normal', { modifier: '.euiText' });
   });
 
   test('it invokes onCategorySelected when a user clicks a category', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.tsx
index 2581fba75da1e5..1845a0bae88d59 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_columns.tsx
@@ -26,7 +26,9 @@ import { LoadingSpinner, getCategoryPaneCategoryClassName, getFieldCount } from
 import * as i18n from './translations';
 
 const CategoryName = styled.span<{ bold: boolean }>`
-  font-weight: ${({ bold }) => (bold ? 'bold' : 'normal')};
+  .euiText {
+    font-weight: ${({ bold }) => (bold ? 'bold' : 'normal')};
+  }
 `;
 
 CategoryName.displayName = 'CategoryName';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.tsx
index fb47672512de56..70604f73105f9e 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiOutsideClickDetector } from '@elastic/eui';
-import React, { useEffect } from 'react';
+import React, { useEffect, useCallback } from 'react';
 import { noop } from 'lodash/fp';
 import styled, { css } from 'styled-components';
 
@@ -122,7 +122,7 @@ export const FieldsBrowser = React.memo<Props>(
     width,
   }) => {
     /** Focuses the input that filters the field browser */
-    function focusInput() {
+    const focusInput = () => {
       const elements = document.getElementsByClassName(
         getFieldBrowserSearchInputClassName(timelineId)
       );
@@ -130,22 +130,28 @@ export const FieldsBrowser = React.memo<Props>(
       if (elements.length > 0) {
         (elements[0] as HTMLElement).focus(); // this cast is required because focus() does not exist on every `Element` returned by `getElementsByClassName`
       }
-    }
+    };
 
     /** Invoked when the user types in the input to filter the field browser */
-    function onInputChange(event: React.ChangeEvent<HTMLInputElement>) {
-      onSearchInputChange(event.target.value);
-    }
+    const onInputChange = useCallback(
+      (event: React.ChangeEvent<HTMLInputElement>) => {
+        onSearchInputChange(event.target.value);
+      },
+      [onSearchInputChange]
+    );
 
-    function selectFieldAndHide(fieldId: string) {
-      if (onFieldSelected != null) {
-        onFieldSelected(fieldId);
-      }
+    const selectFieldAndHide = useCallback(
+      (fieldId: string) => {
+        if (onFieldSelected != null) {
+          onFieldSelected(fieldId);
+        }
 
-      onHideFieldBrowser();
-    }
+        onHideFieldBrowser();
+      },
+      [onFieldSelected, onHideFieldBrowser]
+    );
 
-    function scrollViews() {
+    const scrollViews = () => {
       if (selectedCategoryId !== '') {
         const categoryPaneTitles = document.getElementsByClassName(
           getCategoryPaneCategoryClassName({
@@ -171,7 +177,7 @@ export const FieldsBrowser = React.memo<Props>(
       }
 
       focusInput(); // always re-focus the input to enable additional filtering
-    }
+    };
 
     useEffect(() => {
       scrollViews();
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/index.test.tsx
index 4c9c1fc4147ab7..8948f765b8fbca 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/index.test.tsx
@@ -14,8 +14,17 @@ import { TestProviders } from '../../mock';
 import { FIELD_BROWSER_HEIGHT, FIELD_BROWSER_WIDTH } from './helpers';
 
 import { StatefulFieldsBrowser } from '.';
-
+// Suppress warnings about "act" until async/await syntax is supported: https://github.com/facebook/react/issues/14769
+/* eslint-disable no-console */
+const originalError = console.error;
 describe('StatefulFieldsBrowser', () => {
+  beforeAll(() => {
+    console.error = jest.fn();
+  });
+
+  afterAll(() => {
+    console.error = originalError;
+  });
   const timelineId = 'test';
 
   test('it renders the Fields button, which displays the fields browser on click', () => {
@@ -85,6 +94,9 @@ describe('StatefulFieldsBrowser', () => {
   });
 
   describe('updateSelectedCategoryId', () => {
+    beforeEach(() => {
+      jest.useFakeTimers();
+    });
     test('it updates the selectedCategoryId state, which makes the category bold, when the user clicks a category name in the left hand side of the field browser', () => {
       const wrapper = mount(
         <TestProviders>
@@ -111,10 +123,43 @@ describe('StatefulFieldsBrowser', () => {
         .simulate('click');
 
       wrapper.update();
-
       expect(
         wrapper.find(`.field-browser-category-pane-auditd-${timelineId}`).first()
-      ).toHaveStyleRule('font-weight', 'bold');
+      ).toHaveStyleRule('font-weight', 'bold', { modifier: '.euiText' });
+    });
+
+    test('it updates the selectedCategoryId state according to most fields returned', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <StatefulFieldsBrowser
+            browserFields={mockBrowserFields}
+            columnHeaders={[]}
+            height={FIELD_BROWSER_HEIGHT}
+            onUpdateColumns={jest.fn()}
+            timelineId={timelineId}
+            toggleColumn={jest.fn()}
+            width={FIELD_BROWSER_WIDTH}
+          />
+        </TestProviders>
+      );
+
+      wrapper
+        .find('[data-test-subj="show-field-browser"]')
+        .first()
+        .simulate('click');
+      expect(
+        wrapper.find(`.field-browser-category-pane-cloud-${timelineId}`).first()
+      ).toHaveStyleRule('font-weight', 'normal', { modifier: '.euiText' });
+      wrapper
+        .find('[data-test-subj="field-search"]')
+        .last()
+        .simulate('change', { target: { value: 'cloud' } });
+
+      jest.runOnlyPendingTimers();
+      wrapper.update();
+      expect(
+        wrapper.find(`.field-browser-category-pane-cloud-${timelineId}`).first()
+      ).toHaveStyleRule('font-weight', 'bold', { modifier: '.euiText' });
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/index.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/index.tsx
index 7d21e1f44d04b4..2c8092a3295ad8 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiButtonEmpty, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState, useCallback, useMemo } from 'react';
 import { connect } from 'react-redux';
 import styled from 'styled-components';
 import { ActionCreator } from 'typescript-fsa';
@@ -23,7 +23,7 @@ import { FieldBrowserProps } from './types';
 const fieldsButtonClassName = 'fields-button';
 
 /** wait this many ms after the user completes typing before applying the filter input */
-const INPUT_TIMEOUT = 250;
+export const INPUT_TIMEOUT = 250;
 
 const FieldsBrowserButtonContainer = styled.div`
   position: relative;
@@ -82,78 +82,79 @@ export const StatefulFieldsBrowserComponent = React.memo<FieldBrowserProps & Dis
     }, []);
 
     /** Shows / hides the field browser */
-    function toggleShow() {
+    const toggleShow = useCallback(() => {
       setShow(!show);
-    }
+    }, [show]);
 
     /** Invoked when the user types in the filter input */
-    function updateFilter(newFilterInput: string) {
-      setFilterInput(newFilterInput);
-      setIsSearching(true);
-
-      if (inputTimeoutId.current !== 0) {
-        clearTimeout(inputTimeoutId.current); // ⚠️ mutation: cancel any previous timers
-      }
-
-      // ⚠️ mutation: schedule a new timer that will apply the filter when it fires:
-      inputTimeoutId.current = window.setTimeout(() => {
-        const newFilteredBrowserFields = filterBrowserFieldsByFieldName({
-          browserFields: mergeBrowserFieldsWithDefaultCategory(browserFields),
-          substring: filterInput,
-        });
-
-        setFilteredBrowserFields(newFilteredBrowserFields);
-        setIsSearching(false);
-
-        const newSelectedCategoryId =
-          filterInput === '' || Object.keys(newFilteredBrowserFields).length === 0
-            ? DEFAULT_CATEGORY_NAME
-            : Object.keys(newFilteredBrowserFields)
-                .sort()
-                .reduce<string>(
-                  (selected, category) =>
-                    newFilteredBrowserFields[category].fields != null &&
-                    newFilteredBrowserFields[selected].fields != null &&
-                    newFilteredBrowserFields[category].fields!.length >
-                      newFilteredBrowserFields[selected].fields!.length
-                      ? category
-                      : selected,
-                  Object.keys(newFilteredBrowserFields)[0]
-                );
-        setSelectedCategoryId(newSelectedCategoryId);
-      }, INPUT_TIMEOUT);
-    }
+    const updateFilter = useCallback(
+      (newFilterInput: string) => {
+        setFilterInput(newFilterInput);
+        setIsSearching(true);
+        if (inputTimeoutId.current !== 0) {
+          clearTimeout(inputTimeoutId.current); // ⚠️ mutation: cancel any previous timers
+        }
+        // ⚠️ mutation: schedule a new timer that will apply the filter when it fires:
+        inputTimeoutId.current = window.setTimeout(() => {
+          const newFilteredBrowserFields = filterBrowserFieldsByFieldName({
+            browserFields: mergeBrowserFieldsWithDefaultCategory(browserFields),
+            substring: newFilterInput,
+          });
+          setFilteredBrowserFields(newFilteredBrowserFields);
+          setIsSearching(false);
+
+          const newSelectedCategoryId =
+            newFilterInput === '' || Object.keys(newFilteredBrowserFields).length === 0
+              ? DEFAULT_CATEGORY_NAME
+              : Object.keys(newFilteredBrowserFields)
+                  .sort()
+                  .reduce<string>(
+                    (selected, category) =>
+                      newFilteredBrowserFields[category].fields != null &&
+                      newFilteredBrowserFields[selected].fields != null &&
+                      Object.keys(newFilteredBrowserFields[category].fields!).length >
+                        Object.keys(newFilteredBrowserFields[selected].fields!).length
+                        ? category
+                        : selected,
+                    Object.keys(newFilteredBrowserFields)[0]
+                  );
+          setSelectedCategoryId(newSelectedCategoryId);
+        }, INPUT_TIMEOUT);
+      },
+      [browserFields, filterInput, inputTimeoutId.current]
+    );
 
     /**
      * Invoked when the user clicks a category name in the left-hand side of
      * the field browser
      */
-    function updateSelectedCategoryId(categoryId: string) {
+    const updateSelectedCategoryId = useCallback((categoryId: string) => {
       setSelectedCategoryId(categoryId);
-    }
+    }, []);
 
     /**
      * Invoked when the user clicks on the context menu to view a category's
      * columns in the timeline, this function dispatches the action that
      * causes the timeline display those columns.
      */
-    function updateColumnsAndSelectCategoryId(columns: ColumnHeader[]) {
+    const updateColumnsAndSelectCategoryId = useCallback((columns: ColumnHeader[]) => {
       onUpdateColumns(columns); // show the category columns in the timeline
-    }
+    }, []);
 
     /** Invoked when the field browser should be hidden */
-    function hideFieldBrowser() {
+    const hideFieldBrowser = useCallback(() => {
       setFilterInput('');
       setFilterInput('');
       setFilteredBrowserFields(null);
       setIsSearching(false);
       setSelectedCategoryId(DEFAULT_CATEGORY_NAME);
       setShow(false);
-    }
+    }, []);
     // only merge in the default category if the field browser is visible
-    const browserFieldsWithDefaultCategory = show
-      ? mergeBrowserFieldsWithDefaultCategory(browserFields)
-      : {};
+    const browserFieldsWithDefaultCategory = useMemo(
+      () => (show ? mergeBrowserFieldsWithDefaultCategory(browserFields) : {}),
+      [show, browserFields]
+    );
 
     return (
       <>
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/header/index.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/header/index.tsx
index 1d0e03265f5eac..2f4da30672e8cf 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/header/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/header/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { ActionCreator } from 'typescript-fsa';
@@ -22,7 +22,7 @@ import {
 import { UpdateNote } from '../../notes/helpers';
 import { defaultHeaders } from '../../timeline/body/column_headers/default_headers';
 import { Properties } from '../../timeline/properties';
-import { appActions } from '../../../store/app';
+import { appActions, appModel } from '../../../store/app';
 import { inputsActions } from '../../../store/inputs';
 import { timelineActions } from '../../../store/actions';
 import { TimelineModel } from '../../../store/timeline/model';
@@ -36,7 +36,7 @@ interface OwnProps {
 
 interface StateReduxProps {
   description: string;
-  getNotesByIds: (noteIds: string[]) => Note[];
+  notesById: appModel.NotesById;
   isDataInTimeline: boolean;
   isDatepickerLocked: boolean;
   isFavorite: boolean;
@@ -75,13 +75,13 @@ const StatefulFlyoutHeader = React.memo<Props>(
     associateNote,
     createTimeline,
     description,
-    getNotesByIds,
     isFavorite,
     isDataInTimeline,
     isDatepickerLocked,
     title,
     width = DEFAULT_TIMELINE_WIDTH,
     noteIds,
+    notesById,
     timelineId,
     toggleLock,
     updateDescription,
@@ -89,27 +89,33 @@ const StatefulFlyoutHeader = React.memo<Props>(
     updateNote,
     updateTitle,
     usersViewing,
-  }) => (
-    <Properties
-      associateNote={associateNote}
-      createTimeline={createTimeline}
-      description={description}
-      getNotesByIds={getNotesByIds}
-      isDataInTimeline={isDataInTimeline}
-      isDatepickerLocked={isDatepickerLocked}
-      isFavorite={isFavorite}
-      title={title}
-      noteIds={noteIds}
-      timelineId={timelineId}
-      toggleLock={toggleLock}
-      updateDescription={updateDescription}
-      updateIsFavorite={updateIsFavorite}
-      updateTitle={updateTitle}
-      updateNote={updateNote}
-      usersViewing={usersViewing}
-      width={width}
-    />
-  )
+  }) => {
+    const getNotesByIds = useCallback(
+      (noteIdsVar: string[]): Note[] => appSelectors.getNotes(notesById, noteIdsVar),
+      [notesById]
+    );
+    return (
+      <Properties
+        associateNote={associateNote}
+        createTimeline={createTimeline}
+        description={description}
+        getNotesByIds={getNotesByIds}
+        isDataInTimeline={isDataInTimeline}
+        isDatepickerLocked={isDatepickerLocked}
+        isFavorite={isFavorite}
+        title={title}
+        noteIds={noteIds}
+        timelineId={timelineId}
+        toggleLock={toggleLock}
+        updateDescription={updateDescription}
+        updateIsFavorite={updateIsFavorite}
+        updateTitle={updateTitle}
+        updateNote={updateNote}
+        usersViewing={usersViewing}
+        width={width}
+      />
+    );
+  }
 );
 
 StatefulFlyoutHeader.displayName = 'StatefulFlyoutHeader';
@@ -139,7 +145,7 @@ const makeMapStateToProps = () => {
 
     return {
       description,
-      getNotesByIds: getNotesByIds(state),
+      notesById: getNotesByIds(state),
       history,
       isDataInTimeline:
         !isEmpty(dataProviders) || !isEmpty(get('filterQuery.kuery.expression', kqlQuery)),
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.tsx
index ceaff289f776cb..ba5275ed79aef0 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButtonIcon, EuiFlyout, EuiFlyoutBody, EuiFlyoutHeader, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import styled from 'styled-components';
 import { ActionCreator } from 'typescript-fsa';
@@ -122,19 +122,22 @@ const FlyoutPaneComponent = React.memo<Props>(
     usersViewing,
     width,
   }) => {
-    const renderFlyout = () => <></>;
-
-    const onResize: OnResize = ({ delta, id }) => {
-      const bodyClientWidthPixels = document.body.clientWidth;
-
-      applyDeltaToWidth({
-        bodyClientWidthPixels,
-        delta,
-        id,
-        maxWidthPercent,
-        minWidthPixels,
-      });
-    };
+    const renderFlyout = useCallback(() => <></>, []);
+
+    const onResize: OnResize = useCallback(
+      ({ delta, id }) => {
+        const bodyClientWidthPixels = document.body.clientWidth;
+
+        applyDeltaToWidth({
+          bodyClientWidthPixels,
+          delta,
+          id,
+          maxWidthPercent,
+          minWidthPixels,
+        });
+      },
+      [applyDeltaToWidth, maxWidthPercent, minWidthPixels]
+    );
     return (
       <EuiFlyoutContainer headerHeight={headerHeight} data-test-subj="flyout-pane" width={width}>
         <EuiFlyout
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
index a66ec399a838d4..bb0b947f149f47 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.test.tsx
@@ -13,8 +13,8 @@ import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
 
 import { mockFrameworks, TestProviders, MockFrameworks, getMockKibanaUiSetting } from '../../mock';
 
-import { PreferenceFormattedDate, FormattedDate } from '.';
-import { getEmptyValue } from '../empty_value';
+import { PreferenceFormattedDate, FormattedDate, FormattedRelativePreferenceDate } from '.';
+import { getEmptyString, getEmptyValue } from '../empty_value';
 
 const mockUseKibanaUiSetting: jest.Mock = useKibanaUiSetting as jest.Mock;
 jest.mock('../../lib/settings/use_kibana_ui_setting', () => ({
@@ -162,4 +162,45 @@ describe('formatted_date', () => {
       });
     });
   });
+
+  describe('FormattedRelativePreferenceDate', () => {
+    describe('rendering', () => {
+      test('renders time over an hour correctly against snapshot', () => {
+        const isoDateString = '2019-02-25T22:27:05.000Z';
+        const wrapper = shallow(<FormattedRelativePreferenceDate value={isoDateString} />);
+        expect(wrapper.find('[data-test-subj="preference-time"]').exists()).toBe(true);
+      });
+      test('renders time under an hour correctly against snapshot', () => {
+        const timeTwelveMinutesAgo = new Date(new Date().getTime() - 12 * 60 * 1000).toISOString();
+        const wrapper = shallow(<FormattedRelativePreferenceDate value={timeTwelveMinutesAgo} />);
+        expect(wrapper.find('[data-test-subj="relative-time"]').exists()).toBe(true);
+      });
+      test('renders empty string value correctly', () => {
+        const wrapper = mount(
+          <TestProviders>
+            <FormattedRelativePreferenceDate value={''} />
+          </TestProviders>
+        );
+        expect(wrapper.text()).toBe(getEmptyString());
+      });
+
+      test('renders undefined value correctly', () => {
+        const wrapper = mount(
+          <TestProviders>
+            <FormattedRelativePreferenceDate />
+          </TestProviders>
+        );
+        expect(wrapper.text()).toBe(getEmptyValue());
+      });
+
+      test('renders null value correctly', () => {
+        const wrapper = mount(
+          <TestProviders>
+            <FormattedRelativePreferenceDate value={null} />
+          </TestProviders>
+        );
+        expect(wrapper.text()).toBe(getEmptyValue());
+      });
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx
index 22a3893cf0f985..32c064096fcf93 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_date/index.tsx
@@ -6,6 +6,7 @@
 
 import moment from 'moment-timezone';
 import * as React from 'react';
+import { FormattedRelative } from '@kbn/i18n/react';
 import { pure } from 'recompose';
 
 import {
@@ -62,3 +63,36 @@ export const FormattedDate = pure<{
 );
 
 FormattedDate.displayName = 'FormattedDate';
+
+/**
+ * Renders the specified date value according to under/over one hour
+ * Under an hour = relative format
+ * Over an hour = in a format determined by the user's preferences,
+ * with a tooltip that renders:
+ * - the name of the field
+ * - a humanized relative date (e.g. 16 minutes ago)
+ * - a long representation of the date that includes the day of the week (e.g. Thursday, March 21, 2019 6:47pm)
+ * - the raw date value (e.g. 2019-03-22T00:47:46Z)
+ */
+
+export const FormattedRelativePreferenceDate = ({ value }: { value?: string | number | null }) => {
+  if (value == null) {
+    return getOrEmptyTagFromValue(value);
+  }
+  const maybeDate = getMaybeDate(value);
+  if (!maybeDate.isValid()) {
+    return getOrEmptyTagFromValue(value);
+  }
+  const date = maybeDate.toDate();
+  return (
+    <LocalizedDateTooltip date={date}>
+      {moment(date)
+        .add(1, 'hours')
+        .isBefore(new Date()) ? (
+        <PreferenceFormattedDate data-test-subj="preference-time" value={date} />
+      ) : (
+        <FormattedRelative data-test-subj="relative-time" value={date} />
+      )}
+    </LocalizedDateTooltip>
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/components/last_event_time/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/last_event_time/index.test.tsx
index bcf5e3c1de4088..c23a757647a42a 100644
--- a/x-pack/legacy/plugins/siem/public/components/last_event_time/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/last_event_time/index.test.tsx
@@ -53,8 +53,7 @@ describe('Last Event Time Stat', () => {
         <LastEventTime indexKey={LastEventIndexKey.hosts} />
       </TestProviders>
     );
-
-    expect(wrapper.html()).toBe('<span class="euiToolTipAnchor">Last event: 12 days ago</span>');
+    expect(wrapper.html()).toBe('Last event: <span class="euiToolTipAnchor">12 minutes ago</span>');
   });
   test('Bad date time string', async () => {
     mockUseLastEventTimeQuery.mockImplementation(() => ({
diff --git a/x-pack/legacy/plugins/siem/public/components/last_event_time/index.tsx b/x-pack/legacy/plugins/siem/public/components/last_event_time/index.tsx
index cb9895bebcf090..2493a1378e944a 100644
--- a/x-pack/legacy/plugins/siem/public/components/last_event_time/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/last_event_time/index.tsx
@@ -5,18 +5,20 @@
  */
 
 import { EuiIcon, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
-import { FormattedMessage, FormattedRelative } from '@kbn/i18n/react';
+import { FormattedMessage } from '@kbn/i18n/react';
 import React, { memo } from 'react';
 
 import { LastEventIndexKey } from '../../graphql/types';
 import { useLastEventTimeQuery } from '../../containers/events/last_event_time';
 import { getEmptyTagValue } from '../empty_value';
+import { FormattedRelativePreferenceDate } from '../formatted_date';
 
 export interface LastEventTimeProps {
   hostName?: string;
   indexKey: LastEventIndexKey;
   ip?: string;
 }
+
 export const LastEventTime = memo<LastEventTimeProps>(({ hostName, indexKey, ip }) => {
   const { loading, lastSeen, errorMessage } = useLastEventTimeQuery(
     indexKey,
@@ -37,6 +39,7 @@ export const LastEventTime = memo<LastEventTimeProps>(({ hostName, indexKey, ip
       </EuiToolTip>
     );
   }
+
   return (
     <>
       {loading && <EuiLoadingSpinner size="m" />}
@@ -44,15 +47,13 @@ export const LastEventTime = memo<LastEventTimeProps>(({ hostName, indexKey, ip
         ? lastSeen
         : !loading &&
           lastSeen != null && (
-            <EuiToolTip data-test-subj="last_event_time" position="bottom" content={lastSeen}>
-              <FormattedMessage
-                id="xpack.siem.headerPage.pageSubtitle"
-                defaultMessage="Last event: {beat}"
-                values={{
-                  beat: <FormattedRelative value={new Date(lastSeen)} />,
-                }}
-              />
-            </EuiToolTip>
+            <FormattedMessage
+              id="xpack.siem.headerPage.pageSubtitle"
+              defaultMessage="Last event: {beat}"
+              values={{
+                beat: <FormattedRelativePreferenceDate value={lastSeen} />,
+              }}
+            />
           )}
       {!loading && lastSeen == null && getEmptyTagValue()}
     </>
diff --git a/x-pack/legacy/plugins/siem/public/components/lazy_accordion/index.tsx b/x-pack/legacy/plugins/siem/public/components/lazy_accordion/index.tsx
index da2e7334756e4e..008813040138f0 100644
--- a/x-pack/legacy/plugins/siem/public/components/lazy_accordion/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/lazy_accordion/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiAccordion, EuiAccordionProps } from '@elastic/eui';
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 
 type Props = Pick<EuiAccordionProps, Exclude<keyof EuiAccordionProps, 'initialIsOpen'>> & {
   forceExpand?: boolean;
@@ -42,19 +42,19 @@ export const LazyAccordion = React.memo<Props>(
     renderExpandedContent,
   }) => {
     const [expanded, setExpanded] = useState(false);
-    const onCollapsedClick = () => {
+    const onCollapsedClick = useCallback(() => {
       setExpanded(true);
       if (onExpand != null) {
         onExpand();
       }
-    };
+    }, [onExpand]);
 
-    const onExpandedClick = () => {
+    const onExpandedClick = useCallback(() => {
       setExpanded(false);
       if (onCollapse != null) {
         onCollapse();
       }
-    };
+    }, [onCollapse]);
 
     return (
       <>
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_over_time/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/matrix_over_time/index.test.tsx
index e52d44173f656f..3334447739fc50 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_over_time/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_over_time/index.test.tsx
@@ -12,13 +12,13 @@ import { MatrixOverTimeHistogram } from '.';
 jest.mock('@elastic/eui', () => {
   return {
     EuiPanel: (children: JSX.Element) => <>{children}</>,
-    EuiLoadingContent: () => <div className="euiLoadingContent"></div>,
+    EuiLoadingContent: () => <div className="euiLoadingContent" />,
   };
 });
 
 jest.mock('../loader', () => {
   return {
-    Loader: () => <div className="loader"></div>,
+    Loader: () => <div className="loader" />,
   };
 });
 
@@ -28,13 +28,13 @@ jest.mock('../../lib/settings/use_kibana_ui_setting', () => {
 
 jest.mock('../header_panel', () => {
   return {
-    HeaderPanel: () => <div className="headerPanel"></div>,
+    HeaderPanel: () => <div className="headerPanel" />,
   };
 });
 
 jest.mock('../charts/barchart', () => {
   return {
-    BarChart: () => <div className="barchart"></div>,
+    BarChart: () => <div className="barchart" />,
   };
 });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_over_time/index.tsx b/x-pack/legacy/plugins/siem/public/components/matrix_over_time/index.tsx
index 2898541a4a3d10..3523723574be63 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_over_time/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_over_time/index.tsx
@@ -31,8 +31,9 @@ export interface MatrixOverTimeBasicProps {
 }
 
 export interface MatrixOverTimeProps extends MatrixOverTimeBasicProps {
+  customChartData?: ChartSeriesData[];
   title: string;
-  subtitle: string;
+  subtitle?: string;
   dataKey: string;
 }
 
@@ -73,6 +74,7 @@ const getBarchartConfigs = (from: number, to: number, onBrushEnd: UpdateDateRang
 });
 
 export const MatrixOverTimeHistogram = ({
+  customChartData,
   id,
   loading,
   data,
@@ -91,7 +93,7 @@ export const MatrixOverTimeHistogram = ({
   const [darkMode] = useKibanaUiSetting(DEFAULT_DARK_MODE);
   const [loadingInitial, setLoadingInitial] = useState(false);
 
-  const barChartData: ChartSeriesData[] = [
+  const barChartData: ChartSeriesData[] = customChartData || [
     {
       key: dataKey,
       value: data,
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx b/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx
index 6650449dd8200d..daac4835adb285 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx
@@ -6,7 +6,6 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
-import moment from 'moment';
 import { Columns } from '../../paginated_table';
 import { AnomaliesByHost, Anomaly, NarrowDateRange } from '../types';
 import { getRowItemDraggable } from '../../tables/helpers';
@@ -18,10 +17,9 @@ import * as i18n from './translations';
 import { getEntries } from '../get_entries';
 import { DraggableScore } from '../score/draggable_score';
 import { createExplorerLink } from '../links/create_explorer_link';
-import { LocalizedDateTooltip } from '../../localized_date_tooltip';
-import { PreferenceFormattedDate } from '../../formatted_date';
 import { HostsType } from '../../../store/hosts/model';
 import { escapeDataProviderId } from '../../drag_and_drop/helpers';
+import { FormattedRelativePreferenceDate } from '../../formatted_date';
 
 export const getAnomaliesHostTableColumns = (
   startDate: number,
@@ -126,11 +124,7 @@ export const getAnomaliesHostTableColumns = (
     name: i18n.TIME_STAMP,
     field: 'anomaly.time',
     sortable: true,
-    render: time => (
-      <LocalizedDateTooltip date={moment(new Date(time)).toDate()}>
-        <PreferenceFormattedDate value={new Date(time)} />
-      </LocalizedDateTooltip>
-    ),
+    render: time => <FormattedRelativePreferenceDate value={time} />,
   },
 ];
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx b/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx
index 1e1628fb077dd4..2113d3b82f52e7 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
-import moment from 'moment';
+
 import { Columns } from '../../paginated_table';
 import { Anomaly, NarrowDateRange, AnomaliesByNetwork } from '../types';
 import { getRowItemDraggable } from '../../tables/helpers';
@@ -18,8 +18,7 @@ import * as i18n from './translations';
 import { getEntries } from '../get_entries';
 import { DraggableScore } from '../score/draggable_score';
 import { createExplorerLink } from '../links/create_explorer_link';
-import { LocalizedDateTooltip } from '../../localized_date_tooltip';
-import { PreferenceFormattedDate } from '../../formatted_date';
+import { FormattedRelativePreferenceDate } from '../../formatted_date';
 import { NetworkType } from '../../../store/network/model';
 import { escapeDataProviderId } from '../../drag_and_drop/helpers';
 
@@ -120,11 +119,7 @@ export const getAnomaliesNetworkTableColumns = (
     name: i18n.TIME_STAMP,
     field: 'anomaly.time',
     sortable: true,
-    render: time => (
-      <LocalizedDateTooltip date={moment(new Date(time)).toDate()}>
-        <PreferenceFormattedDate value={new Date(time)} />
-      </LocalizedDateTooltip>
-    ),
+    render: time => <FormattedRelativePreferenceDate value={time} />,
   },
 ];
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx
index 15e9c15744e9ca..4dcdd282a12a8b 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.tsx
@@ -8,6 +8,8 @@ import { EuiButton, EuiCallOut, EuiPopover, EuiPopoverTitle, EuiSpacer } from '@
 import React, { useContext, useReducer, useState } from 'react';
 import styled from 'styled-components';
 import moment from 'moment';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { DOC_LINK_VERSION, ELASTIC_WEBSITE_URL } from 'ui/documentation_links';
 import * as i18n from './translations';
 import { JobsFilters, JobSummary, SiemJob } from './types';
 import { hasMlAdminPermissions } from '../ml/permissions/has_ml_admin_permissions';
@@ -216,7 +218,23 @@ export const MlPopover = React.memo(() => {
                 iconType="alert"
                 size="s"
               >
-                <p>{i18n.MODULE_NOT_COMPATIBLE_DESCRIPTION}</p>
+                <p>
+                  <FormattedMessage
+                    defaultMessage="We could not find any data, see {mlDocs} for more information on Machine Learning job requirements."
+                    id="xpack.siem.components.mlPopup.moduleNotCompatibleDescription"
+                    values={{
+                      mlDocs: (
+                        <a
+                          href={`${ELASTIC_WEBSITE_URL}guide/en/siem/guide/${DOC_LINK_VERSION}/machine-learning.html`}
+                          rel="noopener noreferrer"
+                          target="_blank"
+                        >
+                          {'Anomaly Detection with Machine Learning'}
+                        </a>
+                      ),
+                    }}
+                  />
+                </p>
               </EuiCallOut>
 
               <EuiSpacer size="m" />
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/translations.ts b/x-pack/legacy/plugins/siem/public/components/ml_popover/translations.ts
index 3fc9f3a484b898..442068dd0e193e 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/translations.ts
@@ -39,14 +39,6 @@ export const MODULE_NOT_COMPATIBLE_TITLE = (incompatibleJobCount: number) =>
       '{incompatibleJobCount} {incompatibleJobCount, plural, =1 {job} other {jobs}} are currently unavailable',
   });
 
-export const MODULE_NOT_COMPATIBLE_DESCRIPTION = i18n.translate(
-  'xpack.siem.components.mlPopup.moduleNotCompatibleDescription',
-  {
-    defaultMessage:
-      'You may be missing the required index patterns. Learn more in our documentation.',
-  }
-);
-
 export const START_JOB_FAILURE = i18n.translate(
   'xpack.siem.components.mlPopup.errors.startJobFailureTitle',
   {
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/helpers.ts b/x-pack/legacy/plugins/siem/public/components/navigation/helpers.ts
index 68aa115c965d6d..0c44b8d44c3177 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/helpers.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { isEmpty } from 'lodash/fp';
 import { Location } from 'history';
 import { Query } from 'src/plugins/data/common';
@@ -17,6 +16,7 @@ import {
   replaceStateKeyInQueryString,
   getQueryStringFromLocation,
 } from '../url_state/helpers';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 import { TabNavigationProps } from './tab_navigation/types';
 import { SearchNavTab } from './types';
@@ -25,7 +25,7 @@ export const getSearch = (tab: SearchNavTab, urlState: TabNavigationProps): stri
   if (tab && tab.urlKey != null && URL_STATE_KEYS[tab.urlKey] != null) {
     return URL_STATE_KEYS[tab.urlKey].reduce<Location>(
       (myLocation: Location, urlKey: KeyUrlState) => {
-        let urlStateToReplace: UrlInputsModel | Query | Filter[] | Timeline | string = '';
+        let urlStateToReplace: UrlInputsModel | Query | esFilters.Filter[] | Timeline | string = '';
 
         if (urlKey === CONSTANTS.appQuery && urlState.query != null) {
           if (urlState.query.query === '') {
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/types.ts b/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/types.ts
index 1d5ebf2097974f..856651e6f97dc1 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/types.ts
@@ -4,12 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
-import { Query } from 'src/plugins/data/common';
 import { UrlInputsModel } from '../../../store/inputs/model';
 import { CONSTANTS } from '../../url_state/constants';
 import { Timeline } from '../../url_state/types';
 import { HostsTableType } from '../../../store/hosts/model';
+import { esFilters, Query } from '../../../../../../../../src/plugins/data/public';
 
 import { SiemNavigationComponentProps } from '../types';
 
@@ -18,7 +17,7 @@ export interface TabNavigationProps extends SiemNavigationComponentProps {
   pageName: string;
   tabName: HostsTableType | undefined;
   [CONSTANTS.appQuery]?: Query;
-  [CONSTANTS.filters]?: Filter[];
+  [CONSTANTS.filters]?: esFilters.Filter[];
   [CONSTANTS.savedQuery]?: string;
   [CONSTANTS.timerange]: UrlInputsModel;
   [CONSTANTS.timeline]: Timeline;
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.tsx
index aa9415aadeda16..6664660eb6bdc2 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiPanel } from '@elastic/eui';
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 import styled from 'styled-components';
 
 import { Note } from '../../../lib/note';
@@ -66,10 +66,13 @@ export const NoteCards = React.memo<Props>(
   }) => {
     const [newNote, setNewNote] = useState('');
 
-    const associateNoteAndToggleShow = (noteId: string) => {
-      associateNote(noteId);
-      toggleShowAddNote();
-    };
+    const associateNoteAndToggleShow = useCallback(
+      (noteId: string) => {
+        associateNote(noteId);
+        toggleShowAddNote();
+      },
+      [associateNote, toggleShowAddNote]
+    );
 
     return (
       <NoteCardsComp>
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx
index d101d1f4d39f41..ba99a92f66b493 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import ApolloClient from 'apollo-client';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import { connect } from 'react-redux';
 
 import { Dispatch } from 'redux';
@@ -22,7 +22,7 @@ import {
 } from '../../store/timeline/actions';
 import { OpenTimeline } from './open_timeline';
 import { OPEN_TIMELINE_CLASS_NAME, queryTimelineById, dispatchUpdateTimeline } from './helpers';
-import { OpenTimelineModal } from './open_timeline_modal/open_timeline_modal';
+import { OpenTimelineModalBody } from './open_timeline_modal/open_timeline_modal_body';
 import {
   DeleteTimelines,
   EuiSearchBarQuery,
@@ -98,9 +98,9 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
     const [sortField, setSortField] = useState(DEFAULT_SORT_FIELD);
 
     /** Invoked when the user presses enters to submit the text in the search input */
-    const onQueryChange: OnQueryChange = (query: EuiSearchBarQuery) => {
+    const onQueryChange: OnQueryChange = useCallback((query: EuiSearchBarQuery) => {
       setSearch(query.queryText.trim());
-    };
+    }, []);
 
     /** Focuses the input that filters the field browser */
     const focusInput = () => {
@@ -126,23 +126,26 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
     // }
     // };
 
-    const onDeleteOneTimeline: OnDeleteOneTimeline = (timelineIds: string[]) => {
-      deleteTimelines(timelineIds, {
-        search,
-        pageInfo: {
-          pageIndex: pageIndex + 1,
-          pageSize,
-        },
-        sort: {
-          sortField: sortField as SortFieldTimeline,
-          sortOrder: sortDirection as Direction,
-        },
-        onlyUserFavorite: onlyFavorites,
-      });
-    };
+    const onDeleteOneTimeline: OnDeleteOneTimeline = useCallback(
+      (timelineIds: string[]) => {
+        deleteTimelines(timelineIds, {
+          search,
+          pageInfo: {
+            pageIndex: pageIndex + 1,
+            pageSize,
+          },
+          sort: {
+            sortField: sortField as SortFieldTimeline,
+            sortOrder: sortDirection as Direction,
+          },
+          onlyUserFavorite: onlyFavorites,
+        });
+      },
+      [search, pageIndex, pageSize, sortField, sortDirection, onlyFavorites]
+    );
 
     /** Invoked when the user clicks the action to delete the selected timelines */
-    const onDeleteSelected: OnDeleteSelected = () => {
+    const onDeleteSelected: OnDeleteSelected = useCallback(() => {
       deleteTimelines(getSelectedTimelineIds(selectedItems), {
         search,
         pageInfo: {
@@ -161,79 +164,81 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
       resetSelectionState();
 
       // TODO: the query must re-execute to show the results of the deletion
-    };
+    }, [selectedItems, search, pageIndex, pageSize, sortField, sortDirection, onlyFavorites]);
 
     /** Invoked when the user selects (or de-selects) timelines */
-    const onSelectionChange: OnSelectionChange = (newSelectedItems: OpenTimelineResult[]) => {
-      setSelectedItems(newSelectedItems); // <-- this is NOT passed down as props to the table: https://github.com/elastic/eui/issues/1077
-    };
+    const onSelectionChange: OnSelectionChange = useCallback(
+      (newSelectedItems: OpenTimelineResult[]) => {
+        setSelectedItems(newSelectedItems); // <-- this is NOT passed down as props to the table: https://github.com/elastic/eui/issues/1077
+      },
+      []
+    );
 
     /** Invoked by the EUI table implementation when the user interacts with the table (i.e. to update sorting) */
-    const onTableChange: OnTableChange = ({ page, sort }: OnTableChangeParams) => {
+    const onTableChange: OnTableChange = useCallback(({ page, sort }: OnTableChangeParams) => {
       const { index, size } = page;
       const { field, direction } = sort;
       setPageIndex(index);
       setPageSize(size);
       setSortDirection(direction);
       setSortField(field);
-    };
+    }, []);
 
     /** Invoked when the user toggles the option to only view favorite timelines */
-    const onToggleOnlyFavorites: OnToggleOnlyFavorites = () => {
+    const onToggleOnlyFavorites: OnToggleOnlyFavorites = useCallback(() => {
       setOnlyFavorites(!onlyFavorites);
-    };
+    }, [onlyFavorites]);
 
     /** Invoked when the user toggles the expansion or collapse of inline notes in a table row */
-    const onToggleShowNotes: OnToggleShowNotes = (
-      newItemIdToExpandedNotesRowMap: Record<string, JSX.Element>
-    ) => {
-      setItemIdToExpandedNotesRowMap(newItemIdToExpandedNotesRowMap);
-    };
+    const onToggleShowNotes: OnToggleShowNotes = useCallback(
+      (newItemIdToExpandedNotesRowMap: Record<string, JSX.Element>) => {
+        setItemIdToExpandedNotesRowMap(newItemIdToExpandedNotesRowMap);
+      },
+      []
+    );
 
     /** Resets the selection state such that all timelines are unselected */
-    const resetSelectionState = () => {
+    const resetSelectionState = useCallback(() => {
       setSelectedItems([]);
-    };
+    }, []);
 
-    const openTimeline: OnOpenTimeline = ({
-      duplicate,
-      timelineId,
-    }: {
-      duplicate: boolean;
-      timelineId: string;
-    }) => {
-      if (isModal && closeModalTimeline != null) {
-        closeModalTimeline();
-      }
+    const openTimeline: OnOpenTimeline = useCallback(
+      ({ duplicate, timelineId }: { duplicate: boolean; timelineId: string }) => {
+        if (isModal && closeModalTimeline != null) {
+          closeModalTimeline();
+        }
 
-      queryTimelineById({
-        apolloClient,
-        duplicate,
-        timelineId,
-        updateIsLoading,
-        updateTimeline,
-      });
-    };
+        queryTimelineById({
+          apolloClient,
+          duplicate,
+          timelineId,
+          updateIsLoading,
+          updateTimeline,
+        });
+      },
+      [apolloClient, updateIsLoading, updateTimeline]
+    );
+
+    const deleteTimelines: DeleteTimelines = useCallback(
+      (timelineIds: string[], variables?: AllTimelinesVariables) => {
+        if (timelineIds.includes(timeline.savedObjectId || '')) {
+          createNewTimeline({ id: 'timeline-1', columns: defaultHeaders, show: false });
+        }
+        apolloClient.mutate<DeleteTimelineMutation.Mutation, DeleteTimelineMutation.Variables>({
+          mutation: deleteTimelineMutation,
+          fetchPolicy: 'no-cache',
+          variables: { id: timelineIds },
+          refetchQueries: [
+            {
+              query: allTimelinesQuery,
+              variables,
+            },
+          ],
+        });
+      },
+      [apolloClient, createNewTimeline, timeline]
+    );
 
-    const deleteTimelines: DeleteTimelines = (
-      timelineIds: string[],
-      variables?: AllTimelinesVariables
-    ) => {
-      if (timelineIds.includes(timeline.savedObjectId || '')) {
-        createNewTimeline({ id: 'timeline-1', columns: defaultHeaders, show: false });
-      }
-      apolloClient.mutate<DeleteTimelineMutation.Mutation, DeleteTimelineMutation.Variables>({
-        mutation: deleteTimelineMutation,
-        fetchPolicy: 'no-cache',
-        variables: { id: timelineIds },
-        refetchQueries: [
-          {
-            query: allTimelinesQuery,
-            variables,
-          },
-        ],
-      });
-    };
     useEffect(() => {
       focusInput();
     }, []);
@@ -276,7 +281,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
               totalSearchResultsCount={totalCount}
             />
           ) : (
-            <OpenTimelineModal
+            <OpenTimelineModalBody
               data-test-subj={'open-timeline-modal'}
               deleteTimelines={onDeleteOneTimeline}
               defaultPageSize={defaultPageSize}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx
index 146afa85e10a76..03383a6cb66126 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx
@@ -13,174 +13,32 @@ import { ThemeProvider } from 'styled-components';
 import { wait } from '../../../lib/helpers';
 import { TestProviderWithoutDragAndDrop } from '../../../mock/test_providers';
 import { mockOpenTimelineQueryResults } from '../../../mock/timeline_results';
-import * as i18n from '../translations';
 
-import { OpenTimelineModalButton } from '.';
+import { OpenTimelineModal } from '.';
 
 jest.mock('../../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../../utils/apollo_context', () => ({
+  useApolloClient: () => ({}),
+}));
 
-describe('OpenTimelineModalButton', () => {
+describe('OpenTimelineModal', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
 
-  test('it renders the expected button text', async () => {
+  test('it renders the expected modal', async () => {
     const wrapper = mount(
-      <TestProviderWithoutDragAndDrop>
-        <MockedProvider mocks={mockOpenTimelineQueryResults} addTypename={false}>
-          <OpenTimelineModalButton onToggle={jest.fn()} />
-        </MockedProvider>
-      </TestProviderWithoutDragAndDrop>
-    );
-
-    await wait();
-
-    wrapper.update();
-
-    expect(
-      wrapper
-        .find('[data-test-subj="open-timeline-button"]')
-        .first()
-        .text()
-    ).toEqual(i18n.OPEN_TIMELINE);
-  });
-
-  describe('statefulness', () => {
-    test('defaults showModal to false', async () => {
-      const wrapper = mount(
-        <ThemeProvider theme={theme}>
-          <TestProviderWithoutDragAndDrop>
-            <MockedProvider mocks={mockOpenTimelineQueryResults} addTypename={false}>
-              <OpenTimelineModalButton onToggle={jest.fn()} />
-            </MockedProvider>
-          </TestProviderWithoutDragAndDrop>
-        </ThemeProvider>
-      );
-
-      await wait();
-
-      wrapper.update();
-
-      expect(wrapper.find('div[data-test-subj="open-timeline-modal"].euiModal').length).toEqual(0);
-    });
-
-    test('it sets showModal to true when the button is clicked', async () => {
-      const wrapper = mount(
-        <ThemeProvider theme={theme}>
-          <TestProviderWithoutDragAndDrop>
-            <MockedProvider mocks={mockOpenTimelineQueryResults} addTypename={false}>
-              <OpenTimelineModalButton onToggle={jest.fn()} />
-            </MockedProvider>
-          </TestProviderWithoutDragAndDrop>
-        </ThemeProvider>
-      );
-
-      await wait();
-
-      wrapper
-        .find('[data-test-subj="open-timeline-button"]')
-        .first()
-        .simulate('click');
-
-      wrapper.update();
-
-      expect(wrapper.find('div[data-test-subj="open-timeline-modal"].euiModal').length).toEqual(1);
-    });
-
-    test('it does NOT render the modal when showModal is false', async () => {
-      const wrapper = mount(
+      <ThemeProvider theme={theme}>
         <TestProviderWithoutDragAndDrop>
           <MockedProvider mocks={mockOpenTimelineQueryResults} addTypename={false}>
-            <OpenTimelineModalButton onToggle={jest.fn()} />
+            <OpenTimelineModal onClose={jest.fn()} />
           </MockedProvider>
         </TestProviderWithoutDragAndDrop>
-      );
-
-      await wait();
-
-      wrapper.update();
-
-      expect(
-        wrapper
-          .find('[data-test-subj="open-timeline-modal"]')
-          .first()
-          .exists()
-      ).toBe(false);
-    });
-
-    test('it renders the modal when showModal is true', async () => {
-      const wrapper = mount(
-        <ThemeProvider theme={theme}>
-          <TestProviderWithoutDragAndDrop>
-            <MockedProvider mocks={mockOpenTimelineQueryResults} addTypename={false}>
-              <OpenTimelineModalButton onToggle={jest.fn()} />
-            </MockedProvider>
-          </TestProviderWithoutDragAndDrop>
-        </ThemeProvider>
-      );
-
-      await wait();
-
-      wrapper.update();
-
-      wrapper
-        .find('[data-test-subj="open-timeline-button"]')
-        .first()
-        .simulate('click');
-
-      expect(
-        wrapper
-          .find('[data-test-subj="open-timeline-modal"]')
-          .first()
-          .exists()
-      ).toBe(true);
-    });
-  });
-
-  describe('onToggle prop', () => {
-    test('it still correctly updates the showModal state if `onToggle` is not provided as a prop', async () => {
-      const wrapper = mount(
-        <ThemeProvider theme={theme}>
-          <TestProviderWithoutDragAndDrop>
-            <MockedProvider mocks={mockOpenTimelineQueryResults} addTypename={false}>
-              <OpenTimelineModalButton onToggle={jest.fn()} />
-            </MockedProvider>
-          </TestProviderWithoutDragAndDrop>
-        </ThemeProvider>
-      );
-
-      await wait();
-
-      wrapper
-        .find('[data-test-subj="open-timeline-button"]')
-        .first()
-        .simulate('click');
-
-      wrapper.update();
-
-      expect(wrapper.find('div[data-test-subj="open-timeline-modal"].euiModal').length).toEqual(1);
-    });
-
-    test('it invokes the optional onToggle function provided as a prop when the open timeline button is clicked', async () => {
-      const onToggle = jest.fn();
-      const wrapper = mount(
-        <ThemeProvider theme={theme}>
-          <TestProviderWithoutDragAndDrop>
-            <MockedProvider mocks={mockOpenTimelineQueryResults} addTypename={false}>
-              <OpenTimelineModalButton onToggle={onToggle} />
-            </MockedProvider>
-          </TestProviderWithoutDragAndDrop>
-        </ThemeProvider>
-      );
-
-      await wait();
+      </ThemeProvider>
+    );
 
-      wrapper
-        .find('[data-test-subj="open-timeline-button"]')
-        .first()
-        .simulate('click');
+    await wait();
 
-      wrapper.update();
+    wrapper.update();
 
-      expect(onToggle).toBeCalled();
-    });
+    expect(wrapper.find('div[data-test-subj="open-timeline-modal"].euiModal').length).toEqual(1);
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx
index 41907e07d5c1bf..cd89eb8aad6f43 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx
@@ -4,76 +4,42 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiButtonEmpty, EuiModal, EuiOverlayMask } from '@elastic/eui';
-import React, { useState } from 'react';
+import { EuiModal, EuiOverlayMask } from '@elastic/eui';
+import React from 'react';
 
-import { ApolloConsumer } from 'react-apollo';
+import { useApolloClient } from '../../../utils/apollo_context';
 import * as i18n from '../translations';
 import { StatefulOpenTimeline } from '..';
 
-export interface OpenTimelineModalButtonProps {
-  /**
-   * An optional callback that if specified, will perform arbitrary IO before
-   * this component updates its internal toggle state.
-   */
-  onToggle?: () => void;
+export interface OpenTimelineModalProps {
+  onClose: () => void;
 }
 
 const DEFAULT_SEARCH_RESULTS_PER_PAGE = 10;
 const OPEN_TIMELINE_MODAL_WIDTH = 1000; // px
 
-/**
- * Renders a button that when clicked, displays the `Open Timelines` modal
- */
-export const OpenTimelineModalButton = React.memo<OpenTimelineModalButtonProps>(({ onToggle }) => {
-  const [showModal, setShowModal] = useState(false);
+export const OpenTimelineModal = React.memo<OpenTimelineModalProps>(({ onClose }) => {
+  const apolloClient = useApolloClient();
 
-  /** shows or hides the `Open Timeline` modal */
-  function toggleShowModal() {
-    if (onToggle != null) {
-      onToggle();
-    }
-    setShowModal(!showModal);
-  }
+  if (!apolloClient) return null;
 
-  function closeModalTimeline() {
-    toggleShowModal();
-  }
   return (
-    <ApolloConsumer>
-      {client => (
-        <>
-          <EuiButtonEmpty
-            color="text"
-            data-test-subj="open-timeline-button"
-            iconSide="left"
-            iconType="folderOpen"
-            onClick={toggleShowModal}
-          >
-            {i18n.OPEN_TIMELINE}
-          </EuiButtonEmpty>
-
-          {showModal && (
-            <EuiOverlayMask>
-              <EuiModal
-                data-test-subj="open-timeline-modal"
-                maxWidth={OPEN_TIMELINE_MODAL_WIDTH}
-                onClose={toggleShowModal}
-              >
-                <StatefulOpenTimeline
-                  apolloClient={client}
-                  closeModalTimeline={closeModalTimeline}
-                  isModal={true}
-                  defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-                  title={i18n.OPEN_TIMELINE_TITLE}
-                />
-              </EuiModal>
-            </EuiOverlayMask>
-          )}
-        </>
-      )}
-    </ApolloConsumer>
+    <EuiOverlayMask>
+      <EuiModal
+        data-test-subj="open-timeline-modal"
+        maxWidth={OPEN_TIMELINE_MODAL_WIDTH}
+        onClose={onClose}
+      >
+        <StatefulOpenTimeline
+          apolloClient={apolloClient}
+          closeModalTimeline={onClose}
+          isModal={true}
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          title={i18n.OPEN_TIMELINE_TITLE}
+        />
+      </EuiModal>
+    </EuiOverlayMask>
   );
 });
 
-OpenTimelineModalButton.displayName = 'OpenTimelineModalButton';
+OpenTimelineModal.displayName = 'OpenTimelineModal';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal.test.tsx
deleted file mode 100644
index 3a5bf4be5d72fc..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal.test.tsx
+++ /dev/null
@@ -1,293 +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 euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
-import { cloneDeep } from 'lodash/fp';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
-import { ThemeProvider } from 'styled-components';
-
-import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
-import { OpenTimelineResult } from '../types';
-import { TimelinesTableProps } from '../timelines_table';
-import { mockTimelineResults } from '../../../mock/timeline_results';
-import { OpenTimelineModal } from './open_timeline_modal';
-import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants';
-
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
-describe('OpenTimelineModal', () => {
-  const theme = () => ({ eui: euiDarkVars, darkMode: true });
-  const title = 'All Timelines / Open Timelines';
-
-  let mockResults: OpenTimelineResult[];
-
-  beforeEach(() => {
-    mockResults = cloneDeep(mockTimelineResults);
-  });
-
-  test('it renders the title row', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={theme}>
-        <OpenTimelineModal
-          deleteTimelines={jest.fn()}
-          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          isLoading={false}
-          itemIdToExpandedNotesRowMap={{}}
-          onAddTimelinesToFavorites={jest.fn()}
-          onDeleteSelected={jest.fn()}
-          onlyFavorites={false}
-          onOpenTimeline={jest.fn()}
-          onQueryChange={jest.fn()}
-          onSelectionChange={jest.fn()}
-          onTableChange={jest.fn()}
-          onToggleOnlyFavorites={jest.fn()}
-          onToggleShowNotes={jest.fn()}
-          pageIndex={0}
-          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          query={''}
-          searchResults={mockResults}
-          selectedItems={[]}
-          sortDirection={DEFAULT_SORT_DIRECTION}
-          sortField={DEFAULT_SORT_FIELD}
-          title={title}
-          totalSearchResultsCount={mockResults.length}
-        />
-      </ThemeProvider>
-    );
-
-    expect(
-      wrapper
-        .find('[data-test-subj="title-row"]')
-        .first()
-        .exists()
-    ).toBe(true);
-  });
-
-  test('it renders the search row', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={theme}>
-        <OpenTimelineModal
-          deleteTimelines={jest.fn()}
-          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          isLoading={false}
-          itemIdToExpandedNotesRowMap={{}}
-          onAddTimelinesToFavorites={jest.fn()}
-          onDeleteSelected={jest.fn()}
-          onlyFavorites={false}
-          onOpenTimeline={jest.fn()}
-          onQueryChange={jest.fn()}
-          onSelectionChange={jest.fn()}
-          onTableChange={jest.fn()}
-          onToggleOnlyFavorites={jest.fn()}
-          onToggleShowNotes={jest.fn()}
-          pageIndex={0}
-          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          query={''}
-          searchResults={mockResults}
-          selectedItems={[]}
-          sortDirection={DEFAULT_SORT_DIRECTION}
-          sortField={DEFAULT_SORT_FIELD}
-          title={title}
-          totalSearchResultsCount={mockResults.length}
-        />
-      </ThemeProvider>
-    );
-
-    expect(
-      wrapper
-        .find('[data-test-subj="search-row"]')
-        .first()
-        .exists()
-    ).toBe(true);
-  });
-
-  test('it renders the timelines table', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={theme}>
-        <OpenTimelineModal
-          deleteTimelines={jest.fn()}
-          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          isLoading={false}
-          itemIdToExpandedNotesRowMap={{}}
-          onAddTimelinesToFavorites={jest.fn()}
-          onDeleteSelected={jest.fn()}
-          onlyFavorites={false}
-          onOpenTimeline={jest.fn()}
-          onQueryChange={jest.fn()}
-          onSelectionChange={jest.fn()}
-          onTableChange={jest.fn()}
-          onToggleOnlyFavorites={jest.fn()}
-          onToggleShowNotes={jest.fn()}
-          pageIndex={0}
-          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          query={''}
-          searchResults={mockResults}
-          selectedItems={[]}
-          sortDirection={DEFAULT_SORT_DIRECTION}
-          sortField={DEFAULT_SORT_FIELD}
-          title={title}
-          totalSearchResultsCount={mockResults.length}
-        />
-      </ThemeProvider>
-    );
-
-    expect(
-      wrapper
-        .find('[data-test-subj="timelines-table"]')
-        .first()
-        .exists()
-    ).toBe(true);
-  });
-
-  test('it shows extended columns and actions when onDeleteSelected and deleteTimelines are specified', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={theme}>
-        <OpenTimelineModal
-          deleteTimelines={jest.fn()}
-          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          isLoading={false}
-          itemIdToExpandedNotesRowMap={{}}
-          onAddTimelinesToFavorites={jest.fn()}
-          onDeleteSelected={jest.fn()}
-          onlyFavorites={false}
-          onOpenTimeline={jest.fn()}
-          onQueryChange={jest.fn()}
-          onSelectionChange={jest.fn()}
-          onTableChange={jest.fn()}
-          onToggleShowNotes={jest.fn()}
-          onToggleOnlyFavorites={jest.fn()}
-          pageIndex={0}
-          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          query={''}
-          searchResults={mockResults}
-          selectedItems={[]}
-          sortDirection={DEFAULT_SORT_DIRECTION}
-          sortField={DEFAULT_SORT_FIELD}
-          title={title}
-          totalSearchResultsCount={mockResults.length}
-        />
-      </ThemeProvider>
-    );
-
-    const props = wrapper
-      .find('[data-test-subj="timelines-table"]')
-      .first()
-      .props() as TimelinesTableProps;
-
-    expect(props.showExtendedColumnsAndActions).toBe(true);
-  });
-
-  test('it does NOT show extended columns and actions when is onDeleteSelected undefined and deleteTimelines is specified', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={theme}>
-        <OpenTimelineModal
-          deleteTimelines={jest.fn()}
-          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          isLoading={false}
-          itemIdToExpandedNotesRowMap={{}}
-          onAddTimelinesToFavorites={jest.fn()}
-          onlyFavorites={false}
-          onOpenTimeline={jest.fn()}
-          onQueryChange={jest.fn()}
-          onSelectionChange={jest.fn()}
-          onTableChange={jest.fn()}
-          onToggleShowNotes={jest.fn()}
-          onToggleOnlyFavorites={jest.fn()}
-          pageIndex={0}
-          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          query={''}
-          searchResults={mockResults}
-          selectedItems={[]}
-          sortDirection={DEFAULT_SORT_DIRECTION}
-          sortField={DEFAULT_SORT_FIELD}
-          title={title}
-          totalSearchResultsCount={mockResults.length}
-        />
-      </ThemeProvider>
-    );
-
-    const props = wrapper
-      .find('[data-test-subj="timelines-table"]')
-      .first()
-      .props() as TimelinesTableProps;
-
-    expect(props.showExtendedColumnsAndActions).toBe(false);
-  });
-
-  test('it does NOT show extended columns and actions when is onDeleteSelected provided and deleteTimelines is undefined', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={theme}>
-        <OpenTimelineModal
-          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          isLoading={false}
-          itemIdToExpandedNotesRowMap={{}}
-          onAddTimelinesToFavorites={jest.fn()}
-          onDeleteSelected={jest.fn()}
-          onlyFavorites={false}
-          onOpenTimeline={jest.fn()}
-          onQueryChange={jest.fn()}
-          onSelectionChange={jest.fn()}
-          onTableChange={jest.fn()}
-          onToggleOnlyFavorites={jest.fn()}
-          onToggleShowNotes={jest.fn()}
-          pageIndex={0}
-          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          query={''}
-          searchResults={mockResults}
-          selectedItems={[]}
-          sortDirection={DEFAULT_SORT_DIRECTION}
-          sortField={DEFAULT_SORT_FIELD}
-          title={title}
-          totalSearchResultsCount={mockResults.length}
-        />
-      </ThemeProvider>
-    );
-
-    const props = wrapper
-      .find('[data-test-subj="timelines-table"]')
-      .first()
-      .props() as TimelinesTableProps;
-
-    expect(props.showExtendedColumnsAndActions).toBe(false);
-  });
-
-  test('it does NOT show extended columns and actions when both onDeleteSelected and deleteTimelines are undefined', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={theme}>
-        <OpenTimelineModal
-          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          isLoading={false}
-          itemIdToExpandedNotesRowMap={{}}
-          onAddTimelinesToFavorites={jest.fn()}
-          onlyFavorites={false}
-          onOpenTimeline={jest.fn()}
-          onQueryChange={jest.fn()}
-          onSelectionChange={jest.fn()}
-          onTableChange={jest.fn()}
-          onToggleOnlyFavorites={jest.fn()}
-          onToggleShowNotes={jest.fn()}
-          pageIndex={0}
-          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
-          query={''}
-          searchResults={mockResults}
-          selectedItems={[]}
-          sortDirection={DEFAULT_SORT_DIRECTION}
-          sortField={DEFAULT_SORT_FIELD}
-          title={title}
-          totalSearchResultsCount={mockResults.length}
-        />
-      </ThemeProvider>
-    );
-
-    const props = wrapper
-      .find('[data-test-subj="timelines-table"]')
-      .first()
-      .props() as TimelinesTableProps;
-
-    expect(props.showExtendedColumnsAndActions).toBe(false);
-  });
-});
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal.tsx
deleted file mode 100644
index c407d13d46f22b..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal.tsx
+++ /dev/null
@@ -1,94 +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 { EuiModalBody, EuiModalHeader } from '@elastic/eui';
-import * as React from 'react';
-import { pure } from 'recompose';
-import styled from 'styled-components';
-
-import { OpenTimelineProps } from '../types';
-import { SearchRow } from '../search_row';
-import { TimelinesTable } from '../timelines_table';
-import { TitleRow } from '../title_row';
-
-export const HeaderContainer = styled.div`
-  width: 100%;
-`;
-
-HeaderContainer.displayName = 'HeaderContainer';
-
-export const OpenTimelineModal = pure<OpenTimelineProps>(
-  ({
-    deleteTimelines,
-    defaultPageSize,
-    isLoading,
-    itemIdToExpandedNotesRowMap,
-    onAddTimelinesToFavorites,
-    onDeleteSelected,
-    onlyFavorites,
-    onOpenTimeline,
-    onQueryChange,
-    onSelectionChange,
-    onTableChange,
-    onToggleOnlyFavorites,
-    onToggleShowNotes,
-    pageIndex,
-    pageSize,
-    query,
-    searchResults,
-    selectedItems,
-    sortDirection,
-    sortField,
-    title,
-    totalSearchResultsCount,
-  }) => (
-    <>
-      <EuiModalHeader>
-        <HeaderContainer>
-          <TitleRow
-            data-test-subj="title-row"
-            onDeleteSelected={onDeleteSelected}
-            onAddTimelinesToFavorites={onAddTimelinesToFavorites}
-            selectedTimelinesCount={selectedItems.length}
-            title={title}
-          />
-
-          <SearchRow
-            data-test-subj="search-row"
-            onlyFavorites={onlyFavorites}
-            onQueryChange={onQueryChange}
-            onToggleOnlyFavorites={onToggleOnlyFavorites}
-            query={query}
-            totalSearchResultsCount={totalSearchResultsCount}
-          />
-        </HeaderContainer>
-      </EuiModalHeader>
-
-      <EuiModalBody>
-        <TimelinesTable
-          data-test-subj="timelines-table"
-          deleteTimelines={deleteTimelines}
-          defaultPageSize={defaultPageSize}
-          loading={isLoading}
-          itemIdToExpandedNotesRowMap={itemIdToExpandedNotesRowMap}
-          onOpenTimeline={onOpenTimeline}
-          onSelectionChange={onSelectionChange}
-          onTableChange={onTableChange}
-          onToggleShowNotes={onToggleShowNotes}
-          pageIndex={pageIndex}
-          pageSize={pageSize}
-          searchResults={searchResults}
-          showExtendedColumnsAndActions={onDeleteSelected != null && deleteTimelines != null}
-          sortDirection={sortDirection}
-          sortField={sortField}
-          totalSearchResultsCount={totalSearchResultsCount}
-        />
-      </EuiModalBody>
-    </>
-  )
-);
-
-OpenTimelineModal.displayName = 'OpenTimelineModal';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
new file mode 100644
index 00000000000000..4237caf8f3c513
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx
@@ -0,0 +1,293 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import { cloneDeep } from 'lodash/fp';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import * as React from 'react';
+import { ThemeProvider } from 'styled-components';
+
+import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
+import { OpenTimelineResult } from '../types';
+import { TimelinesTableProps } from '../timelines_table';
+import { mockTimelineResults } from '../../../mock/timeline_results';
+import { OpenTimelineModalBody } from './open_timeline_modal_body';
+import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants';
+
+jest.mock('../../../lib/settings/use_kibana_ui_setting');
+
+describe('OpenTimelineModal', () => {
+  const theme = () => ({ eui: euiDarkVars, darkMode: true });
+  const title = 'All Timelines / Open Timelines';
+
+  let mockResults: OpenTimelineResult[];
+
+  beforeEach(() => {
+    mockResults = cloneDeep(mockTimelineResults);
+  });
+
+  test('it renders the title row', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={theme}>
+        <OpenTimelineModalBody
+          deleteTimelines={jest.fn()}
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          isLoading={false}
+          itemIdToExpandedNotesRowMap={{}}
+          onAddTimelinesToFavorites={jest.fn()}
+          onDeleteSelected={jest.fn()}
+          onlyFavorites={false}
+          onOpenTimeline={jest.fn()}
+          onQueryChange={jest.fn()}
+          onSelectionChange={jest.fn()}
+          onTableChange={jest.fn()}
+          onToggleOnlyFavorites={jest.fn()}
+          onToggleShowNotes={jest.fn()}
+          pageIndex={0}
+          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          query={''}
+          searchResults={mockResults}
+          selectedItems={[]}
+          sortDirection={DEFAULT_SORT_DIRECTION}
+          sortField={DEFAULT_SORT_FIELD}
+          title={title}
+          totalSearchResultsCount={mockResults.length}
+        />
+      </ThemeProvider>
+    );
+
+    expect(
+      wrapper
+        .find('[data-test-subj="title-row"]')
+        .first()
+        .exists()
+    ).toBe(true);
+  });
+
+  test('it renders the search row', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={theme}>
+        <OpenTimelineModalBody
+          deleteTimelines={jest.fn()}
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          isLoading={false}
+          itemIdToExpandedNotesRowMap={{}}
+          onAddTimelinesToFavorites={jest.fn()}
+          onDeleteSelected={jest.fn()}
+          onlyFavorites={false}
+          onOpenTimeline={jest.fn()}
+          onQueryChange={jest.fn()}
+          onSelectionChange={jest.fn()}
+          onTableChange={jest.fn()}
+          onToggleOnlyFavorites={jest.fn()}
+          onToggleShowNotes={jest.fn()}
+          pageIndex={0}
+          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          query={''}
+          searchResults={mockResults}
+          selectedItems={[]}
+          sortDirection={DEFAULT_SORT_DIRECTION}
+          sortField={DEFAULT_SORT_FIELD}
+          title={title}
+          totalSearchResultsCount={mockResults.length}
+        />
+      </ThemeProvider>
+    );
+
+    expect(
+      wrapper
+        .find('[data-test-subj="search-row"]')
+        .first()
+        .exists()
+    ).toBe(true);
+  });
+
+  test('it renders the timelines table', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={theme}>
+        <OpenTimelineModalBody
+          deleteTimelines={jest.fn()}
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          isLoading={false}
+          itemIdToExpandedNotesRowMap={{}}
+          onAddTimelinesToFavorites={jest.fn()}
+          onDeleteSelected={jest.fn()}
+          onlyFavorites={false}
+          onOpenTimeline={jest.fn()}
+          onQueryChange={jest.fn()}
+          onSelectionChange={jest.fn()}
+          onTableChange={jest.fn()}
+          onToggleOnlyFavorites={jest.fn()}
+          onToggleShowNotes={jest.fn()}
+          pageIndex={0}
+          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          query={''}
+          searchResults={mockResults}
+          selectedItems={[]}
+          sortDirection={DEFAULT_SORT_DIRECTION}
+          sortField={DEFAULT_SORT_FIELD}
+          title={title}
+          totalSearchResultsCount={mockResults.length}
+        />
+      </ThemeProvider>
+    );
+
+    expect(
+      wrapper
+        .find('[data-test-subj="timelines-table"]')
+        .first()
+        .exists()
+    ).toBe(true);
+  });
+
+  test('it shows extended columns and actions when onDeleteSelected and deleteTimelines are specified', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={theme}>
+        <OpenTimelineModalBody
+          deleteTimelines={jest.fn()}
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          isLoading={false}
+          itemIdToExpandedNotesRowMap={{}}
+          onAddTimelinesToFavorites={jest.fn()}
+          onDeleteSelected={jest.fn()}
+          onlyFavorites={false}
+          onOpenTimeline={jest.fn()}
+          onQueryChange={jest.fn()}
+          onSelectionChange={jest.fn()}
+          onTableChange={jest.fn()}
+          onToggleShowNotes={jest.fn()}
+          onToggleOnlyFavorites={jest.fn()}
+          pageIndex={0}
+          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          query={''}
+          searchResults={mockResults}
+          selectedItems={[]}
+          sortDirection={DEFAULT_SORT_DIRECTION}
+          sortField={DEFAULT_SORT_FIELD}
+          title={title}
+          totalSearchResultsCount={mockResults.length}
+        />
+      </ThemeProvider>
+    );
+
+    const props = wrapper
+      .find('[data-test-subj="timelines-table"]')
+      .first()
+      .props() as TimelinesTableProps;
+
+    expect(props.showExtendedColumnsAndActions).toBe(true);
+  });
+
+  test('it does NOT show extended columns and actions when is onDeleteSelected undefined and deleteTimelines is specified', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={theme}>
+        <OpenTimelineModalBody
+          deleteTimelines={jest.fn()}
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          isLoading={false}
+          itemIdToExpandedNotesRowMap={{}}
+          onAddTimelinesToFavorites={jest.fn()}
+          onlyFavorites={false}
+          onOpenTimeline={jest.fn()}
+          onQueryChange={jest.fn()}
+          onSelectionChange={jest.fn()}
+          onTableChange={jest.fn()}
+          onToggleShowNotes={jest.fn()}
+          onToggleOnlyFavorites={jest.fn()}
+          pageIndex={0}
+          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          query={''}
+          searchResults={mockResults}
+          selectedItems={[]}
+          sortDirection={DEFAULT_SORT_DIRECTION}
+          sortField={DEFAULT_SORT_FIELD}
+          title={title}
+          totalSearchResultsCount={mockResults.length}
+        />
+      </ThemeProvider>
+    );
+
+    const props = wrapper
+      .find('[data-test-subj="timelines-table"]')
+      .first()
+      .props() as TimelinesTableProps;
+
+    expect(props.showExtendedColumnsAndActions).toBe(false);
+  });
+
+  test('it does NOT show extended columns and actions when is onDeleteSelected provided and deleteTimelines is undefined', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={theme}>
+        <OpenTimelineModalBody
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          isLoading={false}
+          itemIdToExpandedNotesRowMap={{}}
+          onAddTimelinesToFavorites={jest.fn()}
+          onDeleteSelected={jest.fn()}
+          onlyFavorites={false}
+          onOpenTimeline={jest.fn()}
+          onQueryChange={jest.fn()}
+          onSelectionChange={jest.fn()}
+          onTableChange={jest.fn()}
+          onToggleOnlyFavorites={jest.fn()}
+          onToggleShowNotes={jest.fn()}
+          pageIndex={0}
+          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          query={''}
+          searchResults={mockResults}
+          selectedItems={[]}
+          sortDirection={DEFAULT_SORT_DIRECTION}
+          sortField={DEFAULT_SORT_FIELD}
+          title={title}
+          totalSearchResultsCount={mockResults.length}
+        />
+      </ThemeProvider>
+    );
+
+    const props = wrapper
+      .find('[data-test-subj="timelines-table"]')
+      .first()
+      .props() as TimelinesTableProps;
+
+    expect(props.showExtendedColumnsAndActions).toBe(false);
+  });
+
+  test('it does NOT show extended columns and actions when both onDeleteSelected and deleteTimelines are undefined', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={theme}>
+        <OpenTimelineModalBody
+          defaultPageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          isLoading={false}
+          itemIdToExpandedNotesRowMap={{}}
+          onAddTimelinesToFavorites={jest.fn()}
+          onlyFavorites={false}
+          onOpenTimeline={jest.fn()}
+          onQueryChange={jest.fn()}
+          onSelectionChange={jest.fn()}
+          onTableChange={jest.fn()}
+          onToggleOnlyFavorites={jest.fn()}
+          onToggleShowNotes={jest.fn()}
+          pageIndex={0}
+          pageSize={DEFAULT_SEARCH_RESULTS_PER_PAGE}
+          query={''}
+          searchResults={mockResults}
+          selectedItems={[]}
+          sortDirection={DEFAULT_SORT_DIRECTION}
+          sortField={DEFAULT_SORT_FIELD}
+          title={title}
+          totalSearchResultsCount={mockResults.length}
+        />
+      </ThemeProvider>
+    );
+
+    const props = wrapper
+      .find('[data-test-subj="timelines-table"]')
+      .first()
+      .props() as TimelinesTableProps;
+
+    expect(props.showExtendedColumnsAndActions).toBe(false);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
new file mode 100644
index 00000000000000..45e9c00ac67861
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiModalBody, EuiModalHeader } from '@elastic/eui';
+import * as React from 'react';
+import { pure } from 'recompose';
+import styled from 'styled-components';
+
+import { OpenTimelineProps } from '../types';
+import { SearchRow } from '../search_row';
+import { TimelinesTable } from '../timelines_table';
+import { TitleRow } from '../title_row';
+
+export const HeaderContainer = styled.div`
+  width: 100%;
+`;
+
+HeaderContainer.displayName = 'HeaderContainer';
+
+export const OpenTimelineModalBody = pure<OpenTimelineProps>(
+  ({
+    deleteTimelines,
+    defaultPageSize,
+    isLoading,
+    itemIdToExpandedNotesRowMap,
+    onAddTimelinesToFavorites,
+    onDeleteSelected,
+    onlyFavorites,
+    onOpenTimeline,
+    onQueryChange,
+    onSelectionChange,
+    onTableChange,
+    onToggleOnlyFavorites,
+    onToggleShowNotes,
+    pageIndex,
+    pageSize,
+    query,
+    searchResults,
+    selectedItems,
+    sortDirection,
+    sortField,
+    title,
+    totalSearchResultsCount,
+  }) => (
+    <>
+      <EuiModalHeader>
+        <HeaderContainer>
+          <TitleRow
+            data-test-subj="title-row"
+            onDeleteSelected={onDeleteSelected}
+            onAddTimelinesToFavorites={onAddTimelinesToFavorites}
+            selectedTimelinesCount={selectedItems.length}
+            title={title}
+          />
+
+          <SearchRow
+            data-test-subj="search-row"
+            onlyFavorites={onlyFavorites}
+            onQueryChange={onQueryChange}
+            onToggleOnlyFavorites={onToggleOnlyFavorites}
+            query={query}
+            totalSearchResultsCount={totalSearchResultsCount}
+          />
+        </HeaderContainer>
+      </EuiModalHeader>
+
+      <EuiModalBody>
+        <TimelinesTable
+          data-test-subj="timelines-table"
+          deleteTimelines={deleteTimelines}
+          defaultPageSize={defaultPageSize}
+          loading={isLoading}
+          itemIdToExpandedNotesRowMap={itemIdToExpandedNotesRowMap}
+          onOpenTimeline={onOpenTimeline}
+          onSelectionChange={onSelectionChange}
+          onTableChange={onTableChange}
+          onToggleShowNotes={onToggleShowNotes}
+          pageIndex={pageIndex}
+          pageSize={pageSize}
+          searchResults={searchResults}
+          showExtendedColumnsAndActions={onDeleteSelected != null && deleteTimelines != null}
+          sortDirection={sortDirection}
+          sortField={sortField}
+          totalSearchResultsCount={totalSearchResultsCount}
+        />
+      </EuiModalBody>
+    </>
+  )
+);
+
+OpenTimelineModalBody.displayName = 'OpenTimelineModalBody';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx
new file mode 100644
index 00000000000000..a5e436c73f93bc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import { mount } from 'enzyme';
+import * as React from 'react';
+import { MockedProvider } from 'react-apollo/test-utils';
+import { ThemeProvider } from 'styled-components';
+
+import { wait } from '../../../lib/helpers';
+import { TestProviderWithoutDragAndDrop } from '../../../mock/test_providers';
+import { mockOpenTimelineQueryResults } from '../../../mock/timeline_results';
+import * as i18n from '../translations';
+
+import { OpenTimelineModalButton } from './open_timeline_modal_button';
+
+jest.mock('../../../lib/settings/use_kibana_ui_setting');
+
+describe('OpenTimelineModalButton', () => {
+  const theme = () => ({ eui: euiDarkVars, darkMode: true });
+
+  test('it renders the expected button text', async () => {
+    const wrapper = mount(
+      <TestProviderWithoutDragAndDrop>
+        <MockedProvider mocks={mockOpenTimelineQueryResults} addTypename={false}>
+          <OpenTimelineModalButton onClick={jest.fn()} />
+        </MockedProvider>
+      </TestProviderWithoutDragAndDrop>
+    );
+
+    await wait();
+
+    wrapper.update();
+
+    expect(
+      wrapper
+        .find('[data-test-subj="open-timeline-button"]')
+        .first()
+        .text()
+    ).toEqual(i18n.OPEN_TIMELINE);
+  });
+
+  describe('onClick prop', () => {
+    test('it invokes onClick function provided as a prop when the button is clicked', async () => {
+      const onClick = jest.fn();
+      const wrapper = mount(
+        <ThemeProvider theme={theme}>
+          <TestProviderWithoutDragAndDrop>
+            <MockedProvider mocks={mockOpenTimelineQueryResults} addTypename={false}>
+              <OpenTimelineModalButton onClick={onClick} />
+            </MockedProvider>
+          </TestProviderWithoutDragAndDrop>
+        </ThemeProvider>
+      );
+
+      await wait();
+
+      wrapper
+        .find('[data-test-subj="open-timeline-button"]')
+        .first()
+        .simulate('click');
+
+      wrapper.update();
+
+      expect(onClick).toBeCalled();
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.tsx
new file mode 100644
index 00000000000000..373868a769d227
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiButtonEmpty } from '@elastic/eui';
+import React from 'react';
+
+import * as i18n from '../translations';
+
+export interface OpenTimelineModalButtonProps {
+  onClick: () => void;
+}
+
+export const OpenTimelineModalButton = React.memo<OpenTimelineModalButtonProps>(({ onClick }) => (
+  <EuiButtonEmpty
+    color="text"
+    data-test-subj="open-timeline-button"
+    iconSide="left"
+    iconType="folderOpen"
+    onClick={onClick}
+  >
+    {i18n.OPEN_TIMELINE}
+  </EuiButtonEmpty>
+));
+
+OpenTimelineModalButton.displayName = 'OpenTimelineModalButton';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
index 9818a33385286f..8eeb29794f5a67 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx
@@ -14,7 +14,7 @@ import { NotePreviews } from '../note_previews';
 import * as i18n from '../translations';
 import { OnOpenTimeline, OnToggleShowNotes, OpenTimelineResult } from '../types';
 import { getEmptyTagValue } from '../../empty_value';
-import { FormattedDate } from '../../formatted_date';
+import { FormattedRelativePreferenceDate } from '../../formatted_date';
 
 /**
  * Returns the column definitions (passed as the `columns` prop to
@@ -96,7 +96,7 @@ export const getCommonColumns = ({
     render: (date: number, timelineResult: OpenTimelineResult) => (
       <div data-test-subj="updated">
         {timelineResult.updated != null ? (
-          <FormattedDate fieldName="" value={date} />
+          <FormattedRelativePreferenceDate value={date} />
         ) : (
           getEmptyTagValue()
         )}
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
index 44da23153fe157..6cf56ad6a770fe 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
@@ -241,7 +241,7 @@ describe('TimelinesTable', () => {
 
     expect(
       wrapper
-        .find('[id="customizablePagination"]')
+        .find('EuiTablePagination EuiPopover')
         .first()
         .exists()
     ).toBe(true);
@@ -272,7 +272,7 @@ describe('TimelinesTable', () => {
 
     expect(
       wrapper
-        .find('[id="customizablePagination"]')
+        .find('EuiTablePagination EuiPopover')
         .first()
         .exists()
     ).toBe(false);
@@ -305,7 +305,7 @@ describe('TimelinesTable', () => {
 
     expect(
       wrapper
-        .find('[id="customizablePagination"]')
+        .find('EuiTablePagination EuiPopover')
         .first()
         .text()
     ).toEqual('Rows per page: 123');
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap
new file mode 100644
index 00000000000000..13f444f33547c5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap
@@ -0,0 +1,43 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AddFilterToGlobalSearchBar Component Rendering 1`] = `
+<Component
+  store={
+    Object {
+      "dispatch": [Function],
+      "getState": [Function],
+      "replaceReducer": [Function],
+      "subscribe": [Function],
+      Symbol(observable): [Function],
+    }
+  }
+>
+  <AddFilterToGlobalSearchBar
+    filter={
+      Object {
+        "meta": Object {
+          "alias": null,
+          "disabled": false,
+          "key": "host.name",
+          "negate": false,
+          "params": Object {
+            "query": "siem-kibana",
+          },
+          "type": "phrase",
+          "value": "siem-kibana",
+        },
+        "query": Object {
+          "match": Object {
+            "host.name": Object {
+              "query": "siem-kibana",
+              "type": "phrase",
+            },
+          },
+        },
+      }
+    }
+  >
+    siem-kibana
+  </AddFilterToGlobalSearchBar>
+</Component>
+`;
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.test.tsx
new file mode 100644
index 00000000000000..7e5e53f575be89
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.test.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createFilter } from './helpers';
+
+describe('helpers', () => {
+  describe('createFilter', () => {
+    test('returns valid filter when key and value are provided', () => {
+      const filter = createFilter('host.name', 'siem-xavier');
+      expect(filter).toEqual({
+        meta: {
+          alias: null,
+          disabled: false,
+          key: 'host.name',
+          negate: false,
+          params: { query: 'siem-xavier' },
+          type: 'phrase',
+          value: 'siem-xavier',
+        },
+        query: { match: { 'host.name': { query: 'siem-xavier', type: 'phrase' } } },
+      });
+    });
+
+    test('return valid exists filter when valid key and null value are provided', () => {
+      const filter = createFilter('host.name', null);
+      expect(filter).toEqual({
+        exists: { field: 'host.name' },
+        meta: {
+          alias: null,
+          disabled: false,
+          key: 'host.name',
+          negate: false,
+          type: 'exists',
+          value: 'exists',
+        },
+      });
+    });
+
+    test('return valid !exists filter when valid key and undefined value are provided', () => {
+      const filter = createFilter('host.name', undefined);
+      expect(filter).toEqual({
+        exists: { field: 'host.name' },
+        meta: {
+          alias: null,
+          disabled: false,
+          key: 'host.name',
+          negate: true,
+          type: 'exists',
+          value: 'exists',
+        },
+      });
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.ts b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.ts
new file mode 100644
index 00000000000000..bd0859bac2d136
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const createFilter = (key: string, value: string | null | undefined) =>
+  value != null
+    ? {
+        meta: {
+          alias: null,
+          negate: false,
+          disabled: false,
+          type: 'phrase',
+          key,
+          value,
+          params: {
+            query: value,
+          },
+        },
+        query: {
+          match: {
+            [key]: {
+              query: value,
+              type: 'phrase',
+            },
+          },
+        },
+      }
+    : {
+        exists: {
+          field: key,
+        },
+        meta: {
+          alias: null,
+          disabled: false,
+          key,
+          negate: value === undefined,
+          type: 'exists',
+          value: 'exists',
+        },
+      };
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx
new file mode 100644
index 00000000000000..ed614d79174f02
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx
@@ -0,0 +1,171 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { mount, shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import * as React from 'react';
+
+import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../mock';
+import { createStore, State } from '../../../store';
+import { siemFilterManager } from '../../search_bar';
+import { AddFilterToGlobalSearchBar } from '.';
+import { esFilters } from '../../../../../../../../src/plugins/data/public';
+
+interface MockSiemFilterManager {
+  addFilters: (filters: esFilters.Filter[]) => void;
+}
+const mockSiemFilterManager: MockSiemFilterManager = siemFilterManager as MockSiemFilterManager;
+jest.mock('../../search_bar', () => ({
+  siemFilterManager: {
+    addFilters: jest.fn(),
+  },
+}));
+const mockAddFilters = jest.fn();
+mockSiemFilterManager.addFilters = mockAddFilters;
+
+describe('AddFilterToGlobalSearchBar Component', () => {
+  const state: State = mockGlobalState;
+  let store = createStore(state, apolloClientObservable);
+
+  beforeEach(() => {
+    store = createStore(state, apolloClientObservable);
+  });
+
+  test('Rendering', async () => {
+    const wrapper = shallow(
+      <TestProviders store={store}>
+        <AddFilterToGlobalSearchBar
+          filter={{
+            meta: {
+              alias: null,
+              negate: false,
+              disabled: false,
+              type: 'phrase',
+              key: 'host.name',
+              value: 'siem-kibana',
+              params: {
+                query: 'siem-kibana',
+              },
+            },
+            query: {
+              match: {
+                'host.name': {
+                  query: 'siem-kibana',
+                  type: 'phrase',
+                },
+              },
+            },
+          }}
+        >
+          <>{'siem-kibana'}</>
+        </AddFilterToGlobalSearchBar>
+      </TestProviders>
+    );
+
+    expect(toJson(wrapper)).toMatchSnapshot();
+  });
+
+  test('Rendering tooltip', async () => {
+    const wrapper = shallow(
+      <TestProviders store={store}>
+        <AddFilterToGlobalSearchBar
+          filter={{
+            meta: {
+              alias: null,
+              negate: false,
+              disabled: false,
+              type: 'phrase',
+              key: 'host.name',
+              value: 'siem-kibana',
+              params: {
+                query: 'siem-kibana',
+              },
+            },
+            query: {
+              match: {
+                'host.name': {
+                  query: 'siem-kibana',
+                  type: 'phrase',
+                },
+              },
+            },
+          }}
+        >
+          <>{'siem-kibana'}</>
+        </AddFilterToGlobalSearchBar>
+      </TestProviders>
+    );
+
+    wrapper.simulate('mouseenter');
+    wrapper.update();
+    expect(wrapper.find('[data-test-subj="hover-actions-container"] svg').first()).toBeTruthy();
+  });
+
+  test('Functionality with inputs state', async () => {
+    const onFilterAdded = jest.fn();
+
+    const wrapper = mount(
+      <TestProviders store={store}>
+        <AddFilterToGlobalSearchBar
+          onFilterAdded={onFilterAdded}
+          filter={{
+            meta: {
+              alias: null,
+              negate: false,
+              disabled: false,
+              type: 'phrase',
+              key: 'host.name',
+              value: 'siem-kibana',
+              params: {
+                query: 'siem-kibana',
+              },
+            },
+            query: {
+              match: {
+                'host.name': {
+                  query: 'siem-kibana',
+                  type: 'phrase',
+                },
+              },
+            },
+          }}
+        >
+          <>{'siem-kibana'}</>
+        </AddFilterToGlobalSearchBar>
+      </TestProviders>
+    );
+
+    wrapper
+      .simulate('mouseenter')
+      .find('[data-test-subj="hover-actions-container"] .euiToolTipAnchor svg')
+      .first()
+      .simulate('click');
+    wrapper.update();
+
+    expect(mockAddFilters.mock.calls[0][0]).toEqual({
+      meta: {
+        alias: null,
+        disabled: false,
+        key: 'host.name',
+        negate: false,
+        params: {
+          query: 'siem-kibana',
+        },
+        type: 'phrase',
+        value: 'siem-kibana',
+      },
+      query: {
+        match: {
+          'host.name': {
+            query: 'siem-kibana',
+            type: 'phrase',
+          },
+        },
+      },
+    });
+    expect(onFilterAdded).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx
new file mode 100644
index 00000000000000..6e1e6545e5534c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiIcon, EuiPanel, EuiToolTip } from '@elastic/eui';
+import React from 'react';
+import styled from 'styled-components';
+
+import { WithHoverActions } from '../../with_hover_actions';
+import { siemFilterManager } from '../../search_bar';
+import { esFilters } from '../../../../../../../../src/plugins/data/public';
+
+import * as i18n from './translations';
+
+export * from './helpers';
+
+interface OwnProps {
+  children: JSX.Element;
+  filter: esFilters.Filter;
+  onFilterAdded?: () => void;
+}
+
+export const AddFilterToGlobalSearchBar = React.memo<OwnProps>(
+  ({ children, filter, onFilterAdded }) => {
+    const addToKql = () => {
+      siemFilterManager.addFilters(filter);
+      if (onFilterAdded != null) {
+        onFilterAdded();
+      }
+    };
+    return (
+      <WithHoverActions
+        hoverContent={
+          <HoverActionsContainer data-test-subj="hover-actions-container">
+            <EuiToolTip content={i18n.FILTER_FOR_VALUE}>
+              <EuiIcon data-test-subj="add-to-filter" type="filter" onClick={addToKql} />
+            </EuiToolTip>
+          </HoverActionsContainer>
+        }
+        render={() => children}
+      />
+    );
+  }
+);
+
+AddFilterToGlobalSearchBar.displayName = 'AddFilterToGlobalSearchBar';
+
+export const HoverActionsContainer = styled(EuiPanel)`
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  height: 25px;
+  justify-content: center;
+  left: 5px;
+  position: absolute;
+  top: -10px;
+  width: 30px;
+  cursor: pointer;
+`;
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/translations.ts b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/translations.ts
new file mode 100644
index 00000000000000..81772527e59db9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/add_filter_to_global_search_bar/translations.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const FILTER_FOR_VALUE = i18n.translate(
+  'xpack.siem.add_filter_to_global_search_bar.filterForValueHoverAction',
+  {
+    defaultMessage: 'Filter for value',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 823ed972d4a2f9..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,135 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AddToKql Component Rendering 1`] = `
-<Component
-  store={
-    Object {
-      "dispatch": [Function],
-      "getState": [Function],
-      "replaceReducer": [Function],
-      "subscribe": [Function],
-      Symbol(observable): [Function],
-    }
-  }
->
-  <Connect(AddToKqlComponent)
-    filter={
-      Object {
-        "meta": Object {
-          "alias": null,
-          "disabled": false,
-          "key": "host.name",
-          "negate": false,
-          "params": Object {
-            "query": "siem-kibana",
-          },
-          "type": "phrase",
-          "value": "siem-kibana",
-        },
-        "query": Object {
-          "match": Object {
-            "host.name": Object {
-              "query": "siem-kibana",
-              "type": "phrase",
-            },
-          },
-        },
-      }
-    }
-    id="global"
-    indexPattern={
-      Object {
-        "fields": Array [
-          Object {
-            "aggregatable": true,
-            "name": "@timestamp",
-            "searchable": true,
-            "type": "date",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "@version",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.ephemeral_id",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.hostname",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.id",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.test1",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.test2",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.test3",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.test4",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.test5",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.test6",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.test7",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "agent.test8",
-            "searchable": true,
-            "type": "string",
-          },
-          Object {
-            "aggregatable": true,
-            "name": "host.name",
-            "searchable": true,
-            "type": "string",
-          },
-        ],
-        "title": "filebeat-*,auditbeat-*,packetbeat-*",
-      }
-    }
-  >
-    siem-kibana
-  </Connect(AddToKqlComponent)>
-</Component>
-`;
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/helpers.ts b/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/helpers.ts
deleted file mode 100644
index 4be2a6be55fce8..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/helpers.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const createFilter = (key: string, value: string) => ({
-  meta: {
-    alias: null,
-    negate: false,
-    disabled: false,
-    type: 'phrase',
-    key,
-    value,
-    params: {
-      query: value,
-    },
-  },
-  query: {
-    match: {
-      [key]: {
-        query: value,
-        type: 'phrase',
-      },
-    },
-  },
-});
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/index.test.tsx
deleted file mode 100644
index 1f5f20cfc9237f..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/index.test.tsx
+++ /dev/null
@@ -1,178 +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 { Filter } from '@kbn/es-query';
-import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
-
-import {
-  apolloClientObservable,
-  mockGlobalState,
-  TestProviders,
-  mockIndexPattern,
-} from '../../../mock';
-import { createStore, State } from '../../../store';
-import { siemFilterManager } from '../../search_bar';
-import { AddToKql } from '.';
-
-interface MockSiemFilterManager {
-  addFilters: (filters: Filter[]) => void;
-}
-const mockSiemFilterManager: MockSiemFilterManager = siemFilterManager as MockSiemFilterManager;
-jest.mock('../../search_bar', () => ({
-  siemFilterManager: {
-    addFilters: jest.fn(),
-  },
-}));
-const mockAddFilters = jest.fn();
-mockSiemFilterManager.addFilters = mockAddFilters;
-
-describe('AddToKql Component', () => {
-  const state: State = mockGlobalState;
-  let store = createStore(state, apolloClientObservable);
-
-  beforeEach(() => {
-    store = createStore(state, apolloClientObservable);
-  });
-
-  test('Rendering', async () => {
-    const wrapper = shallow(
-      <TestProviders store={store}>
-        <AddToKql
-          id="global"
-          indexPattern={mockIndexPattern}
-          filter={{
-            meta: {
-              alias: null,
-              negate: false,
-              disabled: false,
-              type: 'phrase',
-              key: 'host.name',
-              value: 'siem-kibana',
-              params: {
-                query: 'siem-kibana',
-              },
-            },
-            query: {
-              match: {
-                'host.name': {
-                  query: 'siem-kibana',
-                  type: 'phrase',
-                },
-              },
-            },
-          }}
-        >
-          <>{'siem-kibana'}</>
-        </AddToKql>
-      </TestProviders>
-    );
-
-    expect(toJson(wrapper)).toMatchSnapshot();
-  });
-
-  test('Rendering tooltip', async () => {
-    const wrapper = shallow(
-      <TestProviders store={store}>
-        <AddToKql
-          id="global"
-          indexPattern={mockIndexPattern}
-          filter={{
-            meta: {
-              alias: null,
-              negate: false,
-              disabled: false,
-              type: 'phrase',
-              key: 'host.name',
-              value: 'siem-kibana',
-              params: {
-                query: 'siem-kibana',
-              },
-            },
-            query: {
-              match: {
-                'host.name': {
-                  query: 'siem-kibana',
-                  type: 'phrase',
-                },
-              },
-            },
-          }}
-        >
-          <>{'siem-kibana'}</>
-        </AddToKql>
-      </TestProviders>
-    );
-
-    wrapper.simulate('mouseenter');
-    wrapper.update();
-    expect(wrapper.find('[data-test-subj="hover-actions-container"] svg').first()).toBeTruthy();
-  });
-
-  test('Functionality with inputs state', async () => {
-    const wrapper = mount(
-      <TestProviders store={store}>
-        <AddToKql
-          id="global"
-          indexPattern={mockIndexPattern}
-          filter={{
-            meta: {
-              alias: null,
-              negate: false,
-              disabled: false,
-              type: 'phrase',
-              key: 'host.name',
-              value: 'siem-kibana',
-              params: {
-                query: 'siem-kibana',
-              },
-            },
-            query: {
-              match: {
-                'host.name': {
-                  query: 'siem-kibana',
-                  type: 'phrase',
-                },
-              },
-            },
-          }}
-        >
-          <>{'siem-kibana'}</>
-        </AddToKql>
-      </TestProviders>
-    );
-
-    wrapper
-      .simulate('mouseenter')
-      .find('[data-test-subj="hover-actions-container"] .euiToolTipAnchor svg')
-      .first()
-      .simulate('click');
-    wrapper.update();
-
-    expect(mockAddFilters.mock.calls[0][0]).toEqual({
-      meta: {
-        alias: null,
-        disabled: false,
-        key: 'host.name',
-        negate: false,
-        params: {
-          query: 'siem-kibana',
-        },
-        type: 'phrase',
-        value: 'siem-kibana',
-      },
-      query: {
-        match: {
-          'host.name': {
-            query: 'siem-kibana',
-            type: 'phrase',
-          },
-        },
-      },
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/index.tsx
deleted file mode 100644
index 2e3edb2c59a610..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/index.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiIcon, EuiPanel, EuiToolTip } from '@elastic/eui';
-import { Filter } from '@kbn/es-query';
-import { getOr } from 'lodash/fp';
-import React from 'react';
-import { connect } from 'react-redux';
-import styled from 'styled-components';
-import { StaticIndexPattern } from 'ui/index_patterns';
-import { Query } from 'src/plugins/data/common';
-
-import { WithHoverActions } from '../../with_hover_actions';
-import { InputsModelId } from '../../../store/inputs/constants';
-import { siemFilterManager } from '../../search_bar';
-
-import * as i18n from './translations';
-import { filterQuerySelector } from '../../search_bar/selectors';
-import { State } from '../../../store';
-import { InputsRange } from '../../../store/inputs/model';
-
-export * from './helpers';
-
-interface AddToKqlRedux {
-  query: Query;
-}
-
-interface OwnProps {
-  id: InputsModelId;
-  children: JSX.Element;
-  indexPattern: StaticIndexPattern;
-  filter: Filter;
-}
-
-const AddToKqlComponent = React.memo<OwnProps & AddToKqlRedux>(
-  ({ children, id, indexPattern, filter, query }) => {
-    const addToKql = () => {
-      siemFilterManager.addFilters(filter);
-    };
-    return (
-      <WithHoverActions
-        hoverContent={
-          <HoverActionsContainer data-test-subj="hover-actions-container">
-            <EuiToolTip content={i18n.FILTER_FOR_VALUE}>
-              <EuiIcon type="filter" onClick={addToKql} />
-            </EuiToolTip>
-          </HoverActionsContainer>
-        }
-        render={() => children}
-      />
-    );
-  }
-);
-
-AddToKqlComponent.displayName = 'AddToKqlComponent';
-
-export const HoverActionsContainer = styled(EuiPanel)`
-  align-items: center;
-  display: flex;
-  flex-direction: row;
-  height: 25px;
-  justify-content: center;
-  left: 5px;
-  position: absolute;
-  top: -10px;
-  width: 30px;
-  cursor: pointer;
-`;
-
-const makeMapStateToProps = () => {
-  const getFilterQuerySelector = filterQuerySelector();
-  return (state: State, { id }: OwnProps) => {
-    const inputsRange: InputsRange = getOr({}, `inputs.${id}`, state);
-    return {
-      query: getFilterQuerySelector(inputsRange),
-    };
-  };
-};
-
-export const AddToKql = connect(makeMapStateToProps)(AddToKqlComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/translations.ts b/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/translations.ts
deleted file mode 100644
index 82f6ddd44e8cfd..00000000000000
--- a/x-pack/legacy/plugins/siem/public/components/page/add_to_kql/translations.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-export const FILTER_FOR_VALUE = i18n.translate('xpack.siem.add_to_kql.filterForValueHoverAction', {
-  defaultMessage: 'Filter for value',
-});
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_over_time/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_over_time/index.tsx
new file mode 100644
index 00000000000000..ad343933a268cf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_over_time/index.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import * as i18n from './translation';
+import { getCustomChartData } from './utils';
+import { MatrixOverTimeHistogram, MatrixOverTimeBasicProps } from '../../../matrix_over_time';
+
+export const AuthenticationsOverTimeHistogram = (props: MatrixOverTimeBasicProps) => {
+  const dataKey = 'authenticationsOverTime';
+  const { data, ...matrixOverTimeProps } = props;
+
+  const customChartData = getCustomChartData(data);
+
+  return (
+    <MatrixOverTimeHistogram
+      title={i18n.AUTHENTICATIONS_COUNT}
+      dataKey={dataKey}
+      data={data}
+      customChartData={customChartData}
+      {...matrixOverTimeProps}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_over_time/translation.ts b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_over_time/translation.ts
new file mode 100644
index 00000000000000..c9a21bd348caa2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_over_time/translation.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const AUTHENTICATIONS_COUNT = i18n.translate(
+  'xpack.siem.authenticationsOverTime.authenticationCountTitle',
+  {
+    defaultMessage: 'Authentications count',
+  }
+);
+
+export const UNIT = (totalCount: number) =>
+  i18n.translate('xpack.siem.authenticationsOverTime.unit', {
+    values: { totalCount },
+    defaultMessage: `{totalCount, plural, =1 {authentication} other {authentications}}`,
+  });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_over_time/utils.ts b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_over_time/utils.ts
new file mode 100644
index 00000000000000..3cc89eeff6540d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_over_time/utils.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 { groupBy, map, toPairs } from 'lodash/fp';
+
+import { ChartSeriesData } from '../../../charts/common';
+import { MatrixOverTimeHistogramData } from '../../../../graphql/types';
+import { KpiHostsChartColors } from '../kpi_hosts/types';
+
+const formatToChartDataItem = ([key, value]: [
+  string,
+  MatrixOverTimeHistogramData[]
+]): ChartSeriesData => ({
+  key,
+  value,
+});
+
+const addCustomColors = (item: ChartSeriesData) => {
+  if (item.key === 'authentication_success') {
+    item.color = KpiHostsChartColors.authSuccess;
+  }
+
+  if (item.key === 'authentication_failure') {
+    item.color = KpiHostsChartColors.authFailure;
+  }
+
+  return item;
+};
+
+export const getCustomChartData = (data: MatrixOverTimeHistogramData[]): ChartSeriesData[] => {
+  const dataGroupedByEvent = groupBy('g', data);
+  const dataGroupedEntries = toPairs(dataGroupedByEvent);
+  const formattedChartData = map(formatToChartDataItem, dataGroupedEntries);
+
+  return map(addCustomColors, formattedChartData);
+};
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.tsx
index fe280c28993275..b9b132b4f50a44 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.tsx
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiToolTip } from '@elastic/eui';
-import { FormattedRelative } from '@kbn/i18n/react';
 import { has } from 'lodash/fp';
 import React from 'react';
 import { connect } from 'react-redux';
@@ -18,6 +16,7 @@ import { hostsModel, hostsSelectors, State } from '../../../../store';
 import { DragEffects, DraggableWrapper } from '../../../drag_and_drop/draggable_wrapper';
 import { escapeDataProviderId } from '../../../drag_and_drop/helpers';
 import { getEmptyTagValue } from '../../../empty_value';
+import { FormattedRelativePreferenceDate } from '../../../formatted_date';
 import { HostDetailsLink, IPDetailsLink } from '../../../links';
 import { Columns, ItemsPerRow, PaginatedTable } from '../../../paginated_table';
 import { IS_OPERATOR } from '../../../timeline/data_providers/data_provider';
@@ -200,6 +199,7 @@ const getAuthenticationColumns = (): AuthTableColumns => [
         />
       );
     },
+    width: '8%',
   },
   {
     name: i18n.FAILURES,
@@ -237,16 +237,15 @@ const getAuthenticationColumns = (): AuthTableColumns => [
         />
       );
     },
+    width: '8%',
   },
   {
     name: i18n.LAST_SUCCESSFUL_TIME,
     truncateText: false,
     hideForMobile: false,
     render: ({ node }) =>
-      has('lastSuccess.timestamp', node) ? (
-        <EuiToolTip position="bottom" content={node.lastSuccess!.timestamp!}>
-          <FormattedRelative value={new Date(node.lastSuccess!.timestamp!)} />
-        </EuiToolTip>
+      has('lastSuccess.timestamp', node) && node.lastSuccess!.timestamp != null ? (
+        <FormattedRelativePreferenceDate value={node.lastSuccess!.timestamp} />
       ) : (
         getEmptyTagValue()
       ),
@@ -291,9 +290,7 @@ const getAuthenticationColumns = (): AuthTableColumns => [
     hideForMobile: false,
     render: ({ node }) =>
       has('lastFailure.timestamp', node) && node.lastFailure!.timestamp != null ? (
-        <EuiToolTip position="bottom" content={node.lastFailure!.timestamp!}>
-          <FormattedRelative value={new Date(node.lastFailure!.timestamp!)} />
-        </EuiToolTip>
+        <FormattedRelativePreferenceDate value={node.lastFailure!.timestamp} />
       ) : (
         getEmptyTagValue()
       ),
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/events_over_time/translation.ts b/x-pack/legacy/plugins/siem/public/components/page/hosts/events_over_time/translation.ts
index 5f68a1a1cae7d1..edc9f971938402 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/events_over_time/translation.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/events_over_time/translation.ts
@@ -13,13 +13,6 @@ export const EVENT_COUNT_FREQUENCY_BY_ACTION = i18n.translate(
   }
 );
 
-export const LOADING_EVENTS_OVER_TIME = i18n.translate(
-  'xpack.siem.eventsOverTime.loadingEventsOverTimeTitle',
-  {
-    defaultMessage: 'Loading events histogram',
-  }
-);
-
 export const SHOWING = i18n.translate('xpack.siem.eventsOverTime.showing', {
   defaultMessage: 'Showing',
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.tsx
index 665f1f46bc7c13..553615e950b8d8 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.tsx
@@ -5,15 +5,14 @@
  */
 
 import { EuiIcon, EuiLoadingSpinner, EuiText, EuiToolTip } from '@elastic/eui';
-import moment from 'moment';
+
 import React from 'react';
 import { ApolloConsumer } from 'react-apollo';
 import { pure } from 'recompose';
 
 import { useFirstLastSeenHostQuery } from '../../../../containers/hosts/first_last_seen';
 import { getEmptyTagValue } from '../../../empty_value';
-import { PreferenceFormattedDate } from '../../../formatted_date';
-import { LocalizedDateTooltip } from '../../../localized_date_tooltip';
+import { FormattedRelativePreferenceDate } from '../../../formatted_date';
 
 export enum FirstLastSeenHostType {
   FIRST_SEEN = 'first-seen',
@@ -52,9 +51,7 @@ export const FirstLastSeenHost = pure<{ hostname: string; type: FirstLastSeenHos
                 : !loading &&
                   valueSeen != null && (
                     <EuiText size="s">
-                      <LocalizedDateTooltip date={moment(new Date(valueSeen)).toDate()}>
-                        <PreferenceFormattedDate value={new Date(valueSeen)} />
-                      </LocalizedDateTooltip>
+                      <FormattedRelativePreferenceDate value={`${valueSeen}`} />
                     </EuiText>
                   )}
               {!loading && valueSeen == null && getEmptyTagValue()}
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx
index 216c76fa929613..8d490d2c152d96 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx
@@ -5,28 +5,20 @@
  */
 
 import { EuiIcon, EuiToolTip } from '@elastic/eui';
-import moment from 'moment';
 import React from 'react';
-import { StaticIndexPattern } from 'ui/index_patterns';
-
-import { hostsModel } from '../../../../store';
 import { DragEffects, DraggableWrapper } from '../../../drag_and_drop/draggable_wrapper';
 import { escapeDataProviderId } from '../../../drag_and_drop/helpers';
 import { getEmptyTagValue } from '../../../empty_value';
-import { PreferenceFormattedDate } from '../../../formatted_date';
 import { HostDetailsLink } from '../../../links';
-import { LocalizedDateTooltip } from '../../../localized_date_tooltip';
+import { FormattedRelativePreferenceDate } from '../../../formatted_date';
 import { IS_OPERATOR } from '../../../timeline/data_providers/data_provider';
 import { Provider } from '../../../timeline/data_providers/provider';
-import { AddToKql, createFilter } from '../../add_to_kql';
+import { AddFilterToGlobalSearchBar, createFilter } from '../../add_filter_to_global_search_bar';
 import { HostsTableColumns } from './';
 
 import * as i18n from './translations';
 
-export const getHostsColumns = (
-  type: hostsModel.HostsType,
-  indexPattern: StaticIndexPattern
-): HostsTableColumns => [
+export const getHostsColumns = (): HostsTableColumns => [
   {
     field: 'node.host.name',
     name: i18n.NAME,
@@ -54,13 +46,9 @@ export const getHostsColumns = (
                   <Provider dataProvider={dataProvider} />
                 </DragEffects>
               ) : (
-                <AddToKql
-                  id="global"
-                  indexPattern={indexPattern}
-                  filter={createFilter('host.name', hostName[0])}
-                >
+                <AddFilterToGlobalSearchBar filter={createFilter('host.name', hostName[0])}>
                   <HostDetailsLink hostName={hostName[0]} />
-                </AddToKql>
+                </AddFilterToGlobalSearchBar>
               )
             }
           />
@@ -85,11 +73,7 @@ export const getHostsColumns = (
     sortable: true,
     render: lastSeen => {
       if (lastSeen != null) {
-        return (
-          <LocalizedDateTooltip date={moment(new Date(lastSeen)).toDate()}>
-            <PreferenceFormattedDate value={new Date(lastSeen)} />
-          </LocalizedDateTooltip>
-        );
+        return <FormattedRelativePreferenceDate value={lastSeen} />;
       }
       return getEmptyTagValue();
     },
@@ -103,13 +87,9 @@ export const getHostsColumns = (
     render: hostOsName => {
       if (hostOsName != null) {
         return (
-          <AddToKql
-            id="global"
-            indexPattern={indexPattern}
-            filter={createFilter('host.os.name', hostOsName)}
-          >
+          <AddFilterToGlobalSearchBar filter={createFilter('host.os.name', hostOsName)}>
             <>{hostOsName}</>
-          </AddToKql>
+          </AddFilterToGlobalSearchBar>
         );
       }
       return getEmptyTagValue();
@@ -124,13 +104,9 @@ export const getHostsColumns = (
     render: hostOsVersion => {
       if (hostOsVersion != null) {
         return (
-          <AddToKql
-            id="global"
-            indexPattern={indexPattern}
-            filter={createFilter('host.os.version', hostOsVersion)}
-          >
+          <AddFilterToGlobalSearchBar filter={createFilter('host.os.version', hostOsVersion)}>
             <>{hostOsVersion}</>
-          </AddToKql>
+          </AddFilterToGlobalSearchBar>
         );
       }
       return getEmptyTagValue();
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.tsx
index d4b3b5e8759892..cdc84c513737d7 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useMemo } from 'react';
+import React, { useMemo, useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 import { StaticIndexPattern } from 'ui/index_patterns';
@@ -115,22 +115,25 @@ const HostsTableComponent = React.memo<HostsTableProps>(
     updateTableActivePage,
     updateTableLimit,
   }) => {
-    const onChange = (criteria: Criteria) => {
-      if (criteria.sort != null) {
-        const sort: HostsSortField = {
-          field: getSortField(criteria.sort.field),
-          direction: criteria.sort.direction,
-        };
-        if (sort.direction !== direction || sort.field !== sortField) {
-          updateHostsSort({
-            sort,
-            hostsType: type,
-          });
+    const onChange = useCallback(
+      (criteria: Criteria) => {
+        if (criteria.sort != null) {
+          const sort: HostsSortField = {
+            field: getSortField(criteria.sort.field),
+            direction: criteria.sort.direction,
+          };
+          if (sort.direction !== direction || sort.field !== sortField) {
+            updateHostsSort({
+              sort,
+              hostsType: type,
+            });
+          }
         }
-      }
-    };
+      },
+      [direction, sortField, type]
+    );
 
-    const hostsColumns = useMemo(() => getHostsColumns(type, indexPattern), [type, indexPattern]);
+    const hostsColumns = useMemo(() => getHostsColumns(), []);
 
     const sorting = useMemo(() => getSorting(`${sortField}-${direction}`, sortField, direction), [
       sortField,
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_host_details_mapping.ts b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_host_details_mapping.ts
index dbaf35c5b0636c..59f8e55c461060 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_host_details_mapping.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_host_details_mapping.ts
@@ -6,11 +6,7 @@
 
 import * as i18n from './translations';
 import { StatItems } from '../../../stat_items';
-
-const euiColorVis0 = '#00B3A4';
-const euiColorVis2 = '#DB1374';
-const euiColorVis3 = '#490092';
-const euiColorVis9 = '#920000';
+import { KpiHostsChartColors } from './types';
 
 export const kpiHostDetailsMapping: Readonly<StatItems[]> = [
   {
@@ -22,7 +18,7 @@ export const kpiHostDetailsMapping: Readonly<StatItems[]> = [
         name: i18n.SUCCESS_CHART_LABEL,
         description: i18n.SUCCESS_UNIT_LABEL,
         value: null,
-        color: euiColorVis0,
+        color: KpiHostsChartColors.authSuccess,
         icon: 'check',
       },
       {
@@ -30,7 +26,7 @@ export const kpiHostDetailsMapping: Readonly<StatItems[]> = [
         name: i18n.FAIL_CHART_LABEL,
         description: i18n.FAIL_UNIT_LABEL,
         value: null,
-        color: euiColorVis9,
+        color: KpiHostsChartColors.authFailure,
         icon: 'cross',
       },
     ],
@@ -48,7 +44,7 @@ export const kpiHostDetailsMapping: Readonly<StatItems[]> = [
         name: i18n.SOURCE_CHART_LABEL,
         description: i18n.SOURCE_UNIT_LABEL,
         value: null,
-        color: euiColorVis2,
+        color: KpiHostsChartColors.uniqueSourceIps,
         icon: 'visMapCoordinate',
       },
       {
@@ -56,7 +52,7 @@ export const kpiHostDetailsMapping: Readonly<StatItems[]> = [
         name: i18n.DESTINATION_CHART_LABEL,
         description: i18n.DESTINATION_UNIT_LABEL,
         value: null,
-        color: euiColorVis3,
+        color: KpiHostsChartColors.uniqueDestinationIps,
         icon: 'visMapCoordinate',
       },
     ],
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_hosts_mapping.ts b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_hosts_mapping.ts
index ca91b49b27185c..e2d6348d058409 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_hosts_mapping.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_hosts_mapping.ts
@@ -6,12 +6,7 @@
 
 import * as i18n from './translations';
 import { StatItems } from '../../../stat_items';
-
-const euiColorVis0 = '#00B3A4';
-const euiColorVis1 = '#3185FC';
-const euiColorVis2 = '#DB1374';
-const euiColorVis3 = '#490092';
-const euiColorVis9 = '#920000';
+import { KpiHostsChartColors } from './types';
 
 export const kpiHostsMapping: Readonly<StatItems[]> = [
   {
@@ -21,7 +16,7 @@ export const kpiHostsMapping: Readonly<StatItems[]> = [
       {
         key: 'hosts',
         value: null,
-        color: euiColorVis1,
+        color: KpiHostsChartColors.hosts,
         icon: 'storage',
       },
     ],
@@ -38,7 +33,7 @@ export const kpiHostsMapping: Readonly<StatItems[]> = [
         name: i18n.SUCCESS_CHART_LABEL,
         description: i18n.SUCCESS_UNIT_LABEL,
         value: null,
-        color: euiColorVis0,
+        color: KpiHostsChartColors.authSuccess,
         icon: 'check',
       },
       {
@@ -46,7 +41,7 @@ export const kpiHostsMapping: Readonly<StatItems[]> = [
         name: i18n.FAIL_CHART_LABEL,
         description: i18n.FAIL_UNIT_LABEL,
         value: null,
-        color: euiColorVis9,
+        color: KpiHostsChartColors.authFailure,
         icon: 'cross',
       },
     ],
@@ -64,7 +59,7 @@ export const kpiHostsMapping: Readonly<StatItems[]> = [
         name: i18n.SOURCE_CHART_LABEL,
         description: i18n.SOURCE_UNIT_LABEL,
         value: null,
-        color: euiColorVis2,
+        color: KpiHostsChartColors.uniqueSourceIps,
         icon: 'visMapCoordinate',
       },
       {
@@ -72,7 +67,7 @@ export const kpiHostsMapping: Readonly<StatItems[]> = [
         name: i18n.DESTINATION_CHART_LABEL,
         description: i18n.DESTINATION_UNIT_LABEL,
         value: null,
-        color: euiColorVis3,
+        color: KpiHostsChartColors.uniqueDestinationIps,
         icon: 'visMapCoordinate',
       },
     ],
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/types.ts b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/types.ts
new file mode 100644
index 00000000000000..f2f50d72952ac9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/types.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export enum KpiHostsChartColors {
+  authSuccess = '#00B3A4',
+  authFailure = '#920000',
+  uniqueSourceIps = '#DB1374',
+  uniqueDestinationIps = '#490092',
+  hosts = '#3185FC',
+}
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx
index 6fd2cab90efea5..2f2d84306e25e9 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx
@@ -161,16 +161,20 @@ const getUncommonColumns = (): UncommonProcessTableColumns => [
     width: '20%',
   },
   {
+    align: 'right',
     name: i18n.NUMBER_OF_HOSTS,
     truncateText: false,
     hideForMobile: false,
     render: ({ node }) => <>{node.hosts != null ? node.hosts.length : getEmptyValue()}</>,
+    width: '8%',
   },
   {
+    align: 'right',
     name: i18n.NUMBER_OF_INSTANCES,
     truncateText: false,
     hideForMobile: false,
     render: ({ node }) => defaultToEmptyTag(node.instances),
+    width: '8%',
   },
   {
     name: i18n.HOSTS,
diff --git a/x-pack/legacy/plugins/siem/public/components/page/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/index.tsx
index 8101e2c2ec8b68..d211d1513767d0 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/index.tsx
@@ -32,6 +32,12 @@ export const DescriptionListStyled = styled(EuiDescriptionList)`
     dt {
       font-size: ${theme.eui.euiFontSizeXS} !important;
     }
+    dd {
+      width: fit-content;
+    }
+    dd > div {
+      width: fit-content;
+    }
   `}
 `;
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/index.tsx
index 40460f81fa83c6..1f502635a8de4c 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/index.tsx
@@ -9,3 +9,4 @@ export { KpiNetworkComponent } from './kpi_network';
 export { NetworkDnsTable } from './network_dns_table';
 export { NetworkTopCountriesTable } from './network_top_countries_table';
 export { NetworkTopNFlowTable } from './network_top_n_flow_table';
+export { NetworkHttpTable } from './network_http_table';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
index 7c695e37386efd..b71d786e643eb1 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
@@ -114,8 +114,14 @@ export const IpOverview = pure<IpOverviewProps>(
     const descriptionLists: Readonly<DescriptionList[][]> = [
       firstColumn,
       [
-        { title: i18n.FIRST_SEEN, description: dateRenderer('firstSeen', typeData) },
-        { title: i18n.LAST_SEEN, description: dateRenderer('lastSeen', typeData) },
+        {
+          title: i18n.FIRST_SEEN,
+          description: typeData ? dateRenderer(typeData.firstSeen) : getEmptyTagValue(),
+        },
+        {
+          title: i18n.LAST_SEEN,
+          description: typeData ? dateRenderer(typeData.lastSeen) : getEmptyTagValue(),
+        },
       ],
       [
         {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx
index 898990c4497f77..d59d4ccd60c607 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.tsx
@@ -39,7 +39,7 @@ interface KpiNetworkProps {
 export const fieldTitleChartMapping: Readonly<StatItems[]> = [
   {
     key: 'UniqueIps',
-    index: 4,
+    index: 2,
     fields: [
       {
         key: 'uniqueSourcePrivateIps',
@@ -92,7 +92,7 @@ const fieldTitleMatrixMapping: Readonly<StatItems[]> = [
   },
   {
     key: 'uniqueFlowId',
-    index: 2,
+    index: 3,
     fields: [
       {
         key: 'uniqueFlowId',
@@ -103,7 +103,7 @@ const fieldTitleMatrixMapping: Readonly<StatItems[]> = [
   },
   {
     key: 'tlsHandshakes',
-    index: 3,
+    index: 4,
     fields: [
       {
         key: 'tlsHandshakes',
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts
index e06bb1477bc7f9..38d73d5a5895b3 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/mock.ts
@@ -223,7 +223,7 @@ export const mockEnableChartsData = {
   from: 1560578400000,
   grow: 2,
   id: 'statItem',
-  index: 4,
+  index: 2,
   statKey: 'UniqueIps',
   to: 1560837600000,
   narrowDateRange: mockNarrowDateRange,
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/columns.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/columns.tsx
index 353699c5158bc4..b1c1b26cd498dd 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/columns.tsx
@@ -69,6 +69,7 @@ export const getNetworkDnsColumns = (type: networkModel.NetworkType): NetworkDns
     },
   },
   {
+    align: 'right',
     field: `node.${NetworkDnsFields.queryCount}`,
     name: i18n.TOTAL_QUERIES,
     sortable: true,
@@ -83,6 +84,7 @@ export const getNetworkDnsColumns = (type: networkModel.NetworkType): NetworkDns
     },
   },
   {
+    align: 'right',
     field: `node.${NetworkDnsFields.uniqueDomains}`,
     name: i18n.UNIQUE_DOMAINS,
     sortable: true,
@@ -97,6 +99,7 @@ export const getNetworkDnsColumns = (type: networkModel.NetworkType): NetworkDns
     },
   },
   {
+    align: 'right',
     field: `node.${NetworkDnsFields.dnsBytesIn}`,
     name: i18n.DNS_BYTES_IN,
     sortable: true,
@@ -111,6 +114,7 @@ export const getNetworkDnsColumns = (type: networkModel.NetworkType): NetworkDns
     },
   },
   {
+    align: 'right',
     field: `node.${NetworkDnsFields.dnsBytesOut}`,
     name: i18n.DNS_BYTES_OUT,
     sortable: true,
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.tsx
index c1c1bec80d676b..ac5470ee4f236f 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { isEqual } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
@@ -77,24 +77,34 @@ export const NetworkDnsTableComponent = React.memo<NetworkDnsTableProps>(
     type,
     updateNetworkTable,
   }) => {
-    const onChange = (criteria: Criteria) => {
-      if (criteria.sort != null) {
-        const newDnsSortField: NetworkDnsSortField = {
-          field: criteria.sort.field.split('.')[1] as NetworkDnsFields,
-          direction: criteria.sort.direction,
-        };
-        if (!isEqual(newDnsSortField, sort)) {
-          updateNetworkTable({ networkType: type, tableType, updates: { sort: newDnsSortField } });
+    const onChange = useCallback(
+      (criteria: Criteria) => {
+        if (criteria.sort != null) {
+          const newDnsSortField: NetworkDnsSortField = {
+            field: criteria.sort.field.split('.')[1] as NetworkDnsFields,
+            direction: criteria.sort.direction,
+          };
+          if (!isEqual(newDnsSortField, sort)) {
+            updateNetworkTable({
+              networkType: type,
+              tableType,
+              updates: { sort: newDnsSortField },
+            });
+          }
         }
-      }
-    };
+      },
+      [sort, type]
+    );
 
-    const onChangePtrIncluded = () =>
-      updateNetworkTable({
-        networkType: type,
-        tableType,
-        updates: { isPtrIncluded: !isPtrIncluded },
-      });
+    const onChangePtrIncluded = useCallback(
+      () =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { isPtrIncluded: !isPtrIncluded },
+        }),
+      [type, isPtrIncluded]
+    );
 
     return (
       <PaginatedTable
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/__snapshots__/index.test.tsx.snap
new file mode 100644
index 00000000000000..dfc1b2cf64e389
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/__snapshots__/index.test.tsx.snap
@@ -0,0 +1,102 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NetworkHttp Table Component rendering it renders the default NetworkHttp table 1`] = `
+<Connect(NetworkHttpTableComponent)
+  data={
+    Array [
+      Object {
+        "cursor": Object {
+          "tiebreaker": null,
+          "value": "/computeMetadata/v1/instance/virtual-clock/drift-token",
+        },
+        "node": Object {
+          "_id": "/computeMetadata/v1/instance/virtual-clock/drift-token",
+          "domains": Array [
+            "metadata.google.internal",
+          ],
+          "lastHost": "suricata-iowa",
+          "lastSourceIp": "10.128.0.21",
+          "methods": Array [
+            "get",
+          ],
+          "path": "/computeMetadata/v1/instance/virtual-clock/drift-token",
+          "requestCount": 1440,
+          "statuses": Array [],
+        },
+      },
+      Object {
+        "cursor": Object {
+          "tiebreaker": null,
+          "value": "/computeMetadata/v1/",
+        },
+        "node": Object {
+          "_id": "/computeMetadata/v1/",
+          "domains": Array [
+            "metadata.google.internal",
+          ],
+          "lastHost": "suricata-iowa",
+          "lastSourceIp": "10.128.0.21",
+          "methods": Array [
+            "get",
+          ],
+          "path": "/computeMetadata/v1/",
+          "requestCount": 1020,
+          "statuses": Array [
+            "200",
+          ],
+        },
+      },
+      Object {
+        "cursor": Object {
+          "tiebreaker": null,
+          "value": "/computeMetadata/v1/instance/network-interfaces/",
+        },
+        "node": Object {
+          "_id": "/computeMetadata/v1/instance/network-interfaces/",
+          "domains": Array [
+            "metadata.google.internal",
+          ],
+          "lastHost": "suricata-iowa",
+          "lastSourceIp": "10.128.0.21",
+          "methods": Array [
+            "get",
+          ],
+          "path": "/computeMetadata/v1/instance/network-interfaces/",
+          "requestCount": 960,
+          "statuses": Array [],
+        },
+      },
+      Object {
+        "cursor": Object {
+          "tiebreaker": null,
+          "value": "/downloads/ca_setup.exe",
+        },
+        "node": Object {
+          "_id": "/downloads/ca_setup.exe",
+          "domains": Array [
+            "www.oxid.it",
+          ],
+          "lastHost": "jessie",
+          "lastSourceIp": "10.0.2.15",
+          "methods": Array [
+            "get",
+          ],
+          "path": "/downloads/ca_setup.exe",
+          "requestCount": 3,
+          "statuses": Array [
+            "200",
+          ],
+        },
+      },
+    ]
+  }
+  fakeTotalCount={4}
+  id="http"
+  isInspect={false}
+  loadPage={[MockFunction]}
+  loading={false}
+  showMorePagesIndicator={false}
+  totalCount={4}
+  type="page"
+/>
+`;
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/columns.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/columns.tsx
new file mode 100644
index 00000000000000..6a47a58c85f319
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/columns.tsx
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import numeral from '@elastic/numeral';
+import { NetworkHttpEdges, NetworkHttpFields, NetworkHttpItem } from '../../../../graphql/types';
+import { escapeDataProviderId } from '../../../drag_and_drop/helpers';
+import { getEmptyTagValue } from '../../../empty_value';
+import { IPDetailsLink } from '../../../links';
+import { Columns } from '../../../paginated_table';
+
+import * as i18n from './translations';
+import { getRowItemDraggable, getRowItemDraggables } from '../../../tables/helpers';
+export type NetworkHttpColumns = [
+  Columns<NetworkHttpEdges>,
+  Columns<NetworkHttpEdges>,
+  Columns<NetworkHttpItem['path']>,
+  Columns<NetworkHttpEdges>,
+  Columns<NetworkHttpEdges>,
+  Columns<NetworkHttpEdges>,
+  Columns<NetworkHttpItem['requestCount']>
+];
+
+export const getNetworkHttpColumns = (tableId: string): NetworkHttpColumns => [
+  {
+    name: i18n.METHOD,
+    render: ({ node: { methods, path } }) => {
+      return Array.isArray(methods) && methods.length > 0
+        ? getRowItemDraggables({
+            attrName: 'http.request.method',
+            displayCount: 3,
+            idPrefix: escapeDataProviderId(`${tableId}-table-methods-${path}`),
+            rowItems: methods,
+          })
+        : getEmptyTagValue();
+    },
+  },
+  {
+    name: i18n.DOMAIN,
+    render: ({ node: { domains, path } }) =>
+      Array.isArray(domains) && domains.length > 0
+        ? getRowItemDraggables({
+            attrName: 'url.domain',
+            displayCount: 3,
+            idPrefix: escapeDataProviderId(`${tableId}-table-domains-${path}`),
+            rowItems: domains,
+          })
+        : getEmptyTagValue(),
+  },
+  {
+    field: `node.${NetworkHttpFields.path}`,
+    name: i18n.PATH,
+    render: path =>
+      path != null
+        ? getRowItemDraggable({
+            attrName: 'url.path',
+            idPrefix: escapeDataProviderId(`${tableId}-table-path-${path}`),
+            rowItem: path,
+          })
+        : getEmptyTagValue(),
+  },
+  {
+    name: i18n.STATUS,
+    render: ({ node: { statuses, path } }) =>
+      Array.isArray(statuses) && statuses.length > 0
+        ? getRowItemDraggables({
+            attrName: 'http.response.status_code',
+            displayCount: 3,
+            idPrefix: escapeDataProviderId(`${tableId}-table-statuses-${path}`),
+            rowItems: statuses,
+          })
+        : getEmptyTagValue(),
+  },
+  {
+    name: i18n.LAST_HOST,
+    render: ({ node: { lastHost, path } }) =>
+      lastHost != null
+        ? getRowItemDraggable({
+            attrName: 'host.name',
+            idPrefix: escapeDataProviderId(`${tableId}-table-lastHost-${path}`),
+            rowItem: lastHost,
+          })
+        : getEmptyTagValue(),
+  },
+  {
+    name: i18n.LAST_SOURCE_IP,
+    render: ({ node: { lastSourceIp, path } }) =>
+      lastSourceIp != null
+        ? getRowItemDraggable({
+            attrName: 'source.ip',
+            idPrefix: escapeDataProviderId(`${tableId}-table-lastSourceIp-${path}`),
+            rowItem: lastSourceIp,
+            render: () => <IPDetailsLink ip={lastSourceIp} />,
+          })
+        : getEmptyTagValue(),
+  },
+  {
+    align: 'right',
+    field: `node.${NetworkHttpFields.requestCount}`,
+    name: i18n.REQUESTS,
+    sortable: true,
+    render: requestCount => {
+      if (requestCount != null) {
+        return numeral(requestCount).format('0,000');
+      } else {
+        return getEmptyTagValue();
+      }
+    },
+  },
+];
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx
new file mode 100644
index 00000000000000..277e136d776fa6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.test.tsx
@@ -0,0 +1,104 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { mount, shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import { getOr } from 'lodash/fp';
+import * as React from 'react';
+import { MockedProvider } from 'react-apollo/test-utils';
+import { Provider as ReduxStoreProvider } from 'react-redux';
+
+import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock';
+import { createStore, networkModel, State } from '../../../../store';
+
+import { NetworkHttpTable } from '.';
+import { mockData } from './mock';
+
+jest.mock('../../../../lib/settings/use_kibana_ui_setting');
+
+describe('NetworkHttp Table Component', () => {
+  const loadPage = jest.fn();
+  const state: State = mockGlobalState;
+
+  let store = createStore(state, apolloClientObservable);
+
+  beforeEach(() => {
+    store = createStore(state, apolloClientObservable);
+  });
+
+  describe('rendering', () => {
+    test('it renders the default NetworkHttp table', () => {
+      const wrapper = shallow(
+        <ReduxStoreProvider store={store}>
+          <NetworkHttpTable
+            data={mockData.NetworkHttp.edges}
+            fakeTotalCount={getOr(50, 'fakeTotalCount', mockData.NetworkHttp.pageInfo)}
+            id="http"
+            isInspect={false}
+            loading={false}
+            loadPage={loadPage}
+            showMorePagesIndicator={getOr(
+              false,
+              'showMorePagesIndicator',
+              mockData.NetworkHttp.pageInfo
+            )}
+            totalCount={mockData.NetworkHttp.totalCount}
+            type={networkModel.NetworkType.page}
+          />
+        </ReduxStoreProvider>
+      );
+
+      expect(toJson(wrapper)).toMatchSnapshot();
+    });
+  });
+
+  describe('Sorting', () => {
+    test('when you click on the column header, you should show the sorting icon', () => {
+      const wrapper = mount(
+        <MockedProvider>
+          <TestProviders store={store}>
+            <NetworkHttpTable
+              data={mockData.NetworkHttp.edges}
+              fakeTotalCount={getOr(50, 'fakeTotalCount', mockData.NetworkHttp.pageInfo)}
+              id="http"
+              isInspect={false}
+              loading={false}
+              loadPage={loadPage}
+              showMorePagesIndicator={getOr(
+                false,
+                'showMorePagesIndicator',
+                mockData.NetworkHttp.pageInfo
+              )}
+              totalCount={mockData.NetworkHttp.totalCount}
+              type={networkModel.NetworkType.page}
+            />
+          </TestProviders>
+        </MockedProvider>
+      );
+
+      expect(store.getState().network.page.queries!.http.sort).toEqual({
+        direction: 'desc',
+      });
+
+      wrapper
+        .find('.euiTable thead tr th button')
+        .first()
+        .simulate('click');
+
+      wrapper.update();
+
+      expect(store.getState().network.page.queries!.http.sort).toEqual({
+        direction: 'asc',
+      });
+      expect(
+        wrapper
+          .find('.euiTable thead tr th button')
+          .first()
+          .find('svg')
+      ).toBeTruthy();
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.tsx
new file mode 100644
index 00000000000000..71807280ebcb45
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/index.tsx
@@ -0,0 +1,149 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
+import { ActionCreator } from 'typescript-fsa';
+
+import { networkActions } from '../../../../store/actions';
+import {
+  NetworkHttpEdges,
+  NetworkHttpFields,
+  NetworkHttpSortField,
+} from '../../../../graphql/types';
+import { networkModel, networkSelectors, State } from '../../../../store';
+import { Criteria, ItemsPerRow, PaginatedTable } from '../../../paginated_table';
+
+import { getNetworkHttpColumns } from './columns';
+import * as i18n from './translations';
+
+interface OwnProps {
+  data: NetworkHttpEdges[];
+  fakeTotalCount: number;
+  id: string;
+  isInspect: boolean;
+  loading: boolean;
+  loadPage: (newActivePage: number) => void;
+  showMorePagesIndicator: boolean;
+  totalCount: number;
+  type: networkModel.NetworkType;
+}
+
+interface NetworkHttpTableReduxProps {
+  activePage: number;
+  limit: number;
+  sort: NetworkHttpSortField;
+}
+
+interface NetworkHttpTableDispatchProps {
+  updateNetworkTable: ActionCreator<{
+    networkType: networkModel.NetworkType;
+    tableType: networkModel.AllNetworkTables;
+    updates: networkModel.TableUpdates;
+  }>;
+}
+
+type NetworkHttpTableProps = OwnProps & NetworkHttpTableReduxProps & NetworkHttpTableDispatchProps;
+
+const rowItems: ItemsPerRow[] = [
+  {
+    text: i18n.ROWS_5,
+    numberOfRow: 5,
+  },
+  {
+    text: i18n.ROWS_10,
+    numberOfRow: 10,
+  },
+];
+
+const NetworkHttpTableComponent = React.memo<NetworkHttpTableProps>(
+  ({
+    activePage,
+    data,
+    fakeTotalCount,
+    id,
+    isInspect,
+    limit,
+    loading,
+    loadPage,
+    showMorePagesIndicator,
+    sort,
+    totalCount,
+    type,
+    updateNetworkTable,
+  }) => {
+    const onChange = (criteria: Criteria, tableType: networkModel.HttpTableType) => {
+      if (criteria.sort != null && criteria.sort.direction !== sort.direction) {
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: {
+            sort: {
+              direction: criteria.sort.direction,
+            },
+          },
+        });
+      }
+    };
+    const tableType =
+      type === networkModel.NetworkType.page
+        ? networkModel.NetworkTableType.http
+        : networkModel.IpDetailsTableType.http;
+    return (
+      <PaginatedTable
+        activePage={activePage}
+        columns={getNetworkHttpColumns(tableType)}
+        dataTestSubj={`table-${tableType}`}
+        headerCount={totalCount}
+        headerTitle={i18n.HTTP_REQUESTS}
+        headerUnit={i18n.UNIT(totalCount)}
+        id={id}
+        itemsPerRow={rowItems}
+        isInspect={isInspect}
+        limit={limit}
+        loading={loading}
+        loadPage={newActivePage => loadPage(newActivePage)}
+        onChange={criteria => onChange(criteria, tableType)}
+        pageOfItems={data}
+        showMorePagesIndicator={showMorePagesIndicator}
+        sorting={{ field: `node.${NetworkHttpFields.requestCount}`, direction: sort.direction }}
+        totalCount={fakeTotalCount}
+        updateActivePage={newPage =>
+          updateNetworkTable({
+            networkType: type,
+            tableType,
+            updates: { activePage: newPage },
+          })
+        }
+        updateLimitPagination={newLimit =>
+          updateNetworkTable({
+            networkType: type,
+            tableType,
+            updates: { limit: newLimit },
+          })
+        }
+      />
+    );
+  }
+);
+
+NetworkHttpTableComponent.displayName = 'NetworkHttpTableComponent';
+
+const makeMapStateToProps = () => {
+  const getNetworkHttpSelector = networkSelectors.httpSelector();
+  const mapStateToProps = (state: State, { type }: OwnProps) => getNetworkHttpSelector(state, type);
+  return mapStateToProps;
+};
+
+export const NetworkHttpTable = compose<React.ComponentClass<OwnProps>>(
+  connect(
+    makeMapStateToProps,
+    {
+      updateNetworkTable: networkActions.updateNetworkTable,
+    }
+  )
+)(NetworkHttpTableComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/mock.ts b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/mock.ts
new file mode 100644
index 00000000000000..ed9b00ba8e49e5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/mock.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { NetworkHttpData } from '../../../../graphql/types';
+
+export const mockData: { NetworkHttp: NetworkHttpData } = {
+  NetworkHttp: {
+    edges: [
+      {
+        node: {
+          _id: '/computeMetadata/v1/instance/virtual-clock/drift-token',
+          domains: ['metadata.google.internal'],
+          methods: ['get'],
+          statuses: [],
+          lastHost: 'suricata-iowa',
+          lastSourceIp: '10.128.0.21',
+          path: '/computeMetadata/v1/instance/virtual-clock/drift-token',
+          requestCount: 1440,
+        },
+        cursor: {
+          value: '/computeMetadata/v1/instance/virtual-clock/drift-token',
+          tiebreaker: null,
+        },
+      },
+      {
+        node: {
+          _id: '/computeMetadata/v1/',
+          domains: ['metadata.google.internal'],
+          methods: ['get'],
+          statuses: ['200'],
+          lastHost: 'suricata-iowa',
+          lastSourceIp: '10.128.0.21',
+          path: '/computeMetadata/v1/',
+          requestCount: 1020,
+        },
+        cursor: {
+          value: '/computeMetadata/v1/',
+          tiebreaker: null,
+        },
+      },
+      {
+        node: {
+          _id: '/computeMetadata/v1/instance/network-interfaces/',
+          domains: ['metadata.google.internal'],
+          methods: ['get'],
+          statuses: [],
+          lastHost: 'suricata-iowa',
+          lastSourceIp: '10.128.0.21',
+          path: '/computeMetadata/v1/instance/network-interfaces/',
+          requestCount: 960,
+        },
+        cursor: {
+          value: '/computeMetadata/v1/instance/network-interfaces/',
+          tiebreaker: null,
+        },
+      },
+      {
+        node: {
+          _id: '/downloads/ca_setup.exe',
+          domains: ['www.oxid.it'],
+          methods: ['get'],
+          statuses: ['200'],
+          lastHost: 'jessie',
+          lastSourceIp: '10.0.2.15',
+          path: '/downloads/ca_setup.exe',
+          requestCount: 3,
+        },
+        cursor: {
+          value: '/downloads/ca_setup.exe',
+          tiebreaker: null,
+        },
+      },
+    ],
+    inspect: {
+      dsl: [''],
+      response: [''],
+    },
+    pageInfo: {
+      activePage: 0,
+      fakeTotalCount: 4,
+      showMorePagesIndicator: false,
+    },
+    totalCount: 4,
+  },
+};
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/translations.ts b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/translations.ts
new file mode 100644
index 00000000000000..c891a7c75fc3c1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_http_table/translations.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const HTTP_REQUESTS = i18n.translate('xpack.siem.networkHttpTable.title', {
+  defaultMessage: 'HTTP Requests',
+});
+
+export const UNIT = (totalCount: number) =>
+  i18n.translate('xpack.siem.networkHttpTable.unit', {
+    values: { totalCount },
+    defaultMessage: `{totalCount, plural, =1 {request} other {requests}}`,
+  });
+
+export const METHOD = i18n.translate('xpack.siem.networkHttpTable.column.methodTitle', {
+  defaultMessage: 'Method',
+});
+export const DOMAIN = i18n.translate('xpack.siem.networkHttpTable.column.domainTitle', {
+  defaultMessage: 'Domain',
+});
+
+export const PATH = i18n.translate('xpack.siem.networkHttpTable.column.pathTitle', {
+  defaultMessage: 'Path',
+});
+
+export const STATUS = i18n.translate('xpack.siem.networkHttpTable.column.statusTitle', {
+  defaultMessage: 'Status',
+});
+
+export const LAST_HOST = i18n.translate('xpack.siem.networkHttpTable.column.lastHostTitle', {
+  defaultMessage: 'Last host',
+});
+
+export const LAST_SOURCE_IP = i18n.translate(
+  'xpack.siem.networkHttpTable.column.lastSourceIpTitle',
+  {
+    defaultMessage: 'Last source Ip',
+  }
+);
+
+export const REQUESTS = i18n.translate('xpack.siem.networkHttpTable.column.requestsTitle', {
+  defaultMessage: 'Requests',
+});
+
+export const ROWS_5 = i18n.translate('xpack.siem.networkHttpTable.rows', {
+  values: { numRows: 5 },
+  defaultMessage: '{numRows} {numRows, plural, =0 {rows} =1 {row} other {rows}}',
+});
+
+export const ROWS_10 = i18n.translate('xpack.siem.networkHttpTable.rows', {
+  values: { numRows: 10 },
+  defaultMessage: '{numRows} {numRows, plural, =0 {rows} =1 {row} other {rows}}',
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/translations.ts b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/translations.ts
index 70450f08a7d92c..e3a2697142bef3 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/translations.ts
@@ -34,14 +34,14 @@ export const FLOWS = i18n.translate('xpack.siem.networkTopCountriesTable.column.
 export const DESTINATION_COUNTRIES = i18n.translate(
   'xpack.siem.networkTopCountriesTable.heading.destinationCountries',
   {
-    defaultMessage: 'Destination Countries',
+    defaultMessage: 'Destination countries',
   }
 );
 
 export const SOURCE_COUNTRIES = i18n.translate(
   'xpack.siem.networkTopCountriesTable.heading.sourceCountries',
   {
-    defaultMessage: 'Source Countries',
+    defaultMessage: 'Source countries',
   }
 );
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.tsx
index f93ce943da96a1..a41b59b3c6528c 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { isEqual, last } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { ActionCreator } from 'typescript-fsa';
@@ -87,26 +87,29 @@ const NetworkTopNFlowTableComponent = React.memo<NetworkTopNFlowTableProps>(
     type,
     updateNetworkTable,
   }) => {
-    const onChange = (criteria: Criteria, tableType: networkModel.TopNTableType) => {
-      if (criteria.sort != null) {
-        const splitField = criteria.sort.field.split('.');
-        const field = last(splitField);
-        const newSortDirection = field !== sort.field ? Direction.desc : criteria.sort.direction; // sort by desc on init click
-        const newTopNFlowSort: NetworkTopTablesSortField = {
-          field: field as NetworkTopTablesFields,
-          direction: newSortDirection,
-        };
-        if (!isEqual(newTopNFlowSort, sort)) {
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: {
-              sort: newTopNFlowSort,
-            },
-          });
+    const onChange = useCallback(
+      (criteria: Criteria, tableType: networkModel.TopNTableType) => {
+        if (criteria.sort != null) {
+          const splitField = criteria.sort.field.split('.');
+          const field = last(splitField);
+          const newSortDirection = field !== sort.field ? Direction.desc : criteria.sort.direction; // sort by desc on init click
+          const newTopNFlowSort: NetworkTopTablesSortField = {
+            field: field as NetworkTopTablesFields,
+            direction: newSortDirection,
+          };
+          if (!isEqual(newTopNFlowSort, sort)) {
+            updateNetworkTable({
+              networkType: type,
+              tableType,
+              updates: {
+                sort: newTopNFlowSort,
+              },
+            });
+          }
         }
-      }
-    };
+      },
+      [sort, type]
+    );
 
     let tableType: networkModel.TopNTableType;
     const headerTitle: string =
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.tsx
index 3a4712e53c4d4f..6adb335839982b 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { isEqual } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { ActionCreator } from 'typescript-fsa';
@@ -78,22 +78,26 @@ const TlsTableComponent = React.memo<TlsTableProps>(
       type === networkModel.NetworkType.page
         ? networkModel.NetworkTableType.tls
         : networkModel.IpDetailsTableType.tls;
-    const onChange = (criteria: Criteria) => {
-      if (criteria.sort != null) {
-        const splitField = criteria.sort.field.split('.');
-        const newTlsSort: TlsSortField = {
-          field: getSortFromString(splitField[splitField.length - 1]),
-          direction: criteria.sort.direction,
-        };
-        if (!isEqual(newTlsSort, sort)) {
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { sort: newTlsSort },
-          });
+
+    const onChange = useCallback(
+      (criteria: Criteria) => {
+        if (criteria.sort != null) {
+          const splitField = criteria.sort.field.split('.');
+          const newTlsSort: TlsSortField = {
+            field: getSortFromString(splitField[splitField.length - 1]),
+            direction: criteria.sort.direction,
+          };
+          if (!isEqual(newTlsSort, sort)) {
+            updateNetworkTable({
+              networkType: type,
+              tableType,
+              updates: { sort: newTlsSort },
+            });
+          }
         }
-      }
-    };
+      },
+      [sort, type]
+    );
     return (
       <PaginatedTable
         activePage={activePage}
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/columns.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/columns.tsx
index 2c51fb8f94561a..b732ac5bfd5fae 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/columns.tsx
@@ -73,6 +73,7 @@ export const getUsersColumns = (flowTarget: FlowTarget, tableId: string): UsersC
       }),
   },
   {
+    align: 'right',
     field: 'node.user.count',
     name: i18n.DOCUMENT_COUNT,
     truncateText: false,
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.tsx
index df895bbfe8e82f..ce1376d753f708 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { isEqual } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
@@ -78,22 +78,25 @@ const UsersTableComponent = React.memo<UsersTableProps>(
     updateNetworkTable,
     sort,
   }) => {
-    const onChange = (criteria: Criteria) => {
-      if (criteria.sort != null) {
-        const splitField = criteria.sort.field.split('.');
-        const newUsersSort: UsersSortField = {
-          field: getSortFromString(splitField[splitField.length - 1]),
-          direction: criteria.sort.direction,
-        };
-        if (!isEqual(newUsersSort, sort)) {
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { sort: newUsersSort },
-          });
+    const onChange = useCallback(
+      (criteria: Criteria) => {
+        if (criteria.sort != null) {
+          const splitField = criteria.sort.field.split('.');
+          const newUsersSort: UsersSortField = {
+            field: getSortFromString(splitField[splitField.length - 1]),
+            direction: criteria.sort.direction,
+          };
+          if (!isEqual(newUsersSort, sort)) {
+            updateNetworkTable({
+              networkType: type,
+              tableType,
+              updates: { sort: newUsersSort },
+            });
+          }
         }
-      }
-    };
+      },
+      [sort, type]
+    );
 
     return (
       <PaginatedTable
diff --git a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.tsx
index 4de64c6b32aa96..646d003051e836 100644
--- a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.tsx
@@ -23,6 +23,7 @@ import { Direction } from '../../graphql/types';
 import { AuthTableColumns } from '../page/hosts/authentications_table';
 import { HostsTableColumns } from '../page/hosts/hosts_table';
 import { NetworkDnsColumns } from '../page/network/network_dns_table/columns';
+import { NetworkHttpColumns } from '../page/network/network_http_table/columns';
 import {
   NetworkTopNFlowColumns,
   NetworkTopNFlowColumnsIpDetails,
@@ -72,6 +73,7 @@ declare type BasicTableColumns =
   | HostsTableColumns
   | HostsTableColumnsTest
   | NetworkDnsColumns
+  | NetworkHttpColumns
   | NetworkTopCountriesColumns
   | NetworkTopCountriesColumnsIpDetails
   | NetworkTopNFlowColumns
diff --git a/x-pack/legacy/plugins/siem/public/components/search_bar/index.tsx b/x-pack/legacy/plugins/siem/public/components/search_bar/index.tsx
index 0876ca69f91a7b..5b60b625212936 100644
--- a/x-pack/legacy/plugins/siem/public/components/search_bar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/search_bar/index.tsx
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { getOr, isEqual, set } from 'lodash/fp';
-import React, { memo, useEffect } from 'react';
+import React, { memo, useEffect, useCallback, useMemo } from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { Subscription } from 'rxjs';
@@ -17,6 +16,7 @@ import { TimeRange, Query } from 'src/plugins/data/common/types';
 import { SavedQuery } from 'src/legacy/core_plugins/data/public';
 
 import { OnTimeChangeProps } from '@elastic/eui';
+import { npStart } from 'ui/new_platform';
 import { start as data } from '../../../../../../../src/legacy/core_plugins/data/public/legacy';
 
 import { inputsActions } from '../../store/inputs';
@@ -36,15 +36,14 @@ import {
   toStrSelector,
 } from './selectors';
 import { timelineActions, hostsActions, networkActions } from '../../store/actions';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 const {
   ui: { SearchBar },
-  filter,
   search,
-  timefilter,
 } = data;
 
-export const siemFilterManager = filter.filterManager;
+export const siemFilterManager = npStart.plugins.data.query.filterManager;
 export const savedQueryService = search.services.savedQueryService;
 
 interface SiemSearchBarRedux {
@@ -67,7 +66,7 @@ interface SiemSearchBarDispatch {
     id: InputsModelId;
     savedQuery: SavedQuery | undefined;
   }) => void;
-  setSearchBarFilter: ({ id, filters }: { id: InputsModelId; filters: Filter[] }) => void;
+  setSearchBarFilter: ({ id, filters }: { id: InputsModelId; filters: esFilters.Filter[] }) => void;
 }
 
 interface SiemSearchBarProps {
@@ -99,112 +98,125 @@ const SearchBarComponent = memo<SiemSearchBarProps & SiemSearchBarRedux & SiemSe
     toStr,
     updateSearch,
   }) => {
+    const { timefilter } = npStart.plugins.data.query.timefilter;
     if (fromStr != null && toStr != null) {
-      timefilter.timefilter.setTime({ from: fromStr, to: toStr });
+      timefilter.setTime({ from: fromStr, to: toStr });
     } else if (start != null && end != null) {
-      timefilter.timefilter.setTime({
+      timefilter.setTime({
         from: new Date(start).toISOString(),
         to: new Date(end).toISOString(),
       });
     }
 
-    const onQuerySubmit = (payload: { dateRange: TimeRange; query?: Query }) => {
-      const isQuickSelection =
-        payload.dateRange.from.includes('now') || payload.dateRange.to.includes('now');
-      let updateSearchBar: UpdateReduxSearchBar = {
-        id,
-        end: toStr != null ? toStr : new Date(end).toISOString(),
-        start: fromStr != null ? fromStr : new Date(start).toISOString(),
-        isInvalid: false,
-        isQuickSelection,
-        updateTime: false,
-      };
-      let isStateUpdated = false;
-
-      if (
-        (isQuickSelection &&
-          (fromStr !== payload.dateRange.from || toStr !== payload.dateRange.to)) ||
-        (!isQuickSelection &&
-          (start !== formatDate(payload.dateRange.from) ||
-            end !== formatDate(payload.dateRange.to)))
-      ) {
-        isStateUpdated = true;
-        updateSearchBar.updateTime = true;
-        updateSearchBar.end = payload.dateRange.to;
-        updateSearchBar.start = payload.dateRange.from;
-      }
-
-      if (payload.query != null && !isEqual(payload.query, filterQuery)) {
-        isStateUpdated = true;
-        updateSearchBar = set('query', payload.query, updateSearchBar);
-      }
-
-      if (!isStateUpdated) {
-        // That mean we are doing a refresh!
-        if (isQuickSelection) {
+    const onQuerySubmit = useCallback(
+      (payload: { dateRange: TimeRange; query?: Query }) => {
+        const isQuickSelection =
+          payload.dateRange.from.includes('now') || payload.dateRange.to.includes('now');
+        let updateSearchBar: UpdateReduxSearchBar = {
+          id,
+          end: toStr != null ? toStr : new Date(end).toISOString(),
+          start: fromStr != null ? fromStr : new Date(start).toISOString(),
+          isInvalid: false,
+          isQuickSelection,
+          updateTime: false,
+        };
+        let isStateUpdated = false;
+
+        if (
+          (isQuickSelection &&
+            (fromStr !== payload.dateRange.from || toStr !== payload.dateRange.to)) ||
+          (!isQuickSelection &&
+            (start !== formatDate(payload.dateRange.from) ||
+              end !== formatDate(payload.dateRange.to)))
+        ) {
+          isStateUpdated = true;
           updateSearchBar.updateTime = true;
           updateSearchBar.end = payload.dateRange.to;
           updateSearchBar.start = payload.dateRange.from;
-        } else {
-          queries.forEach(q => q.refetch && (q.refetch as inputsModel.Refetch)());
         }
-      }
 
-      window.setTimeout(() => updateSearch(updateSearchBar), 0);
-    };
+        if (payload.query != null && !isEqual(payload.query, filterQuery)) {
+          isStateUpdated = true;
+          updateSearchBar = set('query', payload.query, updateSearchBar);
+        }
 
-    const onRefresh = (payload: { dateRange: TimeRange }) => {
-      if (payload.dateRange.from.includes('now') || payload.dateRange.to.includes('now')) {
-        updateSearch({
-          id,
-          end: payload.dateRange.to,
-          start: payload.dateRange.from,
-          isInvalid: false,
-          isQuickSelection: true,
-          updateTime: true,
-        });
-      } else {
-        queries.forEach(q => q.refetch && (q.refetch as inputsModel.Refetch)());
-      }
-    };
+        if (!isStateUpdated) {
+          // That mean we are doing a refresh!
+          if (isQuickSelection) {
+            updateSearchBar.updateTime = true;
+            updateSearchBar.end = payload.dateRange.to;
+            updateSearchBar.start = payload.dateRange.from;
+          } else {
+            queries.forEach(q => q.refetch && (q.refetch as inputsModel.Refetch)());
+          }
+        }
 
-    const onSaved = (newSavedQuery: SavedQuery) => {
-      setSavedQuery({ id, savedQuery: newSavedQuery });
-    };
+        window.setTimeout(() => updateSearch(updateSearchBar), 0);
+      },
+      [id, end, filterQuery, fromStr, queries, start, toStr]
+    );
 
-    const onSavedQueryUpdated = (savedQueryUpdated: SavedQuery) => {
-      const isQuickSelection = savedQueryUpdated.attributes.timefilter
-        ? savedQueryUpdated.attributes.timefilter.from.includes('now') ||
-          savedQueryUpdated.attributes.timefilter.to.includes('now')
-        : false;
+    const onRefresh = useCallback(
+      (payload: { dateRange: TimeRange }) => {
+        if (payload.dateRange.from.includes('now') || payload.dateRange.to.includes('now')) {
+          updateSearch({
+            id,
+            end: payload.dateRange.to,
+            start: payload.dateRange.from,
+            isInvalid: false,
+            isQuickSelection: true,
+            updateTime: true,
+          });
+        } else {
+          queries.forEach(q => q.refetch && (q.refetch as inputsModel.Refetch)());
+        }
+      },
+      [id, queries]
+    );
 
-      let updateSearchBar: UpdateReduxSearchBar = {
-        id,
-        filters: savedQueryUpdated.attributes.filters || [],
-        end: toStr != null ? toStr : new Date(end).toISOString(),
-        start: fromStr != null ? fromStr : new Date(start).toISOString(),
-        isInvalid: false,
-        isQuickSelection,
-        updateTime: false,
-      };
+    const onSaved = useCallback(
+      (newSavedQuery: SavedQuery) => {
+        setSavedQuery({ id, savedQuery: newSavedQuery });
+      },
+      [id]
+    );
 
-      if (savedQueryUpdated.attributes.timefilter) {
-        updateSearchBar.end = savedQueryUpdated.attributes.timefilter
-          ? savedQueryUpdated.attributes.timefilter.to
-          : updateSearchBar.end;
-        updateSearchBar.start = savedQueryUpdated.attributes.timefilter
-          ? savedQueryUpdated.attributes.timefilter.from
-          : updateSearchBar.start;
-        updateSearchBar.updateTime = true;
-      }
+    const onSavedQueryUpdated = useCallback(
+      (savedQueryUpdated: SavedQuery) => {
+        const isQuickSelection = savedQueryUpdated.attributes.timefilter
+          ? savedQueryUpdated.attributes.timefilter.from.includes('now') ||
+            savedQueryUpdated.attributes.timefilter.to.includes('now')
+          : false;
+
+        let updateSearchBar: UpdateReduxSearchBar = {
+          id,
+          filters: savedQueryUpdated.attributes.filters || [],
+          end: toStr != null ? toStr : new Date(end).toISOString(),
+          start: fromStr != null ? fromStr : new Date(start).toISOString(),
+          isInvalid: false,
+          isQuickSelection,
+          updateTime: false,
+        };
+
+        if (savedQueryUpdated.attributes.timefilter) {
+          updateSearchBar.end = savedQueryUpdated.attributes.timefilter
+            ? savedQueryUpdated.attributes.timefilter.to
+            : updateSearchBar.end;
+          updateSearchBar.start = savedQueryUpdated.attributes.timefilter
+            ? savedQueryUpdated.attributes.timefilter.from
+            : updateSearchBar.start;
+          updateSearchBar.updateTime = true;
+        }
 
-      updateSearchBar = set('query', savedQueryUpdated.attributes.query, updateSearchBar);
-      updateSearchBar = set('savedQuery', savedQueryUpdated, updateSearchBar);
+        updateSearchBar = set('query', savedQueryUpdated.attributes.query, updateSearchBar);
+        updateSearchBar = set('savedQuery', savedQueryUpdated, updateSearchBar);
 
-      updateSearch(updateSearchBar);
-    };
+        updateSearch(updateSearchBar);
+      },
+      [id, end, fromStr, start, toStr]
+    );
 
-    const onClearSavedQuery = () => {
+    const onClearSavedQuery = useCallback(() => {
       if (savedQuery != null) {
         updateSearch({
           id,
@@ -222,7 +234,7 @@ const SearchBarComponent = memo<SiemSearchBarProps & SiemSearchBarRedux & SiemSe
           savedQuery: undefined,
         });
       }
-    };
+    }, [id, end, fromStr, start, toStr]);
 
     useEffect(() => {
       let isSubscribed = true;
@@ -246,13 +258,13 @@ const SearchBarComponent = memo<SiemSearchBarProps & SiemSearchBarRedux & SiemSe
         subscriptions.unsubscribe();
       };
     }, []);
-
+    const IndexPatterns = useMemo(() => [indexPattern as IndexPattern], [indexPattern]);
     return (
       <SearchBarContainer data-test-subj={`${id}DatePicker`}>
         <SearchBar
           appName="siem"
           isLoading={isLoading}
-          indexPatterns={[indexPattern as IndexPattern]}
+          indexPatterns={IndexPatterns}
           query={filterQuery}
           onClearSavedQuery={onClearSavedQuery}
           onQuerySubmit={onQuerySubmit}
@@ -301,7 +313,7 @@ SearchBarComponent.displayName = 'SiemSearchBar';
 
 interface UpdateReduxSearchBar extends OnTimeChangeProps {
   id: InputsModelId;
-  filters?: Filter[];
+  filters?: esFilters.Filter[];
   query?: Query;
   savedQuery?: SavedQuery;
   resetSavedQuery?: boolean;
@@ -385,7 +397,7 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({
   updateSearch: dispatchUpdateSearch(dispatch),
   setSavedQuery: ({ id, savedQuery }: { id: InputsModelId; savedQuery: SavedQuery | undefined }) =>
     dispatch(inputsActions.setSavedQuery({ id, savedQuery })),
-  setSearchBarFilter: ({ id, filters }: { id: InputsModelId; filters: Filter[] }) =>
+  setSearchBarFilter: ({ id, filters }: { id: InputsModelId; filters: esFilters.Filter[] }) =>
     dispatch(inputsActions.setSearchBarFilter({ id, filters })),
 });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.tsx b/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.tsx
index 4859dc0d055561..6359063798ba8e 100644
--- a/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.tsx
@@ -54,7 +54,7 @@ export interface SkeletonRowProps extends CellProps, RowProps {
 export const SkeletonRow = React.memo<SkeletonRowProps>(
   ({ cellColor, cellCount = 4, cellMargin, rowHeight, rowPadding, style }) => {
     const cells = [...Array(cellCount)].map((_, i) => (
-      <Cell cellColor={cellColor} cellMargin={cellMargin} key={i}></Cell>
+      <Cell cellColor={cellColor} cellMargin={cellMargin} key={i} />
     ));
 
     return (
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
index 8453ec1cfb5d74..ed3eaa6cf1e917 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/index.test.tsx
@@ -38,11 +38,11 @@ const from = new Date('2019-06-15T06:00:00.000Z').valueOf();
 const to = new Date('2019-06-18T06:00:00.000Z').valueOf();
 
 jest.mock('../charts/areachart', () => {
-  return { AreaChart: () => <div className="areachart"></div> };
+  return { AreaChart: () => <div className="areachart" /> };
 });
 
 jest.mock('../charts/barchart', () => {
-  return { BarChart: () => <div className="barchart"></div> };
+  return { BarChart: () => <div className="barchart" /> };
 });
 
 describe('Stat Items Component', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.tsx b/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.tsx
index 2d93fde336d3ac..caeb29fc6de7d6 100644
--- a/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.tsx
@@ -13,7 +13,7 @@ import {
   OnTimeChangeProps,
 } from '@elastic/eui';
 import { getOr, take } from 'lodash/fp';
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 import { connect } from 'react-redux';
 
 import { Dispatch } from 'redux';
@@ -55,13 +55,18 @@ interface UpdateReduxTime extends OnTimeChangeProps {
   timelineId?: string;
 }
 
+interface ReturnUpdateReduxTime {
+  kqlHaveBeenUpdated: boolean;
+}
+
 export type DispatchUpdateReduxTime = ({
   end,
   id,
   isQuickSelection,
+  kql,
   start,
   timelineId,
-}: UpdateReduxTime) => void;
+}: UpdateReduxTime) => ReturnUpdateReduxTime;
 
 interface SuperDatePickerDispatchProps {
   setDuration: ({ id, duration }: { id: InputsModelId; duration: number }) => void;
@@ -103,76 +108,89 @@ export const SuperDatePickerComponent = React.memo<SuperDatePickerProps>(
     const [recentlyUsedRanges, setRecentlyUsedRanges] = useState<EuiSuperDatePickerRecentRange[]>(
       []
     );
-    const onRefresh = ({ start: newStart, end: newEnd }: OnRefreshProps): void => {
-      updateReduxTime({
-        end: newEnd,
-        id,
-        isInvalid: false,
-        isQuickSelection,
-        kql: kqlQuery,
-        start: newStart,
-        timelineId,
-      });
-      const currentStart = formatDate(newStart);
-      const currentEnd = isQuickSelection
-        ? formatDate(newEnd, { roundUp: true })
-        : formatDate(newEnd);
-      if (!isQuickSelection || (start === currentStart && end === currentEnd)) {
-        refetchQuery(queries);
-      }
-    };
+    const onRefresh = useCallback(
+      ({ start: newStart, end: newEnd }: OnRefreshProps): void => {
+        const { kqlHaveBeenUpdated } = updateReduxTime({
+          end: newEnd,
+          id,
+          isInvalid: false,
+          isQuickSelection,
+          kql: kqlQuery,
+          start: newStart,
+          timelineId,
+        });
+        const currentStart = formatDate(newStart);
+        const currentEnd = isQuickSelection
+          ? formatDate(newEnd, { roundUp: true })
+          : formatDate(newEnd);
+        if (
+          !kqlHaveBeenUpdated &&
+          (!isQuickSelection || (start === currentStart && end === currentEnd))
+        ) {
+          refetchQuery(queries);
+        }
+      },
+      [end, id, isQuickSelection, kqlQuery, start, timelineId]
+    );
 
-    const onRefreshChange = ({ isPaused, refreshInterval }: OnRefreshChangeProps): void => {
-      if (duration !== refreshInterval) {
-        setDuration({ id, duration: refreshInterval });
-      }
+    const onRefreshChange = useCallback(
+      ({ isPaused, refreshInterval }: OnRefreshChangeProps): void => {
+        if (duration !== refreshInterval) {
+          setDuration({ id, duration: refreshInterval });
+        }
 
-      if (isPaused && policy === 'interval') {
-        stopAutoReload({ id });
-      } else if (!isPaused && policy === 'manual') {
-        startAutoReload({ id });
-      }
+        if (isPaused && policy === 'interval') {
+          stopAutoReload({ id });
+        } else if (!isPaused && policy === 'manual') {
+          startAutoReload({ id });
+        }
 
-      if (!isPaused && (!isQuickSelection || (isQuickSelection && toStr !== 'now'))) {
-        refetchQuery(queries);
-      }
-    };
+        if (!isPaused && (!isQuickSelection || (isQuickSelection && toStr !== 'now'))) {
+          refetchQuery(queries);
+        }
+      },
+      [id, isQuickSelection, duration, policy, toStr]
+    );
 
     const refetchQuery = (newQueries: inputsModel.GlobalGraphqlQuery[]) => {
       newQueries.forEach(q => q.refetch && (q.refetch as inputsModel.Refetch)());
     };
 
-    const onTimeChange = ({
-      start: newStart,
-      end: newEnd,
-      isQuickSelection: newIsQuickSelection,
-      isInvalid,
-    }: OnTimeChangeProps) => {
-      if (!isInvalid) {
-        updateReduxTime({
-          end: newEnd,
-          id,
-          isInvalid,
-          isQuickSelection: newIsQuickSelection,
-          kql: kqlQuery,
-          start: newStart,
-          timelineId,
-        });
-        const newRecentlyUsedRanges = [
-          { start: newStart, end: newEnd },
-          ...take(
-            MAX_RECENTLY_USED_RANGES,
-            recentlyUsedRanges.filter(
-              recentlyUsedRange =>
-                !(recentlyUsedRange.start === newStart && recentlyUsedRange.end === newEnd)
-            )
-          ),
-        ];
+    const onTimeChange = useCallback(
+      ({
+        start: newStart,
+        end: newEnd,
+        isQuickSelection: newIsQuickSelection,
+        isInvalid,
+      }: OnTimeChangeProps) => {
+        if (!isInvalid) {
+          updateReduxTime({
+            end: newEnd,
+            id,
+            isInvalid,
+            isQuickSelection: newIsQuickSelection,
+            kql: kqlQuery,
+            start: newStart,
+            timelineId,
+          });
+          const newRecentlyUsedRanges = [
+            { start: newStart, end: newEnd },
+            ...take(
+              MAX_RECENTLY_USED_RANGES,
+              recentlyUsedRanges.filter(
+                recentlyUsedRange =>
+                  !(recentlyUsedRange.start === newStart && recentlyUsedRange.end === newEnd)
+              )
+            ),
+          ];
+
+          setRecentlyUsedRanges(newRecentlyUsedRanges);
+          setIsQuickSelection(newIsQuickSelection);
+        }
+      },
+      [recentlyUsedRanges, kqlQuery]
+    );
 
-        setRecentlyUsedRanges(newRecentlyUsedRanges);
-        setIsQuickSelection(newIsQuickSelection);
-      }
-    };
     const endDate = kind === 'relative' ? toStr : new Date(end).toISOString();
     const startDate = kind === 'relative' ? fromStr : new Date(start).toISOString();
 
@@ -207,9 +225,10 @@ export const dispatchUpdateReduxTime = (dispatch: Dispatch) => ({
   end,
   id,
   isQuickSelection,
+  kql,
   start,
   timelineId,
-}: UpdateReduxTime): void => {
+}: UpdateReduxTime): ReturnUpdateReduxTime => {
   const fromDate = formatDate(start);
   let toDate = formatDate(end, { roundUp: true });
   if (isQuickSelection) {
@@ -241,6 +260,15 @@ export const dispatchUpdateReduxTime = (dispatch: Dispatch) => ({
       })
     );
   }
+  if (kql) {
+    return {
+      kqlHaveBeenUpdated: kql.refetch(dispatch),
+    };
+  }
+
+  return {
+    kqlHaveBeenUpdated: false,
+  };
 };
 
 export const makeMapStateToProps = () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/tables/__snapshots__/helpers.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/tables/__snapshots__/helpers.test.tsx.snap
index aa8666c247caef..1e6c5eb89352bd 100644
--- a/x-pack/legacy/plugins/siem/public/components/tables/__snapshots__/helpers.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/tables/__snapshots__/helpers.test.tsx.snap
@@ -33,7 +33,7 @@ exports[`Table Helpers #getRowItemDraggables it returns correctly against snapsh
         "and": Array [],
         "enabled": true,
         "excluded": false,
-        "id": "idPrefix-attrName-item1",
+        "id": "idPrefix-attrName-item1-0",
         "kqlQuery": "",
         "name": "item1",
         "queryMatch": Object {
@@ -44,7 +44,7 @@ exports[`Table Helpers #getRowItemDraggables it returns correctly against snapsh
         },
       }
     }
-    key="idPrefix-attrName-item1"
+    key="idPrefix-attrName-item1-0"
     render={[Function]}
   />
   ,
@@ -55,7 +55,7 @@ exports[`Table Helpers #getRowItemDraggables it returns correctly against snapsh
         "and": Array [],
         "enabled": true,
         "excluded": false,
-        "id": "idPrefix-attrName-item2",
+        "id": "idPrefix-attrName-item2-1",
         "kqlQuery": "",
         "name": "item2",
         "queryMatch": Object {
@@ -66,7 +66,7 @@ exports[`Table Helpers #getRowItemDraggables it returns correctly against snapsh
         },
       }
     }
-    key="idPrefix-attrName-item2"
+    key="idPrefix-attrName-item2-1"
     render={[Function]}
   />
   ,
@@ -77,7 +77,7 @@ exports[`Table Helpers #getRowItemDraggables it returns correctly against snapsh
         "and": Array [],
         "enabled": true,
         "excluded": false,
-        "id": "idPrefix-attrName-item3",
+        "id": "idPrefix-attrName-item3-2",
         "kqlQuery": "",
         "name": "item3",
         "queryMatch": Object {
@@ -88,7 +88,7 @@ exports[`Table Helpers #getRowItemDraggables it returns correctly against snapsh
         },
       }
     }
-    key="idPrefix-attrName-item3"
+    key="idPrefix-attrName-item3-2"
     render={[Function]}
   />
    
diff --git a/x-pack/legacy/plugins/siem/public/components/tables/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/tables/helpers.tsx
index 2557630a603061..b4ee93f9963e43 100644
--- a/x-pack/legacy/plugins/siem/public/components/tables/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/tables/helpers.tsx
@@ -89,7 +89,7 @@ export const getRowItemDraggables = ({
 }): JSX.Element => {
   if (rowItems != null && rowItems.length > 0) {
     const draggables = rowItems.slice(0, displayCount).map((rowItem, index) => {
-      const id = escapeDataProviderId(`${idPrefix}-${attrName}-${rowItem}`);
+      const id = escapeDataProviderId(`${idPrefix}-${attrName}-${rowItem}-${index}`);
       return (
         <React.Fragment key={id}>
           {index !== 0 && (
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/event_column_view.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/event_column_view.tsx
index 7afa6ca70ff9b1..96cb9f754f525b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/event_column_view.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/event_column_view.tsx
@@ -15,7 +15,7 @@ import { EventsTrData } from '../../styles';
 import { Actions } from '../actions';
 import { ColumnHeader } from '../column_headers/column_header';
 import { DataDrivenColumns } from '../data_driven_columns';
-import { eventHasNotes, eventIsPinned, getPinOnClick } from '../helpers';
+import { eventHasNotes, getPinOnClick } from '../helpers';
 import { ColumnRenderer } from '../renderers/column_renderer';
 
 interface Props {
@@ -28,13 +28,13 @@ interface Props {
   eventIdToNoteIds: Readonly<Record<string, string[]>>;
   expanded: boolean;
   getNotesByIds: (noteIds: string[]) => Note[];
+  isEventPinned: boolean;
   isEventViewer?: boolean;
   loading: boolean;
   onColumnResized: OnColumnResized;
   onEventToggled: () => void;
   onPinEvent: OnPinEvent;
   onUnPinEvent: OnUnPinEvent;
-  pinnedEventIds: Readonly<Record<string, boolean>>;
   showNotes: boolean;
   timelineId: string;
   toggleShowNotes: () => void;
@@ -56,13 +56,13 @@ export const EventColumnView = React.memo<Props>(
     eventIdToNoteIds,
     expanded,
     getNotesByIds,
+    isEventPinned = false,
     isEventViewer = false,
     loading,
     onColumnResized,
     onEventToggled,
     onPinEvent,
     onUnPinEvent,
-    pinnedEventIds,
     showNotes,
     timelineId,
     toggleShowNotes,
@@ -76,10 +76,7 @@ export const EventColumnView = React.memo<Props>(
         expanded={expanded}
         data-test-subj="actions"
         eventId={id}
-        eventIsPinned={eventIsPinned({
-          eventId: id,
-          pinnedEventIds,
-        })}
+        eventIsPinned={isEventPinned}
         getNotesByIds={getNotesByIds}
         isEventViewer={isEventViewer}
         loading={loading}
@@ -90,7 +87,7 @@ export const EventColumnView = React.memo<Props>(
           eventId: id,
           onPinEvent,
           onUnPinEvent,
-          pinnedEventIds,
+          isEventPinned,
         })}
         showCheckboxes={false}
         showNotes={showNotes}
@@ -118,7 +115,7 @@ export const EventColumnView = React.memo<Props>(
       prevProps.eventIdToNoteIds === nextProps.eventIdToNoteIds &&
       prevProps.expanded === nextProps.expanded &&
       prevProps.loading === nextProps.loading &&
-      prevProps.pinnedEventIds === nextProps.pinnedEventIds &&
+      prevProps.isEventPinned === nextProps.isEventPinned &&
       prevProps.showNotes === nextProps.showNotes &&
       prevProps.timelineId === nextProps.timelineId
     );
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/index.tsx
index 78992dceea4dcc..34281219bcc0cd 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../containers/source';
 import { TimelineItem } from '../../../../graphql/types';
@@ -17,6 +17,7 @@ import { ColumnHeader } from '../column_headers/column_header';
 import { ColumnRenderer } from '../renderers/column_renderer';
 import { RowRenderer } from '../renderers/row_renderer';
 import { StatefulEvent } from './stateful_event';
+import { eventIsPinned } from '../helpers';
 
 interface Props {
   actionsColumnWidth: number;
@@ -74,6 +75,7 @@ export const Events = React.memo<Props>(
           event={event}
           eventIdToNoteIds={eventIdToNoteIds}
           getNotesByIds={getNotesByIds}
+          isEventPinned={eventIsPinned({ eventId: event._id, pinnedEventIds })}
           isEventViewer={isEventViewer}
           key={event._id}
           maxDelay={maxDelay(i)}
@@ -81,7 +83,6 @@ export const Events = React.memo<Props>(
           onPinEvent={onPinEvent}
           onUnPinEvent={onUnPinEvent}
           onUpdateColumns={onUpdateColumns}
-          pinnedEventIds={pinnedEventIds}
           rowRenderers={rowRenderers}
           timelineId={id}
           toggleColumn={toggleColumn}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event.tsx
index 766a75c05f17c6..d54fe8df28a854 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState, useCallback } from 'react';
 import uuid from 'uuid';
 import VisibilitySensor from 'react-visibility-sensor';
 
@@ -21,7 +21,6 @@ import { STATEFUL_EVENT_CSS_CLASS_NAME } from '../../helpers';
 import { EventsTrGroup, EventsTrSupplement, OFFSET_SCROLLBAR } from '../../styles';
 import { useTimelineWidthContext } from '../../timeline_context';
 import { ColumnHeader } from '../column_headers/column_header';
-import { eventIsPinned } from '../helpers';
 import { ColumnRenderer } from '../renderers/column_renderer';
 import { getRowRenderer } from '../renderers/get_row_renderer';
 import { RowRenderer } from '../renderers/row_renderer';
@@ -42,7 +41,7 @@ interface Props {
   onPinEvent: OnPinEvent;
   onUnPinEvent: OnUnPinEvent;
   onUpdateColumns: OnUpdateColumns;
-  pinnedEventIds: Readonly<Record<string, boolean>>;
+  isEventPinned: boolean;
   rowRenderers: RowRenderer[];
   timelineId: string;
   toggleColumn: (column: ColumnHeader) => void;
@@ -110,12 +109,12 @@ export const StatefulEvent = React.memo<Props>(
     eventIdToNoteIds,
     getNotesByIds,
     isEventViewer = false,
+    isEventPinned = false,
     maxDelay = 0,
     onColumnResized,
     onPinEvent,
     onUnPinEvent,
     onUpdateColumns,
-    pinnedEventIds,
     rowRenderers,
     timelineId,
     toggleColumn,
@@ -127,27 +126,28 @@ export const StatefulEvent = React.memo<Props>(
 
     const divElement = useRef<HTMLDivElement | null>(null);
 
-    const onToggleShowNotes = (eventId: string): (() => void) => () => {
+    const onToggleShowNotes = useCallback(() => {
+      const eventId = event._id;
       setShowNotes({ ...showNotes, [eventId]: !showNotes[eventId] });
-    };
+    }, [event, showNotes]);
 
-    const onToggleExpanded = (eventId: string): (() => void) => () => {
+    const onToggleExpanded = useCallback(() => {
+      const eventId = event._id;
       setExpanded({
         ...expanded,
         [eventId]: !expanded[eventId],
       });
-    };
+    }, [event, expanded]);
 
-    const associateNote = (
-      eventId: string,
-      addNoteToEventChild: AddNoteToEvent,
-      onPinEventChild: OnPinEvent
-    ): ((noteId: string) => void) => (noteId: string) => {
-      addNoteToEventChild({ eventId, noteId });
-      if (!eventIsPinned({ eventId, pinnedEventIds })) {
-        onPinEventChild(eventId); // pin the event, because it has notes
-      }
-    };
+    const associateNote = useCallback(
+      (noteId: string) => {
+        addNoteToEvent({ eventId: event._id, noteId });
+        if (!isEventPinned) {
+          onPinEvent(event._id); // pin the event, because it has notes
+        }
+      },
+      [addNoteToEvent, event, isEventPinned, onPinEvent]
+    );
 
     /**
      * Incrementally loads the events when it mounts by trying to
@@ -155,7 +155,6 @@ export const StatefulEvent = React.memo<Props>(
      * indicate to React that it should render its self by setting
      * its initialRender to true.
      */
-
     useEffect(() => {
       let _isMounted = true;
 
@@ -222,6 +221,7 @@ export const StatefulEvent = React.memo<Props>(
                           expanded={!!expanded[event._id]}
                           getNotesByIds={getNotesByIds}
                           id={event._id}
+                          isEventPinned={isEventPinned}
                           isEventViewer={isEventViewer}
                           loading={loading}
                           onColumnResized={onColumnResized}
@@ -229,7 +229,6 @@ export const StatefulEvent = React.memo<Props>(
                           onToggleExpanded={onToggleExpanded}
                           onToggleShowNotes={onToggleShowNotes}
                           onUnPinEvent={onUnPinEvent}
-                          pinnedEventIds={pinnedEventIds}
                           showNotes={!!showNotes[event._id]}
                           timelineId={timelineId}
                           updateNote={updateNote}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event_child.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event_child.tsx
index 4a623ce99c9e99..668139349a3777 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event_child.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/events/stateful_event_child.tsx
@@ -29,21 +29,17 @@ interface Props {
   expanded: boolean;
   eventIdToNoteIds: Readonly<Record<string, string[]>>;
   isEventViewer?: boolean;
+  isEventPinned: boolean;
   loading: boolean;
   onColumnResized: OnColumnResized;
   onUnPinEvent: OnUnPinEvent;
-  pinnedEventIds: Readonly<Record<string, boolean>>;
   showNotes: boolean;
   timelineId: string;
   updateNote: UpdateNote;
-  onToggleExpanded: (eventId: string) => () => void;
-  onToggleShowNotes: (eventId: string) => () => void;
+  onToggleExpanded: () => void;
+  onToggleShowNotes: () => void;
   getNotesByIds: (noteIds: string[]) => Note[];
-  associateNote: (
-    eventId: string,
-    addNoteToEvent: AddNoteToEvent,
-    onPinEvent: OnPinEvent
-  ) => (noteId: string) => void;
+  associateNote: (noteId: string) => void;
 }
 
 export const getNewNoteId = (): string => uuid.v4();
@@ -64,11 +60,11 @@ export const StatefulEventChild = React.memo<Props>(
     eventIdToNoteIds,
     getNotesByIds,
     isEventViewer = false,
+    isEventPinned = false,
     loading,
     onColumnResized,
     onToggleExpanded,
     onUnPinEvent,
-    pinnedEventIds,
     showNotes,
     timelineId,
     onToggleShowNotes,
@@ -84,23 +80,23 @@ export const StatefulEventChild = React.memo<Props>(
         <EventColumnView
           id={id}
           actionsColumnWidth={actionsColumnWidth}
-          associateNote={associateNote(id, addNoteToEvent, onPinEvent)}
+          associateNote={associateNote}
           columnHeaders={columnHeaders}
           columnRenderers={columnRenderers}
           data={data}
           expanded={expanded}
           eventIdToNoteIds={eventIdToNoteIds}
           getNotesByIds={getNotesByIds}
+          isEventPinned={isEventPinned}
           isEventViewer={isEventViewer}
           loading={loading}
           onColumnResized={onColumnResized}
-          onEventToggled={onToggleExpanded(id)}
+          onEventToggled={onToggleExpanded}
           onPinEvent={onPinEvent}
           onUnPinEvent={onUnPinEvent}
-          pinnedEventIds={pinnedEventIds}
           showNotes={showNotes}
           timelineId={timelineId}
-          toggleShowNotes={onToggleShowNotes(id)}
+          toggleShowNotes={onToggleShowNotes}
           updateNote={updateNote}
         />
 
@@ -110,13 +106,13 @@ export const StatefulEventChild = React.memo<Props>(
           style={{ width: `${width - OFFSET_SCROLLBAR}px` }}
         >
           <NoteCards
-            associateNote={associateNote(id, addNoteToEvent, onPinEvent)}
+            associateNote={associateNote}
             data-test-subj="note-cards"
             getNewNoteId={getNewNoteId}
             getNotesByIds={getNotesByIds}
             noteIds={eventIdToNoteIds[id] || emptyNotes}
             showAddNote={showNotes}
-            toggleShowAddNote={onToggleShowNotes(id)}
+            toggleShowAddNote={onToggleShowNotes}
             updateNote={updateNote}
           />
         </EventsTrSupplement>
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/helpers.ts b/x-pack/legacy/plugins/siem/public/components/timeline/body/helpers.ts
index 1cd83cb5560eaa..0b1d21b2371eeb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/helpers.ts
@@ -55,7 +55,7 @@ export interface GetPinOnClickParams {
   eventId: string;
   onPinEvent: OnPinEvent;
   onUnPinEvent: OnUnPinEvent;
-  pinnedEventIds: Readonly<Record<string, boolean>>;
+  isEventPinned: boolean;
 }
 
 export const getPinOnClick = ({
@@ -63,15 +63,12 @@ export const getPinOnClick = ({
   eventId,
   onPinEvent,
   onUnPinEvent,
-  pinnedEventIds,
+  isEventPinned,
 }: GetPinOnClickParams): (() => void) => {
   if (!allowUnpinning) {
     return noop;
   }
-
-  return eventIsPinned({ eventId, pinnedEventIds })
-    ? () => onUnPinEvent(eventId)
-    : () => onPinEvent(eventId);
+  return isEventPinned ? () => onUnPinEvent(eventId) : () => onPinEvent(eventId);
 };
 
 export const getColumnWidthFromType = (type: string): number =>
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/index.test.tsx
index 73b208757c7ad8..86a6ebe22799b4 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/index.test.tsx
@@ -215,7 +215,7 @@ describe('Body', () => {
       wrapper.update();
       wrapper
         .find('[data-test-subj="new-note-tabs"] textarea')
-        .simulate('change', { target: { value: 'hello world' } });
+        .simulate('change', { target: { value: note } });
       wrapper.update();
       wrapper
         .find('button[data-test-subj="add-note"]')
@@ -314,13 +314,11 @@ describe('Body', () => {
         />
       );
       addaNoteToEvent(wrapper, 'hello world');
-
       dispatchAddNoteToEvent.mockClear();
       dispatchOnPinEvent.mockClear();
       wrapper.setProps({ pinnedEventIds: { 1: true } });
       wrapper.update();
       addaNoteToEvent(wrapper, 'new hello world');
-
       expect(dispatchAddNoteToEvent).toHaveBeenCalled();
       expect(dispatchOnPinEvent).not.toHaveBeenCalled();
     });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx
index 68acc58972370a..80be9fd339f51b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx
@@ -22,7 +22,7 @@ describe('FileDraggable', () => {
           eventId="1"
           fileName="[fileName]"
           filePath="[filePath]"
-        ></FileDraggable>
+        />
       </TestProviders>
     );
     expect(wrapper.text()).toEqual('[fileName]in[filePath]');
@@ -38,7 +38,7 @@ describe('FileDraggable', () => {
           eventId="1"
           fileName={undefined}
           filePath={undefined}
-        ></FileDraggable>
+        />
       </TestProviders>
     );
     expect(wrapper.text()).toEqual('');
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/stateful_body.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/stateful_body.tsx
index d93446b2af95b3..531e61dd7dc60b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/stateful_body.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/stateful_body.tsx
@@ -6,14 +6,14 @@
 
 import { noop } from 'lodash/fp';
 import memoizeOne from 'memoize-one';
-import * as React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
 import { BrowserFields } from '../../../containers/source';
 import { TimelineItem } from '../../../graphql/types';
 import { Note } from '../../../lib/note';
-import { appSelectors, State, timelineSelectors } from '../../../store';
+import { appModel, appSelectors, State, timelineSelectors } from '../../../store';
 import { AddNoteToEvent, UpdateNote } from '../../notes/helpers';
 import {
   OnColumnRemoved,
@@ -45,7 +45,7 @@ interface OwnProps {
 interface ReduxProps {
   columnHeaders: ColumnHeader[];
   eventIdToNoteIds: Readonly<Record<string, string[]>>;
-  getNotesByIds: (noteIds: string[]) => Note[];
+  notesById: appModel.NotesById;
   pinnedEventIds: Readonly<Record<string, boolean>>;
   range?: string;
 }
@@ -92,10 +92,10 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
     columnHeaders,
     data,
     eventIdToNoteIds,
-    getNotesByIds,
     height,
     id,
     isEventViewer = false,
+    notesById,
     pinEvent,
     pinnedEventIds,
     range,
@@ -107,30 +107,44 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
     updateNote,
     updateSort,
   }) => {
-    const onAddNoteToEvent: AddNoteToEvent = ({
-      eventId,
-      noteId,
-    }: {
-      eventId: string;
-      noteId: string;
-    }) => addNoteToEvent!({ id, eventId, noteId });
-
-    const onColumnSorted: OnColumnSorted = sorted => {
-      updateSort!({ id, sort: sorted });
-    };
+    const getNotesByIds = useCallback(
+      (noteIds: string[]): Note[] => appSelectors.getNotes(notesById, noteIds),
+      [notesById]
+    );
 
-    const onColumnRemoved: OnColumnRemoved = columnId => removeColumn!({ id, columnId });
+    const onAddNoteToEvent: AddNoteToEvent = useCallback(
+      ({ eventId, noteId }: { eventId: string; noteId: string }) =>
+        addNoteToEvent!({ id, eventId, noteId }),
+      [id]
+    );
 
-    const onColumnResized: OnColumnResized = ({ columnId, delta }) =>
-      applyDeltaToColumnWidth!({ id, columnId, delta });
+    const onColumnSorted: OnColumnSorted = useCallback(
+      sorted => {
+        updateSort!({ id, sort: sorted });
+      },
+      [id]
+    );
 
-    const onPinEvent: OnPinEvent = eventId => pinEvent!({ id, eventId });
+    const onColumnRemoved: OnColumnRemoved = useCallback(
+      columnId => removeColumn!({ id, columnId }),
+      [id]
+    );
 
-    const onUnPinEvent: OnUnPinEvent = eventId => unPinEvent!({ id, eventId });
+    const onColumnResized: OnColumnResized = useCallback(
+      ({ columnId, delta }) => applyDeltaToColumnWidth!({ id, columnId, delta }),
+      [id]
+    );
+
+    const onPinEvent: OnPinEvent = useCallback(eventId => pinEvent!({ id, eventId }), [id]);
 
-    const onUpdateNote: UpdateNote = (note: Note) => updateNote!({ note });
+    const onUnPinEvent: OnUnPinEvent = useCallback(eventId => unPinEvent!({ id, eventId }), [id]);
 
-    const onUpdateColumns: OnUpdateColumns = columns => updateColumns!({ id, columns });
+    const onUpdateNote: UpdateNote = useCallback((note: Note) => updateNote!({ note }), []);
+
+    const onUpdateColumns: OnUpdateColumns = useCallback(
+      columns => updateColumns!({ id, columns }),
+      [id]
+    );
 
     return (
       <Body
@@ -166,7 +180,7 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
       prevProps.columnHeaders === nextProps.columnHeaders &&
       prevProps.data === nextProps.data &&
       prevProps.eventIdToNoteIds === nextProps.eventIdToNoteIds &&
-      prevProps.getNotesByIds === nextProps.getNotesByIds &&
+      prevProps.notesById === nextProps.notesById &&
       prevProps.height === nextProps.height &&
       prevProps.id === nextProps.id &&
       prevProps.isEventViewer === nextProps.isEventViewer &&
@@ -194,7 +208,7 @@ const makeMapStateToProps = () => {
     return {
       columnHeaders: memoizedColumnHeaders(columns, browserFields),
       eventIdToNoteIds,
-      getNotesByIds: getNotesByIds(state),
+      notesById: getNotesByIds(state),
       id,
       pinnedEventIds,
     };
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx
index 98cf0a78b1d1f8..79f9c32a176f5d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx
@@ -5,7 +5,7 @@
  */
 
 import { noop } from 'lodash/fp';
-import React, { useState } from 'react';
+import React, { useCallback, useState } from 'react';
 
 import { BrowserFields } from '../../../containers/source';
 
@@ -51,23 +51,23 @@ export const ProviderItemBadge = React.memo<ProviderItemBadgeProps>(
   }) => {
     const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 
-    function togglePopover() {
+    const togglePopover = useCallback(() => {
       setIsPopoverOpen(!isPopoverOpen);
-    }
+    }, [isPopoverOpen]);
 
-    function closePopover() {
+    const closePopover = useCallback(() => {
       setIsPopoverOpen(false);
-    }
+    }, []);
 
-    function onToggleEnabledProvider() {
+    const onToggleEnabledProvider = useCallback(() => {
       toggleEnabledProvider();
       closePopover();
-    }
+    }, [toggleEnabledProvider]);
 
-    function onToggleExcludedProvider() {
+    const onToggleExcludedProvider = useCallback(() => {
       toggleExcludedProvider();
       closePopover();
-    }
+    }, [toggleExcludedProvider]);
 
     return (
       <TimelineContext.Consumer>
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.tsx
index c1772d9e555771..a0942cbaba0910 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.tsx
@@ -18,7 +18,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { pure } from 'recompose';
 import styled from 'styled-components';
 
@@ -182,14 +182,14 @@ export const Footer = React.memo<FooterProps>(
     const [paginationLoading, setPaginationLoading] = useState(false);
     const [updatedAt, setUpdatedAt] = useState<number | null>(null);
 
-    const loadMore = () => {
+    const loadMore = useCallback(() => {
       setPaginationLoading(true);
       onLoadMore(nextCursor, tieBreaker);
-    };
+    }, [nextCursor, tieBreaker, onLoadMore]);
 
-    const onButtonClick = () => setIsPopoverOpen(!isPopoverOpen);
+    const onButtonClick = useCallback(() => setIsPopoverOpen(!isPopoverOpen), [isPopoverOpen]);
 
-    const closePopover = () => setIsPopoverOpen(false);
+    const closePopover = useCallback(() => setIsPopoverOpen(false), []);
 
     useEffect(() => {
       if (paginationLoading && !isLoading) {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/helpers.test.tsx
index 855c951fbceccd..b30771760bad37 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/helpers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/helpers.test.tsx
@@ -156,7 +156,7 @@ describe('Combined Queries', () => {
       })
     ).toEqual({
       filterQuery:
-        '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}],"should":[],"must_not":[]}}',
+        '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}],"should":[],"must_not":[]}}',
     });
   });
 
@@ -174,7 +174,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 
@@ -194,7 +194,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521848183232,"lte":1521848183232,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521848183232,"lte":1521848183232}}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 
@@ -214,7 +214,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521848183232,"lte":1521848183232,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521848183232,"lte":1521848183232}}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 
@@ -234,7 +234,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"match":{"event.end":1521848183232}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"match":{"event.end":1521848183232}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 
@@ -254,7 +254,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"match":{"event.end":1521848183232}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"match":{"event.end":1521848183232}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 
@@ -271,7 +271,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 
@@ -289,7 +289,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 
@@ -307,7 +307,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}}]}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}}]}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 
@@ -327,7 +327,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"bool":{"should":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 3"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"name":"Provider 4"}}],"minimum_should_match":1}}]}}]}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 2"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"name":"Provider 5"}}],"minimum_should_match":1}}]}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"should":[{"bool":{"should":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 3"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"name":"Provider 4"}}],"minimum_should_match":1}}]}}]}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 2"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"name":"Provider 5"}}],"minimum_should_match":1}}]}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 
@@ -347,7 +347,7 @@ describe('Combined Queries', () => {
       end: endDate,
     })!;
     expect(filterQuery).toEqual(
-      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"filter":[{"bool":{"should":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 3"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"name":"Provider 4"}}],"minimum_should_match":1}}]}}]}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 2"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"name":"Provider 5"}}],"minimum_should_match":1}}]}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}}]}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132,"time_zone":"America/New_York"}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253,"time_zone":"America/New_York"}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
+      '{"bool":{"must":[],"filter":[{"bool":{"filter":[{"bool":{"filter":[{"bool":{"should":[{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 1"}}],"minimum_should_match":1}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 3"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"name":"Provider 4"}}],"minimum_should_match":1}}]}}]}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"name":"Provider 2"}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"name":"Provider 5"}}],"minimum_should_match":1}}]}}],"minimum_should_match":1}},{"bool":{"should":[{"match_phrase":{"host.name":"host-1"}}],"minimum_should_match":1}}]}},{"bool":{"filter":[{"bool":{"should":[{"range":{"@timestamp":{"gte":1521830963132}}}],"minimum_should_match":1}},{"bool":{"should":[{"range":{"@timestamp":{"lte":1521862432253}}}],"minimum_should_match":1}}]}}]}}],"should":[],"must_not":[]}}'
     );
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/helpers.tsx
index a18e4d7962e955..6182fca6e2e993 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/helpers.tsx
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { isEmpty, isNumber, get } from 'lodash/fp';
 import memoizeOne from 'memoize-one';
 import { StaticIndexPattern } from 'ui/index_patterns';
-import { Query } from 'src/plugins/data/common';
+import { Query, esFilters } from 'src/plugins/data/public';
 
 import { escapeQueryValue, convertToBuildEsQuery, EsQueryConfig } from '../../lib/keury';
 
@@ -106,7 +105,7 @@ export const combineQueries = ({
   dataProviders: DataProvider[];
   indexPattern: StaticIndexPattern;
   browserFields: BrowserFields;
-  filters: Filter[];
+  filters: esFilters.Filter[];
   kqlQuery: Query;
   kqlMode: string;
   start: number;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/index.tsx
index ab92f22a4c89fb..78a9488b2fdbbe 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { isEqual } from 'lodash/fp';
-import React, { useEffect } from 'react';
+import React, { useEffect, useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
@@ -159,79 +159,84 @@ const StatefulTimelineComponent = React.memo<Props>(
     updateItemsPerPage,
     upsertColumn,
   }) => {
-    const onDataProviderRemoved: OnDataProviderRemoved = (
-      providerId: string,
-      andProviderId?: string
-    ) => removeProvider!({ id, providerId, andProviderId });
+    const onDataProviderRemoved: OnDataProviderRemoved = useCallback(
+      (providerId: string, andProviderId?: string) =>
+        removeProvider!({ id, providerId, andProviderId }),
+      [id]
+    );
 
-    const onToggleDataProviderEnabled: OnToggleDataProviderEnabled = ({
-      providerId,
-      enabled,
-      andProviderId,
-    }) =>
-      updateDataProviderEnabled!({
-        id,
-        enabled,
-        providerId,
-        andProviderId,
-      });
+    const onToggleDataProviderEnabled: OnToggleDataProviderEnabled = useCallback(
+      ({ providerId, enabled, andProviderId }) =>
+        updateDataProviderEnabled!({
+          id,
+          enabled,
+          providerId,
+          andProviderId,
+        }),
+      [id]
+    );
 
-    const onToggleDataProviderExcluded: OnToggleDataProviderExcluded = ({
-      providerId,
-      excluded,
-      andProviderId,
-    }) =>
-      updateDataProviderExcluded!({
-        id,
-        excluded,
-        providerId,
-        andProviderId,
-      });
+    const onToggleDataProviderExcluded: OnToggleDataProviderExcluded = useCallback(
+      ({ providerId, excluded, andProviderId }) =>
+        updateDataProviderExcluded!({
+          id,
+          excluded,
+          providerId,
+          andProviderId,
+        }),
+      [id]
+    );
 
-    const onDataProviderEditedLocal: OnDataProviderEdited = ({
-      andProviderId,
-      excluded,
-      field,
-      operator,
-      providerId,
-      value,
-    }) =>
-      onDataProviderEdited!({
-        andProviderId,
-        excluded,
-        field,
-        id,
-        operator,
-        providerId,
-        value,
-      });
-    const onChangeDataProviderKqlQuery: OnChangeDataProviderKqlQuery = ({ providerId, kqlQuery }) =>
-      updateDataProviderKqlQuery!({ id, kqlQuery, providerId });
+    const onDataProviderEditedLocal: OnDataProviderEdited = useCallback(
+      ({ andProviderId, excluded, field, operator, providerId, value }) =>
+        onDataProviderEdited!({
+          andProviderId,
+          excluded,
+          field,
+          id,
+          operator,
+          providerId,
+          value,
+        }),
+      [id]
+    );
 
-    const onChangeItemsPerPage: OnChangeItemsPerPage = itemsChangedPerPage =>
-      updateItemsPerPage!({ id, itemsPerPage: itemsChangedPerPage });
+    const onChangeDataProviderKqlQuery: OnChangeDataProviderKqlQuery = useCallback(
+      ({ providerId, kqlQuery }) => updateDataProviderKqlQuery!({ id, kqlQuery, providerId }),
+      [id]
+    );
 
-    const onChangeDroppableAndProvider: OnChangeDroppableAndProvider = providerId =>
-      updateHighlightedDropAndProviderId!({ id, providerId });
+    const onChangeItemsPerPage: OnChangeItemsPerPage = useCallback(
+      itemsChangedPerPage => updateItemsPerPage!({ id, itemsPerPage: itemsChangedPerPage }),
+      [id]
+    );
 
-    const toggleColumn = (column: ColumnHeader) => {
-      const exists = columns.findIndex(c => c.id === column.id) !== -1;
+    const onChangeDroppableAndProvider: OnChangeDroppableAndProvider = useCallback(
+      providerId => updateHighlightedDropAndProviderId!({ id, providerId }),
+      [id]
+    );
 
-      if (!exists && upsertColumn != null) {
-        upsertColumn({
-          column,
-          id,
-          index: 1,
-        });
-      }
+    const toggleColumn = useCallback(
+      (column: ColumnHeader) => {
+        const exists = columns.findIndex(c => c.id === column.id) !== -1;
 
-      if (exists && removeColumn != null) {
-        removeColumn({
-          columnId: column.id,
-          id,
-        });
-      }
-    };
+        if (!exists && upsertColumn != null) {
+          upsertColumn({
+            column,
+            id,
+            index: 1,
+          });
+        }
+
+        if (exists && removeColumn != null) {
+          removeColumn({
+            columnId: column.id,
+            id,
+          });
+        }
+      },
+      [columns, id]
+    );
 
     useEffect(() => {
       if (createTimeline != null) {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.tsx
index b983963c34f55e..40ba16c0c128ae 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiAvatar, EuiFlexItem, EuiIcon } from '@elastic/eui';
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 import styled, { injectGlobal } from 'styled-components';
 
 import { Note } from '../../../lib/note';
@@ -113,18 +113,28 @@ export const Properties = React.memo<Props>(
   }) => {
     const [showActions, setShowActions] = useState(false);
     const [showNotes, setShowNotes] = useState(false);
+    const [showTimelineModal, setShowTimelineModal] = useState(false);
 
-    const onButtonClick = () => {
+    const onButtonClick = useCallback(() => {
       setShowActions(!showActions);
-    };
+    }, [showActions]);
 
-    const onToggleShowNotes = () => {
+    const onToggleShowNotes = useCallback(() => {
       setShowNotes(!showNotes);
-    };
+    }, [showNotes]);
 
-    const onClosePopover = () => {
+    const onClosePopover = useCallback(() => {
       setShowActions(false);
-    };
+    }, []);
+
+    const onOpenTimelineModal = useCallback(() => {
+      onClosePopover();
+      setShowTimelineModal(true);
+    }, []);
+
+    const onCloseTimelineModal = useCallback(() => {
+      setShowTimelineModal(false);
+    }, []);
 
     const datePickerWidth =
       width -
@@ -173,11 +183,14 @@ export const Properties = React.memo<Props>(
           noteIds={noteIds}
           onButtonClick={onButtonClick}
           onClosePopover={onClosePopover}
+          onCloseTimelineModal={onCloseTimelineModal}
+          onOpenTimelineModal={onOpenTimelineModal}
           onToggleShowNotes={onToggleShowNotes}
           showActions={showActions}
           showDescription={width < showDescriptionThreshold}
           showNotes={showNotes}
           showNotesFromWidth={width < showNotesThreshold}
+          showTimelineModal={showTimelineModal}
           showUsersView={title.length > 0}
           timelineId={timelineId}
           updateDescription={updateDescription}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/properties_right.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/properties_right.tsx
index 2eef253d7be7c5..4027682282dcd3 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/properties_right.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/properties_right.tsx
@@ -15,7 +15,8 @@ import {
   EuiAvatar,
 } from '@elastic/eui';
 import { NewTimeline, Description, NotesButton } from './helpers';
-import { OpenTimelineModalButton } from '../../open_timeline/open_timeline_modal';
+import { OpenTimelineModalButton } from '../../open_timeline/open_timeline_modal/open_timeline_modal_button';
+import { OpenTimelineModal } from '../../open_timeline/open_timeline_modal';
 import { InspectButton } from '../../inspect';
 
 import * as i18n from './translations';
@@ -75,6 +76,9 @@ interface Props {
   getNotesByIds: (noteIds: string[]) => Note[];
   noteIds: string[];
   onToggleShowNotes: () => void;
+  onCloseTimelineModal: () => void;
+  onOpenTimelineModal: () => void;
+  showTimelineModal: boolean;
   updateNote: UpdateNote;
 }
 
@@ -98,6 +102,9 @@ export const PropertiesRight = React.memo<Props>(
     noteIds,
     onToggleShowNotes,
     updateNote,
+    showTimelineModal,
+    onCloseTimelineModal,
+    onOpenTimelineModal,
   }) => (
     <PropertiesRightStyle alignItems="flexStart" data-test-subj="properties-right" gutterSize="s">
       <EuiFlexItem grow={false}>
@@ -125,7 +132,7 @@ export const PropertiesRight = React.memo<Props>(
             </EuiFlexItem>
 
             <EuiFlexItem grow={false}>
-              <OpenTimelineModalButton />
+              <OpenTimelineModalButton onClick={onOpenTimelineModal} />
             </EuiFlexItem>
 
             <EuiFlexItem grow={false}>
@@ -186,6 +193,8 @@ export const PropertiesRight = React.memo<Props>(
             </HiddenFlexItem>
           ))
         : null}
+
+      {showTimelineModal ? <OpenTimelineModal onClose={onCloseTimelineModal} /> : null}
     </PropertiesRightStyle>
   )
 );
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/index.tsx
index 91113a545821df..0ebceccfa90c50 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 import { StaticIndexPattern } from 'ui/index_patterns';
@@ -56,26 +56,32 @@ const StatefulSearchOrFilterComponent = React.memo<Props>(
     timelineId,
     updateKqlMode,
   }) => {
-    const applyFilterQueryFromKueryExpression = (expression: string) =>
-      applyKqlFilterQuery({
-        id: timelineId,
-        filterQuery: {
-          kuery: {
+    const applyFilterQueryFromKueryExpression = useCallback(
+      (expression: string) =>
+        applyKqlFilterQuery({
+          id: timelineId,
+          filterQuery: {
+            kuery: {
+              kind: 'kuery',
+              expression,
+            },
+            serializedQuery: convertKueryToElasticSearchQuery(expression, indexPattern),
+          },
+        }),
+      [indexPattern, timelineId]
+    );
+
+    const setFilterQueryDraftFromKueryExpression = useCallback(
+      (expression: string) =>
+        setKqlFilterQueryDraft({
+          id: timelineId,
+          filterQueryDraft: {
             kind: 'kuery',
             expression,
           },
-          serializedQuery: convertKueryToElasticSearchQuery(expression, indexPattern),
-        },
-      });
-
-    const setFilterQueryDraftFromKueryExpression = (expression: string) =>
-      setKqlFilterQueryDraft({
-        id: timelineId,
-        filterQueryDraft: {
-          kind: 'kuery',
-          expression,
-        },
-      });
+        }),
+      [timelineId]
+    );
 
     return (
       <SearchOrFilter
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/helpers.ts b/x-pack/legacy/plugins/siem/public/components/url_state/helpers.ts
index 9c49d356cd4bca..f7487d7a81a7a3 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/helpers.ts
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { decode, encode, RisonValue } from 'rison-node';
 import { Location } from 'history';
 import { QueryString } from 'ui/utils/query_string';
-import { Query } from 'src/plugins/data/common';
+import { Query, esFilters } from 'src/plugins/data/public';
 
 import { inputsSelectors, State, timelineSelectors } from '../../store';
 import { SiemPageName } from '../../pages/home/types';
@@ -154,7 +153,7 @@ export const makeMapStateToProps = () => {
 
     let searchAttr: {
       [CONSTANTS.appQuery]?: Query;
-      [CONSTANTS.filters]?: Filter[];
+      [CONSTANTS.filters]?: esFilters.Filter[];
       [CONSTANTS.savedQuery]?: string;
     } = {
       [CONSTANTS.appQuery]: getGlobalQuerySelector(state),
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/initialize_redux_by_url.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/initialize_redux_by_url.tsx
index fa3b2788667042..013983c78a3a51 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/initialize_redux_by_url.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/initialize_redux_by_url.tsx
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { get, isEmpty } from 'lodash/fp';
 import { Dispatch } from 'redux';
 import { SavedQuery } from 'src/legacy/core_plugins/data/public';
-import { Query } from 'src/plugins/data/common';
+import { Query, esFilters } from 'src/plugins/data/public';
 
 import { inputsActions } from '../../store/actions';
 import { InputsModelId, TimeRangeKinds } from '../../store/inputs/constants';
@@ -125,7 +124,7 @@ export const dispatchSetInitialStateFromUrl = (
     }
 
     if (urlKey === CONSTANTS.filters) {
-      const filters: Filter[] = decodeRisonUrlState(newUrlStateString);
+      const filters: esFilters.Filter[] = decodeRisonUrlState(newUrlStateString);
       siemFilterManager.setFilters(filters || []);
     }
 
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/types.ts b/x-pack/legacy/plugins/siem/public/components/url_state/types.ts
index f858ffc32ddbcb..44c050a1990ce3 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/types.ts
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import ApolloClient from 'apollo-client';
 import { ActionCreator } from 'typescript-fsa';
 import { StaticIndexPattern } from 'ui/index_patterns';
-import { Query } from 'src/plugins/data/common';
+import { Query, esFilters } from 'src/plugins/data/public';
 
 import { UrlInputsModel } from '../../store/inputs/model';
 import { RouteSpyState } from '../../utils/route/types';
@@ -60,7 +59,7 @@ export interface Timeline {
 
 export interface UrlState {
   [CONSTANTS.appQuery]?: Query;
-  [CONSTANTS.filters]?: Filter[];
+  [CONSTANTS.filters]?: esFilters.Filter[];
   [CONSTANTS.savedQuery]?: string;
   [CONSTANTS.timerange]: UrlInputsModel;
   [CONSTANTS.timeline]: Timeline;
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/use_url_state.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/use_url_state.tsx
index 5b9511f169744e..f1eeb4e6fbec40 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/use_url_state.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/use_url_state.tsx
@@ -3,11 +3,11 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { Filter } from '@kbn/es-query';
+
 import { Location } from 'history';
 import { isEqual, difference, isEmpty } from 'lodash/fp';
 import { useEffect, useRef, useState } from 'react';
-import { Query } from 'src/plugins/data/common';
+import { Query, esFilters } from 'src/plugins/data/public';
 
 import { UrlInputsModel } from '../../store/inputs/model';
 import { useApolloClient } from '../../utils/apollo_context';
@@ -59,7 +59,7 @@ export const useUrlStateHooks = ({
   const prevProps = usePrevious({ pathName, urlState });
 
   const replaceStateInLocation = (
-    urlStateToReplace: UrlInputsModel | Query | Filter[] | Timeline | string,
+    urlStateToReplace: UrlInputsModel | Query | esFilters.Filter[] | Timeline | string,
     urlStateKey: string,
     latestLocation: Location = {
       hash: '',
@@ -94,7 +94,10 @@ export const useUrlStateHooks = ({
         urlKey
       );
       if (newUrlStateString) {
-        const queryState: Query | Timeline | Filter[] = decodeRisonUrlState(newUrlStateString);
+        const queryState: Query | Timeline | esFilters.Filter[] = decodeRisonUrlState(
+          newUrlStateString
+        );
+
         if (
           urlKey === CONSTANTS.appQuery &&
           queryState != null &&
diff --git a/x-pack/legacy/plugins/siem/public/components/with_hover_actions/index.tsx b/x-pack/legacy/plugins/siem/public/components/with_hover_actions/index.tsx
index 2569e8d303b69b..f185ffe885ad38 100644
--- a/x-pack/legacy/plugins/siem/public/components/with_hover_actions/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/with_hover_actions/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, { useState, useCallback } from 'react';
 import { pure } from 'recompose';
 import styled from 'styled-components';
 
@@ -66,13 +66,14 @@ WithHoverActionsContainer.displayName = 'WithHoverActionsContainer';
 export const WithHoverActions = React.memo<Props>(
   ({ alwaysShow = false, hoverContent, render }) => {
     const [showHoverContent, setShowHoverContent] = useState(false);
-    function onMouseEnter() {
+    const onMouseEnter = useCallback(() => {
       setShowHoverContent(true);
-    }
+    }, []);
 
-    function onMouseLeave() {
+    const onMouseLeave = useCallback(() => {
       setShowHoverContent(false);
-    }
+    }, []);
+
     return (
       <WithHoverActionsContainer onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave}>
         <>{render(showHoverContent)}</>
diff --git a/x-pack/legacy/plugins/siem/public/containers/authentications/authentications_over_time/authentications_over_time.gql_query.ts b/x-pack/legacy/plugins/siem/public/containers/authentications/authentications_over_time/authentications_over_time.gql_query.ts
new file mode 100644
index 00000000000000..dc05f4f8232d54
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/authentications/authentications_over_time/authentications_over_time.gql_query.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import gql from 'graphql-tag';
+
+export const AuthenticationsOverTimeGqlQuery = gql`
+  query GetAuthenticationsOverTimeQuery(
+    $sourceId: ID!
+    $timerange: TimerangeInput!
+    $defaultIndex: [String!]!
+    $filterQuery: String
+    $inspect: Boolean!
+  ) {
+    source(id: $sourceId) {
+      id
+      AuthenticationsOverTime(
+        timerange: $timerange
+        filterQuery: $filterQuery
+        defaultIndex: $defaultIndex
+      ) {
+        authenticationsOverTime {
+          x
+          y
+          g
+        }
+        totalCount
+        inspect @include(if: $inspect) {
+          dsl
+          response
+        }
+      }
+    }
+  }
+`;
diff --git a/x-pack/legacy/plugins/siem/public/containers/authentications/authentications_over_time/index.tsx b/x-pack/legacy/plugins/siem/public/containers/authentications/authentications_over_time/index.tsx
new file mode 100644
index 00000000000000..1d6d96869b6a93
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/authentications/authentications_over_time/index.tsx
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getOr } from 'lodash/fp';
+import React from 'react';
+import { Query } from 'react-apollo';
+import { connect } from 'react-redux';
+
+import chrome from 'ui/chrome';
+import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
+import { inputsModel, State, inputsSelectors, hostsModel } from '../../../store';
+import { createFilter, getDefaultFetchPolicy } from '../../helpers';
+import { QueryTemplate, QueryTemplateProps } from '../../query_template';
+
+import { AuthenticationsOverTimeGqlQuery } from './authentications_over_time.gql_query';
+import {
+  GetAuthenticationsOverTimeQuery,
+  MatrixOverTimeHistogramData,
+} from '../../../graphql/types';
+
+const ID = 'authenticationsOverTimeQuery';
+
+export interface AuthenticationsArgs {
+  endDate: number;
+  authenticationsOverTime: MatrixOverTimeHistogramData[];
+  id: string;
+  inspect: inputsModel.InspectQuery;
+  loading: boolean;
+  refetch: inputsModel.Refetch;
+  startDate: number;
+  totalCount: number;
+}
+
+export interface OwnProps extends QueryTemplateProps {
+  children?: (args: AuthenticationsArgs) => React.ReactNode;
+  type: hostsModel.HostsType;
+}
+
+export interface AuthenticationsOverTimeComponentReduxProps {
+  isInspected: boolean;
+}
+
+type AuthenticationsOverTimeProps = OwnProps & AuthenticationsOverTimeComponentReduxProps;
+
+class AuthenticationsOverTimeComponentQuery extends QueryTemplate<
+  AuthenticationsOverTimeProps,
+  GetAuthenticationsOverTimeQuery.Query,
+  GetAuthenticationsOverTimeQuery.Variables
+> {
+  public render() {
+    const {
+      children,
+      filterQuery,
+      id = ID,
+      isInspected,
+      sourceId,
+      startDate,
+      endDate,
+    } = this.props;
+    return (
+      <Query<GetAuthenticationsOverTimeQuery.Query, GetAuthenticationsOverTimeQuery.Variables>
+        query={AuthenticationsOverTimeGqlQuery}
+        fetchPolicy={getDefaultFetchPolicy()}
+        notifyOnNetworkStatusChange
+        variables={{
+          filterQuery: createFilter(filterQuery),
+          sourceId,
+          timerange: {
+            interval: '12h',
+            from: startDate!,
+            to: endDate!,
+          },
+          defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+          inspect: isInspected,
+        }}
+      >
+        {({ data, loading, refetch }) => {
+          const source = getOr({}, `source.AuthenticationsOverTime`, data);
+          const authenticationsOverTime = getOr([], `authenticationsOverTime`, source);
+          const totalCount = getOr(-1, 'totalCount', source);
+          return children!({
+            endDate: endDate!,
+            authenticationsOverTime,
+            id,
+            inspect: getOr(null, 'inspect', source),
+            loading,
+            refetch,
+            startDate: startDate!,
+            totalCount,
+          });
+        }}
+      </Query>
+    );
+  }
+}
+
+const makeMapStateToProps = () => {
+  const getQuery = inputsSelectors.globalQueryByIdSelector();
+  const mapStateToProps = (state: State, { type, id = ID }: OwnProps) => {
+    const { isInspected } = getQuery(state, id);
+    return {
+      isInspected,
+    };
+  };
+  return mapStateToProps;
+};
+
+export const AuthenticationsOverTimeQuery = connect(makeMapStateToProps)(
+  AuthenticationsOverTimeComponentQuery
+);
diff --git a/x-pack/legacy/plugins/siem/public/containers/events/events_over_time/index.tsx b/x-pack/legacy/plugins/siem/public/containers/events/events_over_time/index.tsx
index 6fde630c691b43..77ce98e180ab0c 100644
--- a/x-pack/legacy/plugins/siem/public/containers/events/events_over_time/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/events/events_over_time/index.tsx
@@ -56,7 +56,6 @@ class EventsOverTimeComponentQuery extends QueryTemplate<
       isInspected,
       sourceId,
       startDate,
-      timezone,
     } = this.props;
     return (
       <Query<GetEventsOverTimeQuery.Query, GetEventsOverTimeQuery.Variables>
@@ -70,7 +69,6 @@ class EventsOverTimeComponentQuery extends QueryTemplate<
             interval: '12h',
             from: startDate!,
             to: endDate!,
-            timezone,
           },
           defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
           inspect: isInspected,
diff --git a/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/mock.ts b/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/mock.ts
index 09cdfbd07bffdb..ca8786077851f9 100644
--- a/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/mock.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/mock.ts
@@ -28,11 +28,11 @@ interface MockLastEventTimeQuery {
   };
 }
 
-const getTimeTwelveDaysAgo = () => {
+const getTimeTwelveMinutesAgo = () => {
   const d = new Date();
   const ts = d.getTime();
-  const twelveDays = ts - 12 * 24 * 60 * 60 * 1000;
-  return new Date(twelveDays).toISOString();
+  const twelveMinutes = ts - 12 * 60 * 1000;
+  return new Date(twelveMinutes).toISOString();
 };
 
 export const mockLastEventTimeQuery: MockLastEventTimeQuery[] = [
@@ -51,7 +51,7 @@ export const mockLastEventTimeQuery: MockLastEventTimeQuery[] = [
         source: {
           id: 'default',
           LastEventTime: {
-            lastSeen: getTimeTwelveDaysAgo(),
+            lastSeen: getTimeTwelveMinutesAgo(),
             errorMessage: null,
           },
         },
diff --git a/x-pack/legacy/plugins/siem/public/containers/network_http/index.gql_query.ts b/x-pack/legacy/plugins/siem/public/containers/network_http/index.gql_query.ts
new file mode 100644
index 00000000000000..bedf13dfa98495
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/network_http/index.gql_query.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import gql from 'graphql-tag';
+
+export const networkHttpQuery = gql`
+  query GetNetworkHttpQuery(
+    $sourceId: ID!
+    $ip: String
+    $filterQuery: String
+    $pagination: PaginationInputPaginated!
+    $sort: NetworkHttpSortField!
+    $timerange: TimerangeInput!
+    $defaultIndex: [String!]!
+    $inspect: Boolean!
+  ) {
+    source(id: $sourceId) {
+      id
+      NetworkHttp(
+        filterQuery: $filterQuery
+        ip: $ip
+        pagination: $pagination
+        sort: $sort
+        timerange: $timerange
+        defaultIndex: $defaultIndex
+      ) {
+        totalCount
+        edges {
+          node {
+            domains
+            lastHost
+            lastSourceIp
+            methods
+            path
+            requestCount
+            statuses
+          }
+          cursor {
+            value
+          }
+        }
+        pageInfo {
+          activePage
+          fakeTotalCount
+          showMorePagesIndicator
+        }
+        inspect @include(if: $inspect) {
+          dsl
+          response
+        }
+      }
+    }
+  }
+`;
diff --git a/x-pack/legacy/plugins/siem/public/containers/network_http/index.tsx b/x-pack/legacy/plugins/siem/public/containers/network_http/index.tsx
new file mode 100644
index 00000000000000..d76ab53b2de3a9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/network_http/index.tsx
@@ -0,0 +1,154 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getOr } from 'lodash/fp';
+import React from 'react';
+import { Query } from 'react-apollo';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
+import chrome from 'ui/chrome';
+
+import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import {
+  GetNetworkHttpQuery,
+  NetworkHttpEdges,
+  NetworkHttpSortField,
+  PageInfoPaginated,
+} from '../../graphql/types';
+import { inputsModel, inputsSelectors, networkModel, networkSelectors, State } from '../../store';
+import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
+import { createFilter, getDefaultFetchPolicy } from '../helpers';
+import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated';
+import { networkHttpQuery } from './index.gql_query';
+
+const ID = 'networkHttpQuery';
+
+export interface NetworkHttpArgs {
+  id: string;
+  ip?: string;
+  inspect: inputsModel.InspectQuery;
+  isInspected: boolean;
+  loading: boolean;
+  loadPage: (newActivePage: number) => void;
+  networkHttp: NetworkHttpEdges[];
+  pageInfo: PageInfoPaginated;
+  refetch: inputsModel.Refetch;
+  totalCount: number;
+}
+
+export interface OwnProps extends QueryTemplatePaginatedProps {
+  children: (args: NetworkHttpArgs) => React.ReactNode;
+  ip?: string;
+  type: networkModel.NetworkType;
+}
+
+export interface NetworkHttpComponentReduxProps {
+  activePage: number;
+  isInspected: boolean;
+  limit: number;
+  sort: NetworkHttpSortField;
+}
+
+type NetworkHttpProps = OwnProps & NetworkHttpComponentReduxProps;
+
+class NetworkHttpComponentQuery extends QueryTemplatePaginated<
+  NetworkHttpProps,
+  GetNetworkHttpQuery.Query,
+  GetNetworkHttpQuery.Variables
+> {
+  public render() {
+    const {
+      activePage,
+      children,
+      endDate,
+      filterQuery,
+      id = ID,
+      ip,
+      isInspected,
+      limit,
+      skip,
+      sourceId,
+      sort,
+      startDate,
+    } = this.props;
+    const variables: GetNetworkHttpQuery.Variables = {
+      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      filterQuery: createFilter(filterQuery),
+      inspect: isInspected,
+      ip,
+      pagination: generateTablePaginationOptions(activePage, limit),
+      sort,
+      sourceId,
+      timerange: {
+        interval: '12h',
+        from: startDate!,
+        to: endDate!,
+      },
+    };
+    return (
+      <Query<GetNetworkHttpQuery.Query, GetNetworkHttpQuery.Variables>
+        fetchPolicy={getDefaultFetchPolicy()}
+        notifyOnNetworkStatusChange
+        query={networkHttpQuery}
+        skip={skip}
+        variables={variables}
+      >
+        {({ data, loading, fetchMore, networkStatus, refetch }) => {
+          const networkHttp = getOr([], `source.NetworkHttp.edges`, data);
+          this.setFetchMore(fetchMore);
+          this.setFetchMoreOptions((newActivePage: number) => ({
+            variables: {
+              pagination: generateTablePaginationOptions(newActivePage, limit),
+            },
+            updateQuery: (prev, { fetchMoreResult }) => {
+              if (!fetchMoreResult) {
+                return prev;
+              }
+              return {
+                ...fetchMoreResult,
+                source: {
+                  ...fetchMoreResult.source,
+                  NetworkHttp: {
+                    ...fetchMoreResult.source.NetworkHttp,
+                    edges: [...fetchMoreResult.source.NetworkHttp.edges],
+                  },
+                },
+              };
+            },
+          }));
+          const isLoading = this.isItAValidLoading(loading, variables, networkStatus);
+          return children({
+            id,
+            inspect: getOr(null, 'source.NetworkHttp.inspect', data),
+            isInspected,
+            loading: isLoading,
+            loadPage: this.wrappedLoadMore,
+            networkHttp,
+            pageInfo: getOr({}, 'source.NetworkHttp.pageInfo', data),
+            refetch: this.memoizedRefetchQuery(variables, limit, refetch),
+            totalCount: getOr(-1, 'source.NetworkHttp.totalCount', data),
+          });
+        }}
+      </Query>
+    );
+  }
+}
+
+const makeMapStateToProps = () => {
+  const getHttpSelector = networkSelectors.httpSelector();
+  const getQuery = inputsSelectors.globalQueryByIdSelector();
+  return (state: State, { id = ID, type }: OwnProps) => {
+    const { isInspected } = getQuery(state, id);
+    return {
+      ...getHttpSelector(state, type),
+      isInspected,
+    };
+  };
+};
+
+export const NetworkHttpQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps)
+)(NetworkHttpComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/query_template.tsx b/x-pack/legacy/plugins/siem/public/containers/query_template.tsx
index 035ebba5ae6bad..b51eac492c48a1 100644
--- a/x-pack/legacy/plugins/siem/public/containers/query_template.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/query_template.tsx
@@ -17,7 +17,6 @@ export interface QueryTemplateProps {
   skip?: boolean;
   sourceId: string;
   startDate?: number;
-  timezone?: string;
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type FetchMoreOptionsArgs<TData, TVariables> = FetchMoreQueryOptions<any, any> &
diff --git a/x-pack/legacy/plugins/siem/public/containers/source/index.tsx b/x-pack/legacy/plugins/siem/public/containers/source/index.tsx
index edd5740f628799..ff6e5e4d0c788e 100644
--- a/x-pack/legacy/plugins/siem/public/containers/source/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/source/index.tsx
@@ -57,30 +57,28 @@ interface WithSourceProps {
   sourceId: string;
 }
 
-export const WithSource = React.memo<WithSourceProps>(({ children, sourceId }) => {
-  const getIndexFields = (title: string, fields: IndexField[]): StaticIndexPattern =>
+const getIndexFields = memoizeOne(
+  (title: string, fields: IndexField[]): StaticIndexPattern =>
     fields && fields.length > 0
       ? {
           fields: fields.map(field => pick(['name', 'searchable', 'type', 'aggregatable'], field)),
           title,
         }
-      : { fields: [], title };
+      : { fields: [], title }
+);
 
-  const getBrowserFields = (fields: IndexField[]): BrowserFields =>
+const getBrowserFields = memoizeOne(
+  (fields: IndexField[]): BrowserFields =>
     fields && fields.length > 0
       ? fields.reduce<BrowserFields>(
           (accumulator: BrowserFields, field: IndexField) =>
             set([field.category, 'fields', field.name], field, accumulator),
           {}
         )
-      : {};
-  const getBrowserFieldsMemo: (fields: IndexField[]) => BrowserFields = memoizeOne(
-    getBrowserFields
-  );
-  const getIndexFieldsMemo: (
-    title: string,
-    fields: IndexField[]
-  ) => StaticIndexPattern = memoizeOne(getIndexFields);
+      : {}
+);
+
+export const WithSource = React.memo<WithSourceProps>(({ children, sourceId }) => {
   return (
     <Query<SourceQuery.Query, SourceQuery.Variables>
       query={sourceQuery}
@@ -94,8 +92,8 @@ export const WithSource = React.memo<WithSourceProps>(({ children, sourceId }) =
       {({ data }) =>
         children({
           indicesExist: get('source.status.indicesExist', data),
-          browserFields: getBrowserFieldsMemo(get('source.status.indexFields', data)),
-          indexPattern: getIndexFieldsMemo(
+          browserFields: getBrowserFields(get('source.status.indexFields', data)),
+          indexPattern: getIndexFields(
             chrome
               .getUiSettingsClient()
               .get(DEFAULT_INDEX_KEY)
diff --git a/x-pack/legacy/plugins/siem/public/containers/timeline/all/index.tsx b/x-pack/legacy/plugins/siem/public/containers/timeline/all/index.tsx
index c3bff998fdefdf..5ff28480f1b3f9 100644
--- a/x-pack/legacy/plugins/siem/public/containers/timeline/all/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/timeline/all/index.tsx
@@ -36,43 +36,43 @@ interface OwnProps extends AllTimelinesVariables {
   children?: (args: AllTimelinesArgs) => React.ReactNode;
 }
 
-const getAllTimeline = (variables: string, timelines: TimelineResult[]): OpenTimelineResult[] =>
-  timelines.map(timeline => ({
-    created: timeline.created,
-    description: timeline.description,
-    eventIdToNoteIds:
-      timeline.eventIdToNoteIds != null
-        ? timeline.eventIdToNoteIds.reduce((acc, note) => {
-            if (note.eventId != null) {
-              const notes = getOr([], note.eventId, acc);
-              return { ...acc, [note.eventId]: [...notes, note.noteId] };
-            }
-            return acc;
-          }, {})
-        : null,
-    favorite: timeline.favorite,
-    noteIds: timeline.noteIds,
-    notes:
-      timeline.notes != null
-        ? timeline.notes.map(note => ({ ...note, savedObjectId: note.noteId }))
-        : null,
-    pinnedEventIds:
-      timeline.pinnedEventIds != null
-        ? timeline.pinnedEventIds.reduce(
-            (acc, pinnedEventId) => ({ ...acc, [pinnedEventId]: true }),
-            {}
-          )
-        : null,
-    savedObjectId: timeline.savedObjectId,
-    title: timeline.title,
-    updated: timeline.updated,
-    updatedBy: timeline.updatedBy,
-  }));
+const getAllTimeline = memoizeOne(
+  (variables: string, timelines: TimelineResult[]): OpenTimelineResult[] =>
+    timelines.map(timeline => ({
+      created: timeline.created,
+      description: timeline.description,
+      eventIdToNoteIds:
+        timeline.eventIdToNoteIds != null
+          ? timeline.eventIdToNoteIds.reduce((acc, note) => {
+              if (note.eventId != null) {
+                const notes = getOr([], note.eventId, acc);
+                return { ...acc, [note.eventId]: [...notes, note.noteId] };
+              }
+              return acc;
+            }, {})
+          : null,
+      favorite: timeline.favorite,
+      noteIds: timeline.noteIds,
+      notes:
+        timeline.notes != null
+          ? timeline.notes.map(note => ({ ...note, savedObjectId: note.noteId }))
+          : null,
+      pinnedEventIds:
+        timeline.pinnedEventIds != null
+          ? timeline.pinnedEventIds.reduce(
+              (acc, pinnedEventId) => ({ ...acc, [pinnedEventId]: true }),
+              {}
+            )
+          : null,
+      savedObjectId: timeline.savedObjectId,
+      title: timeline.title,
+      updated: timeline.updated,
+      updatedBy: timeline.updatedBy,
+    }))
+);
 
 export const AllTimelinesQuery = React.memo<OwnProps>(
   ({ children, onlyUserFavorite, pageInfo, search, sort }) => {
-    const memoizedAllTimeline = memoizeOne(getAllTimeline);
-
     const variables: GetAllTimeline.Variables = {
       onlyUserFavorite,
       pageInfo,
@@ -90,7 +90,7 @@ export const AllTimelinesQuery = React.memo<OwnProps>(
           return children!({
             loading,
             totalCount: getOr(0, 'getAllTimeline.totalCount', data),
-            timelines: memoizedAllTimeline(
+            timelines: getAllTimeline(
               JSON.stringify(variables),
               getOr([], 'getAllTimeline.timeline', data)
             ),
diff --git a/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx b/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx
index 54dd44063f5da6..cfb3f8bd8dc774 100644
--- a/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/timeline/details/index.tsx
@@ -28,11 +28,12 @@ export interface TimelineDetailsProps {
   sourceId: string;
 }
 
+const getDetailsEvent = memoizeOne(
+  (variables: string, detail: DetailItem[]): DetailItem[] => detail
+);
+
 export const TimelineDetailsComponentQuery = React.memo<TimelineDetailsProps>(
   ({ children, indexName, eventId, executeQuery, sourceId }) => {
-    const getDetailsEvent = (variables: string, detail: DetailItem[]): DetailItem[] => detail;
-    const getDetailsEventMemo = memoizeOne(getDetailsEvent);
-
     const variables: GetTimelineDetailsQuery.Variables = {
       sourceId,
       indexName,
@@ -49,7 +50,7 @@ export const TimelineDetailsComponentQuery = React.memo<TimelineDetailsProps>(
         {({ data, loading, refetch }) => {
           return children!({
             loading,
-            detailsData: getDetailsEventMemo(
+            detailsData: getDetailsEvent(
               JSON.stringify(variables),
               getOr([], 'source.TimelineDetails.data', data)
             ),
diff --git a/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx b/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx
index 4fd24b9cb42a5f..7abe14ae745c5a 100644
--- a/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx
@@ -143,7 +143,7 @@ class TlsComponentQuery extends QueryTemplatePaginated<
 const makeMapStateToProps = () => {
   const getTlsSelector = networkSelectors.tlsSelector();
   const getQuery = inputsSelectors.globalQueryByIdSelector();
-  return (state: State, { flowTarget, id = `${ID}-${flowTarget}`, type }: OwnProps) => {
+  return (state: State, { flowTarget, id = ID, type }: OwnProps) => {
     const { isInspected } = getQuery(state, id);
     return {
       ...getTlsSelector(state, type, flowTarget),
diff --git a/x-pack/legacy/plugins/siem/public/graphql/introspection.json b/x-pack/legacy/plugins/siem/public/graphql/introspection.json
index cc9438d67bd26e..8732b61e5c0eb0 100644
--- a/x-pack/legacy/plugins/siem/public/graphql/introspection.json
+++ b/x-pack/legacy/plugins/siem/public/graphql/introspection.json
@@ -727,6 +727,53 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "AuthenticationsOverTime",
+            "description": "",
+            "args": [
+              {
+                "name": "timerange",
+                "description": "",
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": { "kind": "INPUT_OBJECT", "name": "TimerangeInput", "ofType": null }
+                },
+                "defaultValue": null
+              },
+              {
+                "name": "filterQuery",
+                "description": "",
+                "type": { "kind": "SCALAR", "name": "String", "ofType": null },
+                "defaultValue": null
+              },
+              {
+                "name": "defaultIndex",
+                "description": "",
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
+                    }
+                  }
+                },
+                "defaultValue": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "OBJECT", "name": "AuthenticationsOverTimeData", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "Timeline",
             "description": "",
@@ -1730,6 +1777,93 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "NetworkHttp",
+            "description": "",
+            "args": [
+              {
+                "name": "id",
+                "description": "",
+                "type": { "kind": "SCALAR", "name": "String", "ofType": null },
+                "defaultValue": null
+              },
+              {
+                "name": "filterQuery",
+                "description": "",
+                "type": { "kind": "SCALAR", "name": "String", "ofType": null },
+                "defaultValue": null
+              },
+              {
+                "name": "ip",
+                "description": "",
+                "type": { "kind": "SCALAR", "name": "String", "ofType": null },
+                "defaultValue": null
+              },
+              {
+                "name": "pagination",
+                "description": "",
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "PaginationInputPaginated",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null
+              },
+              {
+                "name": "sort",
+                "description": "",
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "NetworkHttpSortField",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null
+              },
+              {
+                "name": "timerange",
+                "description": "",
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": { "kind": "INPUT_OBJECT", "name": "TimerangeInput", "ofType": null }
+                },
+                "defaultValue": null
+              },
+              {
+                "name": "defaultIndex",
+                "description": "",
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
+                    }
+                  }
+                },
+                "defaultValue": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "OBJECT", "name": "NetworkHttpData", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "OverviewNetwork",
             "description": "",
@@ -2351,12 +2485,6 @@
               "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
             },
             "defaultValue": null
-          },
-          {
-            "name": "timezone",
-            "description": "The default browser set time zone",
-            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
-            "defaultValue": null
           }
         ],
         "interfaces": null,
@@ -3123,6 +3251,108 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "AuthenticationsOverTimeData",
+        "description": "",
+        "fields": [
+          {
+            "name": "inspect",
+            "description": "",
+            "args": [],
+            "type": { "kind": "OBJECT", "name": "Inspect", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "authenticationsOverTime",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "MatrixOverTimeHistogramData",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "totalCount",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "MatrixOverTimeHistogramData",
+        "description": "",
+        "fields": [
+          {
+            "name": "x",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "y",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "g",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "INPUT_OBJECT",
         "name": "PaginationInput",
@@ -5843,75 +6073,28 @@
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "MatrixOverTimeHistogramData",
+        "kind": "INPUT_OBJECT",
+        "name": "HostsSortField",
         "description": "",
-        "fields": [
+        "fields": null,
+        "inputFields": [
           {
-            "name": "x",
+            "name": "field",
             "description": "",
-            "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
-              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
+              "ofType": { "kind": "ENUM", "name": "HostsFields", "ofType": null }
             },
-            "isDeprecated": false,
-            "deprecationReason": null
+            "defaultValue": null
           },
           {
-            "name": "y",
+            "name": "direction",
             "description": "",
-            "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
-              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "g",
-            "description": "",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "INPUT_OBJECT",
-        "name": "HostsSortField",
-        "description": "",
-        "fields": null,
-        "inputFields": [
-          {
-            "name": "field",
-            "description": "",
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "ENUM", "name": "HostsFields", "ofType": null }
-            },
-            "defaultValue": null
-          },
-          {
-            "name": "direction",
-            "description": "",
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "ENUM", "name": "Direction", "ofType": null }
+              "ofType": { "kind": "ENUM", "name": "Direction", "ofType": null }
             },
             "defaultValue": null
           }
@@ -7952,6 +8135,236 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "NetworkHttpSortField",
+        "description": "",
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "direction",
+            "description": "",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "ENUM", "name": "Direction", "ofType": null }
+            },
+            "defaultValue": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "NetworkHttpData",
+        "description": "",
+        "fields": [
+          {
+            "name": "edges",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": { "kind": "OBJECT", "name": "NetworkHttpEdges", "ofType": null }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "totalCount",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "pageInfo",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "OBJECT", "name": "PageInfoPaginated", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "inspect",
+            "description": "",
+            "args": [],
+            "type": { "kind": "OBJECT", "name": "Inspect", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "NetworkHttpEdges",
+        "description": "",
+        "fields": [
+          {
+            "name": "node",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "OBJECT", "name": "NetworkHttpItem", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "cursor",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "OBJECT", "name": "CursorType", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "NetworkHttpItem",
+        "description": "",
+        "fields": [
+          {
+            "name": "_id",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "domains",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastHost",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastSourceIp",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "methods",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "path",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "requestCount",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "statuses",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "OverviewNetworkData",
@@ -11179,6 +11592,54 @@
         ],
         "possibleTypes": null
       },
+      {
+        "kind": "ENUM",
+        "name": "NetworkHttpFields",
+        "description": "",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "domains",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastHost",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastSourceIp",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "methods",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          { "name": "path", "description": "", "isDeprecated": false, "deprecationReason": null },
+          {
+            "name": "requestCount",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "statuses",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
       {
         "kind": "ENUM",
         "name": "FlowDirection",
diff --git a/x-pack/legacy/plugins/siem/public/graphql/types.ts b/x-pack/legacy/plugins/siem/public/graphql/types.ts
index 332592a64dfa5d..a1b259b876a142 100644
--- a/x-pack/legacy/plugins/siem/public/graphql/types.ts
+++ b/x-pack/legacy/plugins/siem/public/graphql/types.ts
@@ -27,8 +27,6 @@ export interface TimerangeInput {
   to: number;
   /** The beginning of the timerange */
   from: number;
-  /** The default browser set time zone */
-  timezone?: Maybe<string>;
 }
 
 export interface PaginationInputPaginated {
@@ -87,6 +85,10 @@ export interface NetworkDnsSortField {
   direction: Direction;
 }
 
+export interface NetworkHttpSortField {
+  direction: Direction;
+}
+
 export interface TlsSortField {
   field: TlsFields;
 
@@ -296,6 +298,16 @@ export enum NetworkDirectionEcs {
   unknown = 'unknown',
 }
 
+export enum NetworkHttpFields {
+  domains = 'domains',
+  lastHost = 'lastHost',
+  lastSourceIp = 'lastSourceIp',
+  methods = 'methods',
+  path = 'path',
+  requestCount = 'requestCount',
+  statuses = 'statuses',
+}
+
 export enum FlowDirection {
   uniDirectional = 'uniDirectional',
   biDirectional = 'biDirectional',
@@ -403,6 +415,8 @@ export interface Source {
   /** Gets Authentication success and failures based on a timerange */
   Authentications: AuthenticationsData;
 
+  AuthenticationsOverTime: AuthenticationsOverTimeData;
+
   Timeline: TimelineData;
 
   TimelineDetails: TimelineDetailsData;
@@ -433,6 +447,8 @@ export interface Source {
 
   NetworkDns: NetworkDnsData;
 
+  NetworkHttp: NetworkHttpData;
+
   OverviewNetwork?: Maybe<OverviewNetworkData>;
 
   OverviewHost?: Maybe<OverviewHostData>;
@@ -636,6 +652,22 @@ export interface Inspect {
   response: string[];
 }
 
+export interface AuthenticationsOverTimeData {
+  inspect?: Maybe<Inspect>;
+
+  authenticationsOverTime: MatrixOverTimeHistogramData[];
+
+  totalCount: number;
+}
+
+export interface MatrixOverTimeHistogramData {
+  x: number;
+
+  y: number;
+
+  g: string;
+}
+
 export interface TimelineData {
   edges: TimelineEdges[];
 
@@ -1220,14 +1252,6 @@ export interface EventsOverTimeData {
   totalCount: number;
 }
 
-export interface MatrixOverTimeHistogramData {
-  x: number;
-
-  y: number;
-
-  g: string;
-}
-
 export interface HostsData {
   edges: HostsEdges[];
 
@@ -1580,6 +1604,40 @@ export interface NetworkDnsItem {
   uniqueDomains?: Maybe<number>;
 }
 
+export interface NetworkHttpData {
+  edges: NetworkHttpEdges[];
+
+  totalCount: number;
+
+  pageInfo: PageInfoPaginated;
+
+  inspect?: Maybe<Inspect>;
+}
+
+export interface NetworkHttpEdges {
+  node: NetworkHttpItem;
+
+  cursor: CursorType;
+}
+
+export interface NetworkHttpItem {
+  _id?: Maybe<string>;
+
+  domains: string[];
+
+  lastHost?: Maybe<string>;
+
+  lastSourceIp?: Maybe<string>;
+
+  methods: string[];
+
+  path?: Maybe<string>;
+
+  requestCount?: Maybe<number>;
+
+  statuses: string[];
+}
+
 export interface OverviewNetworkData {
   auditbeatSocket?: Maybe<number>;
 
@@ -1980,6 +2038,13 @@ export interface AuthenticationsSourceArgs {
 
   defaultIndex: string[];
 }
+export interface AuthenticationsOverTimeSourceArgs {
+  timerange: TimerangeInput;
+
+  filterQuery?: Maybe<string>;
+
+  defaultIndex: string[];
+}
 export interface TimelineSourceArgs {
   pagination: PaginationInput;
 
@@ -2147,6 +2212,21 @@ export interface NetworkDnsSourceArgs {
 
   defaultIndex: string[];
 }
+export interface NetworkHttpSourceArgs {
+  id?: Maybe<string>;
+
+  filterQuery?: Maybe<string>;
+
+  ip?: Maybe<string>;
+
+  pagination: PaginationInputPaginated;
+
+  sort: NetworkHttpSortField;
+
+  timerange: TimerangeInput;
+
+  defaultIndex: string[];
+}
 export interface OverviewNetworkSourceArgs {
   id?: Maybe<string>;
 
@@ -2243,6 +2323,58 @@ export interface DeleteTimelineMutationArgs {
 // Documents
 // ====================================================
 
+export namespace GetAuthenticationsOverTimeQuery {
+  export type Variables = {
+    sourceId: string;
+    timerange: TimerangeInput;
+    defaultIndex: string[];
+    filterQuery?: Maybe<string>;
+    inspect: boolean;
+  };
+
+  export type Query = {
+    __typename?: 'Query';
+
+    source: Source;
+  };
+
+  export type Source = {
+    __typename?: 'Source';
+
+    id: string;
+
+    AuthenticationsOverTime: AuthenticationsOverTime;
+  };
+
+  export type AuthenticationsOverTime = {
+    __typename?: 'AuthenticationsOverTimeData';
+
+    authenticationsOverTime: _AuthenticationsOverTime[];
+
+    totalCount: number;
+
+    inspect: Maybe<Inspect>;
+  };
+
+  export type _AuthenticationsOverTime = {
+    __typename?: 'MatrixOverTimeHistogramData';
+
+    x: number;
+
+    y: number;
+
+    g: string;
+  };
+
+  export type Inspect = {
+    __typename?: 'Inspect';
+
+    dsl: string[];
+
+    response: string[];
+  };
+}
+
 export namespace GetAuthenticationsQuery {
   export type Variables = {
     sourceId: string;
@@ -3142,6 +3274,95 @@ export namespace GetNetworkDnsQuery {
   };
 }
 
+export namespace GetNetworkHttpQuery {
+  export type Variables = {
+    sourceId: string;
+    ip?: Maybe<string>;
+    filterQuery?: Maybe<string>;
+    pagination: PaginationInputPaginated;
+    sort: NetworkHttpSortField;
+    timerange: TimerangeInput;
+    defaultIndex: string[];
+    inspect: boolean;
+  };
+
+  export type Query = {
+    __typename?: 'Query';
+
+    source: Source;
+  };
+
+  export type Source = {
+    __typename?: 'Source';
+
+    id: string;
+
+    NetworkHttp: NetworkHttp;
+  };
+
+  export type NetworkHttp = {
+    __typename?: 'NetworkHttpData';
+
+    totalCount: number;
+
+    edges: Edges[];
+
+    pageInfo: PageInfo;
+
+    inspect: Maybe<Inspect>;
+  };
+
+  export type Edges = {
+    __typename?: 'NetworkHttpEdges';
+
+    node: Node;
+
+    cursor: Cursor;
+  };
+
+  export type Node = {
+    __typename?: 'NetworkHttpItem';
+
+    domains: string[];
+
+    lastHost: Maybe<string>;
+
+    lastSourceIp: Maybe<string>;
+
+    methods: string[];
+
+    path: Maybe<string>;
+
+    requestCount: Maybe<number>;
+
+    statuses: string[];
+  };
+
+  export type Cursor = {
+    __typename?: 'CursorType';
+
+    value: Maybe<string>;
+  };
+
+  export type PageInfo = {
+    __typename?: 'PageInfoPaginated';
+
+    activePage: number;
+
+    fakeTotalCount: number;
+
+    showMorePagesIndicator: boolean;
+  };
+
+  export type Inspect = {
+    __typename?: 'Inspect';
+
+    dsl: string[];
+
+    response: string[];
+  };
+}
+
 export namespace GetNetworkTopCountriesQuery {
   export type Variables = {
     sourceId: string;
diff --git a/x-pack/legacy/plugins/siem/public/lib/keury/index.ts b/x-pack/legacy/plugins/siem/public/lib/keury/index.ts
index 0c78fb9d6f45f6..bf8726d5ed377f 100644
--- a/x-pack/legacy/plugins/siem/public/lib/keury/index.ts
+++ b/x-pack/legacy/plugins/siem/public/lib/keury/index.ts
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { buildEsQuery, Filter, fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
+import { buildEsQuery, fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 import { isEmpty, isString, flow } from 'lodash/fp';
 import { StaticIndexPattern } from 'ui/index_patterns';
 import { Query } from 'src/plugins/data/common';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 import { KueryFilterQuery } from '../../store';
 
@@ -83,11 +84,14 @@ export const convertToBuildEsQuery = ({
   config: EsQueryConfig;
   indexPattern: StaticIndexPattern;
   queries: Query[];
-  filters: Filter[];
+  filters: esFilters.Filter[];
 }) => {
   try {
     return JSON.stringify(
-      buildEsQuery(indexPattern, queries, filters.filter(f => f.meta.disabled === false), config)
+      buildEsQuery(indexPattern, queries, filters.filter(f => f.meta.disabled === false), {
+        ...config,
+        dateFormatTZ: null,
+      })
     );
   } catch (exp) {
     return '';
diff --git a/x-pack/legacy/plugins/siem/public/mock/global_state.ts b/x-pack/legacy/plugins/siem/public/mock/global_state.ts
index 9be209321085f4..ada34acbc19460 100644
--- a/x-pack/legacy/plugins/siem/public/mock/global_state.ts
+++ b/x-pack/legacy/plugins/siem/public/mock/global_state.ts
@@ -96,6 +96,11 @@ export const mockGlobalState: State = {
           limit: 10,
           sort: { field: TlsFields._id, direction: Direction.desc },
         },
+        [networkModel.NetworkTableType.http]: {
+          activePage: 0,
+          limit: 10,
+          sort: { direction: Direction.desc },
+        },
       },
     },
     details: {
@@ -131,6 +136,11 @@ export const mockGlobalState: State = {
           limit: 10,
           sort: { field: UsersFields.name, direction: Direction.asc },
         },
+        [networkModel.IpDetailsTableType.http]: {
+          activePage: 0,
+          limit: 10,
+          sort: { direction: Direction.desc },
+        },
       },
     },
   },
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/__snapshots__/body.test.tsx.snap b/x-pack/legacy/plugins/siem/public/pages/hosts/details/__snapshots__/body.test.tsx.snap
deleted file mode 100644
index 3815b319820efe..00000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/__snapshots__/body.test.tsx.snap
+++ /dev/null
@@ -1,15 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`body render snapshot 1`] = `
-<Component>
-  <Connect(HostDetailsBodyComponent)
-    detailName="host-1"
-    from={0}
-    isInitializing={false}
-    setQuery={[Function]}
-    to={0}
-  >
-    <Component />
-  </Connect(HostDetailsBodyComponent)>
-</Component>
-`;
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/body.test.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/details/body.test.tsx
deleted file mode 100644
index 83af0a616a6604..00000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/body.test.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { shallow, mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import React from 'react';
-import { StaticIndexPattern } from 'ui/index_patterns';
-
-import { mockIndexPattern } from '../../../mock/index_pattern';
-import { TestProviders } from '../../../mock/test_providers';
-import { mockUiSettings } from '../../../mock/ui_settings';
-import { CommonChildren } from '../navigation/types';
-import { HostDetailsBody } from './body';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
-
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-}));
-
-jest.mock('../../../containers/source', () => ({
-  indicesExistOrDataTemporarilyUnavailable: () => true,
-  WithSource: ({
-    children,
-  }: {
-    children: (args: {
-      indicesExist: boolean;
-      indexPattern: StaticIndexPattern;
-    }) => React.ReactNode;
-  }) => children({ indicesExist: true, indexPattern: mockIndexPattern }),
-}));
-
-describe('body', () => {
-  test('render snapshot', () => {
-    const child: CommonChildren = () => <span>{'I am a child'}</span>;
-    const wrapper = shallow(
-      <TestProviders>
-        <HostDetailsBody
-          children={child}
-          from={0}
-          isInitializing={false}
-          detailName={'host-1'}
-          setQuery={() => {}}
-          to={0}
-        />
-      </TestProviders>
-    );
-    expect(toJson(wrapper)).toMatchSnapshot();
-  });
-
-  test('it should pass expected object properties to children', () => {
-    const child = jest.fn();
-    mount(
-      <TestProviders>
-        <HostDetailsBody
-          children={child}
-          from={0}
-          isInitializing={false}
-          detailName={'host-1'}
-          setQuery={() => {}}
-          to={0}
-        />
-      </TestProviders>
-    );
-    // match against everything but the functions to ensure they are there as expected
-    expect(child.mock.calls[0][0]).toMatchObject({
-      endDate: 0,
-      filterQuery:
-        '{"bool":{"must":[],"filter":[{"match_all":{}},{"match_phrase":{"host.name":{"query":"host-1"}}}],"should":[],"must_not":[]}}',
-      skip: false,
-      startDate: 0,
-      type: 'details',
-      indexPattern: {
-        fields: [
-          { name: '@timestamp', searchable: true, type: 'date', aggregatable: true },
-          { name: '@version', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.ephemeral_id', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.hostname', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.id', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.test1', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.test2', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.test3', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.test4', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.test5', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.test6', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.test7', searchable: true, type: 'string', aggregatable: true },
-          { name: 'agent.test8', searchable: true, type: 'string', aggregatable: true },
-          { name: 'host.name', searchable: true, type: 'string', aggregatable: true },
-        ],
-        title: 'filebeat-*,auditbeat-*,packetbeat-*',
-      },
-      hostName: 'host-1',
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/body.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/details/body.tsx
deleted file mode 100644
index ae8ebcf41cd562..00000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/body.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { getEsQueryConfig } from '@kbn/es-query';
-import React from 'react';
-import { connect } from 'react-redux';
-
-import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../../containers/source';
-import { setAbsoluteRangeDatePicker as dispatchAbsoluteRangeDatePicker } from '../../../store/inputs/actions';
-import { scoreIntervalToDateTime } from '../../../components/ml/score/score_interval_to_datetime';
-import { Anomaly } from '../../../components/ml/types';
-import { convertToBuildEsQuery } from '../../../lib/keury';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
-
-import { HostDetailsBodyComponentProps } from './types';
-import { type, makeMapStateToProps } from './utils';
-
-const HostDetailsBodyComponent = React.memo<HostDetailsBodyComponentProps>(
-  ({
-    children,
-    deleteQuery,
-    detailName,
-    filters,
-    from,
-    isInitializing,
-    query,
-    setAbsoluteRangeDatePicker,
-    setQuery,
-    to,
-  }) => {
-    const core = useKibanaCore();
-    return (
-      <WithSource sourceId="default">
-        {({ indicesExist, indexPattern }) => {
-          const filterQuery = convertToBuildEsQuery({
-            config: getEsQueryConfig(core.uiSettings),
-            indexPattern,
-            queries: [query],
-            filters: [
-              {
-                meta: {
-                  alias: null,
-                  negate: false,
-                  disabled: false,
-                  type: 'phrase',
-                  key: 'host.name',
-                  value: detailName,
-                  params: {
-                    query: detailName,
-                  },
-                },
-                query: {
-                  match: {
-                    'host.name': {
-                      query: detailName,
-                      type: 'phrase',
-                    },
-                  },
-                },
-              },
-              ...filters,
-            ],
-          });
-          return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
-            <>
-              {children({
-                deleteQuery,
-                endDate: to,
-                filterQuery,
-                skip: isInitializing,
-                setQuery,
-                startDate: from,
-                type,
-                indexPattern,
-                hostName: detailName,
-                narrowDateRange: (score: Anomaly, interval: string) => {
-                  const fromTo = scoreIntervalToDateTime(score, interval);
-                  setAbsoluteRangeDatePicker({
-                    id: 'global',
-                    from: fromTo.from,
-                    to: fromTo.to,
-                  });
-                },
-                updateDateRange: (min: number, max: number) => {
-                  setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
-                },
-              })}
-            </>
-          ) : null;
-        }}
-      </WithSource>
-    );
-  }
-);
-
-HostDetailsBodyComponent.displayName = 'HostDetailsBodyComponent';
-
-export const HostDetailsBody = connect(
-  makeMapStateToProps,
-  {
-    setAbsoluteRangeDatePicker: dispatchAbsoluteRangeDatePicker,
-  }
-)(HostDetailsBodyComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx
new file mode 100644
index 00000000000000..6ceebc1708b185
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { mount } from 'enzyme';
+import React from 'react';
+import { StaticIndexPattern } from 'ui/index_patterns';
+import { MemoryRouter } from 'react-router-dom';
+
+import { mockIndexPattern } from '../../../mock/index_pattern';
+import { TestProviders } from '../../../mock/test_providers';
+import { mockUiSettings } from '../../../mock/ui_settings';
+import { HostDetailsTabs } from './details_tabs';
+import { SetAbsoluteRangeDatePicker } from './types';
+import { hostDetailsPagePath } from '../types';
+import { type } from './utils';
+import { useKibanaCore } from '../../../lib/compose/kibana_core';
+
+jest.mock('../../../lib/settings/use_kibana_ui_setting');
+
+const mockUseKibanaCore = useKibanaCore as jest.Mock;
+jest.mock('../../../lib/compose/kibana_core');
+mockUseKibanaCore.mockImplementation(() => ({
+  uiSettings: mockUiSettings,
+}));
+
+jest.mock('../../../containers/source', () => ({
+  indicesExistOrDataTemporarilyUnavailable: () => true,
+  WithSource: ({
+    children,
+  }: {
+    children: (args: {
+      indicesExist: boolean;
+      indexPattern: StaticIndexPattern;
+    }) => React.ReactNode;
+  }) => children({ indicesExist: true, indexPattern: mockIndexPattern }),
+}));
+
+// Test will fail because we will to need to mock some core services to make the test work
+// For now let's forget about SiemSearchBar
+jest.mock('../../../components/search_bar', () => ({
+  SiemSearchBar: () => null,
+}));
+
+describe('body', () => {
+  const scenariosMap = {
+    authentications: 'AuthenticationsQueryTabBody',
+    allHosts: 'HostsQueryTabBody',
+    uncommonProcesses: 'UncommonProcessQueryTabBody',
+    anomalies: 'AnomaliesQueryTabBody',
+    events: 'EventsQueryTabBody',
+  };
+
+  Object.entries(scenariosMap).forEach(([path, componentName]) =>
+    test(`it should pass expected object properties to ${componentName}`, () => {
+      const wrapper = mount(
+        <TestProviders>
+          <MemoryRouter initialEntries={[`/hosts/host-1/${path}`]}>
+            <HostDetailsTabs
+              from={0}
+              isInitializing={false}
+              detailName={'host-1'}
+              setQuery={() => {}}
+              to={0}
+              setAbsoluteRangeDatePicker={(jest.fn() as unknown) as SetAbsoluteRangeDatePicker}
+              hostDetailsPagePath={hostDetailsPagePath}
+              indexPattern={mockIndexPattern}
+              type={type}
+              filterQuery='{"bool":{"must":[],"filter":[{"match_all":{}},{"match_phrase":{"host.name":{"query":"host-1"}}}],"should":[],"must_not":[]}}'
+            />
+          </MemoryRouter>
+        </TestProviders>
+      );
+
+      // match against everything but the functions to ensure they are there as expected
+      expect(wrapper.find(componentName).props()).toMatchObject({
+        endDate: 0,
+        filterQuery:
+          '{"bool":{"must":[],"filter":[{"match_all":{}},{"match_phrase":{"host.name":{"query":"host-1"}}}],"should":[],"must_not":[]}}',
+        skip: false,
+        startDate: 0,
+        type: 'details',
+        indexPattern: {
+          fields: [
+            { name: '@timestamp', searchable: true, type: 'date', aggregatable: true },
+            { name: '@version', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.ephemeral_id', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.hostname', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.id', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.test1', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.test2', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.test3', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.test4', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.test5', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.test6', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.test7', searchable: true, type: 'string', aggregatable: true },
+            { name: 'agent.test8', searchable: true, type: 'string', aggregatable: true },
+            { name: 'host.name', searchable: true, type: 'string', aggregatable: true },
+          ],
+          title: 'filebeat-*,auditbeat-*,packetbeat-*',
+        },
+        hostName: 'host-1',
+      });
+    })
+  );
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.tsx
new file mode 100644
index 00000000000000..48b6d34d0b28bb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/details/details_tabs.tsx
@@ -0,0 +1,100 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback } from 'react';
+import { Route, Switch } from 'react-router-dom';
+
+import { scoreIntervalToDateTime } from '../../../components/ml/score/score_interval_to_datetime';
+import { Anomaly } from '../../../components/ml/types';
+import { HostsTableType } from '../../../store/hosts/model';
+
+import { HostDetailsTabsProps } from './types';
+import { type } from './utils';
+
+import {
+  HostsQueryTabBody,
+  AuthenticationsQueryTabBody,
+  UncommonProcessQueryTabBody,
+  AnomaliesQueryTabBody,
+  EventsQueryTabBody,
+} from '../navigation';
+
+const HostDetailsTabs = React.memo<HostDetailsTabsProps>(
+  ({
+    deleteQuery,
+    filterQuery,
+    from,
+    isInitializing,
+    detailName,
+    setAbsoluteRangeDatePicker,
+    setQuery,
+    to,
+    indexPattern,
+    hostDetailsPagePath,
+  }) => {
+    const narrowDateRange = useCallback(
+      (score: Anomaly, interval: string) => {
+        const fromTo = scoreIntervalToDateTime(score, interval);
+        setAbsoluteRangeDatePicker({
+          id: 'global',
+          from: fromTo.from,
+          to: fromTo.to,
+        });
+      },
+      [setAbsoluteRangeDatePicker, scoreIntervalToDateTime]
+    );
+
+    const updateDateRange = useCallback(
+      (min: number, max: number) => {
+        setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+      },
+      [setAbsoluteRangeDatePicker, scoreIntervalToDateTime]
+    );
+
+    const tabProps = {
+      deleteQuery,
+      endDate: to,
+      filterQuery,
+      skip: isInitializing,
+      setQuery,
+      startDate: from,
+      type,
+      indexPattern,
+      hostName: detailName,
+      narrowDateRange,
+      updateDateRange,
+    };
+
+    return (
+      <Switch>
+        <Route
+          path={`${hostDetailsPagePath}/:tabName(${HostsTableType.authentications})`}
+          render={() => <AuthenticationsQueryTabBody {...tabProps} />}
+        />
+        <Route
+          path={`${hostDetailsPagePath}/:tabName(${HostsTableType.hosts})`}
+          render={() => <HostsQueryTabBody {...tabProps} />}
+        />
+        <Route
+          path={`${hostDetailsPagePath}/:tabName(${HostsTableType.uncommonProcesses})`}
+          render={() => <UncommonProcessQueryTabBody {...tabProps} />}
+        />
+        <Route
+          path={`${hostDetailsPagePath}/:tabName(${HostsTableType.anomalies})`}
+          render={() => <AnomaliesQueryTabBody {...tabProps} />}
+        />
+        <Route
+          path={`${hostDetailsPagePath}/:tabName(${HostsTableType.events})`}
+          render={() => <EventsQueryTabBody {...tabProps} />}
+        />
+      </Switch>
+    );
+  }
+);
+
+HostDetailsTabs.displayName = 'HostDetailsTabs';
+
+export { HostDetailsTabs };
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx
index d1d29c3d2ea821..d3a242b41da7b5 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx
@@ -11,6 +11,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { StickyContainer } from 'react-sticky';
 
+import { inputsSelectors, State } from '../../../store';
 import { FiltersGlobal } from '../../../components/filters_global';
 import { HeaderPage } from '../../../components/header_page';
 import { KpiHostDetailsQuery } from '../../../containers/kpi_host_details';
@@ -32,22 +33,19 @@ import { LastEventIndexKey } from '../../../graphql/types';
 import { convertToBuildEsQuery } from '../../../lib/keury';
 import { setAbsoluteRangeDatePicker as dispatchAbsoluteRangeDatePicker } from '../../../store/inputs/actions';
 import { SpyRoute } from '../../../utils/route/spy_routes';
+import { useKibanaCore } from '../../../lib/compose/kibana_core';
 
-import { HostsQueryProps } from '../hosts';
 import { HostsEmptyPage } from '../hosts_empty_page';
-
-export { HostDetailsBody } from './body';
 import { navTabsHostDetails } from './nav_tabs';
-import { HostDetailsComponentProps } from './types';
-import { makeMapStateToProps } from './utils';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
+import { HostDetailsComponentProps, HostDetailsProps } from './types';
+import { HostDetailsTabs } from './details_tabs';
+import { type } from './utils';
 
 const HostOverviewManage = manageQuery(HostOverview);
 const KpiHostDetailsManage = manageQuery(KpiHostsComponent);
 
 const HostDetailsComponent = React.memo<HostDetailsComponentProps>(
   ({
-    detailName,
     filters,
     from,
     isInitializing,
@@ -56,6 +54,9 @@ const HostDetailsComponent = React.memo<HostDetailsComponentProps>(
     setHostDetailsTablesActivePageToZero,
     setQuery,
     to,
+    detailName,
+    deleteQuery,
+    hostDetailsPagePath,
   }) => {
     useEffect(() => {
       setHostDetailsTablesActivePageToZero(null);
@@ -96,94 +97,114 @@ const HostDetailsComponent = React.memo<HostDetailsComponentProps>(
               ],
             });
             return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
-              <StickyContainer>
-                <FiltersGlobal>
-                  <SiemSearchBar indexPattern={indexPattern} id="global" />
-                </FiltersGlobal>
+              <>
+                <StickyContainer>
+                  <FiltersGlobal>
+                    <SiemSearchBar indexPattern={indexPattern} id="global" />
+                  </FiltersGlobal>
 
-                <HeaderPage
-                  subtitle={
-                    <LastEventTime indexKey={LastEventIndexKey.hostDetails} hostName={detailName} />
-                  }
-                  title={detailName}
-                />
-                <HostOverviewByNameQuery
-                  sourceId="default"
-                  hostName={detailName}
-                  skip={isInitializing}
-                  startDate={from}
-                  endDate={to}
-                >
-                  {({ hostOverview, loading, id, inspect, refetch }) => (
-                    <AnomalyTableProvider
-                      criteriaFields={hostToCriteria(hostOverview)}
-                      startDate={from}
-                      endDate={to}
-                      skip={isInitializing}
-                    >
-                      {({ isLoadingAnomaliesData, anomaliesData }) => (
-                        <HostOverviewManage
-                          id={id}
-                          inspect={inspect}
-                          refetch={refetch}
-                          setQuery={setQuery}
-                          data={hostOverview}
-                          anomaliesData={anomaliesData}
-                          isLoadingAnomaliesData={isLoadingAnomaliesData}
-                          loading={loading}
-                          startDate={from}
-                          endDate={to}
-                          narrowDateRange={(score, interval) => {
-                            const fromTo = scoreIntervalToDateTime(score, interval);
-                            setAbsoluteRangeDatePicker({
-                              id: 'global',
-                              from: fromTo.from,
-                              to: fromTo.to,
-                            });
-                          }}
-                        />
-                      )}
-                    </AnomalyTableProvider>
-                  )}
-                </HostOverviewByNameQuery>
+                  <HeaderPage
+                    subtitle={
+                      <LastEventTime
+                        indexKey={LastEventIndexKey.hostDetails}
+                        hostName={detailName}
+                      />
+                    }
+                    title={detailName}
+                  />
+                  <HostOverviewByNameQuery
+                    sourceId="default"
+                    hostName={detailName}
+                    skip={isInitializing}
+                    startDate={from}
+                    endDate={to}
+                  >
+                    {({ hostOverview, loading, id, inspect, refetch }) => (
+                      <AnomalyTableProvider
+                        criteriaFields={hostToCriteria(hostOverview)}
+                        startDate={from}
+                        endDate={to}
+                        skip={isInitializing}
+                      >
+                        {({ isLoadingAnomaliesData, anomaliesData }) => (
+                          <HostOverviewManage
+                            id={id}
+                            inspect={inspect}
+                            refetch={refetch}
+                            setQuery={setQuery}
+                            data={hostOverview}
+                            anomaliesData={anomaliesData}
+                            isLoadingAnomaliesData={isLoadingAnomaliesData}
+                            loading={loading}
+                            startDate={from}
+                            endDate={to}
+                            narrowDateRange={(score, interval) => {
+                              const fromTo = scoreIntervalToDateTime(score, interval);
+                              setAbsoluteRangeDatePicker({
+                                id: 'global',
+                                from: fromTo.from,
+                                to: fromTo.to,
+                              });
+                            }}
+                          />
+                        )}
+                      </AnomalyTableProvider>
+                    )}
+                  </HostOverviewByNameQuery>
 
-                <EuiHorizontalRule />
+                  <EuiHorizontalRule />
 
-                <KpiHostDetailsQuery
-                  sourceId="default"
-                  filterQuery={filterQuery}
-                  skip={isInitializing}
-                  startDate={from}
-                  endDate={to}
-                >
-                  {({ kpiHostDetails, id, inspect, loading, refetch }) => (
-                    <KpiHostDetailsManage
-                      data={kpiHostDetails}
-                      from={from}
-                      id={id}
-                      inspect={inspect}
-                      loading={loading}
-                      refetch={refetch}
-                      setQuery={setQuery}
-                      to={to}
-                      narrowDateRange={(min: number, max: number) => {
-                        setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
-                      }}
-                    />
-                  )}
-                </KpiHostDetailsQuery>
+                  <KpiHostDetailsQuery
+                    sourceId="default"
+                    filterQuery={filterQuery}
+                    skip={isInitializing}
+                    startDate={from}
+                    endDate={to}
+                  >
+                    {({ kpiHostDetails, id, inspect, loading, refetch }) => (
+                      <KpiHostDetailsManage
+                        data={kpiHostDetails}
+                        from={from}
+                        id={id}
+                        inspect={inspect}
+                        loading={loading}
+                        refetch={refetch}
+                        setQuery={setQuery}
+                        to={to}
+                        narrowDateRange={(min: number, max: number) => {
+                          setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+                        }}
+                      />
+                    )}
+                  </KpiHostDetailsQuery>
+
+                  <EuiSpacer />
 
-                <SiemNavigation
-                  navTabs={navTabsHostDetails(detailName, hasMlUserPermissions(capabilities))}
-                  display="default"
-                  showBorder={true}
+                  <SiemNavigation
+                    navTabs={navTabsHostDetails(detailName, hasMlUserPermissions(capabilities))}
+                    display="default"
+                    showBorder={true}
+                  />
+
+                  <EuiSpacer />
+                </StickyContainer>
+                <HostDetailsTabs
+                  isInitializing={isInitializing}
+                  deleteQuery={deleteQuery}
+                  to={to}
+                  from={from}
+                  detailName={detailName}
+                  type={type}
+                  setQuery={setQuery}
+                  filterQuery={filterQuery}
+                  hostDetailsPagePath={hostDetailsPagePath}
+                  indexPattern={indexPattern}
+                  setAbsoluteRangeDatePicker={setAbsoluteRangeDatePicker}
                 />
-                <EuiSpacer />
-              </StickyContainer>
+              </>
             ) : (
               <>
                 <HeaderPage title={detailName} />
-
                 <HostsEmptyPage />
               </>
             );
@@ -197,7 +218,16 @@ const HostDetailsComponent = React.memo<HostDetailsComponentProps>(
 
 HostDetailsComponent.displayName = 'HostDetailsComponent';
 
-export const HostDetails = compose<React.ComponentClass<HostsQueryProps & { detailName: string }>>(
+export const makeMapStateToProps = () => {
+  const getGlobalQuerySelector = inputsSelectors.globalQuerySelector();
+  const getGlobalFiltersQuerySelector = inputsSelectors.globalFiltersQuerySelector();
+  return (state: State) => ({
+    query: getGlobalQuerySelector(state),
+    filters: getGlobalFiltersQuerySelector(state),
+  });
+};
+
+export const HostDetails = compose<React.ComponentClass<HostDetailsProps>>(
   connect(
     makeMapStateToProps,
     {
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/types.ts b/x-pack/legacy/plugins/siem/public/pages/hosts/details/types.ts
index b4dda2cee8760a..4f3d34f51fb932 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/details/types.ts
@@ -4,24 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
+import { StaticIndexPattern } from 'ui/index_patterns';
 import { ActionCreator } from 'typescript-fsa';
-import { Query } from 'src/plugins/data/common';
+import { Query, esFilters } from 'src/plugins/data/public';
 
 import { InputsModelId } from '../../../store/inputs/constants';
 import { HostComponentProps } from '../../../components/link_to/redirect_to_hosts';
 import { HostsTableType } from '../../../store/hosts/model';
-import { HostsQueryProps } from '../hosts';
+import { HostsQueryProps } from '../types';
 import { NavTab } from '../../../components/navigation/types';
-import {
-  AnomaliesChildren,
-  CommonChildren,
-  KeyHostsNavTabWithoutMlPermission,
-} from '../navigation/types';
+import { KeyHostsNavTabWithoutMlPermission } from '../navigation/types';
+import { hostsModel } from '../../../store';
 
 interface HostDetailsComponentReduxProps {
   query: Query;
-  filters: Filter[];
+  filters: esFilters.Filter[];
 }
 
 interface HostBodyComponentDispatchProps {
@@ -31,14 +28,16 @@ interface HostBodyComponentDispatchProps {
     to: number;
   }>;
   detailName: string;
+  hostDetailsPagePath: string;
 }
 
 interface HostDetailsComponentDispatchProps extends HostBodyComponentDispatchProps {
   setHostDetailsTablesActivePageToZero: ActionCreator<null>;
 }
 
-export interface HostDetailsBodyProps extends HostsQueryProps {
-  children: CommonChildren | AnomaliesChildren;
+export interface HostDetailsProps extends HostsQueryProps {
+  detailName: string;
+  hostDetailsPagePath: string;
 }
 
 export type HostDetailsComponentProps = HostDetailsComponentReduxProps &
@@ -46,10 +45,6 @@ export type HostDetailsComponentProps = HostDetailsComponentReduxProps &
   HostComponentProps &
   HostsQueryProps;
 
-export type HostDetailsBodyComponentProps = HostDetailsComponentReduxProps &
-  HostBodyComponentDispatchProps &
-  HostDetailsBodyProps;
-
 type KeyHostDetailsNavTabWithoutMlPermission = HostsTableType.authentications &
   HostsTableType.uncommonProcesses &
   HostsTableType.events;
@@ -62,3 +57,16 @@ type KeyHostDetailsNavTab =
   | KeyHostDetailsNavTabWithMlPermission;
 
 export type HostDetailsNavTab = Record<KeyHostDetailsNavTab, NavTab>;
+
+export type HostDetailsTabsProps = HostBodyComponentDispatchProps &
+  HostsQueryProps & {
+    indexPattern: StaticIndexPattern;
+    type: hostsModel.HostsType;
+    filterQuery: string;
+  };
+
+export type SetAbsoluteRangeDatePicker = ActionCreator<{
+  id: InputsModelId;
+  from: number;
+  to: number;
+}>;
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/utils.ts b/x-pack/legacy/plugins/siem/public/pages/hosts/details/utils.ts
index 52efe93c0c8dcc..7483636cfe03df 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/details/utils.ts
@@ -6,7 +6,7 @@
 
 import { Breadcrumb } from 'ui/chrome';
 
-import { hostsModel, inputsSelectors, State } from '../../../store';
+import { hostsModel } from '../../../store';
 import { HostsTableType } from '../../../store/hosts/model';
 import { getHostsUrl, getHostDetailsUrl } from '../../../components/link_to/redirect_to_hosts';
 
@@ -15,15 +15,6 @@ import { RouteSpyState } from '../../../utils/route/types';
 
 export const type = hostsModel.HostsType.details;
 
-export const makeMapStateToProps = () => {
-  const getGlobalQuerySelector = inputsSelectors.globalQuerySelector();
-  const getGlobalFiltersQuerySelector = inputsSelectors.globalFiltersQuerySelector();
-  return (state: State) => ({
-    query: getGlobalQuerySelector(state),
-    filters: getGlobalFiltersQuerySelector(state),
-  });
-};
-
 const TabNameMappedToI18nKey = {
   [HostsTableType.hosts]: i18n.NAVIGATION_ALL_HOSTS_TITLE,
   [HostsTableType.authentications]: i18n.NAVIGATION_AUTHENTICATIONS_TITLE,
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
index 5b6444148045dd..d2c9822889c265 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.test.tsx
@@ -19,7 +19,8 @@ import { wait } from '../../lib/helpers';
 import { TestProviders } from '../../mock';
 import { mockUiSettings } from '../../mock/ui_settings';
 import { InputsModelId } from '../../store/inputs/constants';
-import { Hosts, HostsComponentProps } from './hosts';
+import { HostsComponentProps } from './types';
+import { Hosts } from './hosts';
 import { useKibanaCore } from '../../lib/compose/kibana_core';
 
 jest.mock('../../lib/settings/use_kibana_ui_setting');
@@ -97,6 +98,7 @@ describe('Hosts - rendering', () => {
     }>,
     query: { query: '', language: 'kuery' },
     filters: [],
+    hostsPagePath: '',
   };
 
   beforeAll(() => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
index fc969974609ea4..334d730378b236 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
@@ -5,13 +5,11 @@
  */
 
 import { EuiSpacer } from '@elastic/eui';
-import { Filter, getEsQueryConfig } from '@kbn/es-query';
+import { getEsQueryConfig } from '@kbn/es-query';
 import * as React from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { StickyContainer } from 'react-sticky';
-import { ActionCreator } from 'typescript-fsa';
-import { Query } from 'src/plugins/data/common';
 
 import { FiltersGlobal } from '../../components/filters_global';
 import { GlobalTimeArgs } from '../../containers/global_time';
@@ -27,41 +25,34 @@ import { SiemSearchBar } from '../../components/search_bar';
 import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source';
 import { LastEventIndexKey } from '../../graphql/types';
 import { convertToBuildEsQuery } from '../../lib/keury';
-import { inputsSelectors, State } from '../../store';
+import { inputsSelectors, State, hostsModel } from '../../store';
 import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions';
-import { InputsModelId } from '../../store/inputs/constants';
 import { SpyRoute } from '../../utils/route/spy_routes';
+import { useKibanaCore } from '../../lib/compose/kibana_core';
 
 import { HostsEmptyPage } from './hosts_empty_page';
 import { navTabsHosts } from './nav_tabs';
 import * as i18n from './translations';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
+import { HostsComponentProps, HostsComponentReduxProps } from './types';
+import { HostsTabs } from './hosts_tabs';
 
 const KpiHostsComponentManage = manageQuery(KpiHostsComponent);
 
-interface HostsComponentReduxProps {
-  query: Query;
-  filters: Filter[];
-}
-
-interface HostsComponentDispatchProps {
-  setAbsoluteRangeDatePicker: ActionCreator<{
-    id: InputsModelId;
-    from: number;
-    to: number;
-  }>;
-}
-
-export type HostsQueryProps = { timezone?: string } & GlobalTimeArgs;
-
-export type HostsComponentProps = HostsComponentReduxProps &
-  HostsComponentDispatchProps &
-  HostsQueryProps;
-
 const HostsComponent = React.memo<HostsComponentProps>(
-  ({ isInitializing, filters, from, query, setAbsoluteRangeDatePicker, setQuery, to }) => {
+  ({
+    deleteQuery,
+    isInitializing,
+    filters,
+    from,
+    query,
+    setAbsoluteRangeDatePicker,
+    setQuery,
+    to,
+    hostsPagePath,
+  }) => {
     const capabilities = React.useContext(MlCapabilitiesContext);
     const core = useKibanaCore();
+
     return (
       <>
         <WithSource sourceId="default">
@@ -73,48 +64,62 @@ const HostsComponent = React.memo<HostsComponentProps>(
               filters,
             });
             return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
-              <StickyContainer>
-                <FiltersGlobal>
-                  <SiemSearchBar indexPattern={indexPattern} id="global" />
-                </FiltersGlobal>
+              <>
+                <StickyContainer>
+                  <FiltersGlobal>
+                    <SiemSearchBar indexPattern={indexPattern} id="global" />
+                  </FiltersGlobal>
 
-                <HeaderPage
-                  subtitle={<LastEventTime indexKey={LastEventIndexKey.hosts} />}
-                  title={i18n.PAGE_TITLE}
-                />
-                <>
-                  <KpiHostsQuery
-                    endDate={to}
-                    filterQuery={filterQuery}
-                    skip={isInitializing}
-                    sourceId="default"
-                    startDate={from}
-                  >
-                    {({ kpiHosts, loading, id, inspect, refetch }) => (
-                      <KpiHostsComponentManage
-                        data={kpiHosts}
-                        from={from}
-                        id={id}
-                        inspect={inspect}
-                        loading={loading}
-                        refetch={refetch}
-                        setQuery={setQuery}
-                        to={to}
-                        narrowDateRange={(min: number, max: number) => {
-                          setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
-                        }}
-                      />
-                    )}
-                  </KpiHostsQuery>
-                  <EuiSpacer />
-                  <SiemNavigation
-                    navTabs={navTabsHosts(hasMlUserPermissions(capabilities))}
-                    display="default"
-                    showBorder={true}
+                  <HeaderPage
+                    subtitle={<LastEventTime indexKey={LastEventIndexKey.hosts} />}
+                    title={i18n.PAGE_TITLE}
                   />
-                  <EuiSpacer />
-                </>
-              </StickyContainer>
+                  <>
+                    <KpiHostsQuery
+                      endDate={to}
+                      filterQuery={filterQuery}
+                      skip={isInitializing}
+                      sourceId="default"
+                      startDate={from}
+                    >
+                      {({ kpiHosts, loading, id, inspect, refetch }) => (
+                        <KpiHostsComponentManage
+                          data={kpiHosts}
+                          from={from}
+                          id={id}
+                          inspect={inspect}
+                          loading={loading}
+                          refetch={refetch}
+                          setQuery={setQuery}
+                          to={to}
+                          narrowDateRange={(min: number, max: number) => {
+                            setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+                          }}
+                        />
+                      )}
+                    </KpiHostsQuery>
+                    <EuiSpacer />
+                    <SiemNavigation
+                      navTabs={navTabsHosts(hasMlUserPermissions(capabilities))}
+                      display="default"
+                      showBorder={true}
+                    />
+                    <EuiSpacer />
+                  </>
+                </StickyContainer>
+                <HostsTabs
+                  deleteQuery={deleteQuery}
+                  to={to}
+                  filterQuery={filterQuery}
+                  isInitializing={isInitializing}
+                  setQuery={setQuery}
+                  from={from}
+                  type={hostsModel.HostsType.page}
+                  indexPattern={indexPattern}
+                  setAbsoluteRangeDatePicker={setAbsoluteRangeDatePicker}
+                  hostsPagePath={hostsPagePath}
+                />
+              </>
             ) : (
               <>
                 <HeaderPage title={i18n.PAGE_TITLE} />
@@ -142,8 +147,12 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
+interface HostsProps extends GlobalTimeArgs {
+  hostsPagePath: string;
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const Hosts = compose<React.ComponentClass<GlobalTimeArgs>>(
+export const Hosts = compose<React.ComponentClass<HostsProps>>(
   connect(
     makeMapStateToProps,
     {
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_body.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_body.tsx
deleted file mode 100644
index 242c66bb3a9ee0..00000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_body.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { getEsQueryConfig } from '@kbn/es-query';
-import React, { memo } from 'react';
-import { connect } from 'react-redux';
-
-import { scoreIntervalToDateTime } from '../../components/ml/score/score_interval_to_datetime';
-import { Anomaly } from '../../components/ml/types';
-import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source';
-import { convertToBuildEsQuery } from '../../lib/keury';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
-import { hostsModel, inputsSelectors, State } from '../../store';
-import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions';
-
-import { HostsComponentProps } from './hosts';
-import { CommonChildren, AnomaliesChildren } from './navigation/types';
-
-interface HostsBodyComponentProps extends HostsComponentProps {
-  children: CommonChildren | AnomaliesChildren;
-}
-
-const HostsBodyComponent = memo<HostsBodyComponentProps>(
-  ({
-    children,
-    deleteQuery,
-    filters,
-    from,
-    isInitializing,
-    query,
-    setAbsoluteRangeDatePicker,
-    setQuery,
-    timezone,
-    to,
-  }) => {
-    const core = useKibanaCore();
-    return (
-      <WithSource sourceId="default">
-        {({ indicesExist, indexPattern }) => {
-          const filterQuery = convertToBuildEsQuery({
-            config: getEsQueryConfig(core.uiSettings),
-            indexPattern,
-            queries: [query],
-            filters,
-          });
-          return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
-            <>
-              {children({
-                deleteQuery,
-                endDate: to,
-                filterQuery,
-                skip: isInitializing,
-                setQuery,
-                startDate: from,
-                timezone,
-                type: hostsModel.HostsType.page,
-                indexPattern,
-                narrowDateRange: (score: Anomaly, interval: string) => {
-                  const fromTo = scoreIntervalToDateTime(score, interval);
-                  setAbsoluteRangeDatePicker({
-                    id: 'global',
-                    from: fromTo.from,
-                    to: fromTo.to,
-                  });
-                },
-                updateDateRange: (min: number, max: number) => {
-                  setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
-                },
-              })}
-            </>
-          ) : null;
-        }}
-      </WithSource>
-    );
-  }
-);
-
-HostsBodyComponent.displayName = 'HostsBodyComponent';
-
-const makeMapStateToProps = () => {
-  const getGlobalQuerySelector = inputsSelectors.globalQuerySelector();
-  const getGlobalFiltersQuerySelector = inputsSelectors.globalFiltersQuerySelector();
-  const mapStateToProps = (state: State) => ({
-    query: getGlobalQuerySelector(state),
-    filters: getGlobalFiltersQuerySelector(state),
-  });
-  return mapStateToProps;
-};
-
-export const HostsBody = connect(
-  makeMapStateToProps,
-  {
-    setAbsoluteRangeDatePicker: dispatchSetAbsoluteRangeDatePicker,
-  }
-)(HostsBodyComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_tabs.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_tabs.tsx
new file mode 100644
index 00000000000000..6dbfb422ed7a6d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_tabs.tsx
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo } from 'react';
+import { Route, Switch } from 'react-router-dom';
+
+import { HostsTabsProps } from './types';
+import { scoreIntervalToDateTime } from '../../components/ml/score/score_interval_to_datetime';
+import { Anomaly } from '../../components/ml/types';
+import { HostsTableType } from '../../store/hosts/model';
+
+import {
+  HostsQueryTabBody,
+  AuthenticationsQueryTabBody,
+  UncommonProcessQueryTabBody,
+  AnomaliesQueryTabBody,
+  EventsQueryTabBody,
+} from './navigation';
+
+const HostsTabs = memo<HostsTabsProps>(
+  ({
+    deleteQuery,
+    filterQuery,
+    setAbsoluteRangeDatePicker,
+    to,
+    from,
+    setQuery,
+    isInitializing,
+    type,
+    indexPattern,
+    hostsPagePath,
+  }) => {
+    const tabProps = {
+      deleteQuery,
+      endDate: to,
+      filterQuery,
+      skip: isInitializing,
+      setQuery,
+      startDate: from,
+      type,
+      indexPattern,
+      narrowDateRange: (score: Anomaly, interval: string) => {
+        const fromTo = scoreIntervalToDateTime(score, interval);
+        setAbsoluteRangeDatePicker({
+          id: 'global',
+          from: fromTo.from,
+          to: fromTo.to,
+        });
+      },
+      updateDateRange: (min: number, max: number) => {
+        setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+      },
+    };
+
+    return (
+      <Switch>
+        <Route
+          path={`${hostsPagePath}/:tabName(${HostsTableType.hosts})`}
+          render={() => <HostsQueryTabBody {...tabProps} />}
+        />
+        <Route
+          path={`${hostsPagePath}/:tabName(${HostsTableType.authentications})`}
+          render={() => <AuthenticationsQueryTabBody {...tabProps} />}
+        />
+        <Route
+          path={`${hostsPagePath}/:tabName(${HostsTableType.uncommonProcesses})`}
+          render={() => <UncommonProcessQueryTabBody {...tabProps} />}
+        />
+        <Route
+          path={`${hostsPagePath}/:tabName(${HostsTableType.anomalies})`}
+          render={() => <AnomaliesQueryTabBody {...tabProps} />}
+        />
+        <Route
+          path={`${hostsPagePath}/:tabName(${HostsTableType.events})`}
+          render={() => <EventsQueryTabBody {...tabProps} />}
+        />
+      </Switch>
+    );
+  }
+);
+
+HostsTabs.displayName = 'HostsTabs';
+
+export { HostsTabs };
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx
index 840c65af8229e6..c8d450a62cc570 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx
@@ -7,23 +7,13 @@
 import React from 'react';
 import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom';
 
-import { HostDetailsBody, HostDetails } from './details';
-import {
-  HostsQueryTabBody,
-  AuthenticationsQueryTabBody,
-  UncommonProcessQueryTabBody,
-  AnomaliesQueryTabBody,
-  EventsQueryTabBody,
-} from './navigation';
-import { HostsBody } from './hosts_body';
+import { HostDetails } from './details';
 import { HostsTableType } from '../../store/hosts/model';
+
 import { GlobalTime } from '../../containers/global_time';
 import { SiemPageName } from '../home/types';
 import { Hosts } from './hosts';
-import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
-import { DEFAULT_TIMEZONE_BROWSER } from '../../../common/constants';
-
-const hostsPagePath = `/:pageName(${SiemPageName.hosts})`;
+import { hostsPagePath, hostDetailsPagePath } from './types';
 
 const getHostsTabPath = (pagePath: string) =>
   `${pagePath}/:tabName(` +
@@ -34,7 +24,7 @@ const getHostsTabPath = (pagePath: string) =>
   `${HostsTableType.events})`;
 
 const getHostDetailsTabPath = (pagePath: string) =>
-  `${pagePath}/:detailName/:tabName(` +
+  `${hostDetailsPagePath}/:tabName(` +
   `${HostsTableType.authentications}|` +
   `${HostsTableType.uncommonProcesses}|` +
   `${HostsTableType.anomalies}|` +
@@ -42,223 +32,58 @@ const getHostDetailsTabPath = (pagePath: string) =>
 
 type Props = Partial<RouteComponentProps<{}>> & { url: string };
 
-export const HostsContainer = React.memo<Props>(({ url }) => {
-  const [timezone] = useKibanaUiSetting(DEFAULT_TIMEZONE_BROWSER);
-  return (
-    <GlobalTime>
-      {({ to, from, setQuery, deleteQuery, isInitializing }) => (
-        <Switch>
-          <Route
-            strict
-            exact
-            path={hostsPagePath}
-            render={() => (
-              <Route
-                path={hostsPagePath}
-                render={() => (
-                  <>
-                    <Hosts
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                    />
-                    <HostsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      children={HostsQueryTabBody}
-                    />
-                  </>
-                )}
-              />
-            )}
-          />
-          <Route
-            strict
-            exact
-            path={getHostsTabPath(hostsPagePath)}
-            render={() => (
-              <>
-                <Hosts from={from} to={to} setQuery={setQuery} isInitializing={isInitializing} />
-                <Route
-                  path={`${hostsPagePath}/:tabName(${HostsTableType.hosts})`}
-                  render={() => (
-                    <HostsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      children={HostsQueryTabBody}
-                    />
-                  )}
-                />
-                <Route
-                  path={`${hostsPagePath}/:tabName(${HostsTableType.authentications})`}
-                  render={() => (
-                    <HostsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      children={AuthenticationsQueryTabBody}
-                    />
-                  )}
-                />
-                <Route
-                  path={`${hostsPagePath}/:tabName(${HostsTableType.uncommonProcesses})`}
-                  render={() => (
-                    <HostsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      children={UncommonProcessQueryTabBody}
-                    />
-                  )}
-                />
-                <Route
-                  path={`${hostsPagePath}/:tabName(${HostsTableType.anomalies})`}
-                  render={() => (
-                    <HostsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      children={AnomaliesQueryTabBody}
-                    />
-                  )}
-                />
-                <Route
-                  path={`${hostsPagePath}/:tabName(${HostsTableType.events})`}
-                  render={() => (
-                    <HostsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      timezone={timezone}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      children={EventsQueryTabBody}
-                    />
-                  )}
-                />
-              </>
-            )}
-          />
-          <Route
-            strict
-            exact
-            path={getHostDetailsTabPath(hostsPagePath)}
-            render={props => (
-              <>
-                <HostDetails
-                  from={from}
-                  to={to}
-                  setQuery={setQuery}
-                  isInitializing={isInitializing}
-                  detailName={props.match.params.detailName}
-                />
-                <Route
-                  path={`${hostsPagePath}/:detailName/:tabName(${HostsTableType.hosts})`}
-                  render={() => (
-                    <HostDetailsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      children={HostsQueryTabBody}
-                      detailName={props.match.params.detailName}
-                    />
-                  )}
-                />
-                <Route
-                  path={`${hostsPagePath}/:detailName/:tabName(${HostsTableType.authentications})`}
-                  render={() => (
-                    <HostDetailsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      detailName={props.match.params.detailName}
-                      children={AuthenticationsQueryTabBody}
-                    />
-                  )}
-                />
-                <Route
-                  path={`${hostsPagePath}/:detailName/:tabName(${HostsTableType.uncommonProcesses})`}
-                  render={() => (
-                    <HostDetailsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      detailName={props.match.params.detailName}
-                      children={UncommonProcessQueryTabBody}
-                    />
-                  )}
-                />
-                <Route
-                  path={`${hostsPagePath}/:detailName/:tabName(${HostsTableType.anomalies})`}
-                  render={() => (
-                    <HostDetailsBody
-                      deleteQuery={deleteQuery}
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      detailName={props.match.params.detailName}
-                      children={AnomaliesQueryTabBody}
-                    />
-                  )}
-                />
-                <Route
-                  path={`${hostsPagePath}/:detailName/:tabName(${HostsTableType.events})`}
-                  render={() => (
-                    <HostDetailsBody
-                      from={from}
-                      to={to}
-                      setQuery={setQuery}
-                      isInitializing={isInitializing}
-                      detailName={props.match.params.detailName}
-                      children={EventsQueryTabBody}
-                    />
-                  )}
-                />
-              </>
-            )}
-          />
-          <Route
-            path={`${url}/:detailName`}
-            render={({ location: { search = '' } }) => (
-              <Redirect
-                from={`${url}/:detailName`}
-                to={`${url}/:detailName/${HostsTableType.authentications}${search}`}
-              />
-            )}
-          />
-          <Route
-            path={`/${SiemPageName.hosts}/`}
-            render={({ location: { search = '' } }) => (
-              <Redirect
-                from={`/${SiemPageName.hosts}/"`}
-                to={`/${SiemPageName.hosts}/${HostsTableType.hosts}${search}`}
-              />
-            )}
-          />
-        </Switch>
-      )}
-    </GlobalTime>
-  );
-});
+export const HostsContainer = React.memo<Props>(({ url }) => (
+  <GlobalTime>
+    {({ to, from, setQuery, deleteQuery, isInitializing }) => (
+      <Switch>
+        <Route
+          strict
+          exact
+          path={getHostsTabPath(hostsPagePath)}
+          render={() => (
+            <Hosts
+              hostsPagePath={hostsPagePath}
+              from={from}
+              to={to}
+              setQuery={setQuery}
+              isInitializing={isInitializing}
+              deleteQuery={deleteQuery}
+            />
+          )}
+        />
+        <Route
+          strict
+          path={getHostDetailsTabPath(hostsPagePath)}
+          render={props => (
+            <HostDetails
+              hostDetailsPagePath={hostDetailsPagePath}
+              detailName={props.match.params.detailName}
+              from={from}
+              to={to}
+              setQuery={setQuery}
+              isInitializing={isInitializing}
+              deleteQuery={deleteQuery}
+            />
+          )}
+        />
+        <Route
+          path={hostDetailsPagePath}
+          render={({
+            match: {
+              params: { detailName },
+            },
+            location: { search = '' },
+          }) => <Redirect to={`${url}/${detailName}/${HostsTableType.authentications}${search}`} />}
+        />
+        <Route
+          path={`${hostsPagePath}/`}
+          render={({ location: { search = '' } }) => (
+            <Redirect to={`/${SiemPageName.hosts}/${HostsTableType.hosts}${search}`} />
+          )}
+        />
+      </Switch>
+    )}
+  </GlobalTime>
+));
 
 HostsContainer.displayName = 'HostsContainer';
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx
index baac539e14cfc1..7a0a25ef188422 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx
@@ -6,12 +6,17 @@
 
 import { getOr } from 'lodash/fp';
 import React from 'react';
+import { EuiSpacer } from '@elastic/eui';
 import { AuthenticationTable } from '../../../components/page/hosts/authentications_table';
 import { manageQuery } from '../../../components/page/manage_query';
+import { AuthenticationsOverTimeHistogram } from '../../../components/page/hosts/authentications_over_time';
+import { AuthenticationsOverTimeQuery } from '../../../containers/authentications/authentications_over_time';
 import { AuthenticationsQuery } from '../../../containers/authentications';
 import { HostsComponentsQueryProps } from './types';
+import { hostsModel } from '../../../store/hosts';
 
 const AuthenticationTableManage = manageQuery(AuthenticationTable);
+const AuthenticationsOverTimeManage = manageQuery(AuthenticationsOverTimeHistogram);
 
 export const AuthenticationsQueryTabBody = ({
   deleteQuery,
@@ -21,43 +26,69 @@ export const AuthenticationsQueryTabBody = ({
   setQuery,
   startDate,
   type,
+  updateDateRange = () => {},
 }: HostsComponentsQueryProps) => (
-  <AuthenticationsQuery
-    endDate={endDate}
-    filterQuery={filterQuery}
-    skip={skip}
-    sourceId="default"
-    startDate={startDate}
-    type={type}
-  >
-    {({
-      authentications,
-      totalCount,
-      loading,
-      pageInfo,
-      loadPage,
-      id,
-      inspect,
-      isInspected,
-      refetch,
-    }) => (
-      <AuthenticationTableManage
-        data={authentications}
-        deleteQuery={deleteQuery}
-        fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
-        id={id}
-        inspect={inspect}
-        isInspect={isInspected}
-        loading={loading}
-        loadPage={loadPage}
-        refetch={refetch}
-        showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
-        setQuery={setQuery}
-        totalCount={totalCount}
-        type={type}
-      />
-    )}
-  </AuthenticationsQuery>
+  <>
+    <AuthenticationsOverTimeQuery
+      endDate={endDate}
+      filterQuery={filterQuery}
+      sourceId="default"
+      startDate={startDate}
+      type={hostsModel.HostsType.page}
+    >
+      {({ authenticationsOverTime, loading, id, inspect, refetch, totalCount }) => (
+        <AuthenticationsOverTimeManage
+          data={authenticationsOverTime!}
+          endDate={endDate}
+          id={id}
+          inspect={inspect}
+          loading={loading}
+          refetch={refetch}
+          setQuery={setQuery}
+          startDate={startDate}
+          totalCount={totalCount}
+          updateDateRange={updateDateRange}
+        />
+      )}
+    </AuthenticationsOverTimeQuery>
+    <EuiSpacer size="l" />
+    <AuthenticationsQuery
+      endDate={endDate}
+      filterQuery={filterQuery}
+      skip={skip}
+      sourceId="default"
+      startDate={startDate}
+      type={type}
+    >
+      {({
+        authentications,
+        totalCount,
+        loading,
+        pageInfo,
+        loadPage,
+        id,
+        inspect,
+        isInspected,
+        refetch,
+      }) => (
+        <AuthenticationTableManage
+          data={authentications}
+          deleteQuery={deleteQuery}
+          fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
+          id={id}
+          inspect={inspect}
+          isInspect={isInspected}
+          loading={loading}
+          loadPage={loadPage}
+          refetch={refetch}
+          showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
+          setQuery={setQuery}
+          totalCount={totalCount}
+          type={type}
+        />
+      )}
+    </AuthenticationsQuery>
+  </>
 );
 
 AuthenticationsQueryTabBody.displayName = 'AuthenticationsQueryTabBody';
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/events_query_tab_body.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/events_query_tab_body.tsx
index 53bf73a1b9b7bd..808565cadfa461 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/events_query_tab_body.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/events_query_tab_body.tsx
@@ -21,7 +21,6 @@ export const EventsQueryTabBody = ({
   filterQuery,
   setQuery,
   startDate,
-  timezone,
   updateDateRange = () => {},
 }: HostsComponentsQueryProps) => {
   return (
@@ -31,7 +30,6 @@ export const EventsQueryTabBody = ({
         filterQuery={filterQuery}
         sourceId="default"
         startDate={startDate}
-        timezone={timezone}
         type={hostsModel.HostsType.page}
       >
         {({ eventsOverTime, loading, id, inspect, refetch, totalCount }) => (
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/types.ts b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/types.ts
index 552426602cdc51..d567038a05bd8d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/types.ts
@@ -29,7 +29,6 @@ interface QueryTabBodyProps {
   type: hostsModel.HostsType;
   startDate: number;
   endDate: number;
-  timezone?: string;
   filterQuery?: string | ESTermQuery;
 }
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/translations.ts b/x-pack/legacy/plugins/siem/public/pages/hosts/translations.ts
index e7f6c3abbd3b58..1c95cbed71a4a9 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/translations.ts
@@ -17,7 +17,7 @@ export const PAGE_TITLE = i18n.translate('xpack.siem.hosts.pageTitle', {
 export const NAVIGATION_ALL_HOSTS_TITLE = i18n.translate(
   'xpack.siem.hosts.navigation.allHostsTitle',
   {
-    defaultMessage: 'All Hosts',
+    defaultMessage: 'All hosts',
   }
 );
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/types.ts b/x-pack/legacy/plugins/siem/public/pages/hosts/types.ts
new file mode 100644
index 00000000000000..afc577244f7e0e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/types.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { StaticIndexPattern } from 'ui/index_patterns';
+import { ActionCreator } from 'typescript-fsa';
+import { Query, esFilters } from 'src/plugins/data/public';
+
+import { SiemPageName } from '../home/types';
+import { hostsModel } from '../../store';
+import { InputsModelId } from '../../store/inputs/constants';
+import { GlobalTimeArgs } from '../../containers/global_time';
+
+export const hostsPagePath = `/:pageName(${SiemPageName.hosts})`;
+export const hostDetailsPagePath = `${hostsPagePath}/:detailName`;
+
+export interface HostsComponentReduxProps {
+  query: Query;
+  filters: esFilters.Filter[];
+}
+
+export interface HostsComponentDispatchProps {
+  setAbsoluteRangeDatePicker: ActionCreator<{
+    id: InputsModelId;
+    from: number;
+    to: number;
+  }>;
+  hostsPagePath: string;
+}
+
+export type HostsTabsProps = HostsComponentDispatchProps &
+  HostsQueryProps & {
+    filterQuery: string;
+    type: hostsModel.HostsType;
+    indexPattern: StaticIndexPattern;
+  };
+
+export type HostsQueryProps = GlobalTimeArgs;
+
+export type HostsComponentProps = HostsComponentReduxProps &
+  HostsComponentDispatchProps &
+  HostsQueryProps;
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.tsx b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.tsx
index 824539cad8d523..0fd4e073ebd13c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.tsx
@@ -38,6 +38,7 @@ export { getBreadcrumbs } from './utils';
 import { TlsQueryTable } from './tls_query_table';
 import { UsersQueryTable } from './users_query_table';
 import { NetworkTopNFlowQueryTable } from './network_top_n_flow_query_table';
+import { NetworkHttpQueryTable } from './network_http_query_table';
 import { NetworkTopCountriesQueryTable } from './network_top_countries_query_table';
 import { useKibanaCore } from '../../../lib/compose/kibana_core';
 
@@ -221,6 +222,18 @@ export const IPDetailsComponent = React.memo<IPDetailsComponentProps>(
 
                 <EuiSpacer />
 
+                <NetworkHttpQueryTable
+                  endDate={to}
+                  filterQuery={filterQuery}
+                  ip={ip}
+                  skip={isInitializing}
+                  startDate={from}
+                  type={networkModel.NetworkType.details}
+                  setQuery={setQuery}
+                />
+
+                <EuiSpacer />
+
                 <TlsQueryTable
                   endDate={to}
                   filterQuery={filterQuery}
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/network_http_query_table.tsx b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/network_http_query_table.tsx
new file mode 100644
index 00000000000000..d071cc67414c9f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/network_http_query_table.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { getOr } from 'lodash/fp';
+import { manageQuery } from '../../../components/page/manage_query';
+import { OwnProps } from './types';
+import { NetworkHttpQuery } from '../../../containers/network_http';
+import { NetworkHttpTable } from '../../../components/page/network/network_http_table';
+
+const NetworkHttpTableManage = manageQuery(NetworkHttpTable);
+
+export const NetworkHttpQueryTable = ({
+  endDate,
+  filterQuery,
+  ip,
+  setQuery,
+  skip,
+  startDate,
+  type,
+}: OwnProps) => (
+  <NetworkHttpQuery
+    endDate={endDate}
+    filterQuery={filterQuery}
+    ip={ip}
+    skip={skip}
+    sourceId="default"
+    startDate={startDate}
+    type={type}
+  >
+    {({
+      id,
+      inspect,
+      isInspected,
+      loading,
+      loadPage,
+      networkHttp,
+      pageInfo,
+      refetch,
+      totalCount,
+    }) => (
+      <NetworkHttpTableManage
+        data={networkHttp}
+        fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
+        id={id}
+        inspect={inspect}
+        isInspect={isInspected}
+        loading={loading}
+        loadPage={loadPage}
+        refetch={refetch}
+        setQuery={setQuery}
+        showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
+        totalCount={totalCount}
+        type={type}
+      />
+    )}
+  </NetworkHttpQuery>
+);
+
+NetworkHttpQueryTable.displayName = 'NetworkHttpQueryTable';
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/types.ts b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/types.ts
index 008409197f77d4..e0029d8d219ebf 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/types.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { StaticIndexPattern } from 'ui/index_patterns';
 import { ActionCreator } from 'typescript-fsa';
-import { Query } from 'src/plugins/data/common';
+import { Query, esFilters } from 'src/plugins/data/public';
 
 import { NetworkType } from '../../../store/network/model';
 import { ESTermQuery } from '../../../../common/typed_json';
@@ -25,7 +24,7 @@ type SetAbsoluteRangeDatePicker = ActionCreator<{
 }>;
 
 interface IPDetailsComponentReduxProps {
-  filters: Filter[];
+  filters: esFilters.Filter[];
   flowTarget: FlowTarget;
   query: Query;
 }
@@ -39,7 +38,7 @@ export type IPDetailsComponentProps = IPDetailsComponentReduxProps &
   IPDetailsComponentDispatchProps &
   GlobalTimeArgs & { detailName: string };
 
-interface OwnProps {
+export interface OwnProps {
   type: NetworkType;
   startDate: number;
   endDate: number;
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/navigation/http_query_tab_body.tsx b/x-pack/legacy/plugins/siem/public/pages/network/navigation/http_query_tab_body.tsx
new file mode 100644
index 00000000000000..a20a212623fb84
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/network/navigation/http_query_tab_body.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { getOr } from 'lodash/fp';
+
+import { NetworkHttpTable } from '../../../components/page/network';
+import { NetworkHttpQuery } from '../../../containers/network_http';
+import { networkModel } from '../../../store';
+import { manageQuery } from '../../../components/page/manage_query';
+
+import { HttpQueryTabBodyProps } from './types';
+
+const NetworkHttpTableManage = manageQuery(NetworkHttpTable);
+
+export const HttpQueryTabBody = ({
+  to,
+  filterQuery,
+  isInitializing,
+  from,
+  setQuery,
+}: HttpQueryTabBodyProps) => (
+  <NetworkHttpQuery
+    endDate={to}
+    filterQuery={filterQuery}
+    skip={isInitializing}
+    sourceId="default"
+    startDate={from}
+    type={networkModel.NetworkType.page}
+  >
+    {({
+      id,
+      inspect,
+      isInspected,
+      loading,
+      loadPage,
+      networkHttp,
+      pageInfo,
+      refetch,
+      totalCount,
+    }) => (
+      <NetworkHttpTableManage
+        data={networkHttp}
+        fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
+        id={id}
+        inspect={inspect}
+        isInspect={isInspected}
+        loading={loading}
+        loadPage={loadPage}
+        refetch={refetch}
+        setQuery={setQuery}
+        showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
+        totalCount={totalCount}
+        type={networkModel.NetworkType.page}
+      />
+    )}
+  </NetworkHttpQuery>
+);
+
+HttpQueryTabBody.displayName = 'HttpQueryTabBody';
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/navigation/nav_tabs.tsx b/x-pack/legacy/plugins/siem/public/pages/network/navigation/nav_tabs.tsx
index ef097373b3ae7d..fbf137df398729 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/navigation/nav_tabs.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/navigation/nav_tabs.tsx
@@ -26,6 +26,13 @@ export const navTabsNetwork = (hasMlUserPermissions: boolean): NetworkNavTab =>
       disabled: false,
       urlKey: 'network',
     },
+    [NetworkRouteType.http]: {
+      id: NetworkRouteType.http,
+      name: i18n.NAVIGATION_HTTP_TITLE,
+      href: getTabsOnNetworkUrl(NetworkRouteType.http),
+      disabled: false,
+      urlKey: 'network',
+    },
     [NetworkRouteType.tls]: {
       id: NetworkRouteType.tls,
       name: i18n.NAVIGATION_TLS_TITLE,
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/navigation/network_routes.tsx b/x-pack/legacy/plugins/siem/public/pages/network/navigation/network_routes.tsx
index fff9b1e7a09680..955670b4b098d0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/navigation/network_routes.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/navigation/network_routes.tsx
@@ -13,6 +13,7 @@ import { scoreIntervalToDateTime } from '../../../components/ml/score/score_inte
 
 import { IPsQueryTabBody } from './ips_query_tab_body';
 import { CountriesQueryTabBody } from './countries_query_tab_body';
+import { HttpQueryTabBody } from './http_query_tab_body';
 import { AnomaliesQueryTabBody } from './anomalies_query_tab_body';
 import { DnsQueryTabBody } from './dns_query_tab_body';
 import { ConditionalFlexGroup } from './conditional_flex_group';
@@ -96,6 +97,10 @@ export const NetworkRoutes = ({
           </>
         )}
       />
+      <Route
+        path={`${networkPagePath}/:tabName(${NetworkRouteType.http})`}
+        render={() => <HttpQueryTabBody {...tabProps} />}
+      />
       <Route
         path={`${networkPagePath}/:tabName(${NetworkRouteType.tls})`}
         render={() => <TlsQueryTabBody {...tabProps} flowTarget={FlowTargetSourceDest.source} />}
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/navigation/types.ts b/x-pack/legacy/plugins/siem/public/pages/network/navigation/types.ts
index a3639da3cc1329..9682495b6f66a6 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/navigation/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/network/navigation/types.ts
@@ -34,6 +34,10 @@ export type TlsQueryTabBodyProps = QueryTabBodyProps &
     ip?: string;
   };
 
+export type HttpQueryTabBodyProps = QueryTabBodyProps &
+  GlobalTimeArgs & {
+    ip?: string;
+  };
 export type AnomaliesQueryTabBodyProps = QueryTabBodyProps &
   Pick<GlobalTimeArgs, 'to' | 'from' | 'isInitializing'> & {
     narrowDateRange: NarrowDateRange;
@@ -63,6 +67,7 @@ export enum NetworkRouteType {
   dns = 'dns',
   anomalies = 'anomalies',
   tls = 'tls',
+  http = 'http',
 }
 
 export type GetNetworkRoutePath = (
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/navigation/utils.ts b/x-pack/legacy/plugins/siem/public/pages/network/navigation/utils.ts
index a1cb9d61b9c479..059949bf518373 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/navigation/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/network/navigation/utils.ts
@@ -12,7 +12,7 @@ export const getNetworkRoutePath: GetNetworkRoutePath = (
   hasMlUserPermission
 ) => {
   if (capabilitiesFetched && !hasMlUserPermission) {
-    return `${pagePath}/:tabName(${NetworkRouteType.flows}|${NetworkRouteType.dns}|${NetworkRouteType.tls})`;
+    return `${pagePath}/:tabName(${NetworkRouteType.flows}|${NetworkRouteType.dns}|${NetworkRouteType.http}|${NetworkRouteType.tls})`;
   }
 
   return (
@@ -20,6 +20,7 @@ export const getNetworkRoutePath: GetNetworkRoutePath = (
     `${NetworkRouteType.flows}|` +
     `${NetworkRouteType.dns}|` +
     `${NetworkRouteType.anomalies}|` +
+    `${NetworkRouteType.http}|` +
     `${NetworkRouteType.tls})`
   );
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/network.tsx b/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
index b10c09d65426be..f7b3cfb4962fcf 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
@@ -14,9 +14,9 @@ import { EmbeddedMap } from '../../components/embeddables/embedded_map';
 import { FiltersGlobal } from '../../components/filters_global';
 import { HeaderPage } from '../../components/header_page';
 import { LastEventTime } from '../../components/last_event_time';
+import { SiemNavigation } from '../../components/navigation';
 import { manageQuery } from '../../components/page/manage_query';
 import { KpiNetworkComponent } from '../../components/page/network';
-import { SiemNavigation } from '../../components/navigation';
 import { SiemSearchBar } from '../../components/search_bar';
 import { KpiNetworkQuery } from '../../containers/kpi_network';
 import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source';
@@ -26,7 +26,6 @@ import { convertToBuildEsQuery } from '../../lib/keury';
 import { networkModel, State, inputsSelectors } from '../../store';
 import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions';
 import { SpyRoute } from '../../utils/route/spy_routes';
-
 import { navTabsNetwork, NetworkRoutes, NetworkRoutesLoading } from './navigation';
 import { NetworkEmptyPage } from './network_empty_page';
 import * as i18n from './translations';
@@ -78,6 +77,8 @@ const NetworkComponent = React.memo<NetworkComponentProps>(
                   setQuery={setQuery}
                 />
 
+                <EuiSpacer />
+
                 <KpiNetworkQuery
                   endDate={to}
                   filterQuery={filterQuery}
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/translations.ts b/x-pack/legacy/plugins/siem/public/pages/network/translations.ts
index 25c117319248ab..be222bf5f2531f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/network/translations.ts
@@ -39,6 +39,10 @@ export const NAVIGATION_TLS_TITLE = i18n.translate('xpack.siem.network.navigatio
   defaultMessage: 'TLS',
 });
 
+export const NAVIGATION_HTTP_TITLE = i18n.translate('xpack.siem.network.navigation.httpTitle', {
+  defaultMessage: 'HTTP',
+});
+
 export const NAVIGATION_ANOMALIES_TITLE = i18n.translate(
   'xpack.siem.network.navigation.anomaliesTitle',
   {
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/types.ts b/x-pack/legacy/plugins/siem/public/pages/network/types.ts
index 46c868729b8328..e440d0c27e4676 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/network/types.ts
@@ -4,10 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { RouteComponentProps } from 'react-router-dom';
 import { ActionCreator } from 'typescript-fsa';
-import { Query } from 'src/plugins/data/common';
+import { Query, esFilters } from 'src/plugins/data/common';
 
 import { GlobalTimeArgs } from '../../containers/global_time';
 import { InputsModelId } from '../../store/inputs/constants';
@@ -19,7 +18,7 @@ export type SetAbsoluteRangeDatePicker = ActionCreator<{
 }>;
 
 interface NetworkComponentReduxProps {
-  filters: Filter[];
+  filters: esFilters.Filter[];
   query: Query;
   setAbsoluteRangeDatePicker: SetAbsoluteRangeDatePicker;
 }
diff --git a/x-pack/legacy/plugins/siem/public/store/app/selectors.ts b/x-pack/legacy/plugins/siem/public/store/app/selectors.ts
index cc006b216da8e8..9037583d278a7a 100644
--- a/x-pack/legacy/plugins/siem/public/store/app/selectors.ts
+++ b/x-pack/legacy/plugins/siem/public/store/app/selectors.ts
@@ -17,14 +17,15 @@ const selectNotesById = (state: State): NotesById => state.app.notesById;
 
 const getErrors = (state: State): ErrorModel => state.app.errors;
 
-const getNotes = (notesById: NotesById, noteIds: string[]) =>
+export const getNotes = memoizeOne((notesById: NotesById, noteIds: string[]): Note[] =>
   keys(notesById).reduce((acc: Note[], noteId: string) => {
     if (noteIds.includes(noteId)) {
       const note: Note = notesById[noteId];
       return [...acc, note];
     }
     return acc;
-  }, []);
+  }, [])
+);
 
 export const selectNotesByIdSelector = createSelector(
   selectNotesById,
@@ -34,8 +35,7 @@ export const selectNotesByIdSelector = createSelector(
 export const notesByIdsSelector = () =>
   createSelector(
     selectNotesById,
-    (notesById: NotesById) =>
-      memoizeOne((noteIds: string[]): Note[] => getNotes(notesById, noteIds))
+    (notesById: NotesById) => notesById
   );
 
 export const errorsSelector = () =>
diff --git a/x-pack/legacy/plugins/siem/public/store/inputs/actions.ts b/x-pack/legacy/plugins/siem/public/store/inputs/actions.ts
index 598b2854b96ebd..aefcd2ea8c696c 100644
--- a/x-pack/legacy/plugins/siem/public/store/inputs/actions.ts
+++ b/x-pack/legacy/plugins/siem/public/store/inputs/actions.ts
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import actionCreatorFactory from 'typescript-fsa';
 
 import { SavedQuery } from 'src/legacy/core_plugins/data/public';
 import { InspectQuery, Refetch } from './model';
 import { InputsModelId } from './constants';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 const actionCreator = actionCreatorFactory('x-pack/siem/local/inputs');
 
@@ -83,5 +83,5 @@ export const setSavedQuery = actionCreator<{
 
 export const setSearchBarFilter = actionCreator<{
   id: InputsModelId;
-  filters: Filter[];
+  filters: esFilters.Filter[];
 }>('SET_SEARCH_BAR_FILTER');
diff --git a/x-pack/legacy/plugins/siem/public/store/inputs/model.ts b/x-pack/legacy/plugins/siem/public/store/inputs/model.ts
index a98ea1f5d08121..01cf386311d77f 100644
--- a/x-pack/legacy/plugins/siem/public/store/inputs/model.ts
+++ b/x-pack/legacy/plugins/siem/public/store/inputs/model.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Filter } from '@kbn/es-query';
 import { Dispatch } from 'redux';
 import { Query } from 'src/plugins/data/common/query';
 import { SavedQuery } from 'src/legacy/core_plugins/data/public';
 import { Omit } from '../../../common/utility_types';
 import { InputsModelId } from './constants';
 import { CONSTANTS } from '../../components/url_state/constants';
+import { esFilters } from '../../../../../../../src/plugins/data/public';
 
 export interface AbsoluteTimeRange {
   kind: 'absolute';
@@ -84,7 +84,7 @@ export interface InputsRange {
   queries: GlobalQuery[];
   linkTo: InputsModelId[];
   query: Query;
-  filters: Filter[];
+  filters: esFilters.Filter[];
   savedQuery?: SavedQuery;
 }
 
diff --git a/x-pack/legacy/plugins/siem/public/store/network/helpers.test.ts b/x-pack/legacy/plugins/siem/public/store/network/helpers.test.ts
index eb6a5c0c5c631e..a15e187b95e605 100644
--- a/x-pack/legacy/plugins/siem/public/store/network/helpers.test.ts
+++ b/x-pack/legacy/plugins/siem/public/store/network/helpers.test.ts
@@ -6,11 +6,11 @@
 
 import {
   Direction,
-  NetworkTopTablesFields,
+  FlowTarget,
   NetworkDnsFields,
+  NetworkTopTablesFields,
   TlsFields,
   UsersFields,
-  FlowTarget,
 } from '../../graphql/types';
 import { DEFAULT_TABLE_LIMIT } from '../constants';
 import { NetworkModel, NetworkTableType, IpDetailsTableType, NetworkType } from './model';
@@ -68,6 +68,11 @@ export const mockNetworkState: NetworkModel = {
           direction: Direction.desc,
         },
       },
+      [NetworkTableType.http]: {
+        activePage: 0,
+        limit: DEFAULT_TABLE_LIMIT,
+        sort: { direction: Direction.desc },
+      },
     },
   },
   details: {
@@ -120,6 +125,11 @@ export const mockNetworkState: NetworkModel = {
           direction: Direction.asc,
         },
       },
+      [IpDetailsTableType.http]: {
+        activePage: 0,
+        limit: DEFAULT_TABLE_LIMIT,
+        sort: { direction: Direction.desc },
+      },
     },
     flowTarget: FlowTarget.source,
   },
@@ -145,6 +155,13 @@ describe('Network redux store', () => {
           sort: { field: 'uniqueDomains', direction: 'desc' },
           isPtrIncluded: false,
         },
+        [NetworkTableType.http]: {
+          activePage: 0,
+          limit: 10,
+          sort: {
+            direction: 'desc',
+          },
+        },
         [NetworkTableType.tls]: {
           activePage: 0,
           limit: 10,
@@ -200,6 +217,13 @@ describe('Network redux store', () => {
             field: 'bytes_out',
           },
         },
+        [IpDetailsTableType.http]: {
+          activePage: 0,
+          limit: 10,
+          sort: {
+            direction: 'desc',
+          },
+        },
         [IpDetailsTableType.tls]: {
           activePage: 0,
           limit: 10,
diff --git a/x-pack/legacy/plugins/siem/public/store/network/helpers.ts b/x-pack/legacy/plugins/siem/public/store/network/helpers.ts
index c438fb6b492cea..0b3a5e65346b8f 100644
--- a/x-pack/legacy/plugins/siem/public/store/network/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/store/network/helpers.ts
@@ -40,6 +40,10 @@ export const setNetworkPageQueriesActivePageToZero = (state: NetworkModel): Netw
     ...state.page.queries[NetworkTableType.tls],
     activePage: DEFAULT_TABLE_ACTIVE_PAGE,
   },
+  [NetworkTableType.http]: {
+    ...state.page.queries[NetworkTableType.http],
+    activePage: DEFAULT_TABLE_ACTIVE_PAGE,
+  },
 });
 
 export const setNetworkDetailsQueriesActivePageToZero = (
@@ -70,6 +74,10 @@ export const setNetworkDetailsQueriesActivePageToZero = (
     ...state.details.queries[IpDetailsTableType.users],
     activePage: DEFAULT_TABLE_ACTIVE_PAGE,
   },
+  [IpDetailsTableType.http]: {
+    ...state.details.queries[IpDetailsTableType.http],
+    activePage: DEFAULT_TABLE_ACTIVE_PAGE,
+  },
 });
 
 export const setNetworkQueriesActivePageToZero = (
diff --git a/x-pack/legacy/plugins/siem/public/store/network/model.ts b/x-pack/legacy/plugins/siem/public/store/network/model.ts
index 1f82aa8a5319d3..45c49d65988811 100644
--- a/x-pack/legacy/plugins/siem/public/store/network/model.ts
+++ b/x-pack/legacy/plugins/siem/public/store/network/model.ts
@@ -7,6 +7,7 @@
 import {
   FlowTarget,
   NetworkDnsSortField,
+  NetworkHttpSortField,
   NetworkTopTablesSortField,
   TlsSortField,
   UsersSortField,
@@ -19,6 +20,7 @@ export enum NetworkType {
 
 export enum NetworkTableType {
   dns = 'dns',
+  http = 'http',
   topCountriesDestination = 'topCountriesDestination',
   topCountriesSource = 'topCountriesSource',
   topNFlowDestination = 'topNFlowDestination',
@@ -40,7 +42,10 @@ export type TopCountriesTableType =
 
 export type TopTlsTableType = IpDetailsTableType.tls | NetworkTableType.tls;
 
+export type HttpTableType = IpDetailsTableType.http | NetworkTableType.http;
+
 export enum IpDetailsTableType {
+  http = 'http',
   tls = 'tls',
   topCountriesDestination = 'topCountriesDestination',
   topCountriesSource = 'topCountriesSource',
@@ -74,15 +79,25 @@ export interface TlsQuery extends BasicQueryPaginated {
   sort: TlsSortField;
 }
 
+export interface HttpQuery extends BasicQueryPaginated {
+  sort: NetworkHttpSortField;
+}
+
 export interface TableUpdates {
   activePage?: number;
   limit?: number;
   isPtrIncluded?: boolean;
-  sort?: NetworkDnsSortField | NetworkTopTablesSortField | TlsSortField | UsersSortField;
+  sort?:
+    | NetworkDnsSortField
+    | NetworkHttpSortField
+    | NetworkTopTablesSortField
+    | TlsSortField
+    | UsersSortField;
 }
 
 export interface NetworkQueries {
   [NetworkTableType.dns]: DnsQuery;
+  [NetworkTableType.http]: HttpQuery;
   [NetworkTableType.topCountriesDestination]: TopCountriesQuery;
   [NetworkTableType.topCountriesSource]: TopCountriesQuery;
   [NetworkTableType.topNFlowDestination]: TopNFlowQuery;
@@ -99,6 +114,7 @@ export interface UsersQuery extends BasicQueryPaginated {
 }
 
 export interface IpOverviewQueries {
+  [IpDetailsTableType.http]: HttpQuery;
   [IpDetailsTableType.tls]: TlsQuery;
   [IpDetailsTableType.topCountriesDestination]: TopCountriesQuery;
   [IpDetailsTableType.topCountriesSource]: TopCountriesQuery;
diff --git a/x-pack/legacy/plugins/siem/public/store/network/reducer.ts b/x-pack/legacy/plugins/siem/public/store/network/reducer.ts
index b2192a92fdf1c2..373bedb63c3e79 100644
--- a/x-pack/legacy/plugins/siem/public/store/network/reducer.ts
+++ b/x-pack/legacy/plugins/siem/public/store/network/reducer.ts
@@ -45,7 +45,7 @@ export const initialNetworkState: NetworkState = {
         activePage: DEFAULT_TABLE_ACTIVE_PAGE,
         limit: DEFAULT_TABLE_LIMIT,
         sort: {
-          field: NetworkTopTablesFields.bytes_out,
+          field: NetworkTopTablesFields.bytes_in,
           direction: Direction.desc,
         },
       },
@@ -58,6 +58,13 @@ export const initialNetworkState: NetworkState = {
         },
         isPtrIncluded: false,
       },
+      [NetworkTableType.http]: {
+        activePage: DEFAULT_TABLE_ACTIVE_PAGE,
+        limit: DEFAULT_TABLE_LIMIT,
+        sort: {
+          direction: Direction.desc,
+        },
+      },
       [NetworkTableType.tls]: {
         activePage: DEFAULT_TABLE_ACTIVE_PAGE,
         limit: DEFAULT_TABLE_LIMIT,
@@ -78,7 +85,7 @@ export const initialNetworkState: NetworkState = {
         activePage: DEFAULT_TABLE_ACTIVE_PAGE,
         limit: DEFAULT_TABLE_LIMIT,
         sort: {
-          field: NetworkTopTablesFields.bytes_out,
+          field: NetworkTopTablesFields.bytes_in,
           direction: Direction.desc,
         },
       },
@@ -86,6 +93,13 @@ export const initialNetworkState: NetworkState = {
   },
   details: {
     queries: {
+      [IpDetailsTableType.http]: {
+        activePage: DEFAULT_TABLE_ACTIVE_PAGE,
+        limit: DEFAULT_TABLE_LIMIT,
+        sort: {
+          direction: Direction.desc,
+        },
+      },
       [IpDetailsTableType.topCountriesSource]: {
         activePage: DEFAULT_TABLE_ACTIVE_PAGE,
         limit: DEFAULT_TABLE_LIMIT,
@@ -98,7 +112,7 @@ export const initialNetworkState: NetworkState = {
         activePage: DEFAULT_TABLE_ACTIVE_PAGE,
         limit: DEFAULT_TABLE_LIMIT,
         sort: {
-          field: NetworkTopTablesFields.bytes_out,
+          field: NetworkTopTablesFields.bytes_in,
           direction: Direction.desc,
         },
       },
@@ -114,7 +128,7 @@ export const initialNetworkState: NetworkState = {
         activePage: DEFAULT_TABLE_ACTIVE_PAGE,
         limit: DEFAULT_TABLE_LIMIT,
         sort: {
-          field: NetworkTopTablesFields.bytes_out,
+          field: NetworkTopTablesFields.bytes_in,
           direction: Direction.desc,
         },
       },
diff --git a/x-pack/legacy/plugins/siem/public/store/network/selectors.ts b/x-pack/legacy/plugins/siem/public/store/network/selectors.ts
index 04cf8f0ea464c4..cf57c0d07c43e0 100644
--- a/x-pack/legacy/plugins/siem/public/store/network/selectors.ts
+++ b/x-pack/legacy/plugins/siem/public/store/network/selectors.ts
@@ -84,6 +84,21 @@ export const topCountriesSelector = () =>
     topCountriesQueries => topCountriesQueries
   );
 
+const selectHttpByType = (state: State, networkType: NetworkType) => {
+  const httpType =
+    networkType === NetworkType.page ? NetworkTableType.http : IpDetailsTableType.http;
+  return (
+    get([networkType, 'queries', httpType], state.network) ||
+    get([networkType, 'queries', httpType], initialNetworkState)
+  );
+};
+
+export const httpSelector = () =>
+  createSelector(
+    selectHttpByType,
+    httpQueries => httpQueries
+  );
+
 // IP Details Selectors
 export const ipDetailsFlowTargetSelector = () =>
   createSelector(
diff --git a/x-pack/legacy/plugins/siem/public/store/timeline/epic_note.ts b/x-pack/legacy/plugins/siem/public/store/timeline/epic_note.ts
index 1c9493ceba9c3d..e5a712fe2c666f 100644
--- a/x-pack/legacy/plugins/siem/public/store/timeline/epic_note.ts
+++ b/x-pack/legacy/plugins/siem/public/store/timeline/epic_note.ts
@@ -127,9 +127,8 @@ export const epicPersistNote = (
 
 export const createTimelineNoteEpic = <State>(): Epic<Action, Action, State> => action$ =>
   action$.pipe(
-    withLatestFrom(),
-    filter(([action]) => timelineNoteActionsType.includes(action.type)),
-    switchMap(([action]) => {
+    filter(action => timelineNoteActionsType.includes(action.type)),
+    switchMap(action => {
       dispatcherTimelinePersistQueue.next({ action });
       return empty();
     })
diff --git a/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_signals.js b/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_signals.js
index 78281efa09e52d..9b2a38e372ae3c 100644
--- a/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_signals.js
+++ b/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_signals.js
@@ -28,10 +28,10 @@ const path = require('path');
 // this type of information. You usually will want to make any hand edits after
 // doing a search to KQL conversion before posting it as a signal or checking it
 // into another repository.
-const INTERVAL = '24h';
+const INTERVAL = '5m';
 const SEVERITY = 'low';
-const TYPE = 'kql';
-const FROM = 'now-24h';
+const TYPE = 'query';
+const FROM = 'now-6m';
 const TO = 'now';
 const INDEX = ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'];
 
@@ -70,43 +70,74 @@ async function main() {
   const files = process.argv[2];
   const outputDir = process.argv[3];
 
-  const savedSearchesJson = walk(files).filter(file => file.endsWith('.ndjson'));
+  const savedSearchesJson = walk(files).filter(file => {
+    return !path.basename(file).startsWith('.') && file.endsWith('.ndjson');
+  });
 
   const savedSearchesParsed = savedSearchesJson.reduce((accum, json) => {
     const jsonFile = fs.readFileSync(json, 'utf8');
-    try {
-      const parsedFile = JSON.parse(jsonFile);
-      parsedFile._file = json;
-      parsedFile.attributes.kibanaSavedObjectMeta.searchSourceJSON = JSON.parse(
-        parsedFile.attributes.kibanaSavedObjectMeta.searchSourceJSON
-      );
-      return [...accum, parsedFile];
-    } catch (err) {
-      return accum;
-    }
+    const jsonLines = jsonFile.split(/\r{0,1}\n/);
+    const parsedLines = jsonLines.reduce((accum, line, index) => {
+      try {
+        const parsedLine = JSON.parse(line);
+        if (index !== 0) {
+          parsedLine._file = `${json.substring(0, json.length - '.ndjson'.length)}_${String(
+            index
+          )}.ndjson`;
+        } else {
+          parsedLine._file = json;
+        }
+        parsedLine.attributes.kibanaSavedObjectMeta.searchSourceJSON = JSON.parse(
+          parsedLine.attributes.kibanaSavedObjectMeta.searchSourceJSON
+        );
+        return [...accum, parsedLine];
+      } catch (err) {
+        console.log('error parsing a line in this file:', json);
+        return accum;
+      }
+    }, []);
+    return [...accum, ...parsedLines];
   }, []);
 
-  savedSearchesParsed.forEach(savedSearch => {
-    const fileToWrite = cleanupFileName(savedSearch._file);
+  savedSearchesParsed.forEach(
+    ({
+      _file,
+      attributes: {
+        description,
+        title,
+        kibanaSavedObjectMeta: {
+          searchSourceJSON: {
+            query: { query, language },
+            filter,
+          },
+        },
+      },
+    }) => {
+      const fileToWrite = cleanupFileName(_file);
 
-    const query = savedSearch.attributes.kibanaSavedObjectMeta.searchSourceJSON.query.query;
-    if (query != null && query.trim() !== '') {
-      const outputMessage = {
-        id: fileToWrite,
-        description: savedSearch.attributes.description || savedSearch.attributes.title,
-        index: INDEX,
-        interval: INTERVAL,
-        name: savedSearch.attributes.title,
-        severity: SEVERITY,
-        type: TYPE,
-        from: FROM,
-        to: TO,
-        kql: savedSearch.attributes.kibanaSavedObjectMeta.searchSourceJSON.query.query,
-      };
+      if (query != null && query.trim() !== '') {
+        const outputMessage = {
+          id: fileToWrite,
+          description: description || title,
+          index: INDEX,
+          interval: INTERVAL,
+          name: title,
+          severity: SEVERITY,
+          type: TYPE,
+          from: FROM,
+          to: TO,
+          query,
+          language,
+          filters: filter,
+        };
 
-      fs.writeFileSync(`${outputDir}/${fileToWrite}.json`, JSON.stringify(outputMessage, null, 2));
+        fs.writeFileSync(
+          `${outputDir}/${fileToWrite}.json`,
+          JSON.stringify(outputMessage, null, 2)
+        );
+      }
     }
-  });
+  );
 }
 
 if (require.main === module) {
diff --git a/x-pack/legacy/plugins/siem/server/graphql/authentications/resolvers.ts b/x-pack/legacy/plugins/siem/server/graphql/authentications/resolvers.ts
index b66ccd9a111b70..aaa66215e98f4b 100644
--- a/x-pack/legacy/plugins/siem/server/graphql/authentications/resolvers.ts
+++ b/x-pack/legacy/plugins/siem/server/graphql/authentications/resolvers.ts
@@ -7,7 +7,7 @@
 import { SourceResolvers } from '../../graphql/types';
 import { Authentications } from '../../lib/authentications';
 import { AppResolverOf, ChildResolverOf } from '../../lib/framework';
-import { createOptionsPaginated } from '../../utils/build_query/create_options';
+import { createOptionsPaginated, createOptions } from '../../utils/build_query/create_options';
 import { QuerySourceResolver } from '../sources/resolvers';
 
 type QueryAuthenticationsResolver = ChildResolverOf<
@@ -15,6 +15,11 @@ type QueryAuthenticationsResolver = ChildResolverOf<
   QuerySourceResolver
 >;
 
+type QueryAuthenticationsOverTimeResolver = ChildResolverOf<
+  AppResolverOf<SourceResolvers.AuthenticationsOverTimeResolver>,
+  QuerySourceResolver
+>;
+
 export interface AuthenticationsResolversDeps {
   authentications: Authentications;
 }
@@ -24,6 +29,7 @@ export const createAuthenticationsResolvers = (
 ): {
   Source: {
     Authentications: QueryAuthenticationsResolver;
+    AuthenticationsOverTime: QueryAuthenticationsOverTimeResolver;
   };
 } => ({
   Source: {
@@ -31,5 +37,12 @@ export const createAuthenticationsResolvers = (
       const options = createOptionsPaginated(source, args, info);
       return libs.authentications.getAuthentications(req, options);
     },
+    async AuthenticationsOverTime(source, args, { req }, info) {
+      const options = {
+        ...createOptions(source, args, info),
+        defaultIndex: args.defaultIndex,
+      };
+      return libs.authentications.getAuthenticationsOverTime(req, options);
+    },
   },
 });
diff --git a/x-pack/legacy/plugins/siem/server/graphql/authentications/schema.gql.ts b/x-pack/legacy/plugins/siem/server/graphql/authentications/schema.gql.ts
index 20935ce9ed03fc..5a65ef5d678ce4 100644
--- a/x-pack/legacy/plugins/siem/server/graphql/authentications/schema.gql.ts
+++ b/x-pack/legacy/plugins/siem/server/graphql/authentications/schema.gql.ts
@@ -34,6 +34,12 @@ export const authenticationsSchema = gql`
     inspect: Inspect
   }
 
+  type AuthenticationsOverTimeData {
+    inspect: Inspect
+    authenticationsOverTime: [MatrixOverTimeHistogramData!]!
+    totalCount: Float!
+  }
+
   extend type Source {
     "Gets Authentication success and failures based on a timerange"
     Authentications(
@@ -42,5 +48,10 @@ export const authenticationsSchema = gql`
       filterQuery: String
       defaultIndex: [String!]!
     ): AuthenticationsData!
+    AuthenticationsOverTime(
+      timerange: TimerangeInput!
+      filterQuery: String
+      defaultIndex: [String!]!
+    ): AuthenticationsOverTimeData!
   }
 `;
diff --git a/x-pack/legacy/plugins/siem/server/graphql/network/resolvers.ts b/x-pack/legacy/plugins/siem/server/graphql/network/resolvers.ts
index 7ce88ba4880be1..db15babc42a722 100644
--- a/x-pack/legacy/plugins/siem/server/graphql/network/resolvers.ts
+++ b/x-pack/legacy/plugins/siem/server/graphql/network/resolvers.ts
@@ -20,6 +20,11 @@ type QueryNetworkTopNFlowResolver = ChildResolverOf<
   QuerySourceResolver
 >;
 
+type QueryNetworkHttpResolver = ChildResolverOf<
+  AppResolverOf<SourceResolvers.NetworkHttpResolver>,
+  QuerySourceResolver
+>;
+
 type QueryDnsResolver = ChildResolverOf<
   AppResolverOf<SourceResolvers.NetworkDnsResolver>,
   QuerySourceResolver
@@ -33,6 +38,7 @@ export const createNetworkResolvers = (
   libs: NetworkResolversDeps
 ): {
   Source: {
+    NetworkHttp: QueryNetworkHttpResolver;
     NetworkTopCountries: QueryNetworkTopCountriesResolver;
     NetworkTopNFlow: QueryNetworkTopNFlowResolver;
     NetworkDns: QueryDnsResolver;
@@ -57,6 +63,14 @@ export const createNetworkResolvers = (
       };
       return libs.network.getNetworkTopNFlow(req, options);
     },
+    async NetworkHttp(source, args, { req }, info) {
+      const options = {
+        ...createOptionsPaginated(source, args, info),
+        networkHttpSort: args.sort,
+        ip: args.ip,
+      };
+      return libs.network.getNetworkHttp(req, options);
+    },
     async NetworkDns(source, args, { req }, info) {
       const options = {
         ...createOptionsPaginated(source, args, info),
diff --git a/x-pack/legacy/plugins/siem/server/graphql/network/schema.gql.ts b/x-pack/legacy/plugins/siem/server/graphql/network/schema.gql.ts
index 36b57ec9368abf..84f8d004198e93 100644
--- a/x-pack/legacy/plugins/siem/server/graphql/network/schema.gql.ts
+++ b/x-pack/legacy/plugins/siem/server/graphql/network/schema.gql.ts
@@ -152,6 +152,43 @@ export const networkSchema = gql`
     inspect: Inspect
   }
 
+  enum NetworkHttpFields {
+    domains
+    lastHost
+    lastSourceIp
+    methods
+    path
+    requestCount
+    statuses
+  }
+
+  input NetworkHttpSortField {
+    direction: Direction!
+  }
+
+  type NetworkHttpItem {
+    _id: String
+    domains: [String!]!
+    lastHost: String
+    lastSourceIp: String
+    methods: [String!]!
+    path: String
+    requestCount: Float
+    statuses: [String!]!
+  }
+
+  type NetworkHttpEdges {
+    node: NetworkHttpItem!
+    cursor: CursorType!
+  }
+
+  type NetworkHttpData {
+    edges: [NetworkHttpEdges!]!
+    totalCount: Float!
+    pageInfo: PageInfoPaginated!
+    inspect: Inspect
+  }
+
   extend type Source {
     NetworkTopCountries(
       id: String
@@ -182,5 +219,14 @@ export const networkSchema = gql`
       timerange: TimerangeInput!
       defaultIndex: [String!]!
     ): NetworkDnsData!
+    NetworkHttp(
+      id: String
+      filterQuery: String
+      ip: String
+      pagination: PaginationInputPaginated!
+      sort: NetworkHttpSortField!
+      timerange: TimerangeInput!
+      defaultIndex: [String!]!
+    ): NetworkHttpData!
   }
 `;
diff --git a/x-pack/legacy/plugins/siem/server/graphql/types.ts b/x-pack/legacy/plugins/siem/server/graphql/types.ts
index a87d321fc68d28..cf7ce3ad02fa18 100644
--- a/x-pack/legacy/plugins/siem/server/graphql/types.ts
+++ b/x-pack/legacy/plugins/siem/server/graphql/types.ts
@@ -29,8 +29,6 @@ export interface TimerangeInput {
   to: number;
   /** The beginning of the timerange */
   from: number;
-  /** The default browser set time zone */
-  timezone?: Maybe<string>;
 }
 
 export interface PaginationInputPaginated {
@@ -89,6 +87,10 @@ export interface NetworkDnsSortField {
   direction: Direction;
 }
 
+export interface NetworkHttpSortField {
+  direction: Direction;
+}
+
 export interface TlsSortField {
   field: TlsFields;
 
@@ -298,6 +300,16 @@ export enum NetworkDirectionEcs {
   unknown = 'unknown',
 }
 
+export enum NetworkHttpFields {
+  domains = 'domains',
+  lastHost = 'lastHost',
+  lastSourceIp = 'lastSourceIp',
+  methods = 'methods',
+  path = 'path',
+  requestCount = 'requestCount',
+  statuses = 'statuses',
+}
+
 export enum FlowDirection {
   uniDirectional = 'uniDirectional',
   biDirectional = 'biDirectional',
@@ -405,6 +417,8 @@ export interface Source {
   /** Gets Authentication success and failures based on a timerange */
   Authentications: AuthenticationsData;
 
+  AuthenticationsOverTime: AuthenticationsOverTimeData;
+
   Timeline: TimelineData;
 
   TimelineDetails: TimelineDetailsData;
@@ -435,6 +449,8 @@ export interface Source {
 
   NetworkDns: NetworkDnsData;
 
+  NetworkHttp: NetworkHttpData;
+
   OverviewNetwork?: Maybe<OverviewNetworkData>;
 
   OverviewHost?: Maybe<OverviewHostData>;
@@ -638,6 +654,22 @@ export interface Inspect {
   response: string[];
 }
 
+export interface AuthenticationsOverTimeData {
+  inspect?: Maybe<Inspect>;
+
+  authenticationsOverTime: MatrixOverTimeHistogramData[];
+
+  totalCount: number;
+}
+
+export interface MatrixOverTimeHistogramData {
+  x: number;
+
+  y: number;
+
+  g: string;
+}
+
 export interface TimelineData {
   edges: TimelineEdges[];
 
@@ -1222,14 +1254,6 @@ export interface EventsOverTimeData {
   totalCount: number;
 }
 
-export interface MatrixOverTimeHistogramData {
-  x: number;
-
-  y: number;
-
-  g: string;
-}
-
 export interface HostsData {
   edges: HostsEdges[];
 
@@ -1582,6 +1606,40 @@ export interface NetworkDnsItem {
   uniqueDomains?: Maybe<number>;
 }
 
+export interface NetworkHttpData {
+  edges: NetworkHttpEdges[];
+
+  totalCount: number;
+
+  pageInfo: PageInfoPaginated;
+
+  inspect?: Maybe<Inspect>;
+}
+
+export interface NetworkHttpEdges {
+  node: NetworkHttpItem;
+
+  cursor: CursorType;
+}
+
+export interface NetworkHttpItem {
+  _id?: Maybe<string>;
+
+  domains: string[];
+
+  lastHost?: Maybe<string>;
+
+  lastSourceIp?: Maybe<string>;
+
+  methods: string[];
+
+  path?: Maybe<string>;
+
+  requestCount?: Maybe<number>;
+
+  statuses: string[];
+}
+
 export interface OverviewNetworkData {
   auditbeatSocket?: Maybe<number>;
 
@@ -1982,6 +2040,13 @@ export interface AuthenticationsSourceArgs {
 
   defaultIndex: string[];
 }
+export interface AuthenticationsOverTimeSourceArgs {
+  timerange: TimerangeInput;
+
+  filterQuery?: Maybe<string>;
+
+  defaultIndex: string[];
+}
 export interface TimelineSourceArgs {
   pagination: PaginationInput;
 
@@ -2149,6 +2214,21 @@ export interface NetworkDnsSourceArgs {
 
   defaultIndex: string[];
 }
+export interface NetworkHttpSourceArgs {
+  id?: Maybe<string>;
+
+  filterQuery?: Maybe<string>;
+
+  ip?: Maybe<string>;
+
+  pagination: PaginationInputPaginated;
+
+  sort: NetworkHttpSortField;
+
+  timerange: TimerangeInput;
+
+  defaultIndex: string[];
+}
 export interface OverviewNetworkSourceArgs {
   id?: Maybe<string>;
 
@@ -2588,6 +2668,12 @@ export namespace SourceResolvers {
     /** Gets Authentication success and failures based on a timerange */
     Authentications?: AuthenticationsResolver<AuthenticationsData, TypeParent, TContext>;
 
+    AuthenticationsOverTime?: AuthenticationsOverTimeResolver<
+      AuthenticationsOverTimeData,
+      TypeParent,
+      TContext
+    >;
+
     Timeline?: TimelineResolver<TimelineData, TypeParent, TContext>;
 
     TimelineDetails?: TimelineDetailsResolver<TimelineDetailsData, TypeParent, TContext>;
@@ -2622,6 +2708,8 @@ export namespace SourceResolvers {
 
     NetworkDns?: NetworkDnsResolver<NetworkDnsData, TypeParent, TContext>;
 
+    NetworkHttp?: NetworkHttpResolver<NetworkHttpData, TypeParent, TContext>;
+
     OverviewNetwork?: OverviewNetworkResolver<Maybe<OverviewNetworkData>, TypeParent, TContext>;
 
     OverviewHost?: OverviewHostResolver<Maybe<OverviewHostData>, TypeParent, TContext>;
@@ -2663,6 +2751,19 @@ export namespace SourceResolvers {
     defaultIndex: string[];
   }
 
+  export type AuthenticationsOverTimeResolver<
+    R = AuthenticationsOverTimeData,
+    Parent = Source,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext, AuthenticationsOverTimeArgs>;
+  export interface AuthenticationsOverTimeArgs {
+    timerange: TimerangeInput;
+
+    filterQuery?: Maybe<string>;
+
+    defaultIndex: string[];
+  }
+
   export type TimelineResolver<
     R = TimelineData,
     Parent = Source,
@@ -2922,6 +3023,27 @@ export namespace SourceResolvers {
     defaultIndex: string[];
   }
 
+  export type NetworkHttpResolver<
+    R = NetworkHttpData,
+    Parent = Source,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext, NetworkHttpArgs>;
+  export interface NetworkHttpArgs {
+    id?: Maybe<string>;
+
+    filterQuery?: Maybe<string>;
+
+    ip?: Maybe<string>;
+
+    pagination: PaginationInputPaginated;
+
+    sort: NetworkHttpSortField;
+
+    timerange: TimerangeInput;
+
+    defaultIndex: string[];
+  }
+
   export type OverviewNetworkResolver<
     R = Maybe<OverviewNetworkData>,
     Parent = Source,
@@ -3619,6 +3741,62 @@ export namespace InspectResolvers {
   >;
 }
 
+export namespace AuthenticationsOverTimeDataResolvers {
+  export interface Resolvers<TContext = SiemContext, TypeParent = AuthenticationsOverTimeData> {
+    inspect?: InspectResolver<Maybe<Inspect>, TypeParent, TContext>;
+
+    authenticationsOverTime?: AuthenticationsOverTimeResolver<
+      MatrixOverTimeHistogramData[],
+      TypeParent,
+      TContext
+    >;
+
+    totalCount?: TotalCountResolver<number, TypeParent, TContext>;
+  }
+
+  export type InspectResolver<
+    R = Maybe<Inspect>,
+    Parent = AuthenticationsOverTimeData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type AuthenticationsOverTimeResolver<
+    R = MatrixOverTimeHistogramData[],
+    Parent = AuthenticationsOverTimeData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type TotalCountResolver<
+    R = number,
+    Parent = AuthenticationsOverTimeData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+}
+
+export namespace MatrixOverTimeHistogramDataResolvers {
+  export interface Resolvers<TContext = SiemContext, TypeParent = MatrixOverTimeHistogramData> {
+    x?: XResolver<number, TypeParent, TContext>;
+
+    y?: YResolver<number, TypeParent, TContext>;
+
+    g?: GResolver<string, TypeParent, TContext>;
+  }
+
+  export type XResolver<
+    R = number,
+    Parent = MatrixOverTimeHistogramData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type YResolver<
+    R = number,
+    Parent = MatrixOverTimeHistogramData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type GResolver<
+    R = string,
+    Parent = MatrixOverTimeHistogramData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+}
+
 export namespace TimelineDataResolvers {
   export interface Resolvers<TContext = SiemContext, TypeParent = TimelineData> {
     edges?: EdgesResolver<TimelineEdges[], TypeParent, TContext>;
@@ -5569,32 +5747,6 @@ export namespace EventsOverTimeDataResolvers {
   > = Resolver<R, Parent, TContext>;
 }
 
-export namespace MatrixOverTimeHistogramDataResolvers {
-  export interface Resolvers<TContext = SiemContext, TypeParent = MatrixOverTimeHistogramData> {
-    x?: XResolver<number, TypeParent, TContext>;
-
-    y?: YResolver<number, TypeParent, TContext>;
-
-    g?: GResolver<string, TypeParent, TContext>;
-  }
-
-  export type XResolver<
-    R = number,
-    Parent = MatrixOverTimeHistogramData,
-    TContext = SiemContext
-  > = Resolver<R, Parent, TContext>;
-  export type YResolver<
-    R = number,
-    Parent = MatrixOverTimeHistogramData,
-    TContext = SiemContext
-  > = Resolver<R, Parent, TContext>;
-  export type GResolver<
-    R = string,
-    Parent = MatrixOverTimeHistogramData,
-    TContext = SiemContext
-  > = Resolver<R, Parent, TContext>;
-}
-
 export namespace HostsDataResolvers {
   export interface Resolvers<TContext = SiemContext, TypeParent = HostsData> {
     edges?: EdgesResolver<HostsEdges[], TypeParent, TContext>;
@@ -6799,6 +6951,119 @@ export namespace NetworkDnsItemResolvers {
   > = Resolver<R, Parent, TContext>;
 }
 
+export namespace NetworkHttpDataResolvers {
+  export interface Resolvers<TContext = SiemContext, TypeParent = NetworkHttpData> {
+    edges?: EdgesResolver<NetworkHttpEdges[], TypeParent, TContext>;
+
+    totalCount?: TotalCountResolver<number, TypeParent, TContext>;
+
+    pageInfo?: PageInfoResolver<PageInfoPaginated, TypeParent, TContext>;
+
+    inspect?: InspectResolver<Maybe<Inspect>, TypeParent, TContext>;
+  }
+
+  export type EdgesResolver<
+    R = NetworkHttpEdges[],
+    Parent = NetworkHttpData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type TotalCountResolver<
+    R = number,
+    Parent = NetworkHttpData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type PageInfoResolver<
+    R = PageInfoPaginated,
+    Parent = NetworkHttpData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type InspectResolver<
+    R = Maybe<Inspect>,
+    Parent = NetworkHttpData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+}
+
+export namespace NetworkHttpEdgesResolvers {
+  export interface Resolvers<TContext = SiemContext, TypeParent = NetworkHttpEdges> {
+    node?: NodeResolver<NetworkHttpItem, TypeParent, TContext>;
+
+    cursor?: CursorResolver<CursorType, TypeParent, TContext>;
+  }
+
+  export type NodeResolver<
+    R = NetworkHttpItem,
+    Parent = NetworkHttpEdges,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type CursorResolver<
+    R = CursorType,
+    Parent = NetworkHttpEdges,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+}
+
+export namespace NetworkHttpItemResolvers {
+  export interface Resolvers<TContext = SiemContext, TypeParent = NetworkHttpItem> {
+    _id?: _IdResolver<Maybe<string>, TypeParent, TContext>;
+
+    domains?: DomainsResolver<string[], TypeParent, TContext>;
+
+    lastHost?: LastHostResolver<Maybe<string>, TypeParent, TContext>;
+
+    lastSourceIp?: LastSourceIpResolver<Maybe<string>, TypeParent, TContext>;
+
+    methods?: MethodsResolver<string[], TypeParent, TContext>;
+
+    path?: PathResolver<Maybe<string>, TypeParent, TContext>;
+
+    requestCount?: RequestCountResolver<Maybe<number>, TypeParent, TContext>;
+
+    statuses?: StatusesResolver<string[], TypeParent, TContext>;
+  }
+
+  export type _IdResolver<
+    R = Maybe<string>,
+    Parent = NetworkHttpItem,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type DomainsResolver<
+    R = string[],
+    Parent = NetworkHttpItem,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type LastHostResolver<
+    R = Maybe<string>,
+    Parent = NetworkHttpItem,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type LastSourceIpResolver<
+    R = Maybe<string>,
+    Parent = NetworkHttpItem,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type MethodsResolver<
+    R = string[],
+    Parent = NetworkHttpItem,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type PathResolver<
+    R = Maybe<string>,
+    Parent = NetworkHttpItem,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type RequestCountResolver<
+    R = Maybe<number>,
+    Parent = NetworkHttpItem,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type StatusesResolver<
+    R = string[],
+    Parent = NetworkHttpItem,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+}
+
 export namespace OverviewNetworkDataResolvers {
   export interface Resolvers<TContext = SiemContext, TypeParent = OverviewNetworkData> {
     auditbeatSocket?: AuditbeatSocketResolver<Maybe<number>, TypeParent, TContext>;
@@ -8112,6 +8377,8 @@ export type IResolvers<TContext = SiemContext> = {
   CursorType?: CursorTypeResolvers.Resolvers<TContext>;
   PageInfoPaginated?: PageInfoPaginatedResolvers.Resolvers<TContext>;
   Inspect?: InspectResolvers.Resolvers<TContext>;
+  AuthenticationsOverTimeData?: AuthenticationsOverTimeDataResolvers.Resolvers<TContext>;
+  MatrixOverTimeHistogramData?: MatrixOverTimeHistogramDataResolvers.Resolvers<TContext>;
   TimelineData?: TimelineDataResolvers.Resolvers<TContext>;
   TimelineEdges?: TimelineEdgesResolvers.Resolvers<TContext>;
   TimelineItem?: TimelineItemResolvers.Resolvers<TContext>;
@@ -8163,7 +8430,6 @@ export type IResolvers<TContext = SiemContext> = {
   DetailItem?: DetailItemResolvers.Resolvers<TContext>;
   LastEventTimeData?: LastEventTimeDataResolvers.Resolvers<TContext>;
   EventsOverTimeData?: EventsOverTimeDataResolvers.Resolvers<TContext>;
-  MatrixOverTimeHistogramData?: MatrixOverTimeHistogramDataResolvers.Resolvers<TContext>;
   HostsData?: HostsDataResolvers.Resolvers<TContext>;
   HostsEdges?: HostsEdgesResolvers.Resolvers<TContext>;
   HostItem?: HostItemResolvers.Resolvers<TContext>;
@@ -8200,6 +8466,9 @@ export type IResolvers<TContext = SiemContext> = {
   NetworkDnsData?: NetworkDnsDataResolvers.Resolvers<TContext>;
   NetworkDnsEdges?: NetworkDnsEdgesResolvers.Resolvers<TContext>;
   NetworkDnsItem?: NetworkDnsItemResolvers.Resolvers<TContext>;
+  NetworkHttpData?: NetworkHttpDataResolvers.Resolvers<TContext>;
+  NetworkHttpEdges?: NetworkHttpEdgesResolvers.Resolvers<TContext>;
+  NetworkHttpItem?: NetworkHttpItemResolvers.Resolvers<TContext>;
   OverviewNetworkData?: OverviewNetworkDataResolvers.Resolvers<TContext>;
   OverviewHostData?: OverviewHostDataResolvers.Resolvers<TContext>;
   TlsData?: TlsDataResolvers.Resolvers<TContext>;
diff --git a/x-pack/legacy/plugins/siem/server/lib/authentications/elastic_adapter.test.ts b/x-pack/legacy/plugins/siem/server/lib/authentications/elasticsearch_adapter.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/siem/server/lib/authentications/elastic_adapter.test.ts
rename to x-pack/legacy/plugins/siem/server/lib/authentications/elasticsearch_adapter.test.ts
diff --git a/x-pack/legacy/plugins/siem/server/lib/authentications/elasticsearch_adapter.ts b/x-pack/legacy/plugins/siem/server/lib/authentications/elasticsearch_adapter.ts
index 79f13ce4461e5a..9a9e30bf01c040 100644
--- a/x-pack/legacy/plugins/siem/server/lib/authentications/elasticsearch_adapter.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/authentications/elasticsearch_adapter.ts
@@ -6,20 +6,50 @@
 
 import { getOr } from 'lodash/fp';
 
-import { AuthenticationsData, AuthenticationsEdges } from '../../graphql/types';
+import {
+  AuthenticationsData,
+  AuthenticationsEdges,
+  AuthenticationsOverTimeData,
+  MatrixOverTimeHistogramData,
+} from '../../graphql/types';
 import { mergeFieldsWithHit, inspectStringifyObject } from '../../utils/build_query';
-import { FrameworkAdapter, FrameworkRequest, RequestOptionsPaginated } from '../framework';
+import {
+  FrameworkAdapter,
+  FrameworkRequest,
+  RequestOptionsPaginated,
+  RequestBasicOptions,
+} from '../framework';
 import { TermAggregation } from '../types';
 import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../common/constants';
 
 import { auditdFieldsMap, buildQuery } from './query.dsl';
+import { buildAuthenticationsOverTimeQuery } from './query.authentications_over_time.dsl';
 import {
   AuthenticationBucket,
   AuthenticationData,
   AuthenticationHit,
   AuthenticationsAdapter,
+  AuthenticationsActionGroupData,
 } from './types';
 
+const getAuthenticationsOverTimeByAuthenticationResult = (
+  data: AuthenticationsActionGroupData[]
+): MatrixOverTimeHistogramData[] => {
+  let result: MatrixOverTimeHistogramData[] = [];
+  data.forEach(({ key: group, events }) => {
+    const eventsData = getOr([], 'buckets', events).map(
+      ({ key, doc_count }: { key: number; doc_count: number }) => ({
+        x: key,
+        y: doc_count,
+        g: group,
+      })
+    );
+    result = [...result, ...eventsData];
+  });
+
+  return result;
+};
+
 export class ElasticsearchAuthenticationAdapter implements AuthenticationsAdapter {
   constructor(private readonly framework: FrameworkAdapter) {}
 
@@ -79,6 +109,35 @@ export class ElasticsearchAuthenticationAdapter implements AuthenticationsAdapte
       },
     };
   }
+
+  public async getAuthenticationsOverTime(
+    request: FrameworkRequest,
+    options: RequestBasicOptions
+  ): Promise<AuthenticationsOverTimeData> {
+    const dsl = buildAuthenticationsOverTimeQuery(options);
+    const response = await this.framework.callWithRequest<AuthenticationHit, TermAggregation>(
+      request,
+      'search',
+      dsl
+    );
+    const totalCount = getOr(0, 'hits.total.value', response);
+    const authenticationsOverTimeBucket = getOr(
+      [],
+      'aggregations.eventActionGroup.buckets',
+      response
+    );
+    const inspect = {
+      dsl: [inspectStringifyObject(dsl)],
+      response: [inspectStringifyObject(response)],
+    };
+    return {
+      inspect,
+      authenticationsOverTime: getAuthenticationsOverTimeByAuthenticationResult(
+        authenticationsOverTimeBucket
+      ),
+      totalCount,
+    };
+  }
 }
 
 export const formatAuthenticationData = (
diff --git a/x-pack/legacy/plugins/siem/server/lib/authentications/index.ts b/x-pack/legacy/plugins/siem/server/lib/authentications/index.ts
index c1b93818943dbe..b369c358e1619b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/authentications/index.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/authentications/index.ts
@@ -5,9 +5,10 @@
  */
 
 import { AuthenticationsData } from '../../graphql/types';
-import { FrameworkRequest, RequestOptionsPaginated } from '../framework';
+import { FrameworkRequest, RequestOptionsPaginated, RequestBasicOptions } from '../framework';
 
 import { AuthenticationsAdapter } from './types';
+import { AuthenticationsOverTimeData } from '../../../public/graphql/types';
 
 export class Authentications {
   constructor(private readonly adapter: AuthenticationsAdapter) {}
@@ -18,4 +19,11 @@ export class Authentications {
   ): Promise<AuthenticationsData> {
     return this.adapter.getAuthentications(req, options);
   }
+
+  public async getAuthenticationsOverTime(
+    req: FrameworkRequest,
+    options: RequestBasicOptions
+  ): Promise<AuthenticationsOverTimeData> {
+    return this.adapter.getAuthenticationsOverTime(req, options);
+  }
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/authentications/query.authentications_over_time.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/authentications/query.authentications_over_time.dsl.ts
new file mode 100644
index 00000000000000..e2ff0013e063cd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/authentications/query.authentications_over_time.dsl.ts
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { createQueryFilterClauses, calculateTimeseriesInterval } from '../../utils/build_query';
+import { RequestBasicOptions } from '../framework';
+
+export const buildAuthenticationsOverTimeQuery = ({
+  filterQuery,
+  timerange: { from, to },
+  defaultIndex,
+  sourceConfiguration: {
+    fields: { timestamp },
+  },
+}: RequestBasicOptions) => {
+  const filter = [
+    ...createQueryFilterClauses(filterQuery),
+    {
+      range: {
+        [timestamp]: {
+          gte: from,
+          lte: to,
+        },
+      },
+    },
+  ];
+
+  const getHistogramAggregation = () => {
+    const minIntervalSeconds = 10;
+    const interval = calculateTimeseriesInterval(from, to, minIntervalSeconds);
+    const histogramTimestampField = '@timestamp';
+    const dateHistogram = {
+      date_histogram: {
+        field: histogramTimestampField,
+        fixed_interval: `${interval}s`,
+      },
+    };
+    const autoDateHistogram = {
+      auto_date_histogram: {
+        field: histogramTimestampField,
+        buckets: 36,
+      },
+    };
+    return {
+      eventActionGroup: {
+        terms: {
+          field: 'event.type',
+          include: ['authentication_success', 'authentication_failure'],
+          order: {
+            _count: 'desc',
+          },
+          size: 2,
+        },
+        aggs: {
+          events: interval ? dateHistogram : autoDateHistogram,
+        },
+      },
+    };
+  };
+
+  const dslQuery = {
+    index: defaultIndex,
+    allowNoIndices: true,
+    ignoreUnavailable: true,
+    body: {
+      aggregations: getHistogramAggregation(),
+      query: {
+        bool: {
+          filter,
+        },
+      },
+      size: 0,
+      track_total_hits: true,
+    },
+  };
+
+  return dslQuery;
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/authentications/types.ts b/x-pack/legacy/plugins/siem/server/lib/authentications/types.ts
index 2d2c7ba547c094..6e83a2bdba9562 100644
--- a/x-pack/legacy/plugins/siem/server/lib/authentications/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/authentications/types.ts
@@ -4,8 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AuthenticationsData, LastSourceHost } from '../../graphql/types';
-import { FrameworkRequest, RequestOptionsPaginated } from '../framework';
+import {
+  AuthenticationsData,
+  AuthenticationsOverTimeData,
+  LastSourceHost,
+} from '../../graphql/types';
+import { FrameworkRequest, RequestOptionsPaginated, RequestBasicOptions } from '../framework';
 import { Hit, SearchHit, TotalHit } from '../types';
 
 export interface AuthenticationsAdapter {
@@ -13,6 +17,10 @@ export interface AuthenticationsAdapter {
     req: FrameworkRequest,
     options: RequestOptionsPaginated
   ): Promise<AuthenticationsData>;
+  getAuthenticationsOverTime(
+    req: FrameworkRequest,
+    options: RequestBasicOptions
+  ): Promise<AuthenticationsOverTimeData>;
 }
 
 type StringOrNumber = string | number;
@@ -60,3 +68,17 @@ export interface AuthenticationData extends SearchHit {
     };
   };
 }
+
+interface AuthenticationsOverTimeHistogramData {
+  key_as_string: string;
+  key: number;
+  doc_count: number;
+}
+
+export interface AuthenticationsActionGroupData {
+  key: number;
+  events: {
+    bucket: AuthenticationsOverTimeHistogramData[];
+  };
+  doc_count: number;
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_query.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_query.test.ts
new file mode 100644
index 00000000000000..6c95e82485e452
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_query.test.ts
@@ -0,0 +1,150 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { buildEventsSearchQuery } from './build_events_query';
+
+describe('create_signals', () => {
+  test('it builds a now-5m up to today filter', () => {
+    const query = buildEventsSearchQuery({
+      index: ['auditbeat-*'],
+      from: 'now-5m',
+      to: 'today',
+      filter: {},
+      size: 100,
+      searchAfterSortId: undefined,
+    });
+    expect(query).toEqual({
+      allowNoIndices: true,
+      index: ['auditbeat-*'],
+      size: 100,
+      ignoreUnavailable: true,
+      body: {
+        query: {
+          bool: {
+            filter: [
+              {},
+              {
+                bool: {
+                  filter: [
+                    {
+                      bool: {
+                        should: [
+                          {
+                            range: {
+                              '@timestamp': {
+                                gte: 'now-5m',
+                              },
+                            },
+                          },
+                        ],
+                        minimum_should_match: 1,
+                      },
+                    },
+                    {
+                      bool: {
+                        should: [
+                          {
+                            range: {
+                              '@timestamp': {
+                                lte: 'today',
+                              },
+                            },
+                          },
+                        ],
+                        minimum_should_match: 1,
+                      },
+                    },
+                  ],
+                },
+              },
+              {
+                match_all: {},
+              },
+            ],
+          },
+        },
+        track_total_hits: true,
+        sort: [
+          {
+            '@timestamp': {
+              order: 'asc',
+            },
+          },
+        ],
+      },
+    });
+  });
+  test('if searchAfterSortId is an empty string it should not be included', () => {
+    const query = buildEventsSearchQuery({
+      index: ['auditbeat-*'],
+      from: 'now-5m',
+      to: 'today',
+      filter: {},
+      size: 100,
+      searchAfterSortId: '',
+    });
+    expect(query).toEqual({
+      allowNoIndices: true,
+      index: ['auditbeat-*'],
+      size: 100,
+      ignoreUnavailable: true,
+      body: {
+        query: {
+          bool: {
+            filter: [
+              {},
+              {
+                bool: {
+                  filter: [
+                    {
+                      bool: {
+                        should: [
+                          {
+                            range: {
+                              '@timestamp': {
+                                gte: 'now-5m',
+                              },
+                            },
+                          },
+                        ],
+                        minimum_should_match: 1,
+                      },
+                    },
+                    {
+                      bool: {
+                        should: [
+                          {
+                            range: {
+                              '@timestamp': {
+                                lte: 'today',
+                              },
+                            },
+                          },
+                        ],
+                        minimum_should_match: 1,
+                      },
+                    },
+                  ],
+                },
+              },
+              {
+                match_all: {},
+              },
+            ],
+          },
+        },
+        track_total_hits: true,
+        sort: [
+          {
+            '@timestamp': {
+              order: 'asc',
+            },
+          },
+        ],
+      },
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_query.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_query.ts
index 91efdc41ca7984..d2fb7c21f66f54 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_query.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_query.ts
@@ -4,41 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
-
-interface BuildEventsScrollQuery {
+interface BuildEventsSearchQuery {
   index: string[];
   from: string;
   to: string;
-  kql: string | undefined;
-  filter: Record<string, {}> | undefined;
+  filter: unknown;
   size: number;
-  scroll: string;
+  searchAfterSortId?: string;
 }
 
-export const getFilter = (kql: string | undefined, filter: Record<string, {}> | undefined) => {
-  if (kql != null) {
-    return toElasticsearchQuery(fromKueryExpression(kql), null);
-  } else if (filter != null) {
-    return filter;
-  } else {
-    // TODO: Re-visit this error (which should never happen) when we do signal errors for the UI
-    throw new TypeError('either kql or filter should be set');
-  }
-};
-
-export const buildEventsScrollQuery = ({
+export const buildEventsSearchQuery = ({
   index,
   from,
   to,
-  kql,
   filter,
   size,
-  scroll,
-}: BuildEventsScrollQuery) => {
-  const kqlOrFilter = getFilter(kql, filter);
+  searchAfterSortId,
+}: BuildEventsSearchQuery) => {
   const filterWithTime = [
-    kqlOrFilter,
+    filter,
     {
       bool: {
         filter: [
@@ -74,10 +58,9 @@ export const buildEventsScrollQuery = ({
       },
     },
   ];
-  return {
+  const searchQuery = {
     allowNoIndices: true,
     index,
-    scroll,
     size,
     ignoreUnavailable: true,
     body: {
@@ -92,7 +75,23 @@ export const buildEventsScrollQuery = ({
         },
       },
       track_total_hits: true,
-      sort: ['_doc'],
+      sort: [
+        {
+          '@timestamp': {
+            order: 'asc',
+          },
+        },
+      ],
     },
   };
+  if (searchAfterSortId) {
+    return {
+      ...searchQuery,
+      body: {
+        ...searchQuery.body,
+        search_after: [searchAfterSortId],
+      },
+    };
+  }
+  return searchQuery;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_reindex.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_reindex.ts
index c7bdc0263e4ce0..4c5d981614cf10 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_reindex.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/build_events_reindex.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
-
 // TODO: Re-index is just a temporary solution in order to speed up development
 // of any front end pieces. This should be replaced with a combination of the file
 // build_events_query.ts and any scrolling/scaling solutions from that particular
@@ -17,9 +15,8 @@ interface BuildEventsReIndexParams {
   from: string;
   to: string;
   signalsIndex: string;
-  maxDocs: string;
-  filter: Record<string, {}> | undefined;
-  kql: string | undefined;
+  maxDocs: number;
+  filter: unknown;
   severity: string;
   name: string;
   timeDetected: string;
@@ -29,17 +26,6 @@ interface BuildEventsReIndexParams {
   references: string[];
 }
 
-export const getFilter = (kql: string | undefined, filter: Record<string, {}> | undefined) => {
-  if (kql != null) {
-    return toElasticsearchQuery(fromKueryExpression(kql), null);
-  } else if (filter != null) {
-    return filter;
-  } else {
-    // TODO: Re-visit this error (which should never happen) when we do signal errors for the UI
-    throw new TypeError('either kql or filter should be set');
-  }
-};
-
 export const buildEventsReIndex = ({
   description,
   index,
@@ -48,7 +34,6 @@ export const buildEventsReIndex = ({
   signalsIndex,
   maxDocs,
   filter,
-  kql,
   severity,
   name,
   timeDetected,
@@ -57,11 +42,10 @@ export const buildEventsReIndex = ({
   type,
   references,
 }: BuildEventsReIndexParams) => {
-  const kqlOrFilter = getFilter(kql, filter);
   const indexPatterns = index.map(element => `"${element}"`).join(',');
   const refs = references.map(element => `"${element}"`).join(',');
   const filterWithTime = [
-    kqlOrFilter,
+    filter,
     {
       bool: {
         filter: [
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/create_signals.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/create_signals.ts
index 70b6723fc51eec..038effbd30086d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/create_signals.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/create_signals.ts
@@ -17,13 +17,17 @@ export const updateIfIdExists = async ({
   enabled,
   filter,
   from,
+  query,
+  language,
+  savedId,
+  filters,
   id,
   index,
   interval,
-  kql,
   maxSignals,
   name,
   severity,
+  size,
   to,
   type,
   references,
@@ -36,23 +40,29 @@ export const updateIfIdExists = async ({
       enabled,
       filter,
       from,
+      query,
+      language,
+      savedId,
+      filters,
       id,
       index,
       interval,
-      kql,
       maxSignals,
       name,
       severity,
+      size,
       to,
       type,
       references,
     });
     return signal;
   } catch (err) {
-    // This happens when we cannot get a saved object back from reading a signal.
-    // So we continue normally as we have nothing we can upsert.
+    if (err.output.statusCode === 404) {
+      return null;
+    } else {
+      return err;
+    }
   }
-  return null;
 };
 
 export const createSignals = async ({
@@ -62,13 +72,17 @@ export const createSignals = async ({
   enabled,
   filter,
   from,
+  query,
+  language,
+  savedId,
+  filters,
   id,
   index,
   interval,
-  kql,
   maxSignals,
   name,
   severity,
+  size,
   to,
   type,
   references,
@@ -81,13 +95,17 @@ export const createSignals = async ({
     enabled,
     filter,
     from,
+    query,
+    language,
+    savedId,
+    filters,
     id,
     index,
     interval,
-    kql,
     maxSignals,
     name,
     severity,
+    size,
     to,
     type,
     references,
@@ -108,6 +126,7 @@ export const createSignals = async ({
 
     return alertsClient.create({
       data: {
+        name,
         alertTypeId: SIGNALS_ID,
         alertTypeParams: {
           description,
@@ -115,9 +134,11 @@ export const createSignals = async ({
           index,
           from,
           filter,
-          kql,
+          query,
+          language,
+          savedId,
+          filters,
           maxSignals,
-          name,
           severity,
           to,
           type,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/find_signals.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/find_signals.ts
index ebddf6ac5b3c74..23f4e38a95eeab 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/find_signals.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/find_signals.ts
@@ -7,16 +7,12 @@
 import { SIGNALS_ID } from '../../../../common/constants';
 import { FindSignalParams } from './types';
 
-// TODO: Change this from a search to a filter once this ticket is solved:
-// https://github.com/elastic/kibana/projects/26#card-27462236
-export const findSignals = async ({ alertsClient, perPage, page, fields }: FindSignalParams) => {
-  return alertsClient.find({
+export const findSignals = async ({ alertsClient, perPage, page, fields }: FindSignalParams) =>
+  alertsClient.find({
     options: {
       fields,
       page,
       perPage,
-      searchFields: ['alertTypeId'],
-      search: SIGNALS_ID,
+      filter: `alert.attributes.alertTypeId: ${SIGNALS_ID}`,
     },
   });
-};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/get_filter.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/get_filter.test.ts
new file mode 100644
index 00000000000000..9f72da44e963bf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/get_filter.test.ts
@@ -0,0 +1,438 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getQueryFilter, getFilter } from './get_filter';
+import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { AlertServices } from '../../../../../alerting/server/types';
+
+describe('get_filter', () => {
+  let savedObjectsClient = savedObjectsClientMock.create();
+  savedObjectsClient.get = jest.fn().mockImplementation(() => ({
+    attributes: {
+      query: { query: 'host.name: linux', language: 'kuery' },
+      filters: [],
+    },
+  }));
+  let servicesMock: AlertServices = {
+    savedObjectsClient,
+    callCluster: jest.fn(),
+    alertInstanceFactory: jest.fn(),
+  };
+
+  beforeAll(() => {
+    jest.resetAllMocks();
+  });
+
+  beforeEach(() => {
+    savedObjectsClient = savedObjectsClientMock.create();
+    savedObjectsClient.get = jest.fn().mockImplementation(() => ({
+      attributes: {
+        query: { query: 'host.name: linux', language: 'kuery' },
+        language: 'kuery',
+        filters: [],
+      },
+    }));
+    servicesMock = {
+      savedObjectsClient,
+      callCluster: jest.fn(),
+      alertInstanceFactory: jest.fn(),
+    };
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('getQueryFilter', () => {
+    test('it should work with an empty filter as kuery', () => {
+      const esQuery = getQueryFilter('host.name: linux', 'kuery', [], ['auditbeat-*']);
+      expect(esQuery).toEqual({
+        bool: {
+          must: [],
+          filter: [
+            {
+              bool: {
+                should: [
+                  {
+                    match: {
+                      'host.name': 'linux',
+                    },
+                  },
+                ],
+                minimum_should_match: 1,
+              },
+            },
+          ],
+          should: [],
+          must_not: [],
+        },
+      });
+    });
+
+    test('it should work with an empty filter as lucene', () => {
+      const esQuery = getQueryFilter('host.name: linux', 'lucene', [], ['auditbeat-*']);
+      expect(esQuery).toEqual({
+        bool: {
+          must: [
+            {
+              query_string: {
+                query: 'host.name: linux',
+                analyze_wildcard: true,
+                time_zone: 'Zulu',
+              },
+            },
+          ],
+          filter: [],
+          should: [],
+          must_not: [],
+        },
+      });
+    });
+
+    test('it should work with a simple filter as a kuery', () => {
+      const esQuery = getQueryFilter(
+        'host.name: windows',
+        'kuery',
+        [
+          {
+            meta: {
+              alias: 'custom label here',
+              disabled: false,
+              key: 'host.name',
+              negate: false,
+              params: {
+                query: 'siem-windows',
+              },
+              type: 'phrase',
+            },
+            query: {
+              match_phrase: {
+                'host.name': 'siem-windows',
+              },
+            },
+          },
+        ],
+        ['auditbeat-*']
+      );
+      expect(esQuery).toEqual({
+        bool: {
+          must: [],
+          filter: [
+            {
+              bool: {
+                should: [
+                  {
+                    match: {
+                      'host.name': 'windows',
+                    },
+                  },
+                ],
+                minimum_should_match: 1,
+              },
+            },
+            {
+              match_phrase: {
+                'host.name': 'siem-windows',
+              },
+            },
+          ],
+          should: [],
+          must_not: [],
+        },
+      });
+    });
+
+    test('it should work with a simple filter that is disabled as a kuery', () => {
+      const esQuery = getQueryFilter(
+        'host.name: windows',
+        'kuery',
+        [
+          {
+            meta: {
+              alias: 'custom label here',
+              disabled: true,
+              key: 'host.name',
+              negate: false,
+              params: {
+                query: 'siem-windows',
+              },
+              type: 'phrase',
+            },
+            query: {
+              match_phrase: {
+                'host.name': 'siem-windows',
+              },
+            },
+          },
+        ],
+        ['auditbeat-*']
+      );
+      expect(esQuery).toEqual({
+        bool: {
+          must: [],
+          filter: [
+            {
+              bool: {
+                should: [
+                  {
+                    match: {
+                      'host.name': 'windows',
+                    },
+                  },
+                ],
+                minimum_should_match: 1,
+              },
+            },
+          ],
+          should: [],
+          must_not: [],
+        },
+      });
+    });
+
+    test('it should work with a simple filter as a lucene', () => {
+      const esQuery = getQueryFilter(
+        'host.name: windows',
+        'lucene',
+        [
+          {
+            meta: {
+              alias: 'custom label here',
+              disabled: false,
+              key: 'host.name',
+              negate: false,
+              params: {
+                query: 'siem-windows',
+              },
+              type: 'phrase',
+            },
+            query: {
+              match_phrase: {
+                'host.name': 'siem-windows',
+              },
+            },
+          },
+        ],
+        ['auditbeat-*']
+      );
+      expect(esQuery).toEqual({
+        bool: {
+          must: [
+            {
+              query_string: {
+                query: 'host.name: windows',
+                analyze_wildcard: true,
+                time_zone: 'Zulu',
+              },
+            },
+          ],
+          filter: [
+            {
+              match_phrase: {
+                'host.name': 'siem-windows',
+              },
+            },
+          ],
+          should: [],
+          must_not: [],
+        },
+      });
+    });
+
+    test('it should work with a simple filter that is disabled as a lucene', () => {
+      const esQuery = getQueryFilter(
+        'host.name: windows',
+        'lucene',
+        [
+          {
+            meta: {
+              alias: 'custom label here',
+              disabled: true,
+              key: 'host.name',
+              negate: false,
+              params: {
+                query: 'siem-windows',
+              },
+              type: 'phrase',
+            },
+            query: {
+              match_phrase: {
+                'host.name': 'siem-windows',
+              },
+            },
+          },
+        ],
+        ['auditbeat-*']
+      );
+      expect(esQuery).toEqual({
+        bool: {
+          must: [
+            {
+              query_string: {
+                query: 'host.name: windows',
+                analyze_wildcard: true,
+                time_zone: 'Zulu',
+              },
+            },
+          ],
+          filter: [],
+          should: [],
+          must_not: [],
+        },
+      });
+    });
+  });
+
+  describe('getFilter', () => {
+    test('returns a filter if given a type of filter as is', async () => {
+      const filter = await getFilter({
+        type: 'filter',
+        filter: { something: '1' },
+        filters: undefined,
+        language: undefined,
+        query: undefined,
+        savedId: undefined,
+        services: servicesMock,
+        index: ['auditbeat-*'],
+      });
+      expect(filter).toEqual({
+        something: '1',
+      });
+    });
+
+    test('returns a query if given a type of query', async () => {
+      const filter = await getFilter({
+        type: 'query',
+        filter: undefined,
+        filters: undefined,
+        language: 'kuery',
+        query: 'host.name: siem',
+        savedId: undefined,
+        services: servicesMock,
+        index: ['auditbeat-*'],
+      });
+      expect(filter).toEqual({
+        bool: {
+          must: [],
+          filter: [
+            {
+              bool: {
+                should: [
+                  {
+                    match: {
+                      'host.name': 'siem',
+                    },
+                  },
+                ],
+                minimum_should_match: 1,
+              },
+            },
+          ],
+          should: [],
+          must_not: [],
+        },
+      });
+    });
+
+    test('throws on type query if query is undefined', async () => {
+      await expect(
+        getFilter({
+          type: 'query',
+          filter: undefined,
+          filters: undefined,
+          language: undefined,
+          query: 'host.name: siem',
+          savedId: undefined,
+          services: servicesMock,
+          index: ['auditbeat-*'],
+        })
+      ).rejects.toThrow('query, filters, and index parameter should be defined');
+    });
+
+    test('throws on type query if language is undefined', async () => {
+      await expect(
+        getFilter({
+          type: 'query',
+          filter: undefined,
+          filters: undefined,
+          language: 'kuery',
+          query: undefined,
+          savedId: undefined,
+          services: servicesMock,
+          index: ['auditbeat-*'],
+        })
+      ).rejects.toThrow('query, filters, and index parameter should be defined');
+    });
+
+    test('throws on type query if index is undefined', async () => {
+      await expect(
+        getFilter({
+          type: 'query',
+          filter: undefined,
+          filters: undefined,
+          language: 'kuery',
+          query: 'host.name: siem',
+          savedId: undefined,
+          services: servicesMock,
+          index: undefined,
+        })
+      ).rejects.toThrow('query, filters, and index parameter should be defined');
+    });
+
+    test('returns a saved query if given a type of query', async () => {
+      const filter = await getFilter({
+        type: 'saved_query',
+        filter: undefined,
+        filters: undefined,
+        language: undefined,
+        query: undefined,
+        savedId: 'some-id',
+        services: servicesMock,
+        index: ['auditbeat-*'],
+      });
+      expect(filter).toEqual({
+        bool: {
+          filter: [
+            { bool: { minimum_should_match: 1, should: [{ match: { 'host.name': 'linux' } }] } },
+          ],
+          must: [],
+          must_not: [],
+          should: [],
+        },
+      });
+    });
+
+    test('throws on saved query if saved_id is undefined', async () => {
+      await expect(
+        getFilter({
+          type: 'saved_query',
+          filter: undefined,
+          filters: undefined,
+          language: undefined,
+          query: undefined,
+          savedId: undefined,
+          services: servicesMock,
+          index: ['auditbeat-*'],
+        })
+      ).rejects.toThrow('savedId parameter should be defined');
+    });
+
+    test('throws on saved query if index is undefined', async () => {
+      await expect(
+        getFilter({
+          type: 'saved_query',
+          filter: undefined,
+          filters: undefined,
+          language: undefined,
+          query: undefined,
+          savedId: 'some-id',
+          services: servicesMock,
+          index: undefined,
+        })
+      ).rejects.toThrow('savedId parameter should be defined');
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/get_filter.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/get_filter.ts
new file mode 100644
index 00000000000000..22ebccbaef6a7c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/get_filter.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { buildEsQuery } from '@kbn/es-query';
+import { Query } from 'src/plugins/data/common/query';
+import { AlertServices } from '../../../../../alerting/server/types';
+import { SignalAlertParams, PartialFilter } from './types';
+import { assertUnreachable } from '../../../utils/build_query';
+
+export const getQueryFilter = (
+  query: string,
+  language: string,
+  filters: PartialFilter[],
+  index: string[]
+) => {
+  const indexPattern = {
+    fields: [],
+    title: index.join(),
+  };
+  const queries: Query[] = [{ query, language }];
+  const config = {
+    allowLeadingWildcards: true,
+    queryStringOptions: { analyze_wildcard: true },
+    ignoreFilterIfFieldNotInIndex: false,
+    dateFormatTZ: 'Zulu',
+  };
+  const esQuery = buildEsQuery(
+    indexPattern,
+    queries,
+    filters.filter(f => f.meta != null && f.meta.disabled === false),
+    config
+  );
+  return esQuery;
+};
+
+interface GetFilterArgs {
+  type: SignalAlertParams['type'];
+  filter: Record<string, {}> | undefined;
+  filters: PartialFilter[] | undefined;
+  language: string | undefined;
+  query: string | undefined;
+  savedId: string | undefined;
+  services: AlertServices;
+  index: string[] | undefined;
+}
+
+export const getFilter = async ({
+  filter,
+  filters,
+  index,
+  language,
+  savedId,
+  services,
+  type,
+  query,
+}: GetFilterArgs): Promise<unknown> => {
+  switch (type) {
+    case 'query': {
+      if (query != null && language != null && index != null) {
+        return getQueryFilter(query, language, filters || [], index);
+      } else {
+        throw new TypeError('query, filters, and index parameter should be defined');
+      }
+    }
+    case 'saved_query': {
+      if (savedId != null && index != null) {
+        const savedObject = await services.savedObjectsClient.get('query', savedId);
+        return getQueryFilter(
+          savedObject.attributes.query.query,
+          savedObject.attributes.query.language,
+          savedObject.attributes.filters,
+          index
+        );
+      } else {
+        throw new TypeError('savedId parameter should be defined');
+      }
+    }
+    case 'filter': {
+      return filter;
+    }
+  }
+  return assertUnreachable(type);
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/signals_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/signals_alert_type.ts
index aad2b2b19d67a8..6673b7bd1423b6 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/signals_alert_type.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/signals_alert_type.ts
@@ -11,13 +11,10 @@ import { Logger } from '../../../../../../../../src/core/server';
 // TODO: Remove this for the build_events_query call eventually
 import { buildEventsReIndex } from './build_events_reindex';
 
-// TODO: Comment this in and use this instead of the reIndex API
-// once scrolling and other things are done with it.
-import { buildEventsScrollQuery } from './build_events_query';
-
-// bulk scroll class
-import { scrollAndBulkIndex } from './utils';
+import { buildEventsSearchQuery } from './build_events_query';
+import { searchAfterAndBulkIndex } from './utils';
 import { SignalAlertTypeDefinition } from './types';
+import { getFilter } from './get_filter';
 
 export const signalsAlertType = ({ logger }: { logger: Logger }): SignalAlertTypeDefinition => {
   return {
@@ -31,89 +28,96 @@ export const signalsAlertType = ({ logger }: { logger: Logger }): SignalAlertTyp
         filter: schema.nullable(schema.object({}, { allowUnknowns: true })),
         id: schema.string(),
         index: schema.arrayOf(schema.string()),
-        kql: schema.nullable(schema.string()),
+        language: schema.nullable(schema.string()),
+        savedId: schema.nullable(schema.string()),
+        query: schema.nullable(schema.string()),
+        filters: schema.nullable(schema.arrayOf(schema.object({}, { allowUnknowns: true }))),
         maxSignals: schema.number({ defaultValue: 100 }),
-        name: schema.string(),
         severity: schema.string(),
         to: schema.string(),
         type: schema.string(),
         references: schema.arrayOf(schema.string(), { defaultValue: [] }),
-        scrollSize: schema.maybe(schema.number()),
-        scrollLock: schema.maybe(schema.string()),
+        size: schema.maybe(schema.number()),
       }),
     },
     async executor({ services, params }) {
-      const instance = services.alertInstanceFactory('siem-signals');
-
       const {
         description,
         filter,
         from,
         id,
         index,
-        kql,
+        filters,
+        language,
+        savedId,
+        query,
         maxSignals,
         name,
         references,
         severity,
         to,
         type,
-        scrollSize,
-        scrollLock,
+        size,
       } = params;
 
-      const scroll = scrollLock ? scrollLock : '1m';
-      const size = scrollSize ? scrollSize : 400;
+      const searchAfterSize = size ? size : 1000;
 
-      // TODO: Turn these options being sent in into a template for the alert type
-      const noReIndex = buildEventsScrollQuery({
-        index,
-        from,
-        to,
-        kql,
+      const esFilter = await getFilter({
+        type,
         filter,
-        size,
-        scroll,
+        filters,
+        language,
+        query,
+        savedId,
+        services,
+        index,
       });
 
-      const reIndex = buildEventsReIndex({
+      const noReIndex = buildEventsSearchQuery({
         index,
         from,
-        kql,
         to,
-        // TODO: Change this out once we have solved
-        // https://github.com/elastic/kibana/issues/47002
-        signalsIndex: process.env.SIGNALS_INDEX || '.siem-signals-10-01-2019',
-        severity,
-        description,
-        name,
-        timeDetected: new Date().toISOString(),
-        filter,
-        maxDocs: maxSignals,
-        ruleRevision: 1,
-        id,
-        type,
-        references,
+        filter: esFilter,
+        size: searchAfterSize,
       });
 
       try {
-        logger.info('Starting SIEM signal job');
-
-        // TODO: Comment this in eventually and use this for manual insertion of the
-        // signals instead of the ReIndex() api
-
+        logger.debug(`Starting signal rule "${id}"`);
         if (process.env.USE_REINDEX_API === 'true') {
+          const reIndex = buildEventsReIndex({
+            index,
+            from,
+            to,
+            // TODO: Change this out once we have solved
+            // https://github.com/elastic/kibana/issues/47002
+            signalsIndex: process.env.SIGNALS_INDEX || '.siem-signals-10-01-2019',
+            severity,
+            description,
+            name,
+            timeDetected: new Date().toISOString(),
+            filter: esFilter,
+            maxDocs: maxSignals,
+            ruleRevision: 1,
+            id,
+            type,
+            references,
+          });
           const result = await services.callCluster('reindex', reIndex);
-
-          // TODO: Error handling here and writing of any errors that come back from ES by
-          logger.info(`Result of reindex: ${JSON.stringify(result, null, 2)}`);
+          if (result.total > 0) {
+            logger.info(
+              `Total signals found from signal rule "${id}" (reindex algorithm): ${result.total}`
+            );
+          }
         } else {
-          logger.info(`[+] Initial search call`);
-
+          logger.debug(`[+] Initial search call of signal rule "${id}"`);
           const noReIndexResult = await services.callCluster('search', noReIndex);
-          logger.info(`Total docs to reindex: ${noReIndexResult.hits.total.value}`);
+          if (noReIndexResult.hits.total.value !== 0) {
+            logger.info(
+              `Total signals found from signal rule "${id}": ${noReIndexResult.hits.total.value}`
+            );
+          }
 
-          const bulkIndexResult = await scrollAndBulkIndex(
+          const bulkIndexResult = await searchAfterAndBulkIndex(
             noReIndexResult,
             params,
             services,
@@ -121,19 +125,23 @@ export const signalsAlertType = ({ logger }: { logger: Logger }): SignalAlertTyp
           );
 
           if (bulkIndexResult) {
-            logger.info('Finished SIEM signal job');
+            logger.debug(`Finished signal rule "${id}"`);
           } else {
-            logger.error('Error processing SIEM signal job');
+            logger.error(`Error processing signal rule "${id}"`);
           }
         }
       } catch (err) {
         // TODO: Error handling and writing of errors into a signal that has error
         // handling/conditions
-        logger.error(`You encountered an error of: ${err.message}`);
+        logger.error(`Error from signal rule "${id}", ${err.message}`);
       }
 
+      // TODO: Schedule and fire any and all actions configured for the signals rule
+      // such as email/slack/etc... Note you will not be able to save in-memory state
+      // without calling this at least once but we are not using in-memory state at the moment.
       // Schedule the default action which is nothing if it's a plain signal.
-      instance.scheduleActions('default');
+      // const instance = services.alertInstanceFactory('siem-signals');
+      // instance.scheduleActions('default');
     },
   };
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/types.ts
index 2d7b9dbb98d767..96a319c944bd90 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/types.ts
@@ -7,6 +7,7 @@
 import { get } from 'lodash/fp';
 
 import Hapi from 'hapi';
+import { esFilters } from '../../../../../../../../src/plugins/data/common';
 import { SIGNALS_ID } from '../../../../common/constants';
 import {
   Alert,
@@ -18,21 +19,43 @@ import { AlertsClient } from '../../../../../alerting/server/alerts_client';
 import { ActionsClient } from '../../../../../actions/server/actions_client';
 import { SearchResponse } from '../../types';
 
+export type PartialFilter = Partial<esFilters.Filter>;
+
 export interface SignalAlertParams {
   description: string;
+  enabled: boolean;
+  filter: Record<string, {}> | undefined;
+  filters: PartialFilter[] | undefined;
   from: string;
-  id: string;
   index: string[];
   interval: string;
-  enabled: boolean;
-  filter: Record<string, {}> | undefined;
-  kql: string | undefined;
-  maxSignals: string;
+  id: string;
+  language: string | undefined;
+  maxSignals: number;
   name: string;
+  query: string | undefined;
+  references: string[];
+  savedId: string | undefined;
   severity: string;
-  type: 'filter' | 'kql';
+  size: number | undefined;
   to: string;
-  references: string[];
+  type: 'filter' | 'query' | 'saved_query';
+}
+
+export type SignalAlertParamsRest = Omit<SignalAlertParams, 'maxSignals' | 'saved_id'> & {
+  saved_id: SignalAlertParams['savedId'];
+  max_signals: SignalAlertParams['maxSignals'];
+};
+
+export type UpdateSignalAlertParamsRest = Partial<Omit<SignalAlertParamsRest, 'id'>> & {
+  id: SignalAlertParams['id'];
+};
+
+export interface FindParamsRest {
+  per_page: number;
+  page: number;
+  sort_field: string;
+  fields: string[];
 }
 
 export interface Clients {
@@ -42,6 +65,10 @@ export interface Clients {
 
 export type SignalParams = SignalAlertParams & Clients;
 
+export type UpdateSignalParams = Partial<Omit<SignalAlertParams, 'id'>> & {
+  id: SignalAlertParams['id'];
+} & Clients;
+
 export type DeleteSignalParams = Clients & { id: string };
 
 export interface FindSignalsRequest extends Omit<Hapi.Request, 'query'> {
@@ -73,9 +100,11 @@ export type SignalAlertType = Alert & {
 };
 
 export interface SignalsRequest extends Hapi.Request {
-  payload: Omit<SignalAlertParams, 'maxSignals'> & {
-    max_signals: string;
-  };
+  payload: SignalAlertParamsRest;
+}
+
+export interface UpdateSignalsRequest extends Hapi.Request {
+  payload: UpdateSignalAlertParamsRest;
 }
 
 export type SignalExecutorOptions = Omit<AlertExecutorOptions, 'params'> & {
@@ -100,6 +129,12 @@ export interface SignalSource {
   '@timestamp': string;
 }
 
+export interface BulkResponse {
+  took: number;
+  errors: boolean;
+  items: unknown[];
+}
+
 export type SignalSearchResponse = SearchResponse<SignalSource>;
 export type SignalSourceHit = SignalSearchResponse['hits']['hits'][0];
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.test.ts
index e3e00e5cea5cea..39f7951a8eab98 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { calculateInterval, calculateKqlAndFilter } from './update_signals';
+import { calculateInterval, calculateName } from './update_signals';
 
 describe('update_signals', () => {
   describe('#calculateInterval', () => {
@@ -24,29 +24,25 @@ describe('update_signals', () => {
     });
   });
 
-  describe('#calculateKqlAndFilter', () => {
-    test('given a undefined kql filter it returns a null kql', () => {
-      const kqlFilter = calculateKqlAndFilter(undefined, {});
-      expect(kqlFilter).toEqual({
-        filter: {},
-        kql: null,
-      });
+  describe('#calculateName', () => {
+    test('should return the updated name when it and originalName is there', () => {
+      const name = calculateName({ updatedName: 'updated', originalName: 'original' });
+      expect(name).toEqual('updated');
     });
 
-    test('given a undefined filter it returns a null filter', () => {
-      const kqlFilter = calculateKqlAndFilter('some kql string', undefined);
-      expect(kqlFilter).toEqual({
-        filter: null,
-        kql: 'some kql string',
-      });
+    test('should return the updated name when originalName is undefined', () => {
+      const name = calculateName({ updatedName: 'updated', originalName: undefined });
+      expect(name).toEqual('updated');
     });
 
-    test('given both a undefined filter and undefined kql it returns both as undefined', () => {
-      const kqlFilter = calculateKqlAndFilter(undefined, undefined);
-      expect(kqlFilter).toEqual({
-        filter: undefined,
-        kql: undefined,
-      });
+    test('should return the original name when updatedName is undefined', () => {
+      const name = calculateName({ updatedName: undefined, originalName: 'original' });
+      expect(name).toEqual('original');
+    });
+
+    test('should return untitled when both updatedName and originalName is undefined', () => {
+      const name = calculateName({ updatedName: undefined, originalName: undefined });
+      expect(name).toEqual('untitled');
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.ts
index de2f0d511711c2..422d9123a286bb 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/update_signals.ts
@@ -7,7 +7,7 @@
 import { defaults } from 'lodash/fp';
 import { AlertAction } from '../../../../../alerting/server/types';
 import { readSignals } from './read_signals';
-import { SignalParams } from './types';
+import { UpdateSignalParams } from './types';
 
 export const calculateInterval = (
   interval: string | undefined,
@@ -22,16 +22,22 @@ export const calculateInterval = (
   }
 };
 
-export const calculateKqlAndFilter = (
-  kql: string | undefined,
-  filter: {} | undefined
-): { kql: string | null | undefined; filter: {} | null | undefined } => {
-  if (filter != null) {
-    return { kql: null, filter };
-  } else if (kql != null) {
-    return { kql, filter: null };
+export const calculateName = ({
+  updatedName,
+  originalName,
+}: {
+  updatedName: string | undefined;
+  originalName: string | undefined;
+}): string => {
+  if (updatedName != null) {
+    return updatedName;
+  } else if (originalName != null) {
+    return originalName;
   } else {
-    return { kql: undefined, filter: undefined };
+    // You really should never get to this point. This is a fail safe way to send back
+    // the name of "untitled" just in case a signal rule name became null or undefined at
+    // some point since TypeScript allows it.
+    return 'untitled';
   }
 };
 
@@ -40,19 +46,22 @@ export const updateSignal = async ({
   actionsClient, // TODO: Use this whenever we add feature support for different action types
   description,
   enabled,
+  query,
+  language,
+  savedId,
+  filters,
   filter,
   from,
   id,
   index,
   interval,
-  kql,
   maxSignals,
   name,
   severity,
   to,
   type,
   references,
-}: SignalParams) => {
+}: UpdateSignalParams) => {
   // TODO: Error handling and abstraction. Right now if this is an error then what happens is we get the error of
   // "message": "Saved object [alert/{id}] not found"
   const signal = await readSignals({ alertsClient, id });
@@ -63,20 +72,20 @@ export const updateSignal = async ({
 
   const alertTypeParams = signal.alertTypeParams || {};
 
-  const { kql: nextKql, filter: nextFilter } = calculateKqlAndFilter(kql, filter);
-
   const nextAlertTypeParams = defaults(
     {
       ...alertTypeParams,
     },
     {
       description,
-      filter: nextFilter,
+      filter,
       from,
+      query,
+      language,
+      savedId,
+      filters,
       index,
-      kql: nextKql,
       maxSignals,
-      name,
       severity,
       to,
       type,
@@ -93,6 +102,7 @@ export const updateSignal = async ({
   return alertsClient.update({
     id: signal.id,
     data: {
+      name: calculateName({ updatedName: name, originalName: signal.name }),
       interval: calculateInterval(interval, signal.interval),
       actions,
       alertTypeParams: nextAlertTypeParams,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/utils.ts
index 312f484b96e002..a514baa186fd26 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/alerts/utils.ts
@@ -3,13 +3,14 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import { performance } from 'perf_hooks';
 import { SignalHit } from '../../types';
 import { Logger } from '../../../../../../../../src/core/server';
 import { AlertServices } from '../../../../../alerting/server/types';
-import { SignalSourceHit, SignalSearchResponse, SignalAlertParams } from './types';
+import { SignalSourceHit, SignalSearchResponse, SignalAlertParams, BulkResponse } from './types';
+import { buildEventsSearchQuery } from './build_events_query';
 
-// format scroll search result for signals index.
+// format search_after result for signals index.
 export const buildBulkBody = (doc: SignalSourceHit, signalParams: SignalAlertParams): SignalHit => {
   return {
     ...doc._source,
@@ -42,8 +43,7 @@ export const singleBulkIndex = async (
   logger: Logger
 ): Promise<boolean> => {
   if (sr.hits.hits.length === 0) {
-    logger.warn('First search result yielded 0 documents');
-    return false;
+    return true;
   }
   const bulkBody = sr.hits.hits.flatMap(doc => [
     {
@@ -54,10 +54,15 @@ export const singleBulkIndex = async (
     },
     buildBulkBody(doc, params),
   ]);
-  const firstResult = await service.callCluster('bulk', {
-    refresh: true,
+  const time1 = performance.now();
+  const firstResult: BulkResponse = await service.callCluster('bulk', {
+    index: process.env.SIGNALS_INDEX || '.siem-signals-10-01-2019',
+    refresh: false,
     body: bulkBody,
   });
+  const time2 = performance.now();
+  logger.debug(`individual bulk process time took: ${time2 - time1} milliseconds`);
+  logger.debug(`took property says bulk took: ${firstResult.took} milliseconds`);
   if (firstResult.errors) {
     logger.error(`[-] bulkResponse had errors: ${JSON.stringify(firstResult.errors, null, 2)}}`);
     return false;
@@ -65,55 +70,95 @@ export const singleBulkIndex = async (
   return true;
 };
 
-// Given a scroll id, grab the next set of documents
-export const singleScroll = async (
-  scrollId: string | undefined,
-  params: SignalAlertParams & { scrollLock?: number }, // TODO: Finish plumbing the scrollLock all the way to the REST endpoint if this algorithm continues to use it.
+// utilize search_after for paging results into bulk.
+export const singleSearchAfter = async (
+  searchAfterSortId: string | undefined,
+  params: SignalAlertParams,
   service: AlertServices,
   logger: Logger
 ): Promise<SignalSearchResponse> => {
-  const scroll = params.scrollLock ? params.scrollLock : '1m';
+  if (searchAfterSortId == null) {
+    throw Error('Attempted to search after with empty sort id');
+  }
   try {
-    const nextScrollResult = await service.callCluster('scroll', {
-      scroll,
-      scrollId,
+    const searchAfterQuery = buildEventsSearchQuery({
+      index: params.index,
+      from: params.from,
+      to: params.to,
+      filter: params.filter,
+      size: params.size ? params.size : 1000,
+      searchAfterSortId,
     });
-    return nextScrollResult;
+    const nextSearchAfterResult = await service.callCluster('search', searchAfterQuery);
+    return nextSearchAfterResult;
   } catch (exc) {
-    logger.error(`[-] nextScroll threw an error ${exc}`);
+    logger.error(`[-] nextSearchAfter threw an error ${exc}`);
     throw exc;
   }
 };
 
-// scroll through documents and re-index using bulk endpoint.
-export const scrollAndBulkIndex = async (
+// search_after through documents and re-index using bulk endpoint.
+export const searchAfterAndBulkIndex = async (
   someResult: SignalSearchResponse,
   params: SignalAlertParams,
   service: AlertServices,
   logger: Logger
 ): Promise<boolean> => {
-  logger.info('[+] starting bulk insertion');
+  if (someResult.hits.hits.length === 0) {
+    return true;
+  }
+
+  logger.debug('[+] starting bulk insertion');
   const firstBulkIndexSuccess = await singleBulkIndex(someResult, params, service, logger);
   if (!firstBulkIndexSuccess) {
-    logger.warn('First bulk index was unsuccessful');
+    logger.error('First bulk index was unsuccessful');
     return false;
   }
-  let newScrollId = someResult._scroll_id;
-  while (true) {
+
+  const totalHits =
+    typeof someResult.hits.total === 'number' ? someResult.hits.total : someResult.hits.total.value;
+  let size = someResult.hits.hits.length - 1;
+  logger.debug(`first size: ${size}`);
+  let sortIds = someResult.hits.hits[0].sort;
+  if (sortIds == null && totalHits > 0) {
+    logger.error(`sortIds was empty on first search when encountering ${totalHits}`);
+    return false;
+  } else if (sortIds == null && totalHits === 0) {
+    return true;
+  }
+  let sortId;
+  if (sortIds != null) {
+    sortId = sortIds[0];
+  }
+  while (size < totalHits) {
+    // utilize track_total_hits instead of true
     try {
-      const scrollResult = await singleScroll(newScrollId, params, service, logger);
-      newScrollId = scrollResult._scroll_id;
-      if (scrollResult.hits.hits.length === 0) {
-        logger.info('[+] Finished indexing signals');
-        return true;
+      logger.debug(`sortIds: ${sortIds}`);
+      const searchAfterResult: SignalSearchResponse = await singleSearchAfter(
+        sortId,
+        params,
+        service,
+        logger
+      );
+      size += searchAfterResult.hits.hits.length - 1;
+      logger.debug(`size adjusted: ${size}`);
+      sortIds = searchAfterResult.hits.hits[0].sort;
+      if (sortIds == null) {
+        logger.error('sortIds was empty search when running a signal rule');
+        return false;
       }
-      const bulkSuccess = await singleBulkIndex(scrollResult, params, service, logger);
+      sortId = sortIds[0];
+      logger.debug('next bulk index');
+      const bulkSuccess = await singleBulkIndex(searchAfterResult, params, service, logger);
+      logger.debug('finished next bulk index');
       if (!bulkSuccess) {
-        logger.error('[-] bulk index failed');
+        logger.error('[-] bulk index failed but continuing');
       }
     } catch (exc) {
-      logger.error('[-] scroll and bulk threw an error');
+      logger.error(`[-] search_after and bulk threw an error ${exc}`);
       return false;
     }
   }
+  logger.debug(`[+] completed bulk index of ${totalHits}`);
+  return true;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index 1b6f529a514186..7b3778d606e473 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -6,21 +6,30 @@
 
 import { ServerInjectOptions } from 'hapi';
 import { ActionResult } from '../../../../../../actions/server/types';
+import { SignalAlertParamsRest } from '../../alerts/types';
+
+// The Omit of filter is because of a Hapi Server Typing issue that I am unclear
+// where it comes from. I would hope to remove the "filter" as an omit at some point
+// when we upgrade and Hapi Server is ok with the filter.
+export const typicalPayload = (): Partial<Omit<SignalAlertParamsRest, 'filter'>> => ({
+  id: 'rule-1',
+  description: 'Detecting root and admin users',
+  index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
+  interval: '5m',
+  name: 'Detect Root/Admin Users',
+  type: 'query',
+  from: 'now-6m',
+  to: 'now',
+  severity: 'high',
+  query: 'user.name: root or user.name: admin',
+  language: 'kuery',
+});
 
 export const getUpdateRequest = (): ServerInjectOptions => ({
   method: 'PUT',
   url: '/api/siem/signals',
   payload: {
-    id: 'rule-1',
-    description: 'Detecting root and admin users',
-    index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-    interval: '5m',
-    name: 'Detect Root/Admin Users',
-    severity: 'high',
-    type: 'kql',
-    from: 'now-6m',
-    to: 'now',
-    kql: 'user.name: root or user.name: admin',
+    ...typicalPayload(),
   },
 });
 
@@ -50,16 +59,7 @@ export const getCreateRequest = (): ServerInjectOptions => ({
   method: 'POST',
   url: '/api/siem/signals',
   payload: {
-    id: 'rule-1',
-    description: 'Detecting root and admin users',
-    index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-    interval: '5m',
-    name: 'Detect Root/Admin Users',
-    severity: 'high',
-    type: 'kql',
-    from: 'now-6m',
-    to: 'now',
-    kql: 'user.name: root or user.name: admin',
+    ...typicalPayload(),
   },
 });
 
@@ -79,12 +79,13 @@ export const createAlertResult = () => ({
     index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
     from: 'now-6m',
     filter: null,
-    kql: 'user.name: root or user.name: admin',
+    query: 'user.name: root or user.name: admin',
     maxSignals: 100,
     name: 'Detect Root/Admin Users',
     severity: 'high',
     to: 'now',
-    type: 'kql',
+    type: 'query',
+    language: 'kuery',
     references: [],
   },
   interval: '5m',
@@ -133,12 +134,13 @@ export const updateAlertResult = () => ({
     index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
     from: 'now-6m',
     filter: null,
-    kql: 'user.name: root or user.name: admin',
+    query: 'user.name: root or user.name: admin',
     maxSignals: 100,
     name: 'Detect Root/Admin Users',
     severity: 'high',
     to: 'now',
-    type: 'kql',
+    type: 'query',
+    language: 'kuery',
     references: [],
   },
   interval: '5m',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals.route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals.route.test.ts
deleted file mode 100644
index ca9e50b3482209..00000000000000
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals.route.test.ts
+++ /dev/null
@@ -1,167 +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 {
-  createMockServer,
-  createMockServerWithoutActionClientDecoration,
-  createMockServerWithoutAlertClientDecoration,
-  createMockServerWithoutActionOrAlertClientDecoration,
-} from './__mocks__/_mock_server';
-import { createSignalsRoute } from './create_signals_route';
-import { ServerInjectOptions } from 'hapi';
-import {
-  getFindResult,
-  getResult,
-  createActionResult,
-  createAlertResult,
-  getCreateRequest,
-} from './__mocks__/request_responses';
-
-describe('create_signals', () => {
-  let { server, alertsClient, actionsClient } = createMockServer();
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    ({ server, alertsClient, actionsClient } = createMockServer());
-    createSignalsRoute(server);
-  });
-
-  describe('status codes with actionClient and alertClient', () => {
-    it('returns 200 when deleting a single signal with a valid actionClient and alertClient', async () => {
-      alertsClient.find.mockResolvedValue(getFindResult());
-      alertsClient.get.mockResolvedValue(getResult());
-      actionsClient.create.mockResolvedValue(createActionResult());
-      alertsClient.create.mockResolvedValue(createAlertResult());
-      const { statusCode } = await server.inject(getCreateRequest());
-      expect(statusCode).toBe(200);
-    });
-
-    it('returns 404 if actionClient is not available on the route', async () => {
-      const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
-      createSignalsRoute(serverWithoutActionClient);
-      const { statusCode } = await serverWithoutActionClient.inject(getCreateRequest());
-      expect(statusCode).toBe(404);
-    });
-
-    it('returns 404 if alertClient is not available on the route', async () => {
-      const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
-      createSignalsRoute(serverWithoutAlertClient);
-      const { statusCode } = await serverWithoutAlertClient.inject(getCreateRequest());
-      expect(statusCode).toBe(404);
-    });
-
-    it('returns 404 if alertClient and actionClient are both not available on the route', async () => {
-      const {
-        serverWithoutActionOrAlertClient,
-      } = createMockServerWithoutActionOrAlertClientDecoration();
-      createSignalsRoute(serverWithoutActionOrAlertClient);
-      const { statusCode } = await serverWithoutActionOrAlertClient.inject(getCreateRequest());
-      expect(statusCode).toBe(404);
-    });
-  });
-
-  describe('validation', () => {
-    it('returns 400 if id is not given', async () => {
-      alertsClient.find.mockResolvedValue(getFindResult());
-      alertsClient.get.mockResolvedValue(getResult());
-      actionsClient.create.mockResolvedValue(createActionResult());
-      alertsClient.create.mockResolvedValue(createAlertResult());
-      const request: ServerInjectOptions = {
-        method: 'POST',
-        url: '/api/siem/signals',
-        payload: {
-          // missing id should throw a 400
-          description: 'Detecting root and admin users',
-          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-          interval: '5m',
-          name: 'Detect Root/Admin Users',
-          severity: 'high',
-          type: 'kql',
-          from: 'now-6m',
-          to: 'now',
-          kql: 'user.name: root or user.name: admin',
-        },
-      };
-      const { statusCode } = await server.inject(request);
-      expect(statusCode).toBe(400);
-    });
-
-    it('returns 200 if type is kql', async () => {
-      alertsClient.find.mockResolvedValue(getFindResult());
-      alertsClient.get.mockResolvedValue(getResult());
-      actionsClient.create.mockResolvedValue(createActionResult());
-      alertsClient.create.mockResolvedValue(createAlertResult());
-      const request: ServerInjectOptions = {
-        method: 'POST',
-        url: '/api/siem/signals',
-        payload: {
-          id: 'rule-1',
-          description: 'Detecting root and admin users',
-          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-          interval: '5m',
-          name: 'Detect Root/Admin Users',
-          severity: 'high',
-          type: 'kql',
-          from: 'now-6m',
-          to: 'now',
-          kql: 'user.name: root or user.name: admin',
-        },
-      };
-      const { statusCode } = await server.inject(request);
-      expect(statusCode).toBe(200);
-    });
-
-    it('returns 200 if type is filter', async () => {
-      alertsClient.find.mockResolvedValue(getFindResult());
-      alertsClient.get.mockResolvedValue(getResult());
-      actionsClient.create.mockResolvedValue(createActionResult());
-      alertsClient.create.mockResolvedValue(createAlertResult());
-      const request: ServerInjectOptions = {
-        method: 'POST',
-        url: '/api/siem/signals',
-        payload: {
-          id: 'rule-1',
-          description: 'Detecting root and admin users',
-          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-          interval: '5m',
-          name: 'Detect Root/Admin Users',
-          severity: 'high',
-          type: 'filter',
-          from: 'now-6m',
-          to: 'now',
-          kql: 'user.name: root or user.name: admin',
-        },
-      };
-      const { statusCode } = await server.inject(request);
-      expect(statusCode).toBe(200);
-    });
-
-    it('returns 400 if type is not filter or kql', async () => {
-      alertsClient.find.mockResolvedValue(getFindResult());
-      alertsClient.get.mockResolvedValue(getResult());
-      actionsClient.create.mockResolvedValue(createActionResult());
-      alertsClient.create.mockResolvedValue(createAlertResult());
-      const request: ServerInjectOptions = {
-        method: 'POST',
-        url: '/api/siem/signals',
-        payload: {
-          id: 'rule-1',
-          description: 'Detecting root and admin users',
-          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-          interval: '5m',
-          name: 'Detect Root/Admin Users',
-          severity: 'high',
-          type: 'something-made-up', // This is a made up type that causes the 400
-          from: 'now-6m',
-          to: 'now',
-          kql: 'user.name: root or user.name: admin',
-        },
-      };
-      const { statusCode } = await server.inject(request);
-      expect(statusCode).toBe(400);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals_route.test.ts
new file mode 100644
index 00000000000000..0fe88cc856d622
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals_route.test.ts
@@ -0,0 +1,141 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  createMockServer,
+  createMockServerWithoutActionClientDecoration,
+  createMockServerWithoutAlertClientDecoration,
+  createMockServerWithoutActionOrAlertClientDecoration,
+} from './__mocks__/_mock_server';
+import { createSignalsRoute } from './create_signals_route';
+import { ServerInjectOptions } from 'hapi';
+import {
+  getFindResult,
+  getResult,
+  createActionResult,
+  createAlertResult,
+  getCreateRequest,
+  typicalPayload,
+} from './__mocks__/request_responses';
+
+describe('create_signals', () => {
+  let { server, alertsClient, actionsClient } = createMockServer();
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    ({ server, alertsClient, actionsClient } = createMockServer());
+    createSignalsRoute(server);
+  });
+
+  describe('status codes with actionClient and alertClient', () => {
+    test('returns 200 when creating a single signal with a valid actionClient and alertClient', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.create.mockResolvedValue(createActionResult());
+      alertsClient.create.mockResolvedValue(createAlertResult());
+      const { statusCode } = await server.inject(getCreateRequest());
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 404 if actionClient is not available on the route', async () => {
+      const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
+      createSignalsRoute(serverWithoutActionClient);
+      const { statusCode } = await serverWithoutActionClient.inject(getCreateRequest());
+      expect(statusCode).toBe(404);
+    });
+
+    test('returns 404 if alertClient is not available on the route', async () => {
+      const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
+      createSignalsRoute(serverWithoutAlertClient);
+      const { statusCode } = await serverWithoutAlertClient.inject(getCreateRequest());
+      expect(statusCode).toBe(404);
+    });
+
+    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
+      const {
+        serverWithoutActionOrAlertClient,
+      } = createMockServerWithoutActionOrAlertClientDecoration();
+      createSignalsRoute(serverWithoutActionOrAlertClient);
+      const { statusCode } = await serverWithoutActionOrAlertClient.inject(getCreateRequest());
+      expect(statusCode).toBe(404);
+    });
+  });
+
+  describe('validation', () => {
+    test('returns 400 if id is not given', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.create.mockResolvedValue(createActionResult());
+      alertsClient.create.mockResolvedValue(createAlertResult());
+      // missing id should throw a 400
+      const { id, ...noId } = typicalPayload();
+      const request: ServerInjectOptions = {
+        method: 'POST',
+        url: '/api/siem/signals',
+        payload: noId,
+      };
+      const { statusCode } = await server.inject(request);
+      expect(statusCode).toBe(400);
+    });
+
+    test('returns 200 if type is query', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.create.mockResolvedValue(createActionResult());
+      alertsClient.create.mockResolvedValue(createAlertResult());
+      const { type, ...noType } = typicalPayload();
+      const request: ServerInjectOptions = {
+        method: 'POST',
+        url: '/api/siem/signals',
+        payload: {
+          ...noType,
+          type: 'query',
+        },
+      };
+      const { statusCode } = await server.inject(request);
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 200 if type is filter', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.create.mockResolvedValue(createActionResult());
+      alertsClient.create.mockResolvedValue(createAlertResult());
+      // Cannot type request with a ServerInjectOptions as the type system complains
+      // about the property filter involving Hapi types, so I left it off for now
+      const { language, query, type, ...noType } = typicalPayload();
+      const request = {
+        method: 'POST',
+        url: '/api/siem/signals',
+        payload: {
+          ...noType,
+          type: 'filter',
+          filter: {},
+        },
+      };
+      const { statusCode } = await server.inject(request);
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 400 if type is not filter or kql', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.create.mockResolvedValue(createActionResult());
+      alertsClient.create.mockResolvedValue(createAlertResult());
+      const { type, ...noType } = typicalPayload();
+      const request: ServerInjectOptions = {
+        method: 'POST',
+        url: '/api/siem/signals',
+        payload: {
+          ...noType,
+          type: 'something-made-up',
+        },
+      };
+      const { statusCode } = await server.inject(request);
+      expect(statusCode).toBe(400);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals_route.ts
index 709b4fa55a9913..f1fc159ffeaee9 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/create_signals_route.ts
@@ -5,10 +5,10 @@
  */
 
 import Hapi from 'hapi';
-import Joi from 'joi';
 import { isFunction } from 'lodash/fp';
 import { createSignals } from '../alerts/create_signals';
 import { SignalsRequest } from '../alerts/types';
+import { createSignalsSchema } from './schemas';
 
 export const createCreateSignalsRoute: Hapi.ServerRoute = {
   method: 'POST',
@@ -19,24 +19,7 @@ export const createCreateSignalsRoute: Hapi.ServerRoute = {
       options: {
         abortEarly: false,
       },
-      payload: Joi.object({
-        description: Joi.string().required(),
-        enabled: Joi.boolean().default(true),
-        filter: Joi.object(),
-        from: Joi.string().required(),
-        id: Joi.string().required(),
-        index: Joi.array().required(),
-        interval: Joi.string().default('5m'),
-        kql: Joi.string(),
-        max_signals: Joi.number().default(100),
-        name: Joi.string().required(),
-        severity: Joi.string().required(),
-        to: Joi.string().required(),
-        type: Joi.string()
-          .valid('filter', 'kql')
-          .required(),
-        references: Joi.array().default([]),
-      }).xor('filter', 'kql'),
+      payload: createSignalsSchema,
     },
   },
   async handler(request: SignalsRequest, headers) {
@@ -44,8 +27,12 @@ export const createCreateSignalsRoute: Hapi.ServerRoute = {
       description,
       enabled,
       filter,
-      kql,
       from,
+      query,
+      language,
+      // eslint-disable-next-line @typescript-eslint/camelcase
+      saved_id: savedId,
+      filters,
       id,
       index,
       interval,
@@ -53,13 +40,13 @@ export const createCreateSignalsRoute: Hapi.ServerRoute = {
       max_signals: maxSignals,
       name,
       severity,
+      size,
       to,
       type,
       references,
     } = request.payload;
 
     const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
-
     const actionsClient = isFunction(request.getActionsClient) ? request.getActionsClient() : null;
 
     if (!alertsClient || !actionsClient) {
@@ -73,13 +60,17 @@ export const createCreateSignalsRoute: Hapi.ServerRoute = {
       enabled,
       filter,
       from,
+      query,
+      language,
+      savedId,
+      filters,
       id,
       index,
       interval,
-      kql,
       maxSignals,
       name,
       severity,
+      size,
       to,
       type,
       references,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/delete_signals_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/delete_signals_route.test.ts
index 70a072f4665274..db74cf6508be60 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/delete_signals_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/delete_signals_route.test.ts
@@ -28,7 +28,7 @@ describe('delete_signals', () => {
   });
 
   describe('status codes with actionClient and alertClient', () => {
-    it('returns 200 when deleting a single signal with a valid actionClient and alertClient', async () => {
+    test('returns 200 when deleting a single signal with a valid actionClient and alertClient', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       alertsClient.delete.mockResolvedValue({});
@@ -36,21 +36,21 @@ describe('delete_signals', () => {
       expect(statusCode).toBe(200);
     });
 
-    it('returns 404 if actionClient is not available on the route', async () => {
+    test('returns 404 if actionClient is not available on the route', async () => {
       const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
       deleteSignalsRoute(serverWithoutActionClient);
       const { statusCode } = await serverWithoutActionClient.inject(getDeleteRequest());
       expect(statusCode).toBe(404);
     });
 
-    it('returns 404 if alertClient is not available on the route', async () => {
+    test('returns 404 if alertClient is not available on the route', async () => {
       const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
       deleteSignalsRoute(serverWithoutAlertClient);
       const { statusCode } = await serverWithoutAlertClient.inject(getDeleteRequest());
       expect(statusCode).toBe(404);
     });
 
-    it('returns 404 if alertClient and actionClient are both not available on the route', async () => {
+    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
       const {
         serverWithoutActionOrAlertClient,
       } = createMockServerWithoutActionOrAlertClientDecoration();
@@ -61,7 +61,7 @@ describe('delete_signals', () => {
   });
 
   describe('validation', () => {
-    it('returns 404 if given a non-existent id', async () => {
+    test('returns 404 if given a non-existent id', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       alertsClient.delete.mockResolvedValue({});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/find_signals_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/find_signals_route.test.ts
index c054f35f93c281..331f8874eb29b5 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/find_signals_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/find_signals_route.test.ts
@@ -28,7 +28,7 @@ describe('find_signals', () => {
   });
 
   describe('status codes with actionClient and alertClient', () => {
-    it('returns 200 when deleting a single signal with a valid actionClient and alertClient', async () => {
+    test('returns 200 when finding a single signal with a valid actionClient and alertClient', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       actionsClient.find.mockResolvedValue({
         page: 1,
@@ -41,21 +41,21 @@ describe('find_signals', () => {
       expect(statusCode).toBe(200);
     });
 
-    it('returns 404 if actionClient is not available on the route', async () => {
+    test('returns 404 if actionClient is not available on the route', async () => {
       const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
       findSignalsRoute(serverWithoutActionClient);
       const { statusCode } = await serverWithoutActionClient.inject(getFindRequest());
       expect(statusCode).toBe(404);
     });
 
-    it('returns 404 if alertClient is not available on the route', async () => {
+    test('returns 404 if alertClient is not available on the route', async () => {
       const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
       findSignalsRoute(serverWithoutAlertClient);
       const { statusCode } = await serverWithoutAlertClient.inject(getFindRequest());
       expect(statusCode).toBe(404);
     });
 
-    it('returns 404 if alertClient and actionClient are both not available on the route', async () => {
+    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
       const {
         serverWithoutActionOrAlertClient,
       } = createMockServerWithoutActionOrAlertClientDecoration();
@@ -66,7 +66,7 @@ describe('find_signals', () => {
   });
 
   describe('validation', () => {
-    it('returns 400 if a bad query parameter is given', async () => {
+    test('returns 400 if a bad query parameter is given', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       const request: ServerInjectOptions = {
@@ -77,7 +77,7 @@ describe('find_signals', () => {
       expect(statusCode).toBe(400);
     });
 
-    it('returns 200 if the set of optional query parameters are given', async () => {
+    test('returns 200 if the set of optional query parameters are given', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       const request: ServerInjectOptions = {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/find_signals_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/find_signals_route.ts
index a16932d256e5eb..e6f4703ff2e635 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/find_signals_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/find_signals_route.ts
@@ -5,10 +5,10 @@
  */
 
 import Hapi from 'hapi';
-import Joi from 'joi';
 import { isFunction } from 'lodash/fp';
 import { findSignals } from '../alerts/find_signals';
 import { FindSignalsRequest } from '../alerts/types';
+import { findSignalsSchema } from './schemas';
 
 export const createFindSignalRoute: Hapi.ServerRoute = {
   method: 'GET',
@@ -19,20 +19,7 @@ export const createFindSignalRoute: Hapi.ServerRoute = {
       options: {
         abortEarly: false,
       },
-      query: Joi.object()
-        .keys({
-          per_page: Joi.number()
-            .min(0)
-            .default(20),
-          page: Joi.number()
-            .min(1)
-            .default(1),
-          sort_field: Joi.string(),
-          fields: Joi.array()
-            .items(Joi.string())
-            .single(),
-        })
-        .default(),
+      query: findSignalsSchema,
     },
   },
   async handler(request: FindSignalsRequest, headers) {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/read_signals_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/read_signals_route.test.ts
index 1010ae7e0c7bdd..43c96792606a24 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/read_signals_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/read_signals_route.test.ts
@@ -28,28 +28,28 @@ describe('read_signals', () => {
   });
 
   describe('status codes with actionClient and alertClient', () => {
-    it('returns 200 when deleting a single signal with a valid actionClient and alertClient', async () => {
+    test('returns 200 when reading a single signal with a valid actionClient and alertClient', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       const { statusCode } = await server.inject(getReadRequest());
       expect(statusCode).toBe(200);
     });
 
-    it('returns 404 if actionClient is not available on the route', async () => {
+    test('returns 404 if actionClient is not available on the route', async () => {
       const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
       readSignalsRoute(serverWithoutActionClient);
       const { statusCode } = await serverWithoutActionClient.inject(getReadRequest());
       expect(statusCode).toBe(404);
     });
 
-    it('returns 404 if alertClient is not available on the route', async () => {
+    test('returns 404 if alertClient is not available on the route', async () => {
       const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
       readSignalsRoute(serverWithoutAlertClient);
       const { statusCode } = await serverWithoutAlertClient.inject(getReadRequest());
       expect(statusCode).toBe(404);
     });
 
-    it('returns 404 if alertClient and actionClient are both not available on the route', async () => {
+    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
       const {
         serverWithoutActionOrAlertClient,
       } = createMockServerWithoutActionOrAlertClientDecoration();
@@ -60,7 +60,7 @@ describe('read_signals', () => {
   });
 
   describe('validation', () => {
-    it('returns 404 if given a non-existent id', async () => {
+    test('returns 404 if given a non-existent id', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       alertsClient.delete.mockResolvedValue({});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas.test.ts
new file mode 100644
index 00000000000000..456a79efe874a7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas.test.ts
@@ -0,0 +1,1195 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createSignalsSchema, updateSignalSchema, findSignalsSchema } from './schemas';
+import { SignalAlertParamsRest, FindParamsRest } from '../alerts/types';
+
+describe('update_signals', () => {
+  describe('create signals schema', () => {
+    test('empty objects do not validate', () => {
+      expect(createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({}).error).toBeTruthy();
+    });
+
+    test('made up values do not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest & { madeUp: string }>>({
+          madeUp: 'hi',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description, from] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description, from, to] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description, from, to, name] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description, from, to, name, severity] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description, from, to, name, severity, type] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+          type: 'query',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description, from, to, name, severity, type, interval] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description, from, to, name, severity, type, interval, index] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+          type: 'query',
+          interval: '5m',
+          index: ['index-1'],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description, from, to, name, severity, type, query, index, interval] does not validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+          type: 'query',
+          query: 'some query',
+          index: ['index-1'],
+          interval: '5m',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id, description, from, to, index, name, severity, interval, type, query, language] does validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          query: 'some query',
+          language: 'kuery',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to, index, name, severity, interval, type, filter] does validate', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+          filter: {},
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('If filter type is set then filter is required', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('If filter type is set then query is not allowed', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+          filter: {},
+          query: 'some query value',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('If filter type is set then language is not allowed', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+          filter: {},
+          language: 'kuery',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('If filter type is set then filters are not allowed', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+          filter: {},
+          filters: [],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('allows references to be sent as valid', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('defaults references to an array', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          query: 'some-query',
+          language: 'kuery',
+        }).value.references
+      ).toEqual([]);
+    });
+
+    test('references cannot be numbers', () => {
+      expect(
+        createSignalsSchema.validate<
+          Partial<Omit<SignalAlertParamsRest, 'references'>> & { references: number[] }
+        >({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          query: 'some-query',
+          language: 'kuery',
+          references: [5],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('indexes cannot be numbers', () => {
+      expect(
+        createSignalsSchema.validate<
+          Partial<Omit<SignalAlertParamsRest, 'index'>> & { index: number[] }
+        >({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: [5],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          query: 'some-query',
+          language: 'kuery',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('defaults interval to 5 min', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          type: 'query',
+        }).value.interval
+      ).toEqual('5m');
+    });
+
+    test('defaults max signals to 100', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+        }).value.max_signals
+      ).toEqual(100);
+    });
+
+    test('filter and filters cannot exist together', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          filter: {},
+          filters: [],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('saved_id is required when type is saved_query and will not validate without out', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'saved_query',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('saved_id is required when type is saved_query and validates with it', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'saved_query',
+          saved_id: 'some id',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('saved_query type cannot have filters with it', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'saved_query',
+          saved_id: 'some id',
+          filters: [],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('saved_query type cannot have filter with it', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'saved_query',
+          saved_id: 'some id',
+          filter: {},
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('language validates with kuery', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('language validates with lucene', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'lucene',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('language does not validate with something made up', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'something-made-up',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('max_signals cannot be negative', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+          max_signals: -1,
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('max_signals cannot be zero', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+          max_signals: 0,
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('max_signals can be 1', () => {
+      expect(
+        createSignalsSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+          max_signals: 1,
+        }).error
+      ).toBeFalsy();
+    });
+  });
+
+  describe('update signals schema', () => {
+    test('empty objects do validate', () => {
+      expect(updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({}).error).toBeFalsy();
+    });
+
+    test('made up values do not validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest & { madeUp: string }>>({
+          madeUp: 'hi',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('[id] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to, name] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to, name, severity] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to, name, severity, type] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+          type: 'query',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to, name, severity, type, interval] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to, index, name, severity, interval, type] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to, index, name, severity, interval, type, query] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          query: 'some query',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to, index, name, severity, interval, type, query, language] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          query: 'some query',
+          language: 'kuery',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('[id, description, from, to, index, name, severity, type, filter] does validate', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+          filter: {},
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('If filter type is set then filter is still not required', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('If filter type is set then query is not allowed', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+          filter: {},
+          query: 'some query value',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('If filter type is set then language is not allowed', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+          filter: {},
+          language: 'kuery',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('If filter type is set then filters are not allowed', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'filter',
+          filter: {},
+          filters: [],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('allows references to be sent as a valid value to update with', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('does not default references to an array', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          query: 'some-query',
+          language: 'kuery',
+        }).value.references
+      ).toEqual(undefined);
+    });
+
+    test('does not default interval', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          type: 'query',
+        }).value.interval
+      ).toEqual(undefined);
+    });
+
+    test('does not default max signal', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+        }).value.max_signals
+      ).toEqual(undefined);
+    });
+
+    test('references cannot be numbers', () => {
+      expect(
+        updateSignalSchema.validate<
+          Partial<Omit<SignalAlertParamsRest, 'references'>> & { references: number[] }
+        >({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          query: 'some-query',
+          language: 'kuery',
+          references: [5],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('indexes cannot be numbers', () => {
+      expect(
+        updateSignalSchema.validate<
+          Partial<Omit<SignalAlertParamsRest, 'index'>> & { index: number[] }
+        >({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: [5],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          query: 'some-query',
+          language: 'kuery',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('filter and filters cannot exist together', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          filter: {},
+          filters: [],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('saved_id is not required when type is saved_query and will validate without it', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'saved_query',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('saved_id validates with saved_query', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'saved_query',
+          saved_id: 'some id',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('saved_query type cannot have filters with it', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'saved_query',
+          saved_id: 'some id',
+          filters: [],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('saved_query type cannot have filter with it', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'saved_query',
+          saved_id: 'some id',
+          filter: {},
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('language validates with kuery', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('language validates with lucene', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'lucene',
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('language does not validate with something made up', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'something-made-up',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('max_signals cannot be negative', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+          max_signals: -1,
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('max_signals cannot be zero', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+          max_signals: 0,
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('max_signals can be 1', () => {
+      expect(
+        updateSignalSchema.validate<Partial<SignalAlertParamsRest>>({
+          id: 'rule-1',
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          index: ['index-1'],
+          name: 'some-name',
+          severity: 'severity',
+          interval: '5m',
+          type: 'query',
+          references: ['index-1'],
+          query: 'some query',
+          language: 'kuery',
+          max_signals: 1,
+        }).error
+      ).toBeFalsy();
+    });
+  });
+
+  describe('find signals schema', () => {
+    test('empty objects do validate', () => {
+      expect(findSignalsSchema.validate<Partial<FindParamsRest>>({}).error).toBeFalsy();
+    });
+
+    test('all values validate', () => {
+      expect(
+        findSignalsSchema.validate<Partial<FindParamsRest>>({
+          per_page: 5,
+          page: 1,
+          sort_field: 'some field',
+          fields: ['field 1', 'field 2'],
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('made up parameters do not validate', () => {
+      expect(
+        findSignalsSchema.validate<Partial<FindParamsRest & { madeUp: string }>>({
+          madeUp: 'hi',
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('per_page validates', () => {
+      expect(
+        findSignalsSchema.validate<Partial<FindParamsRest>>({ per_page: 5 }).error
+      ).toBeFalsy();
+    });
+
+    test('page validates', () => {
+      expect(findSignalsSchema.validate<Partial<FindParamsRest>>({ page: 5 }).error).toBeFalsy();
+    });
+
+    test('sort_field validates', () => {
+      expect(
+        findSignalsSchema.validate<Partial<FindParamsRest>>({ sort_field: 'some value' }).error
+      ).toBeFalsy();
+    });
+
+    test('fields validates with a string', () => {
+      expect(
+        findSignalsSchema.validate<Partial<FindParamsRest>>({ fields: ['some value'] }).error
+      ).toBeFalsy();
+    });
+
+    test('fields validates with multiple strings', () => {
+      expect(
+        findSignalsSchema.validate<Partial<FindParamsRest>>({
+          fields: ['some value 1', 'some value 2'],
+        }).error
+      ).toBeFalsy();
+    });
+
+    test('fields does not validate with a number', () => {
+      expect(
+        findSignalsSchema.validate<Partial<Omit<FindParamsRest, 'fields'>> & { fields: number[] }>({
+          fields: [5],
+        }).error
+      ).toBeTruthy();
+    });
+
+    test('per page has a default of 20', () => {
+      expect(findSignalsSchema.validate<Partial<FindParamsRest>>({}).value.per_page).toEqual(20);
+    });
+
+    test('page has a default of 1', () => {
+      expect(findSignalsSchema.validate<Partial<FindParamsRest>>({}).value.page).toEqual(1);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas.ts
new file mode 100644
index 00000000000000..374105331672fd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas.ts
@@ -0,0 +1,104 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Joi from 'joi';
+
+/* eslint-disable @typescript-eslint/camelcase */
+const description = Joi.string();
+const enabled = Joi.boolean();
+const filter = Joi.object();
+const filters = Joi.array();
+const from = Joi.string();
+const id = Joi.string();
+const index = Joi.array()
+  .items(Joi.string())
+  .single();
+const interval = Joi.string();
+const query = Joi.string();
+const language = Joi.string().valid('kuery', 'lucene');
+const saved_id = Joi.string();
+const max_signals = Joi.number().greater(0);
+const name = Joi.string();
+const severity = Joi.string();
+const to = Joi.string();
+const type = Joi.string().valid('filter', 'query', 'saved_query');
+const references = Joi.array()
+  .items(Joi.string())
+  .single();
+const per_page = Joi.number()
+  .min(0)
+  .default(20);
+const page = Joi.number()
+  .min(1)
+  .default(1);
+const sort_field = Joi.string();
+const fields = Joi.array()
+  .items(Joi.string())
+  .single();
+/* eslint-enable @typescript-eslint/camelcase */
+
+export const createSignalsSchema = Joi.object({
+  description: description.required(),
+  enabled: enabled.default(true),
+  filter: filter.when('type', { is: 'filter', then: Joi.required(), otherwise: Joi.forbidden() }),
+  filters: filters.when('type', { is: 'query', then: Joi.optional(), otherwise: Joi.forbidden() }),
+  from: from.required(),
+  id: id.required(),
+  index: index.required(),
+  interval: interval.default('5m'),
+  query: query.when('type', { is: 'query', then: Joi.required(), otherwise: Joi.forbidden() }),
+  language: language.when('type', {
+    is: 'query',
+    then: Joi.required(),
+    otherwise: Joi.forbidden(),
+  }),
+  saved_id: saved_id.when('type', {
+    is: 'saved_query',
+    then: Joi.required(),
+    otherwise: Joi.forbidden(),
+  }),
+  max_signals: max_signals.default(100),
+  name: name.required(),
+  severity: severity.required(),
+  to: to.required(),
+  type: type.required(),
+  references: references.default([]),
+});
+
+export const updateSignalSchema = Joi.object({
+  description,
+  enabled,
+  filter: filter.when('type', { is: 'filter', then: Joi.optional(), otherwise: Joi.forbidden() }),
+  filters: filters.when('type', { is: 'query', then: Joi.optional(), otherwise: Joi.forbidden() }),
+  from,
+  id,
+  index,
+  interval,
+  query: query.when('type', { is: 'query', then: Joi.optional(), otherwise: Joi.forbidden() }),
+  language: language.when('type', {
+    is: 'query',
+    then: Joi.optional(),
+    otherwise: Joi.forbidden(),
+  }),
+  saved_id: saved_id.when('type', {
+    is: 'saved_query',
+    then: Joi.optional(),
+    otherwise: Joi.forbidden(),
+  }),
+  max_signals,
+  name,
+  severity,
+  to,
+  type,
+  references,
+});
+
+export const findSignalsSchema = Joi.object({
+  per_page,
+  page,
+  sort_field,
+  fields,
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.test.ts
index 05c6528337608c..c553a8bd40973f 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.test.ts
@@ -19,6 +19,7 @@ import {
   updateActionResult,
   updateAlertResult,
   getUpdateRequest,
+  typicalPayload,
 } from './__mocks__/request_responses';
 
 describe('update_signals', () => {
@@ -31,7 +32,7 @@ describe('update_signals', () => {
   });
 
   describe('status codes with actionClient and alertClient', () => {
-    it('returns 200 when deleting a single signal with a valid actionClient and alertClient', async () => {
+    test('returns 200 when updating a single signal with a valid actionClient and alertClient', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       actionsClient.update.mockResolvedValue(updateActionResult());
@@ -40,21 +41,21 @@ describe('update_signals', () => {
       expect(statusCode).toBe(200);
     });
 
-    it('returns 404 if actionClient is not available on the route', async () => {
+    test('returns 404 if actionClient is not available on the route', async () => {
       const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
       updateSignalsRoute(serverWithoutActionClient);
       const { statusCode } = await serverWithoutActionClient.inject(getUpdateRequest());
       expect(statusCode).toBe(404);
     });
 
-    it('returns 404 if alertClient is not available on the route', async () => {
+    test('returns 404 if alertClient is not available on the route', async () => {
       const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
       updateSignalsRoute(serverWithoutAlertClient);
       const { statusCode } = await serverWithoutAlertClient.inject(getUpdateRequest());
       expect(statusCode).toBe(404);
     });
 
-    it('returns 404 if alertClient and actionClient are both not available on the route', async () => {
+    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
       const {
         serverWithoutActionOrAlertClient,
       } = createMockServerWithoutActionOrAlertClientDecoration();
@@ -65,124 +66,86 @@ describe('update_signals', () => {
   });
 
   describe('validation', () => {
-    it('returns 400 if id is not given in either the body or the url', async () => {
+    test('returns 400 if id is not given in either the body or the url', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
+      const { id, ...noId } = typicalPayload();
       const request: ServerInjectOptions = {
         method: 'PUT',
         url: '/api/siem/signals',
         payload: {
-          // missing id should throw a 400
-          description: 'Detecting root and admin users',
-          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-          interval: '5m',
-          name: 'Detect Root/Admin Users',
-          severity: 'high',
-          type: 'kql',
-          from: 'now-6m',
-          to: 'now',
-          kql: 'user.name: root or user.name: admin',
+          payload: noId,
         },
       };
       const { statusCode } = await server.inject(request);
       expect(statusCode).toBe(400);
     });
 
-    it('returns 200 if type is kql', async () => {
+    test('returns 200 if type is query', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       actionsClient.update.mockResolvedValue(updateActionResult());
       alertsClient.update.mockResolvedValue(updateAlertResult());
+      const { type, ...noType } = typicalPayload();
       const request: ServerInjectOptions = {
         method: 'PUT',
         url: '/api/siem/signals',
         payload: {
-          id: 'rule-1',
-          description: 'Detecting root and admin users',
-          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-          interval: '5m',
-          name: 'Detect Root/Admin Users',
-          severity: 'high',
-          type: 'kql',
-          from: 'now-6m',
-          to: 'now',
-          kql: 'user.name: root or user.name: admin',
+          ...noType,
+          type: 'query',
         },
       };
       const { statusCode } = await server.inject(request);
       expect(statusCode).toBe(200);
     });
 
-    it('returns 200 if type is filter', async () => {
+    test('returns 200 if type is filter', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       actionsClient.update.mockResolvedValue(updateActionResult());
       alertsClient.update.mockResolvedValue(updateAlertResult());
+      const { language, query, type, ...noType } = typicalPayload();
       const request: ServerInjectOptions = {
         method: 'PUT',
         url: '/api/siem/signals',
         payload: {
-          id: 'rule-1',
-          description: 'Detecting root and admin users',
-          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-          interval: '5m',
-          name: 'Detect Root/Admin Users',
-          severity: 'high',
+          ...noType,
           type: 'filter',
-          from: 'now-6m',
-          to: 'now',
-          kql: 'user.name: root or user.name: admin',
         },
       };
       const { statusCode } = await server.inject(request);
       expect(statusCode).toBe(200);
     });
 
-    it('returns 400 if type is not filter or kql', async () => {
+    test('returns 400 if type is not filter or kql', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       actionsClient.update.mockResolvedValue(updateActionResult());
       alertsClient.update.mockResolvedValue(updateAlertResult());
+      const { type, ...noType } = typicalPayload();
       const request: ServerInjectOptions = {
         method: 'PUT',
         url: '/api/siem/signals',
         payload: {
-          id: 'rule-1',
-          description: 'Detecting root and admin users',
-          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-          interval: '5m',
-          name: 'Detect Root/Admin Users',
-          severity: 'high',
-          type: 'something-made-up', // This is a made up type that causes the 400
-          from: 'now-6m',
-          to: 'now',
-          kql: 'user.name: root or user.name: admin',
+          ...noType,
+          type: 'something-made-up',
         },
       };
       const { statusCode } = await server.inject(request);
       expect(statusCode).toBe(400);
     });
 
-    it('returns 200 if id is given in the url but not the payload', async () => {
+    test('returns 200 if id is given in the url but not the payload', async () => {
       alertsClient.find.mockResolvedValue(getFindResult());
       alertsClient.get.mockResolvedValue(getResult());
       actionsClient.update.mockResolvedValue(updateActionResult());
       alertsClient.update.mockResolvedValue(updateAlertResult());
+      // missing id should throw a 400
+      const { id, ...noId } = typicalPayload();
       const request: ServerInjectOptions = {
         method: 'PUT',
         url: '/api/siem/signals/rule-1',
-        payload: {
-          // missing id should throw a 400
-          description: 'Detecting root and admin users',
-          index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-          interval: '5m',
-          name: 'Detect Root/Admin Users',
-          severity: 'high',
-          type: 'kql',
-          from: 'now-6m',
-          to: 'now',
-          kql: 'user.name: root or user.name: admin',
-        },
+        payload: noId,
       };
       const { statusCode } = await server.inject(request);
       expect(statusCode).toBe(200);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.ts
index df4f860e19561c..8248d1505143a5 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/update_signals_route.ts
@@ -8,7 +8,8 @@ import Hapi from 'hapi';
 import Joi from 'joi';
 import { isFunction } from 'lodash/fp';
 import { updateSignal } from '../alerts/update_signals';
-import { SignalsRequest } from '../alerts/types';
+import { UpdateSignalsRequest } from '../alerts/types';
+import { updateSignalSchema } from './schemas';
 
 export const createUpdateSignalsRoute: Hapi.ServerRoute = {
   method: 'PUT',
@@ -26,31 +27,20 @@ export const createUpdateSignalsRoute: Hapi.ServerRoute = {
           otherwise: Joi.string().required(),
         }),
       },
-      payload: Joi.object({
-        description: Joi.string(),
-        enabled: Joi.boolean(),
-        filter: Joi.object(),
-        from: Joi.string(),
-        id: Joi.string(),
-        index: Joi.array(),
-        interval: Joi.string(),
-        kql: Joi.string(),
-        max_signals: Joi.number().default(100),
-        name: Joi.string(),
-        severity: Joi.string(),
-        to: Joi.string(),
-        type: Joi.string().valid('filter', 'kql'),
-        references: Joi.array().default([]),
-      }).nand('filter', 'kql'),
+      payload: updateSignalSchema,
     },
   },
-  async handler(request: SignalsRequest, headers) {
+  async handler(request: UpdateSignalsRequest, headers) {
     const {
       description,
       enabled,
       filter,
-      kql,
       from,
+      query,
+      language,
+      // eslint-disable-next-line @typescript-eslint/camelcase
+      saved_id: savedId,
+      filters,
       id,
       index,
       interval,
@@ -58,18 +48,18 @@ export const createUpdateSignalsRoute: Hapi.ServerRoute = {
       max_signals: maxSignals,
       name,
       severity,
+      size,
       to,
       type,
       references,
     } = request.payload;
-    const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
 
+    const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
     const actionsClient = isFunction(request.getActionsClient) ? request.getActionsClient() : null;
 
     if (!alertsClient || !actionsClient) {
       return headers.response().code(404);
     }
-
     return updateSignal({
       alertsClient,
       actionsClient,
@@ -77,13 +67,17 @@ export const createUpdateSignalsRoute: Hapi.ServerRoute = {
       enabled,
       filter,
       from,
+      query,
+      language,
+      savedId,
+      filters,
       id: request.params.id ? request.params.id : id,
       index,
       interval,
-      kql,
       maxSignals,
       name,
       severity,
+      size,
       to,
       type,
       references,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/delete_all_api_keys.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/delete_all_api_keys.sh
new file mode 100755
index 00000000000000..efcee69a0152c6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/delete_all_api_keys.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+#
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+#
+
+set -e
+./check_env_variables.sh
+
+# Example: ./delete_all_api_keys.sh
+# https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-invalidate-api-key.html
+curl -s -k \
+  -H "Content-Type: application/json" \
+  -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+  -X DELETE ${ELASTICSEARCH_URL}/_security/api_key \
+  --data "{
+    \"username\": \"${ELASTICSEARCH_USERNAME}\"
+  }" \
+  | jq .
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/hard_reset.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/hard_reset.sh
index ee8fa18e1234d3..9c37e93831ccbe 100755
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/hard_reset.sh
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/hard_reset.sh
@@ -14,3 +14,4 @@ set -e
 ./delete_all_alert_tasks.sh
 ./delete_signal_index.sh
 ./put_signal_index.sh
+./delete_all_api_keys.sh
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/post_x_signals.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/post_x_signals.sh
index 27f6a40a16df77..4736fbeda3cf47 100755
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/post_x_signals.sh
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/post_x_signals.sh
@@ -28,10 +28,11 @@ do {
     \"interval\": \"24h\",
     \"name\": \"Detect Root/Admin Users\",
     \"severity\": \"high\",
-    \"type\": \"kql\",
+    \"type\": \"query\",
     \"from\": \"now-6m\",
     \"to\": \"now\",
-    \"kql\": \"user.name: root or user.name: admin\"
+    \"query\": \"user.name: root or user.name: admin\"
+    \"language\": \"kuery\"
   }" \
   | jq .;
 } &
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_1.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_1.json
index 7bbe7ab163460d..0b6d222451303a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_1.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_1.json
@@ -5,9 +5,10 @@
   "interval": "5m",
   "name": "Detect Root/Admin Users",
   "severity": "high",
-  "type": "kql",
+  "type": "query",
   "from": "now-6m",
   "to": "now",
-  "kql": "user.name: root or user.name: admin",
+  "query": "user.name: root or user.name: admin",
+  "language": "kuery",
   "references": ["http://www.example.com", "https://ww.example.com"]
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_2.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_2.json
index efbba4e0e46f5f..ad154e29045420 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_2.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_2.json
@@ -5,8 +5,9 @@
   "interval": "24h",
   "name": "Detect Root/Admin Users over a long period of time",
   "severity": "high",
-  "type": "kql",
+  "type": "query",
   "from": "now-1y",
   "to": "now",
-  "kql": "user.name: root or user.name: admin"
+  "query": "user.name: root or user.name: admin",
+  "language": "kuery"
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_3.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_3.json
index db4e5174bc757b..be98c7757c1e22 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_3.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_3.json
@@ -1,12 +1,13 @@
 {
   "id": "rule-3",
-  "description": "Detecting root and admin users",
+  "description": "Detecting root and admin users as an empty set",
   "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
   "interval": "5m",
   "name": "Detect Root/Admin Users",
   "severity": "high",
-  "type": "kql",
+  "type": "query",
   "from": "now-16y",
   "to": "now-15y",
-  "kql": "user.name: root or user.name: admin"
+  "query": "user.name: root or user.name: admin",
+  "language": "kuery"
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_4.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_4.json
new file mode 100644
index 00000000000000..3c917af93fca8c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_4.json
@@ -0,0 +1,14 @@
+{
+  "id": "rule-4",
+  "description": "Detecting root and admin users with lucene",
+  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
+  "interval": "5m",
+  "name": "Detect Root/Admin Users",
+  "severity": "high",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "user.name: root or user.name: admin",
+  "language": "lucene",
+  "references": ["http://www.example.com", "https://ww.example.com"]
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_5.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_5.json
new file mode 100644
index 00000000000000..63728186b8f12c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_5.json
@@ -0,0 +1,27 @@
+{
+  "id": "rule-5",
+  "description": "Detecting root and admin users over 24 hours on windows",
+  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
+  "interval": "5m",
+  "name": "Detect Root/Admin Users",
+  "severity": "high",
+  "type": "query",
+  "from": "now-24h",
+  "to": "now",
+  "query": "user.name: root or user.name: admin",
+  "language": "kuery",
+  "filters": [
+    {
+      "query": {
+        "match_phrase": {
+          "host.name": "siem-windows"
+        }
+      }
+    },
+    {
+      "exists": {
+        "field": "host.hostname"
+      }
+    }
+  ]
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_6.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_6.json
new file mode 100644
index 00000000000000..58aefe12fb2d3f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_6.json
@@ -0,0 +1,51 @@
+{
+  "id": "rule-6",
+  "description": "Detecting root and admin users",
+  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
+  "interval": "5m",
+  "name": "Detect Root/Admin Users",
+  "severity": "high",
+  "type": "query",
+  "from": "now-24h",
+  "to": "now",
+  "query": "user.name: root or user.name: admin",
+  "language": "kuery",
+  "filters": [
+    {
+      "$state": {
+        "store": "appState"
+      },
+      "meta": {
+        "alias": "custom label here",
+        "disabled": false,
+        "key": "host.name",
+        "negate": false,
+        "params": {
+          "query": "siem-windows"
+        },
+        "type": "phrase"
+      },
+      "query": {
+        "match_phrase": {
+          "host.name": "siem-windows"
+        }
+      }
+    },
+    {
+      "exists": {
+        "field": "host.hostname"
+      },
+      "meta": {
+        "type": "exists",
+        "disabled": false,
+        "negate": false,
+        "alias": "has a hostname",
+        "key": "host.hostname",
+        "value": "exists"
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ]
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_7.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_7.json
new file mode 100644
index 00000000000000..ac0c41dc3d2154
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_7.json
@@ -0,0 +1,51 @@
+{
+  "id": "rule-7",
+  "description": "Detecting root and admin users",
+  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
+  "interval": "5m",
+  "name": "Detect Root/Admin Users",
+  "severity": "high",
+  "type": "query",
+  "from": "now-24h",
+  "to": "now",
+  "query": "user.name: root or user.name: admin",
+  "language": "lucene",
+  "filters": [
+    {
+      "$state": {
+        "store": "appState"
+      },
+      "meta": {
+        "alias": "custom label here",
+        "disabled": false,
+        "key": "host.name",
+        "negate": false,
+        "params": {
+          "query": "siem-windows"
+        },
+        "type": "phrase"
+      },
+      "query": {
+        "match_phrase": {
+          "host.name": "siem-windows"
+        }
+      }
+    },
+    {
+      "exists": {
+        "field": "host.hostname"
+      },
+      "meta": {
+        "type": "exists",
+        "disabled": false,
+        "negate": false,
+        "alias": "has a hostname",
+        "key": "host.hostname",
+        "value": "exists"
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ]
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_8.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_8.json
new file mode 100644
index 00000000000000..66f308fc5e2fff
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_8.json
@@ -0,0 +1,15 @@
+{
+  "id": "rule-8",
+  "description": "Detecting root and admin users",
+  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
+  "interval": "5m",
+  "name": "Detect Root/Admin Users",
+  "severity": "high",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "user.name: root or user.name: admin",
+  "language": "kuery",
+  "enabled": false,
+  "references": ["http://www.example.com", "https://ww.example.com"]
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_filter_9998.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_filter_9998.json
new file mode 100644
index 00000000000000..fc5f08234368de
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_filter_9998.json
@@ -0,0 +1,46 @@
+{
+  "id": "rule-9999",
+  "description": "Detecting root and admin users",
+  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
+  "interval": "5m",
+  "name": "Detect Root/Admin Users",
+  "severity": "high",
+  "type": "filter",
+  "from": "now-6m",
+  "to": "now",
+  "filter": {
+    "bool": {
+      "must": [],
+      "filter": [
+        {
+          "bool": {
+            "should": [
+              {
+                "match_phrase": {
+                  "host.name": "siem-windows"
+                }
+              }
+            ],
+            "minimum_should_match": 1
+          }
+        },
+        {
+          "match_phrase": {
+            "winlog.event_id": {
+              "query": "100"
+            }
+          }
+        },
+        {
+          "match_phrase": {
+            "agent.hostname": {
+              "query": "siem-windows"
+            }
+          }
+        }
+      ],
+      "should": [],
+      "must_not": []
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_saved_query_1.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_saved_query_1.json
new file mode 100644
index 00000000000000..cd1a6efa73ad08
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_saved_query_1.json
@@ -0,0 +1,12 @@
+{
+  "id": "saved-query-1",
+  "description": "Detecting root and admin users",
+  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
+  "interval": "5m",
+  "name": "Detect Root/Admin Users",
+  "severity": "high",
+  "type": "saved_query",
+  "from": "now-6m",
+  "to": "now",
+  "saved_id": "Test Query From SIEM"
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_update_1.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_update_1.json
index cad577eeefdc2d..589583d417a133 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_update_1.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/root_or_admin_update_1.json
@@ -1,13 +1,14 @@
 {
   "id": "rule-1",
-  "description": "Only watch winlogbeat users",
-  "index": ["winlogbeat-*"],
-  "interval": "9m",
-  "name": "Just watch other winlogbeat users",
-  "severity": "low",
-  "enabled": false,
-  "type": "filter",
-  "from": "now-5d",
-  "to": "now-1d",
-  "kql": "user.name: something_else"
+  "description": "Changed Description of only detecting root user",
+  "index": ["auditbeat-*"], 
+  "interval": "50m",
+  "name": "A different name",
+  "severity": "high",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now-5m",
+  "query": "user.name: root",
+  "language": "kuery",
+  "references": ["https://update1.example.com", "https://update2.example.com"]
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/watch_longmont.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/watch_longmont.json
new file mode 100644
index 00000000000000..2f5457c352712c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/watch_longmont.json
@@ -0,0 +1,13 @@
+{
+  "id": "rule-longmont",
+  "description": "Detect Longmont activity",
+  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
+  "interval": "24h",
+  "name": "Detect Longmont activity",
+  "severity": "high",
+  "type": "query",
+  "from": "now-1y",
+  "to": "now",
+  "query": "user.name: root or user.name: admin",
+  "language": "kuery"
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/watch_longmont_3.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/watch_longmont_3.json
deleted file mode 100644
index 1ae71b0a4aa179..00000000000000
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/signals/watch_longmont_3.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "id": "rule-3",
-  "description": "Detect Longmont activity",
-  "index": ["auditbeat-*", "filebeat-*", "packetbeat-*", "winlogbeat-*"],
-  "interval": "24h",
-  "name": "Detect Longmont activity",
-  "severity": "high",
-  "type": "kql",
-  "from": "now-1y",
-  "to": "now",
-  "kql": "source.as.organization.name: \"Longmont Power & Communications\""
-}
diff --git a/x-pack/legacy/plugins/siem/server/lib/events/query.events_over_time.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/events/query.events_over_time.dsl.ts
index 357c1c24119bbf..e655485638e167 100644
--- a/x-pack/legacy/plugins/siem/server/lib/events/query.events_over_time.dsl.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/events/query.events_over_time.dsl.ts
@@ -8,7 +8,7 @@ import { RequestBasicOptions } from '../framework';
 
 export const buildEventsOverTimeQuery = ({
   filterQuery,
-  timerange: { from, timezone, to },
+  timerange: { from, to },
   defaultIndex,
   sourceConfiguration: {
     fields: { timestamp },
@@ -21,7 +21,6 @@ export const buildEventsOverTimeQuery = ({
         [timestamp]: {
           gte: from,
           lte: to,
-          ...(timezone && { time_zone: timezone }),
         },
       },
     },
diff --git a/x-pack/legacy/plugins/siem/server/lib/hosts/elasticsearch_adapter.test.ts b/x-pack/legacy/plugins/siem/server/lib/hosts/elasticsearch_adapter.test.ts
index 979f3a832919cc..fc5c037dfbb5ff 100644
--- a/x-pack/legacy/plugins/siem/server/lib/hosts/elasticsearch_adapter.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/hosts/elasticsearch_adapter.test.ts
@@ -49,41 +49,33 @@ describe('hosts elasticsearch_adapter', () => {
   describe('#formatHostsData', () => {
     const buckets: HostAggEsItem = {
       key: 'zeek-london',
-      host_os_version: {
-        buckets: [
-          {
-            key: '18.04.2 LTS (Bionic Beaver)',
-            doc_count: 1467783,
-            timestamp: { value: 1554516350177, value_as_string: '2019-04-06T02:05:50.177Z' },
+      os: {
+        hits: {
+          total: {
+            value: 242338,
+            relation: 'eq',
           },
-        ],
-      },
-      host_os_name: {
-        buckets: [
-          {
-            key: 'Ubuntu',
-            doc_count: 1467783,
-            timestamp: { value: 1554516350177, value_as_string: '2019-04-06T02:05:50.177Z' },
-          },
-        ],
-      },
-      host_name: {
-        buckets: [
-          {
-            key: 'zeek-london',
-            doc_count: 1467783,
-            timestamp: { value: 1554516350177, value_as_string: '2019-04-06T02:05:50.177Z' },
-          },
-        ],
-      },
-      host_id: {
-        buckets: [
-          {
-            key: '7c21f5ed03b04d0299569d221fe18bbc',
-            doc_count: 1467783,
-            timestamp: { value: 1554516350177, value_as_string: '2019-04-06T02:05:50.177Z' },
-          },
-        ],
+          max_score: null,
+          hits: [
+            {
+              _index: 'auditbeat-8.0.0-2019.09.06-000022',
+              _id: 'dl0T_m0BHe9nqdOiF2A8',
+              _score: null,
+              _source: {
+                host: {
+                  os: {
+                    kernel: '5.0.0-1013-gcp',
+                    name: 'Ubuntu',
+                    family: 'debian',
+                    version: '18.04.2 LTS (Bionic Beaver)',
+                    platform: 'ubuntu',
+                  },
+                },
+              },
+              sort: [1571925726017],
+            },
+          ],
+        },
       },
     };
 
diff --git a/x-pack/legacy/plugins/siem/server/lib/hosts/elasticsearch_adapter.ts b/x-pack/legacy/plugins/siem/server/lib/hosts/elasticsearch_adapter.ts
index 792a1a4be53074..1b69863a443bc4 100644
--- a/x-pack/legacy/plugins/siem/server/lib/hosts/elasticsearch_adapter.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/hosts/elasticsearch_adapter.ts
@@ -117,7 +117,6 @@ export const formatHostEdgesData = (fields: readonly string[], bucket: HostAggEs
       const hostId = get('key', bucket);
       flattenedFields.node._id = hostId || null;
       flattenedFields.cursor.value = hostId || '';
-
       const fieldValue = getHostFieldValue(fieldName, bucket);
       if (fieldValue != null) {
         return set(`node.${fieldName}`, fieldValue, flattenedFields);
@@ -164,6 +163,15 @@ const getHostFieldValue = (fieldName: string, bucket: HostAggEsItem): string | s
   } else if (has(aggField, bucket)) {
     const valueObj: HostValue = get(aggField, bucket);
     return valueObj.value_as_string;
+  } else if (['host.name', 'host.os.name', 'host.os.version'].includes(fieldName)) {
+    switch (fieldName) {
+      case 'host.name':
+        return get('key', bucket) || null;
+      case 'host.os.name':
+        return get('os.hits.hits[0]._source.host.os.name', bucket) || null;
+      case 'host.os.version':
+        return get('os.hits.hits[0]._source.host.os.version', bucket) || null;
+    }
   }
   return null;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/hosts/helpers.ts b/x-pack/legacy/plugins/siem/server/lib/hosts/helpers.ts
index fbc7a2146a9b52..886c2d521caba4 100644
--- a/x-pack/legacy/plugins/siem/server/lib/hosts/helpers.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/hosts/helpers.ts
@@ -10,12 +10,12 @@ export const buildFieldsTermAggregation = (esFields: readonly string[]): Aggrega
   esFields.reduce<AggregationRequest>(
     (res, field) => ({
       ...res,
-      ...getAggregationTypeFromField(field),
+      ...getTermsAggregationTypeFromField(field),
     }),
     {}
   );
 
-const getAggregationTypeFromField = (field: string): AggregationRequest => {
+const getTermsAggregationTypeFromField = (field: string): AggregationRequest => {
   return {
     [field.replace(/\./g, '_')]: {
       terms: {
diff --git a/x-pack/legacy/plugins/siem/server/lib/hosts/query.hosts.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/hosts/query.hosts.dsl.ts
index 0e1ed8f6011c2a..70f57769362f58 100644
--- a/x-pack/legacy/plugins/siem/server/lib/hosts/query.hosts.dsl.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/hosts/query.hosts.dsl.ts
@@ -6,11 +6,8 @@
 
 import { Direction, HostsFields, HostsSortField } from '../../graphql/types';
 import { assertUnreachable, createQueryFilterClauses } from '../../utils/build_query';
-import { reduceFields } from '../../utils/build_query/reduce_fields';
-import { hostFieldsMap } from '../ecs_fields';
 
 import { HostsRequestOptions } from '.';
-import { buildFieldsTermAggregation } from './helpers';
 
 export const buildHostsQuery = ({
   defaultIndex,
@@ -23,8 +20,6 @@ export const buildHostsQuery = ({
   },
   timerange: { from, to },
 }: HostsRequestOptions) => {
-  const esFields = reduceFields(fields, hostFieldsMap);
-
   const filter = [
     ...createQueryFilterClauses(filterQuery),
     {
@@ -50,9 +45,21 @@ export const buildHostsQuery = ({
           terms: { size: querySize, field: 'host.name', order: getQueryOrder(sort) },
           aggs: {
             lastSeen: { max: { field: '@timestamp' } },
-            ...buildFieldsTermAggregation(
-              esFields.filter(field => !['@timestamp', '_id'].includes(field))
-            ),
+            os: {
+              top_hits: {
+                size: 1,
+                sort: [
+                  {
+                    '@timestamp': {
+                      order: 'desc',
+                    },
+                  },
+                ],
+                _source: {
+                  includes: ['host.os.*'],
+                },
+              },
+            },
           },
         },
       },
diff --git a/x-pack/legacy/plugins/siem/server/lib/hosts/types.ts b/x-pack/legacy/plugins/siem/server/lib/hosts/types.ts
index 63360492c1cf32..e52cfe9d7feebd 100644
--- a/x-pack/legacy/plugins/siem/server/lib/hosts/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/hosts/types.ts
@@ -10,11 +10,13 @@ import {
   HostItem,
   HostsData,
   HostsSortField,
+  Maybe,
+  OsEcsFields,
   SourceConfiguration,
   TimerangeInput,
 } from '../../graphql/types';
 import { FrameworkRequest, RequestOptionsPaginated } from '../framework';
-import { Hit, Hits, SearchHit } from '../types';
+import { Hit, Hits, SearchHit, TotalValue } from '../types';
 
 export interface HostsAdapter {
   getHosts(req: FrameworkRequest, options: HostsRequestOptions): Promise<HostsData>;
@@ -71,23 +73,38 @@ export interface HostBuckets {
   buckets: HostBucketItem[];
 }
 
+export interface HostOsHitsItem {
+  hits: {
+    total: TotalValue | number;
+    max_score: number | null;
+    hits: Array<{
+      _source: { host: { os: Maybe<OsEcsFields> } };
+      sort?: [number];
+      _index?: string;
+      _type?: string;
+      _id?: string;
+      _score?: number | null;
+    }>;
+  };
+}
+
 export interface HostAggEsItem {
   cloud_instance_id?: HostBuckets;
   cloud_machine_type?: HostBuckets;
   cloud_provider?: HostBuckets;
   cloud_region?: HostBuckets;
-  key?: string;
   firstSeen?: HostValue;
-  lastSeen?: HostValue;
   host_architecture?: HostBuckets;
   host_id?: HostBuckets;
   host_ip?: HostBuckets;
   host_mac?: HostBuckets;
   host_name?: HostBuckets;
-  host_os?: HostBuckets;
   host_os_name?: HostBuckets;
   host_os_version?: HostBuckets;
   host_type?: HostBuckets;
+  key?: string;
+  lastSeen?: HostValue;
+  os?: HostOsHitsItem;
 }
 
 export interface HostEsData extends SearchHit {
diff --git a/x-pack/legacy/plugins/siem/server/lib/network/__snapshots__/elastic_adapter.test.ts.snap b/x-pack/legacy/plugins/siem/server/lib/network/__snapshots__/elastic_adapter.test.ts.snap
new file mode 100644
index 00000000000000..50454fcb6b351f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/network/__snapshots__/elastic_adapter.test.ts.snap
@@ -0,0 +1,1366 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Network Top N flow elasticsearch_adapter with FlowTarget=source Unhappy Path - No geo data getNetworkTopNFlow 1`] = `
+Object {
+  "edges": Array [
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "1.1.1.1",
+      },
+      "node": Object {
+        "_id": "1.1.1.1",
+        "network": Object {
+          "bytes_in": 11276023407,
+          "bytes_out": 1025631,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.1.net",
+          ],
+          "flows": 1234567,
+          "ip": "1.1.1.1",
+          "location": null,
+        },
+      },
+    },
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "2.2.2.2",
+      },
+      "node": Object {
+        "_id": "2.2.2.2",
+        "network": Object {
+          "bytes_in": 5469323342,
+          "bytes_out": 2811441,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.2.net",
+          ],
+          "flows": 1234567,
+          "ip": "2.2.2.2",
+          "location": Object {
+            "flowTarget": "source",
+            "geo": Object {
+              "city_name": "Philadelphia",
+              "continent_name": "North America",
+              "country_iso_code": "US",
+              "location": Object {
+                "lat": 39.9359,
+                "lon": -75.1534,
+              },
+              "region_iso_code": "US-PA",
+              "region_name": "Pennsylvania",
+            },
+          },
+        },
+      },
+    },
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "3.3.3.3",
+      },
+      "node": Object {
+        "_id": "3.3.3.3",
+        "network": Object {
+          "bytes_in": 3807671322,
+          "bytes_out": 4494034,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.3.com",
+            "test.3-duplicate.com",
+          ],
+          "flows": 1234567,
+          "ip": "3.3.3.3",
+          "location": Object {
+            "flowTarget": "source",
+            "geo": Object {
+              "city_name": "Philadelphia",
+              "continent_name": "North America",
+              "country_iso_code": "US",
+              "location": Object {
+                "lat": 39.9359,
+                "lon": -75.1534,
+              },
+              "region_iso_code": "US-PA",
+              "region_name": "Pennsylvania",
+            },
+          },
+        },
+      },
+    },
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "4.4.4.4",
+      },
+      "node": Object {
+        "_id": "4.4.4.4",
+        "network": Object {
+          "bytes_in": 166517626,
+          "bytes_out": 3194782,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.4.com",
+          ],
+          "flows": 1234567,
+          "ip": "4.4.4.4",
+          "location": Object {
+            "flowTarget": "source",
+            "geo": Object {
+              "city_name": "Philadelphia",
+              "continent_name": "North America",
+              "country_iso_code": "US",
+              "location": Object {
+                "lat": 39.9359,
+                "lon": -75.1534,
+              },
+              "region_iso_code": "US-PA",
+              "region_name": "Pennsylvania",
+            },
+          },
+        },
+      },
+    },
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "5.5.5.5",
+      },
+      "node": Object {
+        "_id": "5.5.5.5",
+        "network": Object {
+          "bytes_in": 104785026,
+          "bytes_out": 1838597,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.5.com",
+          ],
+          "flows": 1234567,
+          "ip": "5.5.5.5",
+          "location": Object {
+            "flowTarget": "source",
+            "geo": Object {
+              "city_name": "Philadelphia",
+              "continent_name": "North America",
+              "country_iso_code": "US",
+              "location": Object {
+                "lat": 39.9359,
+                "lon": -75.1534,
+              },
+              "region_iso_code": "US-PA",
+              "region_name": "Pennsylvania",
+            },
+          },
+        },
+      },
+    },
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "6.6.6.6",
+      },
+      "node": Object {
+        "_id": "6.6.6.6",
+        "network": Object {
+          "bytes_in": 28804250,
+          "bytes_out": 482982,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.6.com",
+          ],
+          "flows": 1234567,
+          "ip": "6.6.6.6",
+          "location": Object {
+            "flowTarget": "source",
+            "geo": Object {
+              "city_name": "Philadelphia",
+              "continent_name": "North America",
+              "country_iso_code": "US",
+              "location": Object {
+                "lat": 39.9359,
+                "lon": -75.1534,
+              },
+              "region_iso_code": "US-PA",
+              "region_name": "Pennsylvania",
+            },
+          },
+        },
+      },
+    },
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "7.7.7.7",
+      },
+      "node": Object {
+        "_id": "7.7.7.7",
+        "network": Object {
+          "bytes_in": 23032363,
+          "bytes_out": 400623,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.7.com",
+          ],
+          "flows": 1234567,
+          "ip": "7.7.7.7",
+          "location": Object {
+            "flowTarget": "source",
+            "geo": Object {
+              "city_name": "Philadelphia",
+              "continent_name": "North America",
+              "country_iso_code": "US",
+              "location": Object {
+                "lat": 39.9359,
+                "lon": -75.1534,
+              },
+              "region_iso_code": "US-PA",
+              "region_name": "Pennsylvania",
+            },
+          },
+        },
+      },
+    },
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "8.8.8.8",
+      },
+      "node": Object {
+        "_id": "8.8.8.8",
+        "network": Object {
+          "bytes_in": 21424889,
+          "bytes_out": 344357,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.8.com",
+          ],
+          "flows": 1234567,
+          "ip": "8.8.8.8",
+          "location": Object {
+            "flowTarget": "source",
+            "geo": Object {
+              "city_name": "Philadelphia",
+              "continent_name": "North America",
+              "country_iso_code": "US",
+              "location": Object {
+                "lat": 39.9359,
+                "lon": -75.1534,
+              },
+              "region_iso_code": "US-PA",
+              "region_name": "Pennsylvania",
+            },
+          },
+        },
+      },
+    },
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "9.9.9.9",
+      },
+      "node": Object {
+        "_id": "9.9.9.9",
+        "network": Object {
+          "bytes_in": 19205000,
+          "bytes_out": 355663,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.9.com",
+          ],
+          "flows": 1234567,
+          "ip": "9.9.9.9",
+          "location": Object {
+            "flowTarget": "source",
+            "geo": Object {
+              "city_name": "Philadelphia",
+              "continent_name": "North America",
+              "country_iso_code": "US",
+              "location": Object {
+                "lat": 39.9359,
+                "lon": -75.1534,
+              },
+              "region_iso_code": "US-PA",
+              "region_name": "Pennsylvania",
+            },
+          },
+        },
+      },
+    },
+    Object {
+      "cursor": Object {
+        "tiebreaker": null,
+        "value": "10.10.10.10",
+      },
+      "node": Object {
+        "_id": "10.10.10.10",
+        "network": Object {
+          "bytes_in": 11407633,
+          "bytes_out": 199360,
+        },
+        "source": Object {
+          "autonomous_system": Object {
+            "name": "Level 3 Parent, LLC",
+            "number": 3356,
+          },
+          "destination_ips": 345345,
+          "domain": Array [
+            "test.10.com",
+          ],
+          "flows": 1234567,
+          "ip": "10.10.10.10",
+          "location": Object {
+            "flowTarget": "source",
+            "geo": Object {
+              "city_name": "Philadelphia",
+              "continent_name": "North America",
+              "country_iso_code": "US",
+              "location": Object {
+                "lat": 39.9359,
+                "lon": -75.1534,
+              },
+              "region_iso_code": "US-PA",
+              "region_name": "Pennsylvania",
+            },
+          },
+        },
+      },
+    },
+  ],
+  "inspect": Object {
+    "dsl": Array [
+      "{
+  \\"mockTopNFlowQueryDsl\\": \\"mockTopNFlowQueryDsl\\"
+}",
+    ],
+    "response": Array [
+      "{
+  \\"took\\": 122,
+  \\"timed_out\\": false,
+  \\"_shards\\": {
+    \\"total\\": 11,
+    \\"successful\\": 11,
+    \\"skipped\\": 0,
+    \\"failed\\": 0
+  },
+  \\"hits\\": {
+    \\"max_score\\": null,
+    \\"hits\\": []
+  },
+  \\"aggregations\\": {
+    \\"top_n_flow_count\\": {
+      \\"value\\": 545
+    },
+    \\"source\\": {
+      \\"buckets\\": [
+        {
+          \\"key\\": \\"1.1.1.1\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 11276023407
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 1025631
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": []
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.1.net\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"2.2.2.2\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 5469323342
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 2811441
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.2.net\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"3.3.3.3\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 3807671322
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 4494034
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.3.com\\"
+              },
+              {
+                \\"key\\": \\"test.3-duplicate.com\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"4.4.4.4\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 166517626
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 3194782
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.4.com\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"5.5.5.5\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 104785026
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 1838597
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.5.com\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"6.6.6.6\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 28804250
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 482982
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"doc_count_error_upper_bound\\": 0,
+            \\"sum_other_doc_count\\": 31,
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.6.com\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"7.7.7.7\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 23032363
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 400623
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"doc_count_error_upper_bound\\": 0,
+            \\"sum_other_doc_count\\": 0,
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.7.com\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"8.8.8.8\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 21424889
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 344357
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.8.com\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"9.9.9.9\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 19205000
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 355663
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.9.com\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"10.10.10.10\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 11407633
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 199360
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.10.com\\"
+              }
+            ]
+          }
+        },
+        {
+          \\"key\\": \\"11.11.11.11\\",
+          \\"flows\\": {
+            \\"value\\": 1234567
+          },
+          \\"destination_ips\\": {
+            \\"value\\": 345345
+          },
+          \\"bytes_in\\": {
+            \\"value\\": 11393327
+          },
+          \\"bytes_out\\": {
+            \\"value\\": 195914
+          },
+          \\"location\\": {
+            \\"doc_count\\": 14,
+            \\"top_geo\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"geo\\": {
+                          \\"continent_name\\": \\"North America\\",
+                          \\"region_iso_code\\": \\"US-PA\\",
+                          \\"city_name\\": \\"Philadelphia\\",
+                          \\"country_iso_code\\": \\"US\\",
+                          \\"region_name\\": \\"Pennsylvania\\",
+                          \\"location\\": {
+                            \\"lon\\": -75.1534,
+                            \\"lat\\": 39.9359
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"autonomous_system\\": {
+            \\"doc_count\\": 14,
+            \\"top_as\\": {
+              \\"hits\\": {
+                \\"total\\": {
+                  \\"value\\": 14,
+                  \\"relation\\": \\"eq\\"
+                },
+                \\"max_score\\": 1,
+                \\"hits\\": [
+                  {
+                    \\"_index\\": \\"filebeat-8.0.0-2019.06.19-000005\\",
+                    \\"_type\\": \\"_doc\\",
+                    \\"_id\\": \\"dd4fa2d4bd-692279846149410\\",
+                    \\"_score\\": 1,
+                    \\"_source\\": {
+                      \\"source\\": {
+                        \\"as\\": {
+                          \\"number\\": 3356,
+                          \\"organization\\": {
+                            \\"name\\": \\"Level 3 Parent, LLC\\"
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          \\"domain\\": {
+            \\"buckets\\": [
+              {
+                \\"key\\": \\"test.11.com\\"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}",
+    ],
+  },
+  "pageInfo": Object {
+    "activePage": 0,
+    "fakeTotalCount": 50,
+    "showMorePagesIndicator": true,
+  },
+  "totalCount": 545,
+}
+`;
diff --git a/x-pack/legacy/plugins/siem/server/lib/network/elastic_adapter.test.ts b/x-pack/legacy/plugins/siem/server/lib/network/elastic_adapter.test.ts
index c3bcfafac87574..542a2a0108a9aa 100644
--- a/x-pack/legacy/plugins/siem/server/lib/network/elastic_adapter.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/network/elastic_adapter.test.ts
@@ -96,6 +96,36 @@ describe('Network Top N flow elasticsearch_adapter with FlowTarget=source', () =
     });
   });
 
+  describe('Unhappy Path - No geo data', () => {
+    const mockCallWithRequest = jest.fn();
+    const mockNoGeoDataResponse = cloneDeep(mockResponse);
+    // sometimes bad things happen to good ecs
+    mockNoGeoDataResponse.aggregations[
+      FlowTargetSourceDest.source
+    ].buckets[0].location.top_geo.hits.hits = [];
+    mockCallWithRequest.mockResolvedValue(mockNoGeoDataResponse);
+    const mockFramework: FrameworkAdapter = {
+      version: 'mock',
+      callWithRequest: mockCallWithRequest,
+      exposeStaticDir: jest.fn(),
+      getIndexPatternsService: jest.fn(),
+      getSavedObjectsService: jest.fn(),
+      registerGraphQLEndpoint: jest.fn(),
+    };
+    jest.doMock('../framework', () => ({
+      callWithRequest: mockCallWithRequest,
+    }));
+
+    test('getNetworkTopNFlow', async () => {
+      const EsNetworkTopNFlow = new ElasticsearchNetworkAdapter(mockFramework);
+      const data: NetworkTopNFlowData = await EsNetworkTopNFlow.getNetworkTopNFlow(
+        mockRequest as FrameworkRequest,
+        mockOptions
+      );
+      expect(data).toMatchSnapshot();
+    });
+  });
+
   describe('No pagination', () => {
     const mockNoPaginationResponse = cloneDeep(mockResponse);
     mockNoPaginationResponse.aggregations.top_n_flow_count.value = 10;
diff --git a/x-pack/legacy/plugins/siem/server/lib/network/elasticsearch_adapter.ts b/x-pack/legacy/plugins/siem/server/lib/network/elasticsearch_adapter.ts
index 5a871a3f9c9b41..39babc58ee138c 100644
--- a/x-pack/legacy/plugins/siem/server/lib/network/elasticsearch_adapter.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/network/elasticsearch_adapter.ts
@@ -15,6 +15,8 @@ import {
   NetworkTopCountriesData,
   NetworkTopCountriesEdges,
   NetworkTopNFlowData,
+  NetworkHttpData,
+  NetworkHttpEdges,
   NetworkTopNFlowEdges,
 } from '../../graphql/types';
 import { inspectStringifyObject } from '../../utils/build_query';
@@ -25,15 +27,18 @@ import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../common/constants';
 import {
   NetworkDnsRequestOptions,
   NetworkTopCountriesRequestOptions,
+  NetworkHttpRequestOptions,
   NetworkTopNFlowRequestOptions,
 } from './index';
 import { buildDnsQuery } from './query_dns.dsl';
 import { buildTopNFlowQuery, getOppositeField } from './query_top_n_flow.dsl';
+import { buildHttpQuery } from './query_http.dsl';
 import { buildTopCountriesQuery } from './query_top_countries.dsl';
 import {
   NetworkAdapter,
   NetworkDnsBuckets,
   NetworkTopCountriesBuckets,
+  NetworkHttpBuckets,
   NetworkTopNFlowBuckets,
 } from './types';
 
@@ -151,6 +156,42 @@ export class ElasticsearchNetworkAdapter implements NetworkAdapter {
       totalCount,
     };
   }
+
+  public async getNetworkHttp(
+    request: FrameworkRequest,
+    options: NetworkHttpRequestOptions
+  ): Promise<NetworkHttpData> {
+    if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
+      throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
+    }
+    const dsl = buildHttpQuery(options);
+    const response = await this.framework.callWithRequest<NetworkHttpData, TermAggregation>(
+      request,
+      'search',
+      dsl
+    );
+    const { activePage, cursorStart, fakePossibleCount, querySize } = options.pagination;
+    const totalCount = getOr(0, 'aggregations.http_count.value', response);
+    const networkHttpEdges: NetworkHttpEdges[] = getHttpEdges(response);
+    const fakeTotalCount = fakePossibleCount <= totalCount ? fakePossibleCount : totalCount;
+    const edges = networkHttpEdges.splice(cursorStart, querySize - cursorStart);
+    const inspect = {
+      dsl: [inspectStringifyObject(dsl)],
+      response: [inspectStringifyObject(response)],
+    };
+    const showMorePagesIndicator = totalCount > fakeTotalCount;
+
+    return {
+      edges,
+      inspect,
+      pageInfo: {
+        activePage: activePage ? activePage : 0,
+        fakeTotalCount,
+        showMorePagesIndicator,
+      },
+      totalCount,
+    };
+  }
 }
 
 const getTopNFlowEdges = (
@@ -173,6 +214,12 @@ const getTopCountriesEdges = (
   );
 };
 
+const getHttpEdges = (
+  response: DatabaseSearchResponse<NetworkHttpData, TermAggregation>
+): NetworkHttpEdges[] => {
+  return formatHttpEdges(getOr([], `aggregations.url.buckets`, response));
+};
+
 const getFlowTargetFromString = (flowAsString: string) =>
   flowAsString === 'source' ? FlowTargetSourceDest.source : FlowTargetSourceDest.destination;
 
@@ -193,19 +240,20 @@ const getGeoItem = (result: NetworkTopNFlowBuckets): GeoItem | null =>
     : null;
 
 const getAsItem = (result: NetworkTopNFlowBuckets): AutonomousSystemItem | null =>
-  result.autonomous_system.top_as.hits.hits.length > 0
+  result.autonomous_system.top_as.hits.hits.length > 0 &&
+  result.autonomous_system.top_as.hits.hits[0]._source
     ? {
         number: getOr(
           null,
           `autonomous_system.top_as.hits.hits[0]._source.${
-            Object.keys(result.location.top_geo.hits.hits[0]._source)[0]
+            Object.keys(result.autonomous_system.top_as.hits.hits[0]._source)[0]
           }.as.number`,
           result
         ),
         name: getOr(
           '',
           `autonomous_system.top_as.hits.hits[0]._source.${
-            Object.keys(result.location.top_geo.hits.hits[0]._source)[0]
+            Object.keys(result.autonomous_system.top_as.hits.hits[0]._source)[0]
           }.as.organization.name`,
           result
         ),
@@ -286,6 +334,24 @@ const formatDnsEdges = (buckets: NetworkDnsBuckets[]): NetworkDnsEdges[] =>
     },
   }));
 
+const formatHttpEdges = (buckets: NetworkHttpBuckets[]): NetworkHttpEdges[] =>
+  buckets.map((bucket: NetworkHttpBuckets) => ({
+    node: {
+      _id: bucket.key,
+      domains: bucket.domains.buckets.map(({ key }) => key),
+      methods: bucket.methods.buckets.map(({ key }) => key),
+      statuses: bucket.status.buckets.map(({ key }) => `${key}`),
+      lastHost: get('source.hits.hits[0]._source.host.name', bucket),
+      lastSourceIp: get('source.hits.hits[0]._source.source.ip', bucket),
+      path: bucket.key,
+      requestCount: bucket.doc_count,
+    },
+    cursor: {
+      value: bucket.key,
+      tiebreaker: null,
+    },
+  }));
+
 const getOrNumber = (path: string, bucket: NetworkTopNFlowBuckets | NetworkDnsBuckets) => {
   const numb = get(path, bucket);
   if (numb == null) {
diff --git a/x-pack/legacy/plugins/siem/server/lib/network/index.ts b/x-pack/legacy/plugins/siem/server/lib/network/index.ts
index e391dd922ce31c..0a2de936799b60 100644
--- a/x-pack/legacy/plugins/siem/server/lib/network/index.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/network/index.ts
@@ -7,7 +7,10 @@
 import {
   FlowTargetSourceDest,
   Maybe,
+  NetworkDnsData,
   NetworkDnsSortField,
+  NetworkHttpData,
+  NetworkHttpSortField,
   NetworkTopCountriesData,
   NetworkTopNFlowData,
   NetworkTopTablesSortField,
@@ -30,6 +33,11 @@ export interface NetworkTopCountriesRequestOptions extends RequestOptionsPaginat
   ip?: Maybe<string>;
 }
 
+export interface NetworkHttpRequestOptions extends RequestOptionsPaginated {
+  networkHttpSort: NetworkHttpSortField;
+  ip?: Maybe<string>;
+}
+
 export interface NetworkDnsRequestOptions extends RequestOptionsPaginated {
   isPtrIncluded: boolean;
   networkDnsSortField: NetworkDnsSortField;
@@ -55,7 +63,14 @@ export class Network {
   public async getNetworkDns(
     req: FrameworkRequest,
     options: NetworkDnsRequestOptions
-  ): Promise<NetworkTopNFlowData> {
+  ): Promise<NetworkDnsData> {
     return this.adapter.getNetworkDns(req, options);
   }
+
+  public async getNetworkHttp(
+    req: FrameworkRequest,
+    options: NetworkHttpRequestOptions
+  ): Promise<NetworkHttpData> {
+    return this.adapter.getNetworkHttp(req, options);
+  }
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/network/query_http.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/network/query_http.dsl.ts
new file mode 100644
index 00000000000000..3e33b5af80a855
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/network/query_http.dsl.ts
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { NetworkHttpSortField } from '../../graphql/types';
+import { createQueryFilterClauses } from '../../utils/build_query';
+
+import { NetworkHttpRequestOptions } from './index';
+
+const getCountAgg = () => ({
+  http_count: {
+    cardinality: {
+      field: 'url.path',
+    },
+  },
+});
+
+export const buildHttpQuery = ({
+  defaultIndex,
+  filterQuery,
+  networkHttpSort,
+  pagination: { querySize },
+  sourceConfiguration: {
+    fields: { timestamp },
+  },
+  timerange: { from, to },
+  ip,
+}: NetworkHttpRequestOptions) => {
+  const filter = [
+    ...createQueryFilterClauses(filterQuery),
+    { range: { [timestamp]: { gte: from, lte: to } } },
+    { exists: { field: 'http.request.method' } },
+  ];
+
+  const dslQuery = {
+    allowNoIndices: true,
+    index: defaultIndex,
+    ignoreUnavailable: true,
+    body: {
+      aggregations: {
+        ...getCountAgg(),
+        ...getHttpAggs(networkHttpSort, querySize),
+      },
+      query: {
+        bool: ip
+          ? {
+              filter,
+              should: [
+                {
+                  term: {
+                    'source.ip': ip,
+                  },
+                },
+                {
+                  term: {
+                    'destination.ip': ip,
+                  },
+                },
+              ],
+              minimum_should_match: 1,
+            }
+          : {
+              filter,
+            },
+      },
+    },
+    size: 0,
+    track_total_hits: false,
+  };
+  return dslQuery;
+};
+
+const getHttpAggs = (networkHttpSortField: NetworkHttpSortField, querySize: number) => ({
+  url: {
+    terms: {
+      field: `url.path`,
+      size: querySize,
+      order: {
+        _count: networkHttpSortField.direction,
+      },
+    },
+    aggs: {
+      methods: {
+        terms: {
+          field: 'http.request.method',
+          size: 4,
+        },
+      },
+      domains: {
+        terms: {
+          field: 'url.domain',
+          size: 4,
+        },
+      },
+      status: {
+        terms: {
+          field: 'http.response.status_code',
+          size: 4,
+        },
+      },
+      source: {
+        top_hits: {
+          size: 1,
+          _source: {
+            includes: ['host.name', 'source.ip'],
+          },
+        },
+      },
+    },
+  },
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/network/types.ts b/x-pack/legacy/plugins/siem/server/lib/network/types.ts
index e2e443fb502591..6afcb211b59961 100644
--- a/x-pack/legacy/plugins/siem/server/lib/network/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/network/types.ts
@@ -4,7 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { NetworkTopCountriesData, NetworkDnsData, NetworkTopNFlowData } from '../../graphql/types';
+import {
+  NetworkDnsData,
+  NetworkHttpData,
+  NetworkTopCountriesData,
+  NetworkTopNFlowData,
+} from '../../graphql/types';
 import { FrameworkRequest, RequestOptionsPaginated } from '../framework';
 import { TotalValue } from '../types';
 
@@ -18,6 +23,7 @@ export interface NetworkAdapter {
     options: RequestOptionsPaginated
   ): Promise<NetworkTopNFlowData>;
   getNetworkDns(req: FrameworkRequest, options: RequestOptionsPaginated): Promise<NetworkDnsData>;
+  getNetworkHttp(req: FrameworkRequest, options: RequestOptionsPaginated): Promise<NetworkHttpData>;
 }
 
 export interface GenericBuckets {
@@ -61,6 +67,21 @@ interface AutonomousSystemHit<T> {
   };
 }
 
+interface HttpHit<T> {
+  hits: {
+    total: TotalValue | number;
+    max_score: number | null;
+    hits: Array<{
+      _source: T;
+      sort?: [number];
+      _index?: string;
+      _type?: string;
+      _id?: string;
+      _score?: number | null;
+    }>;
+  };
+}
+
 export interface NetworkTopNFlowBuckets {
   key: string;
   autonomous_system: AutonomousSystemHit<object>;
@@ -106,3 +127,18 @@ export interface NetworkDnsBuckets {
     value: number;
   };
 }
+
+export interface NetworkHttpBuckets {
+  key: string;
+  doc_count: number;
+  domains: {
+    buckets: GenericBuckets[];
+  };
+  methods: {
+    buckets: GenericBuckets[];
+  };
+  source: HttpHit<object>;
+  status: {
+    buckets: GenericBuckets[];
+  };
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/types.ts b/x-pack/legacy/plugins/siem/server/lib/types.ts
index d690954f880577..ad099b728db36c 100644
--- a/x-pack/legacy/plugins/siem/server/lib/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/types.ts
@@ -193,5 +193,16 @@ export interface AggregationRequest {
         };
       };
     };
+    top_hits?: {
+      size?: number;
+      sort?: Array<{
+        [aggSortField: string]: {
+          order: SortRequestDirection;
+        };
+      }>;
+      _source: {
+        includes: string[];
+      };
+    };
   };
 }
diff --git a/x-pack/legacy/plugins/siem/server/utils/beat_schema/index.test.ts b/x-pack/legacy/plugins/siem/server/utils/beat_schema/index.test.ts
index 2be7724f4097fe..53ed7c26b877f6 100644
--- a/x-pack/legacy/plugins/siem/server/utils/beat_schema/index.test.ts
+++ b/x-pack/legacy/plugins/siem/server/utils/beat_schema/index.test.ts
@@ -6,7 +6,7 @@
 
 import { cloneDeep, isArray } from 'lodash/fp';
 
-import { convertSchemaToAssociativeArray, getIndexSchemaDoc } from '.';
+import { convertSchemaToAssociativeArray, getIndexSchemaDoc, getIndexAlias } from '.';
 import { auditbeatSchema, filebeatSchema, packetbeatSchema } from './8.0.0';
 import { Schema } from './type';
 
@@ -657,4 +657,17 @@ describe('Schema Beat', () => {
       ]);
     });
   });
+
+  describe('getIndexAlias', () => {
+    test('getIndexAlias handles values with leading wildcard', () => {
+      const leadingWildcardIndex = '*-auditbeat-*';
+      const result = getIndexAlias([leadingWildcardIndex], leadingWildcardIndex);
+      expect(result).toBe(leadingWildcardIndex);
+    });
+    test('getIndexAlias no match returns "unknown" string', () => {
+      const index = 'auditbeat-*';
+      const result = getIndexAlias([index], 'hello');
+      expect(result).toBe('unknown');
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/utils/beat_schema/index.ts b/x-pack/legacy/plugins/siem/server/utils/beat_schema/index.ts
index aaa171c6befd9c..a191bd835a7c73 100644
--- a/x-pack/legacy/plugins/siem/server/utils/beat_schema/index.ts
+++ b/x-pack/legacy/plugins/siem/server/utils/beat_schema/index.ts
@@ -77,7 +77,7 @@ const convertFieldsToAssociativeArray = (
     : {};
 
 export const getIndexAlias = (defaultIndex: string[], indexName: string): string => {
-  const found = defaultIndex.find(index => indexName.match(index) != null);
+  const found = defaultIndex.find(index => `\\${indexName}`.match(`\\${index}`) != null);
   if (found != null) {
     return found;
   } else {
diff --git a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/home.test.ts b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/home.test.ts
index 7f4860e74bafea..e2782a1358251c 100644
--- a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/home.test.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/home.test.ts
@@ -400,9 +400,7 @@ describe.skip('<SnapshotRestoreHome />', () => {
 
       test('should invite the user to first register a repository', () => {
         const { find, exists } = testBed;
-        expect(find('emptyPrompt.title').text()).toBe(
-          `You don't have any snapshots or repositories yet`
-        );
+        expect(find('emptyPrompt.title').text()).toBe('Start by registering a repository');
         expect(exists('emptyPrompt.registerRepositoryButton')).toBe(true);
       });
     });
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_logistics.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_logistics.tsx
index 80240ae0e77180..7c3036b3d79c29 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_logistics.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_logistics.tsx
@@ -476,12 +476,12 @@ export const PolicyStepLogistics: React.FunctionComponent<StepProps> = ({
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle>
-            <h3>
+            <h2>
               <FormattedMessage
                 id="xpack.snapshotRestore.policyForm.stepLogisticsTitle"
                 defaultMessage="Logistics"
               />
-            </h3>
+            </h2>
           </EuiTitle>
         </EuiFlexItem>
 
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_retention.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_retention.tsx
index 3944cd52c7ee23..c88cbd2736df6d 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_retention.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_retention.tsx
@@ -206,12 +206,12 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle>
-            <h3>
+            <h2>
               <FormattedMessage
                 id="xpack.snapshotRestore.policyForm.stepRetentionTitle"
                 defaultMessage="Snapshot retention (optional)"
               />
-            </h3>
+            </h2>
           </EuiTitle>
         </EuiFlexItem>
 
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_review.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_review.tsx
index 52667ee7ebc871..3ddbcd94009acf 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_review.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_review.tsx
@@ -362,12 +362,12 @@ export const PolicyStepReview: React.FunctionComponent<StepProps> = ({
   return (
     <Fragment>
       <EuiTitle>
-        <h3>
+        <h2>
           <FormattedMessage
             id="xpack.snapshotRestore.policyForm.stepReviewTitle"
             defaultMessage="Review policy"
           />
-        </h3>
+        </h2>
       </EuiTitle>
       <EuiSpacer size="m" />
       <EuiTabbedContent
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_settings.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_settings.tsx
index 6f1b2ed2cef4dc..0997d59b2216d3 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_settings.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/policy_form/steps/step_settings.tsx
@@ -425,12 +425,12 @@ export const PolicyStepSettings: React.FunctionComponent<StepProps> = ({
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle>
-            <h3>
+            <h2>
               <FormattedMessage
                 id="xpack.snapshotRestore.policyForm.stepSettingsTitle"
                 defaultMessage="Snapshot settings"
               />
-            </h3>
+            </h2>
           </EuiTitle>
         </EuiFlexItem>
 
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/repository_form/step_one.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/repository_form/step_one.tsx
index d8cf346dcdc43e..8f6b465b2fe5fa 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/repository_form/step_one.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/repository_form/step_one.tsx
@@ -88,12 +88,12 @@ export const RepositoryFormStepOne: React.FunctionComponent<Props> = ({
     <EuiDescribedFormGroup
       title={
         <EuiTitle size="s">
-          <h3>
+          <h2>
             <FormattedMessage
               id="xpack.snapshotRestore.repositoryForm.fields.nameDescriptionTitle"
               defaultMessage="Repository name"
             />
-          </h3>
+          </h2>
         </EuiTitle>
       }
       description={
@@ -227,12 +227,12 @@ export const RepositoryFormStepOne: React.FunctionComponent<Props> = ({
     return (
       <Fragment>
         <EuiTitle size="s">
-          <h3>
+          <h2>
             <FormattedMessage
               id="xpack.snapshotRestore.repositoryForm.fields.typeDescriptionTitle"
               defaultMessage="Repository type"
             />
-          </h3>
+          </h2>
         </EuiTitle>
         <EuiSpacer size="s" />
         <EuiText id="repositoryTypeDescription" size="s" color="subdued">
@@ -274,12 +274,12 @@ export const RepositoryFormStepOne: React.FunctionComponent<Props> = ({
     <EuiDescribedFormGroup
       title={
         <EuiTitle size="s">
-          <h3>
+          <h2>
             <FormattedMessage
               id="xpack.snapshotRestore.repositoryForm.fields.sourceOnlyDescriptionTitle"
               defaultMessage="Source-only snapshots"
             />
-          </h3>
+          </h2>
         </EuiTitle>
       }
       description={
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_logistics.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_logistics.tsx
index 8a0d8039bb7cd6..f5a3180adbd6e5 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_logistics.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_logistics.tsx
@@ -96,12 +96,12 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle>
-            <h3>
+            <h2>
               <FormattedMessage
                 id="xpack.snapshotRestore.restoreForm.stepLogisticsTitle"
                 defaultMessage="Restore details"
               />
-            </h3>
+            </h2>
           </EuiTitle>
         </EuiFlexItem>
 
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_review.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_review.tsx
index 65a3918d299401..92b0ee48fef01e 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_review.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_review.tsx
@@ -350,12 +350,12 @@ export const RestoreSnapshotStepReview: React.FunctionComponent<StepProps> = ({
   return (
     <Fragment>
       <EuiTitle>
-        <h3>
+        <h2>
           <FormattedMessage
             id="xpack.snapshotRestore.restoreForm.stepReviewTitle"
             defaultMessage="Review restore details"
           />
-        </h3>
+        </h2>
       </EuiTitle>
       <EuiSpacer size="m" />
       <EuiTabbedContent
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_settings.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_settings.tsx
index 6933c47a10ec41..adf0a1334bfcef 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_settings.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/components/restore_snapshot_form/steps/step_settings.tsx
@@ -74,12 +74,12 @@ export const RestoreSnapshotStepSettings: React.FunctionComponent<StepProps> = (
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
           <EuiTitle>
-            <h3>
+            <h2>
               <FormattedMessage
                 id="xpack.snapshotRestore.restoreForm.stepSettingsTitle"
                 defaultMessage="Index settings"
               />
-            </h3>
+            </h2>
           </EuiTitle>
         </EuiFlexItem>
 
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_details/policy_details.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_details/policy_details.tsx
index dfc19069b17aa3..fc49a1fe464ac8 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_details/policy_details.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_details/policy_details.tsx
@@ -20,6 +20,7 @@ import {
   EuiContextMenu,
   EuiButtonIcon,
   EuiLink,
+  EuiSpacer,
 } from '@elastic/eui';
 
 import { SlmPolicy } from '../../../../../../common/types';
@@ -302,49 +303,40 @@ export const PolicyDetails: React.FunctionComponent<Props> = ({
       maxWidth={550}
     >
       <EuiFlyoutHeader>
-        <EuiFlexGroup direction="column" gutterSize="none">
-          <EuiFlexItem>
-            <EuiTitle size="m">
-              <EuiFlexGroup alignItems="center" gutterSize="s">
-                <EuiFlexItem grow={false}>
-                  <h2 id="srPolicyDetailsFlyoutTitle" data-test-subj="title">
-                    {policyName}
-                  </h2>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiButtonIcon
-                    iconType="refresh"
-                    color="subdued"
-                    aria-label={i18n.translate(
-                      'xpack.snapshotRestore.policyDetails.reloadButtonAriaLabel',
-                      { defaultMessage: 'Reload' }
-                    )}
-                    onClick={() => reload()}
-                  />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiTitle>
-          </EuiFlexItem>
-          {policyDetails && policyDetails.policy && policyDetails.policy.inProgress ? (
-            <EuiFlexItem>
-              <SectionLoading inline={true} size="s">
-                <EuiLink
-                  href={linkToSnapshot(
-                    policyDetails.policy.repository,
-                    policyDetails.policy.inProgress.snapshotName
-                  )}
-                  data-test-subj="inProgressSnapshotLink"
-                >
-                  <FormattedMessage
-                    id="xpack.snapshotRestore.policyDetails.inProgressSnapshotLinkText"
-                    defaultMessage="'{snapshotName}' in progress"
-                    values={{ snapshotName: policyDetails.policy.inProgress.snapshotName }}
-                  />
-                </EuiLink>
-              </SectionLoading>
-            </EuiFlexItem>
-          ) : null}
-        </EuiFlexGroup>
+        <EuiTitle size="m">
+          <h2 id="srPolicyDetailsFlyoutTitle" data-test-subj="title">
+            {policyName}{' '}
+            <EuiButtonIcon
+              iconType="refresh"
+              color="subdued"
+              aria-label={i18n.translate(
+                'xpack.snapshotRestore.policyDetails.reloadButtonAriaLabel',
+                { defaultMessage: 'Reload' }
+              )}
+              onClick={() => reload()}
+            />
+          </h2>
+        </EuiTitle>
+        {policyDetails && policyDetails.policy && policyDetails.policy.inProgress ? (
+          <>
+            <EuiSpacer size="s" />
+            <SectionLoading inline={true} size="s">
+              <EuiLink
+                href={linkToSnapshot(
+                  policyDetails.policy.repository,
+                  policyDetails.policy.inProgress.snapshotName
+                )}
+                data-test-subj="inProgressSnapshotLink"
+              >
+                <FormattedMessage
+                  id="xpack.snapshotRestore.policyDetails.inProgressSnapshotLinkText"
+                  defaultMessage="'{snapshotName}' in progress"
+                  values={{ snapshotName: policyDetails.policy.inProgress.snapshotName }}
+                />
+              </EuiLink>
+            </SectionLoading>
+          </>
+        ) : null}
         {renderTabs()}
       </EuiFlyoutHeader>
 
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_list.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_list.tsx
index a1688b8e35486f..dfcf75b5b89a0e 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_list.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_list.tsx
@@ -113,7 +113,7 @@ export const PolicyList: React.FunctionComponent<RouteComponentProps<MatchParams
           <h1>
             <FormattedMessage
               id="xpack.snapshotRestore.policyList.emptyPromptTitle"
-              defaultMessage="You don't have any snapshot policies yet"
+              defaultMessage="Create your first snapshot policy"
             />
           </h1>
         }
@@ -122,7 +122,7 @@ export const PolicyList: React.FunctionComponent<RouteComponentProps<MatchParams
             <p>
               <FormattedMessage
                 id="xpack.snapshotRestore.policyList.emptyPromptDescription"
-                defaultMessage="Create a policy to automatically back up your cluster."
+                defaultMessage="A policy automates the creation and deletion of snapshots."
               />
             </p>
           </Fragment>
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_table/policy_table.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_table/policy_table.tsx
index b544666b671598..01fc904906bf14 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_table/policy_table.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/policy_list/policy_table/policy_table.tsx
@@ -327,36 +327,32 @@ export const PolicyTable: React.FunctionComponent<Props> = ({
     ) : (
       undefined
     ),
-    toolsRight: (
-      <EuiFlexGroup gutterSize="m" justifyContent="spaceAround">
-        <EuiFlexItem>
-          <EuiButton
-            color="secondary"
-            iconType="refresh"
-            onClick={reload}
-            data-test-subj="reloadButton"
-          >
-            <FormattedMessage
-              id="xpack.snapshotRestore.policyList.table.reloadPoliciesButton"
-              defaultMessage="Reload"
-            />
-          </EuiButton>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiButton
-            href={linkToAddPolicy()}
-            fill
-            iconType="plusInCircle"
-            data-test-subj="createPolicyButton"
-          >
-            <FormattedMessage
-              id="xpack.snapshotRestore.policyList.table.addPolicyButton"
-              defaultMessage="Create a policy"
-            />
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    ),
+    toolsRight: [
+      <EuiButton
+        key="reloadPolicies"
+        color="secondary"
+        iconType="refresh"
+        onClick={reload}
+        data-test-subj="reloadButton"
+      >
+        <FormattedMessage
+          id="xpack.snapshotRestore.policyList.table.reloadPoliciesButton"
+          defaultMessage="Reload"
+        />
+      </EuiButton>,
+      <EuiButton
+        key="createNewPolicy"
+        href={linkToAddPolicy()}
+        fill
+        iconType="plusInCircle"
+        data-test-subj="createPolicyButton"
+      >
+        <FormattedMessage
+          id="xpack.snapshotRestore.policyList.table.addPolicyButton"
+          defaultMessage="Create a policy"
+        />
+      </EuiButton>,
+    ],
     box: {
       incremental: true,
       schema: true,
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/repository_list/repository_list.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/repository_list/repository_list.tsx
index fb8eb7b771b87a..5e3250f082fce3 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/repository_list/repository_list.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/repository_list/repository_list.tsx
@@ -99,7 +99,7 @@ export const RepositoryList: React.FunctionComponent<RouteComponentProps<MatchPa
           <h1>
             <FormattedMessage
               id="xpack.snapshotRestore.repositoryList.emptyPromptTitle"
-              defaultMessage="You don't have any repositories yet"
+              defaultMessage="Register your first repository"
             />
           </h1>
         }
@@ -108,7 +108,7 @@ export const RepositoryList: React.FunctionComponent<RouteComponentProps<MatchPa
             <p>
               <FormattedMessage
                 id="xpack.snapshotRestore.repositoryList.emptyPromptDescription"
-                defaultMessage="You need a repository to store your snapshots."
+                defaultMessage="Create a place where your snapshots will live."
               />
             </p>
           </Fragment>
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/repository_list/repository_table/repository_table.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/repository_list/repository_table/repository_table.tsx
index 119733d891ab4e..e8df533cb34969 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/repository_list/repository_table/repository_table.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/repository_list/repository_table/repository_table.tsx
@@ -9,8 +9,6 @@ import {
   EuiBadge,
   EuiButton,
   EuiButtonIcon,
-  EuiFlexGroup,
-  EuiFlexItem,
   EuiInMemoryTable,
   EuiLink,
   EuiToolTip,
@@ -235,36 +233,32 @@ export const RepositoryTable: React.FunctionComponent<Props> = ({
     ) : (
       undefined
     ),
-    toolsRight: (
-      <EuiFlexGroup gutterSize="m" justifyContent="spaceAround">
-        <EuiFlexItem>
-          <EuiButton
-            color="secondary"
-            iconType="refresh"
-            onClick={reload}
-            data-test-subj="reloadButton"
-          >
-            <FormattedMessage
-              id="xpack.snapshotRestore.repositoryList.table.reloadRepositoriesButton"
-              defaultMessage="Reload"
-            />
-          </EuiButton>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiButton
-            href={linkToAddRepository()}
-            fill
-            iconType="plusInCircle"
-            data-test-subj="registerRepositoryButton"
-          >
-            <FormattedMessage
-              id="xpack.snapshotRestore.repositoryList.addRepositoryButtonLabel"
-              defaultMessage="Register a repository"
-            />
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    ),
+    toolsRight: [
+      <EuiButton
+        key="reloadButton"
+        color="secondary"
+        iconType="refresh"
+        onClick={reload}
+        data-test-subj="reloadButton"
+      >
+        <FormattedMessage
+          id="xpack.snapshotRestore.repositoryList.table.reloadRepositoriesButton"
+          defaultMessage="Reload"
+        />
+      </EuiButton>,
+      <EuiButton
+        key="registerRepo"
+        href={linkToAddRepository()}
+        fill
+        iconType="plusInCircle"
+        data-test-subj="registerRepositoryButton"
+      >
+        <FormattedMessage
+          id="xpack.snapshotRestore.repositoryList.addRepositoryButtonLabel"
+          defaultMessage="Register a repository"
+        />
+      </EuiButton>,
+    ],
     box: {
       incremental: true,
       schema: true,
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_list.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_list.tsx
index dfbfcf27e6fab2..ec4b8d9f19fbb9 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_list.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_list.tsx
@@ -98,7 +98,7 @@ export const RestoreList: React.FunctionComponent = () => {
             <h1>
               <FormattedMessage
                 id="xpack.snapshotRestore.restoreList.emptyPromptTitle"
-                defaultMessage="You don't have any restored snapshots"
+                defaultMessage="No restored snapshots"
               />
             </h1>
           }
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
index e9ce9cbe0ac745..955cade353d2ed 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_details/snapshot_details.tsx
@@ -18,7 +18,6 @@ import {
   EuiTab,
   EuiTabs,
   EuiText,
-  EuiTitle,
 } from '@elastic/eui';
 import React, { Fragment, useState, useEffect } from 'react';
 
@@ -256,33 +255,24 @@ export const SnapshotDetails: React.FunctionComponent<Props> = ({
       maxWidth={550}
     >
       <EuiFlyoutHeader>
-        <EuiFlexGroup direction="column" gutterSize="none">
-          <EuiFlexItem>
-            <EuiTitle size="m">
-              <h2 id="srSnapshotDetailsFlyoutTitle" data-test-subj="detailTitle">
-                {snapshotId}
-              </h2>
-            </EuiTitle>
-          </EuiFlexItem>
-
-          <EuiFlexItem>
-            <EuiText size="s">
-              <p>
-                <EuiLink href={linkToRepository(repositoryName)} data-test-subj="repositoryLink">
-                  <FormattedMessage
-                    id="xpack.snapshotRestore.snapshotDetails.repositoryTitle"
-                    defaultMessage="'{repositoryName}' repository"
-                    values={{ repositoryName }}
-                  />
-                </EuiLink>
-              </p>
-            </EuiText>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-
+        <EuiText>
+          <h2 id="srSnapshotDetailsFlyoutTitle" data-test-subj="detailTitle">
+            {snapshotId}
+          </h2>
+          <p>
+            <small>
+              <EuiLink href={linkToRepository(repositoryName)} data-test-subj="repositoryLink">
+                <FormattedMessage
+                  id="xpack.snapshotRestore.snapshotDetails.repositoryTitle"
+                  defaultMessage="'{repositoryName}' repository"
+                  values={{ repositoryName }}
+                />
+              </EuiLink>
+            </small>
+          </p>
+        </EuiText>
         {tabs}
       </EuiFlyoutHeader>
-
       <EuiFlyoutBody data-test-subj="content">{content}</EuiFlyoutBody>
       <EuiFlyoutFooter>{renderFooter()}</EuiFlyoutFooter>
     </EuiFlyout>
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_list.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_list.tsx
index e10a528d8a9616..642a12411e6f33 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_list.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_list.tsx
@@ -168,7 +168,7 @@ export const SnapshotList: React.FunctionComponent<RouteComponentProps<MatchPara
           <h1 data-test-subj="title">
             <FormattedMessage
               id="xpack.snapshotRestore.snapshotList.emptyPrompt.noRepositoriesTitle"
-              defaultMessage="You don't have any snapshots or repositories yet"
+              defaultMessage="Start by registering a repository"
             />
           </h1>
         }
@@ -177,7 +177,7 @@ export const SnapshotList: React.FunctionComponent<RouteComponentProps<MatchPara
             <p>
               <FormattedMessage
                 id="xpack.snapshotRestore.snapshotList.emptyPrompt.noRepositoriesDescription"
-                defaultMessage="Start by registering a repository for your snapshots."
+                defaultMessage="You need a place where your snapshots will live."
               />
             </p>
             <p>
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx b/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx
index 4663b73f1cb7e5..7461edcff10e9f 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx
+++ b/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx
@@ -72,7 +72,7 @@ export const CopySavedObjectsToSpaceFlyout = (props: Props) => {
           }),
         });
       });
-  }, []);
+  }, [spacesManager, toastNotifications]);
   const eligibleSpaces = spaces.filter(space => space.id !== props.activeSpace.id);
 
   const [copyInProgress, setCopyInProgress] = useState(false);
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx b/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
index d8e06c68af7338..d75b8abbe592e7 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
+++ b/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
@@ -6,7 +6,7 @@
 
 import { EuiConfirmModal, EuiOverlayMask } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
-import React, { Component } from 'react';
+import React from 'react';
 
 interface Props {
   onCancel: () => void;
@@ -14,39 +14,35 @@ interface Props {
   intl: InjectedIntl;
 }
 
-class ConfirmAlterActiveSpaceModalUI extends Component<Props, {}> {
-  public render() {
-    return (
-      <EuiOverlayMask>
-        <EuiConfirmModal
-          onConfirm={this.props.onConfirm}
-          onCancel={this.props.onCancel}
-          title={
-            <FormattedMessage
-              id="xpack.spaces.management.confirmAlterActiveSpaceModal.title"
-              defaultMessage="Confirm update space"
-            />
-          }
-          defaultFocusedButton={'confirm'}
-          cancelButtonText={this.props.intl.formatMessage({
-            id: 'xpack.spaces.management.confirmAlterActiveSpaceModal.cancelButton',
-            defaultMessage: 'Cancel',
-          })}
-          confirmButtonText={this.props.intl.formatMessage({
-            id: 'xpack.spaces.management.confirmAlterActiveSpaceModal.updateSpaceButton',
-            defaultMessage: 'Update space',
-          })}
-        >
-          <p>
-            <FormattedMessage
-              id="xpack.spaces.management.confirmAlterActiveSpaceModal.reloadWarningMessage"
-              defaultMessage="You have updated the visible features in this space. Your page will reload after saving."
-            />
-          </p>
-        </EuiConfirmModal>
-      </EuiOverlayMask>
-    );
-  }
-}
+const ConfirmAlterActiveSpaceModalUI: React.SFC<Props> = props => (
+  <EuiOverlayMask>
+    <EuiConfirmModal
+      onConfirm={props.onConfirm}
+      onCancel={props.onCancel}
+      title={
+        <FormattedMessage
+          id="xpack.spaces.management.confirmAlterActiveSpaceModal.title"
+          defaultMessage="Confirm update space"
+        />
+      }
+      defaultFocusedButton={'confirm'}
+      cancelButtonText={props.intl.formatMessage({
+        id: 'xpack.spaces.management.confirmAlterActiveSpaceModal.cancelButton',
+        defaultMessage: 'Cancel',
+      })}
+      confirmButtonText={props.intl.formatMessage({
+        id: 'xpack.spaces.management.confirmAlterActiveSpaceModal.updateSpaceButton',
+        defaultMessage: 'Update space',
+      })}
+    >
+      <p>
+        <FormattedMessage
+          id="xpack.spaces.management.confirmAlterActiveSpaceModal.reloadWarningMessage"
+          defaultMessage="You have updated the visible features in this space. Your page will reload after saving."
+        />
+      </p>
+    </EuiConfirmModal>
+  </EuiOverlayMask>
+);
 
 export const ConfirmAlterActiveSpaceModal = injectI18n(ConfirmAlterActiveSpaceModalUI);
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx b/x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx
index 66cdb0d276e94b..1f0afc706c3f0e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx
+++ b/x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx
@@ -8,7 +8,6 @@ import template from 'plugins/spaces/views/management/template.html';
 import { SpacesNavState } from 'plugins/spaces/views/nav_control';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import 'ui/autoload/styles';
 import { I18nContext } from 'ui/i18n';
 // @ts-ignore
 import routes from 'ui/routes';
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_header_nav_button.tsx b/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_header_nav_button.tsx
index 45bb79ee749eee..2fa0f8ca605b01 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_header_nav_button.tsx
+++ b/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_header_nav_button.tsx
@@ -8,22 +8,18 @@ import {
   // @ts-ignore
   EuiHeaderSectionItemButton,
 } from '@elastic/eui';
-import React, { Component } from 'react';
+import React from 'react';
 import { ButtonProps } from '../types';
 
-export class SpacesHeaderNavButton extends Component<ButtonProps> {
-  public render() {
-    return (
-      <EuiHeaderSectionItemButton
-        aria-controls="headerSpacesMenuList"
-        aria-expanded={this.props.spaceSelectorShown}
-        aria-haspopup="true"
-        aria-label={this.props.linkTitle}
-        title={this.props.linkTitle}
-        onClick={this.props.toggleSpaceSelector}
-      >
-        {this.props.linkIcon}
-      </EuiHeaderSectionItemButton>
-    );
-  }
-}
+export const SpacesHeaderNavButton: React.SFC<ButtonProps> = props => (
+  <EuiHeaderSectionItemButton
+    aria-controls="headerSpacesMenuList"
+    aria-expanded={props.spaceSelectorShown}
+    aria-haspopup="true"
+    aria-label={props.linkTitle}
+    title={props.linkTitle}
+    onClick={props.toggleSpaceSelector}
+  >
+    {props.linkIcon}
+  </EuiHeaderSectionItemButton>
+);
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx b/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
index 4669bd3608e4f2..f0e365c27b8e74 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
+++ b/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiAvatar, EuiPopover, PopoverAnchorPosition } from '@elastic/eui';
-import React, { Component, ComponentClass } from 'react';
+import React, { Component } from 'react';
 import { Space } from '../../../common/model/space';
 import { SpaceAvatar } from '../../components';
 import { SpacesManager } from '../../lib/spaces_manager';
@@ -21,7 +21,7 @@ interface Props {
     space: Space;
   };
   anchorPosition: PopoverAnchorPosition;
-  buttonClass: ComponentClass<ButtonProps>;
+  buttonClass: React.ComponentType<ButtonProps>;
 }
 
 interface State {
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx b/x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx
index 8c650fa778bdd4..6bb0aa47490487 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx
+++ b/x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx
@@ -7,7 +7,6 @@
 import { SpacesManager } from 'plugins/spaces/lib/spaces_manager';
 // @ts-ignore
 import template from 'plugins/spaces/views/space_selector/space_selector.html';
-import 'ui/autoload/styles';
 import chrome from 'ui/chrome';
 import { I18nContext } from 'ui/i18n';
 // @ts-ignore
diff --git a/x-pack/legacy/plugins/task_manager/lib/fill_pool.test.ts b/x-pack/legacy/plugins/task_manager/lib/fill_pool.test.ts
index 860a637d581088..d7ac8d227fc4c0 100644
--- a/x-pack/legacy/plugins/task_manager/lib/fill_pool.test.ts
+++ b/x-pack/legacy/plugins/task_manager/lib/fill_pool.test.ts
@@ -7,13 +7,14 @@
 import _ from 'lodash';
 import sinon from 'sinon';
 import { fillPool } from './fill_pool';
+import { TaskPoolRunResult } from '../task_pool';
 
 describe('fillPool', () => {
   test('stops filling when there are no more tasks in the store', async () => {
     const tasks = [[1, 2, 3], [4, 5]];
     let index = 0;
     const fetchAvailableTasks = async () => tasks[index++] || [];
-    const run = sinon.spy(async () => true);
+    const run = sinon.spy(async () => TaskPoolRunResult.RunningAllClaimedTasks);
     const converter = _.identity;
 
     await fillPool(run, fetchAvailableTasks, converter);
@@ -25,7 +26,7 @@ describe('fillPool', () => {
     const tasks = [[1, 2, 3], [4, 5]];
     let index = 0;
     const fetchAvailableTasks = async () => tasks[index++] || [];
-    const run = sinon.spy(async () => false);
+    const run = sinon.spy(async () => TaskPoolRunResult.RanOutOfCapacity);
     const converter = _.identity;
 
     await fillPool(run, fetchAvailableTasks, converter);
@@ -37,7 +38,7 @@ describe('fillPool', () => {
     const tasks = [[1, 2, 3], [4, 5]];
     let index = 0;
     const fetchAvailableTasks = async () => tasks[index++] || [];
-    const run = sinon.spy(async () => false);
+    const run = sinon.spy(async () => TaskPoolRunResult.RanOutOfCapacity);
     const converter = (x: number) => x.toString();
 
     await fillPool(run, fetchAvailableTasks, converter);
@@ -47,7 +48,7 @@ describe('fillPool', () => {
 
   describe('error handling', () => {
     test('throws exception from fetchAvailableTasks', async () => {
-      const run = sinon.spy(async () => false);
+      const run = sinon.spy(async () => TaskPoolRunResult.RanOutOfCapacity);
       const converter = (x: number) => x.toString();
 
       try {
@@ -80,7 +81,7 @@ describe('fillPool', () => {
         const tasks = [[1, 2, 3], [4, 5]];
         let index = 0;
         const fetchAvailableTasks = async () => tasks[index++] || [];
-        const run = sinon.spy(async () => false);
+        const run = sinon.spy(async () => TaskPoolRunResult.RanOutOfCapacity);
         const converter = (x: number) => {
           throw new Error(`can not convert ${x}`);
         };
diff --git a/x-pack/legacy/plugins/task_manager/lib/fill_pool.ts b/x-pack/legacy/plugins/task_manager/lib/fill_pool.ts
index a5970574abaaf4..6fe965e048ea58 100644
--- a/x-pack/legacy/plugins/task_manager/lib/fill_pool.ts
+++ b/x-pack/legacy/plugins/task_manager/lib/fill_pool.ts
@@ -4,7 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-type BatchRun<T> = (tasks: T[]) => Promise<boolean>;
+import { performance } from 'perf_hooks';
+import { TaskPoolRunResult } from '../task_pool';
+
+export enum FillPoolResult {
+  NoTasksClaimed = 'NoTasksClaimed',
+  RanOutOfCapacity = 'RanOutOfCapacity',
+}
+
+type BatchRun<T> = (tasks: T[]) => Promise<TaskPoolRunResult>;
 type Fetcher<T> = () => Promise<T[]>;
 type Converter<T1, T2> = (t: T1) => T2;
 
@@ -24,18 +32,32 @@ export async function fillPool<TRecord, TRunner>(
   run: BatchRun<TRunner>,
   fetchAvailableTasks: Fetcher<TRecord>,
   converter: Converter<TRecord, TRunner>
-): Promise<void> {
+): Promise<FillPoolResult> {
+  performance.mark('fillPool.start');
   while (true) {
     const instances = await fetchAvailableTasks();
 
     if (!instances.length) {
-      return;
+      performance.mark('fillPool.bailNoTasks');
+      performance.measure(
+        'fillPool.activityDurationUntilNoTasks',
+        'fillPool.start',
+        'fillPool.bailNoTasks'
+      );
+      return FillPoolResult.NoTasksClaimed;
     }
 
     const tasks = instances.map(converter);
 
-    if (!(await run(tasks))) {
-      return;
+    if ((await run(tasks)) === TaskPoolRunResult.RanOutOfCapacity) {
+      performance.mark('fillPool.bailExhaustedCapacity');
+      performance.measure(
+        'fillPool.activityDurationUntilExhaustedCapacity',
+        'fillPool.start',
+        'fillPool.bailExhaustedCapacity'
+      );
+      return FillPoolResult.RanOutOfCapacity;
     }
+    performance.mark('fillPool.cycle');
   }
 }
diff --git a/x-pack/legacy/plugins/task_manager/lib/identify_es_error.test.ts b/x-pack/legacy/plugins/task_manager/lib/identify_es_error.test.ts
new file mode 100644
index 00000000000000..453b81030311dd
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/lib/identify_es_error.test.ts
@@ -0,0 +1,167 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { identifyEsError, ESErrorCausedBy } from './identify_es_error';
+
+describe('identifyEsError', () => {
+  test('extracts messages from root cause', () => {
+    expect(
+      identifyEsError(
+        generateESErrorWithResponse(
+          [
+            {
+              type: 'illegal_argument_exception',
+              reason: 'root cause',
+            },
+          ],
+          {}
+        )
+      )
+    ).toContain('root cause');
+  });
+
+  test('extracts messages from deep root cause', () => {
+    expect(
+      identifyEsError(
+        generateESErrorWithResponse(
+          [
+            {
+              type: 'illegal_argument_exception',
+              reason: 'root cause',
+            },
+            {
+              type: 'illegal_argument_exception',
+              reason: 'deep root cause',
+            },
+          ],
+          {}
+        )
+      )
+    ).toContain('deep root cause');
+  });
+
+  test('extracts messages from first caused by', () => {
+    expect(
+      identifyEsError(
+        generateESErrorWithResponse(
+          [
+            {
+              type: 'illegal_argument_exception',
+              reason: 'root cause',
+            },
+            {
+              type: 'illegal_argument_exception',
+              reason: 'deep root cause',
+            },
+          ],
+          {
+            type: 'illegal_argument_exception',
+            reason: 'first caused by',
+            caused_by: {
+              type: 'illegal_argument_exception',
+              reason: 'second caused by',
+            },
+          }
+        )
+      )
+    ).toContain('first caused by');
+  });
+
+  test('extracts messages from deep caused by', () => {
+    expect(
+      identifyEsError(
+        generateESErrorWithResponse(
+          [
+            {
+              type: 'illegal_argument_exception',
+              reason: 'root cause',
+            },
+            {
+              type: 'illegal_argument_exception',
+              reason: 'deep root cause',
+            },
+          ],
+          {
+            type: 'illegal_argument_exception',
+            reason: 'first caused by',
+            caused_by: {
+              type: 'illegal_argument_exception',
+              reason: 'second caused by',
+            },
+          }
+        )
+      )
+    ).toContain('second caused by');
+  });
+
+  test('extracts all messages in error', () => {
+    expect(
+      identifyEsError(
+        generateESErrorWithResponse(
+          [
+            {
+              type: 'illegal_argument_exception',
+              reason: 'root cause',
+            },
+            {
+              type: 'illegal_argument_exception',
+              reason: 'deep root cause',
+            },
+          ],
+          {
+            type: 'illegal_argument_exception',
+            reason: 'first caused by',
+            caused_by: {
+              type: 'illegal_argument_exception',
+              reason: 'second caused by',
+            },
+          }
+        )
+      )
+    ).toMatchInlineSnapshot(`
+      Array [
+        "first caused by",
+        "second caused by",
+        "root cause",
+        "deep root cause",
+      ]
+    `);
+  });
+});
+
+function generateESErrorWithResponse(
+  rootCause: ESErrorCausedBy[] = [],
+  causeBy: ESErrorCausedBy = {}
+) {
+  return Object.assign(new Error(), {
+    msg: '[illegal_argument_exception] cannot execute [inline] scripts',
+    path: '/.kibana_task_manager/_update_by_query',
+    query: {},
+    body: '{"query":{}}',
+    statusCode: 400,
+    response: JSON.stringify({
+      error: {
+        root_cause: rootCause,
+        type: 'search_phase_execution_exception',
+        reason: 'all shards failed',
+        phase: 'query',
+        grouped: true,
+        failed_shards: [
+          {
+            shard: 0,
+            index: '.kibana_task_manager_1',
+            node: '24A4QbjHSK6prvtopAKLKw',
+            reason: {
+              type: 'illegal_argument_exception',
+              reason: 'cannot execute [inline] scripts',
+            },
+          },
+        ],
+        caused_by: causeBy,
+      },
+      status: 400,
+    }),
+  });
+}
diff --git a/x-pack/legacy/plugins/task_manager/lib/identify_es_error.ts b/x-pack/legacy/plugins/task_manager/lib/identify_es_error.ts
new file mode 100644
index 00000000000000..93baa7a94a337f
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/lib/identify_es_error.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface ESErrorCausedBy {
+  type?: string;
+  reason?: string;
+  caused_by?: ESErrorCausedBy;
+}
+
+export interface ESError {
+  root_cause?: ESErrorCausedBy[];
+  caused_by?: ESErrorCausedBy;
+}
+
+function extractCausedByChain(
+  causedBy: ESErrorCausedBy = {},
+  accumulator: string[] = []
+): string[] {
+  const { reason, caused_by: innerCausedBy } = causedBy;
+
+  if (reason) {
+    accumulator.push(reason);
+  }
+
+  if (innerCausedBy) {
+    return extractCausedByChain(innerCausedBy, accumulator);
+  }
+
+  return accumulator;
+}
+
+/**
+ * Identified causes for ES Error
+ *
+ * @param err Object Error thrown by ES JS client
+ * @return ES error cause
+ */
+export function identifyEsError(err: { response: string }) {
+  const { response } = err;
+
+  if (response) {
+    const { error } = JSON.parse(response) as { error?: ESError };
+    if (error) {
+      const { root_cause: rootCause = [], caused_by: causedBy } = error;
+
+      return [
+        ...extractCausedByChain(causedBy),
+        ...rootCause.reduce(
+          (acc: string[], innerRootCause) => extractCausedByChain(innerRootCause, acc),
+          []
+        ),
+      ];
+    }
+  }
+  return [];
+}
diff --git a/x-pack/legacy/plugins/task_manager/lib/middleware.test.ts b/x-pack/legacy/plugins/task_manager/lib/middleware.test.ts
index 07afee17974626..699765f16d83e5 100644
--- a/x-pack/legacy/plugins/task_manager/lib/middleware.test.ts
+++ b/x-pack/legacy/plugins/task_manager/lib/middleware.test.ts
@@ -70,6 +70,7 @@ describe('addMiddlewareToChain', () => {
         return opts;
       },
       beforeRun: defaultBeforeRun,
+      beforeMarkRunning: defaultBeforeRun,
     };
     const m2 = {
       beforeSave: async (opts: BeforeSaveOpts) => {
@@ -77,6 +78,7 @@ describe('addMiddlewareToChain', () => {
         return opts;
       },
       beforeRun: defaultBeforeRun,
+      beforeMarkRunning: defaultBeforeRun,
     };
     const m3 = {
       beforeSave: async (opts: BeforeSaveOpts) => {
@@ -84,6 +86,7 @@ describe('addMiddlewareToChain', () => {
         return opts;
       },
       beforeRun: defaultBeforeRun,
+      beforeMarkRunning: defaultBeforeRun,
     };
 
     let middlewareChain;
@@ -119,6 +122,7 @@ describe('addMiddlewareToChain', () => {
           m1: true,
         };
       },
+      beforeMarkRunning: defaultBeforeRun,
     };
     const m2 = {
       beforeSave: defaultBeforeSave,
@@ -128,6 +132,7 @@ describe('addMiddlewareToChain', () => {
           m2: true,
         };
       },
+      beforeMarkRunning: defaultBeforeRun,
     };
     const m3 = {
       beforeSave: defaultBeforeSave,
@@ -137,6 +142,7 @@ describe('addMiddlewareToChain', () => {
           m3: true,
         };
       },
+      beforeMarkRunning: defaultBeforeRun,
     };
 
     let middlewareChain;
diff --git a/x-pack/legacy/plugins/task_manager/lib/middleware.ts b/x-pack/legacy/plugins/task_manager/lib/middleware.ts
index d81b76fda7e50e..d367c8ca56c090 100644
--- a/x-pack/legacy/plugins/task_manager/lib/middleware.ts
+++ b/x-pack/legacy/plugins/task_manager/lib/middleware.ts
@@ -23,10 +23,12 @@ export type BeforeSaveFunction = (
 ) => Promise<BeforeSaveMiddlewareParams>;
 
 export type BeforeRunFunction = (params: RunContext) => Promise<RunContext>;
+export type BeforeMarkRunningFunction = (params: RunContext) => Promise<RunContext>;
 
 export interface Middleware {
   beforeSave: BeforeSaveFunction;
   beforeRun: BeforeRunFunction;
+  beforeMarkRunning: BeforeMarkRunningFunction;
 }
 
 export function addMiddlewareToChain(prevMiddleware: Middleware, middleware: Middleware) {
@@ -39,8 +41,14 @@ export function addMiddlewareToChain(prevMiddleware: Middleware, middleware: Mid
     ? (params: RunContext) => middleware.beforeRun(params).then(prevMiddleware.beforeRun)
     : prevMiddleware.beforeRun;
 
+  const beforeMarkRunning = middleware.beforeMarkRunning
+    ? (params: RunContext) =>
+        middleware.beforeMarkRunning(params).then(prevMiddleware.beforeMarkRunning)
+    : prevMiddleware.beforeMarkRunning;
+
   return {
     beforeSave,
     beforeRun,
+    beforeMarkRunning,
   };
 }
diff --git a/x-pack/legacy/plugins/task_manager/task_manager.test.ts b/x-pack/legacy/plugins/task_manager/task_manager.test.ts
index 2bcfdb2f4d4e3b..9ae2f5e1e027b5 100644
--- a/x-pack/legacy/plugins/task_manager/task_manager.test.ts
+++ b/x-pack/legacy/plugins/task_manager/task_manager.test.ts
@@ -7,11 +7,11 @@
 import _ from 'lodash';
 import sinon from 'sinon';
 import { TaskManager, claimAvailableTasks } from './task_manager';
-import { SavedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from 'src/core/server/mocks';
 import { SavedObjectsSerializer, SavedObjectsSchema } from 'src/core/server';
 import { mockLogger } from './test_utils';
 
-const savedObjectsClient = SavedObjectsClientMock.create();
+const savedObjectsClient = savedObjectsClientMock.create();
 const serializer = new SavedObjectsSerializer(new SavedObjectsSchema());
 
 describe('TaskManager', () => {
@@ -174,6 +174,7 @@ describe('TaskManager', () => {
     const middleware = {
       beforeSave: async (saveOpts: any) => saveOpts,
       beforeRun: async (runOpts: any) => runOpts,
+      beforeMarkRunning: async (runOpts: any) => runOpts,
     };
     expect(() => client.addMiddleware(middleware)).not.toThrow();
   });
@@ -183,6 +184,7 @@ describe('TaskManager', () => {
     const middleware = {
       beforeSave: async (saveOpts: any) => saveOpts,
       beforeRun: async (runOpts: any) => runOpts,
+      beforeMarkRunning: async (runOpts: any) => runOpts,
     };
 
     client.start();
@@ -214,5 +216,37 @@ describe('TaskManager', () => {
 
       expect(claim).not.toHaveBeenCalled();
     });
+
+    /**
+     * This handles the case in which Elasticsearch has had inline script disabled.
+     * This is achieved by setting the `script.allowed_types` flag on Elasticsearch to `none`
+     */
+    test('handles failure due to inline scripts being disabled', () => {
+      const logger = mockLogger();
+      const claim = jest.fn(() => {
+        throw Object.assign(new Error(), {
+          msg: '[illegal_argument_exception] cannot execute [inline] scripts',
+          path: '/.kibana_task_manager/_update_by_query',
+          query: {
+            ignore_unavailable: true,
+            refresh: true,
+            max_docs: 200,
+            conflicts: 'proceed',
+          },
+          body:
+            '{"query":{"bool":{"must":[{"term":{"type":"task"}},{"bool":{"must":[{"bool":{"should":[{"bool":{"must":[{"term":{"task.status":"idle"}},{"range":{"task.runAt":{"lte":"now"}}}]}},{"bool":{"must":[{"bool":{"should":[{"term":{"task.status":"running"}},{"term":{"task.status":"claiming"}}]}},{"range":{"task.retryAt":{"lte":"now"}}}]}}]}},{"bool":{"should":[{"exists":{"field":"task.interval"}},{"bool":{"must":[{"term":{"task.taskType":"vis_telemetry"}},{"range":{"task.attempts":{"lt":3}}}]}},{"bool":{"must":[{"term":{"task.taskType":"lens_telemetry"}},{"range":{"task.attempts":{"lt":3}}}]}},{"bool":{"must":[{"term":{"task.taskType":"actions:.server-log"}},{"range":{"task.attempts":{"lt":1}}}]}},{"bool":{"must":[{"term":{"task.taskType":"actions:.slack"}},{"range":{"task.attempts":{"lt":1}}}]}},{"bool":{"must":[{"term":{"task.taskType":"actions:.email"}},{"range":{"task.attempts":{"lt":1}}}]}},{"bool":{"must":[{"term":{"task.taskType":"actions:.index"}},{"range":{"task.attempts":{"lt":1}}}]}},{"bool":{"must":[{"term":{"task.taskType":"actions:.pagerduty"}},{"range":{"task.attempts":{"lt":1}}}]}},{"bool":{"must":[{"term":{"task.taskType":"actions:.webhook"}},{"range":{"task.attempts":{"lt":1}}}]}}]}}]}}]}},"sort":{"_script":{"type":"number","order":"asc","script":{"lang":"expression","source":"doc[\'task.retryAt\'].value || doc[\'task.runAt\'].value"}}},"seq_no_primary_term":true,"script":{"source":"ctx._source.task.ownerId=params.ownerId; ctx._source.task.status=params.status; ctx._source.task.retryAt=params.retryAt;","lang":"painless","params":{"ownerId":"kibana:5b2de169-2785-441b-ae8c-186a1936b17d","retryAt":"2019-10-31T13:35:43.579Z","status":"claiming"}}}',
+          statusCode: 400,
+          response:
+            '{"error":{"root_cause":[{"type":"illegal_argument_exception","reason":"cannot execute [inline] scripts"}],"type":"search_phase_execution_exception","reason":"all shards failed","phase":"query","grouped":true,"failed_shards":[{"shard":0,"index":".kibana_task_manager_1","node":"24A4QbjHSK6prvtopAKLKw","reason":{"type":"illegal_argument_exception","reason":"cannot execute [inline] scripts"}}],"caused_by":{"type":"illegal_argument_exception","reason":"cannot execute [inline] scripts","caused_by":{"type":"illegal_argument_exception","reason":"cannot execute [inline] scripts"}}},"status":400}',
+        });
+      });
+
+      claimAvailableTasks(claim, 10, logger);
+
+      expect(logger.warn).toHaveBeenCalledTimes(1);
+      expect(logger.warn.mock.calls[0][0]).toMatchInlineSnapshot(
+        `"Task Manager cannot operate when inline scripts are disabled in Elasticsearch"`
+      );
+    });
   });
 });
diff --git a/x-pack/legacy/plugins/task_manager/task_manager.ts b/x-pack/legacy/plugins/task_manager/task_manager.ts
index 41b08cda98f219..4ddb18c7cfe748 100644
--- a/x-pack/legacy/plugins/task_manager/task_manager.ts
+++ b/x-pack/legacy/plugins/task_manager/task_manager.ts
@@ -3,10 +3,10 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import { performance } from 'perf_hooks';
 import { SavedObjectsClientContract, SavedObjectsSerializer } from 'src/core/server';
 import { Logger } from './types';
-import { fillPool } from './lib/fill_pool';
+import { fillPool, FillPoolResult } from './lib/fill_pool';
 import { addMiddlewareToChain, BeforeSaveMiddlewareParams, Middleware } from './lib/middleware';
 import { sanitizeTaskDefinitions } from './lib/sanitize_task_definitions';
 import { intervalFromNow } from './lib/intervals';
@@ -27,6 +27,7 @@ import {
   OwnershipClaimingOpts,
   ClaimOwnershipResult,
 } from './task_store';
+import { identifyEsError } from './lib/identify_es_error';
 
 export interface TaskManagerOpts {
   logger: Logger;
@@ -55,13 +56,14 @@ export class TaskManager {
   private readonly pollerInterval: number;
   private definitions: TaskDictionary<TaskDefinition>;
   private store: TaskStore;
-  private poller: TaskPoller;
+  private poller: TaskPoller<FillPoolResult>;
   private logger: Logger;
   private pool: TaskPool;
   private startQueue: Array<() => void> = [];
   private middleware = {
     beforeSave: async (saveOpts: BeforeSaveMiddlewareParams) => saveOpts,
     beforeRun: async (runOpts: RunContext) => runOpts,
+    beforeMarkRunning: async (runOpts: RunContext) => runOpts,
   };
 
   /**
@@ -85,8 +87,6 @@ export class TaskManager {
       this.logger.info(`TaskManager is identified by the Kibana UUID: ${taskManagerId}`);
     }
 
-    /* Kibana UUID needs to be pulled live (not cached), as it takes a long time
-     * to initialize, and can change after startup */
     const store = new TaskStore({
       serializer: opts.serializer,
       savedObjectsRepository: opts.savedObjectsRepository,
@@ -108,13 +108,14 @@ export class TaskManager {
         store,
         definitions: this.definitions,
         beforeRun: this.middleware.beforeRun,
+        beforeMarkRunning: this.middleware.beforeMarkRunning,
       });
-    const poller = new TaskPoller({
+    const poller = new TaskPoller<FillPoolResult>({
       logger: this.logger,
       pollInterval: opts.config.get('xpack.task_manager.poll_interval'),
-      work: (): Promise<void> =>
+      work: (): Promise<FillPoolResult> =>
         fillPool(
-          pool.run,
+          async tasks => await pool.run(tasks),
           () =>
             claimAvailableTasks(
               this.store.claimAvailableTasks.bind(this.store),
@@ -259,20 +260,44 @@ export async function claimAvailableTasks(
   logger: Logger
 ) {
   if (availableWorkers > 0) {
-    const { docs, claimedTasks } = await claim({
-      size: availableWorkers,
-      claimOwnershipUntil: intervalFromNow('30s')!,
-    });
+    performance.mark('claimAvailableTasks_start');
+
+    try {
+      const { docs, claimedTasks } = await claim({
+        size: availableWorkers,
+        claimOwnershipUntil: intervalFromNow('30s')!,
+      });
 
-    if (docs.length !== claimedTasks) {
-      logger.warn(
-        `[Task Ownership error]: (${claimedTasks}) tasks were claimed by Kibana, but (${docs.length}) tasks were fetched`
+      if (claimedTasks === 0) {
+        performance.mark('claimAvailableTasks.noTasks');
+      }
+      performance.mark('claimAvailableTasks_stop');
+      performance.measure(
+        'claimAvailableTasks',
+        'claimAvailableTasks_start',
+        'claimAvailableTasks_stop'
       );
+
+      if (docs.length !== claimedTasks) {
+        logger.warn(
+          `[Task Ownership error]: (${claimedTasks}) tasks were claimed by Kibana, but (${docs.length}) tasks were fetched`
+        );
+      }
+      return docs;
+    } catch (ex) {
+      if (identifyEsError(ex).includes('cannot execute [inline] scripts')) {
+        logger.warn(
+          `Task Manager cannot operate when inline scripts are disabled in Elasticsearch`
+        );
+      } else {
+        throw ex;
+      }
     }
-    return docs;
+  } else {
+    performance.mark('claimAvailableTasks.noAvailableWorkers');
+    logger.info(
+      `[Task Ownership]: Task Manager has skipped Claiming Ownership of available tasks at it has ran out Available Workers. If this happens often, consider adjusting the "xpack.task_manager.max_workers" configuration.`
+    );
   }
-  logger.info(
-    `[Task Ownership]: Task Manager has skipped Claiming Ownership of available tasks at it has ran out Available Workers. If this happens often, consider adjusting the "xpack.task_manager.max_workers" configuration.`
-  );
   return [];
 }
diff --git a/x-pack/legacy/plugins/task_manager/task_poller.test.ts b/x-pack/legacy/plugins/task_manager/task_poller.test.ts
index 478c1a4dc1b17c..88bcf29ec60849 100644
--- a/x-pack/legacy/plugins/task_manager/task_poller.test.ts
+++ b/x-pack/legacy/plugins/task_manager/task_poller.test.ts
@@ -73,7 +73,9 @@ describe('TaskPoller', () => {
     await doneWorking;
 
     expect(count).toEqual(2);
-    sinon.assert.calledWithMatch(logger.error, /Dang it/i);
+    expect(logger.error.mock.calls[0][0]).toMatchInlineSnapshot(
+      `"Failed to poll for work: Error: Dang it!"`
+    );
   });
 
   test('is stoppable', async () => {
diff --git a/x-pack/legacy/plugins/task_manager/task_poller.ts b/x-pack/legacy/plugins/task_manager/task_poller.ts
index ae023f96a40647..0f7b49f17872ad 100644
--- a/x-pack/legacy/plugins/task_manager/task_poller.ts
+++ b/x-pack/legacy/plugins/task_manager/task_poller.ts
@@ -8,27 +8,28 @@
  * This module contains the logic for polling the task manager index for new work.
  */
 
+import { performance } from 'perf_hooks';
 import { Logger } from './types';
 
-type WorkFn = () => Promise<void>;
+type WorkFn<T> = () => Promise<T>;
 
-interface Opts {
+interface Opts<T> {
   pollInterval: number;
   logger: Logger;
-  work: WorkFn;
+  work: WorkFn<T>;
 }
 
 /**
  * Performs work on a scheduled interval, logging any errors. This waits for work to complete
  * (or error) prior to attempting another run.
  */
-export class TaskPoller {
+export class TaskPoller<T> {
   private isStarted = false;
   private isWorking = false;
   private timeout: any;
   private pollInterval: number;
   private logger: Logger;
-  private work: WorkFn;
+  private work: WorkFn<T>;
 
   /**
    * Constructs a new TaskPoller.
@@ -38,7 +39,7 @@ export class TaskPoller {
    * @prop {Logger} logger - The task manager logger
    * @prop {WorkFn} work - An empty, asynchronous function that performs the desired work
    */
-  constructor(opts: Opts) {
+  constructor(opts: Opts<T>) {
     this.pollInterval = opts.pollInterval;
     this.logger = opts.logger;
     this.work = opts.work;
@@ -57,8 +58,16 @@ export class TaskPoller {
     const poll = async () => {
       await this.attemptWork();
 
+      performance.mark('TaskPoller.sleep');
       if (this.isStarted) {
-        this.timeout = setTimeout(poll, this.pollInterval);
+        this.timeout = setTimeout(
+          tryAndLogOnError(() => {
+            performance.mark('TaskPoller.poll');
+            performance.measure('TaskPoller.sleepDuration', 'TaskPoller.sleep', 'TaskPoller.poll');
+            poll();
+          }, this.logger),
+          this.pollInterval
+        );
       }
     };
 
@@ -94,3 +103,13 @@ export class TaskPoller {
     }
   }
 }
+
+function tryAndLogOnError(fn: Function, logger: Logger): Function {
+  return () => {
+    try {
+      fn();
+    } catch (err) {
+      logger.error(`Task Poller polling phase failed: ${err}`);
+    }
+  };
+}
diff --git a/x-pack/legacy/plugins/task_manager/task_pool.test.ts b/x-pack/legacy/plugins/task_manager/task_pool.test.ts
index e6a83dd1911bd1..4967f4383294fc 100644
--- a/x-pack/legacy/plugins/task_manager/task_pool.test.ts
+++ b/x-pack/legacy/plugins/task_manager/task_pool.test.ts
@@ -5,7 +5,7 @@
  */
 
 import sinon from 'sinon';
-import { TaskPool } from './task_pool';
+import { TaskPool, TaskPoolRunResult } from './task_pool';
 import { mockLogger, resolvable, sleep } from './test_utils';
 
 describe('TaskPool', () => {
@@ -17,7 +17,7 @@ describe('TaskPool', () => {
 
     const result = await pool.run([{ ...mockTask() }, { ...mockTask() }, { ...mockTask() }]);
 
-    expect(result).toBeTruthy();
+    expect(result).toEqual(TaskPoolRunResult.RunningAllClaimedTasks);
     expect(pool.occupiedWorkers).toEqual(3);
   });
 
@@ -29,7 +29,7 @@ describe('TaskPool', () => {
 
     const result = await pool.run([{ ...mockTask() }, { ...mockTask() }, { ...mockTask() }]);
 
-    expect(result).toBeTruthy();
+    expect(result).toEqual(TaskPoolRunResult.RunningAllClaimedTasks);
     expect(pool.availableWorkers).toEqual(7);
   });
 
@@ -48,10 +48,74 @@ describe('TaskPool', () => {
       { ...mockTask(), run: shouldNotRun },
     ]);
 
-    expect(result).toBeFalsy();
+    expect(result).toEqual(TaskPoolRunResult.RanOutOfCapacity);
     expect(pool.availableWorkers).toEqual(0);
-    sinon.assert.calledTwice(shouldRun);
-    sinon.assert.notCalled(shouldNotRun);
+    expect(shouldRun).toHaveBeenCalledTimes(2);
+    expect(shouldNotRun).not.toHaveBeenCalled();
+  });
+
+  test('should log when marking a Task as running fails', async () => {
+    const logger = mockLogger();
+    const pool = new TaskPool({
+      maxWorkers: 2,
+      logger,
+    });
+
+    const taskFailedToMarkAsRunning = mockTask();
+    taskFailedToMarkAsRunning.markTaskAsRunning.mockImplementation(async () => {
+      throw new Error(`Mark Task as running has failed miserably`);
+    });
+
+    const result = await pool.run([mockTask(), taskFailedToMarkAsRunning, mockTask()]);
+
+    expect(logger.error.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "Failed to mark Task TaskType \\"shooooo\\" as running: Mark Task as running has failed miserably",
+      ]
+    `);
+
+    expect(result).toEqual(TaskPoolRunResult.RunningAllClaimedTasks);
+  });
+
+  test('should log when running a Task fails', async () => {
+    const logger = mockLogger();
+    const pool = new TaskPool({
+      maxWorkers: 3,
+      logger,
+    });
+
+    const taskFailedToRun = mockTask();
+    taskFailedToRun.run.mockImplementation(async () => {
+      throw new Error(`Run Task has failed miserably`);
+    });
+
+    const result = await pool.run([mockTask(), taskFailedToRun, mockTask()]);
+
+    expect(logger.warn.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "Task TaskType \\"shooooo\\" failed in attempt to run: Run Task has failed miserably",
+      ]
+    `);
+
+    expect(result).toEqual(TaskPoolRunResult.RunningAllClaimedTasks);
+  });
+
+  test('Running a task which fails still takes up capacity', async () => {
+    const logger = mockLogger();
+    const pool = new TaskPool({
+      maxWorkers: 1,
+      logger,
+    });
+
+    const taskFailedToRun = mockTask();
+    taskFailedToRun.run.mockImplementation(async () => {
+      await sleep(0);
+      throw new Error(`Run Task has failed miserably`);
+    });
+
+    const result = await pool.run([taskFailedToRun, mockTask()]);
+
+    expect(result).toEqual(TaskPoolRunResult.RanOutOfCapacity);
   });
 
   test('clears up capacity when a task completes', async () => {
@@ -78,7 +142,7 @@ describe('TaskPool', () => {
       { ...mockTask(), run: secondRun },
     ]);
 
-    expect(result).toBeFalsy();
+    expect(result).toEqual(TaskPoolRunResult.RanOutOfCapacity);
     expect(pool.occupiedWorkers).toEqual(1);
     expect(pool.availableWorkers).toEqual(0);
 
@@ -133,7 +197,7 @@ describe('TaskPool', () => {
       },
     ]);
 
-    expect(result).toBeTruthy();
+    expect(result).toEqual(TaskPoolRunResult.RunningAllClaimedTasks);
     expect(pool.occupiedWorkers).toEqual(2);
     expect(pool.availableWorkers).toEqual(0);
 
@@ -173,7 +237,7 @@ describe('TaskPool', () => {
       },
     ]);
 
-    expect(result).toBeTruthy();
+    expect(result).toEqual(TaskPoolRunResult.RunningAllClaimedTasks);
     await pool.run([]);
 
     expect(pool.occupiedWorkers).toEqual(0);
@@ -181,11 +245,13 @@ describe('TaskPool', () => {
     // Allow the task to cancel...
     await cancelled;
 
-    sinon.assert.calledWithMatch(logger.error, /Failed to cancel task "shooooo!"/);
+    expect(logger.error.mock.calls[0][0]).toMatchInlineSnapshot(
+      `"Failed to cancel task \\"shooooo!\\": Error: Dern!"`
+    );
   });
 
   function mockRun() {
-    return sinon.spy(async () => {
+    return jest.fn(async () => {
       await sleep(0);
       return { state: {} };
     });
@@ -195,8 +261,9 @@ describe('TaskPool', () => {
     return {
       isExpired: false,
       cancel: async () => undefined,
-      markTaskAsRunning: async () => true,
+      markTaskAsRunning: jest.fn(async () => true),
       run: mockRun(),
+      toString: () => `TaskType "shooooo"`,
     };
   }
 });
diff --git a/x-pack/legacy/plugins/task_manager/task_pool.ts b/x-pack/legacy/plugins/task_manager/task_pool.ts
index 7afbec65a0d8c6..5828cb0df4a4d0 100644
--- a/x-pack/legacy/plugins/task_manager/task_pool.ts
+++ b/x-pack/legacy/plugins/task_manager/task_pool.ts
@@ -8,7 +8,7 @@
  * This module contains the logic that ensures we don't run too many
  * tasks at once in a given Kibana instance.
  */
-
+import { performance } from 'perf_hooks';
 import { Logger } from './types';
 import { TaskRunner } from './task_runner';
 
@@ -17,6 +17,13 @@ interface Opts {
   logger: Logger;
 }
 
+export enum TaskPoolRunResult {
+  RunningAllClaimedTasks = 'RunningAllClaimedTasks',
+  RanOutOfCapacity = 'RanOutOfCapacity',
+}
+
+const VERSION_CONFLICT_MESSAGE = 'Task has been claimed by another Kibana service';
+
 /**
  * Runs tasks in batches, taking costs into account.
  */
@@ -66,38 +73,64 @@ export class TaskPool {
   };
 
   public cancelRunningTasks() {
-    this.logger.debug(`Cancelling running tasks.`);
+    this.logger.debug('Cancelling running tasks.');
     for (const task of this.running) {
       this.cancelTask(task);
     }
   }
 
-  private async attemptToRun(tasks: TaskRunner[]) {
-    for (const task of tasks) {
-      if (this.availableWorkers > 0) {
-        if (await task.markTaskAsRunning()) {
-          this.running.add(task);
-          task
-            .run()
-            .catch(err => {
-              this.logger.warn(`Task ${task} failed in attempt to run: ${err.message}`);
-            })
-            .then(() => this.running.delete(task));
-        } else {
-          this.logger.warn(`Failed to mark Task ${task} as running`);
-        }
-      } else {
-        return false;
+  private async attemptToRun(tasks: TaskRunner[]): Promise<TaskPoolRunResult> {
+    const [tasksToRun, leftOverTasks] = partitionListByCount(tasks, this.availableWorkers);
+    if (tasksToRun.length) {
+      performance.mark('attemptToRun_start');
+      await Promise.all(
+        tasksToRun.map(
+          async task =>
+            await task
+              .markTaskAsRunning()
+              .then((hasTaskBeenMarkAsRunning: boolean) =>
+                hasTaskBeenMarkAsRunning
+                  ? this.handleMarkAsRunning(task)
+                  : this.handleFailureOfMarkAsRunning(task, {
+                      name: 'TaskPoolVersionConflictError',
+                      message: VERSION_CONFLICT_MESSAGE,
+                    })
+              )
+              .catch(ex => this.handleFailureOfMarkAsRunning(task, ex))
+        )
+      );
+
+      performance.mark('attemptToRun_stop');
+      performance.measure('taskPool.attemptToRun', 'attemptToRun_start', 'attemptToRun_stop');
+    }
+
+    if (leftOverTasks.length) {
+      if (this.availableWorkers) {
+        return this.attemptToRun(leftOverTasks);
       }
+      return TaskPoolRunResult.RanOutOfCapacity;
     }
+    return TaskPoolRunResult.RunningAllClaimedTasks;
+  }
+
+  private handleMarkAsRunning(task: TaskRunner) {
+    this.running.add(task);
+    task
+      .run()
+      .catch(err => {
+        this.logger.warn(`Task ${task.toString()} failed in attempt to run: ${err.message}`);
+      })
+      .then(() => this.running.delete(task));
+  }
 
-    return true;
+  private handleFailureOfMarkAsRunning(task: TaskRunner, err: Error) {
+    this.logger.error(`Failed to mark Task ${task.toString()} as running: ${err.message}`);
   }
 
   private cancelExpiredTasks() {
     for (const task of this.running) {
       if (task.isExpired) {
-        this.logger.debug(`Cancelling expired task ${task}.`);
+        this.logger.debug(`Cancelling expired task ${task.toString()}.`);
         this.cancelTask(task);
       }
     }
@@ -105,11 +138,16 @@ export class TaskPool {
 
   private async cancelTask(task: TaskRunner) {
     try {
-      this.logger.debug(`Cancelling task ${task}.`);
+      this.logger.debug(`Cancelling task ${task.toString()}.`);
       this.running.delete(task);
       await task.cancel();
     } catch (err) {
-      this.logger.error(`Failed to cancel task ${task}: ${err}`);
+      this.logger.error(`Failed to cancel task ${task.toString()}: ${err}`);
     }
   }
 }
+
+function partitionListByCount<T>(list: T[], count: number): [T[], T[]] {
+  const listInCount = list.splice(0, count);
+  return [listInCount, list];
+}
diff --git a/x-pack/legacy/plugins/task_manager/task_runner.test.ts b/x-pack/legacy/plugins/task_manager/task_runner.test.ts
index 49c55279eafe7a..578b86ba0b3f69 100644
--- a/x-pack/legacy/plugins/task_manager/task_runner.test.ts
+++ b/x-pack/legacy/plugins/task_manager/task_runner.test.ts
@@ -10,6 +10,7 @@ import { minutesFromNow } from './lib/intervals';
 import { ConcreteTaskInstance } from './task';
 import { TaskManagerRunner } from './task_runner';
 import { mockLogger } from './test_utils';
+import { SavedObjectsErrorHelpers } from '../../../../src/core/server/saved_objects/service/lib/errors';
 
 let fakeTimer: sinon.SinonFakeTimers;
 
@@ -202,7 +203,7 @@ describe('TaskManagerRunner', () => {
     await promise;
 
     expect(wasCancelled).toBeTruthy();
-    sinon.assert.neverCalledWithMatch(logger.warn, /not cancellable/);
+    expect(logger.warn).not.toHaveBeenCalled();
   });
 
   test('warns if cancel is called on a non-cancellable task', async () => {
@@ -220,7 +221,10 @@ describe('TaskManagerRunner', () => {
     await runner.cancel();
     await promise;
 
-    sinon.assert.calledWithMatch(logger.warn, /not cancellable/);
+    expect(logger.warn).toHaveBeenCalledTimes(1);
+    expect(logger.warn.mock.calls[0][0]).toMatchInlineSnapshot(
+      `"The task bar \\"foo\\" is not cancellable."`
+    );
   });
 
   test('sets startedAt, status, attempts and retryAt when claiming a task', async () => {
@@ -420,6 +424,74 @@ describe('TaskManagerRunner', () => {
     );
   });
 
+  test('it returns false when markTaskAsRunning fails due to VERSION_CONFLICT_STATUS', async () => {
+    const id = _.random(1, 20).toString();
+    const initialAttempts = _.random(1, 3);
+    const nextRetry = new Date(Date.now() + _.random(15, 100) * 1000);
+    const timeoutMinutes = 1;
+    const getRetryStub = sinon.stub().returns(nextRetry);
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        interval: undefined,
+      },
+      definitions: {
+        bar: {
+          timeout: `${timeoutMinutes}m`,
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            run: async () => undefined,
+          }),
+        },
+      },
+    });
+
+    store.update = sinon
+      .stub()
+      .throws(
+        SavedObjectsErrorHelpers.decorateConflictError(new Error('repo error')).output.payload
+      );
+
+    expect(await runner.markTaskAsRunning()).toEqual(false);
+  });
+
+  test('it throw when markTaskAsRunning fails for unexpected reasons', async () => {
+    const id = _.random(1, 20).toString();
+    const initialAttempts = _.random(1, 3);
+    const nextRetry = new Date(Date.now() + _.random(15, 100) * 1000);
+    const timeoutMinutes = 1;
+    const getRetryStub = sinon.stub().returns(nextRetry);
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        interval: undefined,
+      },
+      definitions: {
+        bar: {
+          timeout: `${timeoutMinutes}m`,
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            run: async () => undefined,
+          }),
+        },
+      },
+    });
+
+    store.update = sinon
+      .stub()
+      .throws(SavedObjectsErrorHelpers.createGenericNotFoundError('type', 'id').output.payload);
+
+    return expect(runner.markTaskAsRunning()).rejects.toMatchInlineSnapshot(`
+              Object {
+                "error": "Not Found",
+                "message": "Saved object [type/id] not found",
+                "statusCode": 404,
+              }
+            `);
+  });
+
   test('uses getRetry (returning true) to set retryAt when defined', async () => {
     const id = _.random(1, 20).toString();
     const initialAttempts = _.random(1, 3);
@@ -601,6 +673,7 @@ describe('TaskManagerRunner', () => {
     };
     const runner = new TaskManagerRunner({
       beforeRun: context => Promise.resolve(context),
+      beforeMarkRunning: context => Promise.resolve(context),
       logger,
       store,
       instance: Object.assign(
@@ -655,9 +728,10 @@ describe('TaskManagerRunner', () => {
     await runner.run();
 
     if (shouldBeValid) {
-      sinon.assert.notCalled(logger.warn);
+      expect(logger.warn).not.toHaveBeenCalled();
     } else {
-      sinon.assert.calledWith(logger.warn, sinon.match(/invalid task result/i));
+      expect(logger.warn).toHaveBeenCalledTimes(1);
+      expect(logger.warn.mock.calls[0][0]).toMatch(/invalid task result/i);
     }
   }
 
diff --git a/x-pack/legacy/plugins/task_manager/task_runner.ts b/x-pack/legacy/plugins/task_manager/task_runner.ts
index a51e0c885b978d..9d1431ed004e32 100644
--- a/x-pack/legacy/plugins/task_manager/task_runner.ts
+++ b/x-pack/legacy/plugins/task_manager/task_runner.ts
@@ -10,10 +10,11 @@
  * rescheduling, middleware application, etc.
  */
 
+import { performance } from 'perf_hooks';
 import Joi from 'joi';
 import { intervalFromDate, intervalFromNow } from './lib/intervals';
 import { Logger } from './types';
-import { BeforeRunFunction } from './lib/middleware';
+import { BeforeRunFunction, BeforeMarkRunningFunction } from './lib/middleware';
 import {
   CancelFunction,
   CancellableTask,
@@ -32,7 +33,7 @@ export interface TaskRunner {
   cancel: CancelFunction;
   markTaskAsRunning: () => Promise<boolean>;
   run: () => Promise<RunResult>;
-  toString?: () => string;
+  toString: () => string;
 }
 
 interface Updatable {
@@ -47,6 +48,7 @@ interface Opts {
   instance: ConcreteTaskInstance;
   store: Updatable;
   beforeRun: BeforeRunFunction;
+  beforeMarkRunning: BeforeMarkRunningFunction;
 }
 
 /**
@@ -62,8 +64,9 @@ export class TaskManagerRunner implements TaskRunner {
   private instance: ConcreteTaskInstance;
   private definitions: TaskDictionary<TaskDefinition>;
   private logger: Logger;
-  private store: Updatable;
+  private bufferedTaskStore: Updatable;
   private beforeRun: BeforeRunFunction;
+  private beforeMarkRunning: BeforeMarkRunningFunction;
 
   /**
    * Creates an instance of TaskManagerRunner.
@@ -79,8 +82,9 @@ export class TaskManagerRunner implements TaskRunner {
     this.instance = sanitizeInstance(opts.instance);
     this.definitions = opts.definitions;
     this.logger = opts.logger;
-    this.store = opts.store;
+    this.bufferedTaskStore = opts.store;
     this.beforeRun = opts.beforeRun;
+    this.beforeMarkRunning = opts.beforeMarkRunning;
   }
 
   /**
@@ -153,14 +157,20 @@ export class TaskManagerRunner implements TaskRunner {
    * @returns {Promise<boolean>}
    */
   public async markTaskAsRunning(): Promise<boolean> {
+    performance.mark('markTaskAsRunning_start');
+
     const VERSION_CONFLICT_STATUS = 409;
-    const attempts = this.instance.attempts + 1;
     const now = new Date();
 
-    const ownershipClaimedUntil = this.instance.retryAt;
+    const { taskInstance } = await this.beforeMarkRunning({
+      taskInstance: this.instance,
+    });
+
+    const attempts = taskInstance.attempts + 1;
+    const ownershipClaimedUntil = taskInstance.retryAt;
 
     try {
-      const { id } = this.instance;
+      const { id } = taskInstance;
 
       const timeUntilClaimExpires = howManyMsUntilOwnershipClaimExpires(ownershipClaimedUntil);
       if (timeUntilClaimExpires < 0) {
@@ -171,8 +181,8 @@ export class TaskManagerRunner implements TaskRunner {
         );
       }
 
-      this.instance = await this.store.update({
-        ...this.instance,
+      this.instance = await this.bufferedTaskStore.update({
+        ...taskInstance,
         status: 'running',
         startedAt: now,
         attempts,
@@ -198,13 +208,14 @@ export class TaskManagerRunner implements TaskRunner {
         );
       }
 
+      performanceStopMarkingTaskAsRunning();
       return true;
     } catch (error) {
+      performanceStopMarkingTaskAsRunning();
       if (error.statusCode !== VERSION_CONFLICT_STATUS) {
         throw error;
       }
     }
-
     return false;
   }
 
@@ -263,7 +274,7 @@ export class TaskManagerRunner implements TaskRunner {
       runAt = intervalFromDate(startedAt, this.instance.interval)!;
     }
 
-    await this.store.update({
+    await this.bufferedTaskStore.update({
       ...this.instance,
       runAt,
       state,
@@ -280,7 +291,7 @@ export class TaskManagerRunner implements TaskRunner {
   private async processResultWhenDone(result: RunResult): Promise<RunResult> {
     // not a recurring task: clean up by removing the task instance from store
     try {
-      await this.store.remove(this.instance.id);
+      await this.bufferedTaskStore.remove(this.instance.id);
     } catch (err) {
       if (err.statusCode === 404) {
         this.logger.warn(`Task cleanup of ${this} failed in processing. Was remove called twice?`);
@@ -306,7 +317,7 @@ export class TaskManagerRunner implements TaskRunner {
       return 'idle';
     }
 
-    const maxAttempts = this.definition.maxAttempts || this.store.maxAttempts;
+    const maxAttempts = this.definition.maxAttempts || this.bufferedTaskStore.maxAttempts;
     return this.instance.attempts < maxAttempts ? 'idle' : 'failed';
   }
 
@@ -352,3 +363,12 @@ function sanitizeInstance(instance: ConcreteTaskInstance): ConcreteTaskInstance
 function howManyMsUntilOwnershipClaimExpires(ownershipClaimedUntil: Date | null): number {
   return ownershipClaimedUntil ? ownershipClaimedUntil.getTime() - Date.now() : 0;
 }
+
+function performanceStopMarkingTaskAsRunning() {
+  performance.mark('markTaskAsRunning_stop');
+  performance.measure(
+    'taskRunner.markTaskAsRunning',
+    'markTaskAsRunning_start',
+    'markTaskAsRunning_stop'
+  );
+}
diff --git a/x-pack/legacy/plugins/task_manager/task_store.test.ts b/x-pack/legacy/plugins/task_manager/task_store.test.ts
index 65b49820d6e6cc..46efc4bb57ba76 100644
--- a/x-pack/legacy/plugins/task_manager/task_store.test.ts
+++ b/x-pack/legacy/plugins/task_manager/task_store.test.ts
@@ -9,8 +9,7 @@ import sinon from 'sinon';
 import uuid from 'uuid';
 import { TaskDictionary, TaskDefinition, TaskInstance, TaskStatus } from './task';
 import { FetchOpts, StoreOpts, OwnershipClaimingOpts, TaskStore } from './task_store';
-import { mockLogger } from './test_utils';
-import { SavedObjectsClientMock } from 'src/core/server/mocks';
+import { savedObjectsClientMock } from 'src/core/server/mocks';
 import { SavedObjectsSerializer, SavedObjectsSchema, SavedObjectAttributes } from 'src/core/server';
 
 const taskDefinitions: TaskDictionary<TaskDefinition> = {
@@ -31,7 +30,7 @@ const taskDefinitions: TaskDictionary<TaskDefinition> = {
   },
 };
 
-const savedObjectsClient = SavedObjectsClientMock.create();
+const savedObjectsClient = savedObjectsClientMock.create();
 const serializer = new SavedObjectsSerializer(new SavedObjectsSchema());
 
 beforeEach(() => jest.resetAllMocks());
@@ -77,6 +76,7 @@ describe('TaskStore', () => {
 
     test('serializes the params and state', async () => {
       const task = {
+        id: 'id',
         params: { hello: 'world' },
         state: { foo: 'bar' },
         taskType: 'report',
@@ -99,7 +99,10 @@ describe('TaskStore', () => {
           taskType: 'report',
           user: undefined,
         },
-        {}
+        {
+          id: 'id',
+          refresh: false,
+        }
       );
 
       expect(result).toEqual({
@@ -326,233 +329,6 @@ describe('TaskStore', () => {
     });
   });
 
-  describe('fetchAvailableTasks', () => {
-    async function testFetchAvailableTasks({ opts = {}, hits = [] }: any = {}) {
-      const callCluster = sinon.spy(async (name: string, params?: any) => ({ hits: { hits } }));
-      const store = new TaskStore({
-        callCluster,
-        logger: mockLogger(),
-        definitions: taskDefinitions,
-        maxAttempts: 2,
-        serializer,
-        ...opts,
-      });
-
-      const result = await store.fetchAvailableTasks();
-
-      sinon.assert.calledOnce(callCluster);
-      sinon.assert.calledWith(callCluster, 'search');
-
-      return {
-        result,
-        args: callCluster.args[0][1],
-      };
-    }
-
-    test('it returns normally with no tasks when the index does not exist.', async () => {
-      const callCluster = sinon.spy(async (name: string, params?: any) => ({ hits: { hits: [] } }));
-      const store = new TaskStore({
-        index: 'tasky',
-        taskManagerId: '',
-        serializer,
-        callCluster,
-        definitions: taskDefinitions,
-        maxAttempts: 2,
-        savedObjectsRepository: savedObjectsClient,
-      });
-
-      const result = await store.fetchAvailableTasks();
-
-      sinon.assert.calledOnce(callCluster);
-      sinon.assert.calledWithMatch(callCluster, 'search', { ignoreUnavailable: true });
-
-      expect(result.length).toBe(0);
-    });
-
-    test('it filters tasks by supported types, maxAttempts, and runAt', async () => {
-      const maxAttempts = _.random(2, 43);
-      const customMaxAttempts = _.random(44, 100);
-      const { args } = await testFetchAvailableTasks({
-        opts: {
-          maxAttempts,
-          definitions: {
-            foo: {
-              type: 'foo',
-              title: '',
-              createTaskRunner: jest.fn(),
-            },
-            bar: {
-              type: 'bar',
-              title: '',
-              maxAttempts: customMaxAttempts,
-              createTaskRunner: jest.fn(),
-            },
-          },
-        },
-      });
-      expect(args).toMatchObject({
-        body: {
-          query: {
-            bool: {
-              must: [
-                { term: { type: 'task' } },
-                {
-                  bool: {
-                    must: [
-                      {
-                        bool: {
-                          should: [
-                            {
-                              bool: {
-                                must: [
-                                  { term: { 'task.status': 'idle' } },
-                                  { range: { 'task.runAt': { lte: 'now' } } },
-                                ],
-                              },
-                            },
-                            {
-                              bool: {
-                                must: [
-                                  { term: { 'task.status': 'running' } },
-                                  { range: { 'task.retryAt': { lte: 'now' } } },
-                                ],
-                              },
-                            },
-                          ],
-                        },
-                      },
-                      {
-                        bool: {
-                          should: [
-                            { exists: { field: 'task.interval' } },
-                            {
-                              bool: {
-                                must: [
-                                  { term: { 'task.taskType': 'foo' } },
-                                  {
-                                    range: {
-                                      'task.attempts': {
-                                        lt: maxAttempts,
-                                      },
-                                    },
-                                  },
-                                ],
-                              },
-                            },
-                            {
-                              bool: {
-                                must: [
-                                  { term: { 'task.taskType': 'bar' } },
-                                  {
-                                    range: {
-                                      'task.attempts': {
-                                        lt: customMaxAttempts,
-                                      },
-                                    },
-                                  },
-                                ],
-                              },
-                            },
-                          ],
-                        },
-                      },
-                    ],
-                  },
-                },
-              ],
-            },
-          },
-          size: 10,
-          sort: {
-            _script: {
-              type: 'number',
-              order: 'asc',
-              script: {
-                lang: 'expression',
-                source: `doc['task.retryAt'].value || doc['task.runAt'].value`,
-              },
-            },
-          },
-          seq_no_primary_term: true,
-        },
-      });
-    });
-
-    test('it returns task objects', async () => {
-      const runAt = new Date();
-      const { result } = await testFetchAvailableTasks({
-        hits: [
-          {
-            _id: 'aaa',
-            _source: {
-              type: 'task',
-              task: {
-                runAt,
-                taskType: 'foo',
-                interval: undefined,
-                attempts: 0,
-                status: 'idle',
-                params: '{ "hello": "world" }',
-                state: '{ "baby": "Henhen" }',
-                user: 'jimbo',
-                scope: ['reporting'],
-              },
-            },
-            _seq_no: 1,
-            _primary_term: 2,
-            sort: ['a', 1],
-          },
-          {
-            _id: 'bbb',
-            _source: {
-              type: 'task',
-              task: {
-                runAt,
-                taskType: 'bar',
-                interval: '5m',
-                attempts: 2,
-                status: 'running',
-                params: '{ "shazm": 1 }',
-                state: '{ "henry": "The 8th" }',
-                user: 'dabo',
-                scope: ['reporting', 'ceo'],
-              },
-            },
-            _seq_no: 3,
-            _primary_term: 4,
-            sort: ['b', 2],
-          },
-        ],
-      });
-      expect(result).toMatchObject([
-        {
-          attempts: 0,
-          id: 'aaa',
-          interval: undefined,
-          params: { hello: 'world' },
-          runAt,
-          scope: ['reporting'],
-          state: { baby: 'Henhen' },
-          status: 'idle',
-          taskType: 'foo',
-          user: 'jimbo',
-        },
-        {
-          attempts: 2,
-          id: 'bbb',
-          interval: '5m',
-          params: { shazm: 1 },
-          runAt,
-          scope: ['reporting', 'ceo'],
-          state: { henry: 'The 8th' },
-          status: 'running',
-          taskType: 'bar',
-          user: 'dabo',
-        },
-      ]);
-    });
-  });
-
   describe('claimAvailableTasks', () => {
     async function testClaimAvailableTasks({
       opts = {},
@@ -927,7 +703,7 @@ describe('TaskStore', () => {
           user: undefined,
           ownerId: null,
         },
-        { version: '123' }
+        { version: '123', refresh: false }
       );
 
       expect(result).toEqual({
diff --git a/x-pack/legacy/plugins/task_manager/task_store.ts b/x-pack/legacy/plugins/task_manager/task_store.ts
index 9b5253d8be7f95..58bffd2269eb6f 100644
--- a/x-pack/legacy/plugins/task_manager/task_store.ts
+++ b/x-pack/legacy/plugins/task_manager/task_store.ts
@@ -70,6 +70,11 @@ export interface ClaimOwnershipResult {
   docs: ConcreteTaskInstance[];
 }
 
+export interface BulkUpdateTaskFailureResult {
+  error: NonNullable<SavedObject['error']>;
+  task: ConcreteTaskInstance;
+}
+
 export interface UpdateByQueryResult {
   updated: number;
   version_conflicts: number;
@@ -107,8 +112,6 @@ export class TaskStore {
     this.definitions = opts.definitions;
     this.serializer = opts.serializer;
     this.savedObjectsRepository = opts.savedObjectsRepository;
-
-    this.fetchAvailableTasks = this.fetchAvailableTasks.bind(this);
   }
 
   /**
@@ -128,7 +131,7 @@ export class TaskStore {
     const savedObject = await this.savedObjectsRepository.create(
       'task',
       taskInstanceToAttributes(taskInstance),
-      { id: taskInstance.id }
+      { id: taskInstance.id, refresh: false }
     );
 
     return savedObjectToConcreteTaskInstance(savedObject);
@@ -148,88 +151,6 @@ export class TaskStore {
     });
   }
 
-  /**
-   * Fetches tasks from the index, which are ready to be run.
-   * - runAt is now or past
-   * - id is not currently running in this instance of Kibana
-   * - has a type that is in our task definitions
-   *
-   * @param {TaskQuery} query
-   * @prop {string[]} types - Task types to be queried
-   * @prop {number} size - The number of task instances to retrieve
-   * @returns {Promise<ConcreteTaskInstance[]>}
-   */
-  public async fetchAvailableTasks(): Promise<ConcreteTaskInstance[]> {
-    const { docs } = await this.search({
-      query: {
-        bool: {
-          must: [
-            // Either a task with idle status and runAt <= now or
-            // status running with a retryAt <= now.
-            {
-              bool: {
-                should: [
-                  {
-                    bool: {
-                      must: [
-                        { term: { 'task.status': 'idle' } },
-                        { range: { 'task.runAt': { lte: 'now' } } },
-                      ],
-                    },
-                  },
-                  {
-                    bool: {
-                      must: [
-                        { term: { 'task.status': 'running' } },
-                        { range: { 'task.retryAt': { lte: 'now' } } },
-                      ],
-                    },
-                  },
-                ],
-              },
-            },
-            // Either task has an interval or the attempts < the maximum configured
-            {
-              bool: {
-                should: [
-                  { exists: { field: 'task.interval' } },
-                  ...Object.entries(this.definitions).map(([type, definition]) => ({
-                    bool: {
-                      must: [
-                        { term: { 'task.taskType': type } },
-                        {
-                          range: {
-                            'task.attempts': {
-                              lt: definition.maxAttempts || this.maxAttempts,
-                            },
-                          },
-                        },
-                      ],
-                    },
-                  })),
-                ],
-              },
-            },
-          ],
-        },
-      },
-      size: 10,
-      sort: {
-        _script: {
-          type: 'number',
-          order: 'asc',
-          script: {
-            lang: 'expression',
-            source: `doc['task.retryAt'].value || doc['task.runAt'].value`,
-          },
-        },
-      },
-      seq_no_primary_term: true,
-    });
-
-    return docs;
-  }
-
   /**
    * Claims available tasks from the index, which are ready to be run.
    * - runAt is now or past
@@ -376,6 +297,7 @@ export class TaskStore {
 
     return docs;
   }
+
   /**
    * Updates the specified doc in the index, returning the doc
    * with its version up to date.
@@ -388,7 +310,10 @@ export class TaskStore {
       'task',
       doc.id,
       taskInstanceToAttributes(doc),
-      { version: doc.version }
+      {
+        refresh: false,
+        version: doc.version,
+      }
     );
 
     return savedObjectToConcreteTaskInstance(updatedSavedObject);
diff --git a/x-pack/legacy/plugins/task_manager/test_utils/index.ts b/x-pack/legacy/plugins/task_manager/test_utils/index.ts
index 8ee5cdce064cc2..719ccadbe33dde 100644
--- a/x-pack/legacy/plugins/task_manager/test_utils/index.ts
+++ b/x-pack/legacy/plugins/task_manager/test_utils/index.ts
@@ -8,8 +8,6 @@
  * A handful of helper functions for testing the task manager.
  */
 
-import sinon from 'sinon';
-
 // Caching this here to avoid setTimeout mocking affecting our tests.
 const nativeTimeout = setTimeout;
 
@@ -18,10 +16,10 @@ const nativeTimeout = setTimeout;
  */
 export function mockLogger() {
   return {
-    info: sinon.stub(),
-    debug: sinon.stub(),
-    warn: sinon.stub(),
-    error: sinon.stub(),
+    info: jest.fn(),
+    debug: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
   };
 }
 
diff --git a/x-pack/legacy/plugins/transform/common/constants.ts b/x-pack/legacy/plugins/transform/common/constants.ts
index 3c6224c96d6f29..c85408d3c5ce60 100644
--- a/x-pack/legacy/plugins/transform/common/constants.ts
+++ b/x-pack/legacy/plugins/transform/common/constants.ts
@@ -24,40 +24,54 @@ export const PLUGIN = {
 
 export const API_BASE_PATH = '/api/transform/';
 
-// Current df_admin permission requirements:
-// 1. `read` on source index
-// 2. `all` on source index to create and start transform
-// 3. `all` on dest index (could be less tbd)
-// 3. `monitor` cluster privilege
-// 4. builtin `data_frame_transforms_admin`
-// 5. builtin `kibana_user`
-// 6. builtin `data_frame_transforms_user` (although this is probably included in the admin)
+// In order to create a transform, the API requires the following privileges:
+// - transform_admin (builtin)
+//   - cluster privileges: manage_transform
+//   - index privileges:
+//     - indices: .transform-notifications-*, .data-frame-notifications-*, .transform-notifications-read
+//     - privileges: view_index_metadata, read
+// - transform_user (builtin)
+//   - cluster privileges: monitor_transform
+//   - index privileges:
+//     - indices: .transform-notifications-*, .data-frame-notifications-*, .transform-notifications-read
+//     - privileges: view_index_metadata, read
+// - source index: read, view_index_metadata (can be applied to a pattern e.g. farequote-*)
+// - dest index: index, create_index (can be applied to a pattern e.g. df-*)
+//
+// In the UI additional privileges are required:
+// - kibana_user (builtin)
+// - dest index: monitor (applied to df-*)
+// - cluster: monitor
+//
+// Note that users with kibana_user can see all Kibana index patterns and saved searches
+// in the source selection modal when creating a transform, but the wizard will trigger
+// error callouts when there are no sufficient privileges to read the actual source indices.
 
 export const APP_CLUSTER_PRIVILEGES = [
-  'cluster:monitor/data_frame/get',
-  'cluster:monitor/data_frame/stats/get',
-  'cluster:admin/data_frame/delete',
-  'cluster:admin/data_frame/preview',
-  'cluster:admin/data_frame/put',
-  'cluster:admin/data_frame/start',
-  'cluster:admin/data_frame/start_task',
-  'cluster:admin/data_frame/stop',
+  'cluster:monitor/transform/get',
+  'cluster:monitor/transform/stats/get',
+  'cluster:admin/transform/delete',
+  'cluster:admin/transform/preview',
+  'cluster:admin/transform/put',
+  'cluster:admin/transform/start',
+  'cluster:admin/transform/start_task',
+  'cluster:admin/transform/stop',
 ];
 
 // Equivalent of capabilities.canGetTransform
 export const APP_GET_TRANSFORM_CLUSTER_PRIVILEGES = [
-  'cluster.cluster:monitor/data_frame/get',
-  'cluster.cluster:monitor/data_frame/stats/get',
+  'cluster.cluster:monitor/transform/get',
+  'cluster.cluster:monitor/transform/stats/get',
 ];
 
 // Equivalent of capabilities.canGetTransform
 export const APP_CREATE_TRANSFORM_CLUSTER_PRIVILEGES = [
-  'cluster.cluster:monitor/data_frame/get',
-  'cluster.cluster:monitor/data_frame/stats/get',
-  'cluster.cluster:admin/data_frame/preview',
-  'cluster.cluster:admin/data_frame/put',
-  'cluster.cluster:admin/data_frame/start',
-  'cluster.cluster:admin/data_frame/start_task',
+  'cluster.cluster:monitor/transform/get',
+  'cluster.cluster:monitor/transform/stats/get',
+  'cluster.cluster:admin/transform/preview',
+  'cluster.cluster:admin/transform/put',
+  'cluster.cluster:admin/transform/start',
+  'cluster.cluster:admin/transform/start_task',
 ];
 
 export const APP_INDEX_PRIVILEGES = ['monitor'];
diff --git a/x-pack/legacy/plugins/transform/public/app/common/transform.ts b/x-pack/legacy/plugins/transform/public/app/common/transform.ts
index 7670ab1f1cca1d..481ad3c6d74ffc 100644
--- a/x-pack/legacy/plugins/transform/public/app/common/transform.ts
+++ b/x-pack/legacy/plugins/transform/public/app/common/transform.ts
@@ -95,6 +95,8 @@ export const useRefreshTransformList = (
     return () => {
       subscriptions.map(sub => sub.unsubscribe());
     };
+    // The effect should only be called once.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   return {
diff --git a/x-pack/legacy/plugins/transform/public/app/components/toast_notification_text.test.tsx b/x-pack/legacy/plugins/transform/public/app/components/toast_notification_text.test.tsx
index ffdb79a9d410b2..2a0ce8ca08becf 100644
--- a/x-pack/legacy/plugins/transform/public/app/components/toast_notification_text.test.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/components/toast_notification_text.test.tsx
@@ -25,6 +25,8 @@ describe('ToastNotificationText', () => {
         'a text message that is longer than 140 characters. a text message that is longer than 140 characters. a text message that is longer than 140 characters. ',
     };
     const { container } = render(<ToastNotificationText {...props} />);
-    expect(container.textContent).toBe('View details');
+    expect(container.textContent).toBe(
+      'a text message that is longer than 140 characters. a text message that is longer than 140 characters. a text message that is longer than 140 ...View details'
+    );
   });
 });
diff --git a/x-pack/legacy/plugins/transform/public/app/components/toast_notification_text.tsx b/x-pack/legacy/plugins/transform/public/app/components/toast_notification_text.tsx
index 15cb23415bb3ab..28bb9b26879133 100644
--- a/x-pack/legacy/plugins/transform/public/app/components/toast_notification_text.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/components/toast_notification_text.tsx
@@ -35,7 +35,11 @@ export const ToastNotificationText: FC<{ text: any }> = ({ text }) => {
     return text.message;
   }
 
-  const formattedText = text.message ? text.message : JSON.stringify(text, null, 2);
+  const unformattedText = text.message ? text.message : text;
+  const formattedText = typeof unformattedText === 'object' ? JSON.stringify(text, null, 2) : text;
+  const previewText = `${formattedText.substring(0, 140)}${
+    formattedText.length > 140 ? ' ...' : ''
+  }`;
 
   const openModal = () => {
     const modal = npStart.core.overlays.openModal(
@@ -65,6 +69,7 @@ export const ToastNotificationText: FC<{ text: any }> = ({ text }) => {
 
   return (
     <>
+      <pre>{previewText}</pre>
       <EuiButtonEmpty onClick={openModal}>
         {i18n.translate('xpack.transform.toastText.openModalButtonText', {
           defaultMessage: 'View details',
diff --git a/x-pack/legacy/plugins/transform/public/app/lib/authorization/components/authorization_provider.tsx b/x-pack/legacy/plugins/transform/public/app/lib/authorization/components/authorization_provider.tsx
index 84c7d616c19b87..8060659c78b80e 100644
--- a/x-pack/legacy/plugins/transform/public/app/lib/authorization/components/authorization_provider.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/lib/authorization/components/authorization_provider.tsx
@@ -64,25 +64,25 @@ export const AuthorizationProvider = ({ privilegesEndpoint, children }: Props) =
   const hasPrivilege = hasPrivilegeFactory(value.privileges);
 
   value.capabilities.canGetTransform =
-    hasPrivilege(['cluster', 'cluster:monitor/data_frame/get']) &&
-    hasPrivilege(['cluster', 'cluster:monitor/data_frame/stats/get']);
+    hasPrivilege(['cluster', 'cluster:monitor/transform/get']) &&
+    hasPrivilege(['cluster', 'cluster:monitor/transform/stats/get']);
 
-  value.capabilities.canCreateTransform = hasPrivilege(['cluster', 'cluster:admin/data_frame/put']);
+  value.capabilities.canCreateTransform = hasPrivilege(['cluster', 'cluster:admin/transform/put']);
 
   value.capabilities.canDeleteTransform = hasPrivilege([
     'cluster',
-    'cluster:admin/data_frame/delete',
+    'cluster:admin/transform/delete',
   ]);
 
   value.capabilities.canPreviewTransform = hasPrivilege([
     'cluster',
-    'cluster:admin/data_frame/preview',
+    'cluster:admin/transform/preview',
   ]);
 
   value.capabilities.canStartStopTransform =
-    hasPrivilege(['cluster', 'cluster:admin/data_frame/start']) &&
-    hasPrivilege(['cluster', 'cluster:admin/data_frame/start_task']) &&
-    hasPrivilege(['cluster', 'cluster:admin/data_frame/stop']);
+    hasPrivilege(['cluster', 'cluster:admin/transform/start']) &&
+    hasPrivilege(['cluster', 'cluster:admin/transform/start_task']) &&
+    hasPrivilege(['cluster', 'cluster:admin/transform/stop']);
 
   return (
     <AuthorizationContext.Provider value={{ ...value }}>{children}</AuthorizationContext.Provider>
diff --git a/x-pack/legacy/plugins/transform/public/app/lib/kibana/kibana_provider.tsx b/x-pack/legacy/plugins/transform/public/app/lib/kibana/kibana_provider.tsx
index b64260b92d473d..7d615bfa521f0a 100644
--- a/x-pack/legacy/plugins/transform/public/app/lib/kibana/kibana_provider.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/lib/kibana/kibana_provider.tsx
@@ -75,6 +75,8 @@ export const KibanaProvider: FC<Props> = ({ savedObjectId, children }) => {
 
   useEffect(() => {
     fetchSavedObject(savedObjectId);
+    // fetchSavedObject should not be tracked.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [savedObjectId]);
 
   return <KibanaContext.Provider value={contextValue}>{children}</KibanaContext.Provider>;
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
index e7f79b240d81a9..65dd8a34330a51 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
@@ -142,7 +142,7 @@ export const PopoverForm: React.SFC<Props> = ({
       {isUnsupportedAgg && (
         <EuiCodeEditor
           mode="json"
-          theme="github"
+          theme="textmate"
           width="100%"
           height="200px"
           value={JSON.stringify(getEsAggFromAggConfig(defaultData), null, 2)}
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.tsx b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.tsx
index 09290cce017042..e5ee72c0708aca 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/group_by_list/popover_form.tsx
@@ -258,7 +258,7 @@ export const PopoverForm: React.SFC<Props> = ({
           <EuiSpacer size="m" />
           <EuiCodeEditor
             mode="json"
-            theme="github"
+            theme="textmate"
             width="100%"
             height="200px"
             value={JSON.stringify(getEsAggFromGroupByConfig(defaultData), null, 2)}
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/source_index_preview/source_index_preview.tsx b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/source_index_preview/source_index_preview.tsx
index 27234af868fbdd..504156b8b89bad 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/source_index_preview/source_index_preview.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/source_index_preview/source_index_preview.tsx
@@ -15,6 +15,7 @@ import {
   EuiButtonIcon,
   EuiCallOut,
   EuiCheckbox,
+  EuiCodeBlock,
   EuiCopy,
   EuiFlexGroup,
   EuiFlexItem,
@@ -142,7 +143,9 @@ export const SourceIndexPreview: React.SFC<Props> = React.memo(({ cellClick, que
           color="danger"
           iconType="cross"
         >
-          <p>{errorMessage}</p>
+          <EuiCodeBlock language="json" fontSize="s" paddingSize="s" isCopyable>
+            {errorMessage}
+          </EuiCodeBlock>
         </EuiCallOut>
       </EuiPanel>
     );
@@ -164,7 +167,7 @@ export const SourceIndexPreview: React.SFC<Props> = React.memo(({ cellClick, que
           <p>
             {i18n.translate('xpack.transform.sourceIndexPreview.SourceIndexNoDataCalloutBody', {
               defaultMessage:
-                'The query for the source index returned no results. Please make sure the index contains documents and your query is not too restrictive.',
+                'The query for the source index returned no results. Please make sure you have sufficient permissions, the index contains documents and your query is not too restrictive.',
             })}
           </p>
         </EuiCallOut>
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/source_index_preview/use_source_index_data.ts b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/source_index_preview/use_source_index_data.ts
index 9d60e3550fd750..9205d03e6401be 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/source_index_preview/use_source_index_data.ts
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/source_index_preview/use_source_index_data.ts
@@ -32,6 +32,23 @@ export enum SOURCE_INDEX_STATUS {
   ERROR,
 }
 
+interface ErrorResponse {
+  error: {
+    body: string;
+    msg: string;
+    path: string;
+    query: any;
+    response: string;
+    statusCode: number;
+  };
+}
+
+const isErrorResponse = (arg: any): arg is ErrorResponse => {
+  return arg.error !== undefined;
+};
+
+type SourceIndexSearchResponse = ErrorResponse | SearchResponse<any>;
+
 export interface UseSourceIndexDataReturnType {
   errorMessage: string;
   status: SOURCE_INDEX_STATUS;
@@ -54,13 +71,17 @@ export const useSourceIndexData = (
     setStatus(SOURCE_INDEX_STATUS.LOADING);
 
     try {
-      const resp: SearchResponse<any> = await api.esSearch({
+      const resp: SourceIndexSearchResponse = await api.esSearch({
         index: indexPattern.title,
         size: SEARCH_SIZE,
         // Instead of using the default query (`*`), fall back to a more efficient `match_all` query.
         body: { query: isDefaultQuery(query) ? { match_all: {} } : query },
       });
 
+      if (isErrorResponse(resp)) {
+        throw resp.error;
+      }
+
       const docs = resp.hits.hits;
 
       if (docs.length === 0) {
@@ -101,7 +122,7 @@ export const useSourceIndexData = (
       if (e.message !== undefined) {
         setErrorMessage(e.message);
       } else {
-        setErrorMessage(JSON.stringify(e));
+        setErrorMessage(JSON.stringify(e, null, 2));
       }
       setTableItems([]);
       setStatus(SOURCE_INDEX_STATUS.ERROR);
@@ -110,6 +131,8 @@ export const useSourceIndexData = (
 
   useEffect(() => {
     getSourceIndexData();
+    // custom comparison
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [indexPattern.title, JSON.stringify(query)]);
   return { errorMessage, status, tableItems };
 };
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
index 3f5ddc6238faa6..6e9505898ced41 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx
@@ -76,6 +76,8 @@ export const StepCreateForm: SFC<Props> = React.memo(
 
     useEffect(() => {
       onChange({ created, started, indexPatternId });
+      // custom comparison
+      // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [created, started, indexPatternId]);
 
     const api = useApi();
@@ -88,7 +90,17 @@ export const StepCreateForm: SFC<Props> = React.memo(
       setCreated(true);
 
       try {
-        await api.createTransform(transformId, transformConfig);
+        const resp = await api.createTransform(transformId, transformConfig);
+        if (resp.errors !== undefined && Array.isArray(resp.errors)) {
+          if (resp.errors.length === 1) {
+            throw resp.errors[0];
+          }
+
+          if (resp.errors.length > 1) {
+            throw resp.errors;
+          }
+        }
+
         toastNotifications.addSuccess(
           i18n.translate('xpack.transform.stepCreateForm.createTransformSuccessMessage', {
             defaultMessage: 'Request to create transform {transformId} acknowledged.',
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/pivot_preview.tsx b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/pivot_preview.tsx
index 3ac87f61d4c89e..b53e0fca0fee1e 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/pivot_preview.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/pivot_preview.tsx
@@ -12,12 +12,12 @@ import { i18n } from '@kbn/i18n';
 import {
   EuiButtonIcon,
   EuiCallOut,
+  EuiCodeBlock,
   EuiCopy,
   EuiFlexGroup,
   EuiFlexItem,
   EuiPanel,
   EuiProgress,
-  EuiText,
   EuiTitle,
 } from '@elastic/eui';
 
@@ -102,24 +102,11 @@ interface ErrorMessageProps {
   message: string;
 }
 
-const ErrorMessage: SFC<ErrorMessageProps> = ({ message }) => {
-  const error = JSON.parse(message);
-
-  const statusCodeLabel = i18n.translate('xpack.transform.pivotPreview.statusCodeLabel', {
-    defaultMessage: 'Status code',
-  });
-
-  return (
-    <EuiText size="xs">
-      <pre>
-        {(error.message &&
-          error.statusCode &&
-          `${statusCodeLabel}: ${error.statusCode}\n${error.message}`) ||
-          message}
-      </pre>
-    </EuiText>
-  );
-};
+const ErrorMessage: SFC<ErrorMessageProps> = ({ message }) => (
+  <EuiCodeBlock language="json" fontSize="s" paddingSize="s" isCopyable>
+    {message}
+  </EuiCodeBlock>
+);
 
 interface PivotPreviewProps {
   aggs: PivotAggsConfigDict;
@@ -163,7 +150,7 @@ export const PivotPreview: SFC<PivotPreviewProps> = React.memo(({ aggs, groupBy,
     if (clearTable) {
       setTimeout(() => setClearTable(false), 0);
     }
-  });
+  }, [firstColumnNameChanged, clearTable]);
 
   if (firstColumnNameChanged) {
     return null;
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx
index 49017ac9e3c029..442ce2011f77ee 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx
@@ -487,6 +487,8 @@ export const StepDefineForm: SFC<Props> = React.memo(({ overrides = {}, onChange
       sourceConfigUpdated,
       valid,
     });
+    // custom comparison
+    /* eslint-disable react-hooks/exhaustive-deps */
   }, [
     JSON.stringify(pivotAggsArr),
     JSON.stringify(pivotGroupByArr),
@@ -495,6 +497,7 @@ export const StepDefineForm: SFC<Props> = React.memo(({ overrides = {}, onChange
     searchString,
     searchQuery,
     valid,
+    /* eslint-enable react-hooks/exhaustive-deps */
   ]);
 
   // TODO This should use the actual value of `indices.query.bool.max_clause_count`
@@ -591,6 +594,7 @@ export const StepDefineForm: SFC<Props> = React.memo(({ overrides = {}, onChange
                     setOptions={{
                       fontSize: '12px',
                     }}
+                    theme="textmate"
                     aria-label={i18n.translate(
                       'xpack.transform.stepDefineForm.advancedSourceEditorAriaLabel',
                       {
@@ -751,6 +755,7 @@ export const StepDefineForm: SFC<Props> = React.memo(({ overrides = {}, onChange
                     setOptions={{
                       fontSize: '12px',
                     }}
+                    theme="textmate"
                     aria-label={i18n.translate(
                       'xpack.transform.stepDefineForm.advancedEditorAriaLabel',
                       {
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/use_pivot_preview_data.ts b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/use_pivot_preview_data.ts
index 7f7d06a7d18e63..92e3bdded4f6a1 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/use_pivot_preview_data.ts
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/use_pivot_preview_data.ts
@@ -82,7 +82,7 @@ export const usePivotPreviewData = (
       setPreviewMappings(resp.mappings);
       setStatus(PIVOT_PREVIEW_STATUS.LOADED);
     } catch (e) {
-      setErrorMessage(JSON.stringify(e));
+      setErrorMessage(JSON.stringify(e, null, 2));
       setPreviewData([]);
       setPreviewMappings({ properties: {} });
       setStatus(PIVOT_PREVIEW_STATUS.ERROR);
@@ -91,11 +91,15 @@ export const usePivotPreviewData = (
 
   useEffect(() => {
     getPreviewData();
+    // custom comparison
+    /* eslint-disable react-hooks/exhaustive-deps */
   }, [
     indexPattern.title,
     JSON.stringify(aggsArr),
     JSON.stringify(groupByArr),
     JSON.stringify(query),
+    /* eslint-enable react-hooks/exhaustive-deps */
   ]);
+
   return { errorMessage, status, previewData, previewMappings, previewRequest };
 };
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
index ba43e020674acf..962a8905056b60 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
@@ -121,6 +121,8 @@ export const StepDetailsForm: SFC<Props> = React.memo(({ overrides = {}, onChang
         }
       }
     })();
+    // custom comparison
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [kibanaContext.initialized]);
 
   if (!isKibanaContextInitialized(kibanaContext)) {
@@ -169,6 +171,8 @@ export const StepDetailsForm: SFC<Props> = React.memo(({ overrides = {}, onChang
       touched: true,
       valid,
     });
+    // custom comparison
+    /* eslint-disable react-hooks/exhaustive-deps */
   }, [
     continuousModeDateField,
     continuousModeDelay,
@@ -178,6 +182,7 @@ export const StepDetailsForm: SFC<Props> = React.memo(({ overrides = {}, onChang
     transformDescription,
     destinationIndex,
     valid,
+    /* eslint-enable react-hooks/exhaustive-deps */
   ]);
 
   return (
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/__snapshots__/transform_management_section.test.tsx.snap b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/__snapshots__/transform_management_section.test.tsx.snap
index df8002cb7145dd..8348f93b321405 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/__snapshots__/transform_management_section.test.tsx.snap
+++ b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/__snapshots__/transform_management_section.test.tsx.snap
@@ -4,8 +4,8 @@ exports[`Transform: <TransformManagementSection /> Minimal initialization 1`] =
 <PrivilegesWrapper
   privileges={
     Array [
-      "cluster.cluster:monitor/data_frame/get",
-      "cluster.cluster:monitor/data_frame/stats/get",
+      "cluster.cluster:monitor/transform/get",
+      "cluster.cluster:monitor/transform/stats/get",
     ]
   }
 >
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/expanded_row_json_pane.test.tsx.snap b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/expanded_row_json_pane.test.tsx.snap
index f185579fd9e4c9..0d4a80a94ee518 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/expanded_row_json_pane.test.tsx.snap
+++ b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/__snapshots__/expanded_row_json_pane.test.tsx.snap
@@ -15,6 +15,7 @@ exports[`Transform: Transform List Expanded Row <ExpandedRowJsonPane /> Minimal
           "width": "100%",
         }
       }
+      theme="textmate"
       value="{
   \\"id\\": \\"fq_date_histogram_1m_1441\\",
   \\"source\\": {
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_json_pane.tsx b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_json_pane.tsx
index d24fc19f216a37..416d93007daba2 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_json_pane.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_json_pane.tsx
@@ -28,6 +28,7 @@ export const ExpandedRowJsonPane: SFC<Props> = ({ json }) => {
           readOnly={true}
           mode="json"
           style={{ width: '100%' }}
+          theme="textmate"
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>&nbsp;</EuiFlexItem>
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/use_refresh_interval.ts b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/use_refresh_interval.ts
index 7a2e6b9e623fb9..8e505c7cccc022 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/use_refresh_interval.ts
+++ b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/use_refresh_interval.ts
@@ -77,5 +77,7 @@ export const useRefreshInterval = (
       refreshIntervalSubscription.unsubscribe();
       clearRefreshInterval();
     };
+    // custom comparison
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []); // [] as comparator makes sure this only runs once
 };
diff --git a/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx b/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx
index d4602b99c94b2c..12e57fdf6c01c4 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx
+++ b/x-pack/legacy/plugins/upgrade_assistant/public/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx
@@ -195,8 +195,8 @@ export class WarningsFlyoutStep extends React.Component<
                   values={{
                     true: <EuiCode>true</EuiCode>,
                     false: <EuiCode>false</EuiCode>,
-                    yes: <EuiCode>"yes"</EuiCode>,
-                    on: <EuiCode>"on"</EuiCode>,
+                    yes: <EuiCode>&quot;yes&quot;</EuiCode>,
+                    on: <EuiCode>&quot;on&quot;</EuiCode>,
                     one: <EuiCode>1</EuiCode>,
                   }}
                 />
diff --git a/x-pack/legacy/plugins/upgrade_assistant/public/components/types.ts b/x-pack/legacy/plugins/upgrade_assistant/public/components/types.ts
index c2181b783a089f..dc31308a1ea340 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/public/components/types.ts
+++ b/x-pack/legacy/plugins/upgrade_assistant/public/components/types.ts
@@ -21,6 +21,7 @@ export interface UpgradeAssistantTabProps {
   setSelectedTabIndex: (tabIndex: number) => void;
 }
 
+// eslint-disable-next-line react/prefer-stateless-function
 export class UpgradeAssistantTabComponent<
   T extends UpgradeAssistantTabProps = UpgradeAssistantTabProps,
   S = {}
diff --git a/x-pack/legacy/plugins/uptime/common/constants/chart_format_limits.ts b/x-pack/legacy/plugins/uptime/common/constants/chart_format_limits.ts
index 1e691b45e1792b..f291450ab2a7a0 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/chart_format_limits.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/chart_format_limits.ts
@@ -4,8 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+const MINUTE = 1000 * 60;
+const HOUR = MINUTE * 60;
 const DAY = 24 * 60 * 60 * 1000;
 const WEEK = DAY * 7;
+const MONTH = WEEK * 4;
 
 /**
  * These contsants are used by the charting code to determine
@@ -14,9 +17,10 @@ const WEEK = DAY * 7;
  */
 export const CHART_FORMAT_LIMITS = {
   DAY,
-  FIFTEEN_DAYS: 1000 * 60 * 60 * 24 * 15,
-  EIGHT_MINUTES: 1000 * 60 * 8,
+  EIGHT_MINUTES: MINUTE * 8,
   FOUR_YEARS: 4 * 12 * 4 * WEEK,
-  THIRTY_SIX_HOURS: 1000 * 60 * 60 * 36,
+  THIRTY_SIX_HOURS: HOUR * 36,
   THREE_WEEKS: WEEK * 3,
+  SIX_MONTHS: MONTH * 7,
+  NINE_DAYS: DAY * 9,
 };
diff --git a/x-pack/legacy/plugins/uptime/common/domain_types/monitors.ts b/x-pack/legacy/plugins/uptime/common/domain_types/monitors.ts
index 7f5699eb7e8a4e..296df279b8eec9 100644
--- a/x-pack/legacy/plugins/uptime/common/domain_types/monitors.ts
+++ b/x-pack/legacy/plugins/uptime/common/domain_types/monitors.ts
@@ -4,7 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { HistogramDataPoint } from '../graphql/types';
+
 export interface UMGqlRange {
   dateRangeStart: string;
   dateRangeEnd: string;
 }
+
+export interface HistogramResult {
+  histogram: HistogramDataPoint[];
+  interval: number;
+}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/integration_group.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/integration_group.test.tsx.snap
index f07d0171b22ad0..bab69a6de9708a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/integration_group.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/integration_group.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`]
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Check Infrastructure UI for this montor's ip address"
-      iconType="infraApp"
+      iconType="metricsApp"
       message="Show host metrics"
       tooltipContent="Check Infrastructure UI for the IP \\"\\""
     />
@@ -15,7 +15,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`]
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Check Infrastructure UI for this monitor's pod UID"
-      iconType="infraApp"
+      iconType="metricsApp"
       message="Show pod metrics"
       tooltipContent="Check Infrastructure UI for pod UID \\"\\"."
     />
@@ -23,7 +23,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`]
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Check Infrastructure UI for this monitor's container ID"
-      iconType="infraApp"
+      iconType="metricsApp"
       message="Show container metrics"
       tooltipContent="Check Infrastructure UI for container ID \\"\\""
     />
@@ -31,7 +31,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`]
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Check Logging UI for this monitor's ip address"
-      iconType="loggingApp"
+      iconType="logsApp"
       message="Show host logs"
       tooltipContent="Check Logging UI for the IP \\"\\""
     />
@@ -39,7 +39,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`]
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Show pod logs"
-      iconType="loggingApp"
+      iconType="logsApp"
       message="Show pod logs"
       tooltipContent="Check for logs for pod UID \\"\\""
     />
@@ -47,7 +47,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`]
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Show container logs"
-      iconType="loggingApp"
+      iconType="logsApp"
       message="Show container logs"
       tooltipContent="Check Logging UI for container ID \\"\\""
     />
@@ -71,7 +71,7 @@ exports[`IntegrationGroup will not display infra links when infra is unavailable
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Check Logging UI for this monitor's ip address"
-      iconType="loggingApp"
+      iconType="logsApp"
       message="Show host logs"
       tooltipContent="Check Logging UI for the IP \\"\\""
     />
@@ -79,7 +79,7 @@ exports[`IntegrationGroup will not display infra links when infra is unavailable
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Show pod logs"
-      iconType="loggingApp"
+      iconType="logsApp"
       message="Show pod logs"
       tooltipContent="Check for logs for pod UID \\"\\""
     />
@@ -87,7 +87,7 @@ exports[`IntegrationGroup will not display infra links when infra is unavailable
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Show container logs"
-      iconType="loggingApp"
+      iconType="logsApp"
       message="Show container logs"
       tooltipContent="Check Logging UI for container ID \\"\\""
     />
@@ -111,7 +111,7 @@ exports[`IntegrationGroup will not display logging links when logging is unavail
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Check Infrastructure UI for this montor's ip address"
-      iconType="infraApp"
+      iconType="metricsApp"
       message="Show host metrics"
       tooltipContent="Check Infrastructure UI for the IP \\"\\""
     />
@@ -119,7 +119,7 @@ exports[`IntegrationGroup will not display logging links when logging is unavail
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Check Infrastructure UI for this monitor's pod UID"
-      iconType="infraApp"
+      iconType="metricsApp"
       message="Show pod metrics"
       tooltipContent="Check Infrastructure UI for pod UID \\"\\"."
     />
@@ -127,7 +127,7 @@ exports[`IntegrationGroup will not display logging links when logging is unavail
   <EuiFlexItem>
     <IntegrationLink
       ariaLabel="Check Infrastructure UI for this monitor's container ID"
-      iconType="infraApp"
+      iconType="metricsApp"
       message="Show container metrics"
       tooltipContent="Check Infrastructure UI for container ID \\"\\""
     />
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_charts.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_charts.test.tsx.snap
index d915bcb72e05eb..511485e70d0dc5 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_charts.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_charts.test.tsx.snap
@@ -1,82 +1,81 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`MonitorCharts component renders the component without errors 1`] = `
-<Fragment>
-  <EuiFlexGroup>
-    <EuiFlexItem>
-      <DurationChart
-        loading={false}
-        locationDurationLines={
-          Array [
-            Object {
-              "line": Array [
-                Object {
-                  "x": 1548697620000,
-                  "y": 743928.2027027027,
-                },
-                Object {
-                  "x": 1548697920000,
-                  "y": 766840.0133333333,
-                },
-                Object {
-                  "x": 1548698220000,
-                  "y": 786970.8266666667,
-                },
-                Object {
-                  "x": 1548698520000,
-                  "y": 781064.7808219178,
-                },
-                Object {
-                  "x": 1548698820000,
-                  "y": 741563.04,
-                },
-                Object {
-                  "x": 1548699120000,
-                  "y": 759354.6756756756,
-                },
-                Object {
-                  "x": 1548699420000,
-                  "y": 737533.3866666667,
-                },
-                Object {
-                  "x": 1548699720000,
-                  "y": 728669.0266666666,
-                },
-                Object {
-                  "x": 1548700020000,
-                  "y": 719951.64,
-                },
-                Object {
-                  "x": 1548700320000,
-                  "y": 769181.7866666666,
-                },
-                Object {
-                  "x": 1548700620000,
-                  "y": 740805.2666666667,
-                },
-              ],
-              "name": "somewhere",
-            },
-          ]
-        }
-        meanColor="mean"
-        rangeColor="range"
-      />
-    </EuiFlexItem>
-    <EuiFlexItem>
-      <withApollo(Component)
-        absoluteEndDate={20}
-        absoluteStartDate={20}
-        height="400px"
-        variables={
+<EuiFlexGroup>
+  <EuiFlexItem>
+    <DurationChart
+      loading={false}
+      locationDurationLines={
+        Array [
           Object {
-            "dateRangeEnd": "2011-12-03T10:15:30+01:00",
-            "dateRangeStart": "2011-12-03T10:15:30+01:00",
-            "monitorId": "something",
-          }
+            "line": Array [
+              Object {
+                "x": 1548697620000,
+                "y": 743928.2027027027,
+              },
+              Object {
+                "x": 1548697920000,
+                "y": 766840.0133333333,
+              },
+              Object {
+                "x": 1548698220000,
+                "y": 786970.8266666667,
+              },
+              Object {
+                "x": 1548698520000,
+                "y": 781064.7808219178,
+              },
+              Object {
+                "x": 1548698820000,
+                "y": 741563.04,
+              },
+              Object {
+                "x": 1548699120000,
+                "y": 759354.6756756756,
+              },
+              Object {
+                "x": 1548699420000,
+                "y": 737533.3866666667,
+              },
+              Object {
+                "x": 1548699720000,
+                "y": 728669.0266666666,
+              },
+              Object {
+                "x": 1548700020000,
+                "y": 719951.64,
+              },
+              Object {
+                "x": 1548700320000,
+                "y": 769181.7866666666,
+              },
+              Object {
+                "x": 1548700620000,
+                "y": 740805.2666666667,
+              },
+            ],
+            "name": "somewhere",
+          },
+        ]
+      }
+      meanColor="mean"
+      rangeColor="range"
+    />
+  </EuiFlexItem>
+  <EuiFlexItem>
+    <withApollo(Component)
+      absoluteEndDate={20}
+      absoluteStartDate={20}
+      height="400px"
+      isResponsive={false}
+      variables={
+        Object {
+          "dateRangeEnd": "2011-12-03T10:15:30+01:00",
+          "dateRangeStart": "2011-12-03T10:15:30+01:00",
+          "monitorId": "something",
         }
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-</Fragment>
+      }
+    />
+  </EuiFlexItem>
+</EuiFlexGroup>
 `;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/ping_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/ping_list.test.tsx.snap
index 11b26bff9ea366..9c6d2e2f495c11 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/ping_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/ping_list.test.tsx.snap
@@ -43,41 +43,30 @@ exports[`PingList component renders sorted list without errors 1`] = `
                   label="Status"
                   labelType="label"
                 >
-                  <EuiComboBox
+                  <EuiSelect
                     aria-label="Status"
                     compressed={false}
                     fullWidth={false}
-                    isClearable={false}
+                    hasNoInitialSelection={false}
+                    isLoading={false}
                     onChange={[Function]}
                     options={
                       Array [
                         Object {
-                          "label": "All",
+                          "text": "All",
                           "value": "",
                         },
                         Object {
-                          "label": "Up",
+                          "text": "Up",
                           "value": "up",
                         },
                         Object {
-                          "label": "Down",
+                          "text": "Down",
                           "value": "down",
                         },
                       ]
                     }
-                    selectedOptions={
-                      Array [
-                        Object {
-                          "label": "Down",
-                          "value": "down",
-                        },
-                      ]
-                    }
-                    singleSelection={
-                      Object {
-                        "asPlainText": true,
-                      }
-                    }
+                    value="down"
                   />
                 </EuiFormRow>
               </EuiFlexItem>
@@ -92,37 +81,26 @@ exports[`PingList component renders sorted list without errors 1`] = `
                   label="Location"
                   labelType="label"
                 >
-                  <EuiComboBox
+                  <EuiSelect
                     aria-label="Location"
                     compressed={false}
                     fullWidth={false}
-                    isClearable={false}
+                    hasNoInitialSelection={false}
+                    isLoading={false}
                     onChange={[Function]}
                     options={
                       Array [
                         Object {
-                          "label": "All",
-                          "value": "All",
+                          "text": "All",
+                          "value": "",
                         },
                         Object {
-                          "label": "nyc",
+                          "text": "nyc",
                           "value": "nyc",
                         },
                       ]
                     }
-                    selectedOptions={
-                      Array [
-                        Object {
-                          "label": "All",
-                          "value": "All",
-                        },
-                      ]
-                    }
-                    singleSelection={
-                      Object {
-                        "asPlainText": true,
-                      }
-                    }
+                    value=""
                   />
                 </EuiFormRow>
               </EuiFlexItem>
@@ -150,7 +128,7 @@ exports[`PingList component renders sorted list without errors 1`] = `
             "render": [Function],
           },
           Object {
-            "align": "left",
+            "align": "right",
             "dataType": "number",
             "field": "monitor.ip",
             "name": "IP",
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot.test.tsx.snap
index d6b96fef9b2ee0..ebbd8a4ac56a83 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot.test.tsx.snap
@@ -4,22 +4,10 @@ exports[`Snapshot component renders without errors 1`] = `
 <ChartWrapper
   loading={false}
 >
-  <EuiTitle
-    size="s"
-  >
-    <h2>
-      <FormattedMessage
-        defaultMessage="{down}/{total} monitors are down"
-        id="xpack.uptime.snapshot.downCountsMessage"
-        values={
-          Object {
-            "down": 2,
-            "total": 10,
-          }
-        }
-      />
-    </h2>
-  </EuiTitle>
+  <SnapshotHeading
+    down={2}
+    total={10}
+  />
   <EuiSpacer
     size="xs"
   />
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot_heading.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot_heading.test.tsx.snap
new file mode 100644
index 00000000000000..da2e39c3dc1272
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/snapshot_heading.test.tsx.snap
@@ -0,0 +1,31 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SnapshotHeading renders custom heading for no down monitors 1`] = `
+<EuiTitle
+  size="s"
+>
+  <h2>
+    All monitors are up
+  </h2>
+</EuiTitle>
+`;
+
+exports[`SnapshotHeading renders custom heading for no monitors 1`] = `
+<EuiTitle
+  size="s"
+>
+  <h2>
+    No monitors found
+  </h2>
+</EuiTitle>
+`;
+
+exports[`SnapshotHeading renders standard heading for valid counts 1`] = `
+<EuiTitle
+  size="s"
+>
+  <h2>
+    3/17 monitors are down
+  </h2>
+</EuiTitle>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/ping_list.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/ping_list.test.tsx
index 64aed656158469..46da7e52333543 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/ping_list.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/ping_list.test.tsx
@@ -7,7 +7,7 @@
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { PingResults, Ping } from '../../../../common/graphql/types';
-import { PingListComponent, BaseLocationOptions, toggleDetails } from '../ping_list';
+import { PingListComponent, AllLocationOption, toggleDetails } from '../ping_list';
 import { EuiComboBoxOptionProps } from '@elastic/eui';
 import { ExpandedRowMap } from '../monitor_list/types';
 
@@ -210,7 +210,7 @@ describe('PingList component', () => {
         onUpdateApp={jest.fn()}
         pageSize={30}
         selectedOption="down"
-        selectedLocation={BaseLocationOptions}
+        selectedLocation={AllLocationOption.value}
       />
     );
     expect(component).toMatchSnapshot();
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/snapshot_heading.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/snapshot_heading.test.tsx
new file mode 100644
index 00000000000000..5ddef3d0aabd10
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/snapshot_heading.test.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 { shallowWithIntl } from 'test_utils/enzyme_helpers';
+import React from 'react';
+import { SnapshotHeading } from '../snapshot_heading';
+
+describe('SnapshotHeading', () => {
+  it('renders custom heading for no down monitors', () => {
+    const wrapper = shallowWithIntl(<SnapshotHeading down={0} total={23} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('renders standard heading for valid counts', () => {
+    const wrapper = shallowWithIntl(<SnapshotHeading down={3} total={17} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('renders custom heading for no monitors', () => {
+    const wrapper = shallowWithIntl(<SnapshotHeading down={0} total={0} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/snapshot_histogram.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/snapshot_histogram.test.tsx
index bad6c5e2a2ba1d..db78c063b7ed58 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/snapshot_histogram.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/snapshot_histogram.test.tsx
@@ -12,6 +12,7 @@ describe('SnapshotHistogram component', () => {
   const props: SnapshotHistogramProps = {
     absoluteStartDate: 1548697920000,
     absoluteEndDate: 1548700920000,
+    isResponsive: false,
   };
 
   it('renders the component without errors', () => {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart.tsx
index 3ae6f349d39976..76c3bd5d4c50d6 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/donut_chart.tsx
@@ -25,6 +25,10 @@ export const DonutChart = ({ height, down, up, width }: DonutChartProps) => {
     colors: { danger, gray },
   } = useContext(UptimeSettingsContext);
 
+  let upCount = up;
+  if (up === 0 && down === 0) {
+    upCount = 1;
+  }
   useEffect(() => {
     if (chartElement.current !== null) {
       // we must remove any existing paths before painting
@@ -50,7 +54,7 @@ export const DonutChart = ({ height, down, up, width }: DonutChartProps) => {
         .data(
           // @ts-ignore pie generator expects param of type number[], but only works with
           // output of d3.entries, which is like Array<{ key: string, value: number }>
-          pieGenerator(d3.entries({ up, down }))
+          pieGenerator(d3.entries({ up: upCount, down }))
         )
         .enter()
         .append('path')
@@ -64,7 +68,7 @@ export const DonutChart = ({ height, down, up, width }: DonutChartProps) => {
         )
         .attr('fill', (d: any) => color(d.data.key));
     }
-  }, [chartElement.current, up, down]);
+  }, [chartElement.current, upCount, down]);
   return (
     <EuiFlexGroup alignItems="center" responsive={false}>
       <EuiFlexItem grow={false}>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/snapshot_histogram.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/snapshot_histogram.tsx
index e39adc2868c84c..37edd208712456 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/snapshot_histogram.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/snapshot_histogram.tsx
@@ -19,27 +19,16 @@ import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import moment from 'moment';
-import styled from 'styled-components';
-import { HistogramDataPoint } from '../../../../common/graphql/types';
 import { getColorsMap } from './get_colors_map';
 import { getChartDateLabel } from '../../../lib/helper';
 import { withUptimeGraphQL, UptimeGraphQLQueryProps } from '../../higher_order';
 import { snapshotHistogramQuery } from '../../../queries/snapshot_histogram_query';
 import { ChartWrapper } from './chart_wrapper';
 import { UptimeSettingsContext } from '../../../contexts';
+import { ResponsiveWrapperProps, withResponsiveWrapper } from '../../higher_order';
+import { HistogramResult } from '../../../../common/domain_types';
 
-const SnapshotHistogramWrapper = styled.div`
-  margin-left: 120px;
-  @media (max-width: 950px) {
-    margin-left: 48px;
-  }
-  @media (max-width: 767px) {
-    margin-left: 12px;
-    margin-top: 40px;
-  }
-`;
-
-export interface SnapshotHistogramProps {
+interface HistogramProps {
   /**
    * The date/time for the start of the timespan.
    */
@@ -55,20 +44,24 @@ export interface SnapshotHistogramProps {
   height?: string;
 }
 
+export type SnapshotHistogramProps = HistogramProps & ResponsiveWrapperProps;
+
 interface SnapshotHistogramQueryResult {
-  histogram?: HistogramDataPoint[];
+  queryResult?: HistogramResult;
 }
 
-type Props = UptimeGraphQLQueryProps<SnapshotHistogramQueryResult> & SnapshotHistogramProps;
+type Props = UptimeGraphQLQueryProps<SnapshotHistogramQueryResult> &
+  SnapshotHistogramProps &
+  ResponsiveWrapperProps;
 
-export const SnapshotHistogramComponent = ({
+export const SnapshotHistogramComponent: React.FC<Props> = ({
   absoluteStartDate,
   absoluteEndDate,
   data,
   loading = false,
   height,
 }: Props) => {
-  if (!data || !data.histogram)
+  if (!data || !data.queryResult)
     /**
      * TODO: the Fragment, EuiTitle, and EuiPanel should be extracted to a dumb component
      * that we can reuse in the subsequent return statement at the bottom of this function.
@@ -107,7 +100,9 @@ export const SnapshotHistogramComponent = ({
         </EuiPanel>
       </>
     );
-  const { histogram } = data;
+  const {
+    queryResult: { histogram, interval },
+  } = data;
 
   const {
     colors: { danger, gray },
@@ -123,7 +118,7 @@ export const SnapshotHistogramComponent = ({
   });
   const upSpecId = getSpecId(upMonitorsId);
   return (
-    <SnapshotHistogramWrapper>
+    <>
       <EuiTitle size="xs">
         <h2>
           <FormattedMessage
@@ -145,7 +140,14 @@ export const SnapshotHistogramComponent = ({
         })}
       >
         <Chart>
-          <Settings xDomain={{ min: absoluteStartDate, max: absoluteEndDate }} showLegend={false} />
+          <Settings
+            xDomain={{
+              minInterval: interval,
+              min: absoluteStartDate,
+              max: absoluteEndDate,
+            }}
+            showLegend={false}
+          />
           <Axis
             id={getAxisId(
               i18n.translate('xpack.uptime.snapshotHistogram.xAxisId', {
@@ -197,11 +199,11 @@ export const SnapshotHistogramComponent = ({
           />
         </Chart>
       </ChartWrapper>
-    </SnapshotHistogramWrapper>
+    </>
   );
 };
 
 export const SnapshotHistogram = withUptimeGraphQL<
   SnapshotHistogramQueryResult,
   SnapshotHistogramProps
->(SnapshotHistogramComponent, snapshotHistogramQuery);
+>(withResponsiveWrapper<Props>(SnapshotHistogramComponent), snapshotHistogramQuery);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
index 9bb21a3ef5c719..0077292d91a467 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
@@ -36,7 +36,7 @@ describe('EmptyState component', () => {
   it(`doesn't render child components when count is falsey`, () => {
     const component = mountWithIntl(
       <EmptyStateComponent basePath="" data={undefined} loading={false}>
-        <div>Shouldn't be rendered</div>
+        <div>Shouldn&apos;t be rendered</div>
       </EmptyStateComponent>
     );
     expect(component).toMatchSnapshot();
@@ -58,7 +58,7 @@ describe('EmptyState component', () => {
     ];
     const component = mountWithIntl(
       <EmptyStateComponent basePath="" data={undefined} errors={errors} loading={false}>
-        <div>Shouldn't appear...</div>
+        <div>Shouldn&apos;t appear...</div>
       </EmptyStateComponent>
     );
     expect(component).toMatchSnapshot();
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
index e54129015b3e97..6efce389b72f70 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
@@ -25,6 +25,7 @@ exports[`FilterPopover component does not show item list when loading 1`] = `
   <EuiPopoverTitle>
     <EuiFieldSearch
       compressed={false}
+      disabled={false}
       fullWidth={false}
       incremental={false}
       isLoading={false}
@@ -60,6 +61,7 @@ exports[`FilterPopover component renders without errors for valid props 1`] = `
   <EuiPopoverTitle>
     <EuiFieldSearch
       compressed={false}
+      disabled={false}
       fullWidth={false}
       incremental={false}
       isLoading={false}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/__snapshots__/filter_status_button.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/__snapshots__/filter_status_button.test.tsx.snap
index 22eacdb91c0dc2..28ac27054b8566 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/__snapshots__/filter_status_button.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/__snapshots__/filter_status_button.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`FilterStatusButton renders without errors for valid props 1`] = `
 <EuiFilterButton
   color="text"
+  data-test-subj="foo"
   grow={true}
   hasActiveFilters={false}
   iconSide="right"
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/filter_status_button.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/filter_status_button.test.tsx
index 98eafb2d0fe2a9..73a74747d5ca5d 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/filter_status_button.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/__tests__/filter_status_button.test.tsx
@@ -13,6 +13,7 @@ describe('FilterStatusButton', () => {
   beforeEach(() => {
     props = {
       content: 'Up',
+      dataTestSubj: 'foo',
       value: 'up',
       withNext: true,
     };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_group.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_group.tsx
index cfdb27d9c41224..f27514bf76a11a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_group.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_group.tsx
@@ -105,6 +105,7 @@ export const FilterGroupComponent = ({
         content={i18n.translate('xpack.uptime.filterBar.filterUpLabel', {
           defaultMessage: 'Up',
         })}
+        dataTestSubj="xpack.uptime.filterBar.filterStatusUp"
         value="up"
         withNext={true}
       />
@@ -112,6 +113,7 @@ export const FilterGroupComponent = ({
         content={i18n.translate('xpack.uptime.filterBar.filterDownLabel', {
           defaultMessage: 'Down',
         })}
+        dataTestSubj="xpack.uptime.filterBar.filterStatusDown"
         value="down"
         withNext={false}
       />
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_popover.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_popover.tsx
index 676c7f24743bdb..4f12af75815e8b 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_popover.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_popover.tsx
@@ -9,6 +9,7 @@ import React, { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { UptimeFilterButton } from './uptime_filter_button';
 import { toggleSelectedItems } from './toggle_selected_item';
+import { LocationLink } from '../monitor_list/location_link';
 
 export interface FilterPopoverProps {
   fieldName: string;
@@ -73,6 +74,7 @@ export const FilterPopover = ({
     >
       <EuiPopoverTitle>
         <EuiFieldSearch
+          disabled={items.length === 0}
           onSearch={query => setSearchQuery(query)}
           placeholder={
             isLoading
@@ -98,6 +100,7 @@ export const FilterPopover = ({
             {item}
           </EuiFilterSelectItem>
         ))}
+      {id === 'location' && items.length === 0 && <LocationLink />}
     </EuiPopover>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_status_button.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_status_button.tsx
index 6f2659ddbc83e9..95f4c30337d627 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_status_button.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_status_button.tsx
@@ -10,15 +10,22 @@ import { useUrlParams } from '../../../hooks';
 
 export interface FilterStatusButtonProps {
   content: string;
+  dataTestSubj: string;
   value: string;
   withNext: boolean;
 }
 
-export const FilterStatusButton = ({ content, value, withNext }: FilterStatusButtonProps) => {
+export const FilterStatusButton = ({
+  content,
+  dataTestSubj,
+  value,
+  withNext,
+}: FilterStatusButtonProps) => {
   const [getUrlParams, setUrlParams] = useUrlParams();
   const { statusFilter: urlValue } = getUrlParams();
   return (
     <EuiFilterButton
+      data-test-subj={dataTestSubj}
       hasActiveFilters={urlValue === value}
       onClick={() => {
         const nextFilter = { statusFilter: urlValue === value ? '' : value, pagination: '' };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx
index 2dd3d24a3cd8db..da66235e37f1ae 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx
@@ -87,7 +87,7 @@ export const IntegrationGroup = ({
                 }
               )}
               href={getInfraIpHref(summary, basePath)}
-              iconType="infraApp"
+              iconType="metricsApp"
               message={i18n.translate(
                 'xpack.uptime.monitorList.infraIntegrationAction.ip.message',
                 {
@@ -116,7 +116,7 @@ export const IntegrationGroup = ({
                 }
               )}
               href={getInfraKubernetesHref(summary, basePath)}
-              iconType="infraApp"
+              iconType="metricsApp"
               message={i18n.translate(
                 'xpack.uptime.monitorList.infraIntegrationAction.kubernetes.message',
                 {
@@ -145,7 +145,7 @@ export const IntegrationGroup = ({
                 }
               )}
               href={getInfraContainerHref(summary, basePath)}
-              iconType="infraApp"
+              iconType="metricsApp"
               message={i18n.translate(
                 'xpack.uptime.monitorList.infraIntegrationAction.container.message',
                 {
@@ -177,7 +177,7 @@ export const IntegrationGroup = ({
                 }
               )}
               href={getLoggingIpHref(summary, basePath)}
-              iconType="loggingApp"
+              iconType="logsApp"
               message={i18n.translate(
                 'xpack.uptime.monitorList.loggingIntegrationAction.ip.message',
                 {
@@ -200,7 +200,7 @@ export const IntegrationGroup = ({
                 }
               )}
               href={getLoggingKubernetesHref(summary, basePath)}
-              iconType="loggingApp"
+              iconType="logsApp"
               message={i18n.translate(
                 'xpack.uptime.monitorList.loggingIntegrationAction.kubernetes.message',
                 {
@@ -227,7 +227,7 @@ export const IntegrationGroup = ({
                 }
               )}
               href={getLoggingContainerHref(summary, basePath)}
-              iconType="loggingApp"
+              iconType="logsApp"
               message={i18n.translate(
                 'xpack.uptime.monitorList.loggingIntegrationAction.container.message',
                 {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx
index 63a3053afc6016..a545cd7c42927f 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 interface IntegrationLinkProps {
   ariaLabel: string;
   href: string | undefined;
-  iconType: 'apmApp' | 'infraApp' | 'loggingApp';
+  iconType: 'apmApp' | 'metricsApp' | 'logsApp';
   message: string;
   tooltipContent: string;
 }
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_charts.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_charts.tsx
index 51c58a871d0e7a..7d8e788f49ea00 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_charts.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_charts.tsx
@@ -48,26 +48,25 @@ export const MonitorChartsComponent = ({
     const { absoluteDateRangeStart, absoluteDateRangeEnd } = getUrlParams();
 
     return (
-      <Fragment>
-        <EuiFlexGroup>
-          <EuiFlexItem>
-            <DurationChart
-              locationDurationLines={locationDurationLines}
-              meanColor={mean}
-              rangeColor={range}
-              loading={loading}
-            />
-          </EuiFlexItem>
-          <EuiFlexItem>
-            <SnapshotHistogram
-              absoluteStartDate={absoluteDateRangeStart}
-              absoluteEndDate={absoluteDateRangeEnd}
-              variables={{ dateRangeStart, dateRangeEnd, monitorId }}
-              height="400px"
-            />
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </Fragment>
+      <EuiFlexGroup>
+        <EuiFlexItem>
+          <DurationChart
+            locationDurationLines={locationDurationLines}
+            meanColor={mean}
+            rangeColor={range}
+            loading={loading}
+          />
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <SnapshotHistogram
+            absoluteStartDate={absoluteDateRangeStart}
+            absoluteEndDate={absoluteDateRangeEnd}
+            height="400px"
+            isResponsive={false}
+            variables={{ dateRangeStart, dateRangeEnd, monitorId }}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
     );
   }
   return (
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 e53d73fb5a4613..c2167993b80b93 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
@@ -88,6 +88,7 @@ exports[`MonitorList component renders a no items message when no data is provid
         grow={false}
       >
         <OverviewPageLink
+          dataTestSubj="xpack.uptime.monitorList.prevButton"
           direction="prev"
         />
       </EuiFlexItem>
@@ -95,6 +96,7 @@ exports[`MonitorList component renders a no items message when no data is provid
         grow={false}
       >
         <OverviewPageLink
+          dataTestSubj="xpack.uptime.monitorList.nextButton"
           direction="next"
         />
       </EuiFlexItem>
@@ -253,6 +255,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
         grow={false}
       >
         <OverviewPageLink
+          dataTestSubj="xpack.uptime.monitorList.prevButton"
           direction="prev"
         />
       </EuiFlexItem>
@@ -260,6 +263,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
         grow={false}
       >
         <OverviewPageLink
+          dataTestSubj="xpack.uptime.monitorList.nextButton"
           direction="next"
         />
       </EuiFlexItem>
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 cd03c6aad5611b..619cce88b309ba 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
@@ -88,6 +88,7 @@ exports[`MonitorList component renders a no items message when no data is provid
         grow={false}
       >
         <OverviewPageLink
+          dataTestSubj="xpack.uptime.monitorList.prevButton"
           direction="prev"
         />
       </EuiFlexItem>
@@ -95,6 +96,7 @@ exports[`MonitorList component renders a no items message when no data is provid
         grow={false}
       >
         <OverviewPageLink
+          dataTestSubj="xpack.uptime.monitorList.nextButton"
           direction="next"
         />
       </EuiFlexItem>
@@ -253,6 +255,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
         grow={false}
       >
         <OverviewPageLink
+          dataTestSubj="xpack.uptime.monitorList.prevButton"
           direction="prev"
           pagination="{\\"cursorKey\\":{\\"monitor_id\\":123},\\"cursorDirection\\":\\"BEFORE\\",\\"sortOrder\\":\\"ASC\\"}"
         />
@@ -261,6 +264,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
         grow={false}
       >
         <OverviewPageLink
+          dataTestSubj="xpack.uptime.monitorList.nextButton"
           direction="next"
           pagination="{\\"cursorKey\\":{\\"monitor_id\\":456},\\"cursorDirection\\":\\"AFTER\\",\\"sortOrder\\":\\"ASC\\"}"
         />
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 cf3a0ef4e37e75..5774453ff67ab5 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
@@ -248,10 +248,18 @@ export const MonitorListComponent = (props: Props) => {
         <EuiSpacer size="s" />
         <EuiFlexGroup>
           <EuiFlexItem grow={false}>
-            <OverviewPageLink pagination={prevPagePagination} direction="prev" />
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.prevButton"
+              direction="prev"
+              pagination={prevPagePagination}
+            />
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <OverviewPageLink pagination={nextPagePagination} direction="next" />
+            <OverviewPageLink
+              dataTestSubj="xpack.uptime.monitorList.nextButton"
+              direction="next"
+              pagination={nextPagePagination}
+            />
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiPanel>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/overview_page_link.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/overview_page_link.tsx
index 9153b6018ce729..5b0ad2ce585370 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/overview_page_link.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/overview_page_link.tsx
@@ -10,13 +10,15 @@ import { i18n } from '@kbn/i18n';
 import { useUrlParams } from '../../hooks';
 
 interface OverviewPageLinkProps {
-  pagination: string;
+  dataTestSubj: string;
   direction: string;
+  pagination: string;
 }
 
 export const OverviewPageLink: FunctionComponent<OverviewPageLinkProps> = ({
-  pagination,
+  dataTestSubj,
   direction,
+  pagination,
 }) => {
   const [, updateUrlParams] = useUrlParams();
   const icon = direction === 'prev' ? 'arrowLeft' : 'arrowRight';
@@ -34,6 +36,7 @@ export const OverviewPageLink: FunctionComponent<OverviewPageLinkProps> = ({
   return !!pagination ? (
     <EuiLink
       aria-label={ariaLabel}
+      data-test-subj={dataTestSubj}
       onClick={() => {
         updateUrlParams({ pagination });
       }}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list.tsx
index 705a757a83eb74..fb7c0a5af1e7f8 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list.tsx
@@ -6,12 +6,11 @@
 import {
   EuiBadge,
   EuiBasicTable,
-  EuiComboBox,
-  EuiComboBoxOptionProps,
   EuiFlexGroup,
   EuiFlexItem,
   EuiHealth,
   EuiPanel,
+  EuiSelect,
   EuiSpacer,
   EuiText,
   EuiTitle,
@@ -38,13 +37,13 @@ interface PingListQueryResult {
 }
 
 interface PingListProps {
-  onSelectedStatusChange: (status: string | null) => void;
-  onSelectedLocationChange: (location: EuiComboBoxOptionProps[]) => void;
+  onSelectedStatusChange: (status: string | undefined) => void;
+  onSelectedLocationChange: (location: any) => void;
   onPageCountChange: (itemCount: number) => void;
   onUpdateApp: () => void;
   pageSize: number;
   selectedOption: string;
-  selectedLocation: EuiComboBoxOptionProps[];
+  selectedLocation: string | undefined;
 }
 
 type Props = UptimeGraphQLQueryProps<PingListQueryResult> & PingListProps;
@@ -52,7 +51,7 @@ interface ExpandedRowMap {
   [key: string]: JSX.Element;
 }
 
-export const BaseLocationOptions = [{ label: 'All', value: 'All' }];
+export const AllLocationOption = { text: 'All', value: '' };
 
 export const toggleDetails = (
   ping: Ping,
@@ -84,32 +83,32 @@ export const PingListComponent = ({
 }: Props) => {
   const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<ExpandedRowMap>({});
 
-  const statusOptions: EuiComboBoxOptionProps[] = [
+  const statusOptions = [
     {
-      label: i18n.translate('xpack.uptime.pingList.statusOptions.allStatusOptionLabel', {
+      text: i18n.translate('xpack.uptime.pingList.statusOptions.allStatusOptionLabel', {
         defaultMessage: 'All',
       }),
       value: '',
     },
     {
-      label: i18n.translate('xpack.uptime.pingList.statusOptions.upStatusOptionLabel', {
+      text: i18n.translate('xpack.uptime.pingList.statusOptions.upStatusOptionLabel', {
         defaultMessage: 'Up',
       }),
       value: 'up',
     },
     {
-      label: i18n.translate('xpack.uptime.pingList.statusOptions.downStatusOptionLabel', {
+      text: i18n.translate('xpack.uptime.pingList.statusOptions.downStatusOptionLabel', {
         defaultMessage: 'Down',
       }),
       value: 'down',
     },
   ];
   const locations = get<string[]>(data, 'allPings.locations');
-  const locationOptions: EuiComboBoxOptionProps[] = !locations
-    ? BaseLocationOptions
-    : BaseLocationOptions.concat(
+  const locationOptions = !locations
+    ? [AllLocationOption]
+    : [AllLocationOption].concat(
         locations.map(name => {
-          return { label: name, value: name };
+          return { text: name, value: name };
         })
       );
 
@@ -151,7 +150,7 @@ export const PingListComponent = ({
       render: (location: string) => <LocationName location={location} />,
     },
     {
-      align: 'left',
+      align: 'right',
       dataType: 'number',
       field: 'monitor.ip',
       name: i18n.translate('xpack.uptime.pingList.ipAddressColumnLabel', {
@@ -253,22 +252,18 @@ export const PingListComponent = ({
                         defaultMessage: 'Status',
                       })}
                     >
-                      <EuiComboBox
-                        isClearable={false}
-                        singleSelection={{ asPlainText: true }}
-                        selectedOptions={[
-                          statusOptions.find(({ value }) => value === selectedOption) ||
-                            statusOptions[2],
-                        ]}
+                      <EuiSelect
                         options={statusOptions}
                         aria-label={i18n.translate('xpack.uptime.pingList.statusLabel', {
                           defaultMessage: 'Status',
                         })}
-                        onChange={(selectedOptions: EuiComboBoxOptionProps[]) => {
-                          if (typeof selectedOptions[0].value === 'string') {
+                        value={selectedOption}
+                        onChange={selected => {
+                          if (typeof selected.target.value === 'string') {
                             onSelectedStatusChange(
-                              // @ts-ignore it's definitely a string
-                              selectedOptions[0].value !== '' ? selectedOptions[0].value : null
+                              selected.target && selected.target.value !== ''
+                                ? selected.target.value
+                                : undefined
                             );
                           }
                         }}
@@ -282,16 +277,18 @@ export const PingListComponent = ({
                         defaultMessage: 'Location',
                       })}
                     >
-                      <EuiComboBox
-                        isClearable={false}
-                        singleSelection={{ asPlainText: true }}
-                        selectedOptions={selectedLocation}
+                      <EuiSelect
                         options={locationOptions}
+                        value={selectedLocation}
                         aria-label={i18n.translate('xpack.uptime.pingList.locationLabel', {
                           defaultMessage: 'Location',
                         })}
-                        onChange={(selectedOptions: EuiComboBoxOptionProps[]) => {
-                          onSelectedLocationChange(selectedOptions);
+                        onChange={selected => {
+                          onSelectedLocationChange(
+                            selected.target && selected.target.value !== ''
+                              ? selected.target.value
+                              : null
+                          );
                         }}
                       />
                     </EuiFormRow>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx
index bfc8cb70038681..8d89e53a41a45d 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx
@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiSpacer, EuiTitle } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import { get } from 'lodash';
 import { DonutChart } from './charts';
@@ -13,6 +12,7 @@ import { Snapshot as SnapshotType } from '../../../common/graphql/types';
 import { UptimeGraphQLQueryProps, withUptimeGraphQL } from '../higher_order';
 import { snapshotQuery } from '../../queries';
 import { ChartWrapper } from './charts/chart_wrapper';
+import { SnapshotHeading } from './snapshot_heading';
 
 const SNAPSHOT_CHART_WIDTH = 144;
 const SNAPSHOT_CHART_HEIGHT = 144;
@@ -31,18 +31,10 @@ export const SnapshotComponent = ({
   loading,
 }: UptimeGraphQLQueryProps<SnapshotQueryResult>) => (
   <ChartWrapper loading={loading}>
-    <EuiTitle size="s">
-      <h2>
-        <FormattedMessage
-          id="xpack.uptime.snapshot.downCountsMessage"
-          defaultMessage="{down}/{total} monitors are down"
-          values={{
-            down: get<number>(data, 'snapshot.counts.down', 0),
-            total: get<number>(data, 'snapshot.counts.total', 0),
-          }}
-        />
-      </h2>
-    </EuiTitle>
+    <SnapshotHeading
+      down={get<number>(data, 'snapshot.counts.down', 0)}
+      total={get<number>(data, 'snapshot.counts.total', 0)}
+    />
     <EuiSpacer size="xs" />
     <DonutChart
       up={get<number>(data, 'snapshot.counts.up', 0)}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/snapshot_heading.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/snapshot_heading.tsx
new file mode 100644
index 00000000000000..85d1294d4b0640
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/snapshot_heading.tsx
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiTitle } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+
+interface Props {
+  down: number;
+  total: number;
+}
+
+const getMessage = (down: number, total: number): string => {
+  if (down === 0 && total > 0) {
+    return i18n.translate('xpack.uptime.snapshot.zeroDownMessage', {
+      defaultMessage: 'All monitors are up',
+    });
+  } else if (down === 0 && total === 0) {
+    return i18n.translate('xpack.uptime.snapshot.noMonitorMessage', {
+      defaultMessage: 'No monitors found',
+    });
+  }
+  return i18n.translate('xpack.uptime.snapshot.downCountsMessage', {
+    defaultMessage: '{down}/{total} monitors are down',
+    values: {
+      down,
+      total,
+    },
+  });
+};
+
+export const SnapshotHeading = ({ down, total }: Props) => (
+  <EuiTitle size="s">
+    <h2>{getMessage(down, total)}</h2>
+  </EuiTitle>
+);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/status_panel.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/status_panel.tsx
index 9f1e4648b072d4..e941c2dad87d2d 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/status_panel.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/status_panel.tsx
@@ -8,19 +8,16 @@ import { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
 import React from 'react';
 import { SnapshotHistogram } from './charts';
 import { Snapshot } from './snapshot';
-import { UptimeAppColors } from '../../uptime_app';
 
 interface StatusPanelProps {
   absoluteDateRangeStart: number;
   absoluteDateRangeEnd: number;
-  colors: UptimeAppColors;
   sharedProps: { [key: string]: any };
 }
 
 export const StatusPanel = ({
   absoluteDateRangeStart,
   absoluteDateRangeEnd,
-  colors: { danger, success },
   sharedProps,
 }: StatusPanelProps) => (
   <EuiPanel>
@@ -32,8 +29,9 @@ export const StatusPanel = ({
         <SnapshotHistogram
           absoluteStartDate={absoluteDateRangeStart}
           absoluteEndDate={absoluteDateRangeEnd}
-          variables={sharedProps}
           height="160px"
+          isResponsive={true}
+          variables={sharedProps}
         />
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/uptime/public/components/higher_order/__tests__/__snapshots__/responsive_wrapper.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/higher_order/__tests__/__snapshots__/responsive_wrapper.test.tsx.snap
new file mode 100644
index 00000000000000..65b6d7cc39e558
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/higher_order/__tests__/__snapshots__/responsive_wrapper.test.tsx.snap
@@ -0,0 +1,221 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ResponsiveWrapper HOC is not responsive when prop is false 1`] = `
+<EuiPanel
+  paddingSize="m"
+>
+  <Component
+    intl={
+      Object {
+        "defaultFormats": Object {},
+        "defaultLocale": "en",
+        "formatDate": [Function],
+        "formatHTMLMessage": [Function],
+        "formatMessage": [Function],
+        "formatNumber": [Function],
+        "formatPlural": [Function],
+        "formatRelative": [Function],
+        "formatTime": [Function],
+        "formats": Object {
+          "date": Object {
+            "full": Object {
+              "day": "numeric",
+              "month": "long",
+              "weekday": "long",
+              "year": "numeric",
+            },
+            "long": Object {
+              "day": "numeric",
+              "month": "long",
+              "year": "numeric",
+            },
+            "medium": Object {
+              "day": "numeric",
+              "month": "short",
+              "year": "numeric",
+            },
+            "short": Object {
+              "day": "numeric",
+              "month": "numeric",
+              "year": "2-digit",
+            },
+          },
+          "number": Object {
+            "currency": Object {
+              "style": "currency",
+            },
+            "percent": Object {
+              "style": "percent",
+            },
+          },
+          "relative": Object {
+            "days": Object {
+              "units": "day",
+            },
+            "hours": Object {
+              "units": "hour",
+            },
+            "minutes": Object {
+              "units": "minute",
+            },
+            "months": Object {
+              "units": "month",
+            },
+            "seconds": Object {
+              "units": "second",
+            },
+            "years": Object {
+              "units": "year",
+            },
+          },
+          "time": Object {
+            "full": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+              "second": "numeric",
+              "timeZoneName": "short",
+            },
+            "long": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+              "second": "numeric",
+              "timeZoneName": "short",
+            },
+            "medium": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+              "second": "numeric",
+            },
+            "short": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+            },
+          },
+        },
+        "formatters": Object {
+          "getDateTimeFormat": [Function],
+          "getMessageFormat": [Function],
+          "getNumberFormat": [Function],
+          "getPluralFormat": [Function],
+          "getRelativeFormat": [Function],
+        },
+        "locale": "en",
+        "messages": Object {},
+        "now": [Function],
+        "onError": [Function],
+        "textComponent": Symbol(react.fragment),
+        "timeZone": null,
+      }
+    }
+  />
+</EuiPanel>
+`;
+
+exports[`ResponsiveWrapper HOC renders a responsive wrapper 1`] = `
+<styled.div>
+  <Component
+    intl={
+      Object {
+        "defaultFormats": Object {},
+        "defaultLocale": "en",
+        "formatDate": [Function],
+        "formatHTMLMessage": [Function],
+        "formatMessage": [Function],
+        "formatNumber": [Function],
+        "formatPlural": [Function],
+        "formatRelative": [Function],
+        "formatTime": [Function],
+        "formats": Object {
+          "date": Object {
+            "full": Object {
+              "day": "numeric",
+              "month": "long",
+              "weekday": "long",
+              "year": "numeric",
+            },
+            "long": Object {
+              "day": "numeric",
+              "month": "long",
+              "year": "numeric",
+            },
+            "medium": Object {
+              "day": "numeric",
+              "month": "short",
+              "year": "numeric",
+            },
+            "short": Object {
+              "day": "numeric",
+              "month": "numeric",
+              "year": "2-digit",
+            },
+          },
+          "number": Object {
+            "currency": Object {
+              "style": "currency",
+            },
+            "percent": Object {
+              "style": "percent",
+            },
+          },
+          "relative": Object {
+            "days": Object {
+              "units": "day",
+            },
+            "hours": Object {
+              "units": "hour",
+            },
+            "minutes": Object {
+              "units": "minute",
+            },
+            "months": Object {
+              "units": "month",
+            },
+            "seconds": Object {
+              "units": "second",
+            },
+            "years": Object {
+              "units": "year",
+            },
+          },
+          "time": Object {
+            "full": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+              "second": "numeric",
+              "timeZoneName": "short",
+            },
+            "long": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+              "second": "numeric",
+              "timeZoneName": "short",
+            },
+            "medium": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+              "second": "numeric",
+            },
+            "short": Object {
+              "hour": "numeric",
+              "minute": "numeric",
+            },
+          },
+        },
+        "formatters": Object {
+          "getDateTimeFormat": [Function],
+          "getMessageFormat": [Function],
+          "getNumberFormat": [Function],
+          "getPluralFormat": [Function],
+          "getRelativeFormat": [Function],
+        },
+        "locale": "en",
+        "messages": Object {},
+        "now": [Function],
+        "onError": [Function],
+        "textComponent": Symbol(react.fragment),
+        "timeZone": null,
+      }
+    }
+  />
+</styled.div>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/higher_order/__tests__/responsive_wrapper.test.tsx b/x-pack/legacy/plugins/uptime/public/components/higher_order/__tests__/responsive_wrapper.test.tsx
new file mode 100644
index 00000000000000..ae265ef1bb0c62
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/higher_order/__tests__/responsive_wrapper.test.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { withResponsiveWrapper } from '../responsive_wrapper';
+
+interface Prop {
+  isResponsive: boolean;
+}
+
+describe('ResponsiveWrapper HOC', () => {
+  let WrappedByHOC: React.FC<Prop>;
+  beforeEach(() => {
+    WrappedByHOC = withResponsiveWrapper<Prop>(() => <div>Should be responsive</div>);
+  });
+
+  it('renders a responsive wrapper', () => {
+    const component = shallowWithIntl(<WrappedByHOC isResponsive={true} />);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('is not responsive when prop is false', () => {
+    const component = shallowWithIntl(<WrappedByHOC isResponsive={false} />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/higher_order/index.ts b/x-pack/legacy/plugins/uptime/public/components/higher_order/index.ts
index c5b712e0ae6744..e0e14456cfc684 100644
--- a/x-pack/legacy/plugins/uptime/public/components/higher_order/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/higher_order/index.ts
@@ -5,3 +5,4 @@
  */
 
 export { UptimeGraphQLQueryProps, withUptimeGraphQL } from './uptime_graphql_query';
+export { ResponsiveWrapperProps, withResponsiveWrapper } from './responsive_wrapper';
diff --git a/x-pack/legacy/plugins/uptime/public/components/higher_order/responsive_wrapper.tsx b/x-pack/legacy/plugins/uptime/public/components/higher_order/responsive_wrapper.tsx
new file mode 100644
index 00000000000000..f383600ab8aa1f
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/higher_order/responsive_wrapper.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiPanel } from '@elastic/eui';
+import React, { FC } from 'react';
+import styled from 'styled-components';
+
+const ResponsiveWrapper = styled.div`
+  margin-left: 120px;
+  @media (max-width: 950px) {
+    margin-left: 48px;
+  }
+  @media (max-width: 767px) {
+    margin-left: 12px;
+    margin-top: 40px;
+  }
+`;
+
+export interface ResponsiveWrapperProps {
+  isResponsive: boolean;
+}
+
+/**
+ * HOC that wraps a component in either a responsive div or an EuiPanel.
+ * @param Component The component to wrap.
+ */
+export const withResponsiveWrapper = <P extends {} & ResponsiveWrapperProps>(
+  Component: FC<P>
+): FC<ResponsiveWrapperProps & P> => ({ isResponsive, ...rest }: ResponsiveWrapperProps) =>
+  isResponsive ? (
+    <ResponsiveWrapper>
+      <Component {...(rest as P)} />
+    </ResponsiveWrapper>
+  ) : (
+    <EuiPanel paddingSize="m">
+      <Component {...(rest as P)} />
+    </EuiPanel>
+  );
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/kibana_global_help.tsx b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/kibana_global_help.tsx
index 7896764d359634..8e730dcc293104 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/kibana_global_help.tsx
+++ b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/kibana_global_help.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 
 export const renderUptimeKibanaGlobalHelp = (docsSiteUrl: string, docLinkVersion: string) => (
   <React.Fragment>
-    <EuiHorizontalRule margin="none"></EuiHorizontalRule>
+    <EuiHorizontalRule margin="none" />
     <EuiSpacer />
     <EuiText size="s">For Uptime specific information</EuiText>
     <EuiSpacer />
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/__tests__/get_label_format.test.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/charts/__tests__/get_label_format.test.ts
index c435e5acc2f287..bdf0832a98fdfa 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/__tests__/get_label_format.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/charts/__tests__/get_label_format.test.ts
@@ -24,7 +24,7 @@ describe('getChartLabelFormatter', () => {
 
   it('creates a label with month/day and hour/minute for time between 36 hours and 4 days', () => {
     // Sun, 15 Jul 2001 17:53:10 GMT -> Thu, 19 Jul 2001 17:52:59 GMT
-    expect(getChartDateLabel(995219590000, 995565179000)).toBe('MM-dd HH:mm');
+    expect(getChartDateLabel(995219590000, 995565179000)).toBe('MM-DD HH:mm');
   });
 
   it('creates a format without day/month string for delta within same day local time', () => {
@@ -34,17 +34,25 @@ describe('getChartLabelFormatter', () => {
 
   it('creates a format with date/month string for delta crossing dates', () => {
     // Wed, 18 Jul 2001 11:06:19 GMT -> Thu, 19 Jul 2001 17:52:59 GMT
-    expect(getChartDateLabel(995454379000, 995565179000)).toBe('MM-dd HH:mm');
+    expect(getChartDateLabel(995454379000, 995565179000)).toBe('MM-DD HH:mm');
   });
 
   it('creates a format with only month/day for delta between to eight days and two weeks', () => {
     // Sun, 01 Jul 2001 23:28:15 GMT -> Thu, 19 Jul 2001 17:52:59 GMT
-    expect(getChartDateLabel(994030095000, 995565179000)).toBe('MM-dd');
+    expect(getChartDateLabel(994030095000, 995565179000)).toBe('MM-DD');
   });
 
-  it('creates a format with the year/month for range exceeding a week', () => {
+  it('creates a format with the date and hour/min for 36h < range < 9d', () => {
+    expect(getChartDateLabel(1003752000000, 1004270400000)).toBe('MM-DD HH:mm');
+  });
+
+  it('creates a format with month/day for range between nine days and three weeks', () => {
+    expect(getChartDateLabel(1003752000000, 1004875200000)).toBe('MM-DD');
+  });
+
+  it('creates a format with the year/month/day for range exceeding three weeks', () => {
     // Sun, 15 Jul 2001 12:27:59 GMT -> Fri, 28 Dec 2001 18:46:19 GMT
-    expect(getChartDateLabel(995200079000, 1009565179000)).toBe('yyyy-MM');
+    expect(getChartDateLabel(995200079000, 1009565179000)).toBe('YYYY-MM-DD');
   });
 
   it('creates a format of only year for timespan > 4 years', () => {
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts
index 3533f2667b66c4..126b1d85f749f0 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_chart_date_label.ts
@@ -34,7 +34,7 @@ export const getChartDateLabel = (dateRangeStart: number, dateRangeEnd: number)
     delta < CHART_FORMAT_LIMITS.THIRTY_SIX_HOURS &&
     !isWithinCurrentDate(dateRangeStart, dateRangeEnd)
   ) {
-    formatString = 'MM-dd ';
+    formatString = 'MM-DD ';
   }
   return formatString + getLabelFormat(delta);
 };
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_label_format.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_label_format.ts
index ad3e04f4036403..668147fee80551 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_label_format.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/charts/get_label_format.ts
@@ -7,11 +7,12 @@
 import { CHART_FORMAT_LIMITS } from '../../../../common/constants';
 
 const {
-  FIFTEEN_DAYS,
   EIGHT_MINUTES,
   FOUR_YEARS,
   THIRTY_SIX_HOURS,
   THREE_WEEKS,
+  SIX_MONTHS,
+  NINE_DAYS,
 } = CHART_FORMAT_LIMITS;
 
 /**
@@ -30,16 +31,20 @@ const dateStops: Array<{ key: number; value: string }> = [
     value: 'HH:mm',
   },
   {
-    key: FIFTEEN_DAYS,
-    value: 'MM-dd HH:mm',
+    key: NINE_DAYS,
+    value: 'MM-DD HH:mm',
   },
   {
     key: THREE_WEEKS,
-    value: 'MM-dd',
+    value: 'MM-DD',
+  },
+  {
+    key: SIX_MONTHS,
+    value: 'YYYY-MM-DD',
   },
   {
     key: FOUR_YEARS,
-    value: 'yyyy-MM',
+    value: 'YYYY-MM',
   },
 ];
 
diff --git a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
index 0ebcf48cd249de..86a0a9e4b0f0b9 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
@@ -7,7 +7,6 @@
 import {
   // @ts-ignore No typings for EuiSpacer
   EuiSpacer,
-  EuiComboBoxOptionProps,
 } from '@elastic/eui';
 import { ApolloQueryResult, OperationVariables, QueryOptions } from 'apollo-client';
 import gql from 'graphql-tag';
@@ -23,7 +22,6 @@ import { UMUpdateBreadcrumbs } from '../lib/lib';
 import { UptimeSettingsContext } from '../contexts';
 import { useUrlParams } from '../hooks';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
-import { BaseLocationOptions } from '../components/functional/ping_list';
 import { useTrackPageview } from '../../../infra/public';
 import { getTitle } from '../lib/helper/get_title';
 
@@ -74,16 +72,12 @@ export const MonitorPage = ({
     });
   }, [params]);
 
-  const [selectedLocation, setSelectedLocation] = useState<EuiComboBoxOptionProps[]>(
-    BaseLocationOptions
-  );
-
-  const selLocationVal = selectedLocation[0].value === 'All' ? null : selectedLocation[0].value;
+  const [selectedLocation, setSelectedLocation] = useState(undefined);
 
   const sharedVariables = {
     dateRangeStart,
     dateRangeEnd,
-    location: selLocationVal,
+    location: selectedLocation,
     monitorId,
   };
 
@@ -111,7 +105,7 @@ export const MonitorPage = ({
       <PingList
         onPageCountChange={setPingListPageCount}
         onSelectedLocationChange={setSelectedLocation}
-        onSelectedStatusChange={(selectedStatus: string | null) =>
+        onSelectedStatusChange={(selectedStatus: string | undefined) =>
           updateUrlParams({ selectedPingStatus: selectedStatus || '' })
         }
         onUpdateApp={refreshApp}
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
index 445ebcb5547b88..ded16c3f8eb2f0 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
@@ -151,7 +151,6 @@ export const OverviewPage = ({
         <StatusPanel
           absoluteDateRangeStart={absoluteDateRangeStart}
           absoluteDateRangeEnd={absoluteDateRangeEnd}
-          colors={colors}
           sharedProps={sharedProps}
         />
         <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/uptime/public/queries/snapshot_histogram_query.ts b/x-pack/legacy/plugins/uptime/public/queries/snapshot_histogram_query.ts
index 37f7178d23630f..7eb56ea4e9dd18 100644
--- a/x-pack/legacy/plugins/uptime/public/queries/snapshot_histogram_query.ts
+++ b/x-pack/legacy/plugins/uptime/public/queries/snapshot_histogram_query.ts
@@ -14,18 +14,21 @@ export const snapshotHistogramQueryString = `
     $monitorId: String
     $statusFilter: String
   ) {
-    histogram: getSnapshotHistogram(
+    queryResult: getSnapshotHistogram(
       dateRangeStart: $dateRangeStart
       dateRangeEnd: $dateRangeEnd
       filters: $filters
       statusFilter: $statusFilter
       monitorId: $monitorId
     ) {
+      histogram {
       upCount
         downCount
         x
         x0
         y
+      }
+      interval
     }
   }
 `;
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts b/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
index 287e80a6291ca1..96a386b6a68487 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
@@ -17,11 +17,11 @@ import {
   MonitorPageTitle,
   Ping,
   Snapshot,
-  HistogramDataPoint,
   GetSnapshotHistogramQueryArgs,
 } from '../../../common/graphql/types';
 import { UMServerLibs } from '../../lib/lib';
 import { CreateUMGraphQLResolvers, UMContext } from '../types';
+import { HistogramResult } from '../../../common/domain_types';
 
 export type UMSnapshotResolver = UMResolver<
   Snapshot | Promise<Snapshot>,
@@ -61,7 +61,7 @@ export type UMGetMontiorPageTitleResolver = UMResolver<
 >;
 
 export type UMGetSnapshotHistogram = UMResolver<
-  HistogramDataPoint[] | Promise<HistogramDataPoint[]>,
+  HistogramResult | Promise<HistogramResult>,
   any,
   GetSnapshotHistogramQueryArgs,
   UMContext
@@ -101,7 +101,7 @@ export const createMonitorsResolvers: CreateUMGraphQLResolvers = (
       resolver,
       { dateRangeStart, dateRangeEnd, filters, monitorId, statusFilter },
       { req }
-    ): Promise<HistogramDataPoint[]> {
+    ): Promise<HistogramResult> {
       return await libs.pings.getPingHistogram(
         req,
         dateRangeStart,
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/monitors/schema.gql.ts b/x-pack/legacy/plugins/uptime/server/graphql/monitors/schema.gql.ts
index d406be2e8b15bb..97dcbd12fff2e5 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/monitors/schema.gql.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/monitors/schema.gql.ts
@@ -120,6 +120,11 @@ export const monitorsSchema = gql`
     monitors: [LatestMonitor!]
   }
 
+  type HistogramResult {
+    histogram: [HistogramDataPoint]!
+    interval: UnsignedInteger!
+  }
+
   type MonitorPageTitle {
     id: String!
     url: String
@@ -147,7 +152,7 @@ export const monitorsSchema = gql`
       filters: String
       statusFilter: String
       monitorId: String
-    ): [HistogramDataPoint!]!
+    ): HistogramResult
 
     getMonitorChartsData(
       monitorId: String!
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts
index 2518264292cbdb..6b594d8b491182 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts
@@ -6,7 +6,7 @@
 
 import { get, sortBy } from 'lodash';
 import { QueryContext } from '../elasticsearch_monitor_states_adapter';
-import { getHistogramInterval } from '../../../helper';
+import { getHistogramIntervalFormatted } from '../../../helper';
 import { INDEX_NAMES, STATES } from '../../../../../common/constants';
 import {
   MonitorSummary,
@@ -324,7 +324,7 @@ const getHistogramForMonitors = async (
             histogram: {
               date_histogram: {
                 field: '@timestamp',
-                fixed_interval: getHistogramInterval(
+                fixed_interval: getHistogramIntervalFormatted(
                   queryContext.dateRangeStart,
                   queryContext.dateRangeEnd
                 ),
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap
index 75b19d7381a624..99349f42d5750c 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap
@@ -221,6 +221,10 @@ Object {
           "x": 1568412432000,
           "y": 1972483.25,
         },
+        Object {
+          "x": 1568412468000,
+          "y": 1020490,
+        },
       ],
       "name": "us-east-2",
     },
@@ -302,6 +306,10 @@ Object {
           "x": 1568412432000,
           "y": 1543307.5,
         },
+        Object {
+          "x": 1568412468000,
+          "y": null,
+        },
       ],
       "name": "us-west-4",
     },
@@ -421,6 +429,12 @@ Object {
       "up": null,
       "x": 1568412432000,
     },
+    Object {
+      "down": null,
+      "total": 1,
+      "up": null,
+      "x": 1568412468000,
+    },
   ],
   "statusMaxCount": 0,
 }
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
index c14e3dab987d7a..f2d84d149344b0 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
@@ -13,12 +13,7 @@ import {
   Ping,
   LocationDurationLine,
 } from '../../../../common/graphql/types';
-import {
-  dropLatestBucket,
-  getFilterClause,
-  getHistogramInterval,
-  parseFilterQuery,
-} from '../../helper';
+import { getFilterClause, parseFilterQuery, getHistogramIntervalFormatted } from '../../helper';
 import { DatabaseAdapter } from '../database';
 import { UMMonitorsAdapter } from './adapter_types';
 
@@ -80,7 +75,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
           timeseries: {
             date_histogram: {
               field: '@timestamp',
-              fixed_interval: getHistogramInterval(dateRangeStart, dateRangeEnd),
+              fixed_interval: getHistogramIntervalFormatted(dateRangeStart, dateRangeEnd),
               min_doc_count: 0,
             },
             aggs: {
@@ -102,10 +97,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
 
     const result = await this.database.search(request, params);
 
-    const dateHistogramBuckets = dropLatestBucket(
-      get(result, 'aggregations.timeseries.buckets', [])
-    );
-
+    const dateHistogramBuckets = get<any[]>(result, 'aggregations.timeseries.buckets', []);
     /**
      * The code below is responsible for formatting the aggregation data we fetched above in a way
      * that the chart components used by the client understands.
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/__snapshots__/elasticsearch_pings_adapter.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/__snapshots__/elasticsearch_pings_adapter.test.ts.snap
index a7526739c95ac8..b73595d539e933 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/__snapshots__/elasticsearch_pings_adapter.test.ts.snap
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/__snapshots__/elasticsearch_pings_adapter.test.ts.snap
@@ -1,82 +1,127 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ElasticsearchPingsAdapter class getPingHistogram handles simple_text_query without issues 1`] = `
-Array [
-  Object {
-    "downCount": 1,
-    "key": 1,
-    "upCount": 2,
-    "x": 2,
-    "x0": 1,
-    "y": 1,
-  },
-  Object {
-    "downCount": 2,
-    "key": 2,
-    "upCount": 1,
-    "x": 3,
-    "x0": 2,
-    "y": 1,
-  },
-]
+Object {
+  "histogram": Array [
+    Object {
+      "downCount": 1,
+      "upCount": 2,
+      "x": 1,
+      "y": 1,
+    },
+    Object {
+      "downCount": 2,
+      "upCount": 1,
+      "x": 2,
+      "y": 1,
+    },
+    Object {
+      "downCount": 1,
+      "upCount": 3,
+      "x": 3,
+      "y": 1,
+    },
+  ],
+  "interval": 36000,
+}
 `;
 
 exports[`ElasticsearchPingsAdapter class getPingHistogram handles status + additional user queries 1`] = `
-Array [
-  Object {
-    "downCount": 1,
-    "key": 1,
-    "upCount": 0,
-    "x": 2,
-    "x0": 1,
-    "y": 1,
-  },
-  Object {
-    "downCount": 2,
-    "key": 2,
-    "upCount": 0,
-    "x": 3,
-    "x0": 2,
-    "y": 1,
-  },
-]
+Object {
+  "histogram": Array [
+    Object {
+      "downCount": 1,
+      "upCount": 0,
+      "x": 1,
+      "y": 1,
+    },
+    Object {
+      "downCount": 2,
+      "upCount": 0,
+      "x": 2,
+      "y": 1,
+    },
+    Object {
+      "downCount": 1,
+      "upCount": 0,
+      "x": 3,
+      "y": 1,
+    },
+  ],
+  "interval": 5609564928000,
+}
 `;
 
 exports[`ElasticsearchPingsAdapter class getPingHistogram returns a down-filtered array for when filtered by down status 1`] = `
-Array [
-  Object {
-    "downCount": 1,
-    "key": 1,
-    "upCount": 0,
-    "x": 2,
-    "x0": 1,
-    "y": 1,
-  },
-]
+Object {
+  "histogram": Array [
+    Object {
+      "downCount": 1,
+      "upCount": 0,
+      "x": 1,
+      "y": 1,
+    },
+    Object {
+      "downCount": undefined,
+      "upCount": 0,
+      "x": 2,
+      "y": 1,
+    },
+  ],
+  "interval": 5609564928000,
+}
 `;
 
 exports[`ElasticsearchPingsAdapter class getPingHistogram returns a down-filtered array for when filtered by up status 1`] = `
-Array [
-  Object {
-    "downCount": 0,
-    "key": 1,
-    "upCount": 2,
-    "x": 2,
-    "x0": 1,
-    "y": 1,
-  },
-]
+Object {
+  "histogram": Array [
+    Object {
+      "downCount": 0,
+      "upCount": 2,
+      "x": 1,
+      "y": 1,
+    },
+    Object {
+      "downCount": 0,
+      "upCount": 2,
+      "x": 2,
+      "y": 1,
+    },
+  ],
+  "interval": 5609564928000,
+}
+`;
+
+exports[`ElasticsearchPingsAdapter class getPingHistogram returns a single bucket if array has 1 1`] = `
+Object {
+  "histogram": Array [
+    Object {
+      "downCount": 1,
+      "upCount": 2,
+      "x": 1,
+      "y": 1,
+    },
+  ],
+  "interval": 36000,
+}
 `;
 
 exports[`ElasticsearchPingsAdapter class getPingHistogram returns expected result for no status filter 1`] = `
-Array [
-  Object {
-    "downCount": 1,
-    "key": 1,
-    "upCount": 2,
-    "x": 2,
-    "x0": 1,
-    "y": 1,
-  },
-]
+Object {
+  "histogram": Array [
+    Object {
+      "downCount": 1,
+      "upCount": 2,
+      "x": 1,
+      "y": 1,
+    },
+    Object {
+      "downCount": undefined,
+      "upCount": 2,
+      "x": 2,
+      "y": 1,
+    },
+  ],
+  "interval": 36000,
+}
 `;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts
index ec414cda7d8112..7b3c72f535401a 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts
@@ -7,6 +7,7 @@
 import { set } from 'lodash';
 import { DatabaseAdapter } from '../../database';
 import { ElasticsearchPingsAdapter } from '../elasticsearch_pings_adapter';
+import { assertCloseTo } from '../../../helper';
 
 describe('ElasticsearchPingsAdapter class', () => {
   let database: DatabaseAdapter;
@@ -88,7 +89,7 @@ describe('ElasticsearchPingsAdapter class', () => {
   });
 
   describe('getPingHistogram', () => {
-    it('returns an empty array for <= 1 bucket', async () => {
+    it('returns a single bucket if array has 1', async () => {
       expect.assertions(2);
       const search = jest.fn();
       search.mockReturnValue({
@@ -115,8 +116,10 @@ describe('ElasticsearchPingsAdapter class', () => {
       };
       const pingAdapter = new ElasticsearchPingsAdapter(pingDatabase);
       const result = await pingAdapter.getPingHistogram(serverRequest, 'now-15m', 'now', null);
+      assertCloseTo(result.interval, 36000, 100);
+      result.interval = 36000;
       expect(pingDatabase.search).toHaveBeenCalledTimes(1);
-      expect(result).toEqual([]);
+      expect(result).toMatchSnapshot();
     });
 
     it('returns expected result for no status filter', async () => {
@@ -132,6 +135,8 @@ describe('ElasticsearchPingsAdapter class', () => {
       };
       const pingAdapter = new ElasticsearchPingsAdapter(pingDatabase);
       const result = await pingAdapter.getPingHistogram(serverRequest, 'now-15m', 'now', null);
+      assertCloseTo(result.interval, 36000, 100);
+      result.interval = 36000;
 
       expect(pingDatabase.search).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
@@ -197,6 +202,8 @@ describe('ElasticsearchPingsAdapter class', () => {
         undefined,
         'down'
       );
+      assertCloseTo(result.interval, 5609564928000, 1000);
+      result.interval = 5609564928000;
 
       expect(pingDatabase.search).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
@@ -254,6 +261,8 @@ describe('ElasticsearchPingsAdapter class', () => {
         searchFilter
       );
 
+      assertCloseTo(result.interval, 36000, 100);
+      result.interval = 36000;
       expect(pingDatabase.search).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
     });
@@ -276,6 +285,8 @@ describe('ElasticsearchPingsAdapter class', () => {
         undefined,
         'down'
       );
+      assertCloseTo(result.interval, 5609564928000, 1000);
+      result.interval = 5609564928000;
 
       expect(pingDatabase.search).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/adapter_types.ts
index bb26e04f2fc9e6..1e0cf7ec406466 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/adapter_types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/adapter_types.ts
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { DocCount, HistogramDataPoint, Ping, PingResults } from '../../../../common/graphql/types';
+import { DocCount, Ping, PingResults } from '../../../../common/graphql/types';
+import { HistogramResult } from '../../../../common/domain_types';
 
 export interface UMPingsAdapter {
   getAll(
@@ -33,7 +34,7 @@ export interface UMPingsAdapter {
     filters?: string | null,
     monitorId?: string | null,
     statusFilter?: string | null
-  ): Promise<HistogramDataPoint[]>;
+  ): Promise<HistogramResult>;
 
   getDocCount(request: any): Promise<DocCount>;
 }
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts
index 822441449a774a..cad8b412f3e589 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts
@@ -6,17 +6,12 @@
 
 import { get } from 'lodash';
 import { INDEX_NAMES } from '../../../../common/constants';
-import {
-  DocCount,
-  HistogramDataPoint,
-  HttpBody,
-  Ping,
-  PingResults,
-} from '../../../../common/graphql/types';
-import { formatEsBucketsForHistogram, parseFilterQuery, getFilterClause } from '../../helper';
+import { DocCount, HttpBody, Ping, PingResults } from '../../../../common/graphql/types';
+import { parseFilterQuery, getFilterClause, getHistogramIntervalFormatted } from '../../helper';
 import { DatabaseAdapter, HistogramQueryResult } from '../database';
 import { UMPingsAdapter } from './adapter_types';
 import { getHistogramInterval } from '../../helper/get_histogram_interval';
+import { HistogramResult } from '../../../../common/domain_types';
 
 export class ElasticsearchPingsAdapter implements UMPingsAdapter {
   private database: DatabaseAdapter;
@@ -195,7 +190,7 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
     filters?: string | null,
     monitorId?: string | null,
     statusFilter?: string | null
-  ): Promise<HistogramDataPoint[]> {
+  ): Promise<HistogramResult> {
     const boolFilters = parseFilterQuery(filters);
     const additionaFilters = [];
     if (monitorId) {
@@ -205,6 +200,8 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
       additionaFilters.push(boolFilters);
     }
     const filter = getFilterClause(dateRangeStart, dateRangeEnd, additionaFilters);
+    const interval = getHistogramInterval(dateRangeStart, dateRangeEnd);
+    const intervalFormatted = getHistogramIntervalFormatted(dateRangeStart, dateRangeEnd);
 
     const params = {
       index: INDEX_NAMES.HEARTBEAT,
@@ -219,7 +216,7 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
           timeseries: {
             date_histogram: {
               field: '@timestamp',
-              fixed_interval: getHistogramInterval(dateRangeStart, dateRangeEnd),
+              fixed_interval: intervalFormatted,
             },
             aggs: {
               down: {
@@ -244,19 +241,21 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
 
     const result = await this.database.search(request, params);
     const buckets: HistogramQueryResult[] = get(result, 'aggregations.timeseries.buckets', []);
-    const mappedBuckets = buckets.map(bucket => {
-      const key: number = get(bucket, 'key');
+    const histogram = buckets.map(bucket => {
+      const x: number = get(bucket, 'key');
       const downCount: number = get(bucket, 'down.doc_count');
       const upCount: number = get(bucket, 'up.doc_count');
       return {
-        key,
+        x,
         downCount: statusFilter && statusFilter !== 'down' ? 0 : downCount,
         upCount: statusFilter && statusFilter !== 'up' ? 0 : upCount,
         y: 1,
       };
     });
-
-    return formatEsBucketsForHistogram(mappedBuckets);
+    return {
+      histogram,
+      interval,
+    };
   }
 
   /**
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/__snapshots__/drop_latest_buckets.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/__snapshots__/drop_latest_buckets.test.ts.snap
deleted file mode 100644
index db05bb02be8a9d..00000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/__snapshots__/drop_latest_buckets.test.ts.snap
+++ /dev/null
@@ -1,9 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`dropLatestBucket drops the last of a list with greater length than 1 1`] = `
-Array [
-  Object {
-    "prop": "val",
-  },
-]
-`;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/__snapshots__/format_es_buckets_for_histogram.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/__snapshots__/format_es_buckets_for_histogram.test.ts.snap
deleted file mode 100644
index 1b30ee15492734..00000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/__snapshots__/format_es_buckets_for_histogram.test.ts.snap
+++ /dev/null
@@ -1,42 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`formatEsBucketsForHistogram returns properly formatted buckets 1`] = `
-Array [
-  Object {
-    "key": 1000,
-    "x": 2000,
-    "x0": 1000,
-  },
-  Object {
-    "key": 2000,
-    "x": 3000,
-    "x0": 2000,
-  },
-  Object {
-    "key": 3000,
-    "x": 4000,
-    "x0": 3000,
-  },
-]
-`;
-
-exports[`formatEsBucketsForHistogram returns properly formatted object for generic call 1`] = `
-Array [
-  Object {
-    "key": 1000,
-    "name": "something",
-    "value": 150,
-    "x": 2000,
-    "x0": 1000,
-  },
-  Object {
-    "key": 2000,
-    "name": "something",
-    "value": 120,
-    "x": 3000,
-    "x0": 2000,
-  },
-]
-`;
-
-exports[`formatEsBucketsForHistogram returns the provided buckets if length is below min threshold 1`] = `Array []`;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/drop_latest_buckets.test.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/drop_latest_buckets.test.ts
deleted file mode 100644
index 57ae48f0c7b63b..00000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/drop_latest_buckets.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { dropLatestBucket } from '../drop_latest_bucket';
-
-describe('dropLatestBucket', () => {
-  it('drops the last of a list with greater length than 1', () => {
-    const testData = [{ prop: 'val' }, { prop: 'val' }];
-    const result = dropLatestBucket(testData);
-    expect(result).toMatchSnapshot();
-  });
-  it('returns an empty list when length === 1', () => {
-    const testData = [{ prop: 'val' }];
-    const result = dropLatestBucket(testData);
-    expect(result).toEqual([]);
-  });
-  it('returns an empty list when length === 0', () => {
-    const testData: any[] = [];
-    const result = dropLatestBucket(testData);
-    expect(result).toEqual([]);
-  });
-});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/format_es_buckets_for_histogram.test.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/format_es_buckets_for_histogram.test.ts
deleted file mode 100644
index 87c6aad5da0320..00000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/format_es_buckets_for_histogram.test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { formatEsBucketsForHistogram } from '../format_es_buckets_for_histogram';
-
-describe('formatEsBucketsForHistogram', () => {
-  it('returns the provided buckets if length is below min threshold', () => {
-    const buckets = [{ key: 1000 }];
-    const result = formatEsBucketsForHistogram(buckets);
-    expect(result).toMatchSnapshot();
-  });
-  it('returns properly formatted buckets', () => {
-    const buckets = [{ key: 1000 }, { key: 2000 }, { key: 3000 }, { key: 4000 }];
-    const result = formatEsBucketsForHistogram(buckets);
-    expect(result).toMatchSnapshot();
-  });
-  it('returns properly formatted object for generic call', () => {
-    const buckets = [
-      { key: 1000, name: 'something', value: 150 },
-      { key: 2000, name: 'something', value: 120 },
-      { key: 3000, name: 'something', value: 180 },
-    ];
-    const result = formatEsBucketsForHistogram(buckets);
-    expect(result).toMatchSnapshot();
-  });
-});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/get_histogram_interval.test.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/get_histogram_interval.test.ts
index 83f861d3fb4672..bddca1b863ce4a 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/get_histogram_interval.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/get_histogram_interval.test.ts
@@ -5,29 +5,16 @@
  */
 
 import { getHistogramInterval } from '../get_histogram_interval';
+import { assertCloseTo } from '../assert_close_to';
 
 describe('getHistogramInterval', () => {
   it('specifies the interval necessary to divide a given timespan into equal buckets, rounded to the nearest integer, expressed in ms', () => {
-    const result = getHistogramInterval('now-15m', 'now', 10);
-    /**
-     * These assertions were verbatim comparisons but that introduced
-     * some flakiness at the ms resolution, sometimes values like "9001ms"
-     * are returned.
-     */
-    expect(result.startsWith('9000')).toBeTruthy();
-    expect(result.endsWith('ms')).toBeTruthy();
-    expect(result).toHaveLength(7);
+    const interval = getHistogramInterval('now-15m', 'now', 10);
+    assertCloseTo(interval, 90000, 10);
   });
 
   it('will supply a default constant value for bucketCount when none is provided', () => {
-    const result = getHistogramInterval('now-15m', 'now');
-    /**
-     * These assertions were verbatim comparisons but that introduced
-     * some flakiness at the ms resolution, sometimes values like "9001ms"
-     * are returned.
-     */
-    expect(result.startsWith('3600')).toBeTruthy();
-    expect(result.endsWith('ms')).toBeTruthy();
-    expect(result).toHaveLength(7);
+    const interval = getHistogramInterval('now-15m', 'now');
+    assertCloseTo(interval, 36000, 10);
   });
 });
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/get_histogram_interval_formatted.test.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/get_histogram_interval_formatted.test.ts
new file mode 100644
index 00000000000000..e67a93f24b3ca4
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/__test__/get_histogram_interval_formatted.test.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 { getHistogramIntervalFormatted } from '../get_histogram_interval_formatted';
+
+describe('getHistogramIntervalFormatted', () => {
+  it('specifies the interval necessary to divide a given timespan into equal buckets, rounded to the nearest integer, expressed in ms', () => {
+    const intervalFormatted = getHistogramIntervalFormatted('now-15m', 'now', 10);
+    /**
+     * Expected result is 90000.
+     * These assertions were verbatim comparisons but that introduced
+     * some flakiness at the ms resolution, sometimes values like "9001ms"
+     * are returned.
+     */
+    expect(intervalFormatted.startsWith('9000')).toBeTruthy();
+    expect(intervalFormatted.endsWith('ms')).toBeTruthy();
+    expect(intervalFormatted).toHaveLength(7);
+  });
+
+  it('will supply a default constant value for bucketCount when none is provided', () => {
+    const intervalFormatted = getHistogramIntervalFormatted('now-15m', 'now');
+    /**
+     * Expected result is 36000.
+     * These assertions were verbatim comparisons but that introduced
+     * some flakiness at the ms resolution, sometimes values like "9001ms"
+     * are returned.
+     */
+    expect(intervalFormatted.startsWith('3600')).toBeTruthy();
+    expect(intervalFormatted.endsWith('ms')).toBeTruthy();
+    expect(intervalFormatted).toHaveLength(7);
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/drop_latest_bucket.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/drop_latest_bucket.ts
deleted file mode 100644
index 4d072266fa4eaa..00000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/drop_latest_bucket.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/**
- * We've had numerous requests to not display semi-full buckets (i.e. it is 13:01 and the
- * bounds of our bucket are 13:00-13:05). If the first bucket isn't done filling, we'll
- * start out with nothing returned, otherwise we drop the most recent bucket.
- * @param buckets The bucket list
- */
-export const dropLatestBucket = (buckets: any[]) =>
-  buckets.length > 1 ? buckets.slice(0, buckets.length - 1) : [];
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/format_es_buckets_for_histogram.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/format_es_buckets_for_histogram.ts
deleted file mode 100644
index 1b0a2bfdfc5c0a..00000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/format_es_buckets_for_histogram.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { UMESBucket, UMESHistogramBucket } from '../adapters/database';
-import { dropLatestBucket } from './drop_latest_bucket';
-
-/**
- * The charting library we're currently using requires histogram data points have an
- * x and an x0 property, where x0 is the beginning of a data point and x provides
- * the size of the point from the start. This function attempts to generalize the
- * concept so any bucket that has a numeric value as its key can be put into this format.
- *
- * Additionally, histograms that stack horizontally instead of vertically need to have
- * a y and a y0 value. We're not doing this currently but with some minor modification
- * this function could provide formatting for those buckets as well.
- * @param buckets The ES data to format.
- */
-export function formatEsBucketsForHistogram<T extends UMESBucket>(
-  buckets: T[]
-): Array<T & UMESHistogramBucket> {
-  // wait for first bucket to fill up
-  if (buckets.length < 2) {
-    return [];
-  }
-  const TERMINAL_INDEX = buckets.length - 1;
-  const { key: terminalBucketTime } = buckets[TERMINAL_INDEX];
-  // drop the most recent bucket to avoid returning incomplete bucket
-  return dropLatestBucket(buckets).map((item, index, array) => {
-    const { key } = item;
-    const nextItem = array[index + 1];
-    const bucketSize = nextItem ? Math.abs(nextItem.key - key) : Math.abs(terminalBucketTime - key);
-
-    return {
-      x: key + bucketSize,
-      x0: key,
-      ...item,
-    };
-  });
-}
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval.ts
index 107a635366a0b6..0dedc3e456f513 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval.ts
@@ -11,7 +11,7 @@ export const getHistogramInterval = (
   dateRangeStart: string,
   dateRangeEnd: string,
   bucketCount?: number
-): string => {
+): number => {
   const from = DateMath.parse(dateRangeStart);
   const to = DateMath.parse(dateRangeEnd);
   if (from === undefined) {
@@ -20,7 +20,5 @@ export const getHistogramInterval = (
   if (to === undefined) {
     throw Error('Invalid dateRangeEnd value');
   }
-  return `${Math.round(
-    (to.valueOf() - from.valueOf()) / (bucketCount || QUERY.DEFAULT_BUCKET_COUNT)
-  )}ms`;
+  return Math.round((to.valueOf() - from.valueOf()) / (bucketCount || QUERY.DEFAULT_BUCKET_COUNT));
 };
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval_formatted.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval_formatted.ts
new file mode 100644
index 00000000000000..29af862611ca4b
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/get_histogram_interval_formatted.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getHistogramInterval } from './get_histogram_interval';
+
+export const getHistogramIntervalFormatted = (
+  dateRangeStart: string,
+  dateRangeEnd: string,
+  bucketCount?: number
+): string => `${getHistogramInterval(dateRangeStart, dateRangeEnd, bucketCount)}ms`;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/index.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/index.ts
index a2a72825c6b98d..4c88da7eca85aa 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/index.ts
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { dropLatestBucket } from './drop_latest_bucket';
-export { formatEsBucketsForHistogram } from './format_es_buckets_for_histogram';
 export { getFilterClause } from './get_filter_clause';
 export { getHistogramInterval } from './get_histogram_interval';
+export { getHistogramIntervalFormatted } from './get_histogram_interval_formatted';
 export { parseFilterQuery } from './parse_filter_query';
 export { assertCloseTo } from './assert_close_to';
diff --git a/x-pack/legacy/plugins/watcher/common/types/action_types.ts b/x-pack/legacy/plugins/watcher/common/types/action_types.ts
index 8247df3293d175..123bf0f58db9d5 100644
--- a/x-pack/legacy/plugins/watcher/common/types/action_types.ts
+++ b/x-pack/legacy/plugins/watcher/common/types/action_types.ts
@@ -34,7 +34,7 @@ export interface EmailAction extends BaseAction {
 
 export interface LoggingAction extends BaseAction {
   type: LoggingActionType;
-  iconClass: 'loggingApp';
+  iconClass: 'logsApp';
   text: string;
 }
 
diff --git a/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js b/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js
index e11ebedc874c07..477ee9e2230b4c 100644
--- a/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js
+++ b/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js
@@ -68,7 +68,7 @@ export class LoggingAction extends BaseAction {
   static typeName = i18n.translate('xpack.watcher.models.loggingAction.typeName', {
     defaultMessage: 'Logging',
   });
-  static iconClass = 'loggingApp';
+  static iconClass = 'logsApp';
   static selectMessage = i18n.translate('xpack.watcher.models.loggingAction.selectMessageText', {
     defaultMessage: 'Add an item to the logs.',
   });
diff --git a/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx b/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
index 5d16ac3aa18f09..e57a875aa4356d 100644
--- a/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
+++ b/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
@@ -158,12 +158,12 @@ export const JsonWatchEditSimulate = ({
         <EuiDescribedFormGroup
           fullWidth
           title={
-            <h3>
+            <h2>
               {i18n.translate(
                 'xpack.watcher.sections.watchEdit.simulate.form.triggerOverridesTitle',
                 { defaultMessage: 'Trigger' }
               )}
-            </h3>
+            </h2>
           }
           description={i18n.translate(
             'xpack.watcher.sections.watchEdit.simulate.form.triggerOverridesDescription',
@@ -247,12 +247,12 @@ export const JsonWatchEditSimulate = ({
         <EuiDescribedFormGroup
           fullWidth
           title={
-            <h3>
+            <h2>
               {i18n.translate(
                 'xpack.watcher.sections.watchEdit.simulate.form.conditionOverridesTitle',
                 { defaultMessage: 'Condition' }
               )}
-            </h3>
+            </h2>
           }
           description={i18n.translate(
             'xpack.watcher.sections.watchEdit.simulate.form.conditionOverridesDescription',
@@ -283,12 +283,12 @@ export const JsonWatchEditSimulate = ({
           fullWidth
           idAria="simulateExecutionActionModesDescription"
           title={
-            <h3>
+            <h2>
               {i18n.translate(
                 'xpack.watcher.sections.watchEdit.simulate.form.actionOverridesTitle',
                 { defaultMessage: 'Actions' }
               )}
-            </h3>
+            </h2>
           }
           description={
             <FormattedMessage
@@ -331,12 +331,12 @@ export const JsonWatchEditSimulate = ({
           fullWidth
           idAria="simulateExecutionInputOverridesDescription"
           title={
-            <h3>
+            <h2>
               {i18n.translate(
                 'xpack.watcher.sections.watchEdit.simulate.form.inputOverridesTitle',
                 { defaultMessage: 'Input' }
               )}
-            </h3>
+            </h2>
           }
           description={i18n.translate(
             'xpack.watcher.sections.watchEdit.simulate.form.inputOverridesDescription',
diff --git a/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_panel.tsx b/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_panel.tsx
index 504c5e10ed665b..a2e46652429ea0 100644
--- a/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_panel.tsx
+++ b/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_action_panel.tsx
@@ -29,7 +29,7 @@ export const WatchActionsPanel: React.FunctionComponent<Props> = ({ actionErrors
       <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
         <EuiFlexItem>
           <EuiTitle size="s">
-            <h3>
+            <h2>
               {i18n.translate('xpack.watcher.sections.watchEdit.actions.title', {
                 defaultMessage:
                   'Perform {watchActionsCount, plural, one{# action} other {# actions}} when condition is met',
@@ -37,7 +37,7 @@ export const WatchActionsPanel: React.FunctionComponent<Props> = ({ actionErrors
                   watchActionsCount: watch.actions.length,
                 },
               })}
-            </h3>
+            </h2>
           </EuiTitle>
         </EuiFlexItem>
         <EuiFlexItem className="watcherThresholdWatchActionDropdownContainer">
diff --git a/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx b/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx
index c479cad1bc8256..ee89d9bfc176ac 100644
--- a/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx
+++ b/x-pack/legacy/plugins/watcher/public/sections/watch_edit/components/threshold_watch_edit/threshold_watch_edit.tsx
@@ -441,12 +441,12 @@ export const ThresholdWatchEdit = ({ pageTitle }: { pageTitle: string }) => {
         {shouldShowThresholdExpression ? (
           <Fragment>
             <EuiTitle size="s">
-              <h3 data-test-subj="watchConditionTitle">
+              <h2 data-test-subj="watchConditionTitle">
                 <FormattedMessage
                   id="xpack.watcher.sections.watchEdit.watchConditionSectionTitle"
                   defaultMessage="Match the following condition"
                 />
-              </h3>
+              </h2>
             </EuiTitle>
             <EuiSpacer size="m" />
             <EuiFlexGroup gutterSize="s">
diff --git a/x-pack/package.json b/x-pack/package.json
index 7f7b3e822bd0cc..2d6a6e1155c821 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -98,7 +98,6 @@
     "@types/recompose": "^0.30.6",
     "@types/reduce-reducers": "^0.3.0",
     "@types/redux-actions": "^2.2.1",
-    "@types/rimraf": "^2.0.2",
     "@types/sinon": "^7.0.13",
     "@types/storybook__addon-actions": "^3.4.3",
     "@types/storybook__addon-info": "^4.1.2",
@@ -112,28 +111,22 @@
     "@types/xml-crypto": "^1.4.0",
     "@types/xml2js": "^0.4.5",
     "abab": "^1.0.4",
-    "ansicolors": "0.3.2",
     "axios": "^0.19.0",
     "babel-jest": "^24.9.0",
-    "babel-plugin-inline-react-svg": "^1.1.0",
-    "babel-plugin-mock-imports": "^1.0.1",
     "babel-plugin-require-context-hook": "npm:babel-plugin-require-context-hook-babel7@1.0.0",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "base64-js": "^1.3.1",
     "base64url": "^3.0.1",
     "chalk": "^2.4.2",
     "chance": "1.0.18",
-    "checksum": "0.1.1",
     "cheerio": "0.22.0",
     "commander": "3.0.0",
     "copy-webpack-plugin": "^5.0.4",
     "cypress": "^3.4.1",
-    "del": "^4.1.1",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
     "enzyme-adapter-utils": "^1.12.0",
     "enzyme-to-json": "^3.3.4",
-    "execa": "^1.0.0",
+    "execa": "^3.2.0",
     "fancy-log": "^1.3.2",
     "fetch-mock": "^7.3.9",
     "graphql-code-generator": "^0.18.2",
@@ -145,7 +138,6 @@
     "graphql-codegen-typescript-server": "^0.18.2",
     "gulp": "4.0.2",
     "gulp-mocha": "^7.0.2",
-    "gulp-multi-process": "1.3.1",
     "hapi": "^17.5.3",
     "jest": "^24.9.0",
     "jest-cli": "^24.9.0",
@@ -157,7 +149,6 @@
     "mocha-multi-reporters": "^1.1.7",
     "mochawesome": "^4.1.0",
     "mochawesome-merge": "^2.0.1",
-    "mochawesome-report-generator": "^4.0.1",
     "mustache": "^2.3.0",
     "mutation-observer": "^1.0.3",
     "node-fetch": "^2.6.0",
@@ -170,8 +161,6 @@
     "react-hooks-testing-library": "^0.3.8",
     "react-test-renderer": "^16.8.0",
     "react-testing-library": "^6.0.0",
-    "redux-test-utils": "0.2.2",
-    "rsync": "0.6.1",
     "sass-loader": "^7.3.1",
     "sass-resources-loader": "^2.0.1",
     "simple-git": "1.116.0",
@@ -184,6 +173,7 @@
     "ts-loader": "^6.0.4",
     "typescript": "3.5.3",
     "vinyl-fs": "^3.0.3",
+    "whatwg-fetch": "^3.0.0",
     "xml-crypto": "^1.4.0",
     "yargs": "4.8.1"
   },
@@ -194,14 +184,13 @@
     "@elastic/ctags-langserver": "^0.1.11",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
-    "@elastic/eui": "14.5.0",
+    "@elastic/eui": "14.8.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/javascript-typescript-langserver": "^0.3.3",
     "@elastic/lsp-extension": "^0.1.2",
     "@elastic/maki": "6.1.0",
     "@elastic/node-crypto": "^1.0.0",
     "@elastic/numeral": "2.3.3",
-    "@elastic/simple-git": "1.124.0-elastic.15",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/config-schema": "1.0.0",
     "@kbn/elastic-idx": "1.0.0",
@@ -210,9 +199,7 @@
     "@kbn/interpreter": "1.0.0",
     "@kbn/ui-framework": "1.0.0",
     "@mapbox/mapbox-gl-draw": "^1.1.1",
-    "@samverschueren/stream-to-observable": "^0.3.0",
     "@scant/router": "^0.1.0",
-    "@slack/client": "^4.8.0",
     "@slack/webhook": "^5.0.0",
     "@turf/boolean-contains": "6.0.1",
     "angular-resource": "1.7.8",
@@ -243,10 +230,10 @@
     "cytoscape-dagre": "^2.2.2",
     "d3": "3.5.17",
     "d3-scale": "1.0.7",
-    "dataloader": "^1.4.0",
     "dedent": "^0.7.0",
+    "del": "^5.1.0",
     "dragselect": "1.13.1",
-    "elasticsearch": "^16.4.0",
+    "elasticsearch": "^16.5.0",
     "extract-zip": "1.6.7",
     "file-saver": "^1.3.8",
     "file-type": "^10.9.0",
@@ -267,7 +254,6 @@
     "handlebars": "4.3.5",
     "history": "4.9.0",
     "history-extra": "^5.0.1",
-    "humps": "2.0.1",
     "i18n-iso-countries": "^4.3.1",
     "icalendar": "0.7.1",
     "idx": "^2.5.6",
@@ -284,11 +270,7 @@
     "jsts": "^1.6.2",
     "lodash": "npm:@elastic/lodash@3.10.1-kibana3",
     "lodash.keyby": "^4.6.0",
-    "lodash.lowercase": "^4.3.0",
     "lodash.mean": "^4.1.0",
-    "lodash.omitby": "^4.6.0",
-    "lodash.orderby": "4.6.0",
-    "lodash.pickby": "^4.6.0",
     "lodash.topath": "^4.5.2",
     "lodash.uniqby": "^4.7.0",
     "lz-string": "^1.4.4",
@@ -297,9 +279,9 @@
     "markdown-it": "^8.4.1",
     "memoize-one": "^5.0.0",
     "mime": "^2.4.4",
-    "moment": "^2.20.1",
-    "moment-duration-format": "^1.3.0",
-    "moment-timezone": "^0.5.14",
+    "moment": "^2.24.0",
+    "moment-duration-format": "^2.3.2",
+    "moment-timezone": "^0.5.27",
     "monaco-editor": "~0.17.0",
     "ngreact": "^0.5.1",
     "nock": "10.0.6",
@@ -310,11 +292,10 @@
     "oboe": "^2.1.4",
     "oppsy": "^2.0.0",
     "papaparse": "^4.6.3",
-    "pdfmake": "0.1.57",
+    "pdfmake": "^0.1.60",
     "pluralize": "3.1.0",
     "pngjs": "3.4.0",
     "polished": "^1.9.2",
-    "popper.js": "^1.14.3",
     "postcss-prefix-selector": "^1.7.2",
     "prop-types": "^15.6.0",
     "proper-lockfile": "^3.2.0",
@@ -324,21 +305,18 @@
     "react": "^16.8.0",
     "react-apollo": "^2.1.4",
     "react-beautiful-dnd": "^8.0.7",
-    "react-clipboard.js": "^1.1.2",
     "react-datetime": "^2.14.0",
     "react-dom": "^16.8.0",
     "react-dropzone": "^4.2.9",
     "react-fast-compare": "^2.0.4",
     "react-markdown": "^3.4.1",
-    "react-moment-proptypes": "^1.6.0",
+    "react-moment-proptypes": "^1.7.0",
     "react-monaco-editor": "~0.27.0",
     "react-portal": "^3.2.0",
     "react-redux": "^5.1.1",
-    "react-redux-request": "^1.5.6",
     "react-resize-detector": "^4.2.0",
-    "react-reverse-portal": "^1.0.2",
+    "react-reverse-portal": "^1.0.4",
     "react-router-dom": "^4.3.1",
-    "react-select": "^1.2.1",
     "react-shortcuts": "^2.0.0",
     "react-sticky": "^6.0.3",
     "react-syntax-highlighter": "^5.7.0",
@@ -355,9 +333,8 @@
     "request": "^2.88.0",
     "reselect": "3.0.1",
     "resize-observer-polyfill": "^1.5.0",
-    "rimraf": "^2.7.1",
     "rison-node": "0.3.1",
-    "rxjs": "^6.2.1",
+    "rxjs": "^6.5.3",
     "semver": "5.7.0",
     "squel": "^5.13.0",
     "stats-lite": "^2.2.0",
diff --git a/x-pack/plugins/code/kibana.json b/x-pack/plugins/code/kibana.json
index c591604ec97201..815bc147d3cfef 100644
--- a/x-pack/plugins/code/kibana.json
+++ b/x-pack/plugins/code/kibana.json
@@ -4,6 +4,5 @@
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "code"],
   "server": true,
-  "ui": false,
-  "requiredPlugins": ["features"]
+  "ui": false
 }
diff --git a/x-pack/plugins/code/server/config.ts b/x-pack/plugins/code/server/config.ts
index b06ff2c94cb184..4911537aa0c980 100644
--- a/x-pack/plugins/code/server/config.ts
+++ b/x-pack/plugins/code/server/config.ts
@@ -5,117 +5,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import moment from 'moment';
-
-// TODO: update these legacy imports to new ones.
-import {
-  LanguageServers,
-  LanguageServersDeveloping,
-} from '../../../legacy/plugins/code/server/lsp/language_servers';
-import { DEFAULT_WATERMARK_LOW_PERCENTAGE } from '../../../legacy/plugins/code/server/disk_watermark';
 
 const createCodeConfigSchema = () => {
-  const langSwitches: any = {};
-  LanguageServers.forEach(lang => {
-    langSwitches[lang.name] = schema.object({
-      enabled: schema.boolean({ defaultValue: true }),
-    });
-  });
-  LanguageServersDeveloping.forEach(lang => {
-    langSwitches[lang.name] = schema.object({
-      enabled: schema.boolean({ defaultValue: false }),
-    });
-  });
-
-  return schema.object({
-    ui: schema.object({
-      enabled: schema.boolean({ defaultValue: true }),
-    }),
-    enabled: schema.boolean({ defaultValue: true }),
-    diffPage: schema.object({
-      enabled: schema.boolean({ defaultValue: false }),
-    }),
-    integrations: schema.object({
-      enabled: schema.boolean({ defaultValue: false }),
-    }),
-    queueIndex: schema.string({ defaultValue: '.code_internal-worker-queue' }),
-    // 1 hour by default.
-    queueTimeoutMs: schema.number({
-      defaultValue: moment.duration(1, 'hour').asMilliseconds(),
-    }),
-    // The frequency which update scheduler executes. 1 minute by default.
-    updateFrequencyMs: schema.number({
-      defaultValue: moment.duration(1, 'minute').asMilliseconds(),
-    }),
-    // The frequency which index scheduler executes. 1 day by default.
-    indexFrequencyMs: schema.number({
-      defaultValue: moment.duration(1, 'day').asMilliseconds(),
-    }),
-    // The frequency which each repo tries to update. 5 minutes by default.
-    updateRepoFrequencyMs: schema.number({
-      defaultValue: moment.duration(5, 'minute').asMilliseconds(),
-    }),
-    // The frequency which each repo tries to index. 1 day by default.
-    indexRepoFrequencyMs: schema.number({
-      defaultValue: moment.duration(1, 'day').asMilliseconds(),
-    }),
-    // whether we want to show more logs
-    verbose: schema.boolean({ defaultValue: false }),
-    lsp: schema.object({
-      ...langSwitches,
-      // timeout of a request
-      requestTimeoutMs: schema.number({
-        defaultValue: moment.duration(10, 'second').asMilliseconds(),
-      }),
-      // if we want the language server run in seperately
-      detach: schema.boolean({ defaultValue: false }),
-      // enable oom_score_adj on linux
-      oomScoreAdj: schema.boolean({ defaultValue: true }),
-    }),
-    repos: schema.arrayOf(schema.string(), { defaultValue: [] }),
-    security: schema.object({
-      enableMavenImport: schema.boolean({ defaultValue: true }),
-      enableGradleImport: schema.boolean({ defaultValue: false }),
-      installGoDependency: schema.boolean({ defaultValue: false }),
-      installNodeDependency: schema.boolean({ defaultValue: true }),
-      gitHostWhitelist: schema.arrayOf(schema.string(), {
-        defaultValue: [
-          'github.com',
-          'gitlab.com',
-          'bitbucket.org',
-          'gitbox.apache.org',
-          'eclipse.org',
-        ],
-      }),
-      gitProtocolWhitelist: schema.arrayOf(schema.string(), {
-        defaultValue: ['https', 'git', 'ssh'],
-      }),
-      enableJavaSecurityManager: schema.boolean({ defaultValue: true }),
-      extraJavaRepositoryWhitelist: schema.arrayOf(schema.string(), {
-        defaultValue: [],
-      }),
-    }),
-    disk: schema.object({
-      thresholdEnabled: schema.boolean({ defaultValue: true }),
-      watermarkLow: schema.string({ defaultValue: `${DEFAULT_WATERMARK_LOW_PERCENTAGE}%` }),
-    }),
-    maxWorkspace: schema.number({ defaultValue: 5 }), // max workspace folder for each language server
-    enableGlobalReference: schema.boolean({ defaultValue: false }), // Global reference as optional feature for now
-    enableCommitIndexing: schema.boolean({ defaultValue: false }),
-    codeNodeUrl: schema.maybe(schema.string()),
-    clustering: schema.object({
-      enabled: schema.boolean({ defaultValue: false }),
-      codeNodes: schema.arrayOf(
-        schema.object({
-          id: schema.string(),
-          address: schema.string(),
-        }),
-        {
-          defaultValue: [],
-        }
-      ),
-    }),
-  });
+  return schema.any({ defaultValue: {} });
 };
 
 export const CodeConfigSchema = createCodeConfigSchema();
diff --git a/x-pack/plugins/code/server/index.ts b/x-pack/plugins/code/server/index.ts
index 554974349f2fe7..954ae629e028c8 100644
--- a/x-pack/plugins/code/server/index.ts
+++ b/x-pack/plugins/code/server/index.ts
@@ -8,8 +8,6 @@ import { PluginInitializerContext } from 'src/core/server';
 import { CodeConfigSchema } from './config';
 import { CodePlugin } from './plugin';
 
-export { PluginSetupContract } from './plugin';
-
 export const config = { schema: CodeConfigSchema };
 export const plugin = (initializerContext: PluginInitializerContext) =>
   new CodePlugin(initializerContext);
diff --git a/x-pack/plugins/code/server/plugin.test.ts b/x-pack/plugins/code/server/plugin.test.ts
new file mode 100644
index 00000000000000..23a16ef8f3b829
--- /dev/null
+++ b/x-pack/plugins/code/server/plugin.test.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { coreMock } from '../../../../src/core/server/mocks';
+
+import { CodePlugin } from './plugin';
+
+describe('Code Plugin', () => {
+  describe('setup()', () => {
+    it('does not log deprecation message if no xpack.code.* configurations are set', async () => {
+      const context = coreMock.createPluginInitializerContext();
+      const plugin = new CodePlugin(context);
+
+      await plugin.setup();
+
+      expect(context.logger.get).not.toHaveBeenCalled();
+    });
+
+    it('logs deprecation message if any xpack.code.* configurations are set', async () => {
+      const context = coreMock.createPluginInitializerContext({
+        foo: 'bar',
+      });
+      const warn = jest.fn();
+      context.logger.get = jest.fn().mockReturnValue({ warn });
+      const plugin = new CodePlugin(context);
+
+      await plugin.setup();
+
+      expect(context.logger.get).toHaveBeenCalledWith('config', 'deprecation');
+      expect(warn.mock.calls[0][0]).toMatchInlineSnapshot(
+        `"The experimental app \\"Code\\" has been removed from Kibana. Remove all xpack.code.* configurations from kibana.yml so Kibana does not fail to start up in the next major version."`
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/code/server/plugin.ts b/x-pack/plugins/code/server/plugin.ts
index 40f4bc8d4749e2..8acff96eef3aa5 100644
--- a/x-pack/plugins/code/server/plugin.ts
+++ b/x-pack/plugins/code/server/plugin.ts
@@ -4,35 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { i18n } from '@kbn/i18n';
 import { first } from 'rxjs/operators';
 import { TypeOf } from '@kbn/config-schema';
-import {
-  CoreSetup,
-  IClusterClient,
-  LoggerFactory,
-  PluginInitializerContext,
-  RecursiveReadonly,
-} from 'src/core/server';
-// import { deepFreeze } from '../../../../src/core/utils';
-import { PluginSetupContract as FeaturesSetupContract } from '../../features/server';
+import { PluginInitializerContext } from 'src/core/server';
 import { CodeConfigSchema } from './config';
-import { SAVED_OBJ_REPO } from '../../../legacy/plugins/code/common/constants';
-
-/**
- * Describes public Code plugin contract returned at the `setup` stage.
- */
-export interface PluginSetupContract {
-  /** @deprecated */
-  legacy: {
-    config: TypeOf<typeof CodeConfigSchema>;
-    logger: LoggerFactory;
-    http: any;
-    elasticsearch: {
-      adminClient$: IClusterClient;
-    };
-  };
-}
 
 /**
  * Represents Code Plugin instance that will be managed by the Kibana plugin system.
@@ -40,63 +15,23 @@ export interface PluginSetupContract {
 export class CodePlugin {
   constructor(private readonly initializerContext: PluginInitializerContext) {}
 
-  public async setup(
-    coreSetup: CoreSetup,
-    { features }: { features: FeaturesSetupContract }
-  ): Promise<RecursiveReadonly<PluginSetupContract>> {
+  public async setup() {
     const config = await this.initializerContext.config
       .create<TypeOf<typeof CodeConfigSchema>>()
       .pipe(first())
       .toPromise();
 
-    features.registerFeature({
-      id: 'code',
-      name: i18n.translate('xpack.code.featureRegistry.codeFeatureName', {
-        defaultMessage: 'Code',
-      }),
-      icon: 'codeApp',
-      navLinkId: 'code',
-      app: ['code', 'kibana'],
-      catalogue: [], // TODO add catalogue here
-      privileges: {
-        all: {
-          excludeFromBasePrivileges: true,
-          api: ['code_user', 'code_admin'],
-          savedObject: {
-            all: [SAVED_OBJ_REPO],
-            read: ['config'],
-          },
-          ui: ['show', 'user', 'admin'],
-        },
-        read: {
-          api: ['code_user'],
-          savedObject: {
-            all: [],
-            read: ['config', SAVED_OBJ_REPO],
-          },
-          ui: ['show', 'user'],
-        },
-      },
-    });
-
-    return {
-      /** @deprecated */
-      legacy: {
-        config,
-        logger: this.initializerContext.logger,
-        http: coreSetup.http,
-        elasticsearch: {
-          adminClient$: await coreSetup.elasticsearch.adminClient$.pipe(first()).toPromise(),
-        },
-      },
-    };
+    if (config && Object.keys(config).length > 0) {
+      this.initializerContext.logger
+        .get('config', 'deprecation')
+        .warn(
+          'The experimental app "Code" has been removed from Kibana. Remove all xpack.code.* ' +
+            'configurations from kibana.yml so Kibana does not fail to start up in the next major version.'
+        );
+    }
   }
 
-  public start() {
-    this.initializerContext.logger.get().debug('Starting Code plugin');
-  }
+  public start() {}
 
-  public stop() {
-    this.initializerContext.logger.get().debug('Stopping Code plugin');
-  }
+  public stop() {}
 }
diff --git a/x-pack/plugins/encrypted_saved_objects/README.md b/x-pack/plugins/encrypted_saved_objects/README.md
new file mode 100644
index 00000000000000..a352989870079e
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/README.md
@@ -0,0 +1,109 @@
+# Encrypted Saved Objects
+
+## Overview
+
+The purpose of this plugin is to provide a way to encrypt/decrypt attributes on the custom Saved Objects that works with
+security and spaces filtering as well as performing audit logging.
+
+[RFC #2: Encrypted Saved Objects Attributes](../../../rfcs/text/0002_encrypted_attributes.md).
+
+## Usage
+
+Follow these steps to use `encryptedSavedObjects` in your plugin: 
+
+1. Declare `encryptedSavedObjects` as a dependency in `kibana.json`:
+
+```json
+{
+  ...
+  "requiredPlugins": ["encryptedSavedObjects"],
+  ...
+}
+```
+
+2. Add attributes to be encrypted in `mappings.json` file for the respective Saved Object type. These attributes should
+always have a `binary` type since they'll contain encrypted content as a `Base64` encoded string and should never be 
+searchable or analyzed:
+
+```json
+{
+ "my-saved-object-type": {
+   "properties": {
+     "name": { "type": "keyword" },
+     "mySecret": { "type": "binary" }
+   }
+ }
+}
+```
+
+3. Register Saved Object type using the provided API at the `setup` stage:
+
+```typescript
+...
+public setup(core: CoreSetup, { encryptedSavedObjects }: PluginSetupDependencies) {
+  encryptedSavedObjects.registerType({
+    type: 'my-saved-object-type',
+    attributesToEncrypt: new Set(['mySecret']),
+  });
+}
+...
+```
+
+4. For any Saved Object operation that does not require retrieval of decrypted content, use standard REST or 
+programmatic Saved Object API, e.g.:
+
+```typescript
+...
+router.get(
+  { path: '/some-path', validate: false },
+  async (context, req, res) => {
+    return res.ok({ 
+      body: await context.core.savedObjects.client.create(
+        'my-saved-object-type',
+         { name: 'some name', mySecret: 'non encrypted secret' }
+      ),
+    });
+  }
+);
+...
+```
+
+5. To retrieve Saved Object with decrypted content use the dedicated `getDecryptedAsInternalUser` API method. 
+
+**Note:** As name suggests the method will retrieve the encrypted values and decrypt them on behalf of the internal Kibana
+user to make it possible to use this method even when user request context is not available (e.g. in background tasks).
+Hence this method should only be used wherever consumers would otherwise feel comfortable using `callAsInternalUser`
+and preferably only as a part of the Kibana server routines that are outside of the lifecycle of a HTTP request that a 
+user has control over.
+
+```typescript
+const savedObjectWithDecryptedContent =  await encryptedSavedObjects.getDecryptedAsInternalUser(
+  'my-saved-object-type',
+  'saved-object-id'
+);
+```
+
+`getDecryptedAsInternalUser` also accepts the 3rd optional `options` argument that has exactly the same type as `options`
+one would pass to `SavedObjectsClient.get`. These argument allows to specify `namespace` property that, for example, is
+required if Saved Object was created within a non-default space.
+
+## Testing
+
+### Unit tests
+
+From `kibana-root-folder/x-pack`, run:
+```bash
+$ node scripts/jest.js
+```
+
+### API Integration tests
+
+In one shell, from `kibana-root-folder/x-pack`:
+```bash
+$ node scripts/functional_tests_server.js --config test/plugin_api_integration/config.js
+```
+
+In another shell, from `kibana-root-folder/x-pack`:
+```bash
+$ node ../scripts/functional_test_runner.js --config test/plugin_api_integration/config.js --grep="{TEST_NAME}"
+```
diff --git a/x-pack/plugins/encrypted_saved_objects/kibana.json b/x-pack/plugins/encrypted_saved_objects/kibana.json
new file mode 100644
index 00000000000000..8bf214a4d7c3fa
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "encryptedSavedObjects",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "configPath": ["xpack", "encryptedSavedObjects"],
+  "server": true,
+  "ui": false
+}
diff --git a/x-pack/plugins/encrypted_saved_objects/server/audit/audit_logger.test.ts b/x-pack/plugins/encrypted_saved_objects/server/audit/audit_logger.test.ts
new file mode 100644
index 00000000000000..3553a3bc347796
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/audit/audit_logger.test.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 { EncryptedSavedObjectsAuditLogger } from './audit_logger';
+
+test('properly logs audit events', () => {
+  const mockInternalAuditLogger = { log: jest.fn() };
+  const audit = new EncryptedSavedObjectsAuditLogger(() => mockInternalAuditLogger);
+
+  audit.encryptAttributesSuccess(['one', 'two'], {
+    type: 'known-type',
+    id: 'object-id',
+  });
+  audit.encryptAttributesSuccess(['one', 'two'], {
+    type: 'known-type-ns',
+    id: 'object-id-ns',
+    namespace: 'object-ns',
+  });
+
+  audit.decryptAttributesSuccess(['three', 'four'], {
+    type: 'known-type-1',
+    id: 'object-id-1',
+  });
+  audit.decryptAttributesSuccess(['three', 'four'], {
+    type: 'known-type-1-ns',
+    id: 'object-id-1-ns',
+    namespace: 'object-ns',
+  });
+
+  audit.encryptAttributeFailure('five', {
+    type: 'known-type-2',
+    id: 'object-id-2',
+  });
+  audit.encryptAttributeFailure('five', {
+    type: 'known-type-2-ns',
+    id: 'object-id-2-ns',
+    namespace: 'object-ns',
+  });
+
+  audit.decryptAttributeFailure('six', {
+    type: 'known-type-3',
+    id: 'object-id-3',
+  });
+  audit.decryptAttributeFailure('six', {
+    type: 'known-type-3-ns',
+    id: 'object-id-3-ns',
+    namespace: 'object-ns',
+  });
+
+  expect(mockInternalAuditLogger.log).toHaveBeenCalledTimes(8);
+  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
+    'encrypt_success',
+    'Successfully encrypted attributes "[one,two]" for saved object "[known-type,object-id]".',
+    { id: 'object-id', type: 'known-type', attributesNames: ['one', 'two'] }
+  );
+  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
+    'encrypt_success',
+    'Successfully encrypted attributes "[one,two]" for saved object "[object-ns,known-type-ns,object-id-ns]".',
+    {
+      id: 'object-id-ns',
+      type: 'known-type-ns',
+      namespace: 'object-ns',
+      attributesNames: ['one', 'two'],
+    }
+  );
+
+  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
+    'decrypt_success',
+    'Successfully decrypted attributes "[three,four]" for saved object "[known-type-1,object-id-1]".',
+    { id: 'object-id-1', type: 'known-type-1', attributesNames: ['three', 'four'] }
+  );
+  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
+    'decrypt_success',
+    'Successfully decrypted attributes "[three,four]" for saved object "[object-ns,known-type-1-ns,object-id-1-ns]".',
+    {
+      id: 'object-id-1-ns',
+      type: 'known-type-1-ns',
+      namespace: 'object-ns',
+      attributesNames: ['three', 'four'],
+    }
+  );
+
+  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
+    'encrypt_failure',
+    'Failed to encrypt attribute "five" for saved object "[known-type-2,object-id-2]".',
+    { id: 'object-id-2', type: 'known-type-2', attributeName: 'five' }
+  );
+  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
+    'encrypt_failure',
+    'Failed to encrypt attribute "five" for saved object "[object-ns,known-type-2-ns,object-id-2-ns]".',
+    { id: 'object-id-2-ns', type: 'known-type-2-ns', namespace: 'object-ns', attributeName: 'five' }
+  );
+
+  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
+    'decrypt_failure',
+    'Failed to decrypt attribute "six" for saved object "[known-type-3,object-id-3]".',
+    { id: 'object-id-3', type: 'known-type-3', attributeName: 'six' }
+  );
+  expect(mockInternalAuditLogger.log).toHaveBeenCalledWith(
+    'decrypt_failure',
+    'Failed to decrypt attribute "six" for saved object "[object-ns,known-type-3-ns,object-id-3-ns]".',
+    { id: 'object-id-3-ns', type: 'known-type-3-ns', namespace: 'object-ns', attributeName: 'six' }
+  );
+});
diff --git a/x-pack/plugins/encrypted_saved_objects/server/audit/audit_logger.ts b/x-pack/plugins/encrypted_saved_objects/server/audit/audit_logger.ts
new file mode 100644
index 00000000000000..9eb0a1e0872c27
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/audit/audit_logger.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectDescriptor, descriptorToArray } from '../crypto';
+import { LegacyAPI } from '../plugin';
+
+/**
+ * Represents all audit events the plugin can log.
+ */
+export class EncryptedSavedObjectsAuditLogger {
+  constructor(private readonly getAuditLogger: () => LegacyAPI['auditLogger']) {}
+
+  public encryptAttributeFailure(attributeName: string, descriptor: SavedObjectDescriptor) {
+    this.getAuditLogger().log(
+      'encrypt_failure',
+      `Failed to encrypt attribute "${attributeName}" for saved object "[${descriptorToArray(
+        descriptor
+      )}]".`,
+      { ...descriptor, attributeName }
+    );
+  }
+
+  public decryptAttributeFailure(attributeName: string, descriptor: SavedObjectDescriptor) {
+    this.getAuditLogger().log(
+      'decrypt_failure',
+      `Failed to decrypt attribute "${attributeName}" for saved object "[${descriptorToArray(
+        descriptor
+      )}]".`,
+      { ...descriptor, attributeName }
+    );
+  }
+
+  public encryptAttributesSuccess(
+    attributesNames: readonly string[],
+    descriptor: SavedObjectDescriptor
+  ) {
+    this.getAuditLogger().log(
+      'encrypt_success',
+      `Successfully encrypted attributes "[${attributesNames}]" for saved object "[${descriptorToArray(
+        descriptor
+      )}]".`,
+      { ...descriptor, attributesNames }
+    );
+  }
+
+  public decryptAttributesSuccess(
+    attributesNames: readonly string[],
+    descriptor: SavedObjectDescriptor
+  ) {
+    this.getAuditLogger().log(
+      'decrypt_success',
+      `Successfully decrypted attributes "[${attributesNames}]" for saved object "[${descriptorToArray(
+        descriptor
+      )}]".`,
+      { ...descriptor, attributesNames }
+    );
+  }
+}
diff --git a/x-pack/plugins/encrypted_saved_objects/server/audit/index.mock.ts b/x-pack/plugins/encrypted_saved_objects/server/audit/index.mock.ts
new file mode 100644
index 00000000000000..41f1c9dac7d18f
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/audit/index.mock.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EncryptedSavedObjectsAuditLogger } from './audit_logger';
+
+export const encryptedSavedObjectsAuditLoggerMock = {
+  create() {
+    return ({
+      encryptAttributesSuccess: jest.fn(),
+      encryptAttributeFailure: jest.fn(),
+      decryptAttributesSuccess: jest.fn(),
+      decryptAttributeFailure: jest.fn(),
+    } as unknown) as jest.Mocked<EncryptedSavedObjectsAuditLogger>;
+  },
+};
diff --git a/x-pack/plugins/encrypted_saved_objects/server/audit/index.ts b/x-pack/plugins/encrypted_saved_objects/server/audit/index.ts
new file mode 100644
index 00000000000000..97f684ec841fe1
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/audit/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { EncryptedSavedObjectsAuditLogger } from './audit_logger';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/config.test.ts b/x-pack/plugins/encrypted_saved_objects/server/config.test.ts
new file mode 100644
index 00000000000000..7d6632aa56cb18
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/config.test.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+jest.mock('crypto', () => ({ randomBytes: jest.fn() }));
+
+import { first } from 'rxjs/operators';
+import { loggingServiceMock, coreMock } from 'src/core/server/mocks';
+import { createConfig$, ConfigSchema } from './config';
+
+describe('config schema', () => {
+  it('generates proper defaults', () => {
+    expect(ConfigSchema.validate({})).toMatchInlineSnapshot(`
+      Object {
+        "enabled": true,
+        "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+      }
+    `);
+
+    expect(ConfigSchema.validate({}, { dist: false })).toMatchInlineSnapshot(`
+      Object {
+        "enabled": true,
+        "encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+      }
+    `);
+
+    expect(ConfigSchema.validate({}, { dist: true })).toMatchInlineSnapshot(`
+      Object {
+        "enabled": true,
+      }
+    `);
+  });
+
+  it('should throw error if xpack.encryptedSavedObjects.encryptionKey is less than 32 characters', () => {
+    expect(() =>
+      ConfigSchema.validate({ encryptionKey: 'foo' })
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"[encryptionKey]: value is [foo] but it must have a minimum length of [32]."`
+    );
+
+    expect(() =>
+      ConfigSchema.validate({ encryptionKey: 'foo' }, { dist: true })
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"[encryptionKey]: value is [foo] but it must have a minimum length of [32]."`
+    );
+  });
+});
+
+describe('createConfig$()', () => {
+  it('should log a warning and set xpack.encryptedSavedObjects.encryptionKey if not set', async () => {
+    const mockRandomBytes = jest.requireMock('crypto').randomBytes;
+    mockRandomBytes.mockReturnValue('ab'.repeat(16));
+
+    const contextMock = coreMock.createPluginInitializerContext({});
+    const config = await createConfig$(contextMock)
+      .pipe(first())
+      .toPromise();
+    expect(config).toEqual({ encryptionKey: 'ab'.repeat(16) });
+
+    expect(loggingServiceMock.collect(contextMock.logger).warn).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          "Generating a random key for xpack.encryptedSavedObjects.encryptionKey. To be able to decrypt encrypted saved objects attributes after restart, please set xpack.encryptedSavedObjects.encryptionKey in kibana.yml",
+        ],
+      ]
+    `);
+  });
+});
diff --git a/x-pack/plugins/encrypted_saved_objects/server/config.ts b/x-pack/plugins/encrypted_saved_objects/server/config.ts
new file mode 100644
index 00000000000000..c755b7dd9f205f
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/config.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import crypto from 'crypto';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { schema, TypeOf } from '@kbn/config-schema';
+import { PluginInitializerContext } from 'src/core/server';
+
+export type ConfigType = ReturnType<typeof createConfig$> extends Observable<infer P>
+  ? P
+  : ReturnType<typeof createConfig$>;
+
+export const ConfigSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: true }),
+  encryptionKey: schema.conditional(
+    schema.contextRef('dist'),
+    true,
+    schema.maybe(schema.string({ minLength: 32 })),
+    schema.string({ minLength: 32, defaultValue: 'a'.repeat(32) })
+  ),
+});
+
+export function createConfig$(context: PluginInitializerContext) {
+  return context.config.create<TypeOf<typeof ConfigSchema>>().pipe(
+    map(config => {
+      const logger = context.logger.get('config');
+
+      let encryptionKey = config.encryptionKey;
+      if (encryptionKey === undefined) {
+        logger.warn(
+          'Generating a random key for xpack.encryptedSavedObjects.encryptionKey. ' +
+            'To be able to decrypt encrypted saved objects attributes after restart, ' +
+            'please set xpack.encryptedSavedObjects.encryptionKey in kibana.yml'
+        );
+
+        encryptionKey = crypto.randomBytes(16).toString('hex');
+      }
+
+      return { ...config, encryptionKey };
+    })
+  );
+}
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_service.test.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts
similarity index 97%
rename from x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_service.test.ts
rename to x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts
index 2f38bcf96c5839..e1e1a8224aa7b5 100644
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_service.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.test.ts
@@ -6,19 +6,17 @@
 
 jest.mock('@elastic/node-crypto', () => jest.fn());
 
-import { EncryptedSavedObjectsAuditLogger } from './encrypted_saved_objects_audit_logger';
+import { EncryptedSavedObjectsAuditLogger } from '../audit';
 import { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
 import { EncryptionError } from './encryption_error';
 
+import { loggingServiceMock } from 'src/core/server/mocks';
+import { encryptedSavedObjectsAuditLoggerMock } from '../audit/index.mock';
+
 let service: EncryptedSavedObjectsService;
 let mockAuditLogger: jest.Mocked<EncryptedSavedObjectsAuditLogger>;
 beforeEach(() => {
-  mockAuditLogger = {
-    encryptAttributesSuccess: jest.fn(),
-    encryptAttributeFailure: jest.fn(),
-    decryptAttributesSuccess: jest.fn(),
-    decryptAttributeFailure: jest.fn(),
-  } as any;
+  mockAuditLogger = encryptedSavedObjectsAuditLoggerMock.create();
 
   // Call actual `@elastic/node-crypto` by default, but allow to override implementation in tests.
   jest
@@ -27,8 +25,7 @@ beforeEach(() => {
 
   service = new EncryptedSavedObjectsService(
     'encryption-key-abc',
-    ['known-type-1', 'known-type-2'],
-    { debug: jest.fn(), error: jest.fn() } as any,
+    loggingServiceMock.create().get(),
     mockAuditLogger
   );
 });
@@ -54,12 +51,6 @@ describe('#registerType', () => {
       service.registerType({ type: 'known-type-1', attributesToEncrypt: new Set(['attr']) })
     ).toThrowError('The "known-type-1" saved object type is already registered.');
   });
-
-  it('throws if `type` references to the unknown type', () => {
-    expect(() =>
-      service.registerType({ type: 'unknown-type', attributesToEncrypt: new Set(['attr']) })
-    ).toThrowError('The type "unknown-type" is not known saved object type.');
-  });
 });
 
 describe('#isRegistered', () => {
@@ -137,8 +128,7 @@ describe('#encryptAttributes', () => {
 
     service = new EncryptedSavedObjectsService(
       'encryption-key-abc',
-      ['known-type-1', 'known-type-2'],
-      { debug: jest.fn(), error: jest.fn() } as any,
+      loggingServiceMock.create().get(),
       mockAuditLogger
     );
   });
@@ -773,8 +763,7 @@ describe('#decryptAttributes', () => {
     it('fails if encrypted with another encryption key', async () => {
       service = new EncryptedSavedObjectsService(
         'encryption-key-abc*',
-        ['known-type-1'],
-        { debug: jest.fn(), error: jest.fn() } as any,
+        loggingServiceMock.create().get(),
         mockAuditLogger
       );
 
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_service.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
similarity index 93%
rename from x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_service.ts
rename to x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
index 558f9127c42730..94c16845295774 100644
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_service.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
@@ -8,8 +8,8 @@
 import nodeCrypto from '@elastic/node-crypto';
 import stringify from 'json-stable-stringify';
 import typeDetect from 'type-detect';
-import { Server } from 'kibana';
-import { EncryptedSavedObjectsAuditLogger } from './encrypted_saved_objects_audit_logger';
+import { Logger } from 'src/core/server';
+import { EncryptedSavedObjectsAuditLogger } from '../audit';
 import { EncryptionError } from './encryption_error';
 
 /**
@@ -62,14 +62,12 @@ export class EncryptedSavedObjectsService {
 
   /**
    * @param encryptionKey The key used to encrypt and decrypt saved objects attributes.
-   * @param knownTypes The list of all known saved object types.
-   * @param log Ordinary logger instance.
+   * @param logger Ordinary logger instance.
    * @param audit Audit logger instance.
    */
   constructor(
     encryptionKey: string,
-    private readonly knownTypes: readonly string[],
-    private readonly log: Server.Logger,
+    private readonly logger: Logger,
     private readonly audit: EncryptedSavedObjectsAuditLogger
   ) {
     this.crypto = nodeCrypto({ encryptionKey });
@@ -91,10 +89,6 @@ export class EncryptedSavedObjectsService {
       throw new Error(`The "${typeRegistration.type}" saved object type is already registered.`);
     }
 
-    if (!this.knownTypes.includes(typeRegistration.type)) {
-      throw new Error(`The type "${typeRegistration.type}" is not known saved object type.`);
-    }
-
     this.typeRegistrations.set(typeRegistration.type, typeRegistration);
   }
 
@@ -160,7 +154,9 @@ export class EncryptedSavedObjectsService {
             encryptionAAD
           );
         } catch (err) {
-          this.log.error(`Failed to encrypt "${attributeName}" attribute: ${err.message || err}`);
+          this.logger.error(
+            `Failed to encrypt "${attributeName}" attribute: ${err.message || err}`
+          );
           this.audit.encryptAttributeFailure(attributeName, descriptor);
 
           throw new EncryptionError(
@@ -176,7 +172,7 @@ export class EncryptedSavedObjectsService {
     // not the case we should collect and log them to make troubleshooting easier.
     const encryptedAttributesKeys = Object.keys(encryptedAttributes);
     if (encryptedAttributesKeys.length !== typeRegistration.attributesToEncrypt.size) {
-      this.log.debug(
+      this.logger.debug(
         `The following attributes of saved object "${descriptorToArray(
           descriptor
         )}" should have been encrypted: ${Array.from(
@@ -238,7 +234,7 @@ export class EncryptedSavedObjectsService {
           encryptionAAD
         );
       } catch (err) {
-        this.log.error(`Failed to decrypt "${attributeName}" attribute: ${err.message || err}`);
+        this.logger.error(`Failed to decrypt "${attributeName}" attribute: ${err.message || err}`);
         this.audit.decryptAttributeFailure(attributeName, descriptor);
 
         throw new EncryptionError(
@@ -253,7 +249,7 @@ export class EncryptedSavedObjectsService {
     // not the case we should collect and log them to make troubleshooting easier.
     const decryptedAttributesKeys = Object.keys(decryptedAttributes);
     if (decryptedAttributesKeys.length !== typeRegistration.attributesToEncrypt.size) {
-      this.log.debug(
+      this.logger.debug(
         `The following attributes of saved object "${descriptorToArray(
           descriptor
         )}" should have been decrypted: ${Array.from(
@@ -298,8 +294,8 @@ export class EncryptedSavedObjectsService {
       }
     }
 
-    if (Object.keys(attributesAAD).length) {
-      this.log.debug(
+    if (Object.keys(attributesAAD).length === 0) {
+      this.logger.debug(
         `The AAD for saved object "${descriptorToArray(
           descriptor
         )}" does not include any attributes.`
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encryption_error.test.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_error.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encryption_error.test.ts
rename to x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_error.test.ts
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encryption_error.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_error.ts
similarity index 100%
rename from x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encryption_error.ts
rename to x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_error.ts
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/index.mock.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/index.mock.ts
new file mode 100644
index 00000000000000..b1795b9439808e
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/index.mock.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EncryptedSavedObjectsService,
+  EncryptedSavedObjectTypeRegistration,
+  SavedObjectDescriptor,
+} from '.';
+
+export const encryptedSavedObjectsServiceMock = {
+  create(registrations: EncryptedSavedObjectTypeRegistration[] = []) {
+    const mock: jest.Mocked<EncryptedSavedObjectsService> = new (jest.requireMock(
+      './encrypted_saved_objects_service'
+    )).EncryptedSavedObjectsService();
+
+    function processAttributes<T extends Record<string, any>>(
+      descriptor: Pick<SavedObjectDescriptor, 'type'>,
+      attrs: T,
+      action: (attrs: T, attrName: string) => void
+    ) {
+      const registration = registrations.find(r => r.type === descriptor.type);
+      if (!registration) {
+        return attrs;
+      }
+
+      const clonedAttrs = { ...attrs };
+      for (const attrName of registration.attributesToEncrypt) {
+        if (attrName in clonedAttrs) {
+          action(clonedAttrs, attrName);
+        }
+      }
+      return clonedAttrs;
+    }
+
+    mock.isRegistered.mockImplementation(
+      type => registrations.findIndex(r => r.type === type) >= 0
+    );
+    mock.encryptAttributes.mockImplementation(async (descriptor, attrs) =>
+      processAttributes(
+        descriptor,
+        attrs,
+        (clonedAttrs, attrName) => (clonedAttrs[attrName] = `*${clonedAttrs[attrName]}*`)
+      )
+    );
+    mock.decryptAttributes.mockImplementation(async (descriptor, attrs) =>
+      processAttributes(
+        descriptor,
+        attrs,
+        (clonedAttrs, attrName) =>
+          (clonedAttrs[attrName] = (clonedAttrs[attrName] as string).slice(1, -1))
+      )
+    );
+    mock.stripEncryptedAttributes.mockImplementation((type, attrs) =>
+      processAttributes({ type }, attrs, (clonedAttrs, attrName) => delete clonedAttrs[attrName])
+    );
+
+    return mock;
+  },
+};
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/index.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/index.ts
new file mode 100644
index 00000000000000..0849f0eb320dd3
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export {
+  EncryptedSavedObjectsService,
+  EncryptedSavedObjectTypeRegistration,
+  descriptorToArray,
+  SavedObjectDescriptor,
+} from './encrypted_saved_objects_service';
+export { EncryptionError } from './encryption_error';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/index.ts b/x-pack/plugins/encrypted_saved_objects/server/index.ts
new file mode 100644
index 00000000000000..5e6edb95ec37a6
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PluginInitializerContext } from 'src/core/server';
+import { ConfigSchema } from './config';
+import { Plugin } from './plugin';
+
+export { EncryptedSavedObjectTypeRegistration, EncryptionError } from './crypto';
+export { PluginSetupContract, PluginStartContract } from './plugin';
+
+export const config = { schema: ConfigSchema };
+export const plugin = (initializerContext: PluginInitializerContext) =>
+  new Plugin(initializerContext);
diff --git a/x-pack/plugins/encrypted_saved_objects/server/mocks.ts b/x-pack/plugins/encrypted_saved_objects/server/mocks.ts
new file mode 100644
index 00000000000000..87c36381a841aa
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/mocks.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 { PluginSetupContract, PluginStartContract } from './plugin';
+
+function createEncryptedSavedObjectsSetupMock() {
+  return {
+    registerType: jest.fn(),
+    __legacyCompat: { registerLegacyAPI: jest.fn() },
+  } as jest.Mocked<PluginSetupContract>;
+}
+
+function createEncryptedSavedObjectsStartMock() {
+  return {
+    isEncryptionError: jest.fn(),
+    getDecryptedAsInternalUser: jest.fn(),
+  } as jest.Mocked<PluginStartContract>;
+}
+
+export const encryptedSavedObjectsMock = {
+  createSetup: createEncryptedSavedObjectsSetupMock,
+  createStart: createEncryptedSavedObjectsStartMock,
+};
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
new file mode 100644
index 00000000000000..534ed13ba0acbd
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.test.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Plugin } from './plugin';
+
+import { coreMock } from 'src/core/server/mocks';
+
+describe('EncryptedSavedObjects Plugin', () => {
+  describe('setup()', () => {
+    it('exposes proper contract', async () => {
+      const plugin = new Plugin(coreMock.createPluginInitializerContext());
+      await expect(plugin.setup(coreMock.createSetup())).resolves.toMatchInlineSnapshot(`
+              Object {
+                "__legacyCompat": Object {
+                  "registerLegacyAPI": [Function],
+                },
+                "registerType": [Function],
+              }
+            `);
+    });
+  });
+
+  describe('start()', () => {
+    it('exposes proper contract', async () => {
+      const plugin = new Plugin(coreMock.createPluginInitializerContext());
+      await plugin.setup(coreMock.createSetup());
+      await expect(plugin.start()).toMatchInlineSnapshot(`
+              Object {
+                "getDecryptedAsInternalUser": [Function],
+                "isEncryptionError": [Function],
+              }
+            `);
+    });
+  });
+});
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
new file mode 100644
index 00000000000000..73c2439f777ccc
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.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 {
+  Logger,
+  SavedObjectsBaseOptions,
+  PluginInitializerContext,
+  CoreSetup,
+  SavedObjectsLegacyService,
+  KibanaRequest,
+  LegacyRequest,
+} from 'src/core/server';
+import { first } from 'rxjs/operators';
+import { createConfig$ } from './config';
+import {
+  EncryptedSavedObjectsService,
+  EncryptedSavedObjectTypeRegistration,
+  EncryptionError,
+} from './crypto';
+import { EncryptedSavedObjectsAuditLogger } from './audit';
+import { SavedObjectsSetup, setupSavedObjects } from './saved_objects';
+
+export interface PluginSetupContract {
+  registerType: (typeRegistration: EncryptedSavedObjectTypeRegistration) => void;
+  __legacyCompat: { registerLegacyAPI: (legacyAPI: LegacyAPI) => void };
+}
+
+export interface PluginStartContract extends SavedObjectsSetup {
+  isEncryptionError: (error: Error) => boolean;
+}
+
+/**
+ * Describes a set of APIs that is available in the legacy platform only and required by this plugin
+ * to function properly.
+ */
+export interface LegacyAPI {
+  savedObjects: SavedObjectsLegacyService<KibanaRequest | LegacyRequest>;
+  auditLogger: {
+    log: (eventType: string, message: string, data?: Record<string, unknown>) => void;
+  };
+}
+
+/**
+ * Represents EncryptedSavedObjects Plugin instance that will be managed by the Kibana plugin system.
+ */
+export class Plugin {
+  private readonly logger: Logger;
+  private savedObjectsSetup?: ReturnType<typeof setupSavedObjects>;
+
+  private legacyAPI?: LegacyAPI;
+  private readonly getLegacyAPI = () => {
+    if (!this.legacyAPI) {
+      throw new Error('Legacy API is not registered!');
+    }
+    return this.legacyAPI;
+  };
+
+  constructor(private readonly initializerContext: PluginInitializerContext) {
+    this.logger = this.initializerContext.logger.get();
+  }
+
+  public async setup(core: CoreSetup): Promise<PluginSetupContract> {
+    const config = await createConfig$(this.initializerContext)
+      .pipe(first())
+      .toPromise();
+    const adminClusterClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
+
+    const service = Object.freeze(
+      new EncryptedSavedObjectsService(
+        config.encryptionKey,
+        this.logger,
+        new EncryptedSavedObjectsAuditLogger(() => this.getLegacyAPI().auditLogger)
+      )
+    );
+
+    return {
+      registerType: (typeRegistration: EncryptedSavedObjectTypeRegistration) =>
+        service.registerType(typeRegistration),
+      __legacyCompat: {
+        registerLegacyAPI: (legacyAPI: LegacyAPI) => {
+          this.legacyAPI = legacyAPI;
+          this.savedObjectsSetup = setupSavedObjects({
+            adminClusterClient,
+            service,
+            savedObjects: legacyAPI.savedObjects,
+          });
+        },
+      },
+    };
+  }
+
+  public start() {
+    this.logger.debug('Starting plugin');
+
+    return {
+      isEncryptionError: (error: Error) => error instanceof EncryptionError,
+      getDecryptedAsInternalUser: (type: string, id: string, options?: SavedObjectsBaseOptions) => {
+        if (!this.savedObjectsSetup) {
+          throw new Error('Legacy SavedObjects API is not registered!');
+        }
+
+        return this.savedObjectsSetup.getDecryptedAsInternalUser(type, id, options);
+      },
+    };
+  }
+
+  public stop() {
+    this.logger.debug('Stopping plugin');
+  }
+}
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_client_wrapper.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
similarity index 93%
rename from x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_client_wrapper.test.ts
rename to x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
index 703ba64b95a7c8..8574293e3e6a66 100644
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_client_wrapper.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
@@ -6,18 +6,19 @@
 
 jest.mock('uuid', () => ({ v4: jest.fn().mockReturnValue('uuid-v4-id') }));
 
-import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
-import { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
-import { createEncryptedSavedObjectsServiceMock } from './encrypted_saved_objects_service.mock';
-import { SavedObjectsClientMock } from 'src/core/server/saved_objects/service/saved_objects_client.mock';
 import { SavedObjectsClientContract } from 'src/core/server';
+import { EncryptedSavedObjectsService } from '../crypto';
+import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
+
+import { savedObjectsClientMock } from 'src/core/server/mocks';
+import { encryptedSavedObjectsServiceMock } from '../crypto/index.mock';
 
 let wrapper: EncryptedSavedObjectsClientWrapper;
 let mockBaseClient: jest.Mocked<SavedObjectsClientContract>;
-let encryptedSavedObjectsServiceMock: jest.Mocked<EncryptedSavedObjectsService>;
+let encryptedSavedObjectsServiceMockInstance: jest.Mocked<EncryptedSavedObjectsService>;
 beforeEach(() => {
-  mockBaseClient = SavedObjectsClientMock.create();
-  encryptedSavedObjectsServiceMock = createEncryptedSavedObjectsServiceMock([
+  mockBaseClient = savedObjectsClientMock.create();
+  encryptedSavedObjectsServiceMockInstance = encryptedSavedObjectsServiceMock.create([
     {
       type: 'known-type',
       attributesToEncrypt: new Set(['attrSecret']),
@@ -25,7 +26,7 @@ beforeEach(() => {
   ]);
 
   wrapper = new EncryptedSavedObjectsClientWrapper({
-    service: encryptedSavedObjectsServiceMock,
+    service: encryptedSavedObjectsServiceMockInstance,
     baseClient: mockBaseClient,
   } as any);
 });
@@ -76,8 +77,8 @@ describe('#create', () => {
       attributes: { attrOne: 'one', attrThree: 'three' },
     });
 
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledWith(
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
       { type: 'known-type', id: 'uuid-v4-id' },
       { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
     );
@@ -107,8 +108,8 @@ describe('#create', () => {
       attributes: { attrOne: 'one', attrThree: 'three' },
     });
 
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledWith(
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
       { type: 'known-type', id: 'uuid-v4-id', namespace: 'some-namespace' },
       { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
     );
@@ -236,8 +237,8 @@ describe('#bulkCreate', () => {
       ],
     });
 
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledWith(
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
       { type: 'known-type', id: 'uuid-v4-id' },
       { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
     );
@@ -272,8 +273,8 @@ describe('#bulkCreate', () => {
       ],
     });
 
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledWith(
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
       { type: 'known-type', id: 'uuid-v4-id', namespace: 'some-namespace' },
       { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
     );
@@ -390,12 +391,12 @@ describe('#bulkUpdate', () => {
       ],
     });
 
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledTimes(2);
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledWith(
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(2);
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
       { type: 'known-type', id: 'some-id' },
       { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
     );
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledWith(
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
       { type: 'known-type', id: 'some-id-2' },
       { attrOne: 'one 2', attrSecret: 'secret 2', attrThree: 'three 2' }
     );
@@ -459,8 +460,8 @@ describe('#bulkUpdate', () => {
       ],
     });
 
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledWith(
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
       { type: 'known-type', id: 'some-id', namespace: 'some-namespace' },
       { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
     );
@@ -822,8 +823,8 @@ describe('#update', () => {
       attributes: { attrOne: 'one', attrThree: 'three' },
     });
 
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledWith(
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
       { type: 'known-type', id: 'some-id' },
       { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
     );
@@ -849,8 +850,8 @@ describe('#update', () => {
       attributes: { attrOne: 'one', attrThree: 'three' },
     });
 
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledTimes(1);
-    expect(encryptedSavedObjectsServiceMock.encryptAttributes).toHaveBeenCalledWith(
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledTimes(1);
+    expect(encryptedSavedObjectsServiceMockInstance.encryptAttributes).toHaveBeenCalledWith(
       { type: 'known-type', id: 'some-id', namespace: 'some-namespace' },
       { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' }
     );
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_client_wrapper.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
similarity index 98%
rename from x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_client_wrapper.ts
rename to x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
index 7fa066aa3355cf..1e439b68f8c30d 100644
--- a/x-pack/legacy/plugins/encrypted_saved_objects/server/lib/encrypted_saved_objects_client_wrapper.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
@@ -21,7 +21,7 @@ import {
   SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
 } from 'src/core/server';
-import { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
+import { EncryptedSavedObjectsService } from '../crypto';
 
 interface EncryptedSavedObjectsClientOptions {
   baseClient: SavedObjectsClientContract;
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
new file mode 100644
index 00000000000000..e5445e187e2cc1
--- /dev/null
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  IClusterClient,
+  SavedObject,
+  SavedObjectAttributes,
+  SavedObjectsBaseOptions,
+} from 'src/core/server';
+import { LegacyAPI } from '../plugin';
+import { EncryptedSavedObjectsService } from '../crypto';
+import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
+
+interface SetupSavedObjectsParams {
+  adminClusterClient: IClusterClient;
+  service: PublicMethodsOf<EncryptedSavedObjectsService>;
+  savedObjects: LegacyAPI['savedObjects'];
+}
+
+export interface SavedObjectsSetup {
+  getDecryptedAsInternalUser: <T extends SavedObjectAttributes = any>(
+    type: string,
+    id: string,
+    options?: SavedObjectsBaseOptions
+  ) => Promise<SavedObject<T>>;
+}
+
+export function setupSavedObjects({
+  adminClusterClient,
+  service,
+  savedObjects,
+}: SetupSavedObjectsParams): SavedObjectsSetup {
+  // Register custom saved object client that will encrypt, decrypt and strip saved object
+  // attributes where appropriate for any saved object repository request. We choose max possible
+  // priority for this wrapper to allow all other wrappers to set proper `namespace` for the Saved
+  // Object (e.g. wrapper registered by the Spaces plugin) before we encrypt attributes since
+  // `namespace` is included into AAD.
+  savedObjects.addScopedSavedObjectsClientWrapperFactory(
+    Number.MAX_SAFE_INTEGER,
+    'encryptedSavedObjects',
+    ({ client: baseClient }) => new EncryptedSavedObjectsClientWrapper({ baseClient, service })
+  );
+
+  const internalRepository = savedObjects.getSavedObjectsRepository(
+    adminClusterClient.callAsInternalUser
+  );
+
+  return {
+    getDecryptedAsInternalUser: async <T extends SavedObjectAttributes = any>(
+      type: string,
+      id: string,
+      options?: SavedObjectsBaseOptions
+    ): Promise<SavedObject<T>> => {
+      const savedObject = await internalRepository.get(type, id, options);
+      return {
+        ...savedObject,
+        attributes: await service.decryptAttributes(
+          { type, id, namespace: options && options.namespace },
+          savedObject.attributes
+        ),
+      };
+    },
+  };
+}
diff --git a/x-pack/plugins/features/server/oss_features.ts b/x-pack/plugins/features/server/oss_features.ts
index ff19df62bc3db7..d70f72a7ff0854 100644
--- a/x-pack/plugins/features/server/oss_features.ts
+++ b/x-pack/plugins/features/server/oss_features.ts
@@ -84,6 +84,7 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
               'visualization',
               'timelion-sheet',
               'canvas-workpad',
+              'lens',
               'map',
             ],
           },
diff --git a/x-pack/plugins/reporting/public/components/general_error.tsx b/x-pack/plugins/reporting/public/components/general_error.tsx
index 8a84b3d1741f49..dc65800ecf1120 100644
--- a/x-pack/plugins/reporting/public/components/general_error.tsx
+++ b/x-pack/plugins/reporting/public/components/general_error.tsx
@@ -21,7 +21,7 @@ export const getGeneralErrorToast = (errorText: string, err: Error): ToastInput
       <FormattedMessage
         id="xpack.reporting.publicNotifier.error.tryRefresh"
         defaultMessage="Try refreshing the page."
-      ></FormattedMessage>
+      />
     </Fragment>
   ),
   iconType: undefined,
diff --git a/x-pack/plugins/security/kibana.json b/x-pack/plugins/security/kibana.json
index 7ac9d654eb07ee..9f243a7dfb2fc1 100644
--- a/x-pack/plugins/security/kibana.json
+++ b/x-pack/plugins/security/kibana.json
@@ -4,5 +4,5 @@
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "security"],
   "server": true,
-  "ui": false
+  "ui": true
 }
diff --git a/x-pack/plugins/security/public/index.ts b/x-pack/plugins/security/public/index.ts
new file mode 100644
index 00000000000000..12a3092039d0de
--- /dev/null
+++ b/x-pack/plugins/security/public/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PluginInitializer } from 'src/core/public';
+import { SecurityPlugin, SecurityPluginSetup, SecurityPluginStart } from './plugin';
+
+export const plugin: PluginInitializer<SecurityPluginSetup, SecurityPluginStart> = () =>
+  new SecurityPlugin();
diff --git a/x-pack/plugins/security/public/plugin.ts b/x-pack/plugins/security/public/plugin.ts
new file mode 100644
index 00000000000000..55d125bf993ec6
--- /dev/null
+++ b/x-pack/plugins/security/public/plugin.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Plugin, CoreSetup } from 'src/core/public';
+import {
+  SessionExpired,
+  SessionTimeout,
+  SessionTimeoutHttpInterceptor,
+  UnauthorizedResponseHttpInterceptor,
+} from './session';
+
+export class SecurityPlugin implements Plugin<SecurityPluginSetup, SecurityPluginStart> {
+  public setup(core: CoreSetup) {
+    const { http, notifications, injectedMetadata } = core;
+    const { basePath, anonymousPaths } = http;
+    anonymousPaths.register('/login');
+    anonymousPaths.register('/logout');
+    anonymousPaths.register('/logged_out');
+
+    const sessionExpired = new SessionExpired(basePath);
+    http.intercept(new UnauthorizedResponseHttpInterceptor(sessionExpired, anonymousPaths));
+    const sessionTimeout = new SessionTimeout(
+      injectedMetadata.getInjectedVar('sessionTimeout', null) as number | null,
+      notifications,
+      sessionExpired,
+      http
+    );
+    http.intercept(new SessionTimeoutHttpInterceptor(sessionTimeout, anonymousPaths));
+
+    return {
+      anonymousPaths,
+      sessionTimeout,
+    };
+  }
+
+  public start() {}
+}
+
+export type SecurityPluginSetup = ReturnType<SecurityPlugin['setup']>;
+export type SecurityPluginStart = ReturnType<SecurityPlugin['start']>;
diff --git a/x-pack/plugins/security/public/session/index.ts b/x-pack/plugins/security/public/session/index.ts
new file mode 100644
index 00000000000000..253207dc1b717e
--- /dev/null
+++ b/x-pack/plugins/security/public/session/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { SessionExpired } from './session_expired';
+export { SessionTimeout } from './session_timeout';
+export { SessionTimeoutHttpInterceptor } from './session_timeout_http_interceptor';
+export { UnauthorizedResponseHttpInterceptor } from './unauthorized_response_http_interceptor';
diff --git a/x-pack/plugins/security/public/session/session_expired.mock.ts b/x-pack/plugins/security/public/session/session_expired.mock.ts
new file mode 100644
index 00000000000000..e894caafd9594a
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_expired.mock.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ISessionExpired } from './session_expired';
+
+export function createSessionExpiredMock() {
+  return {
+    logout: jest.fn(),
+  } as jest.Mocked<ISessionExpired>;
+}
diff --git a/x-pack/plugins/security/public/session/session_expired.test.ts b/x-pack/plugins/security/public/session/session_expired.test.ts
new file mode 100644
index 00000000000000..9c0e4cd8036cc9
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_expired.test.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { coreMock } from 'src/core/public/mocks';
+import { SessionExpired } from './session_expired';
+
+const mockCurrentUrl = (url: string) => window.history.pushState({}, '', url);
+
+it('redirects user to "/logout" when there is no basePath', async () => {
+  const { basePath } = coreMock.createSetup().http;
+  mockCurrentUrl('/foo/bar?baz=quz#quuz');
+  const sessionExpired = new SessionExpired(basePath);
+  const newUrlPromise = new Promise<string>(resolve => {
+    jest.spyOn(window.location, 'assign').mockImplementation(url => {
+      resolve(url);
+    });
+  });
+
+  sessionExpired.logout();
+
+  const url = await newUrlPromise;
+  expect(url).toBe(
+    `/logout?next=${encodeURIComponent('/foo/bar?baz=quz#quuz')}&msg=SESSION_EXPIRED`
+  );
+});
+
+it('redirects user to "/${basePath}/logout" and removes basePath from next parameter when there is a basePath', async () => {
+  const { basePath } = coreMock.createSetup({ basePath: '/foo' }).http;
+  mockCurrentUrl('/foo/bar?baz=quz#quuz');
+  const sessionExpired = new SessionExpired(basePath);
+  const newUrlPromise = new Promise<string>(resolve => {
+    jest.spyOn(window.location, 'assign').mockImplementation(url => {
+      resolve(url);
+    });
+  });
+
+  sessionExpired.logout();
+
+  const url = await newUrlPromise;
+  expect(url).toBe(
+    `/foo/logout?next=${encodeURIComponent('/bar?baz=quz#quuz')}&msg=SESSION_EXPIRED`
+  );
+});
diff --git a/x-pack/plugins/security/public/session/session_expired.ts b/x-pack/plugins/security/public/session/session_expired.ts
new file mode 100644
index 00000000000000..3ef15088bb2889
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_expired.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 { HttpSetup } from 'src/core/public';
+
+export interface ISessionExpired {
+  logout(): void;
+}
+
+export class SessionExpired {
+  constructor(private basePath: HttpSetup['basePath']) {}
+
+  logout() {
+    const next = this.basePath.remove(
+      `${window.location.pathname}${window.location.search}${window.location.hash}`
+    );
+    window.location.assign(
+      this.basePath.prepend(`/logout?next=${encodeURIComponent(next)}&msg=SESSION_EXPIRED`)
+    );
+  }
+}
diff --git a/x-pack/plugins/security/public/session/session_timeout.mock.ts b/x-pack/plugins/security/public/session/session_timeout.mock.ts
new file mode 100644
index 00000000000000..9917a502790833
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_timeout.mock.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ISessionTimeout } from './session_timeout';
+
+export function createSessionTimeoutMock() {
+  return {
+    extend: jest.fn(),
+  } as jest.Mocked<ISessionTimeout>;
+}
diff --git a/x-pack/plugins/security/public/session/session_timeout.test.tsx b/x-pack/plugins/security/public/session/session_timeout.test.tsx
new file mode 100644
index 00000000000000..776247dda94e61
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_timeout.test.tsx
@@ -0,0 +1,171 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { coreMock } from 'src/core/public/mocks';
+import { SessionTimeout } from './session_timeout';
+import { createSessionExpiredMock } from './session_expired.mock';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+
+jest.useFakeTimers();
+
+const expectNoWarningToast = (
+  notifications: ReturnType<typeof coreMock.createSetup>['notifications']
+) => {
+  expect(notifications.toasts.add).not.toHaveBeenCalled();
+};
+
+const expectWarningToast = (
+  notifications: ReturnType<typeof coreMock.createSetup>['notifications'],
+  toastLifeTimeMS: number = 60000
+) => {
+  expect(notifications.toasts.add).toHaveBeenCalledTimes(1);
+  expect(notifications.toasts.add.mock.calls[0]).toMatchInlineSnapshot(`
+    Array [
+      Object {
+        "color": "warning",
+        "text": <SessionTimeoutWarning
+          onRefreshSession={[Function]}
+        />,
+        "title": "Warning",
+        "toastLifeTimeMs": ${toastLifeTimeMS},
+      },
+    ]
+  `);
+};
+
+const expectWarningToastHidden = (
+  notifications: ReturnType<typeof coreMock.createSetup>['notifications'],
+  toast: symbol
+) => {
+  expect(notifications.toasts.remove).toHaveBeenCalledTimes(1);
+  expect(notifications.toasts.remove).toHaveBeenCalledWith(toast);
+};
+
+describe('warning toast', () => {
+  test(`shows session expiration warning toast`, () => {
+    const { notifications, http } = coreMock.createSetup();
+    const sessionExpired = createSessionExpiredMock();
+    const sessionTimeout = new SessionTimeout(2 * 60 * 1000, notifications, sessionExpired, http);
+
+    sessionTimeout.extend();
+    // we display the warning a minute before we expire the the session, which is 5 seconds before it actually expires
+    jest.advanceTimersByTime(55 * 1000);
+    expectWarningToast(notifications);
+  });
+
+  test(`extend delays the warning toast`, () => {
+    const { notifications, http } = coreMock.createSetup();
+    const sessionExpired = createSessionExpiredMock();
+    const sessionTimeout = new SessionTimeout(2 * 60 * 1000, notifications, sessionExpired, http);
+
+    sessionTimeout.extend();
+    jest.advanceTimersByTime(54 * 1000);
+    expectNoWarningToast(notifications);
+
+    sessionTimeout.extend();
+    jest.advanceTimersByTime(54 * 1000);
+    expectNoWarningToast(notifications);
+
+    jest.advanceTimersByTime(1 * 1000);
+
+    expectWarningToast(notifications);
+  });
+
+  test(`extend hides displayed warning toast`, () => {
+    const { notifications, http } = coreMock.createSetup();
+    const toast = Symbol();
+    notifications.toasts.add.mockReturnValue(toast as any);
+    const sessionExpired = createSessionExpiredMock();
+    const sessionTimeout = new SessionTimeout(2 * 60 * 1000, notifications, sessionExpired, http);
+
+    sessionTimeout.extend();
+    // we display the warning a minute before we expire the the session, which is 5 seconds before it actually expires
+    jest.advanceTimersByTime(55 * 1000);
+    expectWarningToast(notifications);
+
+    sessionTimeout.extend();
+    expectWarningToastHidden(notifications, toast);
+  });
+
+  test('clicking "extend" causes a new HTTP request (which implicitly extends the session)', () => {
+    const { notifications, http } = coreMock.createSetup();
+    const sessionExpired = createSessionExpiredMock();
+    const sessionTimeout = new SessionTimeout(2 * 60 * 1000, notifications, sessionExpired, http);
+
+    sessionTimeout.extend();
+    // we display the warning a minute before we expire the the session, which is 5 seconds before it actually expires
+    jest.advanceTimersByTime(55 * 1000);
+    expectWarningToast(notifications);
+
+    expect(http.get).not.toHaveBeenCalled();
+    const toastInput = notifications.toasts.add.mock.calls[0][0];
+    expect(toastInput).toHaveProperty('text');
+    const reactComponent = (toastInput as any).text;
+    const wrapper = mountWithIntl(reactComponent);
+    wrapper.find('EuiButton[data-test-subj="refreshSessionButton"]').simulate('click');
+    expect(http.get).toHaveBeenCalled();
+  });
+
+  test('when the session timeout is shorter than 65 seconds, display the warning immediately and for a shorter duration', () => {
+    const { notifications, http } = coreMock.createSetup();
+    const sessionExpired = createSessionExpiredMock();
+    const sessionTimeout = new SessionTimeout(64 * 1000, notifications, sessionExpired, http);
+
+    sessionTimeout.extend();
+    jest.advanceTimersByTime(0);
+    expectWarningToast(notifications, 59 * 1000);
+  });
+});
+
+describe('session expiration', () => {
+  test(`expires the session 5 seconds before it really expires`, () => {
+    const { notifications, http } = coreMock.createSetup();
+    const sessionExpired = createSessionExpiredMock();
+    const sessionTimeout = new SessionTimeout(2 * 60 * 1000, notifications, sessionExpired, http);
+
+    sessionTimeout.extend();
+    jest.advanceTimersByTime(114 * 1000);
+    expect(sessionExpired.logout).not.toHaveBeenCalled();
+
+    jest.advanceTimersByTime(1 * 1000);
+    expect(sessionExpired.logout).toHaveBeenCalled();
+  });
+
+  test(`extend delays the expiration`, () => {
+    const { notifications, http } = coreMock.createSetup();
+    const sessionExpired = createSessionExpiredMock();
+    const sessionTimeout = new SessionTimeout(2 * 60 * 1000, notifications, sessionExpired, http);
+
+    sessionTimeout.extend();
+    jest.advanceTimersByTime(114 * 1000);
+
+    sessionTimeout.extend();
+    jest.advanceTimersByTime(114 * 1000);
+    expect(sessionExpired.logout).not.toHaveBeenCalled();
+
+    jest.advanceTimersByTime(1 * 1000);
+    expect(sessionExpired.logout).toHaveBeenCalled();
+  });
+
+  test(`if the session timeout is shorter than 5 seconds, expire session immediately`, () => {
+    const { notifications, http } = coreMock.createSetup();
+    const sessionExpired = createSessionExpiredMock();
+    const sessionTimeout = new SessionTimeout(4 * 1000, notifications, sessionExpired, http);
+
+    sessionTimeout.extend();
+    jest.advanceTimersByTime(0);
+    expect(sessionExpired.logout).toHaveBeenCalled();
+  });
+
+  test(`'null' sessionTimeout never logs you out`, () => {
+    const { notifications, http } = coreMock.createSetup();
+    const sessionExpired = createSessionExpiredMock();
+    const sessionTimeout = new SessionTimeout(null, notifications, sessionExpired, http);
+    sessionTimeout.extend();
+    jest.advanceTimersByTime(Number.MAX_VALUE);
+    expect(sessionExpired.logout).not.toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/security/public/session/session_timeout.tsx b/x-pack/plugins/security/public/session/session_timeout.tsx
new file mode 100644
index 00000000000000..db4926e7f04eac
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_timeout.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { NotificationsSetup, Toast, HttpSetup } from 'src/core/public';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { SessionTimeoutWarning } from './session_timeout_warning';
+import { ISessionExpired } from './session_expired';
+
+/**
+ * Client session timeout is decreased by this number so that Kibana server
+ * can still access session content during logout request to properly clean
+ * user session up (invalidate access tokens, redirect to logout portal etc.).
+ */
+const GRACE_PERIOD_MS = 5 * 1000;
+
+/**
+ * Duration we'll normally display the warning toast
+ */
+const WARNING_MS = 60 * 1000;
+
+export interface ISessionTimeout {
+  extend(): void;
+}
+
+export class SessionTimeout {
+  private warningTimeoutMilliseconds?: number;
+  private expirationTimeoutMilliseconds?: number;
+  private warningToast?: Toast;
+
+  constructor(
+    private sessionTimeoutMilliseconds: number | null,
+    private notifications: NotificationsSetup,
+    private sessionExpired: ISessionExpired,
+    private http: HttpSetup
+  ) {}
+
+  extend() {
+    if (this.sessionTimeoutMilliseconds == null) {
+      return;
+    }
+
+    if (this.warningTimeoutMilliseconds) {
+      window.clearTimeout(this.warningTimeoutMilliseconds);
+    }
+    if (this.expirationTimeoutMilliseconds) {
+      window.clearTimeout(this.expirationTimeoutMilliseconds);
+    }
+    if (this.warningToast) {
+      this.notifications.toasts.remove(this.warningToast);
+    }
+    this.warningTimeoutMilliseconds = window.setTimeout(
+      () => this.showWarning(),
+      Math.max(this.sessionTimeoutMilliseconds - WARNING_MS - GRACE_PERIOD_MS, 0)
+    );
+    this.expirationTimeoutMilliseconds = window.setTimeout(
+      () => this.sessionExpired.logout(),
+      Math.max(this.sessionTimeoutMilliseconds - GRACE_PERIOD_MS, 0)
+    );
+  }
+
+  private showWarning = () => {
+    this.warningToast = this.notifications.toasts.add({
+      color: 'warning',
+      text: <SessionTimeoutWarning onRefreshSession={this.refreshSession} />,
+      title: i18n.translate('xpack.security.components.sessionTimeoutWarning.title', {
+        defaultMessage: 'Warning',
+      }),
+      toastLifeTimeMs: Math.min(this.sessionTimeoutMilliseconds! - GRACE_PERIOD_MS, WARNING_MS),
+    });
+  };
+
+  private refreshSession = () => {
+    this.http.get('/api/security/v1/me');
+  };
+}
diff --git a/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts
new file mode 100644
index 00000000000000..ffbd625590b158
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts
@@ -0,0 +1,120 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// @ts-ignore
+import fetchMock from 'fetch-mock/es5/client';
+import { SessionTimeoutHttpInterceptor } from './session_timeout_http_interceptor';
+import { setup } from '../../../../../src/test_utils/public/http_test_setup';
+import { createSessionTimeoutMock } from './session_timeout.mock';
+
+const mockCurrentUrl = (url: string) => window.history.pushState({}, '', url);
+
+const setupHttp = (basePath: string) => {
+  const { http } = setup(injectedMetadata => {
+    injectedMetadata.getBasePath.mockReturnValue(basePath);
+  });
+  return http;
+};
+
+afterEach(() => {
+  fetchMock.restore();
+});
+
+describe('response', () => {
+  test('extends session timeouts', async () => {
+    const http = setupHttp('/foo');
+    const sessionTimeoutMock = createSessionTimeoutMock();
+    const interceptor = new SessionTimeoutHttpInterceptor(sessionTimeoutMock, http.anonymousPaths);
+    http.intercept(interceptor);
+    fetchMock.mock('*', 200);
+
+    await http.fetch('/foo-api');
+
+    expect(sessionTimeoutMock.extend).toHaveBeenCalled();
+  });
+
+  test(`doesn't extend session timeouts for anonymous paths`, async () => {
+    mockCurrentUrl('/foo/bar');
+    const http = setupHttp('/foo');
+    const sessionTimeoutMock = createSessionTimeoutMock();
+    const { anonymousPaths } = http;
+    anonymousPaths.register('/bar');
+    const interceptor = new SessionTimeoutHttpInterceptor(sessionTimeoutMock, anonymousPaths);
+    http.intercept(interceptor);
+    fetchMock.mock('*', 200);
+
+    await http.fetch('/foo-api');
+
+    expect(sessionTimeoutMock.extend).not.toHaveBeenCalled();
+  });
+
+  test(`doesn't extend session timeouts for system api requests`, async () => {
+    const http = setupHttp('/foo');
+    const sessionTimeoutMock = createSessionTimeoutMock();
+    const interceptor = new SessionTimeoutHttpInterceptor(sessionTimeoutMock, http.anonymousPaths);
+    http.intercept(interceptor);
+    fetchMock.mock('*', 200);
+
+    await http.fetch('/foo-api', { headers: { 'kbn-system-api': 'true' } });
+
+    expect(sessionTimeoutMock.extend).not.toHaveBeenCalled();
+  });
+});
+
+describe('responseError', () => {
+  test('extends session timeouts', async () => {
+    const http = setupHttp('/foo');
+    const sessionTimeoutMock = createSessionTimeoutMock();
+    const interceptor = new SessionTimeoutHttpInterceptor(sessionTimeoutMock, http.anonymousPaths);
+    http.intercept(interceptor);
+    fetchMock.mock('*', 401);
+
+    await expect(http.fetch('/foo-api')).rejects.toMatchInlineSnapshot(`[Error: Unauthorized]`);
+
+    expect(sessionTimeoutMock.extend).toHaveBeenCalled();
+  });
+
+  test(`doesn't extend session timeouts for anonymous paths`, async () => {
+    mockCurrentUrl('/foo/bar');
+    const http = setupHttp('/foo');
+    const sessionTimeoutMock = createSessionTimeoutMock();
+    const { anonymousPaths } = http;
+    anonymousPaths.register('/bar');
+    const interceptor = new SessionTimeoutHttpInterceptor(sessionTimeoutMock, anonymousPaths);
+    http.intercept(interceptor);
+    fetchMock.mock('*', 401);
+
+    await expect(http.fetch('/foo-api')).rejects.toMatchInlineSnapshot(`[Error: Unauthorized]`);
+
+    expect(sessionTimeoutMock.extend).not.toHaveBeenCalled();
+  });
+
+  test(`doesn't extend session timeouts for system api requests`, async () => {
+    const http = setupHttp('/foo');
+    const sessionTimeoutMock = createSessionTimeoutMock();
+    const interceptor = new SessionTimeoutHttpInterceptor(sessionTimeoutMock, http.anonymousPaths);
+    http.intercept(interceptor);
+    fetchMock.mock('*', 401);
+
+    await expect(
+      http.fetch('/foo-api', { headers: { 'kbn-system-api': 'true' } })
+    ).rejects.toMatchInlineSnapshot(`[Error: Unauthorized]`);
+
+    expect(sessionTimeoutMock.extend).not.toHaveBeenCalled();
+  });
+
+  test(`doesn't extend session timeouts when there is no response`, async () => {
+    const http = setupHttp('/foo');
+    const sessionTimeoutMock = createSessionTimeoutMock();
+    const interceptor = new SessionTimeoutHttpInterceptor(sessionTimeoutMock, http.anonymousPaths);
+    http.intercept(interceptor);
+    fetchMock.mock('*', new Promise((resolve, reject) => reject(new Error('Network is down'))));
+
+    await expect(http.fetch('/foo-api')).rejects.toMatchInlineSnapshot(`[Error: Network is down]`);
+
+    expect(sessionTimeoutMock.extend).not.toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/security/public/session/session_timeout_http_interceptor.ts b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.ts
new file mode 100644
index 00000000000000..98516cb4a613be
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { HttpInterceptor, HttpErrorResponse, HttpResponse, IAnonymousPaths } from 'src/core/public';
+
+import { ISessionTimeout } from './session_timeout';
+
+const isSystemAPIRequest = (request: Request) => {
+  return request.headers.has('kbn-system-api');
+};
+
+export class SessionTimeoutHttpInterceptor implements HttpInterceptor {
+  constructor(private sessionTimeout: ISessionTimeout, private anonymousPaths: IAnonymousPaths) {}
+
+  response(httpResponse: HttpResponse) {
+    if (this.anonymousPaths.isAnonymous(window.location.pathname)) {
+      return;
+    }
+
+    if (isSystemAPIRequest(httpResponse.request)) {
+      return;
+    }
+
+    this.sessionTimeout.extend();
+  }
+
+  responseError(httpErrorResponse: HttpErrorResponse) {
+    if (this.anonymousPaths.isAnonymous(window.location.pathname)) {
+      return;
+    }
+
+    if (isSystemAPIRequest(httpErrorResponse.request)) {
+      return;
+    }
+
+    // if we happen to not have a response, for example if there is no
+    // network connectivity, we won't extend the session because there
+    // won't be a response with a set-cookie header, which is required
+    // to extend the session
+    const { response } = httpErrorResponse;
+    if (!response) {
+      return;
+    }
+
+    this.sessionTimeout.extend();
+  }
+}
diff --git a/x-pack/plugins/security/public/session/session_timeout_warning.test.tsx b/x-pack/plugins/security/public/session/session_timeout_warning.test.tsx
new file mode 100644
index 00000000000000..a52e7ce4e94b52
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_timeout_warning.test.tsx
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { SessionTimeoutWarning } from './session_timeout_warning';
+
+describe('SessionTimeoutWarning', () => {
+  it('fires its callback when the OK button is clicked', () => {
+    const handler = jest.fn();
+    const wrapper = mountWithIntl(<SessionTimeoutWarning onRefreshSession={handler} />);
+
+    expect(handler).toBeCalledTimes(0);
+    wrapper.find('EuiButton[data-test-subj="refreshSessionButton"]').simulate('click');
+    expect(handler).toBeCalledTimes(1);
+  });
+});
diff --git a/x-pack/plugins/security/public/session/session_timeout_warning.tsx b/x-pack/plugins/security/public/session/session_timeout_warning.tsx
new file mode 100644
index 00000000000000..e1b4542031ed1f
--- /dev/null
+++ b/x-pack/plugins/security/public/session/session_timeout_warning.tsx
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiButton } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+interface Props {
+  onRefreshSession: () => void;
+}
+
+export const SessionTimeoutWarning = (props: Props) => {
+  return (
+    <>
+      <p>
+        <FormattedMessage
+          id="xpack.security.components.sessionTimeoutWarning.message"
+          defaultMessage="You will soon be logged out due to inactivity. Click OK to resume."
+        />
+      </p>
+      <div className="eui-textRight">
+        <EuiButton
+          size="s"
+          color="warning"
+          onClick={props.onRefreshSession}
+          data-test-subj="refreshSessionButton"
+        >
+          <FormattedMessage
+            id="xpack.security.components.sessionTimeoutWarning.okButtonText"
+            defaultMessage="OK"
+          />
+        </EuiButton>
+      </div>
+    </>
+  );
+};
diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
new file mode 100644
index 00000000000000..60f032652221b8
--- /dev/null
+++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// @ts-ignore
+import fetchMock from 'fetch-mock/es5/client';
+import { SessionExpired } from './session_expired';
+import { setup } from '../../../../../src/test_utils/public/http_test_setup';
+import { UnauthorizedResponseHttpInterceptor } from './unauthorized_response_http_interceptor';
+jest.mock('./session_expired');
+
+const drainPromiseQueue = () => {
+  return new Promise(resolve => {
+    setImmediate(resolve);
+  });
+};
+
+const mockCurrentUrl = (url: string) => window.history.pushState({}, '', url);
+
+const setupHttp = (basePath: string) => {
+  const { http } = setup(injectedMetadata => {
+    injectedMetadata.getBasePath.mockReturnValue(basePath);
+  });
+  return http;
+};
+
+afterEach(() => {
+  fetchMock.restore();
+});
+
+it(`logs out 401 responses`, async () => {
+  const http = setupHttp('/foo');
+  const sessionExpired = new SessionExpired(http.basePath);
+  const logoutPromise = new Promise(resolve => {
+    jest.spyOn(sessionExpired, 'logout').mockImplementation(() => resolve());
+  });
+  const interceptor = new UnauthorizedResponseHttpInterceptor(sessionExpired, http.anonymousPaths);
+  http.intercept(interceptor);
+  fetchMock.mock('*', 401);
+
+  let fetchResolved = false;
+  let fetchRejected = false;
+  http.fetch('/foo-api').then(() => (fetchResolved = true), () => (fetchRejected = true));
+
+  await logoutPromise;
+  await drainPromiseQueue();
+  expect(fetchResolved).toBe(false);
+  expect(fetchRejected).toBe(false);
+});
+
+it(`ignores anonymous paths`, async () => {
+  mockCurrentUrl('/foo/bar');
+  const http = setupHttp('/foo');
+  const { anonymousPaths } = http;
+  anonymousPaths.register('/bar');
+  const sessionExpired = new SessionExpired(http.basePath);
+  const interceptor = new UnauthorizedResponseHttpInterceptor(sessionExpired, anonymousPaths);
+  http.intercept(interceptor);
+  fetchMock.mock('*', 401);
+
+  await expect(http.fetch('/foo-api')).rejects.toMatchInlineSnapshot(`[Error: Unauthorized]`);
+  expect(sessionExpired.logout).not.toHaveBeenCalled();
+});
+
+it(`ignores errors which don't have a response, for example network connectivity issues`, async () => {
+  const http = setupHttp('/foo');
+  const sessionExpired = new SessionExpired(http.basePath);
+  const interceptor = new UnauthorizedResponseHttpInterceptor(sessionExpired, http.anonymousPaths);
+  http.intercept(interceptor);
+  fetchMock.mock('*', new Promise((resolve, reject) => reject(new Error('Network is down'))));
+
+  await expect(http.fetch('/foo-api')).rejects.toMatchInlineSnapshot(`[Error: Network is down]`);
+  expect(sessionExpired.logout).not.toHaveBeenCalled();
+});
+
+it(`ignores requests which omit credentials`, async () => {
+  const http = setupHttp('/foo');
+  const sessionExpired = new SessionExpired(http.basePath);
+  const interceptor = new UnauthorizedResponseHttpInterceptor(sessionExpired, http.anonymousPaths);
+  http.intercept(interceptor);
+  fetchMock.mock('*', 401);
+
+  await expect(http.fetch('/foo-api', { credentials: 'omit' })).rejects.toMatchInlineSnapshot(
+    `[Error: Unauthorized]`
+  );
+  expect(sessionExpired.logout).not.toHaveBeenCalled();
+});
diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts
new file mode 100644
index 00000000000000..a0ef2fdb86b47e
--- /dev/null
+++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  HttpInterceptor,
+  HttpErrorResponse,
+  IHttpInterceptController,
+  IAnonymousPaths,
+} from 'src/core/public';
+
+import { SessionExpired } from './session_expired';
+
+export class UnauthorizedResponseHttpInterceptor implements HttpInterceptor {
+  constructor(private sessionExpired: SessionExpired, private anonymousPaths: IAnonymousPaths) {}
+
+  responseError(httpErrorResponse: HttpErrorResponse, controller: IHttpInterceptController) {
+    if (this.anonymousPaths.isAnonymous(window.location.pathname)) {
+      return;
+    }
+
+    // if the request was omitting credentials it's to an anonymous endpoint
+    // (for example to login) and we don't wish to ever redirect
+    if (httpErrorResponse.request.credentials === 'omit') {
+      return;
+    }
+
+    // if we happen to not have a response, for example if there is no
+    // network connectivity, we don't do anything
+    const { response } = httpErrorResponse;
+    if (!response) {
+      return;
+    }
+
+    if (response.status === 401) {
+      this.sessionExpired.logout();
+      controller.halt();
+    }
+  }
+}
diff --git a/x-pack/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.test.ts b/x-pack/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.test.ts
index 2e19f858756163..c2bc534f742a87 100644
--- a/x-pack/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.test.ts
+++ b/x-pack/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.test.ts
@@ -7,13 +7,13 @@
 import { DEFAULT_SPACE_ID } from '../../../common/constants';
 import { SpacesSavedObjectsClient } from './spaces_saved_objects_client';
 import { spacesServiceMock } from '../../spaces_service/spaces_service.mock';
-import { SavedObjectsClientMock } from '../../../../../../src/core/server/mocks';
+import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 
 const types = ['foo', 'bar', 'space'];
 
 const createMockRequest = () => ({});
 
-const createMockClient = () => SavedObjectsClientMock.create();
+const createMockClient = () => savedObjectsClientMock.create();
 
 const createSpacesService = async (spaceId: string) => {
   return spacesServiceMock.createSetupContract(spaceId);
diff --git a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
index 92744aa9f0fc50..54d9654005f893 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
@@ -337,7 +337,7 @@ describe('copy to space', () => {
       expect(() =>
         resolveConflicts.routeValidation.body!.validate(payload)
       ).toThrowErrorMatchingInlineSnapshot(
-        `"[key(\\"invalid-space-id!@#$%^&*()\\")]: Invalid space id: invalid-space-id!@#$%^&*()"`
+        `"[retries.key(\\"invalid-space-id!@#$%^&*()\\")]: Invalid space id: invalid-space-id!@#$%^&*()"`
       );
     });
 
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index d3d66cd104120e..057ae6e2ce9946 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -854,7 +854,6 @@
     "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "選択されたクエリボタン {savedQueryName} を保存しました。変更を破棄するには押してください。",
     "data.search.searchBar.savedQueryPopoverTitleText": "保存されたクエリ",
     "embeddableApi.actions.applyFilterActionTitle": "現在のビューにフィルターを適用",
-    "embeddableApi.addPanel.createNew": "新規 {factoryName} を作成",
     "embeddableApi.addPanel.createNewDefaultOption": "新規作成...",
     "embeddableApi.addPanel.displayName": "パネルの追加",
     "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} が追加されました",
@@ -923,21 +922,20 @@
     "inputControl.vis.listControl.selectPlaceholder": "選択してください…",
     "inputControl.vis.listControl.selectTextPlaceholder": "選択してください…",
     "inputControl.vis.listControl.partialResultsWarningMessage": "リクエストに長くかかり過ぎているため、用語リストが不完全な可能性があります。完全な結果を得るには、kibana.yml の自動完了設定を調整してください。",
-    "interpreter.function.visDimension.accessor.help": "使用するデータセット内の列 (列インデックスまたは列名)",
-    "interpreter.function.visDimension.error.accessor": "入力された列名は無効です。",
-    "interpreter.function.visDimension.help": "visConfig ディメンションオブジェクトを生成します",
+    "visualizations.function.visDimension.accessor.help": "使用するデータセット内の列 (列インデックスまたは列名)",
+    "visualizations.function.visDimension.error.accessor": "入力された列名は無効です。",
+    "visualizations.function.visDimension.help": "visConfig ディメンションオブジェクトを生成します",
     "interpreter.functions.esaggs.help": "AggConfig 集約を実行します",
-    "interpreter.functions.kibana_context.help": "Kibana グローバルコンテキストを更新します",
-    "interpreter.functions.kibana.help": "Kibana グローバルコンテキストを取得します",
-    "interpreter.functions.visualization.help": "シンプルなビジュアライゼーションです",
-    "interpreter.functions.font.args.alignHelpText": "水平テキスト配置",
-    "interpreter.functions.font.args.colorHelpText": "文字の色です。",
-    "interpreter.functions.font.args.italicHelpText": "テキストを斜体にしますか？",
-    "interpreter.functions.font.args.lHeightHelpText": "ピクセル単位の行の高さです。",
-    "interpreter.functions.font.args.sizeHelpText": "ピクセル単位のフォントサイズです。",
-    "interpreter.functions.font.args.underlineHelpText": "テキストに下線を引きますか？",
-    "interpreter.functions.font.args.weightHelpText": "フォントの重量です。例: {list} または {end}。",
-    "interpreter.functions.fontHelpText": "フォントスタイルを作成します。",
+    "expressions_np.functions.kibana_context.help": "Kibana グローバルコンテキストを更新します",
+    "expressions_np.functions.kibana.help": "Kibana グローバルコンテキストを取得します",
+    "expressions_np.functions.font.args.alignHelpText": "水平テキスト配置",
+    "expressions_np.functions.font.args.colorHelpText": "文字の色です。",
+    "expressions_np.functions.font.args.italicHelpText": "テキストを斜体にしますか？",
+    "expressions_np.functions.font.args.lHeightHelpText": "ピクセル単位の行の高さです。",
+    "expressions_np.functions.font.args.sizeHelpText": "ピクセル単位のフォントサイズです。",
+    "expressions_np.functions.font.args.underlineHelpText": "テキストに下線を引きますか？",
+    "expressions_np.functions.font.args.weightHelpText": "フォントの重量です。例: {list} または {end}。",
+    "expressions_np.functions.fontHelpText": "フォントスタイルを作成します。",
     "kbn.advancedSettings.context.defaultSizeText": "コンテキストビューに表示される周りのエントリーの数",
     "kbn.advancedSettings.context.defaultSizeTitle": "コンテキストサイズ",
     "kbn.advancedSettings.context.sizeStepText": "コンテキストサイズを増減させる際の最低単位です",
@@ -3255,9 +3253,6 @@
     "xpack.apm.invalidLicense.licenseManagementLink": "ライセンスを更新",
     "xpack.apm.invalidLicense.message": "現在ご使用のライセンスが期限切れか有効でなくなったため、APM UI を利用できません。",
     "xpack.apm.invalidLicense.title": "無効なライセンス",
-    "xpack.apm.kueryBar.indexPatternMissingWarningMessage": "{apmIndexPatternTitle} というタイトルで利用可能な APM インデックスパターンがありません。クエリバーを使用するには、{setupInstructionsLink} での APM インデックスパターンのインポートを選択してください。",
-    "xpack.apm.kueryBar.searchPlaceholder": "トランザクションとエラーを検索… (例: {queryExample})",
-    "xpack.apm.kueryBar.setupInstructionsLinkLabel": "セットアップの手順",
     "xpack.apm.metadataTable.section.agentLabel": "エージェント",
     "xpack.apm.metadataTable.section.containerLabel": "コンテナー",
     "xpack.apm.metadataTable.section.customLabel": "カスタム",
@@ -3456,8 +3451,6 @@
     "xpack.apm.settings.agentConf.configTable.serviceNameColumnLabel": "サービス名",
     "xpack.apm.settings.agentConf.configurationsPanelTitle": "構成",
     "xpack.apm.settings.agentConf.createConfigButtonLabel": "構成の作成",
-    "xpack.apm.settings.agentConf.pageTitle": "設定",
-    "xpack.apm.settings.agentConf.returnToOverviewLinkLabel": "概要に戻る",
     "xpack.apm.transactionDetails.traceNotFound": "選択されたトレースが見つかりません",
     "xpack.apm.transactionDetails.traceSampleTitle": "トレースのサンプル",
     "xpack.apm.transactionsTable.notFoundLabel": "トランザクションが見つかりませんでした。",
@@ -3944,148 +3937,6 @@
     "xpack.canvas.functions.urlparam.args.defaultHelpText": "{URL} パラメーターが指定されていないときに戻される文字列です。",
     "xpack.canvas.functions.urlparam.args.paramHelpText": "取得する {URL} ハッシュパラメーターです。",
     "xpack.canvas.functions.urlparamHelpText": "表現で使用する {URL} パラメーターを取得します。{urlparamFn} 関数は常に {TYPE_STRING} を戻します。たとえば、値 {value} を {URL} {example} のパラメーター {myVar} から取得できます)。",
-    "xpack.code.featureRegistry.codeFeatureName": "コード",
-    "xpack.code.adminPage.langserverTab.installedText": "インストール済み",
-    "xpack.code.adminPage.langserverTab.languageServersDescription": "{serverCount} 個の {serverCount, plural, one {言語サーバー} other {言語サーバー}}",
-    "xpack.code.adminPage.langserverTab.notInstalledText": "未インストール",
-    "xpack.code.adminPage.langserverTab.runningText": "実行中...",
-    "xpack.code.adminPage.langserverTab.setup.closeButtonLabel": "閉じる",
-    "xpack.code.adminPage.langserverTab.setup.installationInstructionTitle": "インストール手順",
-    "xpack.code.adminPage.langserverTab.setup.installTitle": "インストール",
-    "xpack.code.adminPage.langserverTab.setup.stopKibanaDescription": "kibana コードノードを停止します。",
-    "xpack.code.adminPage.langserverTab.setup.uninstallTitle": "アンインストール",
-    "xpack.code.adminPage.langserverTab.setup.useFollowingCommandToInstallDescription": "次のコマンドで {name} 言語サーバーをインストールします。",
-    "xpack.code.adminPage.langserverTab.setup.useFollowingCommandToRemoveDescription": "次のコマンドで {name} 言語サーバーを削除します。",
-    "xpack.code.adminPage.langserverTab.setupButtonLabel": "セットアップ",
-    "xpack.code.adminPage.langserverTabLabel": "言語サーバー",
-    "xpack.code.adminPage.repoTab.cancelButtonLabel": "キャンセル",
-    "xpack.code.adminPage.repoTab.emptyRepo.importFirstRepositoryText": "最初のをインポートしましょう",
-    "xpack.code.adminPage.repoTab.emptyRepo.noRepositoryText": "まだレポジトリがありません",
-    "xpack.code.adminPage.repoTab.emptyRepo.viewSetupGuideButtonLabel": "セットアップガイドを表示",
-    "xpack.code.adminPage.repoTab.importButtonLabel": "インポート",
-    "xpack.code.adminPage.repoTab.importRepoButtonLabel": "新規レポジトリをインポート",
-    "xpack.code.adminPage.repoTab.importRepoTitle": "新規レポジトリをインポート",
-    "xpack.code.adminPage.repoTab.repoDescription": "{projectsCount} 件の{projectsCount, plural, one {レポジトリ} other {レポジトリ}}",
-    "xpack.code.adminPage.repoTab.repositoryUrlEmptyText": "URL は未入力のままにできません。",
-    "xpack.code.adminPage.repoTab.repositoryUrlFormLabel": "レポジトリ URL",
-    "xpack.code.adminPage.repoTab.repositoryUrlTitle": "レポジトリ URL",
-    "xpack.code.adminPage.repoTab.sort.aToZDropDownOptionLabel": "A ～ Z",
-    "xpack.code.adminPage.repoTab.sort.sortByFormLabel": "並べ替え基準",
-    "xpack.code.adminPage.repoTab.sort.updatedAscDropDownOptionLabel": "最終更新 昇順",
-    "xpack.code.adminPage.repoTab.sort.updatedDescDropDownOptionLabel": "最終更新 降順",
-    "xpack.code.adminPage.repoTab.sort.zToADropDownOptionLabel": "Z ～ A",
-    "xpack.code.adminPage.repoTabLabel": "レポジトリ",
-    "xpack.code.adminPage.setupGuide.addRepositoryDescription": "{sampleRepoLink} または {ownRepoLink} をインポートします。GIt クローン URL をコードにコピー・貼り付けするだけです。",
-    "xpack.code.adminPage.setupGuide.addRepositoryOwnRepoLinkText": "独自のレポジトリ",
-    "xpack.code.adminPage.setupGuide.addRepositorySampleRepoLinkText": "サンプルレポジトリ",
-    "xpack.code.adminPage.setupGuide.addRepositoryTitle": "レポジトリをコードに追加",
-    "xpack.code.adminPage.setupGuide.backToDashboardButtonLabel": "レポジトリダッシュボードに戻る",
-    "xpack.code.adminPage.setupGuide.checkMultiInstanceDescription1": "単一の Kibana インスタンスを使用している場合は、このステップをスキップできます。",
-    "xpack.code.adminPage.setupGuide.checkMultiInstanceDescription2": "複数 Kibana インスタンスを使用している場合は、1 つのインスタンスを「コードノード」として割り当てる必要があります。「コードノード」を割り当てるには、次のコードをすべての Kibana インスタンスの kibana.yml ファイルに追加して、インスタンスを再起動します:",
-    "xpack.code.adminPage.setupGuide.checkMultiInstanceDescription3": "「$YourCodeNoteAddress」は、他の Kibana からアクセスできるよう割り当てられたコードノードの URL です。",
-    "xpack.code.adminPage.setupGuide.checkMultiInstanceTitle": "複数 Kibana インスタンスがクラスター URL として使用されているか確認してください。",
-    "xpack.code.adminPage.setupGuide.getStartedTitle": "Elastic Code を使いはじめる",
-    "xpack.code.adminPage.setupGuide.installExtraLangSupportDescription1": "対応言語と言語サーバーのインストールに関する詳細は、{link} をご覧ください。",
-    "xpack.code.adminPage.setupGuide.installExtraLangSupportDescription2": "Java 言語サポートが必要な場合は、インストール された言語サーバー {link} を管理できます。",
-    "xpack.code.adminPage.setupGuide.installExtraLangSupportHereLinkText": "こちら",
-    "xpack.code.adminPage.setupGuide.installExtraLangSupportTitle": "オプションで追加の言語サーバーをインストールすることができます",
-    "xpack.code.adminPage.setupGuide.learnMoreButtonLabel": "さらに詳しく",
-    "xpack.code.adminPage.setupGuide.permissionChangesDescription": "Kibana のロールとパーミッションにいくつかの変更点があります。これらの変更点が Code の導入にどのような影響を与えるかは、以下の情報をご覧ください。",
-    "xpack.code.adminPage.setupGuide.permissionChangesTitle": "パーミッションの変更",
-    "xpack.code.adminPage.setupGuide.verifyImportDescription": "レポジトリを {searchingLink} および {navigatingLink} することで、レポジトリが正しくインポートされたか確認できます。レポジトリに言語サポートが利用可能な場合は、{semanticNavigationLink} も利用可能であることを確認してください。",
-    "xpack.code.adminPage.setupGuide.verifyImportNavigatingLinkText": "移動",
-    "xpack.code.adminPage.setupGuide.verifyImportSearchingLinkText": "検索",
-    "xpack.code.adminPage.setupGuide.verifyImportSemanticNavigatingLinkText": "セマンティックナビゲーション",
-    "xpack.code.adminPage.setupGuide.verifyImportTitle": "レポジトリが正常にインポートされていることを確認してください",
-    "xpack.code.git.diskWatermarkLowMessage": "ディスクの空き容量が {watermark} 未満です",
-    "xpack.code.git.diskWatermarkLowPercentageMessage": "ディスクの使用レベルが {watermark} を超えています",
-    "xpack.code.gitUrlUtil.protocolNotWhitelistedMessage": "Git URL プロトコルがホワイトリストに登録されていません。",
-    "xpack.code.gitUrlUtil.urlNotWhitelistedMessage": "Git URL ホストがホワイトリストに登録されていません。",
-    "xpack.code.helpMenu.codeDocumentationButtonLabel": "Code のドキュメンテーション",
-    "xpack.code.helpMenu.helpDescription": "Code に関する情報",
-    "xpack.code.helpMenu.setupGuideButtonLabel": "セットアップガイド",
-    "xpack.code.mainPage.content.buttons.blameButtonLabel": "Blame",
-    "xpack.code.mainPage.content.buttons.codeButtonLabel": "コード",
-    "xpack.code.mainPage.content.buttons.contentButtonLabel": "コンテンツ",
-    "xpack.code.mainPage.content.buttons.downloadButtonLabel": "ダウンロード",
-    "xpack.code.mainPage.content.buttons.folderButtonLabel": "ディレクトリ",
-    "xpack.code.mainPage.content.buttons.historyButtonLabel": "履歴",
-    "xpack.code.mainPage.content.buttons.rawButtonLabel": "生",
-    "xpack.code.mainPage.content.cloneStatus.isCloningText": "クローンを作成中",
-    "xpack.code.mainPage.content.cloneStatus.progress.cloneFailedText": "クローンの作成に失敗",
-    "xpack.code.mainPage.content.cloneStatus.progress.indexingText": "オブジェクトをインデックス中: {progressRate}% {indexedObjects}/{totalObjects}",
-    "xpack.code.mainPage.content.cloneStatus.progress.receivingRateOnlyText": "オブジェクトを受信中: {progressRate}%",
-    "xpack.code.mainPage.content.cloneStatus.progress.receivingText": "オブジェクトを受信中: {progressRate}% {receivedObjects}/{totalObjects}",
-    "xpack.code.mainPage.content.cloneStatus.yourProjectWillBeAvailableText": "プロジェクトはこのプロセスの完了時に利用可能になります",
-    "xpack.code.mainPage.content.directory.directoriesTitle": "指示",
-    "xpack.code.mainPage.content.directory.filesTitle": "ファイル",
-    "xpack.code.mainPage.directory.recentCommitsTitle": "最近のコミット",
-    "xpack.code.mainPage.directory.viewAllCommitsButtonLabel": "すべて表示",
-    "xpack.code.mainPage.history.commitHistoryTitle": "コミット履歴",
-    "xpack.code.mainPage.history.commitsOnTitle": "{date} のコミット",
-    "xpack.code.mainPage.history.moreButtonLabel": "もっと",
-    "xpack.code.mainPage.sideTab.fileTabLabel": "ファイル",
-    "xpack.code.mainPage.sideTab.languageServerInitializingText": "言語サーバーを初期化中",
-    "xpack.code.mainPage.sideTab.loadingFileTreeText": "ファイルツリーを読み込み中",
-    "xpack.code.mainPage.sideTab.loadingStructureTreeText": "ストラクチャツリーを読み込み中",
-    "xpack.code.mainPage.sideTab.structureTabLabel": "ストラクチャ",
-    "xpack.code.monaco.hover.findReferenceButtonLabel": "リファレンスを検索",
-    "xpack.code.monaco.hover.gotoDefinitionButtonLabel": "Goto 定義",
-    "xpack.code.monaco.hover.languageServerInitializingDescription": "レポジトリのサイズによって、この操作には数分かかる場合があります。",
-    "xpack.code.monaco.hover.languageServerInitializingTitle": "言語サーバーを初期化中…",
-    "xpack.code.repoFileStatus.fileIsTooBigMessage": "現在のファイルは大きすぎます。",
-    "xpack.code.repoFileStatus.fileNotSupportedMessage": "現在のファイルは対応言語のものではありません。",
-    "xpack.code.repoFileStatus.IndexingInProgressMessage": "インデックス中です。",
-    "xpack.code.repoFileStatus.langServerNotInstalledMessage": "現在のファイルをサポートするには、追加言語サーバーをインストールしてください。",
-    "xpack.code.repoFileStatus.langserverType.dedicatedMessage": "現在のファイルには専用の言語サーバーが使用されます。",
-    "xpack.code.repoFileStatus.langserverType.genericMessage": "現在のファイルには一般の言語サーバーのみ使用できます。",
-    "xpack.code.repoFileStatus.langserverType.noneMessage": "現在のファイルはどの言語サーバーにもサポートされていません。",
-    "xpack.code.repoFileStatus.languageServerInitializedMessage": "言語サーバーが初期化されました。",
-    "xpack.code.repoFileStatus.langugageServerIsInitializitingMessage": "言語サーバーを初期化中です。",
-    "xpack.code.repoFileStatus.revisionNotIndexedMessage": "現在のリビジョンはインデックスされていません。",
-    "xpack.code.repoItem.cancelButtonText": "いいえ、削除しません",
-    "xpack.code.repoItem.cloneErrorText": "レポジトリのクローン作成中にエラーが発生",
-    "xpack.code.repoItem.cloningText": "クローンを作成中…",
-    "xpack.code.repoItem.confirmButtonText": "はい、削除します",
-    "xpack.code.repoItem.deleteButtonLabel": "削除",
-    "xpack.code.repoItem.deleteConfirmTitle": "このレポジトリを削除しますか？",
-    "xpack.code.repoItem.deleteErrorText": "レポジトリの削除中にエラーが発生",
-    "xpack.code.repoItem.deletingText": "削除中…",
-    "xpack.code.repoItem.indexErrorText": "レポジトリのインデックス中にエラーが発生",
-    "xpack.code.repoItem.indexingText": "インデックス中…",
-    "xpack.code.repoItem.initText": "初期化…",
-    "xpack.code.repoItem.lastUpdatedText": "最終更新",
-    "xpack.code.repoItem.reindexButtonLabel": "再インデックス",
-    "xpack.code.repoItem.reindexConfirmTitle": "このレポジトリを再インデックスしますか？",
-    "xpack.code.repoItem.settingsButtonLabel": "設定",
-    "xpack.code.repositoryManagement.repoImportedMessage": "このレポジトリは既にインポート済みです！",
-    "xpack.code.repositoryManagement.repoSubmittedMessage": "{name} が送信されました！",
-    "xpack.code.searchBar.addRepoPlaceholder": "レポジトリを追加するために検索",
-    "xpack.code.searchBar.addToScopeDescription": "インデックス済みのレポジトリを検索対象に追加します",
-    "xpack.code.searchBar.applyAndCloseButtonLabel": "適用して閉じる",
-    "xpack.code.searchBar.fileGroupTitle": "ファイル",
-    "xpack.code.searchBar.repositorylGroupTitle": "レポジトリ",
-    "xpack.code.searchBar.resultCountText": "{total} 件の{total, plural, one {結果} other {結果}}",
-    "xpack.code.searchBar.searchFilterTitle": "{filterCount, plural, one {検索フィルター} other {検索フィルター}}",
-    "xpack.code.searchBar.searchScopeTitle": "検索対象",
-    "xpack.code.searchBar.symbolGroupTitle": "シンボル",
-    "xpack.code.searchBar.viewFullSearchLinkText": "完全テキスト全文検索は ⮐ エンターキーを押してください",
-    "xpack.code.searchBar.viewMoreLinkText": "他を表示",
-    "xpack.code.searchPage.emptyText": "他を検索したり、検索設定を変更したりできます。",
-    "xpack.code.searchPage.emptyTitle": "ふむむ、検索しましたが何も見つかりませんでした。",
-    "xpack.code.searchPage.hitsCountText": " 次の場所からのヒット ",
-    "xpack.code.searchPage.modifySearchSettingButtonLabel": "検索設定を変更",
-    "xpack.code.searchPage.showingResultsTitle": "{total} 件中 {from} ～ {to} 件目を表示中",
-    "xpack.code.searchPage.sideBar.languagesTitle": "言語",
-    "xpack.code.searchPage.sideBar.repositoriesTitle": "レポジトリ",
-    "xpack.code.searchScope.defaultDropDownOptionLabel": "すべて検索",
-    "xpack.code.searchScope.defaultPlaceholder": "入力してすべてを検索",
-    "xpack.code.searchScope.fileDropDownOptionLabel": "ファイルを検索",
-    "xpack.code.searchScope.filePlaceholder": "入力してファイルを検索",
-    "xpack.code.searchScope.repositoryDropDownOptionLabel": "レポジトリを検索",
-    "xpack.code.searchScope.repositoryPlaceholder": "入力してレポジトリを検索",
-    "xpack.code.searchScope.symbolDropDownOptionLabel": "シンボルを検索",
-    "xpack.code.searchScope.symbolPlaceholder": "入力してシンボルを検索",
     "xpack.crossClusterReplication.addAutoFollowPatternButtonLabel": "自動フォローパターンを作成",
     "xpack.crossClusterReplication.addBreadcrumbTitle": "追加",
     "xpack.crossClusterReplication.addFollowerButtonLabel": "フォロワーインデックスを作成",
@@ -4463,10 +4314,6 @@
     "xpack.graph.sidebar.selections.selectNoneButtonLabel": "なし",
     "xpack.graph.sidebar.selections.selectNoneButtonTooltip": "どれも選択しません",
     "xpack.graph.sidebar.selectionsTitle": "選択項目",
-    "xpack.graph.sidebar.similarLabels.keyTermsText": "キー用語: {inferredEdgeLabel}",
-    "xpack.graph.sidebar.similarLabels.mergeSrcToTargetButtonTooltip": "{srcLabel} を {targetLabel} に結合します",
-    "xpack.graph.sidebar.similarLabels.mergeTargetToSrcButtonTooltip": "{targetLabel} を {srcLabel} に結合します",
-    "xpack.graph.sidebar.similarLabelsTitle": "類似ラベル",
     "xpack.graph.sidebar.styleVerticesTitle": "スタイルが選択された頂点",
     "xpack.graph.sidebar.topMenu.addLinksButtonTooltip": "既存の用語の間にリンクを追加します",
     "xpack.graph.sidebar.topMenu.blacklistButtonTooltip": "選択項目がワークスペースに戻らないようブラックリストに追加します",
@@ -5212,14 +5059,9 @@
     "xpack.infra.logs.analysisPage.unavailable.mLDisabledTitle": "分析機能には機械学習が必要です",
     "xpack.infra.logs.highlights.goToNextHighlightButtonLabel": "次のハイライトにスキップ",
     "xpack.infra.logs.highlights.goToPreviousHighlightButtonLabel": "前のハイライトにスキップ",
-    "xpack.infra.logs.index.analysisBetaBadgeLabel": "ベータ",
     "xpack.infra.logs.index.analysisBetaBadgeTitle": "分析",
-    "xpack.infra.logs.index.analysisBetaBadgeTooltipContent": "この機能は現在開発中です。他にも機能が追加され、機能によっては変更されるものもあります。",
-    "xpack.infra.logs.index.analysisTabTitle": "分析",
-    "xpack.infra.logs.index.documentTitle": "ログ",
     "xpack.infra.logs.index.settingsTabTitle": "設定",
     "xpack.infra.logs.index.streamTabTitle": "ストリーム",
-    "xpack.infra.logs.logsAnalysisResults.loadingMessage": "結果を読み込み中...",
     "xpack.infra.logs.logsAnalysisResults.onboardingSuccessContent": "機械学習ロボットがデータの収集を開始するまでしばらくお待ちください。",
     "xpack.infra.logs.logsAnalysisResults.onboardingSuccessTitle": "成功！",
     "xpack.infra.logs.streamPage.documentTitle": "{previousTitle} | ストリーム",
@@ -6990,7 +6832,6 @@
     "xpack.transform.transformList.stopActionName": "停止",
     "xpack.transform.transformList.stopTransformSuccessMessage": "データフレームジョブ {transformId} が停止しました",
     "xpack.transform.pivotPreview.copyClipboardTooltip": "ピボットプレビューの開発コンソールステートメントをクリップボードにコピーします。",
-    "xpack.transform.pivotPreview.statusCodeLabel": "ステータスコード",
     "xpack.transform.progress": "進捗",
     "xpack.transform.sourceIndex": "ソースインデックス",
     "xpack.transform.sourceIndexPreview.copyClipboardTooltip": "ソースインデックスプレビューの開発コンソールステートメントをクリップボードにコピーします。",
@@ -8503,7 +8344,6 @@
     "xpack.searchProfiler.basicLicenseTitle": "ベーシック",
     "xpack.searchProfiler.formIndexLabel": "インデックス",
     "xpack.searchProfiler.formProfileButtonLabel": "プロフィール",
-    "xpack.searchProfiler.formTypeLabel": "タイプ",
     "xpack.searchProfiler.goldLicenseTitle": "ゴールド",
     "xpack.searchProfiler.highlightDetails.descriptionTitle": "説明",
     "xpack.searchProfiler.highlightDetails.selfTimeTitle": "セルフタイム",
@@ -8513,7 +8353,7 @@
     "xpack.searchProfiler.highlightDetails.totalTimeTooltip": "子を除き、このクエリコンポーネントだけに使用された合計時間です",
     "xpack.searchProfiler.highlightDetails.typeTitle": "タイプ",
     "xpack.searchProfiler.licenseErrorMessageDescription": "さらに可視化するには有効なライセンス ({licenseTypeList} または {platinumLicenseType}), が必要ですが、クラスターに見つかりませんでした。",
-    "xpack.searchProfiler.licenseErrorMessageTitle": "{warningIcon} ライセンスエラー",
+    "xpack.searchProfiler.licenseErrorMessageTitle": "ライセンスエラー",
     "xpack.searchProfiler.licenseHasExpiredMessage": "検索プロフィールを利用できません。ライセンスが期限切れです。",
     "xpack.searchProfiler.pageDisplayName": "検索プロファイラー",
     "xpack.searchProfiler.platinumLicenseTitle": "プラチナ",
@@ -8550,9 +8390,9 @@
     "xpack.security.account.passwordsDoNotMatch": "パスワードが一致していません。",
     "xpack.security.account.usernameGroupDescription": "この情報は変更できません。",
     "xpack.security.account.usernameGroupTitle": "ユーザー名とメールアドレス",
-    "xpack.security.components.sessionExpiration.logoutNotification": "操作がないため間もなくログアウトします。再開するには [OK] をクリックしてくださ。",
-    "xpack.security.components.sessionExpiration.okButtonText": "OK",
-    "xpack.security.hacks.warningTitle": "警告",
+    "xpack.security.components.sessionTimeoutWarning.message": "操作がないため間もなくログアウトします。再開するには [OK] をクリックしてくださ。",
+    "xpack.security.components.sessionTimeoutWarning.okButtonText": "OK",
+    "xpack.security.components.sessionTimeoutWarning.title": "警告",
     "xpack.security.loggedOut.login": "ログイン",
     "xpack.security.loggedOut.title": "ログアウト完了",
     "xpack.security.login.basicLoginForm.invalidUsernameOrPasswordErrorMessage": "無効なユーザー名またはパスワード再試行してください。",
@@ -8797,7 +8637,6 @@
     "xpack.server.checkLicense.errorExpiredMessage": "{licenseType} ライセンスが期限切れのため {pluginName} を使用できません",
     "xpack.server.checkLicense.errorUnavailableMessage": "現在ライセンス情報が利用できないため {pluginName} を使用できません。",
     "xpack.server.checkLicense.errorUnsupportedMessage": "ご使用の {licenseType} ライセンスは {pluginName} をサポートしていません。ライセンスをアップグレードしてください。",
-    "xpack.siem.add_to_kql.filterForValueHoverAction": "値でフィルターします",
     "xpack.siem.andOrBadge.and": "AND",
     "xpack.siem.andOrBadge.or": "OR",
     "xpack.siem.auditd.abortedAuditStartupDescription": "中断された監査のスタートアップ",
@@ -9319,9 +9158,7 @@
     "xpack.siem.anomaliesTable.table.anomaliesTooltip": "異常表は SIEM グローバル KQL 検索でフィルタリングできません。",
     "xpack.siem.anomaliesTable.table.unit": "{totalCount, plural, =1 {anomaly} other {anomalies}}",
     "xpack.siem.clipboard.copy.to.the.clipboard": "クリップボードにコピー",
-    "xpack.siem.components.embeddables.actions.applySiemFilterActionTitle": "フィルターを適用",
     "xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorButtonLabel": "インデックスパターンを編集",
-    "xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorDescription": "マップにイベントデータを表示するには、ECS に準拠した Kibana インデックスパターンを構成する必要があります。ビートを使用すると、次のセットアップコマンドを実行して必要な Kibana インデックスパターンを作成するか、Kibana の設定で手動により構成することができます。",
     "xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorTitle": "必要なインデックスパターンが構成されていません",
     "xpack.siem.components.ml.anomaly.errors.anomaliesTableFetchFailureTitle": "異常表の取得に失敗",
     "xpack.siem.components.ml.api.errors.networkErrorFailureTitle": "ネットワークエラー",
@@ -10473,4 +10310,4 @@
     "xpack.fileUpload.fileParser.errorReadingFile": "ファイルの読み込み中にエラーが発生しました",
     "xpack.fileUpload.fileParser.noFileProvided": "エラー、ファイルが提供されていません"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index c7448d0a7972c1..8a0e3d78139b18 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -855,7 +855,6 @@
     "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "已保存查询按钮已选择 {savedQueryName}。按下可清除任何更改。",
     "data.search.searchBar.savedQueryPopoverTitleText": "已保存查询",
     "embeddableApi.actions.applyFilterActionTitle": "将筛选应用于当前视图",
-    "embeddableApi.addPanel.createNew": "创建新的{factoryName}",
     "embeddableApi.addPanel.createNewDefaultOption": "创建新的......",
     "embeddableApi.addPanel.displayName": "添加面板",
     "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} 已添加",
@@ -924,21 +923,20 @@
     "inputControl.vis.listControl.selectPlaceholder": "选择......",
     "inputControl.vis.listControl.selectTextPlaceholder": "选择......",
     "inputControl.vis.listControl.partialResultsWarningMessage": "字词列表可能不完整，因为请求花费的时间过长。在 Kibana.yml 中调整自动完成设置以获取完整的结果。",
-    "interpreter.function.visDimension.accessor.help": "数据集中要使用的列（列索引或列名称）",
-    "interpreter.function.visDimension.error.accessor": "提供的列名称无效",
-    "interpreter.function.visDimension.help": "生成 visConfig 维度对象",
+    "visualizations.function.visDimension.accessor.help": "数据集中要使用的列（列索引或列名称）",
+    "visualizations.function.visDimension.error.accessor": "提供的列名称无效",
+    "visualizations.function.visDimension.help": "生成 visConfig 维度对象",
     "interpreter.functions.esaggs.help": "运行 AggConfig 聚合",
-    "interpreter.functions.kibana_context.help": "更新 kibana 全局上下文",
-    "interpreter.functions.kibana.help": "获取 kibana 全局上下文",
-    "interpreter.functions.visualization.help": "简单可视化",
-    "interpreter.functions.font.args.alignHelpText": "水平文本对齐。",
-    "interpreter.functions.font.args.colorHelpText": "文本颜色。",
-    "interpreter.functions.font.args.italicHelpText": "使文本变为斜体？",
-    "interpreter.functions.font.args.lHeightHelpText": "行高（像素）",
-    "interpreter.functions.font.args.sizeHelpText": "字体大小（像素）",
-    "interpreter.functions.font.args.underlineHelpText": "为文本加下划线？",
-    "interpreter.functions.font.args.weightHelpText": "字体粗细。例如 {list} 或 {end}。",
-    "interpreter.functions.fontHelpText": "创建字体样式。",
+    "expressions_np.functions.kibana_context.help": "更新 kibana 全局上下文",
+    "expressions_np.functions.kibana.help": "获取 kibana 全局上下文",
+    "expressions_np.functions.font.args.alignHelpText": "水平文本对齐。",
+    "expressions_np.functions.font.args.colorHelpText": "文本颜色。",
+    "expressions_np.functions.font.args.italicHelpText": "使文本变为斜体？",
+    "expressions_np.functions.font.args.lHeightHelpText": "行高（像素）",
+    "expressions_np.functions.font.args.sizeHelpText": "字体大小（像素）",
+    "expressions_np.functions.font.args.underlineHelpText": "为文本加下划线？",
+    "expressions_np.functions.font.args.weightHelpText": "字体粗细。例如 {list} 或 {end}。",
+    "expressions_np.functions.fontHelpText": "创建字体样式。",
     "kbn.advancedSettings.context.defaultSizeText": "要在上下文视图中显示的周围条目数目",
     "kbn.advancedSettings.context.defaultSizeTitle": "上下文大小",
     "kbn.advancedSettings.context.sizeStepText": "递增或递减上下文大小的步进大小",
@@ -3256,9 +3254,6 @@
     "xpack.apm.invalidLicense.licenseManagementLink": "管理您的许可",
     "xpack.apm.invalidLicense.message": "APM UI 不可用，因为您当前的许可已过期或不再有效。",
     "xpack.apm.invalidLicense.title": "许可无效",
-    "xpack.apm.kueryBar.indexPatternMissingWarningMessage": "没有标题为 “{apmIndexPatternTitle}” 的可用 APM 索引模式。要使用查询栏，请选择通过{setupInstructionsLink}导入 APM 索引模式。",
-    "xpack.apm.kueryBar.searchPlaceholder": "搜索事务和错误……（例如 {queryExample}",
-    "xpack.apm.kueryBar.setupInstructionsLinkLabel": "设置说明",
     "xpack.apm.metadataTable.section.agentLabel": "代理",
     "xpack.apm.metadataTable.section.containerLabel": "容器",
     "xpack.apm.metadataTable.section.customLabel": "定制",
@@ -3457,8 +3452,6 @@
     "xpack.apm.settings.agentConf.configTable.serviceNameColumnLabel": "服务名称",
     "xpack.apm.settings.agentConf.configurationsPanelTitle": "配置",
     "xpack.apm.settings.agentConf.createConfigButtonLabel": "创建配置",
-    "xpack.apm.settings.agentConf.pageTitle": "设置",
-    "xpack.apm.settings.agentConf.returnToOverviewLinkLabel": "返回至概览",
     "xpack.apm.transactionDetails.traceNotFound": "找不到所选跟踪",
     "xpack.apm.transactionDetails.traceSampleTitle": "跟踪样例",
     "xpack.apm.transactionsTable.notFoundLabel": "未找到任何事务。",
@@ -3945,150 +3938,6 @@
     "xpack.canvas.functions.urlparam.args.defaultHelpText": "未指定 {URL} 参数时返回的值。",
     "xpack.canvas.functions.urlparam.args.paramHelpText": "要检索的 {URL} 哈希参数。",
     "xpack.canvas.functions.urlparamHelpText": "检索要在表达式中使用的 {URL} 参数。{urlparamFn} 函数始终返回 {TYPE_STRING}。例如，从 {URL} 的参数 {myVar} 检索值 {value} ({example})。",
-    "xpack.code.adminPage.langserverTab.installedText": "已安装",
-    "xpack.code.adminPage.langserverTab.languageServersDescription": "{serverCount} 个 {serverCount, plural, one {语言服务器} other {语言服务器}}",
-    "xpack.code.adminPage.langserverTab.notInstalledText": "未安装",
-    "xpack.code.adminPage.langserverTab.runningText": "正在运行......",
-    "xpack.code.adminPage.langserverTab.setup.closeButtonLabel": "关闭",
-    "xpack.code.adminPage.langserverTab.setup.installationInstructionTitle": "安装说明",
-    "xpack.code.adminPage.langserverTab.setup.installTitle": "安装",
-    "xpack.code.adminPage.langserverTab.setup.stopKibanaDescription": "停止您的 Kibana Code 节点。",
-    "xpack.code.adminPage.langserverTab.setup.uninstallTitle": "卸载",
-    "xpack.code.adminPage.langserverTab.setup.useFollowingCommandToInstallDescription": "使用以下命令安装 {name} 语言服务器。",
-    "xpack.code.adminPage.langserverTab.setup.useFollowingCommandToRemoveDescription": "使用以下命令卸载 {name} 语言服务器。",
-    "xpack.code.adminPage.langserverTab.setupButtonLabel": "设置",
-    "xpack.code.adminPage.langserverTabLabel": "语言服务器",
-    "xpack.code.adminPage.repoTab.cancelButtonLabel": "取消",
-    "xpack.code.adminPage.repoTab.emptyRepo.importFirstRepositoryText": "让我们导入您的首个存储库",
-    "xpack.code.adminPage.repoTab.emptyRepo.noRepositoryText": "您尚未有任何存储库",
-    "xpack.code.adminPage.repoTab.emptyRepo.viewSetupGuideButtonLabel": "查看设置指南",
-    "xpack.code.adminPage.repoTab.importButtonLabel": "导入",
-    "xpack.code.adminPage.repoTab.importRepoButtonLabel": "导入新的存储库",
-    "xpack.code.adminPage.repoTab.importRepoTitle": "导入新的存储库",
-    "xpack.code.adminPage.repoTab.repoDescription": "{projectsCount} 个 {projectsCount, plural, one {存储库} other {存储库}}",
-    "xpack.code.adminPage.repoTab.repositoryUrlEmptyText": "URL 不应为空。",
-    "xpack.code.adminPage.repoTab.repositoryUrlFormLabel": "存储库 URL",
-    "xpack.code.adminPage.repoTab.repositoryUrlTitle": "存储库 URL",
-    "xpack.code.adminPage.repoTab.sort.aToZDropDownOptionLabel": "升序",
-    "xpack.code.adminPage.repoTab.sort.sortByFormLabel": "排序依据",
-    "xpack.code.adminPage.repoTab.sort.updatedAscDropDownOptionLabel": "最后更新时间 - 升序",
-    "xpack.code.adminPage.repoTab.sort.updatedDescDropDownOptionLabel": "最后更新时间 - 降序",
-    "xpack.code.adminPage.repoTab.sort.zToADropDownOptionLabel": "降序",
-    "xpack.code.adminPage.repoTabLabel": "存储库",
-    "xpack.code.adminPage.setupGuide.checkMultiInstanceTitle": "确认多个 Kibana 实例是否用作集群 URL",
-    "xpack.code.adminPage.setupGuide.checkMultiInstanceDescription1": "如果使用单个 Kibana 实例，则可以跳过此步骤。",
-    "xpack.code.adminPage.setupGuide.checkMultiInstanceDescription2": "如果使用多个 Kibana 实例，则需要将一个 Kibana 实例指定为 `Code 节点`。为此，将以下代码行添加到每个 Kibana 实例的 kibana.yml 文件中，并重新启动这些实例：",
-    "xpack.code.adminPage.setupGuide.checkMultiInstanceDescription3": "其中，`$YourCodeNoteAddress` 是已指定 Code 节点的 URL，其可由其他 Kibana 实例访问。",
-    "xpack.code.adminPage.setupGuide.installExtraLangSupportTitle": "根据需要安装额外的语言支持",
-    "xpack.code.adminPage.setupGuide.installExtraLangSupportDescription1": "访问{link}，详细了解支持的语言和语言服务器安装。",
-    "xpack.code.adminPage.setupGuide.installExtraLangSupportDescription2": "如果需要 Java 语言支持，可以在{link}管理语言服务器安装。",
-    "xpack.code.adminPage.setupGuide.installExtraLangSupportHereLinkText": "此处",
-    "xpack.code.adminPage.setupGuide.addRepositoryTitle": "将存储库添加到 Code",
-    "xpack.code.adminPage.setupGuide.addRepositoryDescription": "导入 {sampleRepoLink} 或 {ownRepoLink}。只需将 git clone URL 复制并粘贴到 Code。",
-    "xpack.code.adminPage.setupGuide.addRepositorySampleRepoLinkText": "样例存储库",
-    "xpack.code.adminPage.setupGuide.addRepositoryOwnRepoLinkText": "您自己的存储库",
-    "xpack.code.adminPage.setupGuide.verifyImportTitle": "确认存储库成功导入",
-    "xpack.code.adminPage.setupGuide.verifyImportDescription": "您可以通过{searchingLink}和{navigatingLink}存储库来确认存储库是否成功导入。如果语言支持可用于存储库，请确保{semanticNavigationLink}也可用。",
-    "xpack.code.adminPage.setupGuide.verifyImportSearchingLinkText": "搜索",
-    "xpack.code.adminPage.setupGuide.verifyImportNavigatingLinkText": "导航",
-    "xpack.code.adminPage.setupGuide.verifyImportSemanticNavigatingLinkText": "语义导航",
-    "xpack.code.adminPage.setupGuide.backToDashboardButtonLabel": "返回存储库仪表板",
-    "xpack.code.adminPage.setupGuide.getStartedTitle": "Elastic Code 入门",
-    "xpack.code.adminPage.setupGuide.learnMoreButtonLabel": "了解详情",
-    "xpack.code.adminPage.setupGuide.permissionChangesDescription": "我们在 Kibana 中对角色和权限做了一些变更。在下面详细了解这些变更如何影响 Code 实施。",
-    "xpack.code.adminPage.setupGuide.permissionChangesTitle": "权限变更",
-    "xpack.code.featureRegistry.codeFeatureName": "Code",
-    "xpack.code.git.diskWatermarkLowMessage": "可用磁盘空间低于 {watermark}",
-    "xpack.code.git.diskWatermarkLowPercentageMessage": "磁盘使用水位线水平高于 {watermark}",
-    "xpack.code.gitUrlUtil.urlNotWhitelistedMessage": "Git url 主机未列入白名单。",
-    "xpack.code.gitUrlUtil.protocolNotWhitelistedMessage": "Git url 协议未列入白名单。",
-    "xpack.code.helpMenu.codeDocumentationButtonLabel": "Code 文档",
-    "xpack.code.helpMenu.helpDescription": "有关 Code 特定信息",
-    "xpack.code.helpMenu.setupGuideButtonLabel": "设置指南",
-    "xpack.code.mainPage.content.cloneStatus.isCloningText": "正在克隆",
-    "xpack.code.mainPage.content.cloneStatus.yourProjectWillBeAvailableText": "此过程完成时，您的项目将可用",
-    "xpack.code.mainPage.content.cloneStatus.progress.receivingText": "正在接收对象：{progressRate}% {receivedObjects}/{totalObjects}",
-    "xpack.code.mainPage.content.cloneStatus.progress.receivingRateOnlyText": "正在接收对象：{progressRate}%",
-    "xpack.code.mainPage.content.cloneStatus.progress.indexingText": "正在索引对象：{progressRate}% {indexedObjects}/{totalObjects}",
-    "xpack.code.mainPage.content.cloneStatus.progress.cloneFailedText": "克隆失败",
-    "xpack.code.mainPage.content.buttons.blameButtonLabel": "归咎",
-    "xpack.code.mainPage.content.buttons.codeButtonLabel": "Code",
-    "xpack.code.mainPage.content.buttons.contentButtonLabel": "内容",
-    "xpack.code.mainPage.content.buttons.downloadButtonLabel": "下载",
-    "xpack.code.mainPage.content.buttons.folderButtonLabel": "目录",
-    "xpack.code.mainPage.content.buttons.historyButtonLabel": "历史记录",
-    "xpack.code.mainPage.content.buttons.rawButtonLabel": "原始",
-    "xpack.code.mainPage.content.directory.directoriesTitle": "目录",
-    "xpack.code.mainPage.content.directory.filesTitle": "文件",
-    "xpack.code.mainPage.directory.recentCommitsTitle": "最近的提交",
-    "xpack.code.mainPage.directory.viewAllCommitsButtonLabel": "查看全部",
-    "xpack.code.mainPage.history.commitHistoryTitle": "提交历史记录",
-    "xpack.code.mainPage.history.commitsOnTitle": "{date} 的提交",
-    "xpack.code.mainPage.history.moreButtonLabel": "更多",
-    "xpack.code.mainPage.sideTab.fileTabLabel": "文件",
-    "xpack.code.mainPage.sideTab.languageServerInitializingText": "语言服务器正在初始化",
-    "xpack.code.mainPage.sideTab.loadingFileTreeText": "正在加载文件树",
-    "xpack.code.mainPage.sideTab.loadingStructureTreeText": "正在加载结构树",
-    "xpack.code.mainPage.sideTab.structureTabLabel": "结构",
-    "xpack.code.monaco.hover.findReferenceButtonLabel": "查找引用",
-    "xpack.code.monaco.hover.gotoDefinitionButtonLabel": "Goto 定义",
-    "xpack.code.monaco.hover.languageServerInitializingDescription": "这可能需要若干分钟，取决于存储库的大小。",
-    "xpack.code.monaco.hover.languageServerInitializingTitle": "语言服务器正在初始化……",
-    "xpack.code.repoItem.cancelButtonText": "不，不执行",
-    "xpack.code.repoItem.cloneErrorText": "克隆存储库时出错",
-    "xpack.code.repoItem.cloningText": "正在克隆......",
-    "xpack.code.repoItem.confirmButtonText": "是，执行",
-    "xpack.code.repoItem.deleteButtonLabel": "删除",
-    "xpack.code.repoItem.deleteConfirmTitle": "删除此存储库？",
-    "xpack.code.repoItem.deleteErrorText": "删除存储库时出错",
-    "xpack.code.repoItem.deletingText": "正在删除......",
-    "xpack.code.repoItem.indexErrorText": "索引存储库时出错",
-    "xpack.code.repoItem.indexingText": "正在索引......",
-    "xpack.code.repoItem.initText": "正在初始化...",
-    "xpack.code.repoItem.lastUpdatedText": "最后更新时间",
-    "xpack.code.repoItem.reindexButtonLabel": "重新索引",
-    "xpack.code.repoItem.reindexConfirmTitle": "重新索引此存储库？",
-    "xpack.code.repoItem.settingsButtonLabel": "设置",
-    "xpack.code.repositoryManagement.repoImportedMessage": "此存储库已导入！",
-    "xpack.code.repositoryManagement.repoOtherSpaceImportedMessage": "此存储库已在其他空间导入！",
-    "xpack.code.repositoryManagement.repoSubmittedMessage": "{name} 已成功提交！",
-    "xpack.code.repoFileStatus.langugageServerIsInitializitingMessage": "语言服务器正在初始化。",
-    "xpack.code.repoFileStatus.languageServerInitializedMessage": "语言服务器已初始化。",
-    "xpack.code.repoFileStatus.IndexingInProgressMessage": "索引正在进行中。",
-    "xpack.code.repoFileStatus.fileNotSupportedMessage": "当前文件的语言不受支持。",
-    "xpack.code.repoFileStatus.revisionNotIndexedMessage": "当前修订未索引。",
-    "xpack.code.repoFileStatus.langServerNotInstalledMessage": "安装其他语言服务器以支持当前文件。",
-    "xpack.code.repoFileStatus.fileIsTooBigMessage": "当前文件过大。",
-    "xpack.code.repoFileStatus.langserverType.noneMessage": "当前文件不受任何语言服务器支持。",
-    "xpack.code.repoFileStatus.langserverType.genericMessage": "当前文件仅由常规语言服务器支持。",
-    "xpack.code.repoFileStatus.langserverType.dedicatedMessage": "当前文件由专用语言服务器支持。",
-    "xpack.code.repoFileStatus.langServerLaunchFailed": "语言服务器启动失败。",
-    "xpack.code.searchBar.addRepoPlaceholder": "搜索以添加存储库",
-    "xpack.code.searchBar.addToScopeDescription": "将索引的存储库添加到搜索范围",
-    "xpack.code.searchBar.applyAndCloseButtonLabel": "应用并关闭",
-    "xpack.code.searchBar.fileGroupTitle": "文件",
-    "xpack.code.searchBar.repositorylGroupTitle": "存储库",
-    "xpack.code.searchBar.resultCountText": "{total} 个 {total, plural, one {结果} other {结果}}",
-    "xpack.code.searchBar.searchFilterTitle": "{filterCount, plural, one {高级选项} other {高级选项}}",
-    "xpack.code.searchBar.searchScopeTitle": "搜索范围",
-    "xpack.code.searchBar.symbolGroupTitle": "符号",
-    "xpack.code.searchBar.viewFullSearchLinkText": "按 ⮐ Return 键以进行全文本搜索",
-    "xpack.code.searchBar.viewMoreLinkText": "查看更多内容",
-    "xpack.code.searchPage.emptyText": "您可以搜索其他内容或修改搜索设置。",
-    "xpack.code.searchPage.emptyTitle": "嗯...... 我们已找过该内容，但未有任何发现。",
-    "xpack.code.searchPage.hitsCountText": " 次命中，来自 ",
-    "xpack.code.searchPage.modifySearchSettingButtonLabel": "修改搜索设置",
-    "xpack.code.searchPage.showingResultsTitle": "显示第 {from} - {to} 个结果，共 {total} 个。",
-    "xpack.code.searchPage.sideBar.languagesTitle": "语言",
-    "xpack.code.searchPage.sideBar.repositoriesTitle": "存储库",
-    "xpack.code.searchScope.defaultDropDownOptionLabel": "搜索所有内容",
-    "xpack.code.searchScope.defaultPlaceholder": "键入要查找的任何内容",
-    "xpack.code.searchScope.fileDropDownOptionLabel": "搜索文件",
-    "xpack.code.searchScope.filePlaceholder": "键入要查找的文件",
-    "xpack.code.searchScope.repositoryDropDownOptionLabel": "搜索存储库",
-    "xpack.code.searchScope.repositoryPlaceholder": "键入要查找的存储库",
-    "xpack.code.searchScope.symbolDropDownOptionLabel": "搜索符号",
-    "xpack.code.searchScope.symbolPlaceholder": "键入要查找的符号",
     "xpack.crossClusterReplication.addAutoFollowPatternButtonLabel": "创建自动跟随模式",
     "xpack.crossClusterReplication.addBreadcrumbTitle": "添加",
     "xpack.crossClusterReplication.addFollowerButtonLabel": "创建 Follower 索引",
@@ -4466,10 +4315,6 @@
     "xpack.graph.sidebar.selections.selectNoneButtonLabel": "无",
     "xpack.graph.sidebar.selections.selectNoneButtonTooltip": "不选择任何内容",
     "xpack.graph.sidebar.selectionsTitle": "选择的内容",
-    "xpack.graph.sidebar.similarLabels.keyTermsText": "关键字词：{inferredEdgeLabel}",
-    "xpack.graph.sidebar.similarLabels.mergeSrcToTargetButtonTooltip": "将 {srcLabel} 合并到 {targetLabel}",
-    "xpack.graph.sidebar.similarLabels.mergeTargetToSrcButtonTooltip": "将 {targetLabel} 合并到 {srcLabel}",
-    "xpack.graph.sidebar.similarLabelsTitle": "类似标签",
     "xpack.graph.sidebar.styleVerticesTitle": "样式选择的顶点",
     "xpack.graph.sidebar.topMenu.addLinksButtonTooltip": "在现有字词之间添加链接",
     "xpack.graph.sidebar.topMenu.blacklistButtonTooltip": "返回工作空间时选择的黑名单",
@@ -5215,14 +5060,9 @@
     "xpack.infra.logs.analysisPage.unavailable.mLDisabledTitle": "分析功能需要 Machine Learning",
     "xpack.infra.logs.highlights.goToNextHighlightButtonLabel": "跳转到下一高亮条目",
     "xpack.infra.logs.highlights.goToPreviousHighlightButtonLabel": "跳转到上一高亮条目",
-    "xpack.infra.logs.index.analysisBetaBadgeLabel": "公测版",
     "xpack.infra.logs.index.analysisBetaBadgeTitle": "分析",
-    "xpack.infra.logs.index.analysisBetaBadgeTooltipContent": "此功能仍处于开发状态。额外功能即将推出，某些功能可能会有变更。",
-    "xpack.infra.logs.index.analysisTabTitle": "分析",
-    "xpack.infra.logs.index.documentTitle": "Logs",
     "xpack.infra.logs.index.settingsTabTitle": "设置",
     "xpack.infra.logs.index.streamTabTitle": "流式传输",
-    "xpack.infra.logs.logsAnalysisResults.loadingMessage": "正在加载结果......",
     "xpack.infra.logs.logsAnalysisResults.onboardingSuccessContent": "请注意，我们的 Machine Learning 机器人若干分钟后才会开始收集数据。",
     "xpack.infra.logs.logsAnalysisResults.onboardingSuccessTitle": "成功！",
     "xpack.infra.logs.streamPage.documentTitle": "{previousTitle} | 流式传输",
@@ -7148,7 +6988,6 @@
     "xpack.transform.transformList.stopActionName": "停止",
     "xpack.transform.transformList.stopTransformSuccessMessage": "数据帧作业 {transformId} 停止成功。",
     "xpack.transform.pivotPreview.copyClipboardTooltip": "将透视预览的开发控制台语句复制到剪贴板。",
-    "xpack.transform.pivotPreview.statusCodeLabel": "状态代码",
     "xpack.transform.progress": "进度",
     "xpack.transform.sourceIndex": "源索引",
     "xpack.transform.sourceIndexPreview.copyClipboardTooltip": "将源索引预览的开发控制台语句复制到剪贴板。",
@@ -8660,7 +8499,6 @@
     "xpack.searchProfiler.basicLicenseTitle": "基础级",
     "xpack.searchProfiler.formIndexLabel": "索引",
     "xpack.searchProfiler.formProfileButtonLabel": "配置文件",
-    "xpack.searchProfiler.formTypeLabel": "类型",
     "xpack.searchProfiler.goldLicenseTitle": "黄金级",
     "xpack.searchProfiler.highlightDetails.descriptionTitle": "描述",
     "xpack.searchProfiler.highlightDetails.selfTimeTitle": "独自时间",
@@ -8670,7 +8508,7 @@
     "xpack.searchProfiler.highlightDetails.totalTimeTooltip": "此查询组件花费的总时间（包括子项）",
     "xpack.searchProfiler.highlightDetails.typeTitle": "类型",
     "xpack.searchProfiler.licenseErrorMessageDescription": "分析器可视化需要有效的许可（{licenseTypeList}或{platinumLicenseType}，但在您的集群中未找到任何许可。",
-    "xpack.searchProfiler.licenseErrorMessageTitle": "{warningIcon} 许可错误",
+    "xpack.searchProfiler.licenseErrorMessageTitle": "许可错误",
     "xpack.searchProfiler.licenseHasExpiredMessage": "Search Profiler 不可用 - 许可已过期。",
     "xpack.searchProfiler.pageDisplayName": "Search Profiler",
     "xpack.searchProfiler.platinumLicenseTitle": "白金级",
@@ -8707,9 +8545,9 @@
     "xpack.security.account.passwordsDoNotMatch": "密码不匹配。",
     "xpack.security.account.usernameGroupDescription": "不能更改此信息。",
     "xpack.security.account.usernameGroupTitle": "用户名和电子邮件",
-    "xpack.security.components.sessionExpiration.logoutNotification": "由于处于不活动状态，您即将退出。单击“确定”可以恢复。",
-    "xpack.security.components.sessionExpiration.okButtonText": "确定",
-    "xpack.security.hacks.warningTitle": "警告",
+    "xpack.security.components.sessionTimeoutWarning.message": "由于处于不活动状态，您即将退出。单击“确定”可以恢复。",
+    "xpack.security.components.sessionTimeoutWarning.okButtonText": "确定",
+    "xpack.security.components.sessionTimeoutWarning.title": "警告",
     "xpack.security.loggedOut.login": "登录",
     "xpack.security.loggedOut.title": "已成功退出",
     "xpack.security.login.basicLoginForm.invalidUsernameOrPasswordErrorMessage": "用户名或密码无效。请重试。",
@@ -8954,7 +8792,6 @@
     "xpack.server.checkLicense.errorExpiredMessage": "您不能使用 {pluginName}，因为您的 {licenseType} 许可证已过期",
     "xpack.server.checkLicense.errorUnavailableMessage": "您不能使用 {pluginName}，因为许可证信息当前不可用。",
     "xpack.server.checkLicense.errorUnsupportedMessage": "您的 {licenseType} 许可证不支持 {pluginName}。请升级您的许可。",
-    "xpack.siem.add_to_kql.filterForValueHoverAction": "筛留值",
     "xpack.siem.andOrBadge.and": "AND",
     "xpack.siem.andOrBadge.or": "OR",
     "xpack.siem.auditd.abortedAuditStartupDescription": "已中止审计启动",
@@ -9476,9 +9313,7 @@
     "xpack.siem.anomaliesTable.table.anomaliesTooltip": "异常表无法通过 SIEM 全局 KQL 搜索进行筛选。",
     "xpack.siem.anomaliesTable.table.unit": "{totalCount, plural, =1 {anomaly} other {anomalies}}",
     "xpack.siem.clipboard.copy.to.the.clipboard": "复制到剪贴板",
-    "xpack.siem.components.embeddables.actions.applySiemFilterActionTitle": "应用筛选",
     "xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorButtonLabel": "配置索引模式",
-    "xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorDescription": "必须配置符合 ECS 的 Kibana 索引模式，才能查看地图上的数据。使用 Beats 时，您可以运行以下设置命令来创建所需的 Kibana 索引模式，否则只能在 Kibana 设置内手动配置。",
     "xpack.siem.components.embeddables.indexPatternsMissingPrompt.errorTitle": "未配置所需的索引模式",
     "xpack.siem.components.ml.anomaly.errors.anomaliesTableFetchFailureTitle": "异常表提取失败",
     "xpack.siem.components.ml.api.errors.networkErrorFailureTitle": "网络错误：",
@@ -10630,4 +10465,4 @@
     "xpack.fileUpload.fileParser.errorReadingFile": "读取文件时出错",
     "xpack.fileUpload.fileParser.noFileProvided": "错误，未提供任何文件"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index 2ac8fff6ef8ab7..7b2c2c2b7840f1 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -13,7 +13,11 @@ require('@kbn/test').runTestsCli([
   require.resolve('../test/api_integration/config_security_basic.js'),
   require.resolve('../test/api_integration/config.js'),
   require.resolve('../test/alerting_api_integration/spaces_only/config.ts'),
-  require.resolve('../test/alerting_api_integration/security_and_spaces/config.ts'),
+  // FLAKY: https://github.com/elastic/kibana/issues/50079
+  // FLAKY: https://github.com/elastic/kibana/issues/50074
+  // FLAKY: https://github.com/elastic/kibana/issues/48709
+  // FLAKY: https://github.com/elastic/kibana/issues/50078
+  // require.resolve('../test/alerting_api_integration/security_and_spaces/config.ts'),
   require.resolve('../test/plugin_api_integration/config.js'),
   require.resolve('../test/kerberos_api_integration/config'),
   require.resolve('../test/kerberos_api_integration/anonymous_access.config'),
diff --git a/x-pack/scripts/functional_tests_server.js b/x-pack/scripts/functional_tests_server.js
index c361f1839c50b7..039da38c8f5479 100644
--- a/x-pack/scripts/functional_tests_server.js
+++ b/x-pack/scripts/functional_tests_server.js
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+process.env.ALLOW_PERFORMANCE_HOOKS_IN_TASK_MANAGER = true;
+
 require('@kbn/plugin-helpers').babelRegister();
 require('@kbn/test').startServersCli(
   require.resolve('../test/functional/config.js'),
diff --git a/x-pack/scripts/mocha.js b/x-pack/scripts/mocha.js
index 06d524fe526bfa..cc0f94a2a760e0 100644
--- a/x-pack/scripts/mocha.js
+++ b/x-pack/scripts/mocha.js
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-require('../scripts/mocha');
+require('../../scripts/mocha');
diff --git a/x-pack/tasks/test.ts b/x-pack/tasks/test.ts
index 7be64f7179f639..d26683899ce3fd 100644
--- a/x-pack/tasks/test.ts
+++ b/x-pack/tasks/test.ts
@@ -17,10 +17,6 @@ export const testServerTask = async () => {
 
   const testGlobs = ['common/**/__tests__/**/*.js', 'server/**/__tests__/**/*.js'];
 
-  if (pluginIds.includes('code')) {
-    testGlobs.push(`legacy/plugins/**/server/**/__tests__/**/*.ts`);
-  }
-
   for (const pluginId of pluginIds) {
     testGlobs.push(
       `legacy/plugins/${pluginId}/__tests__/**/*.js`,
diff --git a/x-pack/test/accessibility/apps/login_page.ts b/x-pack/test/accessibility/apps/login_page.ts
new file mode 100644
index 00000000000000..bce6a677453777
--- /dev/null
+++ b/x-pack/test/accessibility/apps/login_page.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function({ getService, getPageObjects }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const a11y = getService('a11y');
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const PageObjects = getPageObjects(['common', 'security']);
+
+  describe('Security', () => {
+    describe('Login Page', () => {
+      before(async () => {
+        await esArchiver.load('empty_kibana');
+        await PageObjects.security.logout();
+      });
+
+      after(async () => {
+        await esArchiver.unload('empty_kibana');
+      });
+
+      afterEach(async () => {
+        await PageObjects.security.logout();
+      });
+
+      it('meets a11y requirements', async () => {
+        await PageObjects.common.navigateToApp('login');
+
+        await retry.waitFor(
+          'login page visible',
+          async () => await testSubjects.exists('loginSubmit')
+        );
+
+        await a11y.testAppSnapshot();
+      });
+    });
+  });
+}
diff --git a/x-pack/test/accessibility/config.ts b/x-pack/test/accessibility/config.ts
new file mode 100644
index 00000000000000..e1a90efccaa807
--- /dev/null
+++ b/x-pack/test/accessibility/config.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 { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { services } from './services';
+import { pageObjects } from './page_objects';
+
+export default async function({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
+
+  return {
+    ...functionalConfig.getAll(),
+
+    testFiles: [require.resolve('./apps/login_page')],
+
+    pageObjects,
+    services,
+
+    junit: {
+      reportName: 'X-Pack Accessibility Tests',
+    },
+  };
+}
diff --git a/x-pack/test/accessibility/ftr_provider_context.d.ts b/x-pack/test/accessibility/ftr_provider_context.d.ts
new file mode 100644
index 00000000000000..bb257cdcbfe1b5
--- /dev/null
+++ b/x-pack/test/accessibility/ftr_provider_context.d.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+
+import { pageObjects } from './page_objects';
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
diff --git a/x-pack/test/accessibility/page_objects.ts b/x-pack/test/accessibility/page_objects.ts
new file mode 100644
index 00000000000000..abfa2a700db5f6
--- /dev/null
+++ b/x-pack/test/accessibility/page_objects.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { pageObjects } from '../functional/page_objects';
diff --git a/x-pack/test/accessibility/services.ts b/x-pack/test/accessibility/services.ts
new file mode 100644
index 00000000000000..a74b97de36b986
--- /dev/null
+++ b/x-pack/test/accessibility/services.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { services as kibanaA11yServices } from '../../../test/accessibility/services';
+import { services as functionalServices } from '../functional/services';
+
+export const services = {
+  ...kibanaA11yServices,
+  ...functionalServices,
+};
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
index 9797e20357176d..b2e69a21218256 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
@@ -15,6 +15,13 @@ export default function(kibana: any) {
     name: 'alerts',
     init(server: any) {
       // Action types
+      const noopActionType: ActionType = {
+        id: 'test.noop',
+        name: 'Test: Noop',
+        async executor() {
+          return { status: 'ok' };
+        },
+      };
       const indexRecordActionType: ActionType = {
         id: 'test.index-record',
         name: 'Test: Index Record',
@@ -158,6 +165,7 @@ export default function(kibana: any) {
           };
         },
       };
+      server.plugins.actions.setup.registerType(noopActionType);
       server.plugins.actions.setup.registerType(indexRecordActionType);
       server.plugins.actions.setup.registerType(failingActionType);
       server.plugins.actions.setup.registerType(rateLimitedActionType);
@@ -311,7 +319,7 @@ export default function(kibana: any) {
       const noopAlertType: AlertType = {
         id: 'test.noop',
         name: 'Test: Noop',
-        actionGroups: [],
+        actionGroups: ['default'],
         async executor({ services, params, state }: AlertExecutorOptions) {},
       };
       server.plugins.alerting.setup.registerType(alwaysFiringAlertType);
diff --git a/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts b/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts
index 83863ef11c4c93..2d1685063f0bc3 100644
--- a/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts
@@ -178,6 +178,7 @@ export class AlertUtils {
     }
     const response = await request.send({
       enabled: true,
+      name: 'abc',
       interval: '1m',
       throttle: '1m',
       alertTypeId: 'test.always-firing',
diff --git a/x-pack/test/alerting_api_integration/common/lib/get_test_alert_data.ts b/x-pack/test/alerting_api_integration/common/lib/get_test_alert_data.ts
index de08a34b355488..ed6775a0fb9845 100644
--- a/x-pack/test/alerting_api_integration/common/lib/get_test_alert_data.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/get_test_alert_data.ts
@@ -7,6 +7,7 @@
 export function getTestAlertData(overwrites = {}) {
   return {
     enabled: true,
+    name: 'abc',
     alertTypeId: 'test.noop',
     interval: '10s',
     throttle: '1m',
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/find.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/find.ts
index d0780005635b34..1c6d5480e400f2 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/find.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/find.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { getUrlPrefix, ObjectRemover } from '../../../common/lib';
+import { getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
@@ -73,6 +73,7 @@ export default function findActionTests({ getService }: FtrProviderContext) {
                     config: {
                       unencrypted: `This value shouldn't get encrypted`,
                     },
+                    referencedByCount: 0,
                   },
                 ],
               });
@@ -133,6 +134,85 @@ export default function findActionTests({ getService }: FtrProviderContext) {
                     config: {
                       unencrypted: `This value shouldn't get encrypted`,
                     },
+                    referencedByCount: 0,
+                  },
+                ],
+              });
+              break;
+            default:
+              throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
+          }
+        });
+
+        it('should handle find request appropriately with proper referencedByCount', async () => {
+          const { body: createdAction } = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/action`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              description: 'My action',
+              actionTypeId: 'test.index-record',
+              config: {
+                unencrypted: `This value shouldn't get encrypted`,
+              },
+              secrets: {
+                encrypted: 'This value should be encrypted',
+              },
+            })
+            .expect(200);
+          objectRemover.add(space.id, createdAction.id, 'action');
+
+          const { body: createdAlert } = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/alert`)
+            .set('kbn-xsrf', 'foo')
+            .send(
+              getTestAlertData({
+                actions: [
+                  {
+                    group: 'default',
+                    id: createdAction.id,
+                    params: {},
+                  },
+                ],
+              })
+            )
+            .expect(200);
+          objectRemover.add(space.id, createdAlert.id, 'alert');
+
+          const response = await supertestWithoutAuth
+            .get(
+              `${getUrlPrefix(
+                space.id
+              )}/api/action/_find?filter=action.attributes.actionTypeId:test.index-record`
+            )
+            .auth(user.username, user.password);
+
+          switch (scenario.id) {
+            case 'no_kibana_privileges at space1':
+            case 'space_1_all at space2':
+              expect(response.statusCode).to.eql(404);
+              expect(response.body).to.eql({
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'Not Found',
+              });
+              break;
+            case 'global_read at space1':
+            case 'superuser at space1':
+            case 'space_1_all at space1':
+              expect(response.statusCode).to.eql(200);
+              expect(response.body).to.eql({
+                page: 1,
+                perPage: 20,
+                total: 1,
+                data: [
+                  {
+                    id: createdAction.id,
+                    description: 'My action',
+                    actionTypeId: 'test.index-record',
+                    config: {
+                      unencrypted: `This value shouldn't get encrypted`,
+                    },
+                    referencedByCount: 1,
                   },
                 ],
               });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts
index 4d4bdfa1558b63..21b27cfb6f8f85 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts
@@ -54,6 +54,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
               objectRemover.add(space.id, response.body.id, 'alert');
               expect(response.body).to.eql({
                 id: response.body.id,
+                name: 'abc',
                 actions: [],
                 enabled: true,
                 alertTypeId: 'test.noop',
@@ -171,10 +172,10 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
                 statusCode: 400,
                 error: 'Bad Request',
                 message:
-                  'child "alertTypeId" fails because ["alertTypeId" is required]. child "interval" fails because ["interval" is required]. child "alertTypeParams" fails because ["alertTypeParams" is required]. child "actions" fails because ["actions" is required]',
+                  'child "name" fails because ["name" is required]. child "alertTypeId" fails because ["alertTypeId" is required]. child "interval" fails because ["interval" is required]. child "alertTypeParams" fails because ["alertTypeParams" is required]. child "actions" fails because ["actions" is required]',
                 validation: {
                   source: 'payload',
-                  keys: ['alertTypeId', 'interval', 'alertTypeParams', 'actions'],
+                  keys: ['name', 'alertTypeId', 'interval', 'alertTypeParams', 'actions'],
                 },
               });
               break;
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/find.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/find.ts
index d8cf5327f63793..935ae3ed969153 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/find.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/find.ts
@@ -56,6 +56,7 @@ export default function createFindTests({ getService }: FtrProviderContext) {
               const match = response.body.data.find((obj: any) => obj.id === createdAlert.id);
               expect(match).to.eql({
                 id: createdAlert.id,
+                name: 'abc',
                 alertTypeId: 'test.noop',
                 interval: '10s',
                 enabled: true,
@@ -111,6 +112,7 @@ export default function createFindTests({ getService }: FtrProviderContext) {
               const match = response.body.data.find((obj: any) => obj.id === createdAlert.id);
               expect(match).to.eql({
                 id: createdAlert.id,
+                name: 'abc',
                 alertTypeId: 'test.noop',
                 interval: '10s',
                 enabled: true,
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get.ts
index a40fc0a9ac86e1..db798b0d8bc7c3 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get.ts
@@ -50,6 +50,7 @@ export default function createGetTests({ getService }: FtrProviderContext) {
               expect(response.statusCode).to.eql(200);
               expect(response.body).to.eql({
                 id: createdAlert.id,
+                name: 'abc',
                 alertTypeId: 'test.noop',
                 interval: '10s',
                 enabled: true,
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
index 5736b82dffec5f..ae5853eead7e7a 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
@@ -31,6 +31,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
           objectRemover.add(space.id, createdAlert.id, 'alert');
 
           const updatedData = {
+            name: 'bcd',
             alertTypeParams: {
               foo: true,
             },
@@ -89,6 +90,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
             .set('kbn-xsrf', 'foo')
             .auth(user.username, user.password)
             .send({
+              name: 'bcd',
               alertTypeParams: {
                 foo: true,
               },
@@ -134,6 +136,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
             .set('kbn-xsrf', 'foo')
             .auth(user.username, user.password)
             .send({
+              name: 'bcd',
               throttle: '1m',
               alertTypeId: '1',
               alertTypeParams: {
@@ -197,10 +200,10 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
                 statusCode: 400,
                 error: 'Bad Request',
                 message:
-                  'child "throttle" fails because ["throttle" is required]. child "interval" fails because ["interval" is required]. child "alertTypeParams" fails because ["alertTypeParams" is required]. child "actions" fails because ["actions" is required]',
+                  'child "throttle" fails because ["throttle" is required]. child "name" fails because ["name" is required]. child "interval" fails because ["interval" is required]. child "alertTypeParams" fails because ["alertTypeParams" is required]. child "actions" fails because ["actions" is required]',
                 validation: {
                   source: 'payload',
-                  keys: ['throttle', 'interval', 'alertTypeParams', 'actions'],
+                  keys: ['throttle', 'name', 'interval', 'alertTypeParams', 'actions'],
                 },
               });
               break;
@@ -229,6 +232,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
             .set('kbn-xsrf', 'foo')
             .auth(user.username, user.password)
             .send({
+              name: 'bcd',
               interval: '10s',
               throttle: '1m',
               alertTypeParams: {},
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
index a643bd8f9f64fc..af9804473a4489 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/index.ts
@@ -18,7 +18,11 @@ export default function alertingApiIntegrationTests({
   const spacesService: SpacesService = getService('spaces');
   const esArchiver = getService('esArchiver');
 
-  describe('alerting api integration security and spaces enabled', function() {
+  // FLAKY: https://github.com/elastic/kibana/issues/50079
+  // FLAKY: https://github.com/elastic/kibana/issues/50074
+  // FLAKY: https://github.com/elastic/kibana/issues/48709
+  // FLAKY: https://github.com/elastic/kibana/issues/50078
+  describe.skip('alerting api integration security and spaces enabled', function() {
     this.tags('ciGroup1');
 
     before(async () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/find.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/find.ts
index 3e61242344c2f5..20ea3f30443108 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/find.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/find.ts
@@ -52,6 +52,7 @@ export default function findActionTests({ getService }: FtrProviderContext) {
               config: {
                 unencrypted: `This value shouldn't get encrypted`,
               },
+              referencedByCount: 0,
             },
           ],
         });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts
index 10335633f5d28e..6ad6a54d3dccbf 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts
@@ -36,6 +36,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
       objectRemover.add(Spaces.space1.id, response.body.id, 'alert');
       expect(response.body).to.eql({
         id: response.body.id,
+        name: 'abc',
         actions: [],
         enabled: true,
         alertTypeId: 'test.noop',
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts
index 521befeb490471..97892e3a95d3ff 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts
@@ -39,6 +39,7 @@ export default function createFindTests({ getService }: FtrProviderContext) {
       const match = response.body.data.find((obj: any) => obj.id === createdAlert.id);
       expect(match).to.eql({
         id: createdAlert.id,
+        name: 'abc',
         alertTypeId: 'test.noop',
         interval: '10s',
         enabled: true,
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get.ts
index cd30b65cb180ee..391d78dda6647f 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get.ts
@@ -33,6 +33,7 @@ export default function createGetTests({ getService }: FtrProviderContext) {
       expect(response.statusCode).to.eql(200);
       expect(response.body).to.eql({
         id: createdAlert.id,
+        name: 'abc',
         alertTypeId: 'test.noop',
         interval: '10s',
         enabled: true,
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts
index d98f6b5cd830b3..b5d9d477f7c82c 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts
@@ -26,6 +26,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
       objectRemover.add(Spaces.space1.id, createdAlert.id, 'alert');
 
       const updatedData = {
+        name: 'bcd',
         alertTypeParams: {
           foo: true,
         },
@@ -63,6 +64,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
         .put(`${getUrlPrefix(Spaces.other.id)}/api/alert/${createdAlert.id}`)
         .set('kbn-xsrf', 'foo')
         .send({
+          name: 'bcd',
           alertTypeParams: {
             foo: true,
           },
diff --git a/x-pack/test/api_integration/apis/beats/assign_tags_to_beats.js b/x-pack/test/api_integration/apis/beats/assign_tags_to_beats.js
index 49a99b3bcdd939..27435d49c252fa 100644
--- a/x-pack/test/api_integration/apis/beats/assign_tags_to_beats.js
+++ b/x-pack/test/api_integration/apis/beats/assign_tags_to_beats.js
@@ -11,7 +11,7 @@ export default function ({ getService }) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
-  const chance = getService('chance');
+  const randomness = getService('randomness');
 
   describe('assign_tags_to_beats', () => {
     const archive = 'beats/list';
@@ -179,9 +179,8 @@ export default function ({ getService }) {
       expect(beat.tags).to.eql(['production']);
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/34038
-    it.skip('should return errors for non-existent beats', async () => {
-      const nonExistentBeatId = chance.word();
+    it('should return errors for non-existent beats', async () => {
+      const nonExistentBeatId = randomness.word();
 
       const { body: apiResponse } = await supertest
         .post('/api/beats/agents_tags/assignments')
@@ -197,7 +196,7 @@ export default function ({ getService }) {
     });
 
     it('should return errors for non-existent tags', async () => {
-      const nonExistentTag = chance.word();
+      const nonExistentTag = randomness.word();
 
       const { body: apiResponse } = await supertest
         .post('/api/beats/agents_tags/assignments')
@@ -221,8 +220,8 @@ export default function ({ getService }) {
     });
 
     it('should return errors for non-existent beats and tags', async () => {
-      const nonExistentBeatId = chance.word();
-      const nonExistentTag = chance.word();
+      const nonExistentBeatId = randomness.word();
+      const nonExistentTag = randomness.word();
 
       const { body: apiResponse } = await supertest
         .post('/api/beats/agents_tags/assignments')
diff --git a/x-pack/test/api_integration/apis/beats/enroll_beat.js b/x-pack/test/api_integration/apis/beats/enroll_beat.js
index b94af7215edf7e..4b4767e1d98497 100644
--- a/x-pack/test/api_integration/apis/beats/enroll_beat.js
+++ b/x-pack/test/api_integration/apis/beats/enroll_beat.js
@@ -11,7 +11,7 @@ import { ES_INDEX_NAME } from './constants';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const chance = getService('chance');
+  const randomness = getService('randomness');
   const es = getService('es');
 
   describe('enroll_beat', () => {
@@ -20,20 +20,20 @@ export default function ({ getService }) {
     let beat;
 
     beforeEach(async () => {
-      validEnrollmentToken = chance.word();
+      validEnrollmentToken = randomness.word();
 
-      beatId = chance.word();
+      beatId = randomness.word();
       const version =
-        chance.integer({ min: 1, max: 10 }) +
+        randomness.integer({ min: 1, max: 10 }) +
         '.' +
-        chance.integer({ min: 1, max: 10 }) +
+        randomness.integer({ min: 1, max: 10 }) +
         '.' +
-        chance.integer({ min: 1, max: 10 });
+        randomness.integer({ min: 1, max: 10 });
 
       beat = {
         type: 'filebeat',
         host_name: 'foo.bar.com',
-        name: chance.word(),
+        name: randomness.word(),
         version,
       };
 
@@ -94,7 +94,7 @@ export default function ({ getService }) {
       const { body: apiResponse } = await supertest
         .post(`/api/beats/agent/${beatId}`)
         .set('kbn-xsrf', 'xxx')
-        .set('kbn-beats-enrollment-token', chance.word())
+        .set('kbn-beats-enrollment-token', randomness.word())
         .send(beat)
         .expect(400);
 
diff --git a/x-pack/test/api_integration/apis/beats/remove_tags_from_beats.js b/x-pack/test/api_integration/apis/beats/remove_tags_from_beats.js
index 3e7c6ce8f48ffa..1548aff1182b33 100644
--- a/x-pack/test/api_integration/apis/beats/remove_tags_from_beats.js
+++ b/x-pack/test/api_integration/apis/beats/remove_tags_from_beats.js
@@ -11,7 +11,7 @@ export default function ({ getService }) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const es = getService('es');
-  const chance = getService('chance');
+  const randomness = getService('randomness');
 
   describe('remove_tags_from_beats', () => {
     const archive = 'beats/list';
@@ -135,7 +135,7 @@ export default function ({ getService }) {
     });
 
     it('should return errors for non-existent beats', async () => {
-      const nonExistentBeatId = chance.word();
+      const nonExistentBeatId = randomness.word();
 
       const { body: apiResponse } = await supertest
         .post('/api/beats/agents_tags/removals')
@@ -151,7 +151,7 @@ export default function ({ getService }) {
     });
 
     it('should return errors for non-existent tags', async () => {
-      const nonExistentTag = chance.word();
+      const nonExistentTag = randomness.word();
 
       const { body: apiResponse } = await supertest
         .post('/api/beats/agents_tags/removals')
@@ -175,8 +175,8 @@ export default function ({ getService }) {
     });
 
     it('should return errors for non-existent beats and tags', async () => {
-      const nonExistentBeatId = chance.word();
-      const nonExistentTag = chance.word();
+      const nonExistentBeatId = randomness.word();
+      const nonExistentTag = randomness.word();
 
       const { body: apiResponse } = await supertest
         .post('/api/beats/agents_tags/removals')
diff --git a/x-pack/test/api_integration/apis/beats/set_config.js b/x-pack/test/api_integration/apis/beats/set_config.js
index a4d7d491d4778e..5e15145cf47c8e 100644
--- a/x-pack/test/api_integration/apis/beats/set_config.js
+++ b/x-pack/test/api_integration/apis/beats/set_config.js
@@ -9,7 +9,6 @@ import { ES_INDEX_NAME } from './constants';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  // const chance = getService('chance');
   const es = getService('es');
   const esArchiver = getService('esArchiver');
 
diff --git a/x-pack/test/api_integration/apis/beats/update_beat.js b/x-pack/test/api_integration/apis/beats/update_beat.js
index 090668aff925c8..228d651a590e6e 100644
--- a/x-pack/test/api_integration/apis/beats/update_beat.js
+++ b/x-pack/test/api_integration/apis/beats/update_beat.js
@@ -10,7 +10,7 @@ import moment from 'moment';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const chance = getService('chance');
+  const randomness = getService('randomness');
   const es = getService('es');
   const esArchiver = getService('esArchiver');
 
@@ -27,18 +27,18 @@ export default function ({ getService }) {
         'SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI';
 
       const version =
-        chance.integer({ min: 1, max: 10 }) +
+        randomness.integer({ min: 1, max: 10 }) +
         '.' +
-        chance.integer({ min: 1, max: 10 }) +
+        randomness.integer({ min: 1, max: 10 }) +
         '.' +
-        chance.integer({ min: 1, max: 10 });
+        randomness.integer({ min: 1, max: 10 });
 
       beat = {
-        type: `${chance.word()}beat`,
-        host_name: `www.${chance.word()}.net`,
-        name: chance.word(),
+        type: `${randomness.word()}beat`,
+        host_name: `www.${randomness.word()}.net`,
+        name: randomness.word(),
         version,
-        ephemeral_id: chance.word(),
+        ephemeral_id: randomness.word(),
       };
 
       await es.index({
@@ -90,7 +90,7 @@ export default function ({ getService }) {
       const { body } = await supertest
         .put(`/api/beats/agent/${beatId}`)
         .set('kbn-xsrf', 'xxx')
-        .set('kbn-beats-access-token', chance.word())
+        .set('kbn-beats-access-token', randomness.word())
         .send(beat)
         .expect(401);
 
@@ -109,7 +109,7 @@ export default function ({ getService }) {
     });
 
     it('should return an error for a non-existent beat', async () => {
-      const beatId = chance.word();
+      const beatId = randomness.word();
       const { body } = await supertest
         .put(`/api/beats/agent/${beatId}`)
         .set('kbn-xsrf', 'xxx')
diff --git a/x-pack/test/api_integration/apis/code/feature_controls.ts b/x-pack/test/api_integration/apis/code/feature_controls.ts
deleted file mode 100644
index a96b3074e4f813..00000000000000
--- a/x-pack/test/api_integration/apis/code/feature_controls.ts
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { SecurityService, SpacesService } from '../../../common/services';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function featureControlsTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertestWithoutAuth');
-  const security: SecurityService = getService('security');
-  const spaces: SpacesService = getService('spaces');
-
-  const expect404 = (result: any) => {
-    expect(result.error).to.be(undefined);
-    expect(result.response).not.to.be(undefined);
-    expect(result.response).to.have.property('statusCode', 404);
-  };
-
-  const expect200 = (result: any) => {
-    expect(result.error).to.be(undefined);
-    expect(result.response).not.to.be(undefined);
-    expect(result.response).to.have.property('statusCode', 200);
-  };
-
-  const endpoints = [
-    {
-      // List all repositories.
-      url: `/api/code/repos`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-    },
-    {
-      // Get one repository.
-      url: `/api/code/repo/github.com/elastic/code-examples_empty-file`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-      isRepoApi: true,
-    },
-    {
-      // Get the status of one repository.
-      url: `/api/code/repo/status/github.com/elastic/code-examples_empty-file`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-      isRepoApi: true,
-    },
-    {
-      // Get all language server installation status.
-      url: `/api/code/install`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-    },
-    // Search and suggestion APIs.
-    {
-      url: `/api/code/search/repo?q=starter`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-    },
-    {
-      url: `/api/code/suggestions/repo?q=starter`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-    },
-    {
-      url: `/api/code/search/doc?q=starter`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-    },
-    {
-      url: `/api/code/suggestions/doc?q=starter`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-    },
-    {
-      url: `/api/code/search/symbol?q=starter`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-    },
-    {
-      url: `/api/code/suggestions/symbol?q=starter`,
-      expectForbidden: expect404,
-      expectResponse: expect200,
-    },
-  ];
-
-  async function executeRequest(
-    endpoint: string,
-    username: string,
-    password: string,
-    spaceId?: string
-  ) {
-    const basePath = spaceId ? `/s/${spaceId}` : '';
-
-    return await supertest
-      .get(`${basePath}${endpoint}`)
-      .auth(username, password)
-      .set('kbn-xsrf', 'foo')
-      .then((response: any) => ({ error: undefined, response }))
-      .catch((error: any) => ({ error, response: undefined }));
-  }
-
-  async function executeRequests(
-    username: string,
-    password: string,
-    spaceId: string,
-    expectation: 'forbidden' | 'response',
-    skipRepoApi: boolean = false
-  ) {
-    for (const endpoint of endpoints) {
-      if (skipRepoApi && endpoint.isRepoApi === true) {
-        continue;
-      }
-      const result = await executeRequest(endpoint.url, username, password, spaceId);
-      if (expectation === 'forbidden') {
-        endpoint.expectForbidden(result);
-      } else {
-        endpoint.expectResponse(result);
-      }
-    }
-  }
-
-  describe('feature controls', () => {
-    const codeAdminUsername = 'code_admin_user';
-    const codeAdminRoleName = 'code_admin_role';
-    const codeAdminUserPassword = `${codeAdminUsername}-password`;
-
-    before(async () => {
-      await security.role.create(codeAdminRoleName, {
-        kibana: [
-          {
-            feature: {
-              // Grant all permission to Code app as an admin user.
-              code: ['all'],
-            },
-            spaces: ['*'],
-          },
-        ],
-      });
-
-      // Import a repository first
-      await security.user.create(codeAdminUsername, {
-        password: codeAdminUserPassword,
-        roles: [codeAdminRoleName],
-        full_name: 'Code admin user',
-      });
-
-      await supertest
-        .post(`/api/code/repo`)
-        .auth(codeAdminUsername, codeAdminUserPassword)
-        .set('kbn-xsrf', 'foo')
-        .send({ url: 'https://github.com/elastic/code-examples_empty-file.git' })
-        .expect(200);
-    });
-
-    after(async () => {
-      // Delete the repository
-      await supertest
-        .delete(`/api/code/repo/github.com/elastic/code-examples_empty-file`)
-        .auth(codeAdminUsername, codeAdminUserPassword)
-        .set('kbn-xsrf', 'foo')
-        .expect(200);
-
-      await security.role.delete(codeAdminRoleName);
-      await security.user.delete(codeAdminUsername);
-    });
-
-    it(`Non admin Code user cannot execute delete without all permission`, async () => {
-      const username = 'logstash_read';
-      const roleName = 'logstash_read';
-      const password = `${username}-password`;
-      try {
-        await security.role.create(roleName, {
-          kibana: [
-            {
-              feature: {
-                // Grant read only permission to Code app as an non-admin user.
-                code: ['read'],
-              },
-              spaces: ['*'],
-            },
-          ],
-        });
-
-        await security.user.create(username, {
-          password,
-          roles: [roleName],
-          full_name: 'a kibana user',
-        });
-
-        await supertest
-          .delete(`/api/code/repo/github.com/elastic/code-examples_empty-file`)
-          .auth(username, password)
-          .set('kbn-xsrf', 'foo')
-          .expect(404);
-      } finally {
-        await security.role.delete(roleName);
-        await security.user.delete(username);
-      }
-    });
-
-    it(`Admin Code user can execute clone/delete with all permission`, async () => {
-      const username = 'another_code_admin_user';
-      const roleName = 'another_code_admin_role';
-      const password = `${username}-password`;
-      try {
-        await security.role.create(roleName, {
-          kibana: [
-            {
-              feature: {
-                // Grant all permission to Code app as an admin user.
-                code: ['all'],
-              },
-              spaces: ['*'],
-            },
-          ],
-        });
-
-        await security.user.create(username, {
-          password,
-          roles: [roleName],
-          full_name: 'Code admin user',
-        });
-
-        // Clone repository
-        await supertest
-          .post(`/api/code/repo`)
-          .auth(username, password)
-          .set('kbn-xsrf', 'foo')
-          .send({ url: 'https://github.com/elastic/code-examples_single-image.git' })
-          .expect(200);
-
-        // Delete repository
-        await supertest
-          .delete(`/api/code/repo/github.com/elastic/code-examples_single-image`)
-          .auth(username, password)
-          .set('kbn-xsrf', 'foo')
-          .expect(200);
-      } finally {
-        await security.role.delete(roleName);
-        await security.user.delete(username);
-      }
-    });
-
-    it(`APIs can't be accessed by .code-* read privileges role`, async () => {
-      const username = 'logstash_read';
-      const roleName = 'logstash_read';
-      const password = `${username}-password`;
-      try {
-        await security.role.create(roleName, {});
-
-        await security.user.create(username, {
-          password,
-          roles: [roleName],
-          full_name: 'a kibana user',
-        });
-
-        await executeRequests(username, password, '', 'forbidden');
-      } finally {
-        await security.role.delete(roleName);
-        await security.user.delete(username);
-      }
-    });
-
-    it(`APIs can be accessed global all with .code-* read privileges role`, async () => {
-      const username = 'global_all';
-      const roleName = 'global_all';
-      const password = `${username}-password`;
-      try {
-        await security.role.create(roleName, {
-          kibana: [
-            {
-              base: ['all'],
-              spaces: ['*'],
-            },
-          ],
-        });
-
-        await security.user.create(username, {
-          password,
-          roles: [roleName],
-          full_name: 'a kibana user',
-        });
-
-        await executeRequests(username, password, '', 'response');
-      } finally {
-        await security.role.delete(roleName);
-        await security.user.delete(username);
-      }
-    });
-
-    it(`APIs can't be accessed by dashboard all with .code-* read privileges role`, async () => {
-      const username = 'dashboard_all';
-      const roleName = 'dashboard_all';
-      const password = `${username}-password`;
-      try {
-        await security.role.create(roleName, {
-          kibana: [
-            {
-              feature: {
-                dashboard: ['all'],
-              },
-              spaces: ['*'],
-            },
-          ],
-        });
-
-        await security.user.create(username, {
-          password,
-          roles: [roleName],
-          full_name: 'a kibana user',
-        });
-
-        await executeRequests(username, password, '', 'forbidden');
-      } finally {
-        await security.role.delete(roleName);
-        await security.user.delete(username);
-      }
-    });
-
-    describe('spaces', () => {
-      // the following tests create a user_1 which has Code read access to space_1 and dashboard all access to space_2
-      const space1Id = 'space_1';
-      const space2Id = 'space_2';
-
-      const roleName = 'user_1';
-      const username = 'user_1';
-      const password = 'user_1-password';
-
-      before(async () => {
-        await spaces.create({
-          id: space1Id,
-          name: space1Id,
-          disabledFeatures: [],
-        });
-        await spaces.create({
-          id: space2Id,
-          name: space2Id,
-          disabledFeatures: [],
-        });
-        await security.role.create(roleName, {
-          kibana: [
-            {
-              feature: {
-                code: ['read'],
-              },
-              spaces: ['default'],
-            },
-            {
-              feature: {
-                code: ['read'],
-              },
-              spaces: [space1Id],
-            },
-            {
-              feature: {
-                dashboard: ['all'],
-              },
-              spaces: [space2Id],
-            },
-          ],
-        });
-        await security.user.create(username, {
-          password,
-          roles: [roleName],
-        });
-      });
-
-      after(async () => {
-        await spaces.delete(space1Id);
-        await spaces.delete(space2Id);
-        await security.role.delete(roleName);
-        await security.user.delete(username);
-      });
-
-      it('user_1 can access all APIs in default space', async () => {
-        await executeRequests(username, password, '', 'response');
-      });
-
-      it('user_1 can access code admin APIs in space_1', async () => {
-        await executeRequests(username, password, space1Id, 'response', true);
-      });
-
-      it(`user_1 cannot access APIs in space_2`, async () => {
-        await executeRequests(username, password, space2Id, 'forbidden');
-      });
-    });
-  });
-}
diff --git a/x-pack/test/api_integration/apis/code/index.ts b/x-pack/test/api_integration/apis/code/index.ts
deleted file mode 100644
index 68f15c318a72d2..00000000000000
--- a/x-pack/test/api_integration/apis/code/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function apmApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
-  describe('Code', () => {
-    loadTestFile(require.resolve('./feature_controls'));
-    loadTestFile(require.resolve('./repo_status'));
-  });
-}
diff --git a/x-pack/test/api_integration/apis/code/repo_status.ts b/x-pack/test/api_integration/apis/code/repo_status.ts
deleted file mode 100644
index f730ebdf9bc66c..00000000000000
--- a/x-pack/test/api_integration/apis/code/repo_status.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import {
-  RepoFileStatus,
-  StatusReport,
-} from '../../../../legacy/plugins/code/common/repo_file_status';
-
-export default function repoStatusTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const retry = getService('retry');
-  const log = getService('log');
-
-  const CLONE_API = '/api/code/repo';
-  const DELETE_API = '/api/code/repo';
-  const REPO_STATUS_API = '/api/code/repo/status';
-  const TEST_REPO = 'github.com/elastic/TypeScript-Node-Starter';
-  const TEST_REPO_URL = `https://${TEST_REPO}.git`;
-
-  // FLAKY: https://github.com/elastic/kibana/issues/41336
-  describe.skip('repo status', () => {
-    after(async () => {
-      await supertest
-        .delete(`${DELETE_API}/${TEST_REPO}`)
-        .set('kbn-xsrf', 'xxx')
-        .expect(200);
-    });
-
-    async function getStatus(revision: string, path: string): Promise<StatusReport> {
-      const api = `/api/code/repo/${TEST_REPO}/status/${revision}/${path}`;
-      const { body } = await supertest.get(api).expect(200);
-      return body as StatusReport;
-    }
-
-    it('', async () => {
-      {
-        // send a clone request
-        const response = await supertest
-          .post(CLONE_API)
-          .set('kbn-xsrf', 'xxx')
-          .send({ url: TEST_REPO_URL })
-          .expect(200);
-        expect(response.body).to.eql({
-          uri: TEST_REPO,
-          url: TEST_REPO_URL,
-          name: 'TypeScript-Node-Starter',
-          org: 'elastic',
-          protocol: 'https',
-        });
-      }
-      log.info('cloning');
-      await retry.tryForTime(60000, async () => {
-        const { body } = await supertest.get(`${REPO_STATUS_API}/${TEST_REPO}`).expect(200);
-        log.info('clone progress:' + body.gitStatus.progress);
-        expect(body.gitStatus).to.have.property('progress', 100);
-      });
-      log.info('indexing');
-      let sawInitializing = false;
-      await retry.tryForTime(60000, async () => {
-        const { body } = await supertest.get(`${REPO_STATUS_API}/${TEST_REPO}`).expect(200);
-        expect(body.indexStatus).to.have.property('progress');
-        if (body.indexStatus.progress === 0 && !sawInitializing) {
-          const status = await getStatus('master', 'src/app.ts');
-          expect(status.langServerStatus).to.be(RepoFileStatus.LANG_SERVER_IS_INITIALIZING);
-          sawInitializing = true;
-        }
-        expect(sawInitializing).to.be(true);
-        // indexing
-        if (body.progress < 100) {
-          const status = getStatus('master', '');
-          expect(status).to.have.property('repoStatus', RepoFileStatus.INDEXING);
-        }
-        expect(body.indexStatus.progress).to.be(100);
-        log.info('index done');
-        const status = await getStatus('master', '');
-        expect(status.repoStatus).not.to.be(RepoFileStatus.INDEXING);
-      });
-      {
-        const status = await getStatus('46971a8454761f1a11d8fde4d96ff8d29bc4e754', '');
-        expect(status.repoStatus).to.be(RepoFileStatus.REVISION_NOT_INDEXED);
-      }
-      {
-        const status = await getStatus('master', 'README.md');
-        expect(status.fileStatus).to.be(RepoFileStatus.FILE_NOT_SUPPORTED);
-      }
-    });
-  });
-}
diff --git a/x-pack/test/api_integration/apis/features/features/features.ts b/x-pack/test/api_integration/apis/features/features/features.ts
index fb17c76cb6bc8d..ef0f0451ee058c 100644
--- a/x-pack/test/api_integration/apis/features/features/features.ts
+++ b/x-pack/test/api_integration/apis/features/features/features.ts
@@ -110,7 +110,6 @@ export default function({ getService }: FtrProviderContext) {
             'ml',
             'apm',
             'canvas',
-            'code',
             'infrastructure',
             'logs',
             'maps',
diff --git a/x-pack/test/api_integration/apis/index.js b/x-pack/test/api_integration/apis/index.js
index 583690ad3d2878..86ef4458990390 100644
--- a/x-pack/test/api_integration/apis/index.js
+++ b/x-pack/test/api_integration/apis/index.js
@@ -25,7 +25,6 @@ export default function ({ loadTestFile }) {
     loadTestFile(require.resolve('./maps'));
     loadTestFile(require.resolve('./apm'));
     loadTestFile(require.resolve('./siem'));
-    loadTestFile(require.resolve('./code'));
     loadTestFile(require.resolve('./short_urls'));
     loadTestFile(require.resolve('./lens'));
   });
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/ccr_shard.json b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/ccr_shard.json
index a8aab6bddc1e7f..abdf105c02c4be 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/ccr_shard.json
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/ccr_shard.json
@@ -2,7 +2,7 @@
   "formattedLeader": "leader",
   "metrics": {
     "ccr_sync_lag_time": [{
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "timeRange": {
         "min": 1537315200000,
         "max": 1537401599000
@@ -22,7 +22,7 @@
       "data": []
     }],
     "ccr_sync_lag_ops": [{
-      "bucket_size": "10 min",
+      "bucket_size": "10 mins",
       "timeRange": {
         "min": 1537315200000,
         "max": 1537401599000
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json
index a791c2b2b7419d..ddd8d8c9a1de66 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json
@@ -51,7 +51,6 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "isOnCloud": false,
     "liveClusterUuid": null
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats.json
index 3ce2f20415b5f2..fcde71551a4f37 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats.json
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats.json
@@ -60,7 +60,6 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "isOnCloud": false,
     "liveClusterUuid": null
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats_management.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats_management.json
index a64e2f40b33dc9..9186006415759e 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats_management.json
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_beats_management.json
@@ -51,7 +51,6 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "isOnCloud": false,
     "liveClusterUuid": null
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash.json
index cc870216d405bd..7311230d108e98 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash.json
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash.json
@@ -51,7 +51,6 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "isOnCloud": false,
     "liveClusterUuid": null
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash_management.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash_management.json
index cc870216d405bd..7311230d108e98 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash_management.json
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_logstash_management.json
@@ -51,7 +51,6 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "isOnCloud": false,
     "liveClusterUuid": null
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_exclusive_mb.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_exclusive_mb.json
index 4ae753aca52251..69688bc46c27eb 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_exclusive_mb.json
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_exclusive_mb.json
@@ -71,7 +71,6 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "isOnCloud": false,
     "liveClusterUuid": null
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_mb.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_mb.json
index 6935060b4d5f7e..8b207b418dae74 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_mb.json
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/es_and_kibana_mb.json
@@ -71,7 +71,6 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "isOnCloud": false,
     "liveClusterUuid": null
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_exclusive_mb.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_exclusive_mb.json
index 161ce32e8ff5f3..319844a7e093d9 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_exclusive_mb.json
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_exclusive_mb.json
@@ -71,7 +71,6 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "isOnCloud": false,
     "liveClusterUuid": null
   }
 }
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_mb.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_mb.json
index b93edacd82b310..f65436ce28616d 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_mb.json
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/kibana_mb.json
@@ -71,7 +71,6 @@
   },
   "_meta": {
     "secondsAgo": 30,
-    "isOnCloud": false,
     "liveClusterUuid": null
   }
 }
diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts
index 846d5cbdf4e1a9..d4c8a3e68c50ed 100644
--- a/x-pack/test/api_integration/apis/security/privileges.ts
+++ b/x-pack/test/api_integration/apis/security/privileges.ts
@@ -37,7 +37,6 @@ export default function({ getService }: FtrProviderContext) {
               uptime: ['all', 'read'],
               apm: ['all', 'read'],
               siem: ['all', 'read'],
-              code: ['all', 'read'],
             },
             global: ['all', 'read'],
             space: ['all', 'read'],
diff --git a/x-pack/test/api_integration/apis/siem/events_over_time.ts b/x-pack/test/api_integration/apis/siem/events_over_time.ts
index 253dbbab77c3cd..10b81734b7b79e 100644
--- a/x-pack/test/api_integration/apis/siem/events_over_time.ts
+++ b/x-pack/test/api_integration/apis/siem/events_over_time.ts
@@ -29,7 +29,6 @@ export default function({ getService }: FtrProviderContext) {
                 interval: '12h',
                 to: TO,
                 from: FROM,
-                timezone: 'America/Denver',
               },
               defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
               inspect: false,
@@ -70,7 +69,6 @@ export default function({ getService }: FtrProviderContext) {
                 interval: '12h',
                 to: TO,
                 from: FROM,
-                timezone: 'America/Denver',
               },
               defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
               inspect: false,
diff --git a/x-pack/test/api_integration/apis/telemetry/index.js b/x-pack/test/api_integration/apis/telemetry/index.js
index d941cda9e3faea..6f794d56ae713a 100644
--- a/x-pack/test/api_integration/apis/telemetry/index.js
+++ b/x-pack/test/api_integration/apis/telemetry/index.js
@@ -8,5 +8,6 @@ export default function ({ loadTestFile }) {
   describe('Telemetry', () => {
     loadTestFile(require.resolve('./telemetry'));
     loadTestFile(require.resolve('./telemetry_local'));
+    loadTestFile(require.resolve('./opt_in'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/telemetry/opt_in.ts b/x-pack/test/api_integration/apis/telemetry/opt_in.ts
new file mode 100644
index 00000000000000..d2ad2d773d6924
--- /dev/null
+++ b/x-pack/test/api_integration/apis/telemetry/opt_in.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function optInTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
+
+  describe('/api/telemetry/v2/optIn API', () => {
+    let kibanaVersion: any;
+
+    before(async () => {
+      const kibanaVersionAccessor = kibanaServer.version;
+      kibanaVersion = await kibanaVersionAccessor.get();
+
+      expect(typeof kibanaVersion).to.eql('string');
+      expect(kibanaVersion.length).to.be.greaterThan(0);
+    });
+
+    it('should support sending false', async () => {
+      await postTelemetryV2Optin(supertest, false, 200);
+      const { enabled, lastVersionChecked } = await getSavedObjectAttributes(supertest);
+      expect(enabled).to.be(false);
+      expect(lastVersionChecked).to.be(kibanaVersion);
+    });
+
+    it('should support sending true', async () => {
+      await postTelemetryV2Optin(supertest, true, 200);
+      const { enabled, lastVersionChecked } = await getSavedObjectAttributes(supertest);
+      expect(enabled).to.be(true);
+      expect(lastVersionChecked).to.be(kibanaVersion);
+    });
+
+    it('should not support sending null', async () => {
+      await postTelemetryV2Optin(supertest, null, 400);
+    });
+
+    it('should not support sending junk', async () => {
+      await postTelemetryV2Optin(supertest, 42, 400);
+    });
+  });
+}
+
+async function postTelemetryV2Optin(supertest: any, value: any, statusCode: number): Promise<any> {
+  const { body } = await supertest
+    .post('/api/telemetry/v2/optIn')
+    .set('kbn-xsrf', 'xxx')
+    .send({ enabled: value })
+    .expect(statusCode);
+
+  return body;
+}
+
+async function getSavedObjectAttributes(supertest: any): Promise<any> {
+  const { body } = await supertest.get('/api/saved_objects/telemetry/telemetry').expect(200);
+  return body.attributes;
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_charts.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_charts.json
index f5368ad7ecf0c5..dbfc17a4687964 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_charts.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_charts.json
@@ -103,6 +103,10 @@
           {
             "x": 1568173204510,
             "y": null
+          },
+          {
+            "x": 1568173227311,
+            "y": 24627
           }
         ]
       }
@@ -257,6 +261,12 @@
         "up": null,
         "down": null,
         "total": 0
+      },
+      {
+        "x": 1568173227311,
+        "up": null,
+        "down": null,
+        "total": 1
       }
     ],
     "statusMaxCount": 0,
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram.json
index c12ec7f3847c39..cf88ccae9cb99b 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram.json
@@ -1,179 +1,188 @@
 {
-  "histogram": [
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172680087,
-      "x0": 1568172657286,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172702888,
-      "x0": 1568172680087,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172725689,
-      "x0": 1568172702888,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568172748490,
-      "x0": 1568172725689,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172771291,
-      "x0": 1568172748490,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172794092,
-      "x0": 1568172771291,
-      "y": 1
-    },
-    {
-      "upCount": 92,
-      "downCount": 8,
-      "x": 1568172816893,
-      "x0": 1568172794092,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568172839694,
-      "x0": 1568172816893,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172862495,
-      "x0": 1568172839694,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172885296,
-      "x0": 1568172862495,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172908097,
-      "x0": 1568172885296,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568172930898,
-      "x0": 1568172908097,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172953699,
-      "x0": 1568172930898,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172976500,
-      "x0": 1568172953699,
-      "y": 1
-    },
-    {
-      "upCount": 92,
-      "downCount": 8,
-      "x": 1568172999301,
-      "x0": 1568172976500,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568173022102,
-      "x0": 1568172999301,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173044903,
-      "x0": 1568173022102,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173067704,
-      "x0": 1568173044903,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173090505,
-      "x0": 1568173067704,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568173113306,
-      "x0": 1568173090505,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173136107,
-      "x0": 1568173113306,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173158908,
-      "x0": 1568173136107,
-      "y": 1
-    },
-    {
-      "upCount": 92,
-      "downCount": 8,
-      "x": 1568173181709,
-      "x0": 1568173158908,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173204510,
-      "x0": 1568173181709,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568173227311,
-      "x0": 1568173204510,
-      "y": 1
-    }
-  ]
+  "queryResult": {
+    "histogram": [
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172657286,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172680087,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172702888,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172725689,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172748490,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172771291,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 92,
+        "downCount": 8,
+        "x": 1568172794092,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172816893,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172839694,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172862495,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172885296,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172908097,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172930898,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172953699,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 92,
+        "downCount": 8,
+        "x": 1568172976500,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172999301,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173022102,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173044903,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173067704,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568173090505,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173113306,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173136107,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 92,
+        "downCount": 8,
+        "x": 1568173158908,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173181709,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568173204510,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173227311,
+        "x0": null,
+        "y": 1
+      }
+    ]
+  }
 }
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_filter.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_filter.json
index f61a101ce44629..383d4acd963402 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_filter.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_filter.json
@@ -1,179 +1,188 @@
 {
-  "histogram": [
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172680087,
-      "x0": 1568172657286,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172702888,
-      "x0": 1568172680087,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172725689,
-      "x0": 1568172702888,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568172748490,
-      "x0": 1568172725689,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172771291,
-      "x0": 1568172748490,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172794092,
-      "x0": 1568172771291,
-      "y": 1
-    },
-    {
-      "upCount": 92,
-      "downCount": 0,
-      "x": 1568172816893,
-      "x0": 1568172794092,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568172839694,
-      "x0": 1568172816893,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172862495,
-      "x0": 1568172839694,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172885296,
-      "x0": 1568172862495,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172908097,
-      "x0": 1568172885296,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568172930898,
-      "x0": 1568172908097,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172953699,
-      "x0": 1568172930898,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568172976500,
-      "x0": 1568172953699,
-      "y": 1
-    },
-    {
-      "upCount": 92,
-      "downCount": 0,
-      "x": 1568172999301,
-      "x0": 1568172976500,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568173022102,
-      "x0": 1568172999301,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568173044903,
-      "x0": 1568173022102,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568173067704,
-      "x0": 1568173044903,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568173090505,
-      "x0": 1568173067704,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568173113306,
-      "x0": 1568173090505,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568173136107,
-      "x0": 1568173113306,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568173158908,
-      "x0": 1568173136107,
-      "y": 1
-    },
-    {
-      "upCount": 92,
-      "downCount": 0,
-      "x": 1568173181709,
-      "x0": 1568173158908,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 0,
-      "x": 1568173204510,
-      "x0": 1568173181709,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568173227311,
-      "x0": 1568173204510,
-      "y": 1
-    }
-  ]
+  "queryResult": {
+    "histogram": [
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172657286,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172680087,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172702888,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172725689,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172748490,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172771291,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 92,
+        "downCount": 0,
+        "x": 1568172794092,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172816893,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172839694,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172862495,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172885296,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172908097,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172930898,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568172953699,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 92,
+        "downCount": 0,
+        "x": 1568172976500,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172999301,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568173022102,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568173044903,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568173067704,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568173090505,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568173113306,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568173136107,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 92,
+        "downCount": 0,
+        "x": 1568173158908,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568173181709,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568173204510,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 0,
+        "x": 1568173227311,
+        "x0": null,
+        "y": 1
+      }
+    ]
+  }
 }
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_id.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_id.json
index c12ec7f3847c39..cf88ccae9cb99b 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_id.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_id.json
@@ -1,179 +1,188 @@
 {
-  "histogram": [
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172680087,
-      "x0": 1568172657286,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172702888,
-      "x0": 1568172680087,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172725689,
-      "x0": 1568172702888,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568172748490,
-      "x0": 1568172725689,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172771291,
-      "x0": 1568172748490,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172794092,
-      "x0": 1568172771291,
-      "y": 1
-    },
-    {
-      "upCount": 92,
-      "downCount": 8,
-      "x": 1568172816893,
-      "x0": 1568172794092,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568172839694,
-      "x0": 1568172816893,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172862495,
-      "x0": 1568172839694,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172885296,
-      "x0": 1568172862495,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172908097,
-      "x0": 1568172885296,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568172930898,
-      "x0": 1568172908097,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172953699,
-      "x0": 1568172930898,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568172976500,
-      "x0": 1568172953699,
-      "y": 1
-    },
-    {
-      "upCount": 92,
-      "downCount": 8,
-      "x": 1568172999301,
-      "x0": 1568172976500,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568173022102,
-      "x0": 1568172999301,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173044903,
-      "x0": 1568173022102,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173067704,
-      "x0": 1568173044903,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173090505,
-      "x0": 1568173067704,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568173113306,
-      "x0": 1568173090505,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173136107,
-      "x0": 1568173113306,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173158908,
-      "x0": 1568173136107,
-      "y": 1
-    },
-    {
-      "upCount": 92,
-      "downCount": 8,
-      "x": 1568173181709,
-      "x0": 1568173158908,
-      "y": 1
-    },
-    {
-      "upCount": 93,
-      "downCount": 7,
-      "x": 1568173204510,
-      "x0": 1568173181709,
-      "y": 1
-    },
-    {
-      "upCount": 0,
-      "downCount": 0,
-      "x": 1568173227311,
-      "x0": 1568173204510,
-      "y": 1
-    }
-  ]
+  "queryResult": {
+    "histogram": [
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172657286,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172680087,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172702888,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172725689,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172748490,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172771291,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 92,
+        "downCount": 8,
+        "x": 1568172794092,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172816893,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172839694,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172862495,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172885296,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172908097,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172930898,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568172953699,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 92,
+        "downCount": 8,
+        "x": 1568172976500,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568172999301,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173022102,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173044903,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173067704,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568173090505,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173113306,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173136107,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 92,
+        "downCount": 8,
+        "x": 1568173158908,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173181709,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 0,
+        "downCount": 0,
+        "x": 1568173204510,
+        "x0": null,
+        "y": 1
+      },
+      {
+        "upCount": 93,
+        "downCount": 7,
+        "x": 1568173227311,
+        "x0": null,
+        "y": 1
+      }
+    ]
+  }
 }
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts b/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts
index 7af9de99d8327c..02fd3fd630d4b2 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts
@@ -7,6 +7,7 @@
 import { snapshotHistogramQueryString } from '../../../../../legacy/plugins/uptime/public/queries/snapshot_histogram_query';
 import { expectFixtureEql } from './helpers/expect_fixture_eql';
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import { assertCloseTo } from '../../../../../legacy/plugins/uptime/server/lib/helper';
 
 export default function({ getService }: FtrProviderContext) {
   describe('snapshotHistogram', () => {
@@ -31,6 +32,10 @@ export default function({ getService }: FtrProviderContext) {
         .post('/api/uptime/graphql')
         .set('kbn-xsrf', 'foo')
         .send({ ...getSnapshotHistogramQuery });
+      // manually testing this value and then removing it to avoid flakiness
+      const { interval } = data.queryResult;
+      assertCloseTo(interval, 22801, 100);
+      delete data.queryResult.interval;
       expectFixtureEql(data, 'snapshot_histogram');
     });
 
@@ -50,6 +55,9 @@ export default function({ getService }: FtrProviderContext) {
         .post('/api/uptime/graphql')
         .set('kbn-xsrf', 'foo')
         .send({ ...getSnapshotHistogramQuery });
+      const { interval } = data.queryResult;
+      assertCloseTo(interval, 22801, 100);
+      delete data.queryResult.interval;
       expectFixtureEql(data, 'snapshot_histogram_by_id');
     });
 
@@ -71,6 +79,9 @@ export default function({ getService }: FtrProviderContext) {
         .post('/api/uptime/graphql')
         .set('kbn-xsrf', 'foo')
         .send({ ...getSnapshotHistogramQuery });
+      const { interval } = data.queryResult;
+      assertCloseTo(interval, 22801, 100);
+      delete data.queryResult.interval;
       expectFixtureEql(data, 'snapshot_histogram_by_filter');
     });
   });
diff --git a/x-pack/test/api_integration/services/index.ts b/x-pack/test/api_integration/services/index.ts
index 00ba2a6b3acfee..7e3b747c81993a 100644
--- a/x-pack/test/api_integration/services/index.ts
+++ b/x-pack/test/api_integration/services/index.ts
@@ -25,14 +25,11 @@ import { SiemGraphQLClientProvider, SiemGraphQLClientFactoryProvider } from './s
 import { InfraOpsSourceConfigurationProvider } from './infraops_source_configuration';
 
 export const services = {
-  chance: kibanaApiIntegrationServices.chance,
+  ...kibanaCommonServices,
+
   esSupertest: kibanaApiIntegrationServices.esSupertest,
   supertest: kibanaApiIntegrationServices.supertest,
 
-  esArchiver: kibanaCommonServices.esArchiver,
-  kibanaServer: kibanaCommonServices.kibanaServer,
-  retry: kibanaCommonServices.retry,
-
   es: LegacyEsProvider,
   esSupertestWithoutAuth: EsSupertestWithoutAuthProvider,
   infraOpsGraphQLClient: InfraOpsGraphQLClientProvider,
diff --git a/x-pack/test/functional/apps/code/code_intelligence.ts b/x-pack/test/functional/apps/code/code_intelligence.ts
deleted file mode 100644
index 012a349d6a882b..00000000000000
--- a/x-pack/test/functional/apps/code/code_intelligence.ts
+++ /dev/null
@@ -1,230 +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 { REPO_ROOT } from '@kbn/dev-utils';
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { load as repoLoad, unload as repoUnload } from './repo_archiver';
-
-export default function codeIntelligenceFunctionalTests({
-  getService,
-  getPageObjects,
-}: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const log = getService('log');
-  const browser = getService('browser');
-  const find = getService('find');
-  const config = getService('config');
-  const FIND_TIME = config.get('timeouts.find');
-  const PageObjects = getPageObjects(['common', 'header', 'security', 'code', 'home']);
-
-  const exists = async (selector: string) =>
-    await testSubjects.exists(selector, { allowHidden: true });
-
-  // FLAKY: https://github.com/elastic/kibana/issues/45094
-  describe.skip('Code Intelligence', () => {
-    describe('Code intelligence in source view page', () => {
-      const repositoryListSelector = 'codeRepositoryList > codeRepositoryItem';
-      const testGoToDefinition = async () => {
-        await retry.try(async () => {
-          expect(await exists('codeSourceViewer')).to.be(true);
-        });
-
-        // Hover on the 'UserModel' reference on line 5.
-        await retry.tryForTime(300000, async () => {
-          const spans = await find.allByCssSelector('.mtk32', FIND_TIME);
-          expect(spans.length).to.greaterThan(1);
-          const userModelSpan = spans[1];
-          expect(await userModelSpan.getVisibleText()).to.equal('UserModel');
-          await userModelSpan.moveMouseTo();
-          // Expect the go to definition button show up eventually.
-          expect(await exists('codeGoToDefinitionButton')).to.be(true);
-
-          await testSubjects.click('codeGoToDefinitionButton');
-          await retry.tryForTime(5000, async () => {
-            const currentUrl: string = await browser.getCurrentUrl();
-            log.info(`Jump to url: ${currentUrl}`);
-            // Expect to jump to src/models/User.ts file on line 5.
-            expect(currentUrl.indexOf('src/models/User.ts!L5:13')).to.greaterThan(0);
-          });
-        });
-      };
-      const testGoToDefinitionFromRoot = async () => {
-        log.debug('Hover on a reference and jump to definition across file');
-
-        // Visit the /src/controllers/user.ts file
-        // Wait the file tree to be rendered and click the 'src' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-Directory-src');
-
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src/controllers')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-Directory-src/controllers');
-        // Then the 'controllers' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-File-src/controllers/user.ts')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-File-src/controllers/user.ts');
-        // Then the 'user.ts' file on the file tree.
-        await testGoToDefinition();
-      };
-
-      before(async () => {
-        await repoLoad(
-          'github.com/elastic/TypeScript-Node-Starter',
-          'typescript_node_starter',
-          config.get('kbnTestServer.installDir') || REPO_ROOT
-        );
-        await esArchiver.load('code/repositories/typescript_node_starter');
-      });
-
-      after(async () => {
-        await PageObjects.security.forceLogout();
-        await esArchiver.unload('code/repositories/typescript_node_starter');
-        await repoUnload(
-          'github.com/elastic/TypeScript-Node-Starter',
-          config.get('kbnTestServer.installDir') || REPO_ROOT
-        );
-      });
-
-      beforeEach(async () => {
-        // Navigate to the code app.
-        await PageObjects.common.navigateToApp('code');
-        await PageObjects.header.waitUntilLoadingHasFinished();
-
-        // Enter the first repository from the admin page.
-        await testSubjects.click(repositoryListSelector);
-      });
-
-      it('Hover on a reference and jump to definition across file', async () => {
-        await testGoToDefinitionFromRoot();
-
-        // can go back and go to definition again
-        await browser.goBack();
-        await testGoToDefinition();
-      });
-
-      it('Find references and jump to reference', async () => {
-        log.debug('Find references and jump to reference');
-
-        // Visit the /src/models/User.ts file
-        // Wait the file tree to be rendered and click the 'src' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-Directory-src');
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src/models')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-Directory-src/models');
-        // Then the 'models' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-File-src/models/User.ts')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-File-src/models/User.ts');
-        // Then the 'User.ts' file on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeSourceViewer')).to.be(true);
-        });
-
-        // Hover on the 'UserModel' reference on line 5.
-        await retry.tryForTime(300000, async () => {
-          const spans = await find.allByCssSelector('.mtk32', FIND_TIME);
-          expect(spans.length).to.greaterThan(1);
-          const userModelSpan = spans[0];
-          expect(await userModelSpan.getVisibleText()).to.equal('UserModel');
-          await userModelSpan.moveMouseTo();
-          // Expect the go to definition button show up eventually.
-          expect(await exists('codeFindReferenceButton')).to.be(true);
-
-          await testSubjects.click('codeFindReferenceButton');
-          await retry.tryForTime(5000, async () => {
-            // Expect the find references panel show up and having highlights.
-            const highlightSpans = await find.allByCssSelector('.codeSearch__highlight', FIND_TIME);
-            expect(highlightSpans.length).to.greaterThan(0);
-            const firstReference = highlightSpans[0];
-            await firstReference.click();
-            const currentUrl: string = await browser.getCurrentUrl();
-            log.info(`Jump to url: ${currentUrl}`);
-            // Expect to jump to src/controllers/user.ts file on line 42.
-            expect(currentUrl.indexOf('src/controllers/user.ts!L42:0')).to.greaterThan(0);
-          });
-        });
-      });
-
-      it('Hover on a reference and jump to a different repository', async () => {
-        log.debug('Hover on a reference and jump to a different repository');
-
-        // Visit the /src/controllers/user.ts file
-        // Wait the file tree to be rendered and click the 'src' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-Directory-src');
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src/controllers')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-Directory-src/controllers');
-        // Then the 'controllers' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-File-src/controllers/user.ts')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-File-src/controllers/user.ts');
-        // Then the 'user.ts' file on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeSourceViewer')).to.be(true);
-        });
-
-        // Hover on the 'async' reference on line 1.
-        await retry.tryForTime(300000, async () => {
-          const spans = await find.allByCssSelector('.mtk9', FIND_TIME);
-          expect(spans.length).to.greaterThan(1);
-          const asyncSpan = spans[1];
-          expect(await asyncSpan.getVisibleText()).to.equal('async');
-          await asyncSpan.moveMouseTo();
-          // Expect the go to definition button show up eventually.
-          expect(await exists('codeGoToDefinitionButton')).to.be(true);
-
-          await testSubjects.click('codeGoToDefinitionButton');
-          // TODO: figure out why jenkins will fail the following test while locally it
-          // passes.
-          // await retry.tryForTime(5000, async () => {
-          //   const currentUrl: string = await browser.getCurrentUrl();
-          //   log.error(`Jump to url: ${currentUrl}`);
-          //   // Expect to jump to repository github.com/DefinitelyTyped/DefinitelyTyped.
-          //   expect(currentUrl.indexOf('github.com/DefinitelyTyped/DefinitelyTyped')).to.greaterThan(
-          //     0
-          //   );
-          // });
-
-          // it should goes back to controllers/user.ts
-          // await browser.goBack();
-
-          // await retry.try(async () => {
-          //   const $spans = await find.allByCssSelector('.mtk32', FIND_TIME);
-          //   expect($spans.length).to.greaterThan(1);
-          //   const $userModelSpan = $spans[1];
-          //   expect(await $userModelSpan.getVisibleText()).to.equal('UserModel');
-          // });
-        });
-      });
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/code/explore_repository.ts b/x-pack/test/functional/apps/code/explore_repository.ts
deleted file mode 100644
index 3103e56ab6a908..00000000000000
--- a/x-pack/test/functional/apps/code/explore_repository.ts
+++ /dev/null
@@ -1,337 +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 { REPO_ROOT } from '@kbn/dev-utils';
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { load as repoLoad, unload as repoUnload } from './repo_archiver';
-
-export default function exploreRepositoryFunctionalTests({
-  getService,
-  getPageObjects,
-}: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const browser = getService('browser');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const log = getService('log');
-  const find = getService('find');
-  const config = getService('config');
-  const PageObjects = getPageObjects(['common', 'header', 'security', 'code', 'home']);
-
-  const exists = async (selector: string) =>
-    await testSubjects.exists(selector, { allowHidden: true });
-
-  const FIND_TIME = config.get('timeouts.find');
-
-  // FLAKY: https://github.com/elastic/kibana/issues/41338
-  describe.skip('Explore Repository', function() {
-    this.tags('smoke');
-    describe('Explore a repository', () => {
-      const repositoryListSelector = 'codeRepositoryList > codeRepositoryItem';
-
-      before(async () => {
-        await repoLoad(
-          'github.com/elastic/TypeScript-Node-Starter',
-          'typescript_node_starter',
-          config.get('kbnTestServer.installDir') || REPO_ROOT
-        );
-        await esArchiver.load('code/repositories/typescript_node_starter');
-      });
-
-      after(async () => {
-        await PageObjects.security.forceLogout();
-        await esArchiver.unload('code/repositories/typescript_node_starter');
-        await repoUnload(
-          'github.com/elastic/TypeScript-Node-Starter',
-          config.get('kbnTestServer.installDir') || REPO_ROOT
-        );
-      });
-
-      beforeEach(async () => {
-        // Navigate to the code app.
-        await PageObjects.common.navigateToApp('code');
-        await PageObjects.header.waitUntilLoadingHasFinished();
-
-        // Enter the first repository from the admin page.
-        await testSubjects.click(repositoryListSelector);
-      });
-
-      afterEach(async () => {
-        // Navigate to the code app.
-        await PageObjects.common.navigateToApp('code');
-        await PageObjects.header.waitUntilLoadingHasFinished();
-
-        // Enter the first repository from the admin page.
-        await testSubjects.click(repositoryListSelector);
-      });
-
-      it('open a file that does not exists should load tree', async () => {
-        // open a file that does not exists
-        const url = `${PageObjects.common.getHostPort()}/app/code#/github.com/elastic/TypeScript-Node-Starter/tree/master/I_DO_NOT_EXIST`;
-        await browser.get(url);
-        await PageObjects.header.awaitKibanaChrome();
-
-        await retry.try(async () => {
-          const currentUrl: string = await browser.getCurrentUrl();
-          expect(
-            currentUrl.indexOf(
-              'github.com/elastic/TypeScript-Node-Starter/tree/master/I_DO_NOT_EXIST'
-            )
-          ).to.greaterThan(0);
-        });
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src')).ok();
-          expect(await exists('codeFileTreeNode-Directory-src-doc')).ok();
-          expect(await exists('codeFileTreeNode-Directory-test')).ok();
-          expect(await exists('codeFileTreeNode-Directory-views')).ok();
-          expect(await exists('codeFileTreeNode-File-package.json')).ok();
-        });
-      });
-
-      it('tree should be loaded', async () => {
-        await retry.tryForTime(5000, async () => {
-          expect(await exists('codeFileTreeNode-Directory-src')).ok();
-          expect(await exists('codeFileTreeNode-Directory-src-doc')).ok();
-          expect(await exists('codeFileTreeNode-Directory-test')).ok();
-          expect(await exists('codeFileTreeNode-Directory-views')).ok();
-          expect(await exists('codeFileTreeNode-File-package.json')).ok();
-        });
-      });
-
-      it('Click file/directory on the file tree', async () => {
-        log.debug('Click a file in the source tree');
-        // Wait the file tree to be rendered and click the 'src' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-Directory-src');
-
-        await retry.tryForTime(1000, async () => {
-          // should only open one folder at this time
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-open')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-doc-closed')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-test-closed')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-views-closed')).ok();
-        });
-        log.info('src folder opened');
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src/models')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-Directory-src/models');
-        // Then the 'models' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-File-src/models/User.ts')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileTreeNode-File-src/models/User.ts');
-        // Then the 'User.ts' file on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeSourceViewer')).to.be(true);
-        });
-
-        // Click breadcrumb does not affect file tree
-        await retry.try(async () => {
-          expect(await exists('codeFileBreadcrumb-src')).ok();
-        });
-        await testSubjects.click('codeFileBreadcrumb-src');
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-open')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-doc-closed')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-test-closed')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-views-closed')).ok();
-        });
-
-        // open another folder
-        await testSubjects.click('codeFileTreeNode-Directory-src-doc');
-        await retry.tryForTime(5000, async () => {
-          // now we should opened two folders
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-open')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-doc-open')).ok();
-        });
-
-        // click src again to focus on this folder and close this folder.
-        await testSubjects.click('codeFileTreeNode-Directory-src');
-
-        await retry.tryForTime(5000, async () => {
-          // should only close src folder
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-closed')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-doc-open')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-test-closed')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-views-closed')).ok();
-        });
-        log.info('src folder closed');
-      });
-
-      it.skip('highlight only one symbol', async () => {
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src')).ok();
-        });
-        await testSubjects.click('codeFileTreeNode-Directory-src');
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-src/controllers')).ok();
-        });
-        await testSubjects.click('codeFileTreeNode-Directory-src/controllers');
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-File-src/controllers/user.ts')).ok();
-        });
-        await testSubjects.click('codeFileTreeNode-File-src/controllers/user.ts');
-        await retry.try(async () => {
-          expect(await exists('codeStructureTreeTab')).ok();
-        });
-
-        await retry.try(async () => {
-          // Retry click the structure tab in case it's not ready yet
-          await testSubjects.click('codeStructureTreeTab');
-          expect(await exists('codeStructureTreeNode-errors')).ok();
-        });
-        await testSubjects.click('codeStructureTreeNode-errors');
-
-        await retry.try(async () => {
-          const highlightSymbols = await find.allByCssSelector('.code-full-width-node', FIND_TIME);
-          expect(highlightSymbols).to.have.length(1);
-        });
-      });
-
-      it('click a breadcrumb should not affect the file tree', async () => {
-        log.debug('it goes to a deep node of file tree');
-        const url = `${PageObjects.common.getHostPort()}/app/code#/github.com/elastic/TypeScript-Node-Starter/blob/master/src/models/User.ts`;
-        await browser.get(url);
-        await PageObjects.header.awaitKibanaChrome();
-
-        // Click breadcrumb does not affect file tree
-        await retry.try(async () => {
-          expect(await exists('codeFileBreadcrumb-src')).ok();
-        });
-        await testSubjects.click('codeFileBreadcrumb-src');
-        await retry.try(async () => {
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-open')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-src-doc-closed')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-test-closed')).ok();
-          expect(await exists('codeFileTreeNode-Directory-Icon-views-closed')).ok();
-        });
-      });
-
-      it('Click file/directory on the right panel', async () => {
-        log.debug('Click file/directory on the right panel');
-
-        // Wait the file tree to be rendered and click the 'src' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileExplorerNode-src')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileExplorerNode-src');
-        await retry.try(async () => {
-          expect(await exists('codeFileExplorerNode-models')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileExplorerNode-models');
-        // Then the 'models' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileExplorerNode-User.ts')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileExplorerNode-User.ts');
-        // Then the 'User.ts' file on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeSourceViewer')).to.be(true);
-        });
-      });
-
-      it.skip('Navigate source file via structure tree', async () => {
-        log.debug('Navigate source file via structure tree');
-        // Wait the file tree to be rendered and click the 'src' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileExplorerNode-src')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileExplorerNode-src');
-        await retry.try(async () => {
-          expect(await exists('codeFileExplorerNode-models')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileExplorerNode-models');
-        // Then the 'models' folder on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeFileExplorerNode-User.ts')).to.be(true);
-        });
-
-        await testSubjects.click('codeFileExplorerNode-User.ts');
-        // Then the 'User.ts' file on the file tree.
-        await retry.try(async () => {
-          expect(await exists('codeSourceViewer')).to.be(true);
-          expect(await exists('codeStructureTreeTab')).to.be(true);
-        });
-
-        // Click the structure tree tab
-        await testSubjects.clickWhenNotDisabled('codeStructureTreeTab');
-        await retry.tryForTime(300000, async () => {
-          expect(await exists('codeStructureTreeNode-User')).to.be(true);
-
-          await testSubjects.click('codeStructureTreeNode-User');
-          await retry.tryForTime(120000, async () => {
-            const currentUrl: string = await browser.getCurrentUrl();
-            log.info(`Jump to url: ${currentUrl}`);
-            expect(currentUrl.indexOf('src/models/User.ts!L92:6') > 0).to.be(true);
-          });
-        });
-      });
-
-      it('goes to a repository which does not exist should render the 404 error page', async () => {
-        log.debug('it goes to a repository which does not exist');
-        const notExistRepoUri = 'github.com/I_DO_NOT_EXIST/I_DO_NOT_EXIST';
-        const url = `${PageObjects.common.getHostPort()}/app/code#/${notExistRepoUri}`;
-        await browser.get(url);
-        await PageObjects.header.awaitKibanaChrome();
-
-        await retry.try(async () => {
-          const currentUrl: string = await browser.getCurrentUrl();
-          // should redirect to main page
-          expect(currentUrl.indexOf(`${notExistRepoUri}/tree/master`)).to.greaterThan(0);
-        });
-        await retry.tryForTime(5000, async () => {
-          expect(await exists('codeNotFoundErrorPage')).ok();
-        });
-      });
-
-      it('goes to a branch of a project', async () => {
-        log.debug('it goes to a branch of the repo');
-        await retry.try(async () => {
-          expect(exists('codeBranchSelector'));
-        });
-        await testSubjects.click('codeBranchSelector');
-        const branch = 'addAzure';
-        const branchOptionSelector = `codeBranchSelectOption-${branch}`;
-        await retry.try(async () => {
-          expect(exists(branchOptionSelector));
-        });
-        await testSubjects.click(branchOptionSelector);
-        await retry.try(async () => {
-          const currentUrl: string = await browser.getCurrentUrl();
-          expect(currentUrl.indexOf(branch.replace(/\//g, ':'))).to.greaterThan(0);
-          expect(exists(`codeBranchSelectOption-${branch}Active`)).to.be.ok();
-        });
-        await retry.try(async () => {
-          expect(exists('codeBranchSelector'));
-        });
-        await testSubjects.click('codeBranchSelector');
-        const anotherBranch = 'noDatabase';
-        const anotherBranchOptionSelector = `codeBranchSelectOption-${anotherBranch}`;
-        await retry.try(async () => {
-          expect(exists(anotherBranchOptionSelector));
-        });
-        await testSubjects.click(anotherBranchOptionSelector);
-        await retry.try(async () => {
-          const currentUrl: string = await browser.getCurrentUrl();
-          expect(currentUrl.indexOf(anotherBranch.replace(/\//g, ':'))).to.greaterThan(0);
-          expect(exists(`codeBranchSelectOption-${anotherBranch}Active`)).to.be.ok();
-        });
-      });
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/code/file_tree.ts b/x-pack/test/functional/apps/code/file_tree.ts
deleted file mode 100644
index 6fa56610b77f63..00000000000000
--- a/x-pack/test/functional/apps/code/file_tree.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { REPO_ROOT } from '@kbn/dev-utils';
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { load as repoLoad, unload as repoUnload } from './repo_archiver';
-
-export default function exploreRepositoryFunctionalTests({
-  getService,
-  getPageObjects,
-}: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const browser = getService('browser');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const config = getService('config');
-  const PageObjects = getPageObjects(['common', 'header', 'security', 'code', 'home']);
-  const exists = async (selector: string) =>
-    await testSubjects.exists(selector, { allowHidden: true });
-
-  // FLAKY: https://github.com/elastic/kibana/issues/48048
-  describe.skip('File Tree', function() {
-    this.tags('smoke');
-    const repositoryListSelector = 'codeRepositoryList > codeRepositoryItem';
-
-    before(async () => {
-      await repoLoad(
-        'github.com/elastic/code-examples_flatten-directory',
-        'code_examples_flatten_directory',
-        config.get('kbnTestServer.installDir') || REPO_ROOT
-      );
-      await esArchiver.load('code/repositories/code_examples_flatten_directory');
-    });
-
-    beforeEach(async () => {
-      // Navigate to the code app.
-      await PageObjects.common.navigateToApp('code');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-
-      // Enter the first repository from the admin page.
-      await testSubjects.click(repositoryListSelector);
-    });
-
-    after(async () => {
-      await PageObjects.security.forceLogout();
-      await repoUnload(
-        'github.com/elastic/code-examples_flatten-directory',
-        config.get('kbnTestServer.installDir') || REPO_ROOT
-      );
-      await esArchiver.unload('code/repositories/code_examples_flatten_directory');
-    });
-
-    it('tree should be loaded', async () => {
-      await retry.tryForTime(5000, async () => {
-        expect(await exists('codeFileTreeNode-Directory-elastic/src/code')).ok();
-        expect(await exists('codeFileTreeNode-Directory-kibana/src/code')).ok();
-        expect(await exists('codeFileTreeNode-File-README.MD')).ok();
-      });
-    });
-
-    it('Click file/directory on the file tree', async () => {
-      await testSubjects.click('codeFileTreeNode-Directory-elastic/src/code');
-
-      await retry.tryForTime(1000, async () => {
-        // should only open one folder at this time
-        expect(await exists('codeFileTreeNode-Directory-Icon-elastic/src/code-open')).ok();
-        expect(await exists('codeFileTreeNode-Directory-Icon-kibana/src/code-closed')).ok();
-      });
-
-      await browser.refresh();
-
-      await PageObjects.header.awaitKibanaChrome();
-
-      await testSubjects.waitForDeleted('.euiLoadingSpinner');
-
-      await retry.tryForTime(30000, async () => {
-        // should only open one folder at this time
-        expect(await exists('codeFileTreeNode-Directory-Icon-elastic/src/code-open')).ok();
-        expect(await exists('codeFileTreeNode-Directory-Icon-kibana/src/code-closed')).ok();
-      });
-
-      await testSubjects.click('codeFileTreeNode-Directory-kibana/src/code');
-
-      await retry.tryForTime(1000, async () => {
-        // should open two folders at this time
-        expect(await exists('codeFileTreeNode-Directory-Icon-elastic/src/code-open')).ok();
-        expect(await exists('codeFileTreeNode-Directory-Icon-kibana/src/code-open')).ok();
-      });
-
-      await testSubjects.click('codeFileTreeNode-Directory-elastic/src/code');
-
-      await retry.tryForTime(1000, async () => {
-        // should only open one folder at this time
-        expect(await exists('codeFileTreeNode-Directory-Icon-elastic/src/code-closed')).ok();
-        expect(await exists('codeFileTreeNode-Directory-Icon-kibana/src/code-open')).ok();
-      });
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/code/fixtures/code_examples_flatten_directory.zip b/x-pack/test/functional/apps/code/fixtures/code_examples_flatten_directory.zip
deleted file mode 100644
index 7b5a4806ee1cb1..00000000000000
Binary files a/x-pack/test/functional/apps/code/fixtures/code_examples_flatten_directory.zip and /dev/null differ
diff --git a/x-pack/test/functional/apps/code/fixtures/typescript_node_starter.zip b/x-pack/test/functional/apps/code/fixtures/typescript_node_starter.zip
deleted file mode 100644
index 628b23a44296e2..00000000000000
Binary files a/x-pack/test/functional/apps/code/fixtures/typescript_node_starter.zip and /dev/null differ
diff --git a/x-pack/test/functional/apps/code/history.ts b/x-pack/test/functional/apps/code/history.ts
deleted file mode 100644
index a0442d1e3fb2e5..00000000000000
--- a/x-pack/test/functional/apps/code/history.ts
+++ /dev/null
@@ -1,247 +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 { REPO_ROOT } from '@kbn/dev-utils';
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { load as repoLoad, unload as repoUnload } from './repo_archiver';
-
-export default function manageRepositoriesFunctionalTests({
-  getService,
-  getPageObjects,
-}: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const log = getService('log');
-  const browser = getService('browser');
-  const queryBar = getService('queryBar');
-  const config = getService('config');
-  const FIND_TIME = config.get('timeouts.find');
-  const find = getService('find');
-  const PageObjects = getPageObjects(['common', 'header', 'security', 'code', 'home']);
-
-  const existsInvisible = async (selector: string) =>
-    await testSubjects.exists(selector, { allowHidden: true });
-
-  // FLAKY: https://github.com/elastic/kibana/issues/46313
-  describe.skip('History', function() {
-    this.tags('smoke');
-    const repositoryListSelector = 'codeRepositoryList > codeRepositoryItem';
-
-    describe('browser history can go back while exploring code app', () => {
-      before(async () => {
-        await repoLoad(
-          'github.com/elastic/TypeScript-Node-Starter',
-          'typescript_node_starter',
-          config.get('kbnTestServer.installDir') || REPO_ROOT
-        );
-        await esArchiver.load('code/repositories/typescript_node_starter');
-
-        // Navigate to the code app.
-        await PageObjects.common.navigateToApp('code');
-        await PageObjects.header.waitUntilLoadingHasFinished();
-      });
-
-      after(async () => {
-        await PageObjects.security.forceLogout();
-        await esArchiver.unload('code/repositories/typescript_node_starter');
-        await repoUnload(
-          'github.com/elastic/TypeScript-Node-Starter',
-          config.get('kbnTestServer.installDir') || REPO_ROOT
-        );
-      });
-
-      it('from admin page to source view page can go back and forward', async () => {
-        await retry.tryForTime(300000, async () => {
-          const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-          expect(repositoryItems).to.have.length(1);
-          expect(await repositoryItems[0].getVisibleText()).to.equal(
-            'elastic/TypeScript-Node-Starter'
-          );
-        });
-
-        await retry.try(async () => {
-          expect(await testSubjects.exists('repositoryIndexDone')).to.be(true);
-
-          log.debug('it goes to elastic/TypeScript-Node-Starter project page');
-          await testSubjects.click('adminLinkToTypeScript-Node-Starter');
-          await retry.try(async () => {
-            expect(await testSubjects.exists('codeStructureTreeTab')).to.be(true);
-          });
-
-          // can go back to admin page
-          await browser.goBack();
-
-          await retry.tryForTime(300000, async () => {
-            const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-            expect(repositoryItems).to.have.length(1);
-            expect(await repositoryItems[0].getVisibleText()).to.equal(
-              'elastic/TypeScript-Node-Starter'
-            );
-          });
-
-          // can go forward to source view page
-          await browser.goForward();
-
-          await retry.try(async () => {
-            expect(await testSubjects.exists('codeStructureTreeTab')).to.be(true);
-          });
-        });
-      });
-
-      it('from source view page to search page can go back and forward', async () => {
-        log.debug('it search a symbol');
-        await queryBar.setQuery('user');
-        await queryBar.submitQuery();
-        await retry.try(async () => {
-          const searchResultListSelector = 'codeSearchResultList codeSearchResultFileItem';
-          const results = await testSubjects.findAll(searchResultListSelector);
-          expect(results).to.be.ok();
-        });
-        log.debug('it goes back to project page');
-        await browser.goBack();
-        retry.try(async () => {
-          expect(await testSubjects.exists('codeStructureTreeTab')).to.be(true);
-        });
-
-        await browser.goForward();
-
-        await retry.try(async () => {
-          const searchResultListSelector = 'codeSearchResultList codeSearchResultFileItem';
-          const results = await testSubjects.findAll(searchResultListSelector);
-          expect(results).to.be.ok();
-        });
-      });
-
-      it('in search page, change language filters can go back and forward', async () => {
-        log.debug('it select typescript language filter');
-        const url = `${PageObjects.common.getHostPort()}/app/code#/search?q=string&langs=typescript`;
-        await browser.get(url);
-
-        await PageObjects.header.awaitKibanaChrome();
-
-        await retry.tryForTime(300000, async () => {
-          const language = await (await find.byCssSelector(
-            '.euiFacetButton--isSelected'
-          )).getVisibleText();
-
-          expect(language.indexOf('typescript')).to.equal(0);
-        });
-
-        const unselectedFilter = (await find.allByCssSelector('.euiFacetButton--unSelected'))[1];
-        await unselectedFilter.click();
-
-        await retry.try(async () => {
-          const l = await (await find.allByCssSelector(
-            '.euiFacetButton--isSelected'
-          ))[1].getVisibleText();
-
-          expect(l.indexOf('javascript')).to.equal(0);
-        });
-
-        await browser.goBack();
-
-        await retry.try(async () => {
-          const lang = await (await find.byCssSelector(
-            '.euiFacetButton--isSelected'
-          )).getVisibleText();
-
-          expect(lang.indexOf('typescript')).to.equal(0);
-        });
-
-        await browser.goForward();
-
-        await retry.try(async () => {
-          const filter = await (await find.allByCssSelector(
-            '.euiFacetButton--isSelected'
-          ))[1].getVisibleText();
-
-          expect(filter.indexOf('javascript')).to.equal(0);
-        });
-      });
-
-      it('in source view page file line number changed can go back and forward', async () => {
-        log.debug('it goes back after line number changed');
-        const url = `${PageObjects.common.getHostPort()}/app/code#/github.com/elastic/TypeScript-Node-Starter`;
-        await browser.get(url);
-        await PageObjects.header.awaitKibanaChrome();
-
-        const lineNumber = 20;
-        await retry.try(async () => {
-          const existence = await existsInvisible('codeFileTreeNode-File-tsconfig.json');
-          expect(existence).to.be(true);
-        });
-        await testSubjects.click('codeFileTreeNode-File-tsconfig.json');
-        await retry.try(async () => {
-          const existence = await existsInvisible('codeFileTreeNode-File-package.json');
-          expect(existence).to.be(true);
-        });
-        await testSubjects.click('codeFileTreeNode-File-package.json');
-
-        await retry.try(async () => {
-          const currentUrl: string = await browser.getCurrentUrl();
-          // click line number should stay in the same file
-          expect(currentUrl.indexOf('package.json')).greaterThan(0);
-        });
-
-        const lineNumberElements = await find.allByCssSelector('.line-numbers');
-        await lineNumberElements[lineNumber].click();
-
-        await retry.try(async () => {
-          const existence = await find.existsByCssSelector('.code-line-number-21', FIND_TIME);
-          expect(existence).to.be(true);
-        });
-
-        await browser.goBack();
-
-        await retry.try(async () => {
-          const existence = await find.existsByCssSelector('.code-line-number-21', FIND_TIME);
-          expect(existence).to.be(false);
-        });
-
-        await browser.goForward();
-
-        await retry.try(async () => {
-          const existence = await find.existsByCssSelector('.code-line-number-21', FIND_TIME);
-          expect(existence).to.be(true);
-        });
-      });
-
-      it('in source view page, switch side tab can go back and forward', async () => {
-        log.debug('it goes back after line number changed');
-        const url = `${PageObjects.common.getHostPort()}/app/code#/github.com/elastic/TypeScript-Node-Starter/blob/master/src/controllers/api.ts`;
-        await browser.get(url);
-        // refresh so language server will be initialized.
-        await browser.refresh();
-
-        await PageObjects.header.awaitKibanaChrome();
-
-        // wait for tab is not disabled
-        await PageObjects.common.sleep(5000);
-        await testSubjects.click('codeStructureTreeTab');
-        await retry.try(async () => {
-          // if structure tree tab is active, file tree tab's `data-test-subj` would be `codeFileTreeTab`
-          expect(testSubjects.exists('codeFileTreeTab')).to.be.ok();
-        });
-
-        await browser.goBack();
-
-        await retry.try(async () => {
-          // if file tree tab is active, file tree tab's `data-test-subj` would be `codeFileTreeTabActive`
-          expect(testSubjects.exists('codeFileTreeTabActive')).to.be.ok();
-        });
-
-        await browser.goForward();
-
-        await retry.try(async () => {
-          // if structure tree tab is active, file tree tab's `data-test-subj` would be `codeFileTreeTab`
-          expect(testSubjects.exists('codeFileTreeTab')).to.be.ok();
-        });
-      });
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/code/index.ts b/x-pack/test/functional/apps/code/index.ts
deleted file mode 100644
index a08d715f3ac7e7..00000000000000
--- a/x-pack/test/functional/apps/code/index.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 { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function codeApp({ loadTestFile }: FtrProviderContext) {
-  describe('Code', function codeAppTestSuite() {
-    // Add 'skipCloud' regarding issue: https://github.com/elastic/kibana/issues/39386
-    this.tags(['ciGroup2', 'skipCloud']);
-    loadTestFile(require.resolve('./lang_server_coverage'));
-    loadTestFile(require.resolve('./manage_repositories'));
-    loadTestFile(require.resolve('./search'));
-    loadTestFile(require.resolve('./explore_repository'));
-    loadTestFile(require.resolve('./code_intelligence'));
-    loadTestFile(require.resolve('./history'));
-    loadTestFile(require.resolve('./file_tree'));
-    loadTestFile(require.resolve('./with_security'));
-  });
-}
diff --git a/x-pack/test/functional/apps/code/lang_server_coverage.ts b/x-pack/test/functional/apps/code/lang_server_coverage.ts
deleted file mode 100644
index 791a0b2c0bf449..00000000000000
--- a/x-pack/test/functional/apps/code/lang_server_coverage.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function langServerCoverageFunctionalTests({
-  getService,
-  getPageObjects,
-}: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const esSupertest = getService('esSupertest');
-  const PageObjects = getPageObjects(['common', 'header', 'security', 'code', 'home']);
-
-  // Use https://github.com/elastic/code-examples_smoke repository to smoke test
-  // all language servers.
-  // FLAKY: https://github.com/elastic/kibana/issues/44576
-  describe.skip('Lang Server Coverage', () => {
-    const repositoryListSelector = 'codeRepositoryList codeRepositoryItem';
-    before(async () => {
-      // Navigate to the code app.
-      await PageObjects.common.navigateToApp('code');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-
-      // Prepare a git repository for the test
-      await PageObjects.code.fillImportRepositoryUrlInputBox(
-        'https://github.com/elastic/code-examples_smoke'
-      );
-      // Click the import repository button.
-      await PageObjects.code.clickImportRepositoryButton();
-
-      await retry.tryForTime(300000, async () => {
-        const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-        expect(repositoryItems).to.have.length(1);
-        expect(await repositoryItems[0].getVisibleText()).to.equal('elastic/code-examples_smoke');
-
-        // Wait for the index to start.
-        await retry.try(async () => {
-          expect(await testSubjects.exists('repositoryIndexOngoing')).to.be(true);
-        });
-        // Wait for the index to end.
-        await retry.try(async () => {
-          expect(await testSubjects.exists('repositoryIndexDone')).to.be(true);
-        });
-      });
-    });
-
-    after(async () => {
-      // Navigate to the code app.
-      await PageObjects.common.navigateToApp('code');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-
-      // Clean up the imported repository
-      await PageObjects.code.clickDeleteRepositoryButton();
-      await retry.try(async () => {
-        expect(await testSubjects.exists('confirmModalConfirmButton')).to.be(true);
-      });
-
-      await testSubjects.click('confirmModalConfirmButton');
-
-      await retry.tryForTime(300000, async () => {
-        const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-        expect(repositoryItems).to.have.length(0);
-      });
-      await retry.tryForTime(300000, async () => {
-        const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-        expect(repositoryItems).to.have.length(0);
-      });
-
-      await PageObjects.security.forceLogout();
-    });
-
-    it('Verify the symbol/referernces object counts in Elasticsearch', async () => {
-      // Make sure the indexes exist.
-      await esSupertest
-        .head('/.code-symbol-github.com-elastic-code-examples_smoke-19c9057c-1')
-        .expect(200);
-      await esSupertest
-        .head('/.code-reference-github.com-elastic-code-examples_smoke-19c9057c-1')
-        .expect(200);
-
-      const symbolLangAggs = await esSupertest
-        .post('/.code-symbol-github.com-elastic-code-examples_smoke-19c9057c-1/_search')
-        .send({
-          query: {
-            match_all: {},
-          },
-          aggs: {
-            language: {
-              terms: {
-                script: {
-                  // Aggregate results based on the source file's extension.
-                  source:
-                    "doc['symbolInformation.location.uri'].value.substring(doc['symbolInformation.location.uri'].value.lastIndexOf('.'))",
-                  lang: 'painless',
-                },
-              },
-            },
-          },
-        })
-        .expect(200)
-        .then((res: any) => res.body);
-
-      // Symbol's source file extension aggregations
-      expect(JSON.stringify(symbolLangAggs.aggregations.language.buckets.sort())).to.equal(
-        JSON.stringify(
-          [
-            {
-              key: '.java',
-              doc_count: 3,
-            },
-            {
-              key: '.py',
-              doc_count: 2,
-            },
-            {
-              key: '.ts',
-              doc_count: 2,
-            },
-          ].sort()
-        )
-      );
-      expect(symbolLangAggs.hits.total.value).to.equal(7);
-
-      const referenceCount = await esSupertest
-        .get('/.code-reference-github.com-elastic-code-examples_smoke-19c9057c-1/_count')
-        .expect(200)
-        .then((res: any) => res.body);
-
-      expect(referenceCount.count).to.equal(0);
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/code/manage_repositories.ts b/x-pack/test/functional/apps/code/manage_repositories.ts
deleted file mode 100644
index 8eff8868a4756d..00000000000000
--- a/x-pack/test/functional/apps/code/manage_repositories.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function manageRepositoriesFunctionalTests({
-  getService,
-  getPageObjects,
-}: FtrProviderContext) {
-  // const esArchiver = getService('esArchiver');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const log = getService('log');
-  const PageObjects = getPageObjects(['common', 'header', 'security', 'code', 'home']);
-
-  describe('Manage Repositories', function() {
-    this.tags('smoke');
-    const repositoryListSelector = 'codeRepositoryList > codeRepositoryItem';
-
-    describe('Manage Repositories', () => {
-      before(async () => {
-        // Navigate to the code app.
-        await PageObjects.common.navigateToApp('code');
-        await PageObjects.header.waitUntilLoadingHasFinished();
-      });
-
-      after(async () => {
-        await PageObjects.security.forceLogout();
-      });
-
-      it('import repository', async () => {
-        log.debug('Code test import repository');
-        // Fill in the import repository input box with a valid git repository url.
-        await PageObjects.code.fillImportRepositoryUrlInputBox(
-          'https://github.com/elastic/code-examples_empty-file'
-        );
-        // Click the import repository button.
-        await PageObjects.code.clickImportRepositoryButton();
-
-        await retry.tryForTime(300000, async () => {
-          const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-          expect(repositoryItems).to.have.length(1);
-          expect(await repositoryItems[0].getVisibleText()).to.equal(
-            'elastic/code-examples_empty-file'
-          );
-        });
-
-        // Wait for the index to end.
-        await retry.try(async () => {
-          expect(await testSubjects.exists('repositoryIndexDone')).to.be(true);
-        });
-      });
-
-      it('delete repository', async () => {
-        log.debug('Code test delete repository');
-        // Click the delete repository button.
-        await PageObjects.code.clickDeleteRepositoryButton();
-
-        await retry.try(async () => {
-          expect(await testSubjects.exists('confirmModalConfirmButton')).to.be(true);
-        });
-
-        await testSubjects.click('confirmModalConfirmButton');
-
-        await retry.tryForTime(300000, async () => {
-          const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-          expect(repositoryItems).to.have.length(0);
-        });
-      });
-
-      it('import a git:// repository', async () => {
-        log.debug('Code test import repository');
-        // Fill in the import repository input box with a valid git repository url.
-        await PageObjects.code.fillImportRepositoryUrlInputBox(
-          'git://github.com/elastic/code-examples_empty-file'
-        );
-
-        // Click the import repository button.
-        await PageObjects.code.clickImportRepositoryButton();
-
-        await retry.tryForTime(300000, async () => {
-          const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-          expect(repositoryItems).to.have.length(1);
-          expect(await repositoryItems[0].getVisibleText()).to.equal(
-            'elastic/code-examples_empty-file'
-          );
-        });
-
-        // Wait for the index to end.
-        await retry.try(async () => {
-          expect(await testSubjects.exists('repositoryIndexDone')).to.be(true);
-        });
-
-        // Delete the repository
-        await PageObjects.code.clickDeleteRepositoryButton();
-
-        await retry.try(async () => {
-          expect(await testSubjects.exists('confirmModalConfirmButton')).to.be(true);
-        });
-
-        await testSubjects.click('confirmModalConfirmButton');
-
-        await retry.tryForTime(300000, async () => {
-          const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-          expect(repositoryItems).to.have.length(0);
-        });
-      });
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/code/repo_archiver.ts b/x-pack/test/functional/apps/code/repo_archiver.ts
deleted file mode 100644
index fc6baaab574231..00000000000000
--- a/x-pack/test/functional/apps/code/repo_archiver.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import del from 'del';
-// @ts-ignore
-import extractZip from 'extract-zip';
-import fs from 'fs';
-import path from 'path';
-import { promisify } from 'util';
-
-const asyncExtractZip = promisify(extractZip);
-const asyncMkdir = promisify(fs.mkdir);
-
-const archiveFilePath = (zipFileName: string) => {
-  return path.resolve(__dirname, `./fixtures/${zipFileName}.zip`);
-};
-
-const repoDir = (repoUri: string, kibanaDir: string) => {
-  return path.resolve(kibanaDir, `data/code/repos/${repoUri}`);
-};
-
-const workspaceDir = (repoUri: string, kibanaDir: string) => {
-  return path.resolve(kibanaDir, `data/code/workspace/${repoUri}`);
-};
-
-const unzip = async (filepath: string, target: string) => {
-  if (!fs.existsSync(target)) {
-    await asyncMkdir(target, { recursive: true });
-  }
-  await asyncExtractZip(filepath, { dir: target });
-};
-
-export const load = async (repoUri: string, zipFileName: string, kibanaDir: string) => {
-  const dir = repoDir(repoUri, kibanaDir);
-  const zipRepoPath = archiveFilePath(zipFileName);
-  // Try to unload first in case the folder already exists
-  await unload(repoUri, kibanaDir);
-  return unzip(zipRepoPath, dir);
-};
-
-export const unload = async (repoUri: string, kibanaDir: string) => {
-  const dir = repoDir(repoUri, kibanaDir);
-  const wsDir = workspaceDir(repoUri, kibanaDir);
-  return del([dir, wsDir], { force: true });
-};
diff --git a/x-pack/test/functional/apps/code/search.ts b/x-pack/test/functional/apps/code/search.ts
deleted file mode 100644
index b3cdb21294a29e..00000000000000
--- a/x-pack/test/functional/apps/code/search.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function searchFunctonalTests({ getService, getPageObjects }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const log = getService('log');
-  const PageObjects = getPageObjects(['common', 'header', 'security', 'code', 'home']);
-
-  describe('Search', function() {
-    this.tags('smoke');
-    const symbolTypeaheadListSelector = 'codeTypeaheadList-symbol > codeTypeaheadItem';
-    const fileTypeaheadListSelector = 'codeTypeaheadList-file > codeTypeaheadItem';
-    const searchResultListSelector = 'codeSearchResultList > codeSearchResultFileItem';
-    const languageFilterListSelector =
-      'codeSearchLanguageFilterList > codeSearchLanguageFilterItem';
-
-    describe('Code Search', () => {
-      before(async () => {
-        await esArchiver.load('code/repositories/typescript_node_starter');
-
-        // Navigate to the search page of the code app.
-        await PageObjects.common.navigateToApp('codeSearch');
-        await PageObjects.header.waitUntilLoadingHasFinished();
-      });
-
-      after(async () => {
-        await PageObjects.security.forceLogout();
-        await esArchiver.unload('code/repositories/typescript_node_starter');
-      });
-
-      it('Trigger symbols in typeahead', async () => {
-        log.debug('Trigger symbols in typeahead');
-        await PageObjects.code.fillSearchQuery('user');
-
-        await retry.tryForTime(5000, async () => {
-          const symbols = await testSubjects.findAll(symbolTypeaheadListSelector);
-          expect(symbols).to.have.length(5);
-
-          expect(await symbols[0].getVisibleText()).to.equal('User.findOne() callback.user');
-          expect(await symbols[1].getVisibleText()).to.equal('postSignup.user');
-        });
-      });
-
-      it('File typeahead should be case insensitive', async () => {
-        log.debug('File typeahead should be case insensitive');
-        await PageObjects.code.fillSearchQuery('LICENSE');
-
-        await retry.tryForTime(5000, async () => {
-          const symbols = await testSubjects.findAll(fileTypeaheadListSelector);
-          expect(symbols).to.have.length(1);
-
-          expect(await symbols[0].getVisibleText()).to.equal('LICENSE');
-        });
-
-        await PageObjects.code.fillSearchQuery('license');
-
-        await retry.tryForTime(5000, async () => {
-          const symbols = await testSubjects.findAll(fileTypeaheadListSelector);
-          expect(symbols).to.have.length(1);
-
-          expect(await symbols[0].getVisibleText()).to.equal('LICENSE');
-        });
-      });
-
-      it('Full text search', async () => {
-        log.debug('Full text search');
-        // Fill in the search query bar with a common prefix of symbols.
-        await PageObjects.code.fillSearchQuery('user');
-        await PageObjects.code.submitSearchQuery();
-
-        await retry.tryForTime(5000, async () => {
-          const results = await testSubjects.findAll(searchResultListSelector);
-          expect(results).to.have.length(20);
-
-          // The third file has the most matches of the query, but is still ranked as
-          // the thrid because the the query matches the qname of the first 2 files. This
-          // is because qname got boosted more from search.
-          expect(await results[0].getVisibleText()).to.equal('src/controllers/user.ts');
-          expect(await results[1].getVisibleText()).to.equal('src/models/User.ts');
-          expect(await results[2].getVisibleText()).to.equal('src/config/passport.ts');
-        });
-      });
-
-      it('Full text search with complex query terms', async () => {
-        log.debug('Full text search with complex query terms');
-        // Fill in the search query bar with a complex query which could result in multiple
-        // terms.
-        await PageObjects.code.fillSearchQuery('postUpdateProfile');
-        await PageObjects.code.submitSearchQuery();
-
-        await retry.tryForTime(5000, async () => {
-          const results = await testSubjects.findAll(searchResultListSelector);
-          expect(results).to.have.length(2);
-          expect(await results[0].getVisibleText()).to.equal('src/app.ts');
-          expect(await results[1].getVisibleText()).to.equal('src/controllers/user.ts');
-        });
-      });
-
-      it('Apply language filter', async () => {
-        log.debug('Apply language filter');
-        // Fill in the search query bar with a common prefix of symbols.
-        await PageObjects.code.fillSearchQuery('user');
-        await PageObjects.code.submitSearchQuery();
-
-        await retry.tryForTime(5000, async () => {
-          const langFilters = await testSubjects.findAll(languageFilterListSelector);
-          expect(langFilters).to.have.length(4);
-
-          expect(await langFilters[0].getVisibleText()).to.equal('scss\n9');
-          expect(await langFilters[1].getVisibleText()).to.equal('typescript\n7');
-          expect(await langFilters[2].getVisibleText()).to.equal('pug\n5');
-          expect(await langFilters[3].getVisibleText()).to.equal('markdown\n1');
-        });
-
-        await retry.tryForTime(5000, async () => {
-          // click the first language filter item.
-          await testSubjects.click(languageFilterListSelector);
-
-          const results = await testSubjects.findAll(searchResultListSelector);
-          expect(results).to.have.length(9);
-
-          expect(await results[0].getVisibleText()).to.equal(
-            'src/public/css/lib/bootstrap/mixins/_vendor-prefixes.scss'
-          );
-          expect(await results[1].getVisibleText()).to.equal(
-            'src/public/css/themes/gsdk/gsdk/mixins/_vendor-prefixes.scss'
-          );
-        });
-      });
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/code/with_security.ts b/x-pack/test/functional/apps/code/with_security.ts
deleted file mode 100644
index 6e332166219425..00000000000000
--- a/x-pack/test/functional/apps/code/with_security.ts
+++ /dev/null
@@ -1,135 +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 { REPO_ROOT } from '@kbn/dev-utils';
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { load as repoLoad, unload as repoUnload } from './repo_archiver';
-
-export default function testWithSecurity({ getService, getPageObjects }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const PageObjects = getPageObjects(['common', 'header', 'security', 'code', 'home', 'settings']);
-  const dummyPassword = '123321';
-  const codeAdmin = 'codeAdmin';
-  const codeUser = 'codeUser';
-  const repositoryListSelector = 'codeRepositoryList > codeRepositoryItem';
-  const manageButtonSelectors = ['indexRepositoryButton', 'deleteRepositoryButton'];
-  const log = getService('log');
-  const security = getService('security');
-  const config = getService('config');
-
-  // FLAKY: https://github.com/elastic/kibana/issues/46977
-  describe.skip('Security', () => {
-    describe('with security enabled:', () => {
-      before(async () => {
-        await esArchiver.load('empty_kibana');
-        await security.role.create('global_code_all_role', {
-          kibana: [
-            {
-              feature: {
-                code: ['all'],
-              },
-              spaces: ['*'],
-            },
-          ],
-        });
-
-        await security.user.create(codeAdmin, {
-          password: dummyPassword,
-          roles: ['global_code_all_role'],
-          full_name: 'code admin',
-        });
-
-        await security.role.create('global_code_read_role', {
-          kibana: [
-            {
-              feature: {
-                code: ['read'],
-              },
-              spaces: ['*'],
-            },
-          ],
-        });
-
-        await security.user.create(codeUser, {
-          password: dummyPassword,
-          roles: ['global_code_read_role'],
-          full_name: 'code user',
-        });
-      });
-
-      after(async () => {
-        await PageObjects.security.forceLogout();
-        await esArchiver.unload('empty_kibana');
-      });
-
-      async function login(user: string) {
-        await PageObjects.security.forceLogout();
-        await PageObjects.security.login(user, dummyPassword);
-        await PageObjects.common.navigateToApp('code');
-        await PageObjects.header.waitUntilLoadingHasFinished();
-      }
-
-      it('codeAdmin should have an import button', async () => {
-        await login(codeAdmin);
-        await retry.tryForTime(5000, async () => {
-          const buttons = await testSubjects.findAll('importRepositoryButton');
-          expect(buttons).to.have.length(1);
-        });
-      });
-      it('codeUser should not have that import button', async () => {
-        await login(codeUser);
-        await retry.tryForTime(5000, async () => {
-          const buttons = await testSubjects.findAll('importRepositoryButton');
-          expect(buttons).to.have.length(0);
-        });
-      });
-
-      it('only codeAdmin can manage repositories', async () => {
-        await repoLoad(
-          'github.com/elastic/TypeScript-Node-Starter',
-          'typescript_node_starter',
-          config.get('kbnTestServer.installDir') || REPO_ROOT
-        );
-        await esArchiver.load('code/repositories/typescript_node_starter');
-
-        {
-          await login(codeAdmin);
-          const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-          expect(repositoryItems).to.have.length(1);
-          for (const buttonSelector of manageButtonSelectors) {
-            const buttons = await testSubjects.findAll(buttonSelector);
-            expect(buttons).to.have.length(1);
-            log.debug(`button ${buttonSelector} found.`);
-          }
-          const importButton = await testSubjects.findAll('newProjectButton');
-          expect(importButton).to.have.length(1);
-          log.debug(`button newProjectButton found.`);
-        }
-
-        {
-          await login(codeUser);
-          const repositoryItems = await testSubjects.findAll(repositoryListSelector);
-          expect(repositoryItems).to.have.length(1);
-          for (const buttonSelector of manageButtonSelectors) {
-            const buttons = await testSubjects.findAll(buttonSelector);
-            expect(buttons).to.have.length(0);
-          }
-          const importButton = await testSubjects.findAll('newProjectButton');
-          expect(importButton).to.have.length(0);
-        }
-
-        await esArchiver.unload('code/repositories/typescript_node_starter');
-        await repoUnload(
-          'github.com/elastic/TypeScript-Node-Starter',
-          config.get('kbnTestServer.installDir') || REPO_ROOT
-        );
-      });
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/logstash/pipeline_list.js b/x-pack/test/functional/apps/logstash/pipeline_list.js
index d04f50690368d9..ce0c9d881f51b6 100644
--- a/x-pack/test/functional/apps/logstash/pipeline_list.js
+++ b/x-pack/test/functional/apps/logstash/pipeline_list.js
@@ -22,6 +22,9 @@ export default function ({ getService, getPageObjects }) {
       originalWindowSize = await browser.getWindowSize();
       await browser.setWindowSize(1600, 1000);
       await esArchiver.load('logstash/example_pipelines');
+    });
+
+    beforeEach(async () => {
       await PageObjects.logstash.gotoPipelineList();
     });
 
@@ -86,10 +89,6 @@ export default function ({ getService, getPageObjects }) {
         await pipelineEditor.assertExists();
         await pipelineEditor.assertDefaultInputs();
       });
-
-      after(async () => {
-        await PageObjects.logstash.gotoPipelineList();
-      });
     });
 
     describe('delete button', () => {
@@ -122,15 +121,12 @@ export default function ({ getService, getPageObjects }) {
 
     describe('row links', () => {
       it('opens the selected row in the editor', async () => {
+        await PageObjects.logstash.gotoPipelineList();
         await pipelineList.setFilter('tweets_and_beats');
         await pipelineList.clickFirstRowId();
         await pipelineEditor.assertExists();
         await pipelineEditor.assertEditorId('tweets_and_beats');
       });
-
-      after(async () => {
-        await PageObjects.logstash.gotoPipelineList();
-      });
     });
 
     describe('next page button', () => {
@@ -225,10 +221,6 @@ export default function ({ getService, getPageObjects }) {
           queueCheckpointWrites,
         });
       });
-
-      after(async () => {
-        await PageObjects.logstash.gotoPipelineList();
-      });
     });
   });
 }
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts
new file mode 100644
index 00000000000000..52e4daef5ecf20
--- /dev/null
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/advanced_job.ts
@@ -0,0 +1,809 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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';
+
+interface Detector {
+  identifier: string;
+  function: string;
+  field?: string;
+  byField?: string;
+  overField?: string;
+  partitionField?: string;
+  excludeFrequent?: string;
+  description?: string;
+}
+
+interface DatafeedConfig {
+  queryDelay?: string;
+  frequency?: string;
+  scrollSize?: string;
+}
+
+interface PickFieldsConfig {
+  detectors: Detector[];
+  influencers: string[];
+  bucketSpan: string;
+  memoryLimit: string;
+  categorizationField?: string;
+  summaryCountField?: string;
+}
+
+// type guards
+// Detector
+const isDetectorWithField = (arg: any): arg is Required<Pick<Detector, 'field'>> => {
+  return arg.hasOwnProperty('field');
+};
+const isDetectorWithByField = (arg: any): arg is Required<Pick<Detector, 'byField'>> => {
+  return arg.hasOwnProperty('byField');
+};
+const isDetectorWithOverField = (arg: any): arg is Required<Pick<Detector, 'overField'>> => {
+  return arg.hasOwnProperty('overField');
+};
+const isDetectorWithPartitionField = (
+  arg: any
+): arg is Required<Pick<Detector, 'partitionField'>> => {
+  return arg.hasOwnProperty('partitionField');
+};
+const isDetectorWithExcludeFrequent = (
+  arg: any
+): arg is Required<Pick<Detector, 'excludeFrequent'>> => {
+  return arg.hasOwnProperty('excludeFrequent');
+};
+const isDetectorWithDescription = (arg: any): arg is Required<Pick<Detector, 'description'>> => {
+  return arg.hasOwnProperty('description');
+};
+
+// DatafeedConfig
+const isDatafeedConfigWithQueryDelay = (
+  arg: any
+): arg is Required<Pick<DatafeedConfig, 'queryDelay'>> => {
+  return arg.hasOwnProperty('queryDelay');
+};
+const isDatafeedConfigWithFrequency = (
+  arg: any
+): arg is Required<Pick<DatafeedConfig, 'frequency'>> => {
+  return arg.hasOwnProperty('frequency');
+};
+const isDatafeedConfigWithScrollSize = (
+  arg: any
+): arg is Required<Pick<DatafeedConfig, 'scrollSize'>> => {
+  return arg.hasOwnProperty('scrollSize');
+};
+
+// PickFieldsConfig
+const isPickFieldsConfigWithCategorizationField = (
+  arg: any
+): arg is Required<Pick<PickFieldsConfig, 'categorizationField'>> => {
+  return arg.hasOwnProperty('categorizationField');
+};
+const isPickFieldsConfigWithSummaryCountField = (
+  arg: any
+): arg is Required<Pick<PickFieldsConfig, 'summaryCountField'>> => {
+  return arg.hasOwnProperty('summaryCountField');
+};
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const ml = getService('ml');
+
+  const defaultValues = {
+    datafeedQuery: `{
+  "bool": {
+    "must": [
+      {
+        "match_all": {}
+      }
+    ]
+  }
+}`,
+    queryDelay: '60s',
+    frequency: '450s',
+    scrollSize: '1000',
+  };
+
+  const testDataList = [
+    {
+      suiteTitle: 'with multiple metric detectors and custom datafeed settings',
+      jobSource: 'ecommerce',
+      jobId: `ec_advanced_1_${Date.now()}`,
+      get jobIdClone(): string {
+        return `${this.jobId}_clone`;
+      },
+      jobDescription:
+        'Create advanced job from ecommerce dataset with multiple metric detectors and custom datafeed settings',
+      jobGroups: ['automated', 'ecommerce', 'advanced'],
+      get jobGroupsClone(): string[] {
+        return [...this.jobGroups, 'clone'];
+      },
+      pickFieldsConfig: {
+        detectors: [
+          {
+            identifier: 'high_count',
+            function: 'high_count',
+            description: 'high_count detector without split',
+          } as Detector,
+          {
+            identifier: 'mean("products.base_price") by "category.keyword"',
+            function: 'mean',
+            field: 'products.base_price',
+            byField: 'category.keyword',
+          } as Detector,
+          {
+            identifier: 'sum("products.discount_amount") over customer_id',
+            function: 'sum',
+            field: 'products.discount_amount',
+            overField: 'customer_id',
+          } as Detector,
+          {
+            identifier: 'median(total_quantity) partition_field_name=customer_gender',
+            function: 'median',
+            field: 'total_quantity',
+            partitionField: 'customer_gender',
+          } as Detector,
+          {
+            identifier:
+              'max(total_quantity) by "geoip.continent_name" over customer_id partition_field_name=customer_gender',
+            function: 'max',
+            field: 'total_quantity',
+            byField: 'geoip.continent_name',
+            overField: 'customer_id',
+            partitionField: 'customer_gender',
+          } as Detector,
+        ],
+        influencers: ['customer_id', 'category.keyword', 'geoip.continent_name', 'customer_gender'],
+        bucketSpan: '1h',
+        memoryLimit: '10mb',
+      } as PickFieldsConfig,
+      datafeedConfig: {
+        queryDelay: '55s',
+        frequency: '350s',
+        scrollSize: '999',
+      } as DatafeedConfig,
+      expected: {
+        wizard: {
+          timeField: 'order_date',
+        },
+        row: {
+          recordCount: '4,675',
+          memoryStatus: 'ok',
+          jobState: 'closed',
+          datafeedState: 'stopped',
+          latestTimestamp: '2019-07-12 23:45:36',
+        },
+        counts: {
+          processed_record_count: '4,675',
+          processed_field_count: '32,725',
+          input_bytes: '1.1 MB',
+          input_field_count: '32,725',
+          invalid_date_count: '0',
+          missing_field_count: '0',
+          out_of_order_timestamp_count: '0',
+          empty_bucket_count: '0',
+          sparse_bucket_count: '0',
+          bucket_count: '743',
+          earliest_record_timestamp: '2019-06-12 00:04:19',
+          latest_record_timestamp: '2019-07-12 23:45:36',
+          input_record_count: '4,675',
+          latest_bucket_timestamp: '2019-07-12 23:00:00',
+        },
+        modelSizeStats: {
+          result_type: 'model_size_stats',
+          model_bytes_exceeded: '0',
+          model_bytes_memory_limit: '10485760',
+          total_by_field_count: '37',
+          total_over_field_count: '92',
+          total_partition_field_count: '8',
+          bucket_allocation_failures_count: '0',
+          memory_status: 'ok',
+          timestamp: '2019-07-12 22:00:00',
+        },
+      },
+    },
+    {
+      // TODO: fix and re-enable the categorization test as soon as Kibana and ES are in sync again
+      skipTest: true,
+      suiteTitle: 'with categorization detector and default datafeed settings',
+      jobSource: 'ecommerce',
+      jobId: `ec_advanced_2_${Date.now()}`,
+      get jobIdClone(): string {
+        return `${this.jobId}_clone`;
+      },
+      jobDescription:
+        'Create advanced job from ecommerce dataset with a categorization detector and default datafeed settings',
+      jobGroups: ['automated', 'ecommerce', 'advanced'],
+      get jobGroupsClone(): string[] {
+        return [...this.jobGroups, 'clone'];
+      },
+      pickFieldsConfig: {
+        categorizationField: 'products.product_name',
+        detectors: [
+          {
+            identifier: 'count by mlcategory',
+            function: 'count',
+            byField: 'mlcategory',
+          } as Detector,
+        ],
+        influencers: ['mlcategory'],
+        bucketSpan: '12h',
+        memoryLimit: '100mb',
+      } as PickFieldsConfig,
+      datafeedConfig: {} as DatafeedConfig,
+      expected: {
+        wizard: {
+          timeField: 'order_date',
+        },
+        row: {
+          recordCount: '4,675',
+          memoryStatus: 'ok',
+          jobState: 'closed',
+          datafeedState: 'stopped',
+          latestTimestamp: '2019-07-12 23:45:36',
+        },
+        counts: {
+          processed_record_count: '4,675',
+          processed_field_count: '4,588',
+          input_bytes: '4.4 MB',
+          input_field_count: '6,154',
+          invalid_date_count: '0',
+          missing_field_count: '87',
+          out_of_order_timestamp_count: '0',
+          empty_bucket_count: '0',
+          sparse_bucket_count: '0',
+          bucket_count: '61',
+          earliest_record_timestamp: '2019-06-12 00:04:19',
+          latest_record_timestamp: '2019-07-12 23:45:36',
+          input_record_count: '4,675',
+          latest_bucket_timestamp: '2019-07-12 12:00:00',
+        },
+        modelSizeStats: {
+          result_type: 'model_size_stats',
+          model_bytes_exceeded: '0',
+          model_bytes_memory_limit: '104857600',
+          total_by_field_count: '3,787',
+          total_over_field_count: '0',
+          total_partition_field_count: '2',
+          bucket_allocation_failures_count: '0',
+          memory_status: 'ok',
+          timestamp: '2019-07-12 00:00:00',
+        },
+      },
+    },
+  ];
+
+  describe('advanced job', function() {
+    this.tags(['smoke', 'mlqa']);
+    before(async () => {
+      await esArchiver.load('ml/ecommerce');
+    });
+
+    after(async () => {
+      await esArchiver.unload('ml/ecommerce');
+      await ml.api.cleanMlIndices();
+    });
+
+    for (const testData of testDataList.filter(td => {
+      return td.skipTest !== true;
+    })) {
+      describe(`${testData.suiteTitle}`, function() {
+        it('job creation loads the job management page', async () => {
+          await ml.navigation.navigateToMl();
+          await ml.navigation.navigateToJobManagement();
+        });
+
+        it('job creation loads the new job source selection page', async () => {
+          await ml.jobManagement.navigateToNewJobSourceSelection();
+        });
+
+        it('job creation loads the job type selection page', async () => {
+          await ml.jobSourceSelection.selectSource(testData.jobSource);
+        });
+
+        it('job creation loads the advanced job wizard page', async () => {
+          await ml.jobTypeSelection.selectAdvancedJob();
+        });
+
+        it('job creation displays the configure datafeed step', async () => {
+          await ml.jobWizardCommon.assertConfigureDatafeedSectionExists();
+        });
+
+        it('job creation pre-fills the datafeed query editor', async () => {
+          await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists();
+          await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(defaultValues.datafeedQuery);
+        });
+
+        it('job creation inputs the query delay', async () => {
+          await ml.jobWizardAdvanced.assertQueryDelayInputExists();
+          await ml.jobWizardAdvanced.assertQueryDelayValue(defaultValues.queryDelay);
+          if (isDatafeedConfigWithQueryDelay(testData.datafeedConfig)) {
+            await ml.jobWizardAdvanced.setQueryDelay(testData.datafeedConfig.queryDelay);
+          }
+        });
+
+        it('job creation inputs the frequency', async () => {
+          await ml.jobWizardAdvanced.assertFrequencyInputExists();
+          await ml.jobWizardAdvanced.assertFrequencyValue(defaultValues.frequency);
+          if (isDatafeedConfigWithFrequency(testData.datafeedConfig)) {
+            await ml.jobWizardAdvanced.setFrequency(testData.datafeedConfig.frequency);
+          }
+        });
+
+        it('job creation inputs the scroll size', async () => {
+          await ml.jobWizardAdvanced.assertScrollSizeInputExists();
+          await ml.jobWizardAdvanced.assertScrollSizeValue(defaultValues.scrollSize);
+          if (isDatafeedConfigWithScrollSize(testData.datafeedConfig)) {
+            await ml.jobWizardAdvanced.setScrollSize(testData.datafeedConfig.scrollSize);
+          }
+        });
+
+        it('job creation pre-fills the time field', async () => {
+          await ml.jobWizardAdvanced.assertTimeFieldInputExists();
+          await ml.jobWizardAdvanced.assertTimeFieldSelection([testData.expected.wizard.timeField]);
+        });
+
+        it('job creation displays the pick fields step', async () => {
+          await ml.jobWizardCommon.advanceToPickFieldsSection();
+        });
+
+        it('job creation selects the categorization field', async () => {
+          await ml.jobWizardAdvanced.assertCategorizationFieldInputExists();
+          if (isPickFieldsConfigWithCategorizationField(testData.pickFieldsConfig)) {
+            await ml.jobWizardAdvanced.selectCategorizationField(
+              testData.pickFieldsConfig.categorizationField
+            );
+          } else {
+            await ml.jobWizardAdvanced.assertCategorizationFieldSelection([]);
+          }
+        });
+
+        it('job creation selects the summary count field', async () => {
+          await ml.jobWizardAdvanced.assertSummaryCountFieldInputExists();
+          if (isPickFieldsConfigWithSummaryCountField(testData.pickFieldsConfig)) {
+            await ml.jobWizardAdvanced.selectSummaryCountField(
+              testData.pickFieldsConfig.summaryCountField
+            );
+          } else {
+            await ml.jobWizardAdvanced.assertSummaryCountFieldSelection([]);
+          }
+        });
+
+        it('job creation adds detectors', async () => {
+          for (const detector of testData.pickFieldsConfig.detectors) {
+            await ml.jobWizardAdvanced.openCreateDetectorModal();
+            await ml.jobWizardAdvanced.assertDetectorFunctionInputExists();
+            await ml.jobWizardAdvanced.assertDetectorFunctionSelection([]);
+            await ml.jobWizardAdvanced.assertDetectorFieldInputExists();
+            await ml.jobWizardAdvanced.assertDetectorFieldSelection([]);
+            await ml.jobWizardAdvanced.assertDetectorByFieldInputExists();
+            await ml.jobWizardAdvanced.assertDetectorByFieldSelection([]);
+            await ml.jobWizardAdvanced.assertDetectorOverFieldInputExists();
+            await ml.jobWizardAdvanced.assertDetectorOverFieldSelection([]);
+            await ml.jobWizardAdvanced.assertDetectorPartitionFieldInputExists();
+            await ml.jobWizardAdvanced.assertDetectorPartitionFieldSelection([]);
+            await ml.jobWizardAdvanced.assertDetectorExcludeFrequentInputExists();
+            await ml.jobWizardAdvanced.assertDetectorExcludeFrequentSelection([]);
+            await ml.jobWizardAdvanced.assertDetectorDescriptionInputExists();
+            await ml.jobWizardAdvanced.assertDetectorDescriptionValue('');
+
+            await ml.jobWizardAdvanced.selectDetectorFunction(detector.function);
+            if (isDetectorWithField(detector)) {
+              await ml.jobWizardAdvanced.selectDetectorField(detector.field);
+            }
+            if (isDetectorWithByField(detector)) {
+              await ml.jobWizardAdvanced.selectDetectorByField(detector.byField);
+            }
+            if (isDetectorWithOverField(detector)) {
+              await ml.jobWizardAdvanced.selectDetectorOverField(detector.overField);
+            }
+            if (isDetectorWithPartitionField(detector)) {
+              await ml.jobWizardAdvanced.selectDetectorPartitionField(detector.partitionField);
+            }
+            if (isDetectorWithExcludeFrequent(detector)) {
+              await ml.jobWizardAdvanced.selectDetectorExcludeFrequent(detector.excludeFrequent);
+            }
+            if (isDetectorWithDescription(detector)) {
+              await ml.jobWizardAdvanced.setDetectorDescription(detector.description);
+            }
+
+            await ml.jobWizardAdvanced.confirmAddDetectorModal();
+          }
+        });
+
+        it('job creation displays detector entries', async () => {
+          for (const [index, detector] of testData.pickFieldsConfig.detectors.entries()) {
+            await ml.jobWizardAdvanced.assertDetectorEntryExists(
+              index,
+              detector.identifier,
+              isDetectorWithDescription(detector) ? detector.description : undefined
+            );
+          }
+        });
+
+        it('job creation inputs the bucket span', async () => {
+          await ml.jobWizardCommon.assertBucketSpanInputExists();
+          await ml.jobWizardCommon.setBucketSpan(testData.pickFieldsConfig.bucketSpan);
+        });
+
+        it('job creation inputs influencers', async () => {
+          await ml.jobWizardCommon.assertInfluencerInputExists();
+          await ml.jobWizardCommon.assertInfluencerSelection([]);
+          for (const influencer of testData.pickFieldsConfig.influencers) {
+            await ml.jobWizardCommon.addInfluencer(influencer);
+          }
+        });
+
+        it('job creation inputs the model memory limit', async () => {
+          await ml.jobWizardCommon.assertModelMemoryLimitInputExists({
+            withAdvancedSection: false,
+          });
+          await ml.jobWizardCommon.setModelMemoryLimit(testData.pickFieldsConfig.memoryLimit, {
+            withAdvancedSection: false,
+          });
+        });
+
+        it('job creation displays the job details step', async () => {
+          await ml.jobWizardCommon.advanceToJobDetailsSection();
+        });
+
+        it('job creation inputs the job id', async () => {
+          await ml.jobWizardCommon.assertJobIdInputExists();
+          await ml.jobWizardCommon.setJobId(testData.jobId);
+        });
+
+        it('job creation inputs the job description', async () => {
+          await ml.jobWizardCommon.assertJobDescriptionInputExists();
+          await ml.jobWizardCommon.setJobDescription(testData.jobDescription);
+        });
+
+        it('job creation inputs job groups', async () => {
+          await ml.jobWizardCommon.assertJobGroupInputExists();
+          for (const jobGroup of testData.jobGroups) {
+            await ml.jobWizardCommon.addJobGroup(jobGroup);
+          }
+          await ml.jobWizardCommon.assertJobGroupSelection(testData.jobGroups);
+        });
+
+        it('job creation displays the model plot switch', async () => {
+          await ml.jobWizardCommon.assertModelPlotSwitchExists({ withAdvancedSection: false });
+        });
+
+        it('job creation enables the dedicated index switch', async () => {
+          await ml.jobWizardCommon.assertDedicatedIndexSwitchExists({ withAdvancedSection: false });
+          await ml.jobWizardCommon.activateDedicatedIndexSwitch({ withAdvancedSection: false });
+        });
+
+        it('job creation displays the validation step', async () => {
+          await ml.jobWizardCommon.advanceToValidationSection();
+        });
+
+        it('job creation displays the summary step', async () => {
+          await ml.jobWizardCommon.advanceToSummarySection();
+        });
+
+        it('job creation creates the job and finishes processing', async () => {
+          await ml.jobWizardCommon.assertCreateJobButtonExists();
+          await ml.jobWizardAdvanced.createJob();
+          await ml.jobManagement.assertStartDatafeedModalExists();
+          await ml.jobManagement.confirmStartDatafeedModal();
+          await ml.jobManagement.waitForJobCompletion(testData.jobId);
+        });
+
+        it('job creation displays the created job in the job list', async () => {
+          await ml.jobTable.refreshJobList();
+          await ml.jobTable.filterWithSearchString(testData.jobId);
+          const rows = await ml.jobTable.parseJobTable();
+          expect(rows.filter(row => row.id === testData.jobId)).to.have.length(1);
+        });
+
+        it('job creation displays details for the created job in the job list', async () => {
+          await ml.jobTable.assertJobRowFields(testData.jobId, {
+            id: testData.jobId,
+            description: testData.jobDescription,
+            jobGroups: [...new Set(testData.jobGroups)].sort(),
+            recordCount: testData.expected.row.recordCount,
+            memoryStatus: testData.expected.row.memoryStatus,
+            jobState: testData.expected.row.jobState,
+            datafeedState: testData.expected.row.datafeedState,
+            latestTimestamp: testData.expected.row.latestTimestamp,
+          });
+
+          await ml.jobTable.assertJobRowDetailsCounts(
+            testData.jobId,
+            {
+              job_id: testData.jobId,
+              processed_record_count: testData.expected.counts.processed_record_count,
+              processed_field_count: testData.expected.counts.processed_field_count,
+              input_bytes: testData.expected.counts.input_bytes,
+              input_field_count: testData.expected.counts.input_field_count,
+              invalid_date_count: testData.expected.counts.invalid_date_count,
+              missing_field_count: testData.expected.counts.missing_field_count,
+              out_of_order_timestamp_count: testData.expected.counts.out_of_order_timestamp_count,
+              empty_bucket_count: testData.expected.counts.empty_bucket_count,
+              sparse_bucket_count: testData.expected.counts.sparse_bucket_count,
+              bucket_count: testData.expected.counts.bucket_count,
+              earliest_record_timestamp: testData.expected.counts.earliest_record_timestamp,
+              latest_record_timestamp: testData.expected.counts.latest_record_timestamp,
+              input_record_count: testData.expected.counts.input_record_count,
+              latest_bucket_timestamp: testData.expected.counts.latest_bucket_timestamp,
+            },
+            {
+              job_id: testData.jobId,
+              result_type: testData.expected.modelSizeStats.result_type,
+              model_bytes_exceeded: testData.expected.modelSizeStats.model_bytes_exceeded,
+              model_bytes_memory_limit: testData.expected.modelSizeStats.model_bytes_memory_limit,
+              total_by_field_count: testData.expected.modelSizeStats.total_by_field_count,
+              total_over_field_count: testData.expected.modelSizeStats.total_over_field_count,
+              total_partition_field_count:
+                testData.expected.modelSizeStats.total_partition_field_count,
+              bucket_allocation_failures_count:
+                testData.expected.modelSizeStats.bucket_allocation_failures_count,
+              memory_status: testData.expected.modelSizeStats.memory_status,
+              timestamp: testData.expected.modelSizeStats.timestamp,
+            }
+          );
+        });
+
+        it('job creation has detector results', async () => {
+          for (let i = 0; i < testData.pickFieldsConfig.detectors.length; i++) {
+            await ml.api.assertDetectorResultsExist(testData.jobId, i);
+          }
+        });
+
+        it('job cloning clicks the clone action and loads the advanced wizard', async () => {
+          await ml.jobTable.clickCloneJobAction(testData.jobId);
+          await ml.jobTypeSelection.assertAdvancedJobWizardOpen();
+        });
+
+        it('job cloning displays the configure datafeed step', async () => {
+          await ml.jobWizardCommon.assertConfigureDatafeedSectionExists();
+        });
+
+        it('job cloning pre-fills the datafeed query editor', async () => {
+          await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists();
+          await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(defaultValues.datafeedQuery);
+        });
+
+        it('job cloning pre-fills the query delay', async () => {
+          await ml.jobWizardAdvanced.assertQueryDelayInputExists();
+          if (isDatafeedConfigWithQueryDelay(testData.datafeedConfig)) {
+            await ml.jobWizardAdvanced.assertQueryDelayValue(testData.datafeedConfig.queryDelay);
+          }
+        });
+
+        it('job cloning pre-fills the frequency', async () => {
+          await ml.jobWizardAdvanced.assertFrequencyInputExists();
+          if (isDatafeedConfigWithFrequency(testData.datafeedConfig)) {
+            await ml.jobWizardAdvanced.assertFrequencyValue(testData.datafeedConfig.frequency);
+          }
+        });
+
+        it('job cloning pre-fills the scroll size', async () => {
+          await ml.jobWizardAdvanced.assertScrollSizeInputExists();
+          await ml.jobWizardAdvanced.assertScrollSizeValue(
+            isDatafeedConfigWithScrollSize(testData.datafeedConfig)
+              ? testData.datafeedConfig.scrollSize
+              : defaultValues.scrollSize
+          );
+        });
+
+        it('job creation pre-fills the time field', async () => {
+          await ml.jobWizardAdvanced.assertTimeFieldInputExists();
+          await ml.jobWizardAdvanced.assertTimeFieldSelection([testData.expected.wizard.timeField]);
+        });
+
+        it('job cloning displays the pick fields step', async () => {
+          await ml.jobWizardCommon.advanceToPickFieldsSection();
+        });
+
+        it('job cloning pre-fills the categorization field', async () => {
+          await ml.jobWizardAdvanced.assertCategorizationFieldInputExists();
+          await ml.jobWizardAdvanced.assertCategorizationFieldSelection(
+            isPickFieldsConfigWithCategorizationField(testData.pickFieldsConfig)
+              ? [testData.pickFieldsConfig.categorizationField]
+              : []
+          );
+        });
+
+        it('job cloning pre-fills the summary count field', async () => {
+          await ml.jobWizardAdvanced.assertSummaryCountFieldInputExists();
+          await ml.jobWizardAdvanced.assertSummaryCountFieldSelection(
+            isPickFieldsConfigWithSummaryCountField(testData.pickFieldsConfig)
+              ? [testData.pickFieldsConfig.summaryCountField]
+              : []
+          );
+        });
+
+        it('job cloning pre-fills detectors', async () => {
+          for (const [index, detector] of testData.pickFieldsConfig.detectors.entries()) {
+            await ml.jobWizardAdvanced.assertDetectorEntryExists(
+              index,
+              detector.identifier,
+              isDetectorWithDescription(detector) ? detector.description : undefined
+            );
+            await ml.jobWizardAdvanced.clickEditDetector(index);
+
+            await ml.jobWizardAdvanced.assertDetectorFunctionInputExists();
+            await ml.jobWizardAdvanced.assertDetectorFieldInputExists();
+            await ml.jobWizardAdvanced.assertDetectorByFieldInputExists();
+            await ml.jobWizardAdvanced.assertDetectorOverFieldInputExists();
+            await ml.jobWizardAdvanced.assertDetectorPartitionFieldInputExists();
+            await ml.jobWizardAdvanced.assertDetectorExcludeFrequentInputExists();
+            await ml.jobWizardAdvanced.assertDetectorDescriptionInputExists();
+
+            await ml.jobWizardAdvanced.assertDetectorFunctionSelection([detector.function]);
+            await ml.jobWizardAdvanced.assertDetectorFieldSelection(
+              isDetectorWithField(detector) ? [detector.field] : []
+            );
+            await ml.jobWizardAdvanced.assertDetectorByFieldSelection(
+              isDetectorWithByField(detector) ? [detector.byField] : []
+            );
+            await ml.jobWizardAdvanced.assertDetectorOverFieldSelection(
+              isDetectorWithOverField(detector) ? [detector.overField] : []
+            );
+            await ml.jobWizardAdvanced.assertDetectorPartitionFieldSelection(
+              isDetectorWithPartitionField(detector) ? [detector.partitionField] : []
+            );
+            await ml.jobWizardAdvanced.assertDetectorExcludeFrequentSelection(
+              isDetectorWithExcludeFrequent(detector) ? [detector.excludeFrequent] : []
+            );
+            // Currently, a description different form the identifier is generated for detectors with partition field
+            await ml.jobWizardAdvanced.assertDetectorDescriptionValue(
+              isDetectorWithDescription(detector)
+                ? detector.description
+                : detector.identifier.replace('partition_field_name', 'partitionfield')
+            );
+
+            await ml.jobWizardAdvanced.cancelAddDetectorModal();
+          }
+        });
+
+        it('job cloning pre-fills the bucket span', async () => {
+          await ml.jobWizardCommon.assertBucketSpanInputExists();
+          await ml.jobWizardCommon.assertBucketSpanValue(testData.pickFieldsConfig.bucketSpan);
+        });
+
+        it('job cloning pre-fills influencers', async () => {
+          await ml.jobWizardCommon.assertInfluencerInputExists();
+          await ml.jobWizardCommon.assertInfluencerSelection(testData.pickFieldsConfig.influencers);
+        });
+
+        it('job cloning pre-fills the model memory limit', async () => {
+          await ml.jobWizardCommon.assertModelMemoryLimitInputExists({
+            withAdvancedSection: false,
+          });
+          await ml.jobWizardCommon.assertModelMemoryLimitValue(
+            testData.pickFieldsConfig.memoryLimit,
+            {
+              withAdvancedSection: false,
+            }
+          );
+        });
+
+        it('job cloning displays the job details step', async () => {
+          await ml.jobWizardCommon.advanceToJobDetailsSection();
+        });
+
+        it('job cloning does not pre-fill the job id', async () => {
+          await ml.jobWizardCommon.assertJobIdInputExists();
+          await ml.jobWizardCommon.assertJobIdValue('');
+        });
+
+        it('job cloning inputs the clone job id', async () => {
+          await ml.jobWizardCommon.setJobId(testData.jobIdClone);
+        });
+
+        it('job cloning pre-fills the job description', async () => {
+          await ml.jobWizardCommon.assertJobDescriptionInputExists();
+          await ml.jobWizardCommon.assertJobDescriptionValue(testData.jobDescription);
+        });
+
+        it('job cloning pre-fills job groups', async () => {
+          await ml.jobWizardCommon.assertJobGroupInputExists();
+          await ml.jobWizardCommon.assertJobGroupSelection(testData.jobGroups);
+        });
+
+        it('job cloning inputs the clone job group', async () => {
+          await ml.jobWizardCommon.assertJobGroupInputExists();
+          await ml.jobWizardCommon.addJobGroup('clone');
+          await ml.jobWizardCommon.assertJobGroupSelection(testData.jobGroupsClone);
+        });
+
+        it('job cloning pre-fills the model plot switch', async () => {
+          await ml.jobWizardCommon.assertModelPlotSwitchExists({ withAdvancedSection: false });
+          await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false, {
+            withAdvancedSection: false,
+          });
+        });
+
+        it('job cloning pre-fills the dedicated index switch', async () => {
+          await ml.jobWizardCommon.assertDedicatedIndexSwitchExists({ withAdvancedSection: false });
+          await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true, {
+            withAdvancedSection: false,
+          });
+        });
+
+        it('job cloning displays the validation step', async () => {
+          await ml.jobWizardCommon.advanceToValidationSection();
+        });
+
+        it('job cloning displays the summary step', async () => {
+          await ml.jobWizardCommon.advanceToSummarySection();
+        });
+
+        it('job cloning creates the job and finishes processing', async () => {
+          await ml.jobWizardCommon.assertCreateJobButtonExists();
+          await ml.jobWizardAdvanced.createJob();
+          await ml.jobManagement.assertStartDatafeedModalExists();
+          await ml.jobManagement.confirmStartDatafeedModal();
+          await ml.jobManagement.waitForJobCompletion(testData.jobIdClone);
+        });
+
+        it('job cloning displays the created job in the job list', async () => {
+          await ml.jobTable.refreshJobList();
+          await ml.jobTable.filterWithSearchString(testData.jobIdClone);
+          const rows = await ml.jobTable.parseJobTable();
+          expect(rows.filter(row => row.id === testData.jobIdClone)).to.have.length(1);
+        });
+
+        it('job creation displays details for the created job in the job list', async () => {
+          await ml.jobTable.assertJobRowFields(testData.jobIdClone, {
+            id: testData.jobIdClone,
+            description: testData.jobDescription,
+            jobGroups: [...new Set(testData.jobGroupsClone)].sort(),
+            recordCount: testData.expected.row.recordCount,
+            memoryStatus: testData.expected.row.memoryStatus,
+            jobState: testData.expected.row.jobState,
+            datafeedState: testData.expected.row.datafeedState,
+            latestTimestamp: testData.expected.row.latestTimestamp,
+          });
+
+          await ml.jobTable.assertJobRowDetailsCounts(
+            testData.jobIdClone,
+            {
+              job_id: testData.jobIdClone,
+              processed_record_count: testData.expected.counts.processed_record_count,
+              processed_field_count: testData.expected.counts.processed_field_count,
+              input_bytes: testData.expected.counts.input_bytes,
+              input_field_count: testData.expected.counts.input_field_count,
+              invalid_date_count: testData.expected.counts.invalid_date_count,
+              missing_field_count: testData.expected.counts.missing_field_count,
+              out_of_order_timestamp_count: testData.expected.counts.out_of_order_timestamp_count,
+              empty_bucket_count: testData.expected.counts.empty_bucket_count,
+              sparse_bucket_count: testData.expected.counts.sparse_bucket_count,
+              bucket_count: testData.expected.counts.bucket_count,
+              earliest_record_timestamp: testData.expected.counts.earliest_record_timestamp,
+              latest_record_timestamp: testData.expected.counts.latest_record_timestamp,
+              input_record_count: testData.expected.counts.input_record_count,
+              latest_bucket_timestamp: testData.expected.counts.latest_bucket_timestamp,
+            },
+            {
+              job_id: testData.jobIdClone,
+              result_type: testData.expected.modelSizeStats.result_type,
+              model_bytes_exceeded: testData.expected.modelSizeStats.model_bytes_exceeded,
+              model_bytes_memory_limit: testData.expected.modelSizeStats.model_bytes_memory_limit,
+              total_by_field_count: testData.expected.modelSizeStats.total_by_field_count,
+              total_over_field_count: testData.expected.modelSizeStats.total_over_field_count,
+              total_partition_field_count:
+                testData.expected.modelSizeStats.total_partition_field_count,
+              bucket_allocation_failures_count:
+                testData.expected.modelSizeStats.bucket_allocation_failures_count,
+              memory_status: testData.expected.modelSizeStats.memory_status,
+              timestamp: testData.expected.modelSizeStats.timestamp,
+            }
+          );
+        });
+
+        it('job creation has detector results', async () => {
+          for (let i = 0; i < testData.pickFieldsConfig.detectors.length; i++) {
+            await ml.api.assertDetectorResultsExist(testData.jobIdClone, i);
+          }
+        });
+      });
+    }
+  });
+}
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/index.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/index.ts
index 8d2e58bb0614df..ba307a24cd739b 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/index.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/index.ts
@@ -11,5 +11,6 @@ export default function({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./multi_metric_job'));
     loadTestFile(require.resolve('./population_job'));
     loadTestFile(require.resolve('./saved_search_job'));
+    loadTestFile(require.resolve('./advanced_job'));
   });
 }
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
index c4e6459e105559..11cb48de260f14 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/multi_metric_job.ts
@@ -74,7 +74,7 @@ export default function({ getService }: FtrProviderContext) {
   describe('multi metric', function() {
     this.tags(['smoke', 'mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.load('ml/farequote');
     });
 
     after(async () => {
@@ -82,289 +82,286 @@ export default function({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    describe('job creation', function() {
-      it('loads the job management page', async () => {
-        await ml.navigation.navigateToMl();
-        await ml.navigation.navigateToJobManagement();
-      });
-
-      it('loads the new job source selection page', async () => {
-        await ml.jobManagement.navigateToNewJobSourceSelection();
-      });
-
-      it('loads the job type selection page', async () => {
-        await ml.jobSourceSelection.selectSource('farequote');
-      });
-
-      it('loads the multi metric job wizard page', async () => {
-        await ml.jobTypeSelection.selectMultiMetricJob();
-      });
-
-      it('displays the time range step', async () => {
-        await ml.jobWizardCommon.assertTimeRangeSectionExists();
-      });
-
-      it('sets the timerange', async () => {
-        await ml.jobWizardCommon.clickUseFullDataButton(
-          'Feb 7, 2016 @ 00:00:00.000',
-          'Feb 11, 2016 @ 23:59:54.000'
-        );
-      });
-
-      it('displays the event rate chart', async () => {
-        await ml.jobWizardCommon.assertEventRateChartExists();
-        await ml.jobWizardCommon.assertEventRateChartHasData();
-      });
-
-      it('displays the pick fields step', async () => {
-        await ml.jobWizardCommon.advanceToPickFieldsSection();
-      });
-
-      it('selects detectors and displays detector previews', async () => {
-        for (const [index, aggAndFieldIdentifier] of aggAndFieldIdentifiers.entries()) {
-          await ml.jobWizardCommon.assertAggAndFieldInputExists();
-          await ml.jobWizardCommon.selectAggAndField(aggAndFieldIdentifier, false);
-          await ml.jobWizardCommon.assertDetectorPreviewExists(
-            aggAndFieldIdentifier,
-            index,
-            'LINE'
-          );
-        }
-      });
-
-      it('inputs the split field and displays split cards', async () => {
-        await ml.jobWizardMultiMetric.assertSplitFieldInputExists();
-        await ml.jobWizardMultiMetric.selectSplitField(splitField);
-
-        await ml.jobWizardMultiMetric.assertDetectorSplitExists(splitField);
-        await ml.jobWizardMultiMetric.assertDetectorSplitFrontCardTitle('AAL');
-        await ml.jobWizardMultiMetric.assertDetectorSplitNumberOfBackCards(9);
-
-        await ml.jobWizardCommon.assertInfluencerSelection([splitField]);
-      });
-
-      it('displays the influencer field', async () => {
-        await ml.jobWizardCommon.assertInfluencerInputExists();
-        await ml.jobWizardCommon.assertInfluencerSelection([splitField]);
-      });
-
-      it('inputs the bucket span', async () => {
-        await ml.jobWizardCommon.assertBucketSpanInputExists();
-        await ml.jobWizardCommon.setBucketSpan(bucketSpan);
-      });
-
-      it('displays the job details step', async () => {
-        await ml.jobWizardCommon.advanceToJobDetailsSection();
-      });
-
-      it('inputs the job id', async () => {
-        await ml.jobWizardCommon.assertJobIdInputExists();
-        await ml.jobWizardCommon.setJobId(jobId);
-      });
-
-      it('inputs the job description', async () => {
-        await ml.jobWizardCommon.assertJobDescriptionInputExists();
-        await ml.jobWizardCommon.setJobDescription(jobDescription);
-      });
-
-      it('inputs job groups', async () => {
-        await ml.jobWizardCommon.assertJobGroupInputExists();
-        for (const jobGroup of jobGroups) {
-          await ml.jobWizardCommon.addJobGroup(jobGroup);
-        }
-        await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-      });
-
-      it('opens the advanced section', async () => {
-        await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-      });
-
-      it('displays the model plot switch', async () => {
-        await ml.jobWizardCommon.assertModelPlotSwitchExists();
-      });
-
-      it('enables the dedicated index switch', async () => {
-        await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
-        await ml.jobWizardCommon.activateDedicatedIndexSwitch();
-      });
-
-      it('inputs the model memory limit', async () => {
-        await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-        await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
-      });
-
-      it('displays the validation step', async () => {
-        await ml.jobWizardCommon.advanceToValidationSection();
-      });
-
-      it('displays the summary step', async () => {
-        await ml.jobWizardCommon.advanceToSummarySection();
-      });
-
-      it('creates the job and finishes processing', async () => {
-        await ml.jobWizardCommon.assertCreateJobButtonExists();
-        await ml.jobWizardCommon.createJobAndWaitForCompletion();
-      });
-
-      it('displays the created job in the job list', async () => {
-        await ml.navigation.navigateToMl();
-        await ml.navigation.navigateToJobManagement();
-
-        await ml.jobTable.waitForJobsToLoad();
-        await ml.jobTable.filterWithSearchString(jobId);
-        const rows = await ml.jobTable.parseJobTable();
-        expect(rows.filter(row => row.id === jobId)).to.have.length(1);
-      });
-
-      it('displays details for the created job in the job list', async () => {
-        await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
-
-        await ml.jobTable.assertJobRowDetailsCounts(
-          jobId,
-          getExpectedCounts(jobId),
-          getExpectedModelSizeStats(jobId)
-        );
-      });
-    });
-
-    describe('job cloning', function() {
-      it('clicks the clone action and loads the multi metric wizard', async () => {
-        await ml.jobTable.clickCloneJobAction(jobId);
-        await ml.jobTypeSelection.assertMultiMetricJobWizardOpen();
-      });
-
-      it('displays the time range step', async () => {
-        await ml.jobWizardCommon.assertTimeRangeSectionExists();
-      });
-
-      it('sets the timerange', async () => {
-        await ml.jobWizardCommon.clickUseFullDataButton(
-          'Feb 7, 2016 @ 00:00:00.000',
-          'Feb 11, 2016 @ 23:59:54.000'
-        );
-      });
-
-      it('displays the event rate chart', async () => {
-        await ml.jobWizardCommon.assertEventRateChartExists();
-        await ml.jobWizardCommon.assertEventRateChartHasData();
-      });
-
-      it('displays the pick fields step', async () => {
-        await ml.jobWizardCommon.advanceToPickFieldsSection();
-      });
-
-      it('pre-fills detectors and shows preview with split cards', async () => {
-        for (const [index, aggAndFieldIdentifier] of aggAndFieldIdentifiers.entries()) {
-          await ml.jobWizardCommon.assertDetectorPreviewExists(
-            aggAndFieldIdentifier,
-            index,
-            'LINE'
-          );
-        }
-
-        await ml.jobWizardMultiMetric.assertDetectorSplitExists(splitField);
-        await ml.jobWizardMultiMetric.assertDetectorSplitFrontCardTitle('AAL');
-        await ml.jobWizardMultiMetric.assertDetectorSplitNumberOfBackCards(9);
-      });
-
-      it('pre-fills the split field', async () => {
-        await ml.jobWizardMultiMetric.assertSplitFieldInputExists();
-        await ml.jobWizardMultiMetric.assertSplitFieldSelection(splitField);
-      });
-
-      it('pre-fills influencers', async () => {
-        await ml.jobWizardCommon.assertInfluencerInputExists();
-        await ml.jobWizardCommon.assertInfluencerSelection([splitField]);
-      });
-
-      it('pre-fills the bucket span', async () => {
-        await ml.jobWizardCommon.assertBucketSpanInputExists();
-        await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
-      });
-
-      it('displays the job details step', async () => {
-        await ml.jobWizardCommon.advanceToJobDetailsSection();
-      });
-
-      it('does not pre-fill the job id', async () => {
-        await ml.jobWizardCommon.assertJobIdInputExists();
-        await ml.jobWizardCommon.assertJobIdValue('');
-      });
-
-      it('inputs the clone job id', async () => {
-        await ml.jobWizardCommon.setJobId(jobIdClone);
-      });
-
-      it('pre-fills the job description', async () => {
-        await ml.jobWizardCommon.assertJobDescriptionInputExists();
-        await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
-      });
-
-      it('pre-fills job groups', async () => {
-        await ml.jobWizardCommon.assertJobGroupInputExists();
-        await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-      });
-
-      it('inputs the clone job group', async () => {
-        await ml.jobWizardCommon.assertJobGroupInputExists();
-        await ml.jobWizardCommon.addJobGroup('clone');
-        await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
-      });
-
-      it('opens the advanced section', async () => {
-        await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-      });
-
-      it('pre-fills the model plot switch', async () => {
-        await ml.jobWizardCommon.assertModelPlotSwitchExists();
-        await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false);
-      });
-
-      it('pre-fills the dedicated index switch', async () => {
-        await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
-        await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
-      });
-
-      it('pre-fills the model memory limit', async () => {
-        await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-        await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
-      });
-
-      it('displays the validation step', async () => {
-        await ml.jobWizardCommon.advanceToValidationSection();
-      });
-
-      it('displays the summary step', async () => {
-        await ml.jobWizardCommon.advanceToSummarySection();
-      });
-
-      it('creates the job and finishes processing', async () => {
-        await ml.jobWizardCommon.assertCreateJobButtonExists();
-        await ml.jobWizardCommon.createJobAndWaitForCompletion();
-      });
-
-      it('displays the created job in the job list', async () => {
-        await ml.navigation.navigateToMl();
-        await ml.navigation.navigateToJobManagement();
-
-        await ml.jobTable.waitForJobsToLoad();
-        await ml.jobTable.filterWithSearchString(jobIdClone);
-        const rows = await ml.jobTable.parseJobTable();
-        expect(rows.filter(row => row.id === jobIdClone)).to.have.length(1);
-      });
-
-      it('displays details for the created job in the job list', async () => {
-        await ml.jobTable.assertJobRowFields(
-          jobIdClone,
-          getExpectedRow(jobIdClone, jobGroupsClone)
-        );
-
-        await ml.jobTable.assertJobRowDetailsCounts(
-          jobIdClone,
-          getExpectedCounts(jobIdClone),
-          getExpectedModelSizeStats(jobIdClone)
-        );
-      });
+    it('job creation loads the job management page', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+    });
+
+    it('job creation loads the new job source selection page', async () => {
+      await ml.jobManagement.navigateToNewJobSourceSelection();
+    });
+
+    it('job creation loads the job type selection page', async () => {
+      await ml.jobSourceSelection.selectSource('farequote');
+    });
+
+    it('job creation loads the multi metric job wizard page', async () => {
+      await ml.jobTypeSelection.selectMultiMetricJob();
+    });
+
+    it('job creation displays the time range step', async () => {
+      await ml.jobWizardCommon.assertTimeRangeSectionExists();
+    });
+
+    it('job creation sets the timerange', async () => {
+      await ml.jobWizardCommon.clickUseFullDataButton(
+        'Feb 7, 2016 @ 00:00:00.000',
+        'Feb 11, 2016 @ 23:59:54.000'
+      );
+    });
+
+    it('job creation displays the event rate chart', async () => {
+      await ml.jobWizardCommon.assertEventRateChartExists();
+      await ml.jobWizardCommon.assertEventRateChartHasData();
+    });
+
+    it('job creation displays the pick fields step', async () => {
+      await ml.jobWizardCommon.advanceToPickFieldsSection();
+    });
+
+    it('job creation selects detectors and displays detector previews', async () => {
+      for (const [index, aggAndFieldIdentifier] of aggAndFieldIdentifiers.entries()) {
+        await ml.jobWizardCommon.assertAggAndFieldInputExists();
+        await ml.jobWizardCommon.selectAggAndField(aggAndFieldIdentifier, false);
+        await ml.jobWizardCommon.assertDetectorPreviewExists(aggAndFieldIdentifier, index, 'LINE');
+      }
+    });
+
+    it('job creation inputs the split field and displays split cards', async () => {
+      await ml.jobWizardMultiMetric.assertSplitFieldInputExists();
+      await ml.jobWizardMultiMetric.selectSplitField(splitField);
+
+      await ml.jobWizardMultiMetric.assertDetectorSplitExists(splitField);
+      await ml.jobWizardMultiMetric.assertDetectorSplitFrontCardTitle('AAL');
+      await ml.jobWizardMultiMetric.assertDetectorSplitNumberOfBackCards(9);
+
+      await ml.jobWizardCommon.assertInfluencerSelection([splitField]);
+    });
+
+    it('job creation displays the influencer field', async () => {
+      await ml.jobWizardCommon.assertInfluencerInputExists();
+      await ml.jobWizardCommon.assertInfluencerSelection([splitField]);
+    });
+
+    it('job creation inputs the bucket span', async () => {
+      await ml.jobWizardCommon.assertBucketSpanInputExists();
+      await ml.jobWizardCommon.setBucketSpan(bucketSpan);
+    });
+
+    it('job creation displays the job details step', async () => {
+      await ml.jobWizardCommon.advanceToJobDetailsSection();
+    });
+
+    it('job creation inputs the job id', async () => {
+      await ml.jobWizardCommon.assertJobIdInputExists();
+      await ml.jobWizardCommon.setJobId(jobId);
+    });
+
+    it('job creation inputs the job description', async () => {
+      await ml.jobWizardCommon.assertJobDescriptionInputExists();
+      await ml.jobWizardCommon.setJobDescription(jobDescription);
+    });
+
+    it('job creation inputs job groups', async () => {
+      await ml.jobWizardCommon.assertJobGroupInputExists();
+      for (const jobGroup of jobGroups) {
+        await ml.jobWizardCommon.addJobGroup(jobGroup);
+      }
+      await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
+    });
+
+    it('job creation opens the advanced section', async () => {
+      await ml.jobWizardCommon.ensureAdvancedSectionOpen();
+    });
+
+    it('job creation displays the model plot switch', async () => {
+      await ml.jobWizardCommon.assertModelPlotSwitchExists();
+    });
+
+    it('job creation enables the dedicated index switch', async () => {
+      await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
+      await ml.jobWizardCommon.activateDedicatedIndexSwitch();
+    });
+
+    it('job creation inputs the model memory limit', async () => {
+      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
+    });
+
+    it('job creation displays the validation step', async () => {
+      await ml.jobWizardCommon.advanceToValidationSection();
+    });
+
+    it('job creation displays the summary step', async () => {
+      await ml.jobWizardCommon.advanceToSummarySection();
+    });
+
+    it('job creation creates the job and finishes processing', async () => {
+      await ml.jobWizardCommon.assertCreateJobButtonExists();
+      await ml.jobWizardCommon.createJobAndWaitForCompletion();
+    });
+
+    it('job creation displays the created job in the job list', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+
+      await ml.jobTable.waitForJobsToLoad();
+      await ml.jobTable.filterWithSearchString(jobId);
+      const rows = await ml.jobTable.parseJobTable();
+      expect(rows.filter(row => row.id === jobId)).to.have.length(1);
+    });
+
+    it('job creation displays details for the created job in the job list', async () => {
+      await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
+
+      await ml.jobTable.assertJobRowDetailsCounts(
+        jobId,
+        getExpectedCounts(jobId),
+        getExpectedModelSizeStats(jobId)
+      );
+    });
+
+    it('job creation has detector results', async () => {
+      for (let i = 0; i < aggAndFieldIdentifiers.length; i++) {
+        await ml.api.assertDetectorResultsExist(jobId, i);
+      }
+    });
+
+    it('job cloning clicks the clone action and loads the multi metric wizard', async () => {
+      await ml.jobTable.clickCloneJobAction(jobId);
+      await ml.jobTypeSelection.assertMultiMetricJobWizardOpen();
+    });
+
+    it('job cloning displays the time range step', async () => {
+      await ml.jobWizardCommon.assertTimeRangeSectionExists();
+    });
+
+    it('job cloning sets the timerange', async () => {
+      await ml.jobWizardCommon.clickUseFullDataButton(
+        'Feb 7, 2016 @ 00:00:00.000',
+        'Feb 11, 2016 @ 23:59:54.000'
+      );
+    });
+
+    it('job cloning displays the event rate chart', async () => {
+      await ml.jobWizardCommon.assertEventRateChartExists();
+      await ml.jobWizardCommon.assertEventRateChartHasData();
+    });
+
+    it('job cloning displays the pick fields step', async () => {
+      await ml.jobWizardCommon.advanceToPickFieldsSection();
+    });
+
+    it('job cloning pre-fills detectors and shows preview with split cards', async () => {
+      for (const [index, aggAndFieldIdentifier] of aggAndFieldIdentifiers.entries()) {
+        await ml.jobWizardCommon.assertDetectorPreviewExists(aggAndFieldIdentifier, index, 'LINE');
+      }
+
+      await ml.jobWizardMultiMetric.assertDetectorSplitExists(splitField);
+      await ml.jobWizardMultiMetric.assertDetectorSplitFrontCardTitle('AAL');
+      await ml.jobWizardMultiMetric.assertDetectorSplitNumberOfBackCards(9);
+    });
+
+    it('job cloning pre-fills the split field', async () => {
+      await ml.jobWizardMultiMetric.assertSplitFieldInputExists();
+      await ml.jobWizardMultiMetric.assertSplitFieldSelection([splitField]);
+    });
+
+    it('job cloning pre-fills influencers', async () => {
+      await ml.jobWizardCommon.assertInfluencerInputExists();
+      await ml.jobWizardCommon.assertInfluencerSelection([splitField]);
+    });
+
+    it('job cloning pre-fills the bucket span', async () => {
+      await ml.jobWizardCommon.assertBucketSpanInputExists();
+      await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
+    });
+
+    it('job cloning displays the job details step', async () => {
+      await ml.jobWizardCommon.advanceToJobDetailsSection();
+    });
+
+    it('job cloning does not pre-fill the job id', async () => {
+      await ml.jobWizardCommon.assertJobIdInputExists();
+      await ml.jobWizardCommon.assertJobIdValue('');
+    });
+
+    it('job cloning inputs the clone job id', async () => {
+      await ml.jobWizardCommon.setJobId(jobIdClone);
+    });
+
+    it('job cloning pre-fills the job description', async () => {
+      await ml.jobWizardCommon.assertJobDescriptionInputExists();
+      await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
+    });
+
+    it('job cloning pre-fills job groups', async () => {
+      await ml.jobWizardCommon.assertJobGroupInputExists();
+      await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
+    });
+
+    it('job cloning inputs the clone job group', async () => {
+      await ml.jobWizardCommon.assertJobGroupInputExists();
+      await ml.jobWizardCommon.addJobGroup('clone');
+      await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
+    });
+
+    it('job cloning opens the advanced section', async () => {
+      await ml.jobWizardCommon.ensureAdvancedSectionOpen();
+    });
+
+    it('job cloning pre-fills the model plot switch', async () => {
+      await ml.jobWizardCommon.assertModelPlotSwitchExists();
+      await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false);
+    });
+
+    it('job cloning pre-fills the dedicated index switch', async () => {
+      await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
+      await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
+    });
+
+    it('job cloning pre-fills the model memory limit', async () => {
+      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
+    });
+
+    it('job cloning displays the validation step', async () => {
+      await ml.jobWizardCommon.advanceToValidationSection();
+    });
+
+    it('job cloning displays the summary step', async () => {
+      await ml.jobWizardCommon.advanceToSummarySection();
+    });
+
+    it('job cloning creates the job and finishes processing', async () => {
+      await ml.jobWizardCommon.assertCreateJobButtonExists();
+      await ml.jobWizardCommon.createJobAndWaitForCompletion();
+    });
+
+    it('job cloning displays the created job in the job list', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+
+      await ml.jobTable.waitForJobsToLoad();
+      await ml.jobTable.filterWithSearchString(jobIdClone);
+      const rows = await ml.jobTable.parseJobTable();
+      expect(rows.filter(row => row.id === jobIdClone)).to.have.length(1);
+    });
+
+    it('job cloning displays details for the created job in the job list', async () => {
+      await ml.jobTable.assertJobRowFields(jobIdClone, getExpectedRow(jobIdClone, jobGroupsClone));
+
+      await ml.jobTable.assertJobRowDetailsCounts(
+        jobIdClone,
+        getExpectedCounts(jobIdClone),
+        getExpectedModelSizeStats(jobIdClone)
+      );
+    });
+
+    it('job cloning has detector results', async () => {
+      for (let i = 0; i < aggAndFieldIdentifiers.length; i++) {
+        await ml.api.assertDetectorResultsExist(jobId, i);
+      }
     });
   });
 }
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
index 706a3c946a261c..71e66cc569f4ef 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/population_job.ts
@@ -88,7 +88,7 @@ export default function({ getService }: FtrProviderContext) {
   describe('population', function() {
     this.tags(['smoke', 'mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.load('ml/ecommerce');
     });
 
     after(async () => {
@@ -96,314 +96,310 @@ export default function({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    describe('job creation', function() {
-      it('loads the job management page', async () => {
-        await ml.navigation.navigateToMl();
-        await ml.navigation.navigateToJobManagement();
-      });
+    it('job creation loads the job management page', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+    });
 
-      it('loads the new job source selection page', async () => {
-        await ml.jobManagement.navigateToNewJobSourceSelection();
-      });
+    it('job creation loads the new job source selection page', async () => {
+      await ml.jobManagement.navigateToNewJobSourceSelection();
+    });
 
-      it('loads the job type selection page', async () => {
-        await ml.jobSourceSelection.selectSource('ecommerce');
-      });
+    it('job creation loads the job type selection page', async () => {
+      await ml.jobSourceSelection.selectSource('ecommerce');
+    });
 
-      it('loads the population job wizard page', async () => {
-        await ml.jobTypeSelection.selectPopulationJob();
-      });
+    it('job creation loads the population job wizard page', async () => {
+      await ml.jobTypeSelection.selectPopulationJob();
+    });
 
-      it('displays the time range step', async () => {
-        await ml.jobWizardCommon.assertTimeRangeSectionExists();
-      });
+    it('job creation displays the time range step', async () => {
+      await ml.jobWizardCommon.assertTimeRangeSectionExists();
+    });
 
-      it('sets the timerange', async () => {
-        await ml.jobWizardCommon.clickUseFullDataButton(
-          'Jun 12, 2019 @ 00:04:19.000',
-          'Jul 12, 2019 @ 23:45:36.000'
-        );
-      });
-
-      it('displays the event rate chart', async () => {
-        await ml.jobWizardCommon.assertEventRateChartExists();
-        await ml.jobWizardCommon.assertEventRateChartHasData();
-      });
-
-      it('displays the pick fields step', async () => {
-        await ml.jobWizardCommon.advanceToPickFieldsSection();
-      });
-
-      it('selects the population field', async () => {
-        await ml.jobWizardPopulation.assertPopulationFieldInputExists();
-        await ml.jobWizardPopulation.selectPopulationField(populationField);
-      });
-
-      it('selects detectors and displays detector previews', async () => {
-        for (const [index, detector] of detectors.entries()) {
-          await ml.jobWizardCommon.assertAggAndFieldInputExists();
-          await ml.jobWizardCommon.selectAggAndField(detector.identifier, false);
-          await ml.jobWizardCommon.assertDetectorPreviewExists(
-            detector.identifier,
-            index,
-            'SCATTER'
-          );
-        }
-      });
-
-      it('inputs detector split fields and displays split cards', async () => {
-        for (const [index, detector] of detectors.entries()) {
-          await ml.jobWizardPopulation.assertDetectorSplitFieldInputExists(index);
-          await ml.jobWizardPopulation.selectDetectorSplitField(index, detector.splitField);
-
-          await ml.jobWizardPopulation.assertDetectorSplitExists(index);
-          await ml.jobWizardPopulation.assertDetectorSplitFrontCardTitle(
-            index,
-            detector.frontCardTitle
-          );
-          await ml.jobWizardPopulation.assertDetectorSplitNumberOfBackCards(
-            index,
-            detector.numberOfBackCards
-          );
-        }
-      });
-
-      it('displays the influencer field', async () => {
-        await ml.jobWizardCommon.assertInfluencerInputExists();
-        await ml.jobWizardCommon.assertInfluencerSelection(
-          [populationField].concat(detectors.map(detector => detector.splitField))
+    it('job creation sets the timerange', async () => {
+      await ml.jobWizardCommon.clickUseFullDataButton(
+        'Jun 12, 2019 @ 00:04:19.000',
+        'Jul 12, 2019 @ 23:45:36.000'
+      );
+    });
+
+    it('job creation displays the event rate chart', async () => {
+      await ml.jobWizardCommon.assertEventRateChartExists();
+      await ml.jobWizardCommon.assertEventRateChartHasData();
+    });
+
+    it('job creation displays the pick fields step', async () => {
+      await ml.jobWizardCommon.advanceToPickFieldsSection();
+    });
+
+    it('job creation selects the population field', async () => {
+      await ml.jobWizardPopulation.assertPopulationFieldInputExists();
+      await ml.jobWizardPopulation.selectPopulationField(populationField);
+    });
+
+    it('job creation selects detectors and displays detector previews', async () => {
+      for (const [index, detector] of detectors.entries()) {
+        await ml.jobWizardCommon.assertAggAndFieldInputExists();
+        await ml.jobWizardCommon.selectAggAndField(detector.identifier, false);
+        await ml.jobWizardCommon.assertDetectorPreviewExists(detector.identifier, index, 'SCATTER');
+      }
+    });
+
+    it('job creation inputs detector split fields and displays split cards', async () => {
+      for (const [index, detector] of detectors.entries()) {
+        await ml.jobWizardPopulation.assertDetectorSplitFieldInputExists(index);
+        await ml.jobWizardPopulation.selectDetectorSplitField(index, detector.splitField);
+
+        await ml.jobWizardPopulation.assertDetectorSplitExists(index);
+        await ml.jobWizardPopulation.assertDetectorSplitFrontCardTitle(
+          index,
+          detector.frontCardTitle
         );
-      });
-
-      it('inputs the bucket span', async () => {
-        await ml.jobWizardCommon.assertBucketSpanInputExists();
-        await ml.jobWizardCommon.setBucketSpan(bucketSpan);
-      });
-
-      it('displays the job details step', async () => {
-        await ml.jobWizardCommon.advanceToJobDetailsSection();
-      });
-
-      it('inputs the job id', async () => {
-        await ml.jobWizardCommon.assertJobIdInputExists();
-        await ml.jobWizardCommon.setJobId(jobId);
-      });
-
-      it('inputs the job description', async () => {
-        await ml.jobWizardCommon.assertJobDescriptionInputExists();
-        await ml.jobWizardCommon.setJobDescription(jobDescription);
-      });
-
-      it('inputs job groups', async () => {
-        await ml.jobWizardCommon.assertJobGroupInputExists();
-        for (const jobGroup of jobGroups) {
-          await ml.jobWizardCommon.addJobGroup(jobGroup);
-        }
-        await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-      });
-
-      it('opens the advanced section', async () => {
-        await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-      });
-
-      it('displays the model plot switch', async () => {
-        await ml.jobWizardCommon.assertModelPlotSwitchExists();
-      });
-
-      it('enables the dedicated index switch', async () => {
-        await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
-        await ml.jobWizardCommon.activateDedicatedIndexSwitch();
-      });
-
-      it('inputs the model memory limit', async () => {
-        await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-        await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
-      });
-
-      it('displays the validation step', async () => {
-        await ml.jobWizardCommon.advanceToValidationSection();
-      });
-
-      it('displays the summary step', async () => {
-        await ml.jobWizardCommon.advanceToSummarySection();
-      });
-
-      it('creates the job and finishes processing', async () => {
-        await ml.jobWizardCommon.assertCreateJobButtonExists();
-        await ml.jobWizardCommon.createJobAndWaitForCompletion();
-      });
-
-      it('displays the created job in the job list', async () => {
-        await ml.navigation.navigateToMl();
-        await ml.navigation.navigateToJobManagement();
-
-        await ml.jobTable.waitForJobsToLoad();
-        await ml.jobTable.filterWithSearchString(jobId);
-        const rows = await ml.jobTable.parseJobTable();
-        expect(rows.filter(row => row.id === jobId)).to.have.length(1);
-      });
-
-      it('displays details for the created job in the job list', async () => {
-        await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
-
-        await ml.jobTable.assertJobRowDetailsCounts(
-          jobId,
-          getExpectedCounts(jobId),
-          getExpectedModelSizeStats(jobId)
+        await ml.jobWizardPopulation.assertDetectorSplitNumberOfBackCards(
+          index,
+          detector.numberOfBackCards
         );
-      });
+      }
+    });
+
+    it('job creation displays the influencer field', async () => {
+      await ml.jobWizardCommon.assertInfluencerInputExists();
+      await ml.jobWizardCommon.assertInfluencerSelection(
+        [populationField].concat(detectors.map(detector => detector.splitField))
+      );
     });
 
-    describe('job cloning', function() {
-      it('clicks the clone action and loads the population wizard', async () => {
-        await ml.jobTable.clickCloneJobAction(jobId);
-        await ml.jobTypeSelection.assertPopulationJobWizardOpen();
-      });
+    it('job creation inputs the bucket span', async () => {
+      await ml.jobWizardCommon.assertBucketSpanInputExists();
+      await ml.jobWizardCommon.setBucketSpan(bucketSpan);
+    });
 
-      it('displays the time range step', async () => {
-        await ml.jobWizardCommon.assertTimeRangeSectionExists();
-      });
+    it('job creation displays the job details step', async () => {
+      await ml.jobWizardCommon.advanceToJobDetailsSection();
+    });
 
-      it('sets the timerange', async () => {
-        await ml.jobWizardCommon.clickUseFullDataButton(
-          'Jun 12, 2019 @ 00:04:19.000',
-          'Jul 12, 2019 @ 23:45:36.000'
-        );
-      });
-
-      it('displays the event rate chart', async () => {
-        await ml.jobWizardCommon.assertEventRateChartExists();
-        await ml.jobWizardCommon.assertEventRateChartHasData();
-      });
-
-      it('displays the pick fields step', async () => {
-        await ml.jobWizardCommon.advanceToPickFieldsSection();
-      });
-
-      it('pre-fills the population field', async () => {
-        await ml.jobWizardPopulation.assertPopulationFieldInputExists();
-        await ml.jobWizardPopulation.assertPopulationFieldSelection(populationField);
-      });
-
-      it('pre-fills detectors and shows preview with split cards', async () => {
-        for (const [index, detector] of detectors.entries()) {
-          await ml.jobWizardCommon.assertDetectorPreviewExists(
-            detector.identifier,
-            index,
-            'SCATTER'
-          );
-
-          await ml.jobWizardPopulation.assertDetectorSplitFieldSelection(
-            index,
-            detector.splitField
-          );
-          await ml.jobWizardPopulation.assertDetectorSplitExists(index);
-          await ml.jobWizardPopulation.assertDetectorSplitFrontCardTitle(
-            index,
-            detector.frontCardTitle
-          );
-          await ml.jobWizardPopulation.assertDetectorSplitNumberOfBackCards(
-            index,
-            detector.numberOfBackCards
-          );
-        }
-      });
-
-      it('pre-fills influencers', async () => {
-        await ml.jobWizardCommon.assertInfluencerInputExists();
-        await ml.jobWizardCommon.assertInfluencerSelection(
-          [populationField].concat(detectors.map(detector => detector.splitField))
+    it('job creation inputs the job id', async () => {
+      await ml.jobWizardCommon.assertJobIdInputExists();
+      await ml.jobWizardCommon.setJobId(jobId);
+    });
+
+    it('job creation inputs the job description', async () => {
+      await ml.jobWizardCommon.assertJobDescriptionInputExists();
+      await ml.jobWizardCommon.setJobDescription(jobDescription);
+    });
+
+    it('job creation inputs job groups', async () => {
+      await ml.jobWizardCommon.assertJobGroupInputExists();
+      for (const jobGroup of jobGroups) {
+        await ml.jobWizardCommon.addJobGroup(jobGroup);
+      }
+      await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
+    });
+
+    it('job creation opens the advanced section', async () => {
+      await ml.jobWizardCommon.ensureAdvancedSectionOpen();
+    });
+
+    it('job creation displays the model plot switch', async () => {
+      await ml.jobWizardCommon.assertModelPlotSwitchExists();
+    });
+
+    it('job creation enables the dedicated index switch', async () => {
+      await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
+      await ml.jobWizardCommon.activateDedicatedIndexSwitch();
+    });
+
+    it('job creation inputs the model memory limit', async () => {
+      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
+    });
+
+    it('job creation displays the validation step', async () => {
+      await ml.jobWizardCommon.advanceToValidationSection();
+    });
+
+    it('job creation displays the summary step', async () => {
+      await ml.jobWizardCommon.advanceToSummarySection();
+    });
+
+    it('job creation creates the job and finishes processing', async () => {
+      await ml.jobWizardCommon.assertCreateJobButtonExists();
+      await ml.jobWizardCommon.createJobAndWaitForCompletion();
+    });
+
+    it('job creation displays the created job in the job list', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+
+      await ml.jobTable.waitForJobsToLoad();
+      await ml.jobTable.filterWithSearchString(jobId);
+      const rows = await ml.jobTable.parseJobTable();
+      expect(rows.filter(row => row.id === jobId)).to.have.length(1);
+    });
+
+    it('job creation displays details for the created job in the job list', async () => {
+      await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
+
+      await ml.jobTable.assertJobRowDetailsCounts(
+        jobId,
+        getExpectedCounts(jobId),
+        getExpectedModelSizeStats(jobId)
+      );
+    });
+
+    it('job creation has detector results', async () => {
+      for (let i = 0; i < detectors.length; i++) {
+        await ml.api.assertDetectorResultsExist(jobId, i);
+      }
+    });
+
+    it('job cloning clicks the clone action and loads the population wizard', async () => {
+      await ml.jobTable.clickCloneJobAction(jobId);
+      await ml.jobTypeSelection.assertPopulationJobWizardOpen();
+    });
+
+    it('job cloning displays the time range step', async () => {
+      await ml.jobWizardCommon.assertTimeRangeSectionExists();
+    });
+
+    it('job cloning sets the timerange', async () => {
+      await ml.jobWizardCommon.clickUseFullDataButton(
+        'Jun 12, 2019 @ 00:04:19.000',
+        'Jul 12, 2019 @ 23:45:36.000'
+      );
+    });
+
+    it('job cloning displays the event rate chart', async () => {
+      await ml.jobWizardCommon.assertEventRateChartExists();
+      await ml.jobWizardCommon.assertEventRateChartHasData();
+    });
+
+    it('job cloning displays the pick fields step', async () => {
+      await ml.jobWizardCommon.advanceToPickFieldsSection();
+    });
+
+    it('job cloning pre-fills the population field', async () => {
+      await ml.jobWizardPopulation.assertPopulationFieldInputExists();
+      await ml.jobWizardPopulation.assertPopulationFieldSelection([populationField]);
+    });
+
+    it('job cloning pre-fills detectors and shows preview with split cards', async () => {
+      for (const [index, detector] of detectors.entries()) {
+        await ml.jobWizardCommon.assertDetectorPreviewExists(detector.identifier, index, 'SCATTER');
+
+        await ml.jobWizardPopulation.assertDetectorSplitFieldSelection(index, [
+          detector.splitField,
+        ]);
+        await ml.jobWizardPopulation.assertDetectorSplitExists(index);
+        await ml.jobWizardPopulation.assertDetectorSplitFrontCardTitle(
+          index,
+          detector.frontCardTitle
         );
-      });
-
-      it('pre-fills the bucket span', async () => {
-        await ml.jobWizardCommon.assertBucketSpanInputExists();
-        await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
-      });
-
-      it('displays the job details step', async () => {
-        await ml.jobWizardCommon.advanceToJobDetailsSection();
-      });
-
-      it('does not pre-fill the job id', async () => {
-        await ml.jobWizardCommon.assertJobIdInputExists();
-        await ml.jobWizardCommon.assertJobIdValue('');
-      });
-
-      it('inputs the clone job id', async () => {
-        await ml.jobWizardCommon.setJobId(jobIdClone);
-      });
-
-      it('pre-fills the job description', async () => {
-        await ml.jobWizardCommon.assertJobDescriptionInputExists();
-        await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
-      });
-
-      it('pre-fills job groups', async () => {
-        await ml.jobWizardCommon.assertJobGroupInputExists();
-        await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-      });
-
-      it('inputs the clone job group', async () => {
-        await ml.jobWizardCommon.assertJobGroupInputExists();
-        await ml.jobWizardCommon.addJobGroup('clone');
-        await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
-      });
-
-      it('opens the advanced section', async () => {
-        await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-      });
-
-      it('pre-fills the model plot switch', async () => {
-        await ml.jobWizardCommon.assertModelPlotSwitchExists();
-        await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false);
-      });
-
-      it('pre-fills the dedicated index switch', async () => {
-        await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
-        await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
-      });
-
-      it('pre-fills the model memory limit', async () => {
-        await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-        await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
-      });
-
-      it('displays the validation step', async () => {
-        await ml.jobWizardCommon.advanceToValidationSection();
-      });
-
-      it('displays the summary step', async () => {
-        await ml.jobWizardCommon.advanceToSummarySection();
-      });
-
-      it('creates the job and finishes processing', async () => {
-        await ml.jobWizardCommon.assertCreateJobButtonExists();
-        await ml.jobWizardCommon.createJobAndWaitForCompletion();
-      });
-
-      it('displays the created job in the job list', async () => {
-        await ml.navigation.navigateToMl();
-        await ml.navigation.navigateToJobManagement();
-
-        await ml.jobTable.waitForJobsToLoad();
-        await ml.jobTable.filterWithSearchString(jobIdClone);
-        const rows = await ml.jobTable.parseJobTable();
-        expect(rows.filter(row => row.id === jobIdClone)).to.have.length(1);
-      });
-
-      it('displays details for the created job in the job list', async () => {
-        await ml.jobTable.assertJobRowFields(
-          jobIdClone,
-          getExpectedRow(jobIdClone, jobGroupsClone)
+        await ml.jobWizardPopulation.assertDetectorSplitNumberOfBackCards(
+          index,
+          detector.numberOfBackCards
         );
+      }
+    });
 
-        await ml.jobTable.assertJobRowDetailsCounts(
-          jobIdClone,
-          getExpectedCounts(jobIdClone),
-          getExpectedModelSizeStats(jobIdClone)
-        );
-      });
+    it('job cloning pre-fills influencers', async () => {
+      await ml.jobWizardCommon.assertInfluencerInputExists();
+      await ml.jobWizardCommon.assertInfluencerSelection(
+        [populationField].concat(detectors.map(detector => detector.splitField))
+      );
+    });
+
+    it('job cloning pre-fills the bucket span', async () => {
+      await ml.jobWizardCommon.assertBucketSpanInputExists();
+      await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
+    });
+
+    it('job cloning displays the job details step', async () => {
+      await ml.jobWizardCommon.advanceToJobDetailsSection();
+    });
+
+    it('job cloning does not pre-fill the job id', async () => {
+      await ml.jobWizardCommon.assertJobIdInputExists();
+      await ml.jobWizardCommon.assertJobIdValue('');
+    });
+
+    it('job cloning inputs the clone job id', async () => {
+      await ml.jobWizardCommon.setJobId(jobIdClone);
+    });
+
+    it('job cloning pre-fills the job description', async () => {
+      await ml.jobWizardCommon.assertJobDescriptionInputExists();
+      await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
+    });
+
+    it('job cloning pre-fills job groups', async () => {
+      await ml.jobWizardCommon.assertJobGroupInputExists();
+      await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
+    });
+
+    it('job cloning inputs the clone job group', async () => {
+      await ml.jobWizardCommon.assertJobGroupInputExists();
+      await ml.jobWizardCommon.addJobGroup('clone');
+      await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
+    });
+
+    it('job cloning opens the advanced section', async () => {
+      await ml.jobWizardCommon.ensureAdvancedSectionOpen();
+    });
+
+    it('job cloning pre-fills the model plot switch', async () => {
+      await ml.jobWizardCommon.assertModelPlotSwitchExists();
+      await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(false);
+    });
+
+    it('job cloning pre-fills the dedicated index switch', async () => {
+      await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
+      await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
+    });
+
+    it('job cloning pre-fills the model memory limit', async () => {
+      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
+    });
+
+    it('job cloning displays the validation step', async () => {
+      await ml.jobWizardCommon.advanceToValidationSection();
+    });
+
+    it('job cloning displays the summary step', async () => {
+      await ml.jobWizardCommon.advanceToSummarySection();
+    });
+
+    it('job cloning creates the job and finishes processing', async () => {
+      await ml.jobWizardCommon.assertCreateJobButtonExists();
+      await ml.jobWizardCommon.createJobAndWaitForCompletion();
+    });
+
+    it('job cloning displays the created job in the job list', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+
+      await ml.jobTable.waitForJobsToLoad();
+      await ml.jobTable.filterWithSearchString(jobIdClone);
+      const rows = await ml.jobTable.parseJobTable();
+      expect(rows.filter(row => row.id === jobIdClone)).to.have.length(1);
+    });
+
+    it('job cloning displays details for the created job in the job list', async () => {
+      await ml.jobTable.assertJobRowFields(jobIdClone, getExpectedRow(jobIdClone, jobGroupsClone));
+
+      await ml.jobTable.assertJobRowDetailsCounts(
+        jobIdClone,
+        getExpectedCounts(jobIdClone),
+        getExpectedModelSizeStats(jobIdClone)
+      );
+    });
+
+    it('job cloning has detector results', async () => {
+      for (let i = 0; i < detectors.length; i++) {
+        await ml.api.assertDetectorResultsExist(jobId, i);
+      }
     });
   });
 }
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
index 9591cdd3ff561a..0330e141b08904 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/saved_search_job.ts
@@ -274,7 +274,7 @@ export default function({ getService }: FtrProviderContext) {
   describe('saved search', function() {
     this.tags(['smoke', 'mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.load('ml/farequote');
     });
 
     after(async () => {
@@ -283,45 +283,45 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     for (const testData of testDataList) {
-      describe(`job creation ${testData.suiteTitle}`, function() {
-        it('loads the job management page', async () => {
+      describe(` ${testData.suiteTitle}`, function() {
+        it('job creation loads the job management page', async () => {
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToJobManagement();
         });
 
-        it('loads the new job source selection page', async () => {
+        it('job creation loads the new job source selection page', async () => {
           await ml.jobManagement.navigateToNewJobSourceSelection();
         });
 
-        it('loads the job type selection page', async () => {
+        it('job creation loads the job type selection page', async () => {
           await ml.jobSourceSelection.selectSource(testData.jobSource);
         });
 
-        it('loads the multi metric job wizard page', async () => {
+        it('job creation loads the multi metric job wizard page', async () => {
           await ml.jobTypeSelection.selectMultiMetricJob();
         });
 
-        it('displays the time range step', async () => {
+        it('job creation displays the time range step', async () => {
           await ml.jobWizardCommon.assertTimeRangeSectionExists();
         });
 
-        it('sets the timerange', async () => {
+        it('job creation sets the timerange', async () => {
           await ml.jobWizardCommon.clickUseFullDataButton(
             'Feb 7, 2016 @ 00:00:00.000',
             'Feb 11, 2016 @ 23:59:54.000'
           );
         });
 
-        it('displays the event rate chart', async () => {
+        it('job creation displays the event rate chart', async () => {
           await ml.jobWizardCommon.assertEventRateChartExists();
           await ml.jobWizardCommon.assertEventRateChartHasData();
         });
 
-        it('displays the pick fields step', async () => {
+        it('job creation displays the pick fields step', async () => {
           await ml.jobWizardCommon.advanceToPickFieldsSection();
         });
 
-        it('selects detectors and displays detector previews', async () => {
+        it('job creation selects detectors and displays detector previews', async () => {
           for (const [index, aggAndFieldIdentifier] of testData.aggAndFieldIdentifiers.entries()) {
             await ml.jobWizardCommon.assertAggAndFieldInputExists();
             await ml.jobWizardCommon.selectAggAndField(aggAndFieldIdentifier, false);
@@ -333,7 +333,7 @@ export default function({ getService }: FtrProviderContext) {
           }
         });
 
-        it('inputs the split field and displays split cards', async () => {
+        it('job creation inputs the split field and displays split cards', async () => {
           await ml.jobWizardMultiMetric.assertSplitFieldInputExists();
           await ml.jobWizardMultiMetric.selectSplitField(testData.splitField);
 
@@ -348,31 +348,31 @@ export default function({ getService }: FtrProviderContext) {
           await ml.jobWizardCommon.assertInfluencerSelection([testData.splitField]);
         });
 
-        it('displays the influencer field', async () => {
+        it('job creation displays the influencer field', async () => {
           await ml.jobWizardCommon.assertInfluencerInputExists();
           await ml.jobWizardCommon.assertInfluencerSelection([testData.splitField]);
         });
 
-        it('inputs the bucket span', async () => {
+        it('job creation inputs the bucket span', async () => {
           await ml.jobWizardCommon.assertBucketSpanInputExists();
           await ml.jobWizardCommon.setBucketSpan(testData.bucketSpan);
         });
 
-        it('displays the job details step', async () => {
+        it('job creation displays the job details step', async () => {
           await ml.jobWizardCommon.advanceToJobDetailsSection();
         });
 
-        it('inputs the job id', async () => {
+        it('job creation inputs the job id', async () => {
           await ml.jobWizardCommon.assertJobIdInputExists();
           await ml.jobWizardCommon.setJobId(testData.jobId);
         });
 
-        it('inputs the job description', async () => {
+        it('job creation inputs the job description', async () => {
           await ml.jobWizardCommon.assertJobDescriptionInputExists();
           await ml.jobWizardCommon.setJobDescription(testData.jobDescription);
         });
 
-        it('inputs job groups', async () => {
+        it('job creation inputs job groups', async () => {
           await ml.jobWizardCommon.assertJobGroupInputExists();
           for (const jobGroup of testData.jobGroups) {
             await ml.jobWizardCommon.addJobGroup(jobGroup);
@@ -380,38 +380,38 @@ export default function({ getService }: FtrProviderContext) {
           await ml.jobWizardCommon.assertJobGroupSelection(testData.jobGroups);
         });
 
-        it('opens the advanced section', async () => {
+        it('job creation opens the advanced section', async () => {
           await ml.jobWizardCommon.ensureAdvancedSectionOpen();
         });
 
-        it('displays the model plot switch', async () => {
+        it('job creation displays the model plot switch', async () => {
           await ml.jobWizardCommon.assertModelPlotSwitchExists();
         });
 
-        it('enables the dedicated index switch', async () => {
+        it('job creation enables the dedicated index switch', async () => {
           await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
           await ml.jobWizardCommon.activateDedicatedIndexSwitch();
         });
 
-        it('inputs the model memory limit', async () => {
+        it('job creation inputs the model memory limit', async () => {
           await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
           await ml.jobWizardCommon.setModelMemoryLimit(testData.memoryLimit);
         });
 
-        it('displays the validation step', async () => {
+        it('job creation displays the validation step', async () => {
           await ml.jobWizardCommon.advanceToValidationSection();
         });
 
-        it('displays the summary step', async () => {
+        it('job creation displays the summary step', async () => {
           await ml.jobWizardCommon.advanceToSummarySection();
         });
 
-        it('creates the job and finishes processing', async () => {
+        it('job creation creates the job and finishes processing', async () => {
           await ml.jobWizardCommon.assertCreateJobButtonExists();
           await ml.jobWizardCommon.createJobAndWaitForCompletion();
         });
 
-        it('displays the created job in the job list', async () => {
+        it('job creation displays the created job in the job list', async () => {
           await ml.navigation.navigateToMl();
           await ml.navigation.navigateToJobManagement();
 
@@ -421,7 +421,7 @@ export default function({ getService }: FtrProviderContext) {
           expect(rows.filter(row => row.id === testData.jobId)).to.have.length(1);
         });
 
-        it('displays details for the created job in the job list', async () => {
+        it('job creation displays details for the created job in the job list', async () => {
           await ml.jobTable.assertJobRowFields(testData.jobId, {
             id: testData.jobId,
             description: testData.jobDescription,
@@ -468,6 +468,12 @@ export default function({ getService }: FtrProviderContext) {
             }
           );
         });
+
+        it('has detector results', async () => {
+          for (let i = 0; i < testData.aggAndFieldIdentifiers.length; i++) {
+            await ml.api.assertDetectorResultsExist(testData.jobId, i);
+          }
+        });
       });
     }
   });
diff --git a/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts b/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
index b5b3d2371bf1a8..b5a544b7af9f67 100644
--- a/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
+++ b/x-pack/test/functional/apps/machine_learning/anomaly_detection/single_metric_job.ts
@@ -73,7 +73,7 @@ export default function({ getService }: FtrProviderContext) {
   describe('single metric', function() {
     this.tags(['smoke', 'mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.load('ml/farequote');
     });
 
     after(async () => {
@@ -81,274 +81,273 @@ export default function({ getService }: FtrProviderContext) {
       await ml.api.cleanMlIndices();
     });
 
-    describe('job creation', function() {
-      it('loads the job management page', async () => {
-        await ml.navigation.navigateToMl();
-        await ml.navigation.navigateToJobManagement();
-      });
-
-      it('loads the new job source selection page', async () => {
-        await ml.jobManagement.navigateToNewJobSourceSelection();
-      });
-
-      it('loads the job type selection page', async () => {
-        await ml.jobSourceSelection.selectSource('farequote');
-      });
-
-      it('loads the single metric job wizard page', async () => {
-        await ml.jobTypeSelection.selectSingleMetricJob();
-      });
-
-      it('displays the time range step', async () => {
-        await ml.jobWizardCommon.assertTimeRangeSectionExists();
-      });
-
-      it('sets the timerange', async () => {
-        await ml.jobWizardCommon.clickUseFullDataButton(
-          'Feb 7, 2016 @ 00:00:00.000',
-          'Feb 11, 2016 @ 23:59:54.000'
-        );
-      });
-
-      it('displays the event rate chart', async () => {
-        await ml.jobWizardCommon.assertEventRateChartExists();
-        await ml.jobWizardCommon.assertEventRateChartHasData();
-      });
-
-      it('displays the pick fields step', async () => {
-        await ml.jobWizardCommon.advanceToPickFieldsSection();
-      });
-
-      it('selects field and aggregation', async () => {
-        await ml.jobWizardCommon.assertAggAndFieldInputExists();
-        await ml.jobWizardCommon.selectAggAndField(aggAndFieldIdentifier, true);
-        await ml.jobWizardCommon.assertAnomalyChartExists('LINE');
-      });
-
-      it('inputs the bucket span', async () => {
-        await ml.jobWizardCommon.assertBucketSpanInputExists();
-        await ml.jobWizardCommon.setBucketSpan(bucketSpan);
-      });
-
-      it('displays the job details step', async () => {
-        await ml.jobWizardCommon.advanceToJobDetailsSection();
-      });
-
-      it('inputs the job id', async () => {
-        await ml.jobWizardCommon.assertJobIdInputExists();
-        await ml.jobWizardCommon.setJobId(jobId);
-      });
-
-      it('inputs the job description', async () => {
-        await ml.jobWizardCommon.assertJobDescriptionInputExists();
-        await ml.jobWizardCommon.setJobDescription(jobDescription);
-      });
-
-      it('inputs job groups', async () => {
-        await ml.jobWizardCommon.assertJobGroupInputExists();
-        for (const jobGroup of jobGroups) {
-          await ml.jobWizardCommon.addJobGroup(jobGroup);
-        }
-        await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-      });
-
-      it('opens the advanced section', async () => {
-        await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-      });
-
-      it('displays the model plot switch', async () => {
-        await ml.jobWizardCommon.assertModelPlotSwitchExists();
-      });
-
-      it('enables the dedicated index switch', async () => {
-        await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
-        await ml.jobWizardCommon.activateDedicatedIndexSwitch();
-      });
-
-      it('inputs the model memory limit', async () => {
-        await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-        await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
-      });
-
-      it('displays the validation step', async () => {
-        await ml.jobWizardCommon.advanceToValidationSection();
-      });
-
-      it('displays the summary step', async () => {
-        await ml.jobWizardCommon.advanceToSummarySection();
-      });
-
-      it('creates the job and finishes processing', async () => {
-        await ml.jobWizardCommon.assertCreateJobButtonExists();
-        await ml.jobWizardCommon.createJobAndWaitForCompletion();
-      });
-
-      it('displays the created job in the job list', async () => {
-        await ml.navigation.navigateToMl();
-        await ml.navigation.navigateToJobManagement();
-
-        await ml.jobTable.waitForJobsToLoad();
-        await ml.jobTable.filterWithSearchString(jobId);
-        const rows = await ml.jobTable.parseJobTable();
-        expect(rows.filter(row => row.id === jobId)).to.have.length(1);
-      });
-
-      it('displays details for the created job in the job list', async () => {
-        await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
-
-        await ml.jobTable.assertJobRowDetailsCounts(
-          jobId,
-          getExpectedCounts(jobId),
-          getExpectedModelSizeStats(jobId)
-        );
-      });
-    });
-
-    describe('job cloning', function() {
-      it('clicks the clone action and loads the single metric wizard', async () => {
-        await ml.jobTable.clickCloneJobAction(jobId);
-        await ml.jobTypeSelection.assertSingleMetricJobWizardOpen();
-      });
-
-      it('displays the time range step', async () => {
-        await ml.jobWizardCommon.assertTimeRangeSectionExists();
-      });
-
-      it('sets the timerange', async () => {
-        await ml.jobWizardCommon.clickUseFullDataButton(
-          'Feb 7, 2016 @ 00:00:00.000',
-          'Feb 11, 2016 @ 23:59:54.000'
-        );
-      });
-
-      it('displays the event rate chart', async () => {
-        await ml.jobWizardCommon.assertEventRateChartExists();
-        await ml.jobWizardCommon.assertEventRateChartHasData();
-      });
-
-      it('displays the pick fields step', async () => {
-        await ml.jobWizardCommon.advanceToPickFieldsSection();
-      });
-
-      it('pre-fills field and aggregation', async () => {
-        await ml.jobWizardCommon.assertAggAndFieldInputExists();
-        await ml.jobWizardCommon.assertAggAndFieldSelection(aggAndFieldIdentifier);
-        await ml.jobWizardCommon.assertAnomalyChartExists('LINE');
-      });
-
-      it('pre-fills the bucket span', async () => {
-        await ml.jobWizardCommon.assertBucketSpanInputExists();
-        await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
-      });
-
-      it('displays the job details step', async () => {
-        await ml.jobWizardCommon.advanceToJobDetailsSection();
-      });
-
-      it('does not pre-fill the job id', async () => {
-        await ml.jobWizardCommon.assertJobIdInputExists();
-        await ml.jobWizardCommon.assertJobIdValue('');
-      });
-
-      it('inputs the clone job id', async () => {
-        await ml.jobWizardCommon.setJobId(jobIdClone);
-      });
-
-      it('pre-fills the job description', async () => {
-        await ml.jobWizardCommon.assertJobDescriptionInputExists();
-        await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
-      });
-
-      it('pre-fills job groups', async () => {
-        await ml.jobWizardCommon.assertJobGroupInputExists();
-        await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
-      });
-
-      it('inputs the clone job group', async () => {
-        await ml.jobWizardCommon.assertJobGroupInputExists();
-        await ml.jobWizardCommon.addJobGroup('clone');
-        await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
-      });
-
-      it('opens the advanced section', async () => {
-        await ml.jobWizardCommon.ensureAdvancedSectionOpen();
-      });
-
-      it('pre-fills the model plot switch', async () => {
-        await ml.jobWizardCommon.assertModelPlotSwitchExists();
-        await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(true);
-      });
-
-      it('pre-fills the dedicated index switch', async () => {
-        await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
-        await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
-      });
-
-      it('pre-fills the model memory limit', async () => {
-        await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
-        await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
-      });
-
-      it('displays the validation step', async () => {
-        await ml.jobWizardCommon.advanceToValidationSection();
-      });
-
-      it('displays the summary step', async () => {
-        await ml.jobWizardCommon.advanceToSummarySection();
-      });
-
-      it('creates the job and finishes processing', async () => {
-        await ml.jobWizardCommon.assertCreateJobButtonExists();
-        await ml.jobWizardCommon.createJobAndWaitForCompletion();
-      });
-
-      it('displays the created job in the job list', async () => {
-        await ml.navigation.navigateToMl();
-        await ml.navigation.navigateToJobManagement();
-
-        await ml.jobTable.waitForJobsToLoad();
-        await ml.jobTable.filterWithSearchString(jobIdClone);
-        const rows = await ml.jobTable.parseJobTable();
-        expect(rows.filter(row => row.id === jobIdClone)).to.have.length(1);
-      });
-
-      it('displays details for the created job in the job list', async () => {
-        await ml.jobTable.assertJobRowFields(
-          jobIdClone,
-          getExpectedRow(jobIdClone, jobGroupsClone)
-        );
-
-        await ml.jobTable.assertJobRowDetailsCounts(
-          jobIdClone,
-          getExpectedCounts(jobIdClone),
-          getExpectedModelSizeStats(jobIdClone)
-        );
-      });
-    });
-
-    describe('job deletion', function() {
-      it('has results for the job before deletion', async () => {
-        await ml.api.assertJobResultsExist(jobIdClone);
-      });
-
-      it('triggers the delete action', async () => {
-        await ml.jobTable.clickDeleteJobAction(jobIdClone);
-      });
-
-      it('confirms the delete modal', async () => {
-        await ml.jobTable.confirmDeleteJobModal();
-      });
-
-      it('does not display the deleted job in the job list any more', async () => {
-        await ml.jobTable.waitForJobsToLoad();
-        await ml.jobTable.filterWithSearchString(jobIdClone);
-        const rows = await ml.jobTable.parseJobTable();
-        expect(rows.filter(row => row.id === jobIdClone)).to.have.length(0);
-      });
-
-      it('does not have results for the deleted job any more', async () => {
-        await ml.api.assertNoJobResultsExist(jobIdClone);
-      });
+    it('job creation loads the job management page', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+    });
+
+    it('job creation loads the new job source selection page', async () => {
+      await ml.jobManagement.navigateToNewJobSourceSelection();
+    });
+
+    it('job creation loads the job type selection page', async () => {
+      await ml.jobSourceSelection.selectSource('farequote');
+    });
+
+    it('job creation loads the single metric job wizard page', async () => {
+      await ml.jobTypeSelection.selectSingleMetricJob();
+    });
+
+    it('job creation displays the time range step', async () => {
+      await ml.jobWizardCommon.assertTimeRangeSectionExists();
+    });
+
+    it('job creation sets the timerange', async () => {
+      await ml.jobWizardCommon.clickUseFullDataButton(
+        'Feb 7, 2016 @ 00:00:00.000',
+        'Feb 11, 2016 @ 23:59:54.000'
+      );
+    });
+
+    it('job creation displays the event rate chart', async () => {
+      await ml.jobWizardCommon.assertEventRateChartExists();
+      await ml.jobWizardCommon.assertEventRateChartHasData();
+    });
+
+    it('job creation displays the pick fields step', async () => {
+      await ml.jobWizardCommon.advanceToPickFieldsSection();
+    });
+
+    it('job creation selects field and aggregation', async () => {
+      await ml.jobWizardCommon.assertAggAndFieldInputExists();
+      await ml.jobWizardCommon.selectAggAndField(aggAndFieldIdentifier, true);
+      await ml.jobWizardCommon.assertAnomalyChartExists('LINE');
+    });
+
+    it('job creation inputs the bucket span', async () => {
+      await ml.jobWizardCommon.assertBucketSpanInputExists();
+      await ml.jobWizardCommon.setBucketSpan(bucketSpan);
+    });
+
+    it('job creation displays the job details step', async () => {
+      await ml.jobWizardCommon.advanceToJobDetailsSection();
+    });
+
+    it('job creation inputs the job id', async () => {
+      await ml.jobWizardCommon.assertJobIdInputExists();
+      await ml.jobWizardCommon.setJobId(jobId);
+    });
+
+    it('job creation inputs the job description', async () => {
+      await ml.jobWizardCommon.assertJobDescriptionInputExists();
+      await ml.jobWizardCommon.setJobDescription(jobDescription);
+    });
+
+    it('job creation inputs job groups', async () => {
+      await ml.jobWizardCommon.assertJobGroupInputExists();
+      for (const jobGroup of jobGroups) {
+        await ml.jobWizardCommon.addJobGroup(jobGroup);
+      }
+      await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
+    });
+
+    it('job creation opens the advanced section', async () => {
+      await ml.jobWizardCommon.ensureAdvancedSectionOpen();
+    });
+
+    it('job creation displays the model plot switch', async () => {
+      await ml.jobWizardCommon.assertModelPlotSwitchExists();
+    });
+
+    it('job creation enables the dedicated index switch', async () => {
+      await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
+      await ml.jobWizardCommon.activateDedicatedIndexSwitch();
+    });
+
+    it('job creation inputs the model memory limit', async () => {
+      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      await ml.jobWizardCommon.setModelMemoryLimit(memoryLimit);
+    });
+
+    it('job creation displays the validation step', async () => {
+      await ml.jobWizardCommon.advanceToValidationSection();
+    });
+
+    it('job creation displays the summary step', async () => {
+      await ml.jobWizardCommon.advanceToSummarySection();
+    });
+
+    it('job creation creates the job and finishes processing', async () => {
+      await ml.jobWizardCommon.assertCreateJobButtonExists();
+      await ml.jobWizardCommon.createJobAndWaitForCompletion();
+    });
+
+    it('job creation displays the created job in the job list', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+
+      await ml.jobTable.waitForJobsToLoad();
+      await ml.jobTable.filterWithSearchString(jobId);
+      const rows = await ml.jobTable.parseJobTable();
+      expect(rows.filter(row => row.id === jobId)).to.have.length(1);
+    });
+
+    it('job creation displays details for the created job in the job list', async () => {
+      await ml.jobTable.assertJobRowFields(jobId, getExpectedRow(jobId, jobGroups));
+
+      await ml.jobTable.assertJobRowDetailsCounts(
+        jobId,
+        getExpectedCounts(jobId),
+        getExpectedModelSizeStats(jobId)
+      );
+    });
+
+    it('job creation has detector results', async () => {
+      await ml.api.assertDetectorResultsExist(jobId, 0);
+    });
+
+    it('job cloning clicks the clone action and loads the single metric wizard', async () => {
+      await ml.jobTable.clickCloneJobAction(jobId);
+      await ml.jobTypeSelection.assertSingleMetricJobWizardOpen();
+    });
+
+    it('job cloning displays the time range step', async () => {
+      await ml.jobWizardCommon.assertTimeRangeSectionExists();
+    });
+
+    it('job cloning sets the timerange', async () => {
+      await ml.jobWizardCommon.clickUseFullDataButton(
+        'Feb 7, 2016 @ 00:00:00.000',
+        'Feb 11, 2016 @ 23:59:54.000'
+      );
+    });
+
+    it('job cloning displays the event rate chart', async () => {
+      await ml.jobWizardCommon.assertEventRateChartExists();
+      await ml.jobWizardCommon.assertEventRateChartHasData();
+    });
+
+    it('job cloning displays the pick fields step', async () => {
+      await ml.jobWizardCommon.advanceToPickFieldsSection();
+    });
+
+    it('job cloning pre-fills field and aggregation', async () => {
+      await ml.jobWizardCommon.assertAggAndFieldInputExists();
+      await ml.jobWizardCommon.assertAggAndFieldSelection([aggAndFieldIdentifier]);
+      await ml.jobWizardCommon.assertAnomalyChartExists('LINE');
+    });
+
+    it('job cloning pre-fills the bucket span', async () => {
+      await ml.jobWizardCommon.assertBucketSpanInputExists();
+      await ml.jobWizardCommon.assertBucketSpanValue(bucketSpan);
+    });
+
+    it('job cloning displays the job details step', async () => {
+      await ml.jobWizardCommon.advanceToJobDetailsSection();
+    });
+
+    it('job cloning does not pre-fill the job id', async () => {
+      await ml.jobWizardCommon.assertJobIdInputExists();
+      await ml.jobWizardCommon.assertJobIdValue('');
+    });
+
+    it('job cloning inputs the clone job id', async () => {
+      await ml.jobWizardCommon.setJobId(jobIdClone);
+    });
+
+    it('job cloning pre-fills the job description', async () => {
+      await ml.jobWizardCommon.assertJobDescriptionInputExists();
+      await ml.jobWizardCommon.assertJobDescriptionValue(jobDescription);
+    });
+
+    it('job cloning pre-fills job groups', async () => {
+      await ml.jobWizardCommon.assertJobGroupInputExists();
+      await ml.jobWizardCommon.assertJobGroupSelection(jobGroups);
+    });
+
+    it('job cloning inputs the clone job group', async () => {
+      await ml.jobWizardCommon.assertJobGroupInputExists();
+      await ml.jobWizardCommon.addJobGroup('clone');
+      await ml.jobWizardCommon.assertJobGroupSelection(jobGroupsClone);
+    });
+
+    it('job cloning opens the advanced section', async () => {
+      await ml.jobWizardCommon.ensureAdvancedSectionOpen();
+    });
+
+    it('job cloning pre-fills the model plot switch', async () => {
+      await ml.jobWizardCommon.assertModelPlotSwitchExists();
+      await ml.jobWizardCommon.assertModelPlotSwitchCheckedState(true);
+    });
+
+    it('job cloning pre-fills the dedicated index switch', async () => {
+      await ml.jobWizardCommon.assertDedicatedIndexSwitchExists();
+      await ml.jobWizardCommon.assertDedicatedIndexSwitchCheckedState(true);
+    });
+
+    it('job cloning pre-fills the model memory limit', async () => {
+      await ml.jobWizardCommon.assertModelMemoryLimitInputExists();
+      await ml.jobWizardCommon.assertModelMemoryLimitValue(memoryLimit);
+    });
+
+    it('job cloning displays the validation step', async () => {
+      await ml.jobWizardCommon.advanceToValidationSection();
+    });
+
+    it('job cloning displays the summary step', async () => {
+      await ml.jobWizardCommon.advanceToSummarySection();
+    });
+
+    it('job cloning creates the job and finishes processing', async () => {
+      await ml.jobWizardCommon.assertCreateJobButtonExists();
+      await ml.jobWizardCommon.createJobAndWaitForCompletion();
+    });
+
+    it('job cloning displays the created job in the job list', async () => {
+      await ml.navigation.navigateToMl();
+      await ml.navigation.navigateToJobManagement();
+
+      await ml.jobTable.waitForJobsToLoad();
+      await ml.jobTable.filterWithSearchString(jobIdClone);
+      const rows = await ml.jobTable.parseJobTable();
+      expect(rows.filter(row => row.id === jobIdClone)).to.have.length(1);
+    });
+
+    it('job cloning displays details for the created job in the job list', async () => {
+      await ml.jobTable.assertJobRowFields(jobIdClone, getExpectedRow(jobIdClone, jobGroupsClone));
+
+      await ml.jobTable.assertJobRowDetailsCounts(
+        jobIdClone,
+        getExpectedCounts(jobIdClone),
+        getExpectedModelSizeStats(jobIdClone)
+      );
+    });
+
+    it('job cloning has detector results', async () => {
+      await ml.api.assertDetectorResultsExist(jobId, 0);
+    });
+
+    it('job deletion has results for the job before deletion', async () => {
+      await ml.api.assertJobResultsExist(jobIdClone);
+    });
+
+    it('job deletion triggers the delete action', async () => {
+      await ml.jobTable.clickDeleteJobAction(jobIdClone);
+    });
+
+    it('job deletion confirms the delete modal', async () => {
+      await ml.jobTable.confirmDeleteJobModal();
+    });
+
+    it('job deletion does not display the deleted job in the job list any more', async () => {
+      await ml.jobTable.waitForJobsToLoad();
+      await ml.jobTable.filterWithSearchString(jobIdClone);
+      const rows = await ml.jobTable.parseJobTable();
+      expect(rows.filter(row => row.id === jobIdClone)).to.have.length(0);
+    });
+
+    it('job deletion does not have results for the deleted job any more', async () => {
+      await ml.api.assertNoJobResultsExist(jobIdClone);
     });
   });
 }
diff --git a/x-pack/test/functional/apps/monitoring/time_filter.js b/x-pack/test/functional/apps/monitoring/time_filter.js
index e4254b487adfd0..0afcada14be5fb 100644
--- a/x-pack/test/functional/apps/monitoring/time_filter.js
+++ b/x-pack/test/functional/apps/monitoring/time_filter.js
@@ -27,7 +27,8 @@ export default function ({ getService, getPageObjects }) {
       await tearDown();
     });
 
-    it('should send another request when clicking Refresh', async () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/48910
+    it.skip('should send another request when clicking Refresh', async () => {
       await testSubjects.click('querySubmitButton');
       const isLoading = await PageObjects.header.isGlobalLoadingIndicatorVisible();
       expect(isLoading).to.be(true);
diff --git a/x-pack/test/functional/apps/uptime/overview.ts b/x-pack/test/functional/apps/uptime/overview.ts
index 96d4aa10149ea4..cdb904537a0f25 100644
--- a/x-pack/test/functional/apps/uptime/overview.ts
+++ b/x-pack/test/functional/apps/uptime/overview.ts
@@ -4,6 +4,7 @@
  * 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 ({ getPageObjects }: FtrProviderContext) => {
@@ -23,11 +24,45 @@ export default ({ getPageObjects }: FtrProviderContext) => {
 
     it('runs filter query without issues', async () => {
       await pageObjects.uptime.inputFilterQuery(
-        DEFAULT_DATE_START,
-        DEFAULT_DATE_END,
-        'monitor.status:up and monitor.id:"0000-intermittent"',
-        'monitor-page-link-0000-intermittent'
+        'monitor.status:up and monitor.id:"0000-intermittent"'
       );
+      await pageObjects.uptime.pageHasExpectedIds(['0000-intermittent']);
+    });
+
+    it('pagination is cleared when filter criteria changes', async () => {
+      await pageObjects.uptime.goToUptimePageAndSetDateRange(DEFAULT_DATE_START, DEFAULT_DATE_END);
+      await pageObjects.uptime.changePage('next');
+      // there should now be pagination data in the URL
+      const contains = await pageObjects.uptime.pageUrlContains('pagination');
+      expect(contains).to.be(true);
+      await pageObjects.uptime.pageHasExpectedIds([
+        '0010-down',
+        '0011-up',
+        '0012-up',
+        '0013-up',
+        '0014-up',
+        '0015-intermittent',
+        '0016-up',
+        '0017-up',
+        '0018-up',
+        '0019-up',
+      ]);
+      await pageObjects.uptime.setStatusFilter('up');
+      // ensure that pagination is removed from the URL
+      const doesNotContain = await pageObjects.uptime.pageUrlContains('pagination');
+      expect(doesNotContain).to.be(false);
+      await pageObjects.uptime.pageHasExpectedIds([
+        '0000-intermittent',
+        '0001-up',
+        '0002-up',
+        '0003-up',
+        '0004-up',
+        '0005-up',
+        '0006-up',
+        '0007-up',
+        '0008-up',
+        '0009-up',
+      ]);
     });
   });
 };
diff --git a/x-pack/test/functional/config.ie.js b/x-pack/test/functional/config.ie.js
index 7a46471726fcf5..af4e9f2e4866f6 100644
--- a/x-pack/test/functional/config.ie.js
+++ b/x-pack/test/functional/config.ie.js
@@ -34,7 +34,6 @@ export default async function ({ readConfigFile }) {
     //   require.resolve(__dirname, './apps/status_page'),
     //   require.resolve(__dirname, './apps/timelion'),
     //   require.resolve(__dirname, './apps/upgrade_assistant'),
-    //   require.resolve(__dirname, './apps/code'),
     //   require.resolve(__dirname, './apps/visualize'),
     //   require.resolve(__dirname, './apps/uptime'),
     //   require.resolve(__dirname, './apps/saved_objects_management'),
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index 3ec86a7fc17220..d1f03f2c136ff6 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -44,7 +44,6 @@ export default async function ({ readConfigFile }) {
       resolve(__dirname, './apps/status_page'),
       resolve(__dirname, './apps/timelion'),
       resolve(__dirname, './apps/upgrade_assistant'),
-      resolve(__dirname, './apps/code'),
       resolve(__dirname, './apps/visualize'),
       resolve(__dirname, './apps/uptime'),
       resolve(__dirname, './apps/saved_objects_management'),
@@ -83,7 +82,7 @@ export default async function ({ readConfigFile }) {
         '--xpack.reporting.csv.maxSizeBytes=2850', // small-ish limit for cutting off a 1999 byte report
         '--stats.maximumWaitTimeForAllCollectorsInS=1',
         '--xpack.security.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"', // server restarts should not invalidate active sessions
-        '--xpack.encrypted_saved_objects.encryptionKey="DkdXazszSCYexXqz4YktBGHCRkV6hyNK"',
+        '--xpack.encryptedSavedObjects.encryptionKey="DkdXazszSCYexXqz4YktBGHCRkV6hyNK"',
         '--telemetry.banner=false',
         '--timelion.ui.enabled=true',
       ],
diff --git a/x-pack/test/functional/es_archives/code/repositories/code_examples_flatten_directory/data.json.gz b/x-pack/test/functional/es_archives/code/repositories/code_examples_flatten_directory/data.json.gz
deleted file mode 100644
index 8c9134e2ce38be..00000000000000
Binary files a/x-pack/test/functional/es_archives/code/repositories/code_examples_flatten_directory/data.json.gz and /dev/null differ
diff --git a/x-pack/test/functional/es_archives/code/repositories/code_examples_flatten_directory/mappings.json b/x-pack/test/functional/es_archives/code/repositories/code_examples_flatten_directory/mappings.json
deleted file mode 100644
index f30d59647b1886..00000000000000
--- a/x-pack/test/functional/es_archives/code/repositories/code_examples_flatten_directory/mappings.json
+++ /dev/null
@@ -1,480 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".code-document-github.com-elastic-code-examples_flatten-directory-40bb5fb7": {
-      }
-    },
-    "index": ".code-document-github.com-elastic-code-examples_flatten-directory-40bb5fb7-1",
-    "mappings": {
-      "_meta": {
-        "version": 1
-      },
-      "dynamic_templates": [
-        {
-          "fieldDefaultNotAnalyzed": {
-            "mapping": {
-              "index": false,
-              "norms": false
-            },
-            "match": "*"
-          }
-        }
-      ],
-      "properties": {
-        "content": {
-          "analyzer": "content_analyzer",
-          "type": "text"
-        },
-        "language": {
-          "type": "keyword"
-        },
-        "path": {
-          "analyzer": "path_analyzer",
-          "fields": {
-            "hierarchy": {
-              "analyzer": "path_hierarchy_analyzer",
-              "type": "text"
-            },
-            "keyword": {
-              "type": "keyword"
-            }
-          },
-          "type": "text"
-        },
-        "qnames": {
-          "analyzer": "qname_path_hierarchy_analyzer",
-          "type": "text"
-        },
-        "repoUri": {
-          "type": "keyword"
-        },
-        "repository": {
-          "properties": {
-            "defaultBranch": {
-              "type": "keyword"
-            },
-            "indexedRevision": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "text"
-            },
-            "nextUpdateTimestamp": {
-              "index": false,
-              "type": "date"
-            },
-            "org": {
-              "type": "text"
-            },
-            "protocol": {
-              "index": false,
-              "norms": false,
-              "type": "text"
-            },
-            "revision": {
-              "type": "keyword"
-            },
-            "uri": {
-              "type": "text"
-            },
-            "url": {
-              "index": false,
-              "type": "text"
-            }
-          }
-        },
-        "repository_config": {
-          "properties": {
-            "disableGo": {
-              "type": "boolean"
-            },
-            "disableJava": {
-              "type": "boolean"
-            },
-            "disableTypescript": {
-              "type": "boolean"
-            },
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "repository_delete_status": {
-          "properties": {
-            "progress": {
-              "type": "integer"
-            },
-            "revision": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date"
-            },
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "repository_git_status": {
-          "properties": {
-            "cloneProgress": {
-              "properties": {
-                "indexedDeltas": {
-                  "type": "integer"
-                },
-                "indexedObjects": {
-                  "type": "integer"
-                },
-                "isCloned": {
-                  "type": "boolean"
-                },
-                "localObjects": {
-                  "type": "integer"
-                },
-                "receivedBytes": {
-                  "type": "integer"
-                },
-                "receivedObjects": {
-                  "type": "integer"
-                },
-                "totalDeltas": {
-                  "type": "integer"
-                },
-                "totalObjects": {
-                  "type": "integer"
-                }
-              }
-            },
-            "errorMessage": {
-              "type": "text"
-            },
-            "progress": {
-              "type": "integer"
-            },
-            "revision": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date"
-            },
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "repository_index_status": {
-          "properties": {
-            "commitIndexProgress": {
-              "properties": {
-                "checkpoint": {
-                  "type": "object"
-                },
-                "fail": {
-                  "type": "integer"
-                },
-                "percentage": {
-                  "type": "integer"
-                },
-                "success": {
-                  "type": "integer"
-                },
-                "total": {
-                  "type": "integer"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "indexProgress": {
-              "properties": {
-                "checkpoint": {
-                  "properties": {
-                    "filePath": {
-                      "index": false,
-                      "norms": false,
-                      "type": "text"
-                    },
-                    "repoUri": {
-                      "index": false,
-                      "norms": false,
-                      "type": "text"
-                    },
-                    "revision": {
-                      "index": false,
-                      "norms": false,
-                      "type": "text"
-                    }
-                  }
-                },
-                "fail": {
-                  "type": "integer"
-                },
-                "percentage": {
-                  "type": "integer"
-                },
-                "success": {
-                  "type": "integer"
-                },
-                "total": {
-                  "type": "integer"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "progress": {
-              "type": "integer"
-            },
-            "revision": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date"
-            },
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "repository_random_path": {
-          "type": "keyword"
-        },
-        "sha1": {
-          "index": false,
-          "norms": false,
-          "type": "text"
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "analysis": {
-          "analyzer": {
-            "content_analyzer": {
-              "char_filter": [
-                "content_char_filter"
-              ],
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "standard"
-            },
-            "lowercase_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "keyword",
-              "type": "custom"
-            },
-            "path_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "path_tokenizer",
-              "type": "custom"
-            },
-            "path_hierarchy_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "path_hierarchy_tokenizer",
-              "type": "custom"
-            },
-            "qname_path_hierarchy_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "qname_path_hierarchy_tokenizer",
-              "type": "custom"
-            }
-          },
-          "char_filter": {
-            "content_char_filter": {
-              "pattern": "[.]",
-              "replacement": " ",
-              "type": "pattern_replace"
-            }
-          },
-          "tokenizer": {
-            "path_hierarchy_tokenizer": {
-              "delimiter": "/",
-              "reverse": "true",
-              "type": "path_hierarchy"
-            },
-            "path_tokenizer": {
-              "pattern": "[\\\\./]",
-              "type": "pattern"
-            },
-            "qname_path_hierarchy_tokenizer": {
-              "delimiter": ".",
-              "reverse": "true",
-              "type": "path_hierarchy"
-            }
-          }
-        },
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".code-reference-github.com-elastic-code-examples_flatten-directory-40bb5fb7": {
-      }
-    },
-    "index": ".code-reference-github.com-elastic-code-examples_flatten-directory-40bb5fb7-1",
-    "mappings": {
-      "_meta": {
-        "version": 1
-      },
-      "dynamic_templates": [
-        {
-          "fieldDefaultNotAnalyzed": {
-            "mapping": {
-              "index": false,
-              "norms": false
-            },
-            "match": "*"
-          }
-        }
-      ],
-      "properties": {
-        "category": {
-          "type": "keyword"
-        },
-        "location": {
-          "properties": {
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "symbol": {
-          "properties": {
-            "kind": {
-              "type": "keyword"
-            },
-            "location": {
-              "properties": {
-                "uri": {
-                  "type": "text"
-                }
-              }
-            },
-            "name": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".code-symbol-github.com-elastic-code-examples_flatten-directory-40bb5fb7": {
-      }
-    },
-    "index": ".code-symbol-github.com-elastic-code-examples_flatten-directory-40bb5fb7-1",
-    "mappings": {
-      "_meta": {
-        "version": 1
-      },
-      "dynamic_templates": [
-        {
-          "fieldDefaultNotAnalyzed": {
-            "mapping": {
-              "index": false,
-              "norms": false
-            },
-            "match": "*"
-          }
-        }
-      ],
-      "properties": {
-        "qname": {
-          "analyzer": "qname_path_hierarchy_case_sensitive_analyzer",
-          "fields": {
-            "lowercased": {
-              "analyzer": "qname_path_hierarchy_case_insensitive_analyzer",
-              "type": "text"
-            }
-          },
-          "type": "text"
-        },
-        "symbolInformation": {
-          "properties": {
-            "kind": {
-              "index": false,
-              "type": "integer"
-            },
-            "location": {
-              "properties": {
-                "uri": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "name": {
-              "analyzer": "qname_path_hierarchy_case_sensitive_analyzer",
-              "fields": {
-                "lowercased": {
-                  "analyzer": "qname_path_hierarchy_case_insensitive_analyzer",
-                  "type": "text"
-                }
-              },
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "analysis": {
-          "analyzer": {
-            "qname_path_hierarchy_case_insensitive_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "qname_path_hierarchy_tokenizer",
-              "type": "custom"
-            },
-            "qname_path_hierarchy_case_sensitive_analyzer": {
-              "tokenizer": "qname_path_hierarchy_tokenizer",
-              "type": "custom"
-            }
-          },
-          "tokenizer": {
-            "qname_path_hierarchy_tokenizer": {
-              "delimiter": ".",
-              "reverse": "true",
-              "type": "path_hierarchy"
-            }
-          }
-        },
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
diff --git a/x-pack/test/functional/es_archives/code/repositories/typescript_node_starter/data.json.gz b/x-pack/test/functional/es_archives/code/repositories/typescript_node_starter/data.json.gz
deleted file mode 100644
index 5ba03fcf9b56fc..00000000000000
Binary files a/x-pack/test/functional/es_archives/code/repositories/typescript_node_starter/data.json.gz and /dev/null differ
diff --git a/x-pack/test/functional/es_archives/code/repositories/typescript_node_starter/mappings.json b/x-pack/test/functional/es_archives/code/repositories/typescript_node_starter/mappings.json
deleted file mode 100644
index da0033cbfd8b8d..00000000000000
--- a/x-pack/test/functional/es_archives/code/repositories/typescript_node_starter/mappings.json
+++ /dev/null
@@ -1,546 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".code-document-github.com-elastic-typescript-node-starter-f7555f82": {
-      }
-    },
-    "index": ".code-document-github.com-elastic-typescript-node-starter-f7555f82-1",
-    "mappings": {
-      "_meta": {
-        "version": 1
-      },
-      "dynamic_templates": [
-        {
-          "fieldDefaultNotAnalyzed": {
-            "mapping": {
-              "index": false,
-              "norms": false
-            },
-            "match": "*"
-          }
-        }
-      ],
-      "properties": {
-        "content": {
-          "analyzer": "content_analyzer",
-          "type": "text"
-        },
-        "language": {
-          "type": "keyword"
-        },
-        "path": {
-          "analyzer": "path_analyzer",
-          "fields": {
-            "hierarchy": {
-              "analyzer": "path_hierarchy_analyzer",
-              "type": "text"
-            },
-            "keyword": {
-              "type": "keyword"
-            }
-          },
-          "type": "text"
-        },
-        "qnames": {
-          "analyzer": "qname_path_hierarchy_analyzer",
-          "type": "text"
-        },
-        "repoUri": {
-          "type": "keyword"
-        },
-        "repository": {
-          "properties": {
-            "defaultBranch": {
-              "type": "keyword"
-            },
-            "indexedRevision": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "text"
-            },
-            "nextUpdateTimestamp": {
-              "index": false,
-              "type": "date"
-            },
-            "org": {
-              "type": "text"
-            },
-            "protocol": {
-              "index": false,
-              "norms": false,
-              "type": "text"
-            },
-            "revision": {
-              "type": "keyword"
-            },
-            "uri": {
-              "type": "text"
-            },
-            "url": {
-              "index": false,
-              "type": "text"
-            }
-          }
-        },
-        "repository_config": {
-          "properties": {
-            "disableGo": {
-              "type": "boolean"
-            },
-            "disableJava": {
-              "type": "boolean"
-            },
-            "disableTypescript": {
-              "type": "boolean"
-            },
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "repository_delete_status": {
-          "properties": {
-            "progress": {
-              "type": "integer"
-            },
-            "revision": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date"
-            },
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "repository_git_status": {
-          "properties": {
-            "cloneProgress": {
-              "properties": {
-                "indexedDeltas": {
-                  "type": "integer"
-                },
-                "indexedObjects": {
-                  "type": "integer"
-                },
-                "isCloned": {
-                  "type": "boolean"
-                },
-                "localObjects": {
-                  "type": "integer"
-                },
-                "receivedBytes": {
-                  "type": "integer"
-                },
-                "receivedObjects": {
-                  "type": "integer"
-                },
-                "totalDeltas": {
-                  "type": "integer"
-                },
-                "totalObjects": {
-                  "type": "integer"
-                }
-              }
-            },
-            "errorMessage": {
-              "type": "text"
-            },
-            "progress": {
-              "type": "integer"
-            },
-            "revision": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date"
-            },
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "repository_index_status": {
-          "properties": {
-            "commitIndexProgress": {
-              "properties": {
-                "checkpoint": {
-                  "type": "object"
-                },
-                "fail": {
-                  "type": "integer"
-                },
-                "percentage": {
-                  "type": "integer"
-                },
-                "success": {
-                  "type": "integer"
-                },
-                "total": {
-                  "type": "integer"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "indexProgress": {
-              "properties": {
-                "checkpoint": {
-                  "properties": {
-                    "filePath": {
-                      "index": false,
-                      "norms": false,
-                      "type": "text"
-                    },
-                    "repoUri": {
-                      "index": false,
-                      "norms": false,
-                      "type": "text"
-                    },
-                    "revision": {
-                      "index": false,
-                      "norms": false,
-                      "type": "text"
-                    }
-                  }
-                },
-                "fail": {
-                  "type": "integer"
-                },
-                "percentage": {
-                  "type": "integer"
-                },
-                "success": {
-                  "type": "integer"
-                },
-                "total": {
-                  "type": "integer"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "progress": {
-              "type": "integer"
-            },
-            "revision": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date"
-            },
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "repository_random_path": {
-          "type": "keyword"
-        },
-        "sha1": {
-          "index": false,
-          "norms": false,
-          "type": "text"
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "analysis": {
-          "analyzer": {
-            "content_analyzer": {
-              "char_filter": [
-                "content_char_filter"
-              ],
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "standard"
-            },
-            "lowercase_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "keyword",
-              "type": "custom"
-            },
-            "path_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "path_tokenizer",
-              "type": "custom"
-            },
-            "path_hierarchy_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "path_hierarchy_tokenizer",
-              "type": "custom"
-            },
-            "qname_path_hierarchy_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "qname_path_hierarchy_tokenizer",
-              "type": "custom"
-            }
-          },
-          "char_filter": {
-            "content_char_filter": {
-              "pattern": "[.]",
-              "replacement": " ",
-              "type": "pattern_replace"
-            }
-          },
-          "tokenizer": {
-            "path_hierarchy_tokenizer": {
-              "delimiter": "/",
-              "reverse": "true",
-              "type": "path_hierarchy"
-            },
-            "path_tokenizer": {
-              "pattern": "[\\\\./]",
-              "type": "pattern"
-            },
-            "qname_path_hierarchy_tokenizer": {
-              "delimiter": ".",
-              "reverse": "true",
-              "type": "path_hierarchy"
-            }
-          }
-        },
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".code-reference-github.com-elastic-typescript-node-starter-f7555f82": {
-      }
-    },
-    "index": ".code-reference-github.com-elastic-typescript-node-starter-f7555f82-1",
-    "mappings": {
-      "_meta": {
-        "version": 1
-      },
-      "dynamic_templates": [
-        {
-          "fieldDefaultNotAnalyzed": {
-            "mapping": {
-              "index": false,
-              "norms": false
-            },
-            "match": "*"
-          }
-        }
-      ],
-      "properties": {
-        "category": {
-          "type": "keyword"
-        },
-        "location": {
-          "properties": {
-            "uri": {
-              "type": "text"
-            }
-          }
-        },
-        "symbol": {
-          "properties": {
-            "kind": {
-              "type": "keyword"
-            },
-            "location": {
-              "properties": {
-                "uri": {
-                  "type": "text"
-                }
-              }
-            },
-            "name": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".code-symbol-github.com-elastic-typescript-node-starter-f7555f82": {
-      }
-    },
-    "index": ".code-symbol-github.com-elastic-typescript-node-starter-f7555f82-1",
-    "mappings": {
-      "_meta": {
-        "version": 1
-      },
-      "dynamic_templates": [
-        {
-          "fieldDefaultNotAnalyzed": {
-            "mapping": {
-              "index": false,
-              "norms": false
-            },
-            "match": "*"
-          }
-        }
-      ],
-      "properties": {
-        "contents": {
-          "properties": {
-            "language": {
-              "index": false,
-              "norms": false,
-              "type": "text"
-            },
-            "value": {
-              "index": false,
-              "norms": false,
-              "type": "text"
-            }
-          }
-        },
-        "package": {
-          "properties": {
-            "name": {
-              "index": false,
-              "norms": false,
-              "type": "text"
-            },
-            "repoUri": {
-              "index": false,
-              "norms": false,
-              "type": "text"
-            },
-            "version": {
-              "index": false,
-              "norms": false,
-              "type": "text"
-            }
-          }
-        },
-        "qname": {
-          "analyzer": "qname_path_hierarchy_case_sensitive_analyzer",
-          "fields": {
-            "lowercased": {
-              "analyzer": "qname_path_hierarchy_case_insensitive_analyzer",
-              "type": "text"
-            }
-          },
-          "type": "text"
-        },
-        "symbolInformation": {
-          "properties": {
-            "containerName": {
-              "index": false,
-              "norms": false,
-              "type": "text"
-            },
-            "kind": {
-              "index": false,
-              "type": "integer"
-            },
-            "location": {
-              "properties": {
-                "range": {
-                  "properties": {
-                    "end": {
-                      "properties": {
-                        "character": {
-                          "index": false,
-                          "type": "long"
-                        },
-                        "line": {
-                          "index": false,
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "start": {
-                      "properties": {
-                        "character": {
-                          "index": false,
-                          "type": "long"
-                        },
-                        "line": {
-                          "index": false,
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "uri": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "name": {
-              "analyzer": "qname_path_hierarchy_case_sensitive_analyzer",
-              "fields": {
-                "lowercased": {
-                  "analyzer": "qname_path_hierarchy_case_insensitive_analyzer",
-                  "type": "text"
-                }
-              },
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "analysis": {
-          "analyzer": {
-            "qname_path_hierarchy_case_insensitive_analyzer": {
-              "filter": [
-                "lowercase"
-              ],
-              "tokenizer": "qname_path_hierarchy_tokenizer",
-              "type": "custom"
-            },
-            "qname_path_hierarchy_case_sensitive_analyzer": {
-              "tokenizer": "qname_path_hierarchy_tokenizer",
-              "type": "custom"
-            }
-          },
-          "tokenizer": {
-            "qname_path_hierarchy_tokenizer": {
-              "delimiter": ".",
-              "reverse": "true",
-              "type": "path_hierarchy"
-            }
-          }
-        },
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/maps/kibana/data.json b/x-pack/test/functional/es_archives/maps/kibana/data.json
index 4b413a97377560..52a454eeeb7432 100644
--- a/x-pack/test/functional/es_archives/maps/kibana/data.json
+++ b/x-pack/test/functional/es_archives/maps/kibana/data.json
@@ -20,7 +20,7 @@
     "index": ".kibana",
     "source": {
       "index-pattern": {
-        "fields" : "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"@message\",\"subType\":\"multi\"},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"@tags\",\"subType\":\"multi\"},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"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\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"agent\",\"subType\":\"multi\"},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"extension\",\"subType\":\"multi\"},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"headings\",\"subType\":\"multi\"},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"host\",\"subType\":\"multi\"},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"index\",\"subType\":\"multi\"},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"links\",\"subType\":\"multi\"},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"machine.os\",\"subType\":\"multi\"},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.article:section\",\"subType\":\"multi\"},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.article:tag\",\"subType\":\"multi\"},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.og:description\",\"subType\":\"multi\"},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.og:image\",\"subType\":\"multi\"},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.og:image:height\",\"subType\":\"multi\"},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.og:image:width\",\"subType\":\"multi\"},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.og:site_name\",\"subType\":\"multi\"},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.og:title\",\"subType\":\"multi\"},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.og:type\",\"subType\":\"multi\"},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.og:url\",\"subType\":\"multi\"},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.twitter:card\",\"subType\":\"multi\"},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.twitter:description\",\"subType\":\"multi\"},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.twitter:image\",\"subType\":\"multi\"},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.twitter:site\",\"subType\":\"multi\"},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.twitter:title\",\"subType\":\"multi\"},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"relatedContent.url\",\"subType\":\"multi\"},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"request\",\"subType\":\"multi\"},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"response\",\"subType\":\"multi\"},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"spaces\",\"subType\":\"multi\"},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"url\",\"subType\":\"multi\"},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"xss\",\"subType\":\"multi\"},{\"name\":\"hour_of_day\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"doc['@timestamp'].value.getHour()\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]",
+        "fields" : "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"@message\"}}},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"@tags\"}}},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"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\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"agent\"}}},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"extension\"}}},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"headings\"}}},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"host\"}}},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"index\"}}},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"links\"}}},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"machine.os\"}}},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.article:section\"}}},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.article:tag\"}}},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:description\"}}},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image\"}}},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image:height\"}}},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image:width\"}}},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:site_name\"}}},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:title\"}}},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:type\"}}},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:url\"}}},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:card\"}}},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:description\"}}},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:image\"}}},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:site\"}}},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:title\"}}},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.url\"}}},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"request\"}}},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"response\"}}},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"spaces\"}}},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"url\"}}},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"xss\"}}},{\"name\":\"hour_of_day\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"doc['@timestamp'].value.getHour()\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]",
         "timeFieldName": "@timestamp",
         "title": "logstash-*"
       },
diff --git a/x-pack/test/functional/es_archives/ml/farequote/mappings.json b/x-pack/test/functional/es_archives/ml/farequote/mappings.json
index b4c6be76558056..4fe559cc85fe15 100644
--- a/x-pack/test/functional/es_archives/ml/farequote/mappings.json
+++ b/x-pack/test/functional/es_archives/ml/farequote/mappings.json
@@ -21,24 +21,6 @@
         "airline": {
           "type": "keyword"
         },
-        "host": {
-          "fields": {
-            "keyword": {
-              "ignore_above": 256,
-              "type": "keyword"
-            }
-          },
-          "type": "text"
-        },
-        "path": {
-          "fields": {
-            "keyword": {
-              "ignore_above": 256,
-              "type": "keyword"
-            }
-          },
-          "type": "text"
-        },
         "responsetime": {
           "type": "float"
         },
@@ -1102,4 +1084,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/functional/es_archives/security/flstest/kibana/data.json b/x-pack/test/functional/es_archives/security/flstest/kibana/data.json
index c54e8a9b44e2e6..ad52bd61c2ea53 100644
--- a/x-pack/test/functional/es_archives/security/flstest/kibana/data.json
+++ b/x-pack/test/functional/es_archives/security/flstest/kibana/data.json
@@ -6,7 +6,7 @@
     "source": {
       "index-pattern" : {
         "title" : "flstest",
-        "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\":\"customer_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"customer_name\",\"subType\":\"multi\"},{\"name\":\"customer_region\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_region.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"customer_region\",\"subType\":\"multi\"},{\"name\":\"customer_ssn\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_ssn.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"parent\":\"customer_ssn\",\"subType\":\"multi\"}]"
+        "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\":\"customer_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"customer_name\"}}},{\"name\":\"customer_region\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_region.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"customer_region\"}}},{\"name\":\"customer_ssn\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"customer_ssn.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"customer_ssn\"}}}]"
       },
       "type" : "index-pattern",
       "references" : [ ],
diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
index 229f8ee55d4420..26c95c3bf526d8 100644
--- a/x-pack/test/functional/page_objects/uptime_page.ts
+++ b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -11,6 +11,14 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
   const uptimeService = getService('uptime');
 
   return new (class UptimePage {
+    public async goToUptimePageAndSetDateRange(
+      datePickerStartValue: string,
+      datePickerEndValue: string
+    ) {
+      await pageObjects.common.navigateToApp('uptime');
+      await pageObjects.timePicker.setAbsoluteRange(datePickerStartValue, datePickerEndValue);
+    }
+
     public async goToUptimeOverviewAndLoadData(
       datePickerStartValue: string,
       datePickerEndValue: string,
@@ -35,16 +43,32 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
       }
     }
 
-    public async inputFilterQuery(
-      datePickerStartValue: string,
-      datePickerEndValue: string,
-      filterQuery: string,
-      testId: string
-    ) {
-      await pageObjects.common.navigateToApp('uptime');
-      await pageObjects.timePicker.setAbsoluteRange(datePickerStartValue, datePickerEndValue);
+    public async inputFilterQuery(filterQuery: string) {
       await uptimeService.setFilterText(filterQuery);
-      await uptimeService.monitorIdExists(testId);
+    }
+
+    public async pageHasExpectedIds(monitorIdsToCheck: string[]) {
+      await Promise.all(monitorIdsToCheck.map(id => uptimeService.monitorPageLinkExists(id)));
+    }
+
+    public async pageUrlContains(value: string) {
+      return await uptimeService.urlContains(value);
+    }
+
+    public async changePage(direction: 'next' | 'prev') {
+      if (direction === 'next') {
+        await uptimeService.goToNextPage();
+      } else if (direction === 'prev') {
+        await uptimeService.goToPreviousPage();
+      }
+    }
+
+    public async setStatusFilter(value: 'up' | 'down') {
+      if (value === 'up') {
+        await uptimeService.setStatusFilterUp();
+      } else if (value === 'down') {
+        await uptimeService.setStatusFilterDown();
+      }
     }
   })();
 }
diff --git a/x-pack/test/functional/services/machine_learning/api.ts b/x-pack/test/functional/services/machine_learning/api.ts
index 148e276dc4a141..270722a97d6b61 100644
--- a/x-pack/test/functional/services/machine_learning/api.ts
+++ b/x-pack/test/functional/services/machine_learning/api.ts
@@ -8,10 +8,13 @@ import expect from '@kbn/expect';
 import { isEmpty } from 'lodash';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
+import { JOB_STATE, DATAFEED_STATE } from '../../../../legacy/plugins/ml/common/constants/states';
+
 export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
   const es = getService('es');
   const log = getService('log');
   const retry = getService('retry');
+  const esSupertest = getService('esSupertest');
 
   return {
     async hasJobResults(jobId: string): Promise<boolean> {
@@ -54,6 +57,54 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
       );
     },
 
+    async hasDetectorResults(jobId: string, detectorIndex: number): Promise<boolean> {
+      const response = await es.search({
+        index: '.ml-anomalies-*',
+        body: {
+          size: 1,
+          query: {
+            bool: {
+              must: [
+                {
+                  match: {
+                    job_id: jobId,
+                  },
+                },
+                {
+                  match: {
+                    result_type: 'record',
+                  },
+                },
+                {
+                  match: {
+                    detector_index: detectorIndex,
+                  },
+                },
+              ],
+            },
+          },
+        },
+      });
+
+      return response.hits.hits.length > 0;
+    },
+
+    async assertDetectorResultsExist(jobId: string, detectorIndex: number) {
+      await retry.waitForWithTimeout(
+        `results for detector ${detectorIndex} on job ${jobId} to exist`,
+        30 * 1000,
+        async () => {
+          if ((await this.hasDetectorResults(jobId, detectorIndex)) === true) {
+            return true;
+          } else {
+            throw new Error(
+              `expected results for detector ${detectorIndex} on job '${jobId}' to exist`
+            );
+          }
+        }
+      );
+    },
+
     async deleteIndices(indices: string) {
       log.debug(`Deleting indices: '${indices}'...`);
       const deleteResponse = await es.indices.delete({
@@ -79,5 +130,61 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
     async cleanMlIndices() {
       await this.deleteIndices('.ml-*');
     },
+
+    async getJobState(jobId: string): Promise<JOB_STATE> {
+      log.debug(`Fetching job state for job ${jobId}`);
+      const jobStats = await esSupertest
+        .get(`/_ml/anomaly_detectors/${jobId}/_stats`)
+        .expect(200)
+        .then((res: any) => res.body);
+
+      expect(jobStats.jobs).to.have.length(1);
+      const state: JOB_STATE = jobStats.jobs[0].state;
+
+      return state;
+    },
+
+    async waitForJobState(jobId: string, expectedJobState: JOB_STATE) {
+      await retry.waitForWithTimeout(
+        `job state to be ${expectedJobState}`,
+        2 * 60 * 1000,
+        async () => {
+          const state = await this.getJobState(jobId);
+          if (state === expectedJobState) {
+            return true;
+          } else {
+            throw new Error(`expected job state to be ${expectedJobState} but got ${state}`);
+          }
+        }
+      );
+    },
+
+    async getDatafeedState(datafeedId: string): Promise<DATAFEED_STATE> {
+      log.debug(`Fetching datafeed state for datafeed ${datafeedId}`);
+      const datafeedStats = await esSupertest
+        .get(`/_ml/datafeeds/${datafeedId}/_stats`)
+        .expect(200)
+        .then((res: any) => res.body);
+
+      expect(datafeedStats.datafeeds).to.have.length(1);
+      const state: DATAFEED_STATE = datafeedStats.datafeeds[0].state;
+
+      return state;
+    },
+
+    async waitForDatafeedState(datafeedId: string, expectedDatafeedState: DATAFEED_STATE) {
+      await retry.waitForWithTimeout(
+        `datafeed state to be ${expectedDatafeedState}`,
+        2 * 60 * 1000,
+        async () => {
+          const state = await this.getDatafeedState(datafeedId);
+          if (state === expectedDatafeedState) {
+            return true;
+          } else {
+            throw new Error(`expected job state to be ${expectedDatafeedState} but got ${state}`);
+          }
+        }
+      );
+    },
   };
 }
diff --git a/x-pack/test/functional/services/machine_learning/index.ts b/x-pack/test/functional/services/machine_learning/index.ts
index 0dc588ffcc9e5a..c5ebe3e9cc1564 100644
--- a/x-pack/test/functional/services/machine_learning/index.ts
+++ b/x-pack/test/functional/services/machine_learning/index.ts
@@ -12,6 +12,7 @@ export { MachineLearningJobManagementProvider } from './job_management';
 export { MachineLearningJobSourceSelectionProvider } from './job_source_selection';
 export { MachineLearningJobTableProvider } from './job_table';
 export { MachineLearningJobTypeSelectionProvider } from './job_type_selection';
+export { MachineLearningJobWizardAdvancedProvider } from './job_wizard_advanced';
 export { MachineLearningJobWizardCommonProvider } from './job_wizard_common';
 export { MachineLearningJobWizardMultiMetricProvider } from './job_wizard_multi_metric';
 export { MachineLearningJobWizardPopulationProvider } from './job_wizard_population';
diff --git a/x-pack/test/functional/services/machine_learning/job_management.ts b/x-pack/test/functional/services/machine_learning/job_management.ts
index 44cf06ab447350..ddab5fd68f13c3 100644
--- a/x-pack/test/functional/services/machine_learning/job_management.ts
+++ b/x-pack/test/functional/services/machine_learning/job_management.ts
@@ -3,11 +3,19 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { ProvidedType } from '@kbn/test/types/ftr';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
+import { MachineLearningAPIProvider } from './api';
 
-export function MachineLearningJobManagementProvider({ getService }: FtrProviderContext) {
+import { JOB_STATE, DATAFEED_STATE } from '../../../../legacy/plugins/ml/common/constants/states';
+
+export function MachineLearningJobManagementProvider(
+  { getService }: FtrProviderContext,
+  mlApi: ProvidedType<typeof MachineLearningAPIProvider>
+) {
   const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
 
   return {
     async navigateToNewJobSourceSelection() {
@@ -26,5 +34,22 @@ export function MachineLearningJobManagementProvider({ getService }: FtrProvider
     async assertJobStatsBarExists() {
       await testSubjects.existOrFail('~mlJobStatsBar');
     },
+
+    async assertStartDatafeedModalExists() {
+      // this retry can be removed as soon as #48734 is merged
+      await retry.tryForTime(5000, async () => {
+        await testSubjects.existOrFail('mlStartDatafeedModal');
+      });
+    },
+
+    async confirmStartDatafeedModal() {
+      await testSubjects.click('mlStartDatafeedModalStartButton');
+      await testSubjects.missingOrFail('mlStartDatafeedModal');
+    },
+
+    async waitForJobCompletion(jobId: string) {
+      await mlApi.waitForDatafeedState(`datafeed-${jobId}`, DATAFEED_STATE.STOPPED);
+      await mlApi.waitForJobState(jobId, JOB_STATE.CLOSED);
+    },
   };
 }
diff --git a/x-pack/test/functional/services/machine_learning/job_table.ts b/x-pack/test/functional/services/machine_learning/job_table.ts
index 17c5d0f54eaa35..7eded43d1f0586 100644
--- a/x-pack/test/functional/services/machine_learning/job_table.ts
+++ b/x-pack/test/functional/services/machine_learning/job_table.ts
@@ -157,6 +157,11 @@ export function MachineLearningJobTableProvider({ getService }: FtrProviderConte
       });
     }
 
+    public async refreshJobList() {
+      await testSubjects.click('mlRefreshJobListButton');
+      await this.waitForJobsToLoad();
+    }
+
     public async waitForJobsToLoad() {
       await testSubjects.existOrFail('~mlJobListTable', { timeout: 60 * 1000 });
       await testSubjects.existOrFail('mlJobListTable loaded', { timeout: 30 * 1000 });
@@ -206,7 +211,7 @@ export function MachineLearningJobTableProvider({ getService }: FtrProviderConte
     }
 
     public async clickActionsMenu(jobId: string) {
-      retry.tryForTime(30 * 1000, async () => {
+      await retry.tryForTime(30 * 1000, async () => {
         if (!(await testSubjects.exists('mlActionButtonDeleteJob'))) {
           await testSubjects.click(this.rowSelector(jobId, 'euiCollapsedItemActionsButton'));
           await testSubjects.existOrFail('mlActionButtonDeleteJob', { timeout: 5000 });
diff --git a/x-pack/test/functional/services/machine_learning/job_type_selection.ts b/x-pack/test/functional/services/machine_learning/job_type_selection.ts
index 0957558f62165a..6686b5b28f200e 100644
--- a/x-pack/test/functional/services/machine_learning/job_type_selection.ts
+++ b/x-pack/test/functional/services/machine_learning/job_type_selection.ts
@@ -36,5 +36,14 @@ export function MachineLearningJobTypeSelectionProvider({ getService }: FtrProvi
     async assertPopulationJobWizardOpen() {
       await testSubjects.existOrFail('mlPageJobWizard population');
     },
+
+    async selectAdvancedJob() {
+      await testSubjects.clickWhenNotDisabled('mlJobTypeLinkAdvancedJob');
+      await this.assertAdvancedJobWizardOpen();
+    },
+
+    async assertAdvancedJobWizardOpen() {
+      await testSubjects.existOrFail('mlPageJobWizard advanced');
+    },
   };
 }
diff --git a/x-pack/test/functional/services/machine_learning/job_wizard_advanced.ts b/x-pack/test/functional/services/machine_learning/job_wizard_advanced.ts
new file mode 100644
index 00000000000000..71b76a6885592d
--- /dev/null
+++ b/x-pack/test/functional/services/machine_learning/job_wizard_advanced.ts
@@ -0,0 +1,315 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 function MachineLearningJobWizardAdvancedProvider({
+  getService,
+  getPageObjects,
+}: FtrProviderContext) {
+  const comboBox = getService('comboBox');
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const aceEditor = getService('aceEditor');
+
+  return {
+    async getValueOrPlaceholder(inputLocator: string): Promise<string> {
+      const value = await testSubjects.getAttribute(inputLocator, 'value');
+      if (value !== '') {
+        return value;
+      } else {
+        return await testSubjects.getAttribute(inputLocator, 'placeholder');
+      }
+    },
+
+    async assertDatafeedQueryEditorExists() {
+      await testSubjects.existOrFail('mlAdvancedDatafeedQueryEditor > codeEditorContainer');
+    },
+
+    async assertDatafeedQueryEditorValue(expectedValue: string) {
+      const actualValue = await aceEditor.getValue(
+        'mlAdvancedDatafeedQueryEditor > codeEditorContainer'
+      );
+      expect(actualValue).to.eql(expectedValue);
+    },
+
+    async assertQueryDelayInputExists() {
+      await testSubjects.existOrFail('mlJobWizardInputQueryDelay');
+    },
+
+    async assertQueryDelayValue(expectedValue: string) {
+      const actualQueryDelay = await this.getValueOrPlaceholder('mlJobWizardInputQueryDelay');
+      expect(actualQueryDelay).to.eql(expectedValue);
+    },
+
+    async setQueryDelay(queryDelay: string) {
+      await testSubjects.setValue('mlJobWizardInputQueryDelay', queryDelay, {
+        clearWithKeyboard: true,
+        typeCharByChar: true,
+      });
+      await this.assertQueryDelayValue(queryDelay);
+    },
+
+    async assertFrequencyInputExists() {
+      await testSubjects.existOrFail('mlJobWizardInputFrequency');
+    },
+
+    async assertFrequencyValue(expectedValue: string) {
+      const actualFrequency = await this.getValueOrPlaceholder('mlJobWizardInputFrequency');
+      expect(actualFrequency).to.eql(expectedValue);
+    },
+
+    async setFrequency(frequency: string) {
+      await testSubjects.setValue('mlJobWizardInputFrequency', frequency, {
+        clearWithKeyboard: true,
+        typeCharByChar: true,
+      });
+      await this.assertFrequencyValue(frequency);
+    },
+
+    async assertScrollSizeInputExists() {
+      await testSubjects.existOrFail('mlJobWizardInputScrollSize');
+    },
+
+    async assertScrollSizeValue(expectedValue: string) {
+      const actualScrollSize = await this.getValueOrPlaceholder('mlJobWizardInputScrollSize');
+      expect(actualScrollSize).to.eql(expectedValue);
+    },
+
+    async setScrollSize(scrollSize: string) {
+      await testSubjects.setValue('mlJobWizardInputScrollSize', scrollSize, {
+        clearWithKeyboard: true,
+        typeCharByChar: true,
+      });
+      await this.assertScrollSizeValue(scrollSize);
+    },
+
+    async assertTimeFieldInputExists() {
+      await testSubjects.existOrFail('mlTimeFieldNameSelect > comboBoxInput');
+    },
+
+    async assertTimeFieldSelection(expectedIdentifier: string[]) {
+      const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+        'mlTimeFieldNameSelect > comboBoxInput'
+      );
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
+    },
+
+    async selectTimeField(identifier: string) {
+      await comboBox.set('mlTimeFieldNameSelect > comboBoxInput', identifier);
+      await this.assertTimeFieldSelection([identifier]);
+    },
+
+    async assertCategorizationFieldInputExists() {
+      await testSubjects.existOrFail('mlCategorizationFieldNameSelect > comboBoxInput');
+    },
+
+    async assertCategorizationFieldSelection(expectedIdentifier: string[]) {
+      const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+        'mlCategorizationFieldNameSelect > comboBoxInput'
+      );
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
+    },
+
+    async selectCategorizationField(identifier: string) {
+      await comboBox.set('mlCategorizationFieldNameSelect > comboBoxInput', identifier);
+      await this.assertCategorizationFieldSelection([identifier]);
+    },
+
+    async assertSummaryCountFieldInputExists() {
+      await testSubjects.existOrFail('mlSummaryCountFieldNameSelect > comboBoxInput');
+    },
+
+    async assertSummaryCountFieldSelection(expectedIdentifier: string[]) {
+      const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+        'mlSummaryCountFieldNameSelect > comboBoxInput'
+      );
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
+    },
+
+    async selectSummaryCountField(identifier: string) {
+      await comboBox.set('mlSummaryCountFieldNameSelect > comboBoxInput', identifier);
+      await this.assertSummaryCountFieldSelection([identifier]);
+    },
+
+    async assertAddDetectorButtonExists() {
+      await testSubjects.existOrFail('mlAddDetectorButton');
+    },
+
+    async openCreateDetectorModal() {
+      await testSubjects.click('mlAddDetectorButton');
+      await this.assertCreateDetectorModalExists();
+    },
+
+    async assertCreateDetectorModalExists() {
+      // this retry can be removed as soon as #48734 is merged
+      await retry.tryForTime(5000, async () => {
+        await testSubjects.existOrFail('mlCreateDetectorModal');
+      });
+    },
+
+    async assertDetectorFunctionInputExists() {
+      await testSubjects.existOrFail('mlAdvancedFunctionSelect > comboBoxInput');
+    },
+
+    async assertDetectorFunctionSelection(expectedIdentifier: string[]) {
+      const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+        'mlAdvancedFunctionSelect > comboBoxInput'
+      );
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
+    },
+
+    async selectDetectorFunction(identifier: string) {
+      await comboBox.set('mlAdvancedFunctionSelect > comboBoxInput', identifier);
+      await this.assertDetectorFunctionSelection([identifier]);
+    },
+
+    async assertDetectorFieldInputExists() {
+      await testSubjects.existOrFail('mlAdvancedFieldSelect > comboBoxInput');
+    },
+
+    async assertDetectorFieldSelection(expectedIdentifier: string[]) {
+      const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+        'mlAdvancedFieldSelect > comboBoxInput'
+      );
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
+    },
+
+    async selectDetectorField(identifier: string) {
+      await comboBox.set('mlAdvancedFieldSelect > comboBoxInput', identifier);
+      await this.assertDetectorFieldSelection([identifier]);
+    },
+
+    async assertDetectorByFieldInputExists() {
+      await testSubjects.existOrFail('mlAdvancedByFieldSelect > comboBoxInput');
+    },
+
+    async assertDetectorByFieldSelection(expectedIdentifier: string[]) {
+      const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+        'mlAdvancedByFieldSelect > comboBoxInput'
+      );
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
+    },
+
+    async selectDetectorByField(identifier: string) {
+      await comboBox.set('mlAdvancedByFieldSelect > comboBoxInput', identifier);
+      await this.assertDetectorByFieldSelection([identifier]);
+    },
+
+    async assertDetectorOverFieldInputExists() {
+      await testSubjects.existOrFail('mlAdvancedOverFieldSelect > comboBoxInput');
+    },
+
+    async assertDetectorOverFieldSelection(expectedIdentifier: string[]) {
+      const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+        'mlAdvancedOverFieldSelect > comboBoxInput'
+      );
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
+    },
+
+    async selectDetectorOverField(identifier: string) {
+      await comboBox.set('mlAdvancedOverFieldSelect > comboBoxInput', identifier);
+      await this.assertDetectorOverFieldSelection([identifier]);
+    },
+
+    async assertDetectorPartitionFieldInputExists() {
+      await testSubjects.existOrFail('mlAdvancedPartitionFieldSelect > comboBoxInput');
+    },
+
+    async assertDetectorPartitionFieldSelection(expectedIdentifier: string[]) {
+      const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+        'mlAdvancedPartitionFieldSelect > comboBoxInput'
+      );
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
+    },
+
+    async selectDetectorPartitionField(identifier: string) {
+      await comboBox.set('mlAdvancedPartitionFieldSelect > comboBoxInput', identifier);
+      await this.assertDetectorPartitionFieldSelection([identifier]);
+    },
+
+    async assertDetectorExcludeFrequentInputExists() {
+      await testSubjects.existOrFail('mlAdvancedExcludeFrequentSelect > comboBoxInput');
+    },
+
+    async assertDetectorExcludeFrequentSelection(expectedIdentifier: string[]) {
+      const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
+        'mlAdvancedExcludeFrequentSelect > comboBoxInput'
+      );
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
+    },
+
+    async selectDetectorExcludeFrequent(identifier: string) {
+      await comboBox.set('mlAdvancedExcludeFrequentSelect > comboBoxInput', identifier);
+      await this.assertDetectorExcludeFrequentSelection([identifier]);
+    },
+
+    async assertDetectorDescriptionInputExists() {
+      await testSubjects.existOrFail('mlAdvancedDetectorDescriptionInput');
+    },
+
+    async assertDetectorDescriptionValue(expectedValue: string) {
+      const actualDetectorDescription = await testSubjects.getAttribute(
+        'mlAdvancedDetectorDescriptionInput',
+        'value'
+      );
+      expect(actualDetectorDescription).to.eql(expectedValue);
+    },
+
+    async setDetectorDescription(description: string) {
+      await testSubjects.setValue('mlAdvancedDetectorDescriptionInput', description, {
+        clearWithKeyboard: true,
+      });
+      await this.assertDetectorDescriptionValue(description);
+    },
+
+    async confirmAddDetectorModal() {
+      await testSubjects.clickWhenNotDisabled('mlCreateDetectorModalSaveButton');
+      await testSubjects.missingOrFail('mlCreateDetectorModal');
+    },
+
+    async cancelAddDetectorModal() {
+      await testSubjects.clickWhenNotDisabled('mlCreateDetectorModalCancelButton');
+      await testSubjects.missingOrFail('mlCreateDetectorModal');
+    },
+
+    async assertDetectorEntryExists(
+      detectorIndex: number,
+      expectedDetectorName: string,
+      expectedDetectorDescription?: string
+    ) {
+      await testSubjects.existOrFail(`mlAdvancedDetector ${detectorIndex}`);
+
+      const actualDetectorIdentifier = await testSubjects.getVisibleText(
+        `mlAdvancedDetector ${detectorIndex} > mlDetectorIdentifier`
+      );
+      expect(actualDetectorIdentifier).to.eql(expectedDetectorName);
+
+      if (expectedDetectorDescription !== undefined) {
+        const actualDetectorDescription = await testSubjects.getVisibleText(
+          `mlAdvancedDetector ${detectorIndex} > mlDetectorDescription`
+        );
+        expect(actualDetectorDescription).to.eql(expectedDetectorDescription);
+      }
+    },
+
+    async clickEditDetector(detectorIndex: number) {
+      await testSubjects.click(
+        `mlAdvancedDetector ${detectorIndex} > mlAdvancedDetectorEditButton`
+      );
+      await this.assertCreateDetectorModalExists();
+    },
+
+    async createJob() {
+      await testSubjects.clickWhenNotDisabled('mlJobWizardButtonCreateJob');
+      // this retry can be removed as soon as #48734 is merged
+      await retry.tryForTime(5000, async () => {
+        await testSubjects.existOrFail('mlStartDatafeedModal');
+      });
+    },
+  };
+}
diff --git a/x-pack/test/functional/services/machine_learning/job_wizard_common.ts b/x-pack/test/functional/services/machine_learning/job_wizard_common.ts
index 08f1fb92d34870..3a71f96fa3fbdd 100644
--- a/x-pack/test/functional/services/machine_learning/job_wizard_common.ts
+++ b/x-pack/test/functional/services/machine_learning/job_wizard_common.ts
@@ -12,6 +12,15 @@ export function MachineLearningJobWizardCommonProvider({ getService }: FtrProvid
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
 
+  interface SectionOptions {
+    withAdvancedSection: boolean;
+  }
+
+  function advancedSectionSelector(subSelector?: string) {
+    const subj = 'mlJobWizardAdvancedSection';
+    return !subSelector ? subj : `${subj} > ${subSelector}`;
+  }
+
   return {
     async clickNextButton() {
       await testSubjects.existOrFail('mlJobWizardNavButtonNext');
@@ -38,6 +47,10 @@ export function MachineLearningJobWizardCommonProvider({ getService }: FtrProvid
       await testSubjects.existOrFail('mlJobWizardStepTitleSummary');
     },
 
+    async assertConfigureDatafeedSectionExists() {
+      await testSubjects.existOrFail('mlJobWizardStepTitleConfigureDatafeed');
+    },
+
     async advanceToPickFieldsSection() {
       await this.clickNextButton();
       await this.assertPickFieldsSectionExists();
@@ -70,17 +83,16 @@ export function MachineLearningJobWizardCommonProvider({ getService }: FtrProvid
       await testSubjects.existOrFail('mlJobWizardAggSelection > comboBoxInput');
     },
 
-    async assertAggAndFieldSelection(expectedIdentifier: string) {
+    async assertAggAndFieldSelection(expectedIdentifier: string[]) {
       const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
         'mlJobWizardAggSelection > comboBoxInput'
       );
-      expect(comboBoxSelectedOptions.length).to.eql(1);
-      expect(comboBoxSelectedOptions[0]).to.eql(expectedIdentifier);
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
     },
 
     async selectAggAndField(identifier: string, isIdentifierKeptInField: boolean) {
       await comboBox.set('mlJobWizardAggSelection > comboBoxInput', identifier);
-      await this.assertAggAndFieldSelection(isIdentifierKeptInField ? identifier : '');
+      await this.assertAggAndFieldSelection(isIdentifierKeptInField ? [identifier] : []);
     },
 
     async assertBucketSpanInputExists() {
@@ -154,75 +166,127 @@ export function MachineLearningJobWizardCommonProvider({ getService }: FtrProvid
       expect(await this.getSelectedJobGroups()).to.contain(jobGroup);
     },
 
-    async assertModelPlotSwitchExists() {
-      await this.ensureAdvancedSectionOpen();
-      await testSubjects.existOrFail('mlJobWizardAdvancedSection > mlJobWizardSwitchModelPlot', {
-        allowHidden: true,
-      });
+    async assertModelPlotSwitchExists(
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ) {
+      let subj = 'mlJobWizardSwitchModelPlot';
+      if (sectionOptions.withAdvancedSection === true) {
+        await this.ensureAdvancedSectionOpen();
+        subj = advancedSectionSelector(subj);
+      }
+      await testSubjects.existOrFail(subj, { allowHidden: true });
     },
 
-    async getModelPlotSwitchCheckedState(): Promise<boolean> {
-      await this.ensureAdvancedSectionOpen();
-      return await testSubjects.isSelected(
-        'mlJobWizardAdvancedSection > mlJobWizardSwitchModelPlot'
-      );
+    async getModelPlotSwitchCheckedState(
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ): Promise<boolean> {
+      let subj = 'mlJobWizardSwitchModelPlot';
+      if (sectionOptions.withAdvancedSection === true) {
+        await this.ensureAdvancedSectionOpen();
+        subj = advancedSectionSelector(subj);
+      }
+      return await testSubjects.isSelected(subj);
     },
 
-    async assertModelPlotSwitchCheckedState(expectedValue: boolean) {
-      await this.ensureAdvancedSectionOpen();
-      const actualCheckedState = await this.getModelPlotSwitchCheckedState();
+    async assertModelPlotSwitchCheckedState(
+      expectedValue: boolean,
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ) {
+      const actualCheckedState = await this.getModelPlotSwitchCheckedState({
+        withAdvancedSection: sectionOptions.withAdvancedSection,
+      });
       expect(actualCheckedState).to.eql(expectedValue);
     },
 
-    async assertDedicatedIndexSwitchExists() {
-      await this.ensureAdvancedSectionOpen();
-      await testSubjects.existOrFail(
-        'mlJobWizardAdvancedSection > mlJobWizardSwitchUseDedicatedIndex',
-        { allowHidden: true }
-      );
+    async assertDedicatedIndexSwitchExists(
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ) {
+      let subj = 'mlJobWizardSwitchUseDedicatedIndex';
+      if (sectionOptions.withAdvancedSection === true) {
+        await this.ensureAdvancedSectionOpen();
+        subj = advancedSectionSelector(subj);
+      }
+      await testSubjects.existOrFail(subj, { allowHidden: true });
     },
 
-    async getDedicatedIndexSwitchCheckedState(): Promise<boolean> {
-      await this.ensureAdvancedSectionOpen();
-      return await testSubjects.isSelected(
-        'mlJobWizardAdvancedSection > mlJobWizardSwitchUseDedicatedIndex'
-      );
+    async getDedicatedIndexSwitchCheckedState(
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ): Promise<boolean> {
+      let subj = 'mlJobWizardSwitchUseDedicatedIndex';
+      if (sectionOptions.withAdvancedSection === true) {
+        await this.ensureAdvancedSectionOpen();
+        subj = advancedSectionSelector(subj);
+      }
+      return await testSubjects.isSelected(subj);
     },
 
-    async assertDedicatedIndexSwitchCheckedState(expectedValue: boolean) {
-      await this.ensureAdvancedSectionOpen();
-      const actualCheckedState = await this.getDedicatedIndexSwitchCheckedState();
+    async assertDedicatedIndexSwitchCheckedState(
+      expectedValue: boolean,
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ) {
+      const actualCheckedState = await this.getDedicatedIndexSwitchCheckedState({
+        withAdvancedSection: sectionOptions.withAdvancedSection,
+      });
       expect(actualCheckedState).to.eql(expectedValue);
     },
 
-    async activateDedicatedIndexSwitch() {
-      if ((await this.getDedicatedIndexSwitchCheckedState()) === false) {
-        await testSubjects.clickWhenNotDisabled('mlJobWizardSwitchUseDedicatedIndex');
+    async activateDedicatedIndexSwitch(
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ) {
+      let subj = 'mlJobWizardSwitchUseDedicatedIndex';
+      if (sectionOptions.withAdvancedSection === true) {
+        await this.ensureAdvancedSectionOpen();
+        subj = advancedSectionSelector(subj);
+      }
+      if (
+        (await this.getDedicatedIndexSwitchCheckedState({
+          withAdvancedSection: sectionOptions.withAdvancedSection,
+        })) === false
+      ) {
+        await testSubjects.clickWhenNotDisabled(subj);
       }
-      await this.assertDedicatedIndexSwitchCheckedState(true);
+      await this.assertDedicatedIndexSwitchCheckedState(true, {
+        withAdvancedSection: sectionOptions.withAdvancedSection,
+      });
     },
 
-    async assertModelMemoryLimitInputExists() {
-      await this.ensureAdvancedSectionOpen();
-      await testSubjects.existOrFail(
-        'mlJobWizardAdvancedSection > mlJobWizardInputModelMemoryLimit'
-      );
+    async assertModelMemoryLimitInputExists(
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ) {
+      let subj = 'mlJobWizardInputModelMemoryLimit';
+      if (sectionOptions.withAdvancedSection === true) {
+        await this.ensureAdvancedSectionOpen();
+        subj = advancedSectionSelector(subj);
+      }
+      await testSubjects.existOrFail(subj);
     },
 
-    async assertModelMemoryLimitValue(expectedValue: string) {
-      await this.ensureAdvancedSectionOpen();
-      const actualModelMemoryLimit = await testSubjects.getAttribute(
-        'mlJobWizardAdvancedSection > mlJobWizardInputModelMemoryLimit',
-        'value'
-      );
+    async assertModelMemoryLimitValue(
+      expectedValue: string,
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ) {
+      let subj = 'mlJobWizardInputModelMemoryLimit';
+      if (sectionOptions.withAdvancedSection === true) {
+        await this.ensureAdvancedSectionOpen();
+        subj = advancedSectionSelector(subj);
+      }
+      const actualModelMemoryLimit = await testSubjects.getAttribute(subj, 'value');
       expect(actualModelMemoryLimit).to.eql(expectedValue);
     },
 
-    async setModelMemoryLimit(modelMemoryLimit: string) {
-      await testSubjects.setValue('mlJobWizardInputModelMemoryLimit', modelMemoryLimit, {
-        clearWithKeyboard: true,
+    async setModelMemoryLimit(
+      modelMemoryLimit: string,
+      sectionOptions: SectionOptions = { withAdvancedSection: true }
+    ) {
+      let subj = 'mlJobWizardInputModelMemoryLimit';
+      if (sectionOptions.withAdvancedSection === true) {
+        await this.ensureAdvancedSectionOpen();
+        subj = advancedSectionSelector(subj);
+      }
+      await testSubjects.setValue(subj, modelMemoryLimit, { clearWithKeyboard: true });
+      await this.assertModelMemoryLimitValue(modelMemoryLimit, {
+        withAdvancedSection: sectionOptions.withAdvancedSection,
       });
-      await this.assertModelMemoryLimitValue(modelMemoryLimit);
     },
 
     async assertInfluencerInputExists() {
@@ -238,7 +302,7 @@ export function MachineLearningJobWizardCommonProvider({ getService }: FtrProvid
     },
 
     async addInfluencer(influencer: string) {
-      await comboBox.setCustom('mlInfluencerSelect > comboBoxInput', influencer);
+      await comboBox.set('mlInfluencerSelect > comboBoxInput', influencer);
       expect(await this.getSelectedInfluencers()).to.contain(influencer);
     },
 
@@ -294,16 +358,16 @@ export function MachineLearningJobWizardCommonProvider({ getService }: FtrProvid
 
     async ensureAdvancedSectionOpen() {
       await retry.tryForTime(5000, async () => {
-        if ((await testSubjects.exists('mlJobWizardAdvancedSection')) === false) {
+        if ((await testSubjects.exists(advancedSectionSelector())) === false) {
           await testSubjects.click('mlJobWizardToggleAdvancedSection');
-          await testSubjects.existOrFail('mlJobWizardAdvancedSection', { timeout: 1000 });
+          await testSubjects.existOrFail(advancedSectionSelector(), { timeout: 1000 });
         }
       });
     },
 
     async createJobAndWaitForCompletion() {
       await testSubjects.clickWhenNotDisabled('mlJobWizardButtonCreateJob');
-      await testSubjects.existOrFail('mlJobWizardButtonRunInRealTime', { timeout: 5 * 60 * 1000 });
+      await testSubjects.existOrFail('mlJobWizardButtonRunInRealTime', { timeout: 2 * 60 * 1000 });
     },
   };
 }
diff --git a/x-pack/test/functional/services/machine_learning/job_wizard_multi_metric.ts b/x-pack/test/functional/services/machine_learning/job_wizard_multi_metric.ts
index d9df6a9d682a76..2fb768d924cff5 100644
--- a/x-pack/test/functional/services/machine_learning/job_wizard_multi_metric.ts
+++ b/x-pack/test/functional/services/machine_learning/job_wizard_multi_metric.ts
@@ -16,17 +16,16 @@ export function MachineLearningJobWizardMultiMetricProvider({ getService }: FtrP
       await testSubjects.existOrFail('mlMultiMetricSplitFieldSelect > comboBoxInput');
     },
 
-    async assertSplitFieldSelection(identifier: string) {
+    async assertSplitFieldSelection(expectedIdentifier: string[]) {
       const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
         'mlMultiMetricSplitFieldSelect > comboBoxInput'
       );
-      expect(comboBoxSelectedOptions.length).to.eql(1);
-      expect(comboBoxSelectedOptions[0]).to.eql(identifier);
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
     },
 
     async selectSplitField(identifier: string) {
       await comboBox.set('mlMultiMetricSplitFieldSelect > comboBoxInput', identifier);
-      await this.assertSplitFieldSelection(identifier);
+      await this.assertSplitFieldSelection([identifier]);
     },
 
     async assertDetectorSplitExists(splitField: string) {
diff --git a/x-pack/test/functional/services/machine_learning/job_wizard_population.ts b/x-pack/test/functional/services/machine_learning/job_wizard_population.ts
index 892bdaf394936a..8ff9d5c12a6422 100644
--- a/x-pack/test/functional/services/machine_learning/job_wizard_population.ts
+++ b/x-pack/test/functional/services/machine_learning/job_wizard_population.ts
@@ -16,17 +16,16 @@ export function MachineLearningJobWizardPopulationProvider({ getService }: FtrPr
       await testSubjects.existOrFail('mlPopulationSplitFieldSelect > comboBoxInput');
     },
 
-    async assertPopulationFieldSelection(identifier: string) {
+    async assertPopulationFieldSelection(expectedIdentifier: string[]) {
       const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
         'mlPopulationSplitFieldSelect > comboBoxInput'
       );
-      expect(comboBoxSelectedOptions.length).to.eql(1);
-      expect(comboBoxSelectedOptions[0]).to.eql(identifier);
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
     },
 
     async selectPopulationField(identifier: string) {
       await comboBox.set('mlPopulationSplitFieldSelect > comboBoxInput', identifier);
-      await this.assertPopulationFieldSelection(identifier);
+      await this.assertPopulationFieldSelection([identifier]);
     },
 
     async assertDetectorSplitFieldInputExists(detectorPosition: number) {
@@ -35,12 +34,14 @@ export function MachineLearningJobWizardPopulationProvider({ getService }: FtrPr
       );
     },
 
-    async assertDetectorSplitFieldSelection(detectorPosition: number, identifier: string) {
+    async assertDetectorSplitFieldSelection(
+      detectorPosition: number,
+      expectedIdentifier: string[]
+    ) {
       const comboBoxSelectedOptions = await comboBox.getComboBoxSelectedOptions(
         `mlDetector ${detectorPosition} > mlByFieldSelect  > comboBoxInput`
       );
-      expect(comboBoxSelectedOptions.length).to.eql(1);
-      expect(comboBoxSelectedOptions[0]).to.eql(identifier);
+      expect(comboBoxSelectedOptions).to.eql(expectedIdentifier);
     },
 
     async selectDetectorSplitField(detectorPosition: number, identifier: string) {
@@ -48,7 +49,7 @@ export function MachineLearningJobWizardPopulationProvider({ getService }: FtrPr
         `mlDetector ${detectorPosition} > mlByFieldSelect  > comboBoxInput`,
         identifier
       );
-      await this.assertDetectorSplitFieldSelection(detectorPosition, identifier);
+      await this.assertDetectorSplitFieldSelection(detectorPosition, [identifier]);
     },
 
     async assertDetectorSplitExists(detectorPosition: number) {
diff --git a/x-pack/test/functional/services/ml.ts b/x-pack/test/functional/services/ml.ts
index 3feb45ae23bbc0..8609552b5dc558 100644
--- a/x-pack/test/functional/services/ml.ts
+++ b/x-pack/test/functional/services/ml.ts
@@ -15,6 +15,7 @@ import {
   MachineLearningJobSourceSelectionProvider,
   MachineLearningJobTableProvider,
   MachineLearningJobTypeSelectionProvider,
+  MachineLearningJobWizardAdvancedProvider,
   MachineLearningJobWizardCommonProvider,
   MachineLearningJobWizardMultiMetricProvider,
   MachineLearningJobWizardPopulationProvider,
@@ -28,10 +29,11 @@ export function MachineLearningProvider(context: FtrProviderContext) {
   const api = MachineLearningAPIProvider(context);
   const dataFrameAnalytics = MachineLearningDataFrameAnalyticsProvider(context);
   const dataVisualizer = MachineLearningDataVisualizerProvider(context);
-  const jobManagement = MachineLearningJobManagementProvider(context);
+  const jobManagement = MachineLearningJobManagementProvider(context, api);
   const jobSourceSelection = MachineLearningJobSourceSelectionProvider(context);
   const jobTable = MachineLearningJobTableProvider(context);
   const jobTypeSelection = MachineLearningJobTypeSelectionProvider(context);
+  const jobWizardAdvanced = MachineLearningJobWizardAdvancedProvider(context);
   const jobWizardCommon = MachineLearningJobWizardCommonProvider(context);
   const jobWizardMultiMetric = MachineLearningJobWizardMultiMetricProvider(context);
   const jobWizardPopulation = MachineLearningJobWizardPopulationProvider(context);
@@ -48,6 +50,7 @@ export function MachineLearningProvider(context: FtrProviderContext) {
     jobSourceSelection,
     jobTable,
     jobTypeSelection,
+    jobWizardAdvanced,
     jobWizardCommon,
     jobWizardMultiMetric,
     jobWizardPopulation,
diff --git a/x-pack/test/functional/services/random.js b/x-pack/test/functional/services/random.js
index 3ed3a945195f71..1245a278eab619 100644
--- a/x-pack/test/functional/services/random.js
+++ b/x-pack/test/functional/services/random.js
@@ -13,7 +13,7 @@ export function RandomProvider({ getService }) {
   log.debug('randomness seed: %j', seed);
   const chance = new Chance(seed);
 
-  return new class Random {
+  return new class Randomness {
     int(min = 3, max = 15) {
       return chance.integer({ min, max });
     }
diff --git a/x-pack/test/functional/services/uptime.ts b/x-pack/test/functional/services/uptime.ts
index fd1a61da2c0f59..40d2e3dafc7f84 100644
--- a/x-pack/test/functional/services/uptime.ts
+++ b/x-pack/test/functional/services/uptime.ts
@@ -19,6 +19,13 @@ export function UptimeProvider({ getService }: FtrProviderContext) {
     async monitorIdExists(key: string) {
       await testSubjects.existOrFail(key);
     },
+    async monitorPageLinkExists(monitorId: string) {
+      await testSubjects.existOrFail(`monitor-page-link-${monitorId}`);
+    },
+    async urlContains(expected: string) {
+      const url = await browser.getCurrentUrl();
+      return url.indexOf(expected) >= 0;
+    },
     async navigateToMonitorWithId(monitorId: string) {
       await testSubjects.click(`monitor-page-link-${monitorId}`);
     },
@@ -30,5 +37,17 @@ export function UptimeProvider({ getService }: FtrProviderContext) {
       await testSubjects.setValue('xpack.uptime.filterBar', filterQuery);
       await browser.pressKeys(browser.keys.ENTER);
     },
+    async goToNextPage() {
+      await testSubjects.click('xpack.uptime.monitorList.nextButton');
+    },
+    async goToPreviousPage() {
+      await testSubjects.click('xpack.uptime.monitorList.prevButton');
+    },
+    async setStatusFilterUp() {
+      await testSubjects.click('xpack.uptime.filterBar.filterStatusUp');
+    },
+    async setStatusFilterDown() {
+      await testSubjects.click('xpack.uptime.filterBar.filterStatusDown');
+    },
   };
 }
diff --git a/x-pack/test/plugin_api_integration/plugins/encrypted_saved_objects/index.ts b/x-pack/test/plugin_api_integration/plugins/encrypted_saved_objects/index.ts
index 7b39c236ec5437..a194e477da7559 100644
--- a/x-pack/test/plugin_api_integration/plugins/encrypted_saved_objects/index.ts
+++ b/x-pack/test/plugin_api_integration/plugins/encrypted_saved_objects/index.ts
@@ -7,6 +7,10 @@
 import { Request } from 'hapi';
 import { boomify, badRequest } from 'boom';
 import { Legacy } from 'kibana';
+import {
+  PluginSetupContract,
+  PluginStartContract,
+} from '../../../../plugins/encrypted_saved_objects/server';
 
 const SAVED_OBJECT_WITH_SECRET_TYPE = 'saved-object-with-secret';
 
@@ -14,22 +18,24 @@ const SAVED_OBJECT_WITH_SECRET_TYPE = 'saved-object-with-secret';
 export default function esoPlugin(kibana: any) {
   return new kibana.Plugin({
     id: 'eso',
-    require: ['encrypted_saved_objects'],
+    require: ['encryptedSavedObjects'],
     uiExports: { mappings: require('./mappings.json') },
     init(server: Legacy.Server) {
       server.route({
         method: 'GET',
         path: '/api/saved_objects/get-decrypted-as-internal-user/{id}',
         async handler(request: Request) {
+          const encryptedSavedObjectsStart = server.newPlatform.start.plugins
+            .encryptedSavedObjects as PluginStartContract;
           const namespace = server.plugins.spaces && server.plugins.spaces.getSpaceId(request);
           try {
-            return await (server.plugins as any).encrypted_saved_objects.getDecryptedAsInternalUser(
+            return await encryptedSavedObjectsStart.getDecryptedAsInternalUser(
               SAVED_OBJECT_WITH_SECRET_TYPE,
               request.params.id,
               { namespace: namespace === 'default' ? undefined : namespace }
             );
           } catch (err) {
-            if ((server.plugins as any).encrypted_saved_objects.isEncryptionError(err)) {
+            if (encryptedSavedObjectsStart.isEncryptionError(err)) {
               return badRequest('Failed to encrypt attributes');
             }
 
@@ -38,7 +44,7 @@ export default function esoPlugin(kibana: any) {
         },
       });
 
-      (server.plugins as any).encrypted_saved_objects.registerType({
+      (server.newPlatform.setup.plugins.encryptedSavedObjects as PluginSetupContract).registerType({
         type: SAVED_OBJECT_WITH_SECRET_TYPE,
         attributesToEncrypt: new Set(['privateProperty']),
         attributesToExcludeFromAAD: new Set(['publicPropertyExcludedFromAAD']),
diff --git a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts
index 34c8cdcc012bae..7be9816f40de3f 100644
--- a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts
@@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function({ getService }: FtrProviderContext) {
   const es = getService('es');
-  const chance = getService('chance');
+  const randomness = getService('randomness');
   const supertest = getService('supertest');
 
   const SAVED_OBJECT_WITH_SECRET_TYPE = 'saved-object-with-secret';
@@ -37,9 +37,9 @@ export default function({ getService }: FtrProviderContext) {
     let savedObject: SavedObject;
     beforeEach(async () => {
       savedObjectOriginalAttributes = {
-        publicProperty: chance.string(),
-        publicPropertyExcludedFromAAD: chance.string(),
-        privateProperty: chance.string(),
+        publicProperty: randomness.string(),
+        publicPropertyExcludedFromAAD: randomness.string(),
+        privateProperty: randomness.string(),
       };
 
       const { body } = await supertest
@@ -74,17 +74,17 @@ export default function({ getService }: FtrProviderContext) {
         {
           type: SAVED_OBJECT_WITH_SECRET_TYPE,
           attributes: {
-            publicProperty: chance.string(),
-            publicPropertyExcludedFromAAD: chance.string(),
-            privateProperty: chance.string(),
+            publicProperty: randomness.string(),
+            publicPropertyExcludedFromAAD: randomness.string(),
+            privateProperty: randomness.string(),
           },
         },
         {
           type: SAVED_OBJECT_WITH_SECRET_TYPE,
           attributes: {
-            publicProperty: chance.string(),
-            publicPropertyExcludedFromAAD: chance.string(),
-            privateProperty: chance.string(),
+            publicProperty: randomness.string(),
+            publicPropertyExcludedFromAAD: randomness.string(),
+            privateProperty: randomness.string(),
           },
         },
       ];
@@ -162,9 +162,9 @@ export default function({ getService }: FtrProviderContext) {
 
     it('#update encrypts attributes and strips them from response', async () => {
       const updatedAttributes = {
-        publicProperty: chance.string(),
-        publicPropertyExcludedFromAAD: chance.string(),
-        privateProperty: chance.string(),
+        publicProperty: randomness.string(),
+        publicPropertyExcludedFromAAD: randomness.string(),
+        privateProperty: randomness.string(),
       };
 
       const { body: response } = await supertest
@@ -197,7 +197,7 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     it('#getDecryptedAsInternalUser is able to decrypt if non-AAD attribute has changed', async () => {
-      const updatedAttributes = { publicPropertyExcludedFromAAD: chance.string() };
+      const updatedAttributes = { publicPropertyExcludedFromAAD: randomness.string() };
 
       const { body: response } = await supertest
         .put(`${getURLAPIBaseURL()}${SAVED_OBJECT_WITH_SECRET_TYPE}/${savedObject.id}`)
@@ -220,7 +220,7 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     it('#getDecryptedAsInternalUser fails to decrypt if AAD attribute has changed', async () => {
-      const updatedAttributes = { publicProperty: chance.string() };
+      const updatedAttributes = { publicProperty: randomness.string() };
 
       const { body: response } = await supertest
         .put(`${getURLAPIBaseURL()}${SAVED_OBJECT_WITH_SECRET_TYPE}/${savedObject.id}`)
diff --git a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts
index 834e0225d0fb6c..424160e84495e3 100644
--- a/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/index.ts
@@ -7,7 +7,7 @@
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function({ loadTestFile }: FtrProviderContext) {
-  describe('encrypted_saved_objects', function encryptedSavedObjectsSuite() {
+  describe('encryptedSavedObjects', function encryptedSavedObjectsSuite() {
     this.tags('ciGroup2');
     loadTestFile(require.resolve('./encrypted_saved_objects_api'));
   });
diff --git a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/index.js b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/index.js
index 0547069dfb4694..17ae9b26fa3b3b 100644
--- a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/index.js
+++ b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/index.js
@@ -4,16 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import uuid from 'uuid';
+import _ from 'lodash';
+import stats from 'stats-lite';
+import prettyMilliseconds from 'pretty-ms';
+import { performance, PerformanceObserver } from 'perf_hooks';
 import { initRoutes } from './init_routes';
 
-function avg(items) {
-  return (
-    items.reduce((sum, val) => {
-      return sum + val;
-    }, 0) / items.length
-  );
-}
-
 export default function TaskManagerPerformanceAPI(kibana) {
   return new kibana.Plugin({
     name: 'perfTask',
@@ -27,35 +24,46 @@ export default function TaskManagerPerformanceAPI(kibana) {
 
     init(server) {
       const taskManager = server.plugins.task_manager;
-      const performanceState = {
-        runningAverageTasks: 0,
-        averagesTaken: [],
-        runningAverageLeadTime: -1,
-        averagesTakenLeadTime: [],
-        leadTimeQueue: [],
-      };
+      const performanceState = resetPerfState({});
+
+      let lastFlush = new Date();
+      function flushPerfStats() {
+        setTimeout(flushPerfStats, 5000);
+        const prevFlush = lastFlush;
+        lastFlush = new Date();
 
-      setInterval(() => {
         const tasks = performanceState.leadTimeQueue.length;
-        console.log(`I have processed ${tasks} tasks in the past 5s`);
+        const title = `[Perf${performanceState.capturing ? ' (capturing)' : ''}]`;
+        const seconds = parseInt((lastFlush - prevFlush) / 1000);
+        console.log(
+          `${title} I have processed ${tasks} tasks in the past ${seconds}s (${tasks /
+            seconds} per second)`
+        );
         if (tasks > 0) {
-          const latestAverage = avg(performanceState.leadTimeQueue.splice(0, tasks));
+          const latestAverage = avg(performanceState.leadTimeQueue.splice(0, tasks)).mean;
 
           performanceState.averagesTakenLeadTime.push(latestAverage);
           performanceState.averagesTaken.push(tasks);
           if (performanceState.averagesTakenLeadTime.length > 1) {
-            performanceState.runningAverageLeadTime = avg(performanceState.averagesTakenLeadTime);
-            performanceState.runningAverageTasks = avg(performanceState.averagesTaken);
+            performanceState.runningAverageLeadTime = avg(
+              performanceState.averagesTakenLeadTime
+            ).mean;
+            performanceState.runningAverageTasksPerSecond =
+              avg(performanceState.averagesTaken).mean / 5;
           } else {
             performanceState.runningAverageLeadTime = latestAverage;
-            performanceState.runningAverageTasks = tasks;
+            performanceState.runningAverageTasksPerSecond = tasks / 5;
           }
         }
-      }, 5000);
+      }
+
+      setTimeout(flushPerfStats, 5000);
+
+      const title = 'Perf Test Task';
 
       taskManager.registerTaskDefinitions({
         performanceTestTask: {
-          title: 'Perf Test Task',
+          title,
           description: 'A task for stress testing task_manager.',
           timeout: '1m',
 
@@ -64,27 +72,41 @@ export default function TaskManagerPerformanceAPI(kibana) {
               async run() {
                 const { params, state } = taskInstance;
 
-                const runAt = millisecondsFromNow(5000);
+                const counter = state.counter ? state.counter : 1;
+
                 const now = Date.now();
                 const leadTime = now - taskInstance.runAt;
                 performanceState.leadTimeQueue.push(leadTime);
 
-                const counter = (state.counter ? 1 + state.counter : 1);
+                // schedule to run next cycle as soon as possible
+                const runAt = calRunAt(params, counter);
 
                 const stateUpdated = {
                   ...state,
-                  counter
+                  counter: counter + 1,
                 };
 
-                if(params.trackExecutionTimeline) {
-                  stateUpdated.timeline = stateUpdated.timeline || [];
-                  stateUpdated.timeline.push({
-                    owner: taskInstance.owner.split('-')[0],
-                    counter,
-                    leadTime,
-                    ranAt: now
-                  });
+                if (params.trackExecutionTimeline && state.perf && state.perf.id) {
+                  performance.mark(`perfTask_run_${state.perf.id}_${counter}`);
+                  performance.measure(
+                    'perfTask.markUntilRun',
+                    `perfTask_markAsRunning_${state.perf.id}_${counter}`,
+                    `perfTask_run_${state.perf.id}_${counter}`
+                  );
+                  if (counter === 1) {
+                    performance.measure(
+                      'perfTask.firstRun',
+                      `perfTask_schedule_${state.perf.id}`,
+                      `perfTask_run_${state.perf.id}_${counter}`
+                    );
+                    performance.measure(
+                      'perfTask.firstMarkAsRunningTillRan',
+                      `perfTask_markAsRunning_${state.perf.id}_${counter}`,
+                      `perfTask_run_${state.perf.id}_${counter}`
+                    );
+                  }
                 }
+
                 return {
                   state: stateUpdated,
                   runAt,
@@ -95,17 +117,249 @@ export default function TaskManagerPerformanceAPI(kibana) {
         },
       });
 
-      initRoutes(server, performanceState);
+      taskManager.addMiddleware({
+        async beforeSave({ taskInstance, ...opts }) {
+          const modifiedInstance = {
+            ...taskInstance,
+          };
+
+          if (taskInstance.params && taskInstance.params.trackExecutionTimeline) {
+            modifiedInstance.state = modifiedInstance.state || {};
+            modifiedInstance.state.perf = modifiedInstance.state.perf || {};
+            modifiedInstance.state.perf.id = uuid.v4().replace(/-/gi, '_');
+            performance.mark(`perfTask_schedule_${modifiedInstance.state.perf.id}`);
+          }
+
+          return {
+            ...opts,
+            taskInstance: modifiedInstance,
+          };
+        },
+
+        async beforeMarkRunning({ taskInstance, ...opts }) {
+          const modifiedInstance = {
+            ...taskInstance,
+          };
+
+          if (
+            modifiedInstance.state &&
+            modifiedInstance.state.perf &&
+            modifiedInstance.state.perf.id
+          ) {
+            const { counter = 1 } = modifiedInstance.state;
+            performance.mark(`perfTask_markAsRunning_${modifiedInstance.state.perf.id}_${counter}`);
+            if (counter === 1) {
+              performance.measure(
+                'perfTask.firstMarkAsRunning',
+                `perfTask_schedule_${modifiedInstance.state.perf.id}`,
+                `perfTask_markAsRunning_${modifiedInstance.state.perf.id}_${counter}`
+              );
+            } else if (counter > 1) {
+              performance.measure(
+                'perfTask.runUntilNextMarkAsRunning',
+                `perfTask_run_${modifiedInstance.state.perf.id}_${counter - 1}`,
+                `perfTask_markAsRunning_${modifiedInstance.state.perf.id}_${counter}`
+              );
+            }
+          }
+
+          return {
+            ...opts,
+            taskInstance: modifiedInstance,
+          };
+        },
+      });
+
+      const perfApi = {
+        capture() {
+          resetPerfState(performanceState);
+          performanceState.capturing = true;
+          performance.mark('perfTest.start');
+        },
+        endCapture() {
+          return new Promise(resolve => {
+            performanceState.performance.summarize.push([resolve, perfApi.summarize]);
+
+            performance.mark('perfTest.end');
+            performance.measure('perfTest.duration', 'perfTest.start', 'perfTest.end');
+          });
+        },
+        summarize(perfTestDuration) {
+          const {
+            runningAverageTasksPerSecond,
+            runningAverageLeadTime,
+            performance,
+          } = performanceState;
+
+          const {
+            numberOfTasksRanOverall,
+            elasticsearchApiCalls,
+            activityDuration,
+            sleepDuration,
+            cycles,
+            claimAvailableTasksNoTasks,
+            claimAvailableTasksNoAvailableWorkers,
+            taskPoolAttemptToRun,
+            taskRunnerMarkTaskAsRunning
+          } = performance;
+
+          const perfRes = {
+            perfTestDuration: prettyMilliseconds(perfTestDuration),
+            runningAverageTasksPerSecond,
+            runningAverageLeadTime,
+            numberOfTasksRanOverall,
+            claimAvailableTasksNoTasks,
+            claimAvailableTasksNoAvailableWorkers,
+            elasticsearchApiCalls: _.mapValues(elasticsearchApiCalls, avg),
+            sleepDuration: prettyMilliseconds(stats.sum(sleepDuration)),
+            activityDuration: prettyMilliseconds(stats.sum(activityDuration)),
+            cycles,
+            taskPoolAttemptToRun: avg(taskPoolAttemptToRun),
+            taskRunnerMarkTaskAsRunning: avg(taskRunnerMarkTaskAsRunning),
+          };
+
+          resetPerfState(performanceState);
+
+          return perfRes;
+        },
+      };
+
+      initRoutes(server, perfApi);
     },
   });
 }
 
-function millisecondsFromNow(ms) {
-  if (!ms) {
-    return;
+function calRunAt(params, counter) {
+  const runAt = counter === 1 ? new Date(params.startAt) : new Date();
+  return runAt.getTime() < params.runUntil ? runAt : undefined;
+}
+
+function avg(items) {
+  const mode = stats.mode(items);
+  return {
+    mean: parseInt(stats.mean(items)),
+    range: {
+      min: parseInt(typeof mode === 'number' ? mode : _.min([...mode])),
+      max: parseInt(typeof mode === 'number' ? mode : _.max([...mode])),
+    },
+  };
+}
+
+function resetPerfState(target) {
+  if(target.performanceObserver) {
+    target.performanceObserver.disconnect();
   }
 
-  const dt = new Date();
-  dt.setTime(dt.getTime() + ms);
-  return dt;
+  const performanceState = Object.assign(target, {
+    capturing: false,
+    runningAverageTasksPerSecond: 0,
+    averagesTaken: [],
+    runningAverageLeadTime: -1,
+    averagesTakenLeadTime: [],
+    leadTimeQueue: [],
+    performance: {
+      numberOfTasksRanOverall: 0,
+      cycles: {
+        fillPoolStarts: 0,
+        fillPoolCycles: 0,
+        fillPoolBail: 0,
+        fillPoolBailNoTasks: 0,
+      },
+      claimAvailableTasksNoTasks: 0,
+      claimAvailableTasksNoAvailableWorkers: 0,
+      elasticsearchApiCalls: {
+        timeUntilFirstRun: [],
+        timeUntilFirstMarkAsRun: [],
+        firstMarkAsRunningTillRan: [],
+        timeFromMarkAsRunTillRun: [],
+        timeFromRunTillNextMarkAsRun: [],
+        claimAvailableTasks: [],
+      },
+      activityDuration: [],
+      sleepDuration: [],
+      taskPollerActivityDurationPreScheduleComplete: [],
+      taskPoolAttemptToRun: [],
+      taskRunnerMarkTaskAsRunning: [],
+
+      summarize: []
+    },
+  });
+
+  performanceState.performanceObserver = new PerformanceObserver((list, observer) => {
+    list.getEntries().forEach(entry => {
+      const { name, duration } = entry;
+      switch (name) {
+        // Elasticsearch Api Calls
+        case 'perfTask.firstRun':
+          performanceState.performance.elasticsearchApiCalls.timeUntilFirstRun.push(duration);
+          break;
+        case 'perfTask.firstMarkAsRunning':
+          performanceState.performance.elasticsearchApiCalls.timeUntilFirstMarkAsRun.push(duration);
+          break;
+        case 'perfTask.firstMarkAsRunningTillRan':
+          performanceState.performance.elasticsearchApiCalls.firstMarkAsRunningTillRan.push(duration);
+          break;
+        case 'perfTask.markUntilRun':
+          performanceState.performance.elasticsearchApiCalls.timeFromMarkAsRunTillRun.push(duration);
+          break;
+        case 'perfTask.runUntilNextMarkAsRunning':
+          performanceState.performance.elasticsearchApiCalls.timeFromRunTillNextMarkAsRun.push(duration);
+          break;
+        case 'claimAvailableTasks':
+          performanceState.performance.elasticsearchApiCalls.claimAvailableTasks.push(duration);
+          break;
+        case 'TaskPoller.sleepDuration':
+          performanceState.performance.sleepDuration.push(duration);
+          break;
+        case 'fillPool.activityDurationUntilNoTasks':
+          performanceState.performance.activityDuration.push(duration);
+          break;
+        case 'fillPool.activityDurationUntilExhaustedCapacity':
+          performanceState.performance.activityDuration.push(duration);
+          break;
+        case 'fillPool.bailExhaustedCapacity':
+          performanceState.performance.cycles.fillPoolBail++;
+          break;
+        case 'fillPool.bailNoTasks':
+          performanceState.performance.cycles.fillPoolBail++;
+          performanceState.performance.cycles.fillPoolBailNoTasks++;
+          break;
+        case 'fillPool.start':
+          performanceState.performance.cycles.fillPoolStarts++;
+          break;
+        case 'fillPool.cycle':
+          performanceState.performance.cycles.fillPoolCycles++;
+          break;
+          break;
+        case 'claimAvailableTasks.noTasks':
+          performanceState.performance.claimAvailableTasksNoTasks++;
+          break;
+        case 'claimAvailableTasks.noAvailableWorkers':
+          performanceState.performance.claimAvailableTasksNoAvailableWorkers++;
+          break;
+        case 'taskPool.attemptToRun':
+          performanceState.performance.taskPoolAttemptToRun.push(duration);
+          break;
+        case 'taskRunner.markTaskAsRunning':
+          performanceState.performance.taskRunnerMarkTaskAsRunning.push(duration);
+          break;
+        case 'perfTest.duration':
+          observer.disconnect();
+          const { summarize } = performanceState.performance;
+          if(summarize && summarize.length) {
+            summarize.splice(0, summarize.length).forEach(([resolve, summarize]) => {
+              resolve(summarize(duration));
+            });
+          }
+          break;
+        default:
+          if (name.startsWith('perfTask_run_')) {
+            performanceState.performance.numberOfTasksRanOverall++;
+          }
+      }
+    });
+  });
+  performanceState.performanceObserver.observe({ entryTypes: ['measure', 'mark'] });
+
+  return performanceState;
 }
diff --git a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/init_routes.js b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/init_routes.js
index b9fe788093d117..ca6d8707f5c58f 100644
--- a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/init_routes.js
+++ b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/init_routes.js
@@ -5,6 +5,7 @@
  */
 
 import Joi from 'joi';
+import { range, chunk } from 'lodash';
 
 const scope = 'perf-testing';
 export function initRoutes(server, performanceState) {
@@ -18,32 +19,56 @@ export function initRoutes(server, performanceState) {
         payload: Joi.object({
           tasksToSpawn: Joi.number().required(),
           durationInSeconds: Joi.number().required(),
-          trackExecutionTimeline: Joi.boolean().default(false).required(),
+          trackExecutionTimeline: Joi.boolean()
+            .default(false)
+            .required(),
         }),
       },
     },
     async handler(request) {
-      const { tasksToSpawn, durationInSeconds, trackExecutionTimeline } = request.payload;
-      const tasks = [];
+      performanceState.capture();
 
-      for (let taskIndex = 0; taskIndex < tasksToSpawn; taskIndex++) {
-        tasks.push(
-          await taskManager.schedule(
-            {
-              taskType: 'performanceTestTask',
-              params: { taskIndex, trackExecutionTimeline },
-              scope: [scope],
-            },
-            { request }
+      const { tasksToSpawn, durationInSeconds, trackExecutionTimeline } = request.payload;
+      const startAt = millisecondsFromNow(5000).getTime();
+      await chunk(range(tasksToSpawn), 200)
+        .map(chunkOfTasksToSpawn => () =>
+          Promise.all(
+            chunkOfTasksToSpawn.map(taskIndex =>
+              taskManager.schedule(
+                {
+                  taskType: 'performanceTestTask',
+                  params: {
+                    startAt,
+                    taskIndex,
+                    trackExecutionTimeline,
+                    runUntil: millisecondsFromNow(durationInSeconds * 1000).getTime(),
+                  },
+                  scope: [scope],
+                },
+                { request }
+              )
+            )
           )
-        );
-      }
+        )
+        .reduce((chain, nextExecutor) => {
+          return chain.then(() => nextExecutor());
+        }, Promise.resolve());
 
       return new Promise(resolve => {
         setTimeout(() => {
-          resolve(performanceState);
-        }, durationInSeconds * 1000);
+          performanceState.endCapture().then(resolve);
+        }, durationInSeconds * 1000 + 10000 /* wait extra 10s to drain queue */);
       });
     },
   });
 }
+
+function millisecondsFromNow(ms) {
+  if (!ms) {
+    return;
+  }
+
+  const dt = new Date();
+  dt.setTime(dt.getTime() + ms);
+  return dt;
+}
diff --git a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/package.json b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/package.json
index 22ee21852aeee9..7d46d6b0f3cca6 100644
--- a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/package.json
+++ b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/package.json
@@ -7,6 +7,10 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "joi": "^13.5.2"
+    "lodash": "^4.17.15",
+    "uuid": "3.3.2",
+    "joi": "^13.5.2",
+    "stats-lite": "2.2.0",
+    "pretty-ms": "5.0.0"
   }
 }
diff --git a/x-pack/test/plugin_api_perf/test_suites/task_manager/task_manager_perf_integration.ts b/x-pack/test/plugin_api_perf/test_suites/task_manager/task_manager_perf_integration.ts
index e8dbf7c5092878..d5caff5f9d10bf 100644
--- a/x-pack/test/plugin_api_perf/test_suites/task_manager/task_manager_perf_integration.ts
+++ b/x-pack/test/plugin_api_perf/test_suites/task_manager/task_manager_perf_integration.ts
@@ -10,23 +10,151 @@ export default function({ getService }: { getService: (service: string) => any }
   const log = getService('log');
   const supertest = getService('supertest');
 
+  const params = { tasksToSpawn: 100, trackExecutionTimeline: true, durationInSeconds: 60 };
   describe('stressing task manager', () => {
-    it('should run 10 tasks every second for a minute', async () => {
-      const { runningAverageTasks, runningAverageLeadTime } = await supertest
+    it(`should run ${params.tasksToSpawn} tasks over ${params.durationInSeconds} seconds`, async () => {
+      const {
+        runningAverageTasksPerSecond,
+        runningAverageLeadTime,
+        // how often things happen in Task Manager
+        cycles: { fillPoolStarts, fillPoolCycles, fillPoolBail, fillPoolBailNoTasks },
+        claimAvailableTasksNoTasks,
+        claimAvailableTasksNoAvailableWorkers,
+        numberOfTasksRanOverall,
+        // how long it takes to talk to Elasticsearch
+        elasticsearchApiCalls: {
+          timeUntilFirstMarkAsRun,
+          firstMarkAsRunningTillRan,
+          timeFromMarkAsRunTillRun,
+          timeFromRunTillNextMarkAsRun,
+          claimAvailableTasks,
+        },
+        // durations in Task Manager
+        perfTestDuration,
+        taskPoolAttemptToRun,
+        taskRunnerMarkTaskAsRunning,
+        sleepDuration,
+        activityDuration,
+      } = await supertest
         .post('/api/perf_tasks')
         .set('kbn-xsrf', 'xxx')
-        .send({ tasksToSpawn: 20, trackExecutionTimeline: true, durationInSeconds: 60 })
+        .send(params)
         .expect(200)
         .then((response: any) => response.body);
 
-      log.debug(`Stress Test Result:`);
-      log.debug(`Average number of tasks executed per second: ${runningAverageTasks}`);
-      log.debug(
-        `Average time it took from the moment a task's scheduled time was reached, until Task Manager picked it up: ${runningAverageLeadTime}`
+      log.info(cyan(`Stress Test Result:`));
+      log.info(
+        `Average number of tasks executed per second: ${bright(runningAverageTasksPerSecond)}`
       );
+      log.info(
+        `Average time between a task's "runAt" scheduled time and the time it actually ran: ${bright(
+          runningAverageLeadTime
+        )}`
+      );
+
+      if (params.trackExecutionTimeline) {
+        log.info(
+          `Overall number of tasks ran in ${bright(params.durationInSeconds)} seconds: ${bright(
+            numberOfTasksRanOverall
+          )}`
+        );
+        log.info(`Average time between stages:`);
+        log.info(
+          `Schedule ---[${descMetric(
+            timeUntilFirstMarkAsRun
+          )}]--> first markAsRunning ---[${descMetric(firstMarkAsRunningTillRan)}]--> first run`
+        );
+        log.info(
+          `markAsRunning ---[${descMetric(timeFromMarkAsRunTillRun)}]--> run ---[${descMetric(
+            timeFromRunTillNextMarkAsRun
+          )}]---> next markAsRunning`
+        );
+        log.info(`Duration of Perf Test: ${bright(perfTestDuration)}`);
+        log.info(`Activity within Task Poller: ${bright(activityDuration)}`);
+        log.info(`Inactivity due to Sleep: ${bright(sleepDuration)}`);
+        log.info(`Polling Cycles: ${colorizeCycles(fillPoolStarts, fillPoolCycles, fillPoolBail)}`);
+        if (fillPoolBail > 0) {
+          log.info(`  ⮑ Bailed due to:`);
+          if (fillPoolBailNoTasks > 0) {
+            log.info(`     ⮑ No Tasks To Process:`);
+            if (claimAvailableTasksNoTasks > 0) {
+              log.info(`       ⮑ ${claimAvailableTasksNoTasks} Times, due to No Tasks Claimed`);
+            }
+            if (claimAvailableTasksNoAvailableWorkers > 0) {
+              log.info(
+                `       ⮑ ${claimAvailableTasksNoAvailableWorkers} Times, due to having No Available Worker Capacity`
+              );
+            }
+          }
+          if (fillPoolBail - fillPoolBailNoTasks > 0) {
+            log.info(
+              `     ⮑ Exhausted Available Workers due to on going Task runs ${fillPoolBail -
+                fillPoolBailNoTasks}`
+            );
+          }
+        }
+        log.info(
+          `average duration taken to Claim Available Tasks: ${descMetric(claimAvailableTasks)}`
+        );
+        log.info(
+          `average duration taken to Mark claimed Tasks as Running in Task Pool: ${descMetric(
+            taskPoolAttemptToRun
+          )}`
+        );
+        log.info(
+          `average duration taken to Mark individual Tasks as Running in Task Runner: ${descMetric(
+            taskRunnerMarkTaskAsRunning
+          )}`
+        );
+      }
 
-      expect(runningAverageTasks).to.be.greaterThan(0);
+      expect(runningAverageTasksPerSecond).to.be.greaterThan(0);
       expect(runningAverageLeadTime).to.be.greaterThan(0);
     });
   });
 }
+
+function descMetric(metric: { mean: number; range: { min: number; max: number } }): string {
+  return `${colorize(metric.mean)}ms ${dim(`(`)}${colorize(metric.range.min)}${dim(
+    `ms - `
+  )}${colorize(metric.range.max)}${dim(`ms)`)}`;
+}
+
+function colorize(avg: number) {
+  if (!avg) {
+    return red('?');
+  }
+  return avg < 500 ? green(`${avg}`) : avg < 1000 ? cyan(`${avg}`) : red(`${avg}`);
+}
+
+function colorizeCycles(fillPoolStarts: number, fillPoolCycles: number, fillPoolBail: number) {
+  const perc = (fillPoolCycles * 100) / fillPoolStarts;
+  const colorFunc = perc >= 100 ? green : perc >= 50 ? cyan : red;
+  return (
+    `ran ` +
+    bright(`${fillPoolStarts}`) +
+    ` cycles, of which ` +
+    colorFunc(`${fillPoolCycles}`) +
+    ` were reran before bailing`
+  );
+}
+
+function cyan(str: string) {
+  return `\x1b[36m${str}\x1b[0m`;
+}
+
+function red(str: string) {
+  return `\x1b[31m${str}\x1b[0m`;
+}
+
+function green(str: string) {
+  return `\x1b[32m${str}\x1b[0m`;
+}
+
+function dim(str: string) {
+  return `\x1b[2m${str}\x1b[0m`;
+}
+
+function bright(str: string | number) {
+  return `\x1b[1m${str}\x1b[0m`;
+}
diff --git a/x-pack/test/saml_api_integration/apis/security/saml_login.ts b/x-pack/test/saml_api_integration/apis/security/saml_login.ts
index 925d28b62f9bb8..276b42423860cb 100644
--- a/x-pack/test/saml_api_integration/apis/security/saml_login.ts
+++ b/x-pack/test/saml_api_integration/apis/security/saml_login.ts
@@ -14,7 +14,7 @@ import { getLogoutRequest, getSAMLRequestId, getSAMLResponse } from '../../fixtu
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function({ getService }: FtrProviderContext) {
-  const chance = getService('chance');
+  const randomness = getService('randomness');
   const supertest = getService('supertestWithoutAuth');
   const config = getService('config');
 
@@ -23,7 +23,7 @@ export default function({ getService }: FtrProviderContext) {
   function createSAMLResponse(options = {}) {
     return getSAMLResponse({
       destination: `http://localhost:${kibanaServerConfig.port}/api/security/saml/callback`,
-      sessionIndex: chance.natural(),
+      sessionIndex: String(randomness.naturalNumber()),
       ...options,
     });
   }
@@ -365,7 +365,7 @@ export default function({ getService }: FtrProviderContext) {
         const handshakeCookie = request.cookie(handshakeResponse.headers['set-cookie'][0])!;
         const samlRequestId = await getSAMLRequestId(handshakeResponse.headers.location);
 
-        idpSessionIndex = chance.natural();
+        idpSessionIndex = String(randomness.naturalNumber());
         const samlAuthenticationResponse = await supertest
           .post('/api/security/saml/callback')
           .set('kbn-xsrf', 'xxx')
diff --git a/x-pack/test/saml_api_integration/config.ts b/x-pack/test/saml_api_integration/config.ts
index 8fb807016afeb6..9d3029db013d3c 100644
--- a/x-pack/test/saml_api_integration/config.ts
+++ b/x-pack/test/saml_api_integration/config.ts
@@ -20,7 +20,7 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [require.resolve('./apis')],
     servers: xPackAPITestsConfig.get('servers'),
     services: {
-      chance: kibanaAPITestsConfig.get('services.chance'),
+      randomness: kibanaAPITestsConfig.get('services.randomness'),
       es: kibanaAPITestsConfig.get('services.es'),
       supertestWithoutAuth: xPackAPITestsConfig.get('services.supertestWithoutAuth'),
     },
diff --git a/x-pack/test/saml_api_integration/services.ts b/x-pack/test/saml_api_integration/services.ts
index 3cbe8fb37356af..307108fa097f40 100644
--- a/x-pack/test/saml_api_integration/services.ts
+++ b/x-pack/test/saml_api_integration/services.ts
@@ -7,7 +7,7 @@
 import { services as apiIntegrationServices } from '../api_integration/services';
 
 export const services = {
-  chance: apiIntegrationServices.chance,
+  randomness: apiIntegrationServices.randomness,
   es: apiIntegrationServices.es,
   supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth,
 };
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
index dd9a92c848fabd..34361ad9df542d 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
@@ -57,7 +57,7 @@
     "index": ".kibana",
     "source": {
       "index-pattern": {
-        "fields": "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"@message\"},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"@tags\"},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"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\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"agent\"},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"extension\"},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"headings\"},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"host\"},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"index\"},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"links\"},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"machine.os\"},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.article:section\"},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.article:tag\"},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:description\"},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:image\"},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:image:height\"},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:image:width\"},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:site_name\"},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:title\"},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:type\"},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:url\"},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:card\"},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:description\"},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:image\"},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:site\"},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:title\"},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.url\"},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"request\"},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"response\"},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"spaces\"},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"url\"},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"xss\"}]",
+        "fields": "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"@message\"}}},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"@tags\"}}},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"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\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"agent\"}}},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"extension\"}}},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"headings\"}}},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"host\"}}},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"index\"}}},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"links\"}}},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"machine.os\"}}},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.article:section\"}}},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.article:tag\"}}},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:description\"}}},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image\"}}},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image:height\"}}},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image:width\"}}},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:site_name\"}}},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:title\"}}},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:type\"}}},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:url\"}}},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:card\"}}},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:description\"}}},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:image\"}}},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:site\"}}},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:title\"}}},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.url\"}}},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"request\"}}},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"response\"}}},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"spaces\"}}},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"url\"}}},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"xss\"}}}]",
         "timeFieldName": "@timestamp",
         "title": "logstash-*"
       },
@@ -148,7 +148,7 @@
     "index": ".kibana",
     "source": {
       "index-pattern": {
-        "fields": "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"@message\"},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"@tags\"},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"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\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"agent\"},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"extension\"},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"headings\"},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"host\"},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"index\"},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"links\"},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"machine.os\"},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.article:section\"},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.article:tag\"},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:description\"},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:image\"},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:image:height\"},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:image:width\"},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:site_name\"},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:title\"},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:type\"},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:url\"},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:card\"},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:description\"},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:image\"},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:site\"},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:title\"},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.url\"},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"request\"},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"response\"},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"spaces\"},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"url\"},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"xss\"}]",
+        "fields": "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"@message\"}}},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"@tags\"}}},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"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\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"agent\"}}},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"extension\"}}},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"headings\"}}},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"host\"}}},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"index\"}}},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"links\"}}},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"machine.os\"}}},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.article:section\"}}},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.article:tag\"}}},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:description\"}}},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image\"}}},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image:height\"}}},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image:width\"}}},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:site_name\"}}},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:title\"}}},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:type\"}}},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:url\"}}},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:card\"}}},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:description\"}}},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:image\"}}},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:site\"}}},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:title\"}}},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.url\"}}},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"request\"}}},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"response\"}}},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"spaces\"}}},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"url\"}}},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"xss\"}}}]",
         "timeFieldName": "@timestamp",
         "title": "logstash-*"
       },
@@ -243,7 +243,7 @@
     "index": ".kibana",
     "source": {
       "index-pattern": {
-        "fields": "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"@message\"},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"@tags\"},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"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\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"agent\"},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"extension\"},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"headings\"},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"host\"},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"index\"},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"links\"},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"machine.os\"},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.article:section\"},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.article:tag\"},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:description\"},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:image\"},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:image:height\"},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:image:width\"},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:site_name\"},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:title\"},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:type\"},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.og:url\"},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:card\"},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:description\"},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:image\"},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:site\"},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.twitter:title\"},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"relatedContent.url\"},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"request\"},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"response\"},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"spaces\"},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"url\"},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":\"multi\",\"parent\":\"xss\"}]",
+        "fields": "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"@message\"}}},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"@tags\"}}},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"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\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"agent\"}}},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"extension\"}}},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"headings\"}}},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"host\"}}},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"index\"}}},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"links\"}}},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"machine.os\"}}},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.article:section\"}}},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.article:tag\"}}},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:description\"}}},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image\"}}},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image:height\"}}},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:image:width\"}}},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:site_name\"}}},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:title\"}}},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:type\"}}},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.og:url\"}}},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:card\"}}},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:description\"}}},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:image\"}}},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:site\"}}},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.twitter:title\"}}},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"relatedContent.url\"}}},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"request\"}}},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"response\"}}},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"spaces\"}}},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"url\"}}},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\": \"xss\"}}}]",
         "timeFieldName": "@timestamp",
         "title": "logstash-*"
       },
diff --git a/x-pack/test/typings/hapi.d.ts b/x-pack/test/typings/hapi.d.ts
index f12e3c0c1c7639..339819798b480e 100644
--- a/x-pack/test/typings/hapi.d.ts
+++ b/x-pack/test/typings/hapi.d.ts
@@ -7,7 +7,6 @@
 import 'hapi';
 
 import { CloudPlugin } from '../../legacy/plugins/cloud';
-import { EncryptedSavedObjectsPlugin } from '../../legacy/plugins/encrypted_saved_objects';
 import { XPackMainPlugin } from '../../legacy/plugins/xpack_main/xpack_main';
 import { SecurityPlugin } from '../../legacy/plugins/security';
 import { ActionsPlugin, ActionsClient } from '../../legacy/plugins/actions';
@@ -23,7 +22,6 @@ declare module 'hapi' {
     cloud?: CloudPlugin;
     xpack_main: XPackMainPlugin;
     security?: SecurityPlugin;
-    encrypted_saved_objects?: EncryptedSavedObjectsPlugin;
     actions?: ActionsPlugin;
     alerting?: AlertingPlugin;
     task_manager?: TaskManager;
diff --git a/x-pack/test/visual_regression/tests/infra/index.js b/x-pack/test/visual_regression/tests/infra/index.js
index 9efd45e83a5504..f3063746b37b55 100644
--- a/x-pack/test/visual_regression/tests/infra/index.js
+++ b/x-pack/test/visual_regression/tests/infra/index.js
@@ -7,7 +7,7 @@
 export default function ({ loadTestFile, getService }) {
   const browser = getService('browser');
 
-  describe('InfraUI Visual Regression', function () {
+  describe.skip('InfraUI Visual Regression', function () {
     before(async () => {
       await browser.setWindowSize(1600, 1000);
     });
diff --git a/x-pack/test/visual_regression/tests/login_page.js b/x-pack/test/visual_regression/tests/login_page.js
index cfc53735dffcc9..003a23086c7b6c 100644
--- a/x-pack/test/visual_regression/tests/login_page.js
+++ b/x-pack/test/visual_regression/tests/login_page.js
@@ -11,8 +11,8 @@ export default function ({ getService, getPageObjects }) {
   const retry = getService('retry');
   const PageObjects = getPageObjects(['common', 'security']);
 
-  describe('Security', () => {
-    describe.skip('Login Page', () => {
+  describe.skip('Security', () => {
+    describe('Login Page', () => {
       before(async () => {
         await esArchiver.load('empty_kibana');
         await PageObjects.security.logout();
diff --git a/x-pack/typings/hapi.d.ts b/x-pack/typings/hapi.d.ts
index c5c02ef3765a72..1c6ad3a55cb2c1 100644
--- a/x-pack/typings/hapi.d.ts
+++ b/x-pack/typings/hapi.d.ts
@@ -7,7 +7,6 @@
 import 'hapi';
 
 import { CloudPlugin } from '../legacy/plugins/cloud';
-import { EncryptedSavedObjectsPlugin } from '../legacy/plugins/encrypted_saved_objects';
 import { XPackMainPlugin } from '../legacy/plugins/xpack_main/xpack_main';
 import { SecurityPlugin } from '../legacy/plugins/security';
 import { ActionsPlugin, ActionsClient } from '../legacy/plugins/actions';
@@ -23,7 +22,6 @@ declare module 'hapi' {
     cloud?: CloudPlugin;
     xpack_main: XPackMainPlugin;
     security?: SecurityPlugin;
-    encrypted_saved_objects?: EncryptedSavedObjectsPlugin;
     actions?: ActionsPlugin;
     alerting?: AlertingPlugin;
     task_manager?: TaskManager;
diff --git a/yarn.lock b/yarn.lock
index 69953ec3d42249..6526c90663b753 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1064,13 +1064,12 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@elastic/charts@^13.5.4":
-  version "13.5.4"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-13.5.4.tgz#b958639d485ed58d116ac66a16e4accef97919e0"
-  integrity sha512-F+aE4VgJ7xvl9RmWtJiHZwADQT9FwBSWgQS1IR1VQ5wLyOI9LUwrDGZXMtLR56M7wjPWbk0228n5xPgjsuBcdg==
+"@elastic/charts@^13.5.12":
+  version "13.5.12"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-13.5.12.tgz#95bd92389ec5fb411debfa5979091b6da2e4b123"
+  integrity sha512-MMNuebZ5jmzXkUJZr/mSvmtWNIR0gWGBtbqpZBfq3T9WRQPvnEHeE/N1WmXw2BSvwN86fy1i0gr52izh/nfzjQ==
   dependencies:
     "@types/d3-shape" "^1.3.1"
-    "@types/luxon" "^1.11.1"
     classnames "^2.2.6"
     d3-array "^1.2.4"
     d3-collection "^1.0.7"
@@ -1078,7 +1077,6 @@
     d3-shape "^1.3.4"
     fp-ts "^1.14.2"
     konva "^2.6.0"
-    luxon "^1.11.3"
     mobx "^4.9.2"
     mobx-react "^5.4.3"
     newtype-ts "^0.2.4"
@@ -1153,10 +1151,10 @@
     tabbable "^1.1.0"
     uuid "^3.1.0"
 
-"@elastic/eui@14.5.0":
-  version "14.5.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-14.5.0.tgz#1b27559cd644403e2692cab1549082cbd3421dab"
-  integrity sha512-QpmfO6Unt4evb4P18CyWzassLFrw/4CUPFYZXQK12IChDOs6GrwQ6xZM8f0wjN/NXwjRjlWzMhtCWHYmrI6NGg==
+"@elastic/eui@14.8.0":
+  version "14.8.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-14.8.0.tgz#777d29852998e52e8fc6dfb1869a4b32d74c72bb"
+  integrity sha512-p6TZv6Z+ENzw6JnCyXVQtvEOo7eEct8Qb/S4aS4EXK1WIyGB35Ra/a/pb3bLQbbZ2mSZtCr1sk+XVUq0qDpytw==
   dependencies:
     "@types/lodash" "^4.14.116"
     "@types/numeral" "^0.0.25"
@@ -1175,7 +1173,7 @@
     react-is "~16.3.0"
     react-virtualized "^9.18.5"
     resize-observer-polyfill "^1.5.0"
-    tabbable "^1.1.0"
+    tabbable "^3.0.0"
     uuid "^3.1.0"
 
 "@elastic/filesaver@1.1.2":
@@ -1240,16 +1238,14 @@
     vscode-languageserver "^5.2.1"
     vscode-languageserver-types "^3.14.0"
 
-"@elastic/makelogs@^4.5.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@elastic/makelogs/-/makelogs-4.5.0.tgz#d9256eb89fbfe7df9ff442cb31c598c5594370d7"
-  integrity sha512-xf8pG6vYoztTJUIjJDxHVRpwzMfsruZ33GjwbkzvKr4C/ZN1fjk5/iZYAnoGkknZgWVB1YEwTdFdUBR9h7ejcg==
+"@elastic/makelogs@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@elastic/makelogs/-/makelogs-5.0.0.tgz#0064e9009c4e480d17195ab70d627bc07635540f"
+  integrity sha512-QiKPR4DHwGH47O1kMuQIQkFCkepVIKrwP3nHUVbC//xMul7QgKRIogcQNTsZoMTGSIUrS80ngqHx+OVnd3t4Bg==
   dependencies:
     async "^1.4.2"
-    bluebird "^2.10.0"
-    elasticsearch "^15.2.0"
-    inquirer "^0.11.1"
-    lodash "~2.4.1"
+    elasticsearch "^16.4.0"
+    inquirer "^7.0.0"
     moment "^2.10.6"
     optimist "~0.6.1"
     progress "^1.1.8"
@@ -1290,15 +1286,6 @@
     "@types/node-jose" "1.1.0"
     node-jose "1.1.0"
 
-"@elastic/simple-git@1.124.0-elastic.15":
-  version "1.124.0-elastic.15"
-  resolved "https://registry.yarnpkg.com/@elastic/simple-git/-/simple-git-1.124.0-elastic.15.tgz#b7975e9d1aeb424c87c817e1bd0549d25ec1d2c5"
-  integrity sha512-Nb+WwJI9I2PN72Ue6stMUDVlqrNKuskpfKJwd+74YtyyfuV7dfHvt4FksqrjnOLbvFxJi214DZ1dHoROg3iQyQ==
-  dependencies:
-    debug "^4.0.1"
-    request "^2.88.0"
-    targz "^1.0.1"
-
 "@elastic/ui-ace@0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@elastic/ui-ace/-/ui-ace-0.2.3.tgz#5281aed47a79b7216c55542b0675e435692f20cd"
@@ -2422,35 +2409,6 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@slack/client@^4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@slack/client/-/client-4.8.0.tgz#265606f1cebae1d72f3fdd2cdf7cf1510783dde4"
-  integrity sha512-c4PKsRMtTp3QVYg+6cNqqxbU/50gnYfMlZgPCGUuMDMm9mkx50y0PEuERcVyLIe5j61imrhQx9DoNIfybEhTTw==
-  dependencies:
-    "@types/form-data" "^2.2.1"
-    "@types/is-stream" "^1.1.0"
-    "@types/loglevel" "^1.5.3"
-    "@types/node" ">=6.0.0"
-    "@types/p-cancelable" "^0.3.0"
-    "@types/p-queue" "^2.3.1"
-    "@types/p-retry" "^1.0.1"
-    "@types/retry" "^0.10.2"
-    "@types/ws" "^5.1.1"
-    axios "^0.18.0"
-    eventemitter3 "^3.0.0"
-    finity "^0.5.4"
-    form-data "^2.3.1"
-    is-stream "^1.1.0"
-    loglevel "^1.6.1"
-    object.entries "^1.0.4"
-    object.getownpropertydescriptors "^2.0.3"
-    object.values "^1.0.4"
-    p-cancelable "^0.3.0"
-    p-queue "^2.3.0"
-    p-retry "^2.0.0"
-    retry "^0.12.0"
-    ws "^5.2.0"
-
 "@slack/types@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@slack/types/-/types-1.0.0.tgz#1dc7a63b293c4911e474197585c3feda012df17a"
@@ -3108,6 +3066,11 @@
   resolved "https://registry.yarnpkg.com/@types/base64-js/-/base64-js-1.2.5.tgz#582b2476169a6cba460a214d476c744441d873d5"
   integrity sha1-WCskdhaabLpGCiFNR2x0REHYc9U=
 
+"@types/bluebird@*":
+  version "3.5.28"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.28.tgz#04c1a520ff076649236bc8ca21198542ce2bdb09"
+  integrity sha512-0Vk/kqkukxPKSzP9c8WJgisgGDx5oZDbsLLWIP5t70yThO/YleE+GEm2S1GlRALTaack3O7U5OS5qEm7q2kciA==
+
 "@types/bluebird@^3.1.1":
   version "3.5.20"
   resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.20.tgz#f6363172add6f4eabb8cada53ca9af2781e8d6a1"
@@ -3297,13 +3260,6 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
   integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==
 
-"@types/execa@^0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@types/execa/-/execa-0.9.0.tgz#9b025d2755f17e80beaf9368c3f4f319d8b0fb93"
-  integrity sha512-mgfd93RhzjYBUHHV532turHC2j4l/qxsF/PbfDmprHDEUHmNZGlDn1CEsulGK3AfsPdhkWzZQT/S/k0UGhLGsA==
-  dependencies:
-    "@types/node" "*"
-
 "@types/fancy-log@^1.3.1":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@types/fancy-log/-/fancy-log-1.3.1.tgz#dd94fbc8c2e2ab8ab402ca8d04bb8c34965f0696"
@@ -3319,13 +3275,6 @@
   resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.0.tgz#cbb49815a5e1129d5f23836a98d65d93822409af"
   integrity sha512-dxdRrUov2HVTbSRFX+7xwUPlbGYVEZK6PrSqClg2QPos3PNe0bCajkDDkDeeC1znjSH03KOEqVbXpnJuWa2wgQ==
 
-"@types/form-data@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
-  integrity sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/fs-extra@5.0.4":
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.4.tgz#b971134d162cc0497d221adde3dbb67502225599"
@@ -3462,11 +3411,6 @@
   resolved "https://registry.yarnpkg.com/@types/hoek/-/hoek-4.1.3.tgz#d1982d48fb0d2a0e5d7e9d91838264d8e428d337"
   integrity sha1-0ZgtSPsNKg5dfp2Rg4Jk2OQo0zc=
 
-"@types/humps@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@types/humps/-/humps-1.1.2.tgz#fbcaf596d20ff2ed78f8f511c5d6a943b51101d6"
-  integrity sha1-+8r1ltIP8u14+PURxdapQ7URAdY=
-
 "@types/indent-string@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/indent-string/-/indent-string-3.0.0.tgz#9ebb391ceda548926f5819ad16405349641b999f"
@@ -3489,13 +3433,6 @@
   resolved "https://registry.yarnpkg.com/@types/is-glob/-/is-glob-4.0.0.tgz#fb8a2bff539025d4dcd6d5efe7689e03341b876d"
   integrity sha512-zC/2EmD8scdsGIeE+Xg7kP7oi9VP90zgMQtm9Cr25av4V+a+k8slQyiT60qSw8KORYrOKlPXfHwoa1bQbRzskQ==
 
-"@types/is-stream@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@types/is-stream/-/is-stream-1.1.0.tgz#b84d7bb207a210f2af9bed431dc0fbe9c4143be1"
-  integrity sha512-jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -3633,21 +3570,11 @@
   resolved "https://registry.yarnpkg.com/@types/log-symbols/-/log-symbols-2.0.0.tgz#7919e2ec3c8d13879bfdcab310dd7a3f7fc9466d"
   integrity sha512-YJhbp0sz3egFFKl3BcCNPQKzuGFOP4PACcsifhK6ROGnJUW9ViYLuLybQ9GQZm7Zejy3tkGuiXYMq3GiyGkU4g==
 
-"@types/loglevel@^1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@types/loglevel/-/loglevel-1.5.3.tgz#adfce55383edc5998a2170ad581b3e23d6adb5b8"
-  integrity sha512-TzzIZihV+y9kxSg5xJMkyIkaoGkXi50isZTtGHObNHRqAAwjGNjSCNPI7AUAv0tZUKTq9f2cdkCUd/2JVZUTrA==
-
 "@types/lru-cache@^5.1.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.0.tgz#57f228f2b80c046b4a1bd5cac031f81f207f4f03"
   integrity sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w==
 
-"@types/luxon@^1.11.1":
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-1.12.0.tgz#acf14294d18e6eba427a5e5d7dfce0f5cd2a9400"
-  integrity sha512-+UzPmwHSEEyv7aGlNkVpuFxp/BirXgl8NnPGCtmyx2KXIzAapoW3IqSVk87/Z3PUk8vEL8Pe1HXEMJbNBOQgtg==
-
 "@types/mapbox-gl@^0.54.1":
   version "0.54.3"
   resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-0.54.3.tgz#6215fbf4dbb555d2ca6ce3be0b1de045eec0f967"
@@ -3699,10 +3626,10 @@
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
   integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
 
-"@types/moment-timezone@^0.5.8":
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/@types/moment-timezone/-/moment-timezone-0.5.8.tgz#92aba9bc238cabf69a27a1a4f52e0ebb8f10f896"
-  integrity sha512-FpC+fLd/Hmxxcl4cxeb5HTyCmEvl3b4TeX8w9J+0frdzH+UCEkexKe4WZ3DTALwLj2/hyujn8tp3zl1YdgLrxQ==
+"@types/moment-timezone@^0.5.12":
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/@types/moment-timezone/-/moment-timezone-0.5.12.tgz#0fb680c03db194fe8ff4551eaeb1eec8d3d80e9f"
+  integrity sha512-hnHH2+Efg2vExr/dSz+IX860nSiyk9Sk4pJF2EmS11lRpMcNXeB4KBW5xcgw2QPsb9amTXdsVNEe5IoJXiT0uw==
   dependencies:
     moment ">=2.14.0"
 
@@ -3739,7 +3666,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@10.12.27", "@types/node@8.5.8", "@types/node@>=6.0.0", "@types/node@>=8.9.0", "@types/node@^10.12.27", "@types/node@^12.0.2":
+"@types/node@*", "@types/node@10.12.27", "@types/node@8.5.8", "@types/node@>=8.9.0", "@types/node@^10.12.27", "@types/node@^12.0.2":
   version "10.12.27"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.27.tgz#eb3843f15d0ba0986cc7e4d734d2ee8b50709ef8"
   integrity sha512-e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg==
@@ -3782,23 +3709,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/p-cancelable@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@types/p-cancelable/-/p-cancelable-0.3.0.tgz#3e4fcc54a3dfd81d0f5b93546bb68d0df50553bb"
-  integrity sha512-sP+9Ivnpil7cdmvr5O+145aXm65YX8Y+Lrul1ojdYz6yaE05Dqonn6Z9v5eqJCQ0UeSGcTRtepMlZDh9ywdKgw==
-
-"@types/p-queue@^2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@types/p-queue/-/p-queue-2.3.1.tgz#2fb251e46e884e31c4bd1bf58f0e188972353ff4"
-  integrity sha512-JyO7uMAtkcMMULmsTQ4t/lCC8nxirTtweGG1xAFNNIAoC1RemmeIxq8PiKghuEy99XdbS6Lwx4zpbXUjfeSSAA==
-
-"@types/p-retry@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/p-retry/-/p-retry-1.0.1.tgz#2302bc3da425014208c8a9b68293d37325124785"
-  integrity sha512-HgQPG9kkUb4EpTeUv2taH2nBZsVUb5aOTSw3X2YozcTG1ttmGcLaLKx1MbAz1evVfUEDTCAPmdz2HiFztIyWrw==
-  dependencies:
-    "@types/retry" "*"
-
 "@types/papaparse@^4.5.11":
   version "4.5.11"
   resolved "https://registry.yarnpkg.com/@types/papaparse/-/papaparse-4.5.11.tgz#dcd4f64da55f768c2e2cf92ccac1973c67a73890"
@@ -3998,19 +3908,6 @@
     "@types/tough-cookie" "*"
     form-data "^2.5.0"
 
-"@types/retry@*", "@types/retry@^0.10.2":
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.10.2.tgz#bd1740c4ad51966609b058803ee6874577848b37"
-  integrity sha512-LqJkY4VQ7S09XhI7kA3ON71AxauROhSv74639VsNXC9ish4IWHnIi98if+nP1MxQV3RMPqXSCYgpPsDHjlg9UQ==
-
-"@types/rimraf@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"
-  integrity sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ==
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
 "@types/selenium-webdriver@^4.0.3":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.0.3.tgz#388f12c464cc1fff5d4c84cb372f19b9ab9b5c81"
@@ -4115,6 +4012,22 @@
     "@types/cookiejar" "*"
     "@types/node" "*"
 
+"@types/supertest-as-promised@^2.0.38":
+  version "2.0.38"
+  resolved "https://registry.yarnpkg.com/@types/supertest-as-promised/-/supertest-as-promised-2.0.38.tgz#5077adf2a31429e06ba8de6799ebdb796ad50fc7"
+  integrity sha512-2vdlnsZBIgaX0DFNOACK4xFDqvoA1sAR78QD3LiDWGmzSfrRCNt1WFyUYe2Vf0QS03tZf6XC8bNlLaLYXhZbGA==
+  dependencies:
+    "@types/bluebird" "*"
+    "@types/superagent" "*"
+    "@types/supertest" "*"
+
+"@types/supertest@*":
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.8.tgz#23801236e2b85204ed771a8e7c40febba7da2bda"
+  integrity sha512-wcax7/ip4XSSJRLbNzEIUVy2xjcBIZZAuSd2vtltQfRK7kxhx5WMHbLHkYdxN3wuQCrwpYrg86/9byDjPXoGMA==
+  dependencies:
+    "@types/superagent" "*"
+
 "@types/supertest@^2.0.5":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.5.tgz#18d082a667eaed22759be98f4923e0061ae70c62"
@@ -4231,14 +4144,6 @@
   resolved "https://registry.yarnpkg.com/@types/write-pkg/-/write-pkg-3.1.0.tgz#f58767f4fb9a6a3ad8e95d3e9cd1f2d026ceab26"
   integrity sha512-JRGsPEPCrYqTXU0Cr+Yu7esPBE2yvH7ucOHr+JuBy0F59kglPvO5gkmtyEvf3P6dASSkScvy/XQ6SC1QEBFDuA==
 
-"@types/ws@^5.1.1":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-5.1.2.tgz#f02d3b1cd46db7686734f3ce83bdf46c49decd64"
-  integrity sha512-NkTXUKTYdXdnPE2aUUbGOXE1XfMK527SCvU/9bj86kyFF6kZ9ZnOQ3mK5jADn98Y2vEUD/7wKDgZa7Qst2wYOg==
-  dependencies:
-    "@types/events" "*"
-    "@types/node" "*"
-
 "@types/xml-crypto@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@types/xml-crypto/-/xml-crypto-1.4.0.tgz#b586e4819f6bdd0571a3faa9a8098049d5c3cc5a"
@@ -4644,11 +4549,25 @@ acorn-jsx@^5.0.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
+acorn-node@^1.3.0:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
+  integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==
+  dependencies:
+    acorn "^7.0.0"
+    acorn-walk "^7.0.0"
+    xtend "^4.0.2"
+
 acorn-walk@^6.0.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
   integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
+acorn-walk@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.0.0.tgz#c8ba6f0f1aac4b0a9e32d1f0af12be769528f36b"
+  integrity sha512-7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg==
+
 acorn@5.X, acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.2, acorn@^5.5.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
@@ -5092,16 +5011,16 @@ ansi@^0.3.0, ansi@~0.3.1:
   resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
   integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
 
-ansicolors@0.3.2, ansicolors@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
-  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
-
 ansicolors@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
   integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=
 
+ansicolors@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
+
 any-base@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe"
@@ -5680,16 +5599,6 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-assignment@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/assignment/-/assignment-2.0.0.tgz#ffd17b21bf5d6b22e777b989681a815456a3dd3e"
-  integrity sha1-/9F7Ib9dayLnd7mJaBqBVFaj3T4=
-
-assignment@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/assignment/-/assignment-2.2.0.tgz#f5b5bc2d160d69986e8700cd38f567c0aabe101e"
-  integrity sha1-9bW8LRYNaZhuhwDNOPVnwKq+EB4=
-
 ast-module-types@^2.3.1, ast-module-types@^2.3.2, ast-module-types@^2.4.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/ast-module-types/-/ast-module-types-2.5.0.tgz#44b8bcd51684329a77f2af6b2587df9ea6b4d5ff"
@@ -5773,55 +5682,6 @@ async-settle@^1.0.0:
   dependencies:
     async-done "^1.2.2"
 
-async.queue@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/async.queue/-/async.queue-0.5.2.tgz#8d5d90812e1481066bc0904e8cc1712b17c3bd7c"
-  integrity sha1-jV2QgS4UgQZrwJBOjMFxKxfDvXw=
-  dependencies:
-    async.util.queue "0.5.2"
-
-async.util.arrayeach@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/async.util.arrayeach/-/async.util.arrayeach-0.5.2.tgz#58c4e98028d55d69bfb05aeb3af44e0a555a829c"
-  integrity sha1-WMTpgCjVXWm/sFrrOvROClVagpw=
-
-async.util.isarray@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/async.util.isarray/-/async.util.isarray-0.5.2.tgz#e62dac8f2636f65875dcf7521c2d24d0dfb2bbdf"
-  integrity sha1-5i2sjyY29lh13PdSHC0k0N+yu98=
-
-async.util.map@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/async.util.map/-/async.util.map-0.5.2.tgz#e588ef86e0b3ab5f027d97af4d6835d055ca69d6"
-  integrity sha1-5YjvhuCzq18CfZevTWg10FXKadY=
-
-async.util.noop@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/async.util.noop/-/async.util.noop-0.5.2.tgz#bdd62b97cb0aa3f60b586ad148468698975e58b9"
-  integrity sha1-vdYrl8sKo/YLWGrRSEaGmJdeWLk=
-
-async.util.onlyonce@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/async.util.onlyonce/-/async.util.onlyonce-0.5.2.tgz#b8e6fc004adc923164d79e32f2813ee465c24ff2"
-  integrity sha1-uOb8AErckjFk154y8oE+5GXCT/I=
-
-async.util.queue@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/async.util.queue/-/async.util.queue-0.5.2.tgz#57f65abe1a3cdf273d31abd28ab95425f8222ee5"
-  integrity sha1-V/Zavho83yc9MavSirlUJfgiLuU=
-  dependencies:
-    async.util.arrayeach "0.5.2"
-    async.util.isarray "0.5.2"
-    async.util.map "0.5.2"
-    async.util.noop "0.5.2"
-    async.util.onlyonce "0.5.2"
-    async.util.setimmediate "0.5.2"
-
-async.util.setimmediate@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/async.util.setimmediate/-/async.util.setimmediate-0.5.2.tgz#2812ebabf2a58027758d4bc7793d1ccfaf10255f"
-  integrity sha1-KBLrq/KlgCd1jUvHeT0cz68QJV8=
-
 async@1.x, async@^1.4.2, async@^1.5.2, async@~1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -5925,6 +5785,11 @@ aws4@^1.6.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
   integrity sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=
 
+axe-core@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-3.3.2.tgz#7baf3c55a5cf1621534a2c38735f5a1bf2f7e1a8"
+  integrity sha512-lRdxsRt7yNhqpcXQk1ao1BL73OZDzmFCWOG0mC4tGR/r14ohH2payjHwCMQjHGbBKm924eDlmG7utAGHiX/A6g==
+
 axios@^0.18.0, axios@^0.18.1:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
@@ -6122,16 +5987,13 @@ babel-plugin-emotion@^9.2.11:
     source-map "^0.5.7"
     touch "^2.0.1"
 
-babel-plugin-inline-react-svg@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-inline-react-svg/-/babel-plugin-inline-react-svg-1.1.0.tgz#b39519c78249b3fcf895b541c38b485a2b11b0be"
-  integrity sha512-Y/tBMi7Jh7Jh+DGcSNsY9/RW33nvcR067HFK0Dp+03jpidil1sJAffBdajK72xn3tbwMsgFLJubxW5xpQLJytA==
+babel-plugin-filter-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-3.0.0.tgz#a849683837ad29960da17492fb32789ab6b09a11"
+  integrity sha512-p/chjzVTgCxUqyLM0q/pfWVZS7IJTwGQMwNg0LOvuQpKiTftQgZDtkGB8XvETnUw19rRcL7bJCTopSwibTN2tA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    lodash.isplainobject "^4.0.6"
-    resolve "^1.10.0"
-    svgo "^0.7.2"
+    "@babel/types" "^7.4.0"
+    lodash "^4.17.11"
 
 babel-plugin-istanbul@^5.1.0:
   version "5.1.1"
@@ -6250,11 +6112,6 @@ babel-plugin-minify-type-constructors@^0.4.3:
   dependencies:
     babel-helper-is-void-0 "^0.4.3"
 
-babel-plugin-mock-imports@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-mock-imports/-/babel-plugin-mock-imports-1.0.1.tgz#1476ed4de911347d344fc81caab4beced80804b1"
-  integrity sha512-Nu4unCGKeqOfLlfnLPnv/pEHancdAGTqFqyArZ27gsKIiKxeZvMr87IHB8BxhMu3Bfc8fA8bx7hWt32aZbEwpQ==
-
 babel-plugin-named-asset-import@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.3.tgz#9ba2f3ac4dc78b042651654f07e847adfe50667c"
@@ -6314,7 +6171,7 @@ babel-plugin-transform-property-literals@^6.9.4:
   dependencies:
     esutils "^2.0.2"
 
-babel-plugin-transform-react-remove-prop-types@0.4.24, babel-plugin-transform-react-remove-prop-types@^0.4.24:
+babel-plugin-transform-react-remove-prop-types@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
   integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
@@ -6717,11 +6574,6 @@ bluebird@3.5.5, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
   integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
 
-bluebird@^2.10.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
-  integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
-
 bluebird@^3.3.0, bluebird@^3.3.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -6945,6 +6797,16 @@ brfs@^1.3.0, brfs@^1.4.0:
     static-module "^1.1.0"
     through2 "^2.0.0"
 
+brfs@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brfs/-/brfs-2.0.2.tgz#44237878fa82aa479ce4f5fe2c1796ec69f07845"
+  integrity sha512-IrFjVtwu4eTJZyu8w/V2gxU7iLTtcHih67sgEdzrhjLBMHp2uYefUBfdM4k2UvcuWMgV7PQDZHSLeNWnLFKWVQ==
+  dependencies:
+    quote-stream "^1.0.1"
+    resolve "^1.1.5"
+    static-module "^3.0.2"
+    through2 "^2.0.0"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -7752,13 +7614,6 @@ check-more-types@2.24.0:
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
   integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=
 
-checksum@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/checksum/-/checksum-0.1.1.tgz#dc6527d4c90be8560dbd1ed4cecf3297d528e9e9"
-  integrity sha1-3GUn1MkL6FYNvR7Uzs8yl9Uo6ek=
-  dependencies:
-    optimist "~0.3.5"
-
 cheerio@0.22.0:
   version "0.22.0"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
@@ -7868,10 +7723,10 @@ chrome-trace-event@^1.0.0, chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-chromedriver@^77.0.0:
-  version "77.0.0"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-77.0.0.tgz#bd916cc87a0ccb7a6e4fb4b43cb2368bc54db6a0"
-  integrity sha512-mZa1IVx4HD8rDaItWbnS470mmypgiWsDiu98r0NkiT4uLm3qrANl4vOU6no6vtWtLQiW5kt1POcIbjeNpsLbXA==
+chromedriver@^78.0.1:
+  version "78.0.1"
+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-78.0.1.tgz#2db3425a2cba6fcaf1a41d9538b16c3d06fa74a8"
+  integrity sha512-eOsyFk4xb9EECs1VMrDbxO713qN+Bu1XUE8K9AuePc3839TPdAegg72kpXSzkeNqRNZiHbnJUItIVCLFkDqceA==
   dependencies:
     del "^4.1.1"
     extract-zip "^1.6.7"
@@ -7912,13 +7767,6 @@ circular-json@^0.5.5:
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
   integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
 
-clap@^1.0.9:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
-  integrity sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==
-  dependencies:
-    chalk "^1.1.3"
-
 class-extend@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/class-extend/-/class-extend-0.1.2.tgz#8057a82b00f53f82a5d62c50ef8cffdec6fabc34"
@@ -7942,7 +7790,7 @@ classnames@2.2.6, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
-classnames@2.x, classnames@^2.2.4:
+classnames@2.x:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
   integrity sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0=
@@ -8067,25 +7915,11 @@ cli-ux@^4.9.0:
     treeify "^1.1.0"
     tslib "^1.9.3"
 
-cli-width@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-1.1.1.tgz#a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"
-  integrity sha1-pNKT72frt7iNSk1CwMzwDE0eNm0=
-
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-clipboard@^1.6.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz#360d6d6946e99a7a1fef395e42ba92b5e9b5a16b"
-  integrity sha1-Ng1taUbpmnof7zleQrqStem1oWs=
-  dependencies:
-    good-listener "^1.2.2"
-    select "^1.1.2"
-    tiny-emitter "^2.0.0"
-
 clipboard@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d"
@@ -8227,13 +8061,6 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
-coa@~1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
-  integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=
-  dependencies:
-    q "^1.1.2"
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -9078,6 +8905,15 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
+  integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 crypt@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
@@ -9276,14 +9112,6 @@ csso@^3.5.1:
   dependencies:
     css-tree "1.0.0-alpha.29"
 
-csso@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
-  integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=
-  dependencies:
-    clap "^1.0.9"
-    source-map "^0.5.3"
-
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
@@ -9697,11 +9525,6 @@ data-urls@^1.0.1:
     whatwg-mimetype "^2.1.0"
     whatwg-url "^7.0.0"
 
-dataloader@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-1.4.0.tgz#bca11d867f5d3f1b9ed9f737bd15970c65dff5c8"
-  integrity sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==
-
 date-fns@^1.27.2:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
@@ -9744,7 +9567,7 @@ debug-fabulous@1.X:
     memoizee "0.4.X"
     object-assign "4.X"
 
-debug@2.6.9, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9, debug@~2.2.0:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -9779,13 +9602,6 @@ debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
-  dependencies:
-    ms "0.7.1"
-
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -10003,6 +9819,14 @@ defined@~1.0.0:
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
   integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
 
+del-cli@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-3.0.0.tgz#327a15d4c18d6b7e5c849a53ef0d17901bc28197"
+  integrity sha512-J4HDC2mpcN5aopya4VdkyiFXZaqAoo7ua9VpKbciX3DDUSbtJbPMc3ivggJsAAgS6EqonmbenIiMhBGtJPW9FA==
+  dependencies:
+    del "^5.1.0"
+    meow "^5.0.0"
+
 del@^2.0.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -10580,7 +10404,7 @@ dragselect@1.13.1:
   resolved "https://registry.yarnpkg.com/dragselect/-/dragselect-1.13.1.tgz#aa4166e1164b51ed5ee0cd89e0c5310a9c35be6a"
   integrity sha512-spfUz6/sNnlY4fF/OxPBwaKLa5hVz6V+fq5XhVuD+h47RAkA75TMkfvr4AoWUh5Ufq3V1oIAbfu+sjc9QbewoA==
 
-duplexer2@^0.1.4:
+duplexer2@^0.1.4, duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
   integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
@@ -10708,24 +10532,15 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
   integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-elasticsearch-browser@^16.4.0:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/elasticsearch-browser/-/elasticsearch-browser-16.4.0.tgz#0e0b9b781f9f5207498085ce1d47d916ff46fb82"
-  integrity sha512-VILNtZQytYnT3mYit3SeN+SgjqOw4piZEhUrHjl7bNY1OGU7nwODtVj/rL7bc0pTmVAnDTtq0CBKE+ncjd+3hQ==
-
-elasticsearch@^15.2.0:
-  version "15.2.0"
-  resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-15.2.0.tgz#234362b5aa743d9c0a925566569ea7813b8f2569"
-  integrity sha512-jOFcBoEh3Sn3gjUTozInODZTLriJtfppAUC7jnQCUE+OUj8o7GoAyC+L4h/L3ZxmXNFbQCunqVR+nmSofHdo9A==
-  dependencies:
-    agentkeepalive "^3.4.1"
-    chalk "^1.0.0"
-    lodash "^4.17.10"
+elasticsearch-browser@^16.5.0:
+  version "16.5.0"
+  resolved "https://registry.yarnpkg.com/elasticsearch-browser/-/elasticsearch-browser-16.5.0.tgz#d2efbbf8751bb563e91b74117a14b9211df5cfe9"
+  integrity sha512-F7npcrmMi3OgQ4fL+7sYLZp5Y9MS6WobVdCA18d9/Eef06x3+UzVE+pRaM71y4/i0N5rt/QrvmijHt25wz5SLw==
 
-elasticsearch@^16.4.0:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-16.4.0.tgz#534d6d83a9e0cc3080bec92b89dac0eb1e4d4c73"
-  integrity sha512-uJN1hNNB8fBkaDqhC1SW8NbEC6Ge63fUHj0vJ9BZdHBlIhbsUq68Y5DUv6TRoE6IC8ezCDFqhRs7m7ar19+iiQ==
+elasticsearch@^16.4.0, elasticsearch@^16.5.0:
+  version "16.5.0"
+  resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-16.5.0.tgz#619a48040be25d345fdddf09fa6042a88c3974d6"
+  integrity sha512-9YbmU2AtM/kQdmp96EI5nu2bjxowdarV6IsKmcS+jQowJ3mhG98J1DCVOtEKuFvsnNaLyKD3aPbCAmb72+WX3w==
   dependencies:
     agentkeepalive "^3.4.1"
     chalk "^1.0.0"
@@ -11087,7 +10902,7 @@ es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-map@^0.1.3:
+es6-map@^0.1.3, es6-map@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
   integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
@@ -11121,7 +10936,7 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-es6-set@~0.1.5:
+es6-set@^0.1.5, es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
   integrity sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=
@@ -11209,6 +11024,18 @@ escodegen@^1.8.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+escodegen@^1.8.1:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
+  integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 escodegen@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
@@ -11253,6 +11080,18 @@ escodegen@~1.3.2:
   optionalDependencies:
     source-map "~0.1.33"
 
+escodegen@~1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 escope@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
@@ -11654,6 +11493,11 @@ estraverse@~1.5.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"
   integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=
 
+estree-is-function@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/estree-is-function/-/estree-is-function-1.0.0.tgz#c0adc29806d7f18a74db7df0f3b2666702e37ad2"
+  integrity sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA==
+
 esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -11815,6 +11659,22 @@ execa@^2.0.4:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+execa@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-3.2.0.tgz#18326b79c7ab7fbd6610fd900c1b9e95fa48f90a"
+  integrity sha512-kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 execall@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73"
@@ -12644,11 +12504,6 @@ fined@^1.0.1:
     object.pick "^1.2.0"
     parse-filepath "^1.0.1"
 
-finity@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/finity/-/finity-0.5.4.tgz#f2a8a9198e8286467328ec32c8bfcc19a2229c11"
-  integrity sha512-3l+5/1tuw616Lgb0QBimxfdd2TqaDGpfCBpfX6EqtFmqUV3FtQnVEX4Aa62DagYEqnsTIjZcTfbq9msDbXYgyA==
-
 first-chunk-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70"
@@ -13251,6 +13106,11 @@ get-amd-module-type@^3.0.0:
     ast-module-types "^2.3.2"
     node-source-walk "^4.0.0"
 
+get-assigned-identifiers@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1"
+  integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -14331,13 +14191,6 @@ gulp-mocha@^7.0.2:
     supports-color "^7.0.0"
     through2 "^3.0.1"
 
-gulp-multi-process@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/gulp-multi-process/-/gulp-multi-process-1.3.1.tgz#e12aa818e4c234357ad99d5caff8df8a18f46e9e"
-  integrity sha512-okxYy3mxUkekM0RNjkBg8OPuzpnD2yXMAdnGOaQPSJ2wzBdE9R9pkTV+tzPZ65ORK7b57YUc6s+gROA4+EIOLg==
-  dependencies:
-    async.queue "^0.5.2"
-
 gulp-rename@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd"
@@ -14717,11 +14570,6 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
-he@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-0.5.0.tgz#2c05ffaef90b68e860f3fd2b54ef580989277ee2"
-  integrity sha1-LAX/rvkLaOhg8/0rVO9YCYknfuI=
-
 he@1.2.0, he@1.2.x, he@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -15095,6 +14943,11 @@ https-proxy-agent@^2.2.2:
     agent-base "^4.3.0"
     debug "^3.1.0"
 
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
@@ -15109,11 +14962,6 @@ humanize-string@^1.0.2:
   dependencies:
     decamelize "^1.0.0"
 
-humps@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/humps/-/humps-2.0.1.tgz#dd02ea6081bd0568dc5d073184463957ba9ef9aa"
-  integrity sha1-3QLqYIG9BWjcXQcxhEY5V7qe+ao=
-
 hyperlinker@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e"
@@ -15150,6 +14998,13 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550"
+  integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -15431,25 +15286,6 @@ inquirer@6.5.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-inquirer@^0.11.1:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.11.4.tgz#81e3374e8361beaff2d97016206d359d0b32fa4d"
-  integrity sha1-geM3ToNhvq/y2XAWIG01nQsy+k0=
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^1.0.1"
-    figures "^1.3.5"
-    lodash "^3.3.1"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
 inquirer@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
@@ -15604,14 +15440,6 @@ inquirer@^7.0.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-insane@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/insane/-/insane-2.6.1.tgz#c7dcae7b51c20346883b71078fad6ce0483c198f"
-  integrity sha1-x9yue1HCA0aIO3EHj61s4Eg8GY8=
-  dependencies:
-    assignment "2.0.0"
-    he "0.5.0"
-
 insight@0.10.1:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/insight/-/insight-0.10.1.tgz#a0ecf668484a95d66e9be59644964e719cc83380"
@@ -17127,7 +16955,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@3.13.1, js-yaml@3.x, js-yaml@^3.10.0, js-yaml@^3.13.1, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.9.0, js-yaml@~3.13.0, js-yaml@~3.13.1, js-yaml@~3.7.0:
+js-yaml@3.13.1, js-yaml@3.x, js-yaml@^3.10.0, js-yaml@^3.13.1, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4, js-yaml@^3.9.0, js-yaml@~3.13.0, js-yaml@~3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -17887,6 +17715,15 @@ linebreak@^0.3.0:
     brfs "^1.3.0"
     unicode-trie "^0.3.0"
 
+linebreak@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/linebreak/-/linebreak-1.0.2.tgz#4b5781733e9a9eb2849dba2f963e47c887f8aa06"
+  integrity sha512-bJwSRsJeAmaZYnkcwl5sCQNfSDAhBuXxb6L27tb+qkBRtUQSSTUa5bcgCPD6hFEkRNlpWHfK7nFMmcANU7ZP1w==
+  dependencies:
+    base64-js "0.0.8"
+    brfs "^2.0.2"
+    unicode-trie "^1.0.0"
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -18318,11 +18155,6 @@ lodash.keyby@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.keyby/-/lodash.keyby-4.6.0.tgz#7f6a1abda93fd24e22728a4d361ed8bcba5a4354"
   integrity sha1-f2oavak/0k4icopNNh7YvLpaQ1Q=
 
-lodash.lowercase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.lowercase/-/lodash.lowercase-4.3.0.tgz#46515aced4acb0b7093133333af068e4c3b14e9d"
-  integrity sha1-RlFaztSssLcJMTMzOvBo5MOxTp0=
-
 lodash.map@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -18353,21 +18185,11 @@ lodash.omit@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
   integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=
 
-lodash.omitby@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.omitby/-/lodash.omitby-4.6.0.tgz#5c15ff4754ad555016b53c041311e8f079204791"
-  integrity sha1-XBX/R1StVVAWtTwEExHo8HkgR5E=
-
 lodash.once@^4.0.0, lodash.once@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
-lodash.orderby@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3"
-  integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM=
-
 lodash.pad@^4.1.0:
   version "4.5.1"
   resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70"
@@ -18393,11 +18215,6 @@ lodash.pick@^4.2.1, lodash.pick@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
   integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
 
-lodash.pickby@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
-  integrity sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=
-
 lodash.reduce@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
@@ -18483,7 +18300,7 @@ lodash@4.17.11, lodash@4.17.15, lodash@>4.17.4, lodash@^4.0.0, lodash@^4.0.1, lo
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@^3.10.1, lodash@^3.3.1:
+lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
@@ -18493,11 +18310,6 @@ lodash@^3.10.1, lodash@^3.3.1:
   resolved "https://registry.yarnpkg.com/@elastic/lodash/-/lodash-3.10.1-kibana3.tgz#c0e318245219eeeff535895c429e0cef5058a9ad"
   integrity sha512-HMfwwT2yAkEQNzHSR1BxgE5YcDMUaZ/skhNyjy1nvM/A4m0Kh940hLZeCqKBCsSaUJz/8A/9cQGd9BaAOCIBLg==
 
-lodash@~2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
-  integrity sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=
-
 log-ok@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/log-ok/-/log-ok-0.1.1.tgz#bea3dd36acd0b8a7240d78736b5b97c65444a334"
@@ -18559,11 +18371,6 @@ logform@^2.1.1:
     ms "^2.1.1"
     triple-beam "^1.3.0"
 
-loglevel@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
-
 loglevel@^1.6.4:
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz#f408f4f006db8354d0577dcf6d33485b3cb90d56"
@@ -18683,11 +18490,6 @@ lru-queue@0.1:
   dependencies:
     es5-ext "~0.10.2"
 
-luxon@^1.11.3:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.13.1.tgz#b7fb7ba1e5c93ebda098af8d579314797e0a0d69"
-  integrity sha512-IQKRIiz9ldUrgcozN13SAeNZVYfD3bEI9X6TcrGu+dkgE4GR/Iik03ozbTM5cTr0lz8ucYPL2jtYT7Va2Flbsg==
-
 lz-string@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
@@ -18721,6 +18523,13 @@ madge@3.4.4:
     rc "^1.2.7"
     walkdir "^0.0.12"
 
+magic-string@^0.22.4:
+  version "0.22.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
+  dependencies:
+    vlq "^0.2.2"
+
 majo@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/majo/-/majo-0.4.1.tgz#5e6eeb9b63bda77e59d396b9c9ce4189ce6100bc"
@@ -19079,6 +18888,13 @@ merge-descriptors@1.0.1, merge-descriptors@~1.0.0:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
+merge-source-map@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
+  dependencies:
+    source-map "^0.5.6"
+
 merge-source-map@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
@@ -19539,7 +19355,7 @@ mochawesome-merge@^2.0.1:
     uuid "^3.3.2"
     yargs "^12.0.5"
 
-mochawesome-report-generator@^4.0.0, mochawesome-report-generator@^4.0.1:
+mochawesome-report-generator@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/mochawesome-report-generator/-/mochawesome-report-generator-4.0.1.tgz#0a010d1ecf379eb26ba05300feb59e2665076080"
   integrity sha512-hQbmQt8/yCT68GjrQFat+Diqeuka3haNllexYfja1+y0hpwi3yCJwFpQCdWK9ezzcXL3Nu80f2I6SZeyspwsqg==
@@ -19599,38 +19415,23 @@ module-not-found-error@^1.0.0:
   resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
   integrity sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=
 
-moment-duration-format@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/moment-duration-format/-/moment-duration-format-1.3.0.tgz#541771b5f87a049cc65540475d3ad966737d6908"
-  integrity sha1-VBdxtfh6BJzGVUBHXTrZZnN9aQg=
+moment-duration-format@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/moment-duration-format/-/moment-duration-format-2.3.2.tgz#5fa2b19b941b8d277122ff3f87a12895ec0d6212"
+  integrity sha512-cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ==
 
-moment-timezone@^0.5.14:
-  version "0.5.14"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1"
-  integrity sha1-TrOP+VOLgBCLpGekWPPtQmjM/LE=
+moment-timezone@^0.5.27:
+  version "0.5.27"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz#73adec8139b6fe30452e78f210f27b1f346b8877"
+  integrity sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==
   dependencies:
     moment ">= 2.9.0"
 
-moment@2.24.0, moment@>=1.6.0:
+moment@2.24.0, "moment@>= 2.9.0", moment@>=1.6.0, moment@>=2.14.0, moment@^2.10.6, moment@^2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-"moment@>= 2.9.0", moment@^2.13.0, moment@^2.20.1:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
-  integrity sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==
-
-moment@>=2.14.0:
-  version "2.22.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
-
-moment@^2.10.6:
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
-  integrity sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ==
-
 monaco-editor@~0.17.0:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.17.1.tgz#8fbe96ca54bfa75262706e044f8f780e904aa45c"
@@ -19665,11 +19466,6 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-  integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -20355,6 +20151,13 @@ npm-run-path@^3.0.0:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.0.tgz#d644ec1bd0569187d2a52909971023a0a58e8438"
+  integrity sha512-8eyAOAH+bYXFPSnNnKr3J+yoybe8O87Is5rtAQ8qRczJz1ajcsjg8l2oZqP+Ppx15Ii3S1vUTjQN2h4YO2tWWQ==
+  dependencies:
+    path-key "^3.0.0"
+
 npmconf@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/npmconf/-/npmconf-2.1.3.tgz#1cbe5dd02e899d365fed7260b54055473f90a15c"
@@ -20520,6 +20323,11 @@ object-inspect@~0.4.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-0.4.0.tgz#f5157c116c1455b243b06ee97703392c5ad89fec"
   integrity sha1-9RV8EWwUVbJDsG7pdwM5LFrYn+w=
 
+object-inspect@~1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+  integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
+
 object-is@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
@@ -20785,13 +20593,6 @@ optimist@^0.6.1, optimist@~0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optimist@~0.3.5:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
-  integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=
-  dependencies:
-    wordwrap "~0.0.2"
-
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
@@ -21053,23 +20854,11 @@ p-map@^3.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
-p-queue@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-2.4.2.tgz#03609826682b743be9a22dba25051bd46724fc34"
-  integrity sha512-n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng==
-
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
   integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
 
-p-retry@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-2.0.0.tgz#b97f1f4d6d81a3c065b2b40107b811e995c1bfba"
-  integrity sha512-ZbCuzAmiwJ45q4evp/IG9D+5MUllGSUeCWwPt3j/tdYSi1KPkSD+46uqmAA1LhccDhOXv8kYZKNb8x78VflzfA==
-  dependencies:
-    retry "^0.12.0"
-
 p-retry@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
@@ -21482,7 +21271,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-key@^3.0.0:
+path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
   integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
@@ -21593,7 +21382,7 @@ pdfjs-dist@^2.0.943:
     node-ensure "^0.0.0"
     worker-loader "^2.0.0"
 
-pdfkit@^0.10.0:
+pdfkit@>=0.8.1, pdfkit@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/pdfkit/-/pdfkit-0.10.0.tgz#88f2aa8e3cf9e1cc2caff6447b68dd4e435cb284"
   integrity sha512-mRJ6iuDzpIQ4ftKp5GvijLXNVRK86xjnyIPBraYSPrUPubNqWM5/oYmc7FZKUWz3wusRTj3PLR9HJ1X5ooqfsg==
@@ -21603,14 +21392,15 @@ pdfkit@^0.10.0:
     linebreak "^0.3.0"
     png-js ">=0.1.0"
 
-pdfmake@0.1.57:
-  version "0.1.57"
-  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.57.tgz#408e9853777fb851eeb700aaa221905e135917a0"
-  integrity sha512-s6Bs71Ylh06yNgJfP61xicHZSEvFrwo8lvI/BOU4+6eDddO8lwOZi5A42RA0V8zQr6hrI1XYxtLkk/7oJ+5w+w==
+pdfmake@^0.1.60:
+  version "0.1.60"
+  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.60.tgz#d6067e30651a70c9095c37c504eae2137a675d28"
+  integrity sha512-vu+d9xaspGfMB0cNfH+CSet3q+Ip7/CRsx1LJLv2ToMduSTzqE4oTxjZQkPLB9LOL+36zT1SvbNvs0qoxusz1A==
   dependencies:
-    iconv-lite "^0.4.24"
-    linebreak "^0.3.0"
+    iconv-lite "^0.5.0"
+    linebreak "^1.0.2"
     pdfkit "^0.10.0"
+    svg-to-pdfkit "^0.1.7"
 
 pegjs@0.10.0:
   version "0.10.0"
@@ -21833,7 +21623,7 @@ polished@^3.3.1:
   dependencies:
     "@babel/runtime" "^7.4.5"
 
-popper.js@^1.14.1, popper.js@^1.14.3, popper.js@^1.14.7:
+popper.js@^1.14.1, popper.js@^1.14.7:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
   integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
@@ -22173,7 +21963,7 @@ prop-types@15.6.1:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-prop-types@15.7.2, prop-types@15.x, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@15.7.2, prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -22803,14 +22593,6 @@ react-clientside-effect@^1.2.0:
     "@babel/runtime" "^7.0.0"
     shallowequal "^1.1.0"
 
-react-clipboard.js@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/react-clipboard.js/-/react-clipboard.js-1.1.3.tgz#86feeb49364553ecd15aea91c75aa142532a60e0"
-  integrity sha512-97IKPinjiuFIBrCXqhNvKCBJFrSS1mmV5LVALE9djkweau26UWpR5VueYB3Eo3b2vfPtbyt0QUw06YOGdC0rpw==
-  dependencies:
-    clipboard "^1.6.1"
-    prop-types "^15.5.0"
-
 react-color@^2.13.8:
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.14.1.tgz#db8ad4f45d81e74896fc2e1c99508927c6d084e0"
@@ -23038,7 +22820,7 @@ react-hotkeys@2.0.0-pre4:
   dependencies:
     prop-types "^15.6.1"
 
-react-input-autosize@^2.1.2, react-input-autosize@^2.2.1:
+react-input-autosize@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8"
   integrity sha512-3+K4CD13iE4lQQ2WlF8PuV5htfmTRLH6MDnfndHM6LuBRszuXnuyIfE7nhSKt8AzRBZ50bu0sAhkNMeS5pxQQA==
@@ -23141,10 +22923,10 @@ react-markdown@^4.0.6:
     unist-util-visit "^1.3.0"
     xtend "^4.0.1"
 
-react-moment-proptypes@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/react-moment-proptypes/-/react-moment-proptypes-1.6.0.tgz#8ec266ee392a08ba3412d2df2eebf833ab1046df"
-  integrity sha512-4h7EuhDMTzQqZ+02KUUO+AVA7PqhbD88yXB740nFpNDyDS/bj9jiPyn2rwr9sa8oDyaE1ByFN9+t5XPyPTmN6g==
+react-moment-proptypes@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/react-moment-proptypes/-/react-moment-proptypes-1.7.0.tgz#89881479840a76c13574a86e3bb214c4ba564e7a"
+  integrity sha512-ZbOn/P4u469WEGAw5hgkS/E+g1YZqdves2BjYsLluJobzUZCtManhjHiZKjniBVT7MSHM6D/iKtRVzlXVv3ikA==
   dependencies:
     moment ">=1.6.0"
 
@@ -23230,15 +23012,6 @@ react-reconciler@^0.20.1:
     prop-types "^15.6.2"
     scheduler "^0.13.6"
 
-react-redux-request@^1.5.6:
-  version "1.5.6"
-  resolved "https://registry.yarnpkg.com/react-redux-request/-/react-redux-request-1.5.6.tgz#8c514dc88264d225e113b4b54a265064e8020651"
-  integrity sha512-mzdG41GSLwynFI7DII3XNJxkABLD++I3Q1zlZWpcqycWSzWSYkjPUEz7M8r6aIIMzruANHQZX+asulvoaiwFRg==
-  dependencies:
-    lodash.get "^4.4.2"
-    lodash.isequal "^4.5.0"
-    prop-types "^15.6.1"
-
 react-redux@^5.0.6, react-redux@^5.0.7:
   version "5.0.7"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
@@ -23283,10 +23056,10 @@ react-resize-detector@^4.0.5, react-resize-detector@^4.2.0:
     raf-schd "^4.0.0"
     resize-observer-polyfill "^1.5.1"
 
-react-reverse-portal@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/react-reverse-portal/-/react-reverse-portal-1.0.3.tgz#38cd2d40f40862352dd63905f9b923f9c41f474b"
-  integrity sha512-mCtpp3BzPedmGTAMqT2v5U1hwnAvRfSqMusriON/GxnedT9gvNNTvai24NnrfKfQ78zqPo4e3N5nWPLpY7bORQ==
+react-reverse-portal@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/react-reverse-portal/-/react-reverse-portal-1.0.4.tgz#d127d2c9147549b25c4959aba1802eca4b144cd4"
+  integrity sha512-WESex/wSjxHwdG7M0uwPNkdQXaLauXNHi4INQiRybmFIXVzAqgf/Ak2OzJ4MLf4UuCD/IzEwJOkML2SxnnontA==
 
 react-router-dom@4.2.2:
   version "4.2.2"
@@ -23356,15 +23129,6 @@ react-router@^4.3.1:
     prop-types "^15.6.1"
     warning "^4.0.1"
 
-react-select@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-1.2.1.tgz#a2fe58a569eb14dcaa6543816260b97e538120d1"
-  integrity sha512-vaCgT2bEl+uTyE/uKOEgzE5Dc/wLtzhnBvoHCeuLoJWc4WuadN6WQDhoL42DW+TziniZK2Gaqe/wUXydI3NSaQ==
-  dependencies:
-    classnames "^2.2.4"
-    prop-types "^15.5.8"
-    react-input-autosize "^2.1.2"
-
 react-select@^2.2.0:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/react-select/-/react-select-2.4.4.tgz#ba72468ef1060c7d46fbb862b0748f96491f1f73"
@@ -23677,7 +23441,7 @@ read-pkg@^5.1.1, read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -23899,11 +23663,6 @@ redux-saga@^0.16.0:
   resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.16.2.tgz#993662e86bc945d8509ac2b8daba3a8c615cc971"
   integrity sha512-iIjKnRThI5sKPEASpUvySemjzwqwI13e3qP7oLub+FycCRDysLSAOwt958niZW6LhxfmS6Qm1BzbU70w/Koc4w==
 
-redux-test-utils@0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/redux-test-utils/-/redux-test-utils-0.2.2.tgz#593213f30173c5908f72315f08b705e1606094fe"
-  integrity sha512-+YsUHpzZJ7G85wYgllmGLJ75opIlWrCuKThaVTsHW5xLOrzaLE4abQ3AbYcHkx/vFOReG2D8XUwMfGnFKH8hGw==
-
 redux-thunk@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
@@ -24684,7 +24443,7 @@ rimraf@2.6.3, rimraf@^2.6.3, rimraf@~2.6.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@2.7.1, rimraf@^2.7.1:
+rimraf@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -24781,11 +24540,6 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
-rsync@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/rsync/-/rsync-0.6.1.tgz#3681a0098bd8750448f8bf9da1fee09f7763742b"
-  integrity sha1-NoGgCYvYdQRI+L+dof7gn3djdCs=
-
 run-async@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
@@ -24851,41 +24605,13 @@ rxjs@^5.0.0-beta.11, rxjs@^5.5.0, rxjs@^5.5.2:
   dependencies:
     symbol-observable "1.0.1"
 
-rxjs@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.1.0.tgz#833447de4e4f6427b9cec3e5eb9f56415cd28315"
-  integrity sha512-lMZdl6xbHJCSb5lmnb6nOhsoBVCyoDC5LDJQK9WWyq+tsI7KnlDIZ0r0AZAlBpRPLbwQA9kzSBAZwNIZEZ+hcw==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1"
-  integrity sha512-OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.3.3:
+rxjs@^6.1.0, rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.1, rxjs@^6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
   integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.5.1:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
-  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
-  dependencies:
-    tslib "^1.9.0"
-
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -25021,7 +24747,7 @@ sass-resources-loader@^2.0.1:
     glob "^7.1.1"
     loader-utils "^1.0.4"
 
-sax@>=0.6.0, sax@^1.2.1, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4:
+sax@>=0.6.0, sax@^1.2.1, sax@^1.2.4, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -25081,6 +24807,18 @@ schema-utils@^2.4.1:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
 
+scope-analyzer@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/scope-analyzer/-/scope-analyzer-2.0.5.tgz#72c9c6770c3e66984f84c7d3c7045998a1a7db8a"
+  integrity sha512-+U5H0417mnTEstCD5VwOYO7V4vYuSqwqjFap40ythe67bhMFL5C3UgPwyBv7KDJsqUBIKafOD57xMlh1rN7eaw==
+  dependencies:
+    array-from "^2.1.1"
+    es6-map "^0.1.5"
+    es6-set "^0.1.5"
+    es6-symbol "^3.1.1"
+    estree-is-function "^1.0.0"
+    get-assigned-identifiers "^1.1.0"
+
 scoped-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-1.0.0.tgz#a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"
@@ -25328,20 +25066,10 @@ set-immediate-shim@^1.0.0, set-immediate-shim@~1.0.1:
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
   integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -25427,11 +25155,23 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 shell-quote@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
@@ -26066,6 +25806,13 @@ statehood@6.x.x:
     iron "5.x.x"
     joi "13.x.x"
 
+static-eval@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
+  integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==
+  dependencies:
+    escodegen "^1.8.1"
+
 static-eval@~0.2.0:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-0.2.4.tgz#b7d34d838937b969f9641ca07d48f8ede263ea7b"
@@ -26098,6 +25845,26 @@ static-module@^1.1.0:
     static-eval "~0.2.0"
     through2 "~0.4.1"
 
+static-module@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.3.tgz#cc2301ed3fe353e2d2a2195137013853676f9960"
+  integrity sha512-RDaMYaI5o/ym0GkCqL/PlD1Pn216omp8fY81okxZ6f6JQxWW5tptOw9reXoZX85yt/scYvbWIt6uoszeyf+/MQ==
+  dependencies:
+    acorn-node "^1.3.0"
+    concat-stream "~1.6.0"
+    convert-source-map "^1.5.1"
+    duplexer2 "~0.1.4"
+    escodegen "~1.9.0"
+    has "^1.0.1"
+    magic-string "^0.22.4"
+    merge-source-map "1.0.4"
+    object-inspect "~1.4.0"
+    readable-stream "~2.3.3"
+    scope-analyzer "^2.0.1"
+    shallow-copy "~0.0.1"
+    static-eval "^2.0.2"
+    through2 "~2.0.3"
+
 stats-lite@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/stats-lite/-/stats-lite-2.2.0.tgz#278a5571fa1d2e8b1691295dccc0235282393bbf"
@@ -26181,11 +25948,6 @@ stream-spigot@~2.1.2:
   dependencies:
     readable-stream "~1.1.0"
 
-stream-stream@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/stream-stream/-/stream-stream-1.2.6.tgz#a9ae071c64c11b8584f52973f7715e37e5144c43"
-  integrity sha1-qa4HHGTBG4WE9Slz93FeN+UUTEM=
-
 stream-to-observable@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.1.0.tgz#45bf1d9f2d7dc09bed81f1c307c430e68b84cffe"
@@ -26687,18 +26449,12 @@ sver-compat@^1.5.0:
     es6-iterator "^2.0.1"
     es6-symbol "^3.1.1"
 
-svgo@^0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-  integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=
+svg-to-pdfkit@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/svg-to-pdfkit/-/svg-to-pdfkit-0.1.7.tgz#7db6d47e47b3888dce18060751a8de2417f85775"
+  integrity sha1-fbbUfkeziI3OGAYHUajeJBf4V3U=
   dependencies:
-    coa "~1.0.1"
-    colors "~1.1.2"
-    csso "~2.3.1"
-    js-yaml "~3.7.0"
-    mkdirp "~0.5.1"
-    sax "~1.2.1"
-    whet.extend "~0.9.9"
+    pdfkit ">=0.8.1"
 
 svgo@^1.2.1:
   version "1.2.2"
@@ -26760,6 +26516,11 @@ tabbable@^1.0.3:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-1.1.2.tgz#b171680aea6e0a3e9281ff23532e2e5de11c0d94"
   integrity sha512-77oqsKEPrxIwgRcXUwipkj9W5ItO97L6eUT1Ar7vh+El16Zm4M6V+YU1cbipHEa6q0Yjw8O3Hoh8oRgatV5s7A==
 
+tabbable@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-3.1.2.tgz#f2d16cccd01f400e38635c7181adfe0ad965a4a2"
+  integrity sha512-wjB6puVXTYO0BSFtCmWQubA/KIn7Xvajw0x0l6eJUudMG/EAiJvIUnyNX6xO4NpGrJ16lbD0eUseB9WxW0vlpQ==
+
 table@^3.7.8:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
@@ -26836,7 +26597,7 @@ tape@^4.5.1:
     string.prototype.trim "~1.1.2"
     through "~2.3.8"
 
-tar-fs@^1.16.3, tar-fs@^1.8.1:
+tar-fs@^1.16.3:
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
   integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
@@ -26915,13 +26676,6 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-targz@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/targz/-/targz-1.0.1.tgz#8f76a523694cdedfbb5d60a4076ff6eeecc5398f"
-  integrity sha1-j3alI2lM3t+7XWCkB2/27uzFOY8=
-  dependencies:
-    tar-fs "^1.8.1"
-
 tcomb-validation@^3.3.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/tcomb-validation/-/tcomb-validation-3.4.1.tgz#a7696ec176ce56a081d9e019f8b732a5a8894b65"
@@ -27149,6 +26903,14 @@ through2@~0.4.1:
     readable-stream "~1.0.17"
     xtend "~2.1.1"
 
+through2@~2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@~2.3.4, through@~2.3.6, through@~2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -27515,25 +27277,6 @@ trough@^1.0.0:
   dependencies:
     glob "^6.0.4"
 
-trunc-html@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/trunc-html/-/trunc-html-1.1.2.tgz#1e97d51f67d470b67662b1a670e6d0ea7a8edafe"
-  integrity sha1-HpfVH2fUcLZ2YrGmcObQ6nqO2v4=
-  dependencies:
-    assignment "2.2.0"
-    insane "2.6.1"
-    trunc-text "1.0.1"
-
-trunc-text@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trunc-text/-/trunc-text-1.0.1.tgz#58f876d8ac59b224b79834bb478b8656e69622b5"
-  integrity sha1-WPh22KxZsiS3mDS7R4uGVuaWIrU=
-
-trunc-text@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/trunc-text/-/trunc-text-1.0.2.tgz#b582bb3ddea9c9adc25017d737c48ebdd2157406"
-  integrity sha1-tYK7Pd6pya3CUBfXN8SOvdIVdAY=
-
 ts-debounce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ts-debounce/-/ts-debounce-1.0.0.tgz#e433301744ba75fe25466f7f23e1382c646aae6a"
@@ -28336,6 +28079,14 @@ unicode-trie@^0.3.0:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
 
+unicode-trie@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-1.0.0.tgz#f649afdca127135edb55ca0ad7c8c60656d92ad1"
+  integrity sha512-v5raLKsobbFbWLMoX9+bChts/VhPPj3XpkNr/HbqkirXR1DPk8eo9IYKyvk0MQZFkaoRsFj2Rmaqgi2rfAZYtA==
+  dependencies:
+    pako "^0.2.5"
+    tiny-inflate "^1.0.0"
+
 unified@^6.1.5:
   version "6.1.6"
   resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.6.tgz#5ea7f807a0898f1f8acdeefe5f25faa010cc42b1"
@@ -28369,14 +28120,14 @@ union-find@^1.0.0:
   integrity sha1-KSusQV5q06iVNdI3AQ20pTYoTlg=
 
 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"
 
 uniq@^1.0.1:
   version "1.0.1"
@@ -29384,6 +29135,11 @@ vision@^5.3.3:
     items "2.x.x"
     joi "13.x.x"
 
+vlq@^0.2.2:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
+
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -29850,11 +29606,6 @@ whatwg-url@^7.0.0:
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
-whet.extend@~0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-  integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=
-
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
@@ -29879,6 +29630,13 @@ which@^1.1.1, which@^1.2.1, which@^1.2.14, which@^1.2.8, which@^1.3.0:
   dependencies:
     isexe "^2.0.0"
 
+which@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.1.tgz#f1cf94d07a8e571b6ff006aeb91d0300c47ef0a4"
+  integrity sha512-N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w==
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -30143,13 +29901,6 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^5.2.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
-  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
-  dependencies:
-    async-limiter "~1.0.0"
-
 ws@^6.1.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526"
@@ -30307,6 +30058,11 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
   integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
+xtend@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
 xtend@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"